From 433efd657ba44e088eaebfd9544be92c8679fbe4 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 8 Nov 2019 20:23:26 +0100 Subject: [PATCH] Add Utilities field to Utility Pole and Street Cabinet preset (re: #6978) --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/utility_semi.json | 5 +++++ data/presets/presets.json | 4 ++-- data/presets/presets/man_made/street_cabinet.json | 1 + data/presets/presets/man_made/utility_pole.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 8 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/utility_semi.json diff --git a/data/presets.yaml b/data/presets.yaml index 93d545032..18dbb5454 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2448,6 +2448,9 @@ en: # usage=tourism tourism: Tourism terms: '[translate with synonyms or related terms for ''Usage Type'', separated by commas]' + utility_semi: + # utility=* + label: Utilities valve: # valve=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index 78d74a015..fbf6febc8 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -413,6 +413,7 @@ "trolley_wire": {"key": "trolley_wire", "type": "check", "label": "Overhead Trolley Wires"}, "tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}}, + "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"}, "valve": {"key": "valve", "type": "combo", "label": "Type"}, "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"}, "visibility": {"key": "visibility", "type": "combo", "label": "Visibility", "strings": {"options": {"house": "Up to 5m (16ft)", "street": "5 to 20m (16 to 65ft)", "area": "Over 20m (65ft)"}}}, diff --git a/data/presets/fields/utility_semi.json b/data/presets/fields/utility_semi.json new file mode 100644 index 000000000..3c1e13ab4 --- /dev/null +++ b/data/presets/fields/utility_semi.json @@ -0,0 +1,5 @@ +{ + "key": "utility", + "type": "semiCombo", + "label": "Utilities" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 6bb0b095d..7834dc980 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -755,7 +755,7 @@ "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", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"}, "man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"}, - "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"}, + "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "utility_semi", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"}, "man_made/surveillance": {"icon": "temaki-security_camera", "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": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "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"}, @@ -767,7 +767,7 @@ "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"}, "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/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"}, - "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"}, + "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "utility_semi", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"}, "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "phone", "website"], "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", "height"], "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/street_cabinet.json b/data/presets/presets/man_made/street_cabinet.json index f889b0fd6..98a735263 100644 --- a/data/presets/presets/man_made/street_cabinet.json +++ b/data/presets/presets/man_made/street_cabinet.json @@ -8,6 +8,7 @@ "ref", "operator", "street_cabinet", + "utility_semi", "height", "colour" ], diff --git a/data/presets/presets/man_made/utility_pole.json b/data/presets/presets/man_made/utility_pole.json index 9f859bead..72f2650f8 100644 --- a/data/presets/presets/man_made/utility_pole.json +++ b/data/presets/presets/man_made/utility_pole.json @@ -3,6 +3,7 @@ "fields": [ "ref", "operator", + "utility_semi", "height", "material" ], diff --git a/data/taginfo.json b/data/taginfo.json index 2cfa69fdd..2b4926638 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1835,6 +1835,7 @@ {"key": "usage", "value": "military", "description": "🄵 Usage Type"}, {"key": "usage", "value": "test", "description": "🄵 Usage Type"}, {"key": "usage", "value": "tourism", "description": "🄵 Usage Type"}, + {"key": "utility", "description": "🄵 Utilities"}, {"key": "valve", "description": "🄵 Type"}, {"key": "vending", "description": "🄵 Types of Goods"}, {"key": "visibility", "value": "house", "description": "🄵 Visibility"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index a4ba6f4ed..6ed74b8e6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4521,6 +4521,9 @@ "tourism": "Tourism" } }, + "utility_semi": { + "label": "Utilities" + }, "valve": { "label": "Type" },