From e402862a6b67a83603df62ca8d978c2c182a3fc0 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 19 Mar 2019 12:56:27 -0400 Subject: [PATCH] Add Underground Pipeline preset Add "layer=-1" to "addTags" of Underground Power Cable preset --- data/presets.yaml | 5 ++++ data/presets/presets.json | 3 +- .../man_made/pipeline/underground.json | 28 +++++++++++++++++++ .../presets/power/cable/underground.json | 10 +++++++ data/taginfo.json | 2 +- dist/locales/en.json | 4 +++ 6 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 data/presets/presets/man_made/pipeline/underground.json diff --git a/data/presets.yaml b/data/presets.yaml index 4d32b4b3f..6cb3c0d2b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5023,6 +5023,11 @@ en: name: Pipeline # 'terms: oil,natural gas,water,sewer,sewage' terms: '' + man_made/pipeline/underground: + # 'man_made=pipeline, location=underground' + name: Underground Pipeline + # 'terms: oil,natural gas,water,sewer,sewage' + terms: '' man_made/pumping_station: # man_made=pumping_station name: Pumping Station diff --git a/data/presets/presets.json b/data/presets/presets.json index 687ac76ee..b5f1bfdda 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -637,6 +637,7 @@ "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "removeTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"}, "man_made/pier/floating": {"icon": "temaki-pedestrian", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "addTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "removeTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "name": "Floating Pier"}, "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/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "removeTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground 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"}, @@ -773,7 +774,7 @@ "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"}, "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "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/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "removeTags": {"power": "cable", "location": "underground", "layer": "-1"}, "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/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"}, "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"}, diff --git a/data/presets/presets/man_made/pipeline/underground.json b/data/presets/presets/man_made/pipeline/underground.json new file mode 100644 index 000000000..43c2a9981 --- /dev/null +++ b/data/presets/presets/man_made/pipeline/underground.json @@ -0,0 +1,28 @@ +{ + "icon": "iD-pipeline-line", + "geometry": [ + "line" + ], + "terms": [ + "oil", + "natural gas", + "water", + "sewer", + "sewage" + ], + "tags": { + "man_made": "pipeline", + "location": "underground" + }, + "addTags": { + "man_made": "pipeline", + "location": "underground", + "layer": "-1" + }, + "removeTags": { + "man_made": "pipeline", + "location": "underground", + "layer": "-1" + }, + "name": "Underground Pipeline" +} diff --git a/data/presets/presets/power/cable/underground.json b/data/presets/presets/power/cable/underground.json index 0d80be672..27b2ba4c6 100644 --- a/data/presets/presets/power/cable/underground.json +++ b/data/presets/presets/power/cable/underground.json @@ -13,5 +13,15 @@ "power": "cable", "location": "underground" }, + "addTags": { + "power": "cable", + "location": "underground", + "layer": "-1" + }, + "removeTags": { + "power": "cable", + "location": "underground", + "layer": "-1" + }, "name": "Underground Power Cable" } diff --git a/data/taginfo.json b/data/taginfo.json index cf0a48a78..d55ca7d81 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -617,6 +617,7 @@ {"key": "man_made", "value": "pier", "description": "🄿 Pier", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "floating", "value": "yes", "description": "🄿 Floating Pier", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "man_made", "value": "pipeline", "description": "🄿 Pipeline", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"}, + {"key": "location", "value": "underground", "description": "🄿 Underground Pipeline, 🄿 Underground Power Cable", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"}, {"key": "man_made", "value": "pumping_station", "description": "🄿 Pumping Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "man_made", "value": "silo", "description": "🄿 Silo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/silo.svg?sanitize=true"}, {"key": "man_made", "value": "storage_tank", "description": "🄿 Storage Tank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"}, @@ -749,7 +750,6 @@ {"key": "playground", "value": "swing", "description": "🄿 Swing", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/playground-15.svg?sanitize=true"}, {"key": "playground", "value": "zipwire", "description": "🄿 Zip Wire", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/playground-15.svg?sanitize=true"}, {"key": "power", "value": "sub_station", "description": "🄿 Substation (unsearchable)", "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", "description": "🄿 Power Generator", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"}, {"key": "generator:method", "value": "photovoltaic", "description": "🄿 Solar Panel", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-solar-panel.svg?sanitize=true"}, {"key": "generator:method", "value": "fission", "description": "🄿 Nuclear Reactor", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/radiation.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 913e7ec48..25bd33cf5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6486,6 +6486,10 @@ "name": "Pipeline", "terms": "oil,natural gas,water,sewer,sewage" }, + "man_made/pipeline/underground": { + "name": "Underground Pipeline", + "terms": "oil,natural gas,water,sewer,sewage" + }, "man_made/pumping_station": { "name": "Pumping Station", "terms": ""