From 28f49d3015492c577ef3511dad276375de61c622 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 29 Jan 2019 08:55:11 -0500 Subject: [PATCH] Add Bell Tower preset (close #5772) Update tower presets to use field inheritance --- data/presets.yaml | 5 ++++ data/presets/presets.json | 7 ++--- data/presets/presets/man_made/tower.json | 6 ++++- .../presets/man_made/tower/bell_tower.json | 27 +++++++++++++++++++ .../presets/man_made/tower/communication.json | 4 +-- .../presets/man_made/tower/observation.json | 7 +++-- data/taginfo.json | 1 + dist/locales/en.json | 4 +++ 8 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 data/presets/presets/man_made/tower/bell_tower.json diff --git a/data/presets.yaml b/data/presets.yaml index e62b0a414..473cd486d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4941,6 +4941,11 @@ en: # man_made=tower name: Tower terms: '' + man_made/tower/bell_tower: + # 'man_made=tower, tower:type=bell_tower' + name: Bell Tower + # 'terms: belfry,bell gable,campanile,church tower,klockstapel' + terms: '' man_made/tower/communication: # 'man_made=tower, tower:type=communication' name: Communication Tower diff --git a/data/presets/presets.json b/data/presets/presets.json index 0423f4275..8b2a144a0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -625,9 +625,10 @@ "man_made/surveillance": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"}, "man_made/surveillance/camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"}, "man_made/survey_point": {"icon": "maki-monument", "fields": ["ref"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"}, - "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"}, - "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"}, - "man_made/tower/observation": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"}, + "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"}, + "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"}, + "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"}, + "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"}, "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"}, "man_made/water_tower": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"}, "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "name": "Water Well"}, diff --git a/data/presets/presets/man_made/tower.json b/data/presets/presets/man_made/tower.json index b9d1c610e..8d2837c4d 100644 --- a/data/presets/presets/man_made/tower.json +++ b/data/presets/presets/man_made/tower.json @@ -3,7 +3,11 @@ "fields": [ "tower/type", "tower/construction", - "height" + "height", + "building_area" + ], + "moreFields": [ + "architect" ], "geometry": [ "point", diff --git a/data/presets/presets/man_made/tower/bell_tower.json b/data/presets/presets/man_made/tower/bell_tower.json new file mode 100644 index 000000000..b68ffb662 --- /dev/null +++ b/data/presets/presets/man_made/tower/bell_tower.json @@ -0,0 +1,27 @@ +{ + "icon": "fas-bell", + "moreFields": [ + "{man_made/tower}", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "belfry", + "bell gable", + "campanile", + "church tower", + "klockstapel" + ], + "tags": { + "man_made": "tower", + "tower:type": "bell_tower" + }, + "reference": { + "key": "tower:type", + "value": "bell_tower" + }, + "name": "Bell Tower" +} diff --git a/data/presets/presets/man_made/tower/communication.json b/data/presets/presets/man_made/tower/communication.json index ecdaa2363..18f9c3042 100644 --- a/data/presets/presets/man_made/tower/communication.json +++ b/data/presets/presets/man_made/tower/communication.json @@ -1,9 +1,7 @@ { "icon": "temaki-tower", "fields": [ - "tower/type", - "tower/construction", - "height", + "{man_made/tower}", "communication_multi" ], "geometry": [ diff --git a/data/presets/presets/man_made/tower/observation.json b/data/presets/presets/man_made/tower/observation.json index 8b2e61b7d..a9e2996eb 100644 --- a/data/presets/presets/man_made/tower/observation.json +++ b/data/presets/presets/man_made/tower/observation.json @@ -1,9 +1,8 @@ { "icon": "temaki-tower", - "fields": [ - "tower/type", - "tower/construction", - "height" + "moreFields": [ + "{man_made/tower}", + "opening_hours" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index ae5a3a81d..4681ec81a 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -613,6 +613,7 @@ {"key": "surveillance:type", "value": "camera", "description": "🄿 Surveillance Camera, 🄵 Surveillance Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"}, {"key": "man_made", "value": "survey_point", "description": "🄿 Survey Point", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"}, {"key": "man_made", "value": "tower", "description": "🄿 Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"}, + {"key": "tower:type", "value": "bell_tower", "description": "🄿 Bell Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-bell.svg?sanitize=true"}, {"key": "tower:type", "value": "observation", "description": "🄿 Observation Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"}, {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 9463d70af..62ea0bfa4 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6114,6 +6114,10 @@ "name": "Tower", "terms": "" }, + "man_made/tower/bell_tower": { + "name": "Bell Tower", + "terms": "belfry,bell gable,campanile,church tower,klockstapel" + }, "man_made/tower/communication": { "name": "Communication Tower", "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"