From c708e0fabce8473878f8ae4c92b23a043f29e1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 25 Sep 2021 23:14:11 -0700 Subject: [PATCH 1/3] Added Shooting Range presets --- data/fields/shooting.json | 12 ++++++++ data/presets/leisure/pitch/paintball.json | 16 +++++++++++ data/presets/leisure/pitch/shooting.json | 27 ++++++++++++++++++ .../leisure/sports_centre/shooting.json | 28 +++++++++++++++++++ interim/source_strings.yaml | 24 ++++++++++++++++ 5 files changed, 107 insertions(+) create mode 100644 data/fields/shooting.json create mode 100644 data/presets/leisure/pitch/paintball.json create mode 100644 data/presets/leisure/pitch/shooting.json create mode 100644 data/presets/leisure/sports_centre/shooting.json diff --git a/data/fields/shooting.json b/data/fields/shooting.json new file mode 100644 index 00000000..8fa7c920 --- /dev/null +++ b/data/fields/shooting.json @@ -0,0 +1,12 @@ +{ + "key": "shooting", + "type": "semiCombo", + "label": "Type", + "strings": { + "options": { + "rifle": "Rifle", + "clay_pigeon": "Clay Pigeon", + "pistol": "Pistol" + } + } +} diff --git a/data/presets/leisure/pitch/paintball.json b/data/presets/leisure/pitch/paintball.json new file mode 100644 index 00000000..413affa2 --- /dev/null +++ b/data/presets/leisure/pitch/paintball.json @@ -0,0 +1,16 @@ +{ + "icon": "fas-crosshairs", + "geometry": [ + "area", + "point" + ], + "tags": { + "leisure": "pitch", + "sport": "paintball" + }, + "reference": { + "key": "sport", + "value": "paintball" + }, + "name": "Paintball Field" +} \ No newline at end of file diff --git a/data/presets/leisure/pitch/shooting.json b/data/presets/leisure/pitch/shooting.json new file mode 100644 index 00000000..899d6bde --- /dev/null +++ b/data/presets/leisure/pitch/shooting.json @@ -0,0 +1,27 @@ +{ + "icon": "fas-crosshairs", + "geometry": [ + "area", + "point" + ], + "tags": { + "leisure": "pitch", + "sport": "shooting" + }, + "reference": { + "key": "sport", + "value": "shooting" + }, + "fields": [ + "{leisure/pitch}", + "shooting" + ], + "terms": [ + "firing range", + "gun range", + "shooting gallery", + "gun practice", + "shooting practice" + ], + "name": "Shooting Range" +} \ No newline at end of file diff --git a/data/presets/leisure/sports_centre/shooting.json b/data/presets/leisure/sports_centre/shooting.json new file mode 100644 index 00000000..57b06d19 --- /dev/null +++ b/data/presets/leisure/sports_centre/shooting.json @@ -0,0 +1,28 @@ +{ + "icon": "fas-crosshairs", + "geometry": [ + "area", + "point" + ], + "tags": { + "leisure": "sports_centre", + "sport": "shooting" + }, + "reference": { + "key": "sport", + "value": "shooting" + }, + "fields": [ + "{leisure/sports_centre}", + "shooting" + ], + "terms": [ + "shooting club", + "firing range", + "gun range", + "shooting gallery", + "gun practice", + "shooting practice" + ], + "name": "Shooting Range Facility" +} \ No newline at end of file diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 7047386d..a5de0773 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2407,6 +2407,16 @@ en: shelter_type: # shelter_type=* label: Type + shooting: + # shooting=* + label: Type + options: + # shooting=clay_pigeon + clay_pigeon: Clay Pigeon + # shooting=pistol + pistol: Pistol + # shooting=rifle + rifle: Rifle shop: # shop=* label: Type @@ -6418,6 +6428,10 @@ en: name: Netball Court # 'terms: basketball' terms: '' + leisure/pitch/paintball: + # 'leisure=pitch + sport=paintball\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' + name: Paintball Field + terms: '' leisure/pitch/rugby_league: # 'leisure=pitch + sport=rugby_league\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' name: Rugby League Field @@ -6426,6 +6440,11 @@ en: # 'leisure=pitch + sport=rugby_union\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' name: Rugby Union Field terms: '' + leisure/pitch/shooting: + # 'leisure=pitch + sport=shooting\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' + name: Shooting Range + # 'terms: firing range,gun range,shooting gallery,gun practice,shooting practice' + terms: '' leisure/pitch/shuffleboard: # 'leisure=pitch + sport=shuffleboard\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' name: Shuffleboard Court @@ -6500,6 +6519,11 @@ en: name: Climbing Gym # 'terms: abseiling,artificial climbing wall,belaying,bouldering,rock climbing facility,indoor rock wall,rappeling,rock gym,ropes' terms: '' + leisure/sports_centre/shooting: + # 'leisure=sports_centre + sport=shooting\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' + name: Shooting Range Facility + # 'terms: shooting club,firing range,gun range,shooting gallery,gun practice,shooting practice' + terms: '' leisure/sports_centre/swimming: # 'leisure=sports_centre + sport=swimming\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' name: Swimming Pool Facility From 497cb976c6fa801fc7acc2b9280b423339679010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 25 Sep 2021 23:34:02 -0700 Subject: [PATCH 2/3] Added target practice as synonym for shooting range --- data/presets/leisure/pitch/shooting.json | 3 ++- data/presets/leisure/sports_centre/shooting.json | 3 ++- interim/source_strings.yaml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/presets/leisure/pitch/shooting.json b/data/presets/leisure/pitch/shooting.json index 899d6bde..efa2bab4 100644 --- a/data/presets/leisure/pitch/shooting.json +++ b/data/presets/leisure/pitch/shooting.json @@ -21,7 +21,8 @@ "gun range", "shooting gallery", "gun practice", - "shooting practice" + "shooting practice", + "target practice" ], "name": "Shooting Range" } \ No newline at end of file diff --git a/data/presets/leisure/sports_centre/shooting.json b/data/presets/leisure/sports_centre/shooting.json index 57b06d19..4afb414a 100644 --- a/data/presets/leisure/sports_centre/shooting.json +++ b/data/presets/leisure/sports_centre/shooting.json @@ -22,7 +22,8 @@ "gun range", "shooting gallery", "gun practice", - "shooting practice" + "shooting practice", + "target practice" ], "name": "Shooting Range Facility" } \ No newline at end of file diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index a5de0773..cbd933ca 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6443,7 +6443,7 @@ en: leisure/pitch/shooting: # 'leisure=pitch + sport=shooting\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' name: Shooting Range - # 'terms: firing range,gun range,shooting gallery,gun practice,shooting practice' + # 'terms: firing range,gun range,shooting gallery,gun practice,shooting practice,target practice' terms: '' leisure/pitch/shuffleboard: # 'leisure=pitch + sport=shuffleboard\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' @@ -6522,7 +6522,7 @@ en: leisure/sports_centre/shooting: # 'leisure=sports_centre + sport=shooting\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' name: Shooting Range Facility - # 'terms: shooting club,firing range,gun range,shooting gallery,gun practice,shooting practice' + # 'terms: shooting club,firing range,gun range,shooting gallery,gun practice,shooting practice,target practice' terms: '' leisure/sports_centre/swimming: # 'leisure=sports_centre + sport=swimming\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' From 495f336840c8cb5478440ffa16f92ac8de93b686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sun, 26 Sep 2021 14:11:11 -0700 Subject: [PATCH 3/3] Removed shooting type field --- data/fields/shooting.json | 12 ------------ data/presets/leisure/pitch/shooting.json | 4 ---- data/presets/leisure/sports_centre/shooting.json | 4 ---- interim/source_strings.yaml | 10 ---------- 4 files changed, 30 deletions(-) delete mode 100644 data/fields/shooting.json diff --git a/data/fields/shooting.json b/data/fields/shooting.json deleted file mode 100644 index 8fa7c920..00000000 --- a/data/fields/shooting.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "key": "shooting", - "type": "semiCombo", - "label": "Type", - "strings": { - "options": { - "rifle": "Rifle", - "clay_pigeon": "Clay Pigeon", - "pistol": "Pistol" - } - } -} diff --git a/data/presets/leisure/pitch/shooting.json b/data/presets/leisure/pitch/shooting.json index efa2bab4..1f80aeae 100644 --- a/data/presets/leisure/pitch/shooting.json +++ b/data/presets/leisure/pitch/shooting.json @@ -12,10 +12,6 @@ "key": "sport", "value": "shooting" }, - "fields": [ - "{leisure/pitch}", - "shooting" - ], "terms": [ "firing range", "gun range", diff --git a/data/presets/leisure/sports_centre/shooting.json b/data/presets/leisure/sports_centre/shooting.json index 4afb414a..56ee1de5 100644 --- a/data/presets/leisure/sports_centre/shooting.json +++ b/data/presets/leisure/sports_centre/shooting.json @@ -12,10 +12,6 @@ "key": "sport", "value": "shooting" }, - "fields": [ - "{leisure/sports_centre}", - "shooting" - ], "terms": [ "shooting club", "firing range", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index cbd933ca..9c2b1138 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2407,16 +2407,6 @@ en: shelter_type: # shelter_type=* label: Type - shooting: - # shooting=* - label: Type - options: - # shooting=clay_pigeon - clay_pigeon: Clay Pigeon - # shooting=pistol - pistol: Pistol - # shooting=rifle - rifle: Rifle shop: # shop=* label: Type