From 499b2e58af17e1ab98ad3e7291cbd38ba8984a34 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 6 Aug 2018 13:47:07 -0400 Subject: [PATCH] Support building tags on gasometers and silos --- data/presets/presets.json | 6 +++--- data/presets/presets/man_made/gasometer.json | 4 ++++ data/presets/presets/man_made/silo.json | 4 ++-- data/presets/presets/man_made/storage_tank.json | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 8c1e5e1f0..c032e2050 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -536,7 +536,7 @@ "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"}, "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"}, "man_made/flagpole": {"icon": "maki-embassy", "geometry": ["point"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, - "man_made/gasometer": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"}, + "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"}, "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"}, "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"}, "man_made/mast": {"icon": "temaki-antenna", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "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": "mast"}, "name": "Mast"}, @@ -547,8 +547,8 @@ "man_made/pier": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"}, "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"}, "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"}, - "man_made/silo": {"icon": "temaki-silo", "fields": ["building_area", "crop"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"}, - "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["building_area", "content"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"}, + "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"}, + "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"}, "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/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/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"}, diff --git a/data/presets/presets/man_made/gasometer.json b/data/presets/presets/man_made/gasometer.json index 63daf508b..aca591e2e 100644 --- a/data/presets/presets/man_made/gasometer.json +++ b/data/presets/presets/man_made/gasometer.json @@ -1,5 +1,9 @@ { "icon": "temaki-storage_tank", + "fields": [ + "content", + "building_area" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/man_made/silo.json b/data/presets/presets/man_made/silo.json index a59a67d9e..77e6c899a 100644 --- a/data/presets/presets/man_made/silo.json +++ b/data/presets/presets/man_made/silo.json @@ -1,8 +1,8 @@ { "icon": "temaki-silo", "fields": [ - "building_area", - "crop" + "crop", + "building_area" ], "geometry": [ "point", diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json index 826fcf6fe..2890e3f60 100644 --- a/data/presets/presets/man_made/storage_tank.json +++ b/data/presets/presets/man_made/storage_tank.json @@ -1,8 +1,8 @@ { "icon": "temaki-storage_tank", "fields": [ - "building_area", - "content" + "content", + "building_area" ], "geometry": [ "point",