From 82500725c56b60b941121ad9e554bd23dbde9e64 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 11 Apr 2017 21:13:45 +0100 Subject: [PATCH 1/4] Make pavilion searchable --- data/presets/presets/amenity/pavilion.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/presets/presets/amenity/pavilion.json diff --git a/data/presets/presets/amenity/pavilion.json b/data/presets/presets/amenity/pavilion.json new file mode 100644 index 000000000..6565194eb --- /dev/null +++ b/data/presets/presets/amenity/pavilion.json @@ -0,0 +1,17 @@ +{ + "icon": "shelter", + "fields": [ + "bin", + "bench" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "shelter", + "shelter_type": "pavilion" + }, + "name": "Pavilion" +} From 4092916216236a3d46dd762f37adf92ce36ce696 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 11 Apr 2017 21:38:19 +0100 Subject: [PATCH 2/4] Adding building tag, as it is not normally rendered. --- data/presets/presets/amenity/pavilion.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/presets/amenity/pavilion.json b/data/presets/presets/amenity/pavilion.json index 6565194eb..410bca082 100644 --- a/data/presets/presets/amenity/pavilion.json +++ b/data/presets/presets/amenity/pavilion.json @@ -11,7 +11,8 @@ ], "tags": { "amenity": "shelter", - "shelter_type": "pavilion" + "shelter_type": "pavilion", + "building": "yes" }, "name": "Pavilion" } From 10afdd54a413694fa51877688b0393db382f2222 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Tue, 11 Apr 2017 21:58:11 +0100 Subject: [PATCH 3/4] Removing building tag, as it is not needed --- data/presets.yaml | 5 ++- data/presets/presets.json | 41 ++++++++++++++++------ data/presets/presets/amenity/pavilion.json | 3 +- data/taginfo.json | 8 +++-- dist/locales/en.json | 12 ++++--- 5 files changed, 49 insertions(+), 20 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 02106d08f..c280c74d2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1724,6 +1724,10 @@ en: # amenity=parking_space name: Parking Space terms: '' + amenity/pavilion: + # 'amenity=shelter, shelter_type=pavilion, building=yes' + name: Pavilion + terms: '' amenity/pharmacy: # amenity=pharmacy name: Pharmacy @@ -3513,7 +3517,6 @@ en: place/farm: # place=farm name: Farm - terms: '' place/hamlet: # place=hamlet name: Hamlet diff --git a/data/presets/presets.json b/data/presets/presets.json index 167e6256b..2ac714f73 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1749,6 +1749,24 @@ "terms": [], "name": "Car Parking" }, + "amenity/pavilion": { + "icon": "shelter", + "fields": [ + "bin", + "bench" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "shelter", + "shelter_type": "pavilion", + "building": "yes" + }, + "name": "Pavilion" + }, "amenity/pharmacy": { "icon": "pharmacy", "fields": [ @@ -9131,6 +9149,18 @@ }, "name": "Piste/Ski Trail" }, + "place/farm": { + "icon": "farm", + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "farm" + }, + "name": "Farm", + "searchable": false + }, "place/city": { "icon": "city", "fields": [ @@ -9145,17 +9175,6 @@ }, "name": "City" }, - "place/farm": { - "icon": "farm", - "geometry": [ - "point", - "area" - ], - "tags": { - "place": "farm" - }, - "name": "Farm" - }, "place/hamlet": { "icon": "triangle-stroked", "fields": [ diff --git a/data/presets/presets/amenity/pavilion.json b/data/presets/presets/amenity/pavilion.json index 410bca082..6565194eb 100644 --- a/data/presets/presets/amenity/pavilion.json +++ b/data/presets/presets/amenity/pavilion.json @@ -11,8 +11,7 @@ ], "tags": { "amenity": "shelter", - "shelter_type": "pavilion", - "building": "yes" + "shelter_type": "pavilion" }, "name": "Pavilion" } diff --git a/data/taginfo.json b/data/taginfo.json index 60fa5a30d..3fe537687 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -371,6 +371,10 @@ "key": "amenity", "value": "parking" }, + { + "key": "building", + "value": "yes" + }, { "key": "amenity", "value": "pharmacy" @@ -1960,11 +1964,11 @@ }, { "key": "place", - "value": "city" + "value": "farm" }, { "key": "place", - "value": "farm" + "value": "city" }, { "key": "place", diff --git a/dist/locales/en.json b/dist/locales/en.json index 7bf594b96..50ce54370 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2253,6 +2253,10 @@ "name": "Car Parking", "terms": "" }, + "amenity/pavilion": { + "name": "Pavilion", + "terms": "" + }, "amenity/pharmacy": { "name": "Pharmacy", "terms": "drug*,med*,prescription" @@ -3857,14 +3861,14 @@ "name": "Piste/Ski Trail", "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile" }, - "place/city": { - "name": "City", - "terms": "" - }, "place/farm": { "name": "Farm", "terms": "" }, + "place/city": { + "name": "City", + "terms": "" + }, "place/hamlet": { "name": "Hamlet", "terms": "" From 7cb7124b16a85cbed52b8098178604d56791c4b5 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Tue, 11 Apr 2017 22:01:42 +0100 Subject: [PATCH 4/4] Updating other related files to latest --- data/presets.yaml | 2 +- data/presets/presets.json | 3 +-- data/taginfo.json | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index c280c74d2..4ebd08171 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1725,7 +1725,7 @@ en: name: Parking Space terms: '' amenity/pavilion: - # 'amenity=shelter, shelter_type=pavilion, building=yes' + # 'amenity=shelter, shelter_type=pavilion' name: Pavilion terms: '' amenity/pharmacy: diff --git a/data/presets/presets.json b/data/presets/presets.json index 2ac714f73..ca5c8e2dc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1762,8 +1762,7 @@ ], "tags": { "amenity": "shelter", - "shelter_type": "pavilion", - "building": "yes" + "shelter_type": "pavilion" }, "name": "Pavilion" }, diff --git a/data/taginfo.json b/data/taginfo.json index 3fe537687..ac37b503b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -372,8 +372,8 @@ "value": "parking" }, { - "key": "building", - "value": "yes" + "key": "shelter_type", + "value": "pavilion" }, { "key": "amenity",