From 72842ff0f5c101f4cf5ba1eda11b27b397969f07 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 7 Oct 2018 11:05:31 -0700 Subject: [PATCH] Adds the Underground Power Cable Preset (closes #5380) Adds the Utility Features preset category for line geometry Adds terms to the Pipeline preset --- data/presets.yaml | 7 +++++++ data/presets/categories.json | 11 +++++++++++ data/presets/categories/utility.json | 11 +++++++++++ data/presets/defaults.json | 2 +- data/presets/presets.json | 3 ++- data/presets/presets/man_made/pipeline.json | 7 +++++++ .../presets/power/cable/underground.json | 17 +++++++++++++++++ data/taginfo.json | 6 ++++++ dist/locales/en.json | 9 ++++++++- svg/iD-sprite/presets/category-utility.svg | 8 ++++++++ 10 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 data/presets/categories/utility.json create mode 100644 data/presets/presets/power/cable/underground.json create mode 100644 svg/iD-sprite/presets/category-utility.svg diff --git a/data/presets.yaml b/data/presets.yaml index f04b94426..17cce17aa 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -25,6 +25,8 @@ en: name: Road Features category-route: name: Route Features + category-utility: + name: Utility Features category-water-area: name: Water Features category-water-line: @@ -4603,6 +4605,7 @@ en: man_made/pipeline: # man_made=pipeline name: Pipeline + # 'terms: oil,natural gas,water,sewer,sewage' terms: '' man_made/pumping_station: # man_made=pumping_station @@ -5170,6 +5173,10 @@ en: power: # power=* name: Power + power/cable/underground: + # 'power=cable, location=underground' + name: Underground Power Cable + terms: '' power/generator: # power=generator name: Power Generator diff --git a/data/presets/categories.json b/data/presets/categories.json index af19ba230..60309de77 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -186,6 +186,17 @@ "type/route" ] }, + "category-utility": { + "icon": "iD-category-utility", + "geometry": "line", + "name": "Utility Features", + "members": [ + "power/line", + "power/minor_line", + "man_made/pipeline", + "power/cable/underground" + ] + }, "category-water-area": { "icon": "maki-water", "geometry": "area", diff --git a/data/presets/categories/utility.json b/data/presets/categories/utility.json new file mode 100644 index 000000000..63aae92d0 --- /dev/null +++ b/data/presets/categories/utility.json @@ -0,0 +1,11 @@ +{ + "icon": "iD-category-utility", + "geometry": "line", + "name": "Utility Features", + "members": [ + "power/line", + "power/minor_line", + "man_made/pipeline", + "power/cable/underground" + ] +} diff --git a/data/presets/defaults.json b/data/presets/defaults.json index b0c9e52ef..a6db43d57 100644 --- a/data/presets/defaults.json +++ b/data/presets/defaults.json @@ -19,7 +19,7 @@ "category-water-line", "category-barrier", "category-natural-line", - "power/line", + "category-utility", "line" ], "point": [ diff --git a/data/presets/presets.json b/data/presets/presets.json index 814adcd7b..6b499878d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -571,7 +571,7 @@ "man_made/observatory": {"geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"}, "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"}, "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/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "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": ["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"}, @@ -697,6 +697,7 @@ "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"}, "point": {"fields": ["name"], "geometry": ["point"], "tags": {}, "name": "Point", "matchScore": 0.1}, "power/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false}, + "power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "name": "Underground Power Cable"}, "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"}, "power/generator/source_nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"}, "power/generator/source_wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "height", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"}, diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json index 192855517..d198ffc10 100644 --- a/data/presets/presets/man_made/pipeline.json +++ b/data/presets/presets/man_made/pipeline.json @@ -9,6 +9,13 @@ "geometry": [ "line" ], + "terms": [ + "oil", + "natural gas", + "water", + "sewer", + "sewage" + ], "tags": { "man_made": "pipeline" }, diff --git a/data/presets/presets/power/cable/underground.json b/data/presets/presets/power/cable/underground.json new file mode 100644 index 000000000..0d80be672 --- /dev/null +++ b/data/presets/presets/power/cable/underground.json @@ -0,0 +1,17 @@ +{ + "fields": [ + "name", + "operator", + "voltage", + "ref", + "layer" + ], + "geometry": [ + "line" + ], + "tags": { + "power": "cable", + "location": "underground" + }, + "name": "Underground Power Cable" +} diff --git a/data/taginfo.json b/data/taginfo.json index 299bcf6ee..fbd88f0eb 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -4669,6 +4669,12 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true" }, + { + "key": "location", + "value": "underground", + "description": "Underground Power Cable", + "object_types": ["way"] + }, { "key": "power", "value": "generator", diff --git a/dist/locales/en.json b/dist/locales/en.json index 431da2fe2..d8cb61df6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1455,6 +1455,9 @@ "category-route": { "name": "Route Features" }, + "category-utility": { + "name": "Utility Features" + }, "category-water-area": { "name": "Water Features" }, @@ -5446,7 +5449,7 @@ }, "man_made/pipeline": { "name": "Pipeline", - "terms": "" + "terms": "oil,natural gas,water,sewer,sewage" }, "man_made/pumping_station": { "name": "Pumping Station", @@ -5948,6 +5951,10 @@ "name": "Substation", "terms": "" }, + "power/cable/underground": { + "name": "Underground Power Cable", + "terms": "" + }, "power/generator": { "name": "Power Generator", "terms": "hydro,solar,turbine,wind" diff --git a/svg/iD-sprite/presets/category-utility.svg b/svg/iD-sprite/presets/category-utility.svg new file mode 100644 index 000000000..e819114fc --- /dev/null +++ b/svg/iD-sprite/presets/category-utility.svg @@ -0,0 +1,8 @@ + + + + + + + +