From 82665a6883b6e21f61b141fa074cdee93b2af4c8 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 18 Dec 2016 21:27:34 -0500 Subject: [PATCH] Add preset for power=plant (closes #3661) This one was a little complicated because they are generally tagged along with landuse=industrial, and we want to make sure the power=plant is the tag used for matching. --- css/map.css | 9 +++-- data/presets.yaml | 5 +++ data/presets/presets.json | 40 ++++++++++++++++++-- data/presets/presets/landuse.json | 1 + data/presets/presets/landuse/industrial.json | 1 + data/presets/presets/power/line.json | 4 +- data/presets/presets/power/minor_line.json | 4 +- data/presets/presets/power/plant.json | 30 +++++++++++++++ data/taginfo.json | 4 ++ dist/locales/en.json | 4 ++ 10 files changed, 91 insertions(+), 11 deletions(-) create mode 100644 data/presets/presets/power/plant.json diff --git a/css/map.css b/css/map.css index 8e3f3290b..4724e5a90 100644 --- a/css/map.css +++ b/css/map.css @@ -296,14 +296,17 @@ path.fill.tag-landuse-commercial { background-color: rgba(214, 136, 26, 0.3); } -path.stroke.tag-landuse-industrial { +path.stroke.tag-landuse-industrial, +path.stroke.tag-power-plant { stroke: rgb(228, 164, 245); } -path.fill.tag-landuse-industrial { +path.fill.tag-landuse-industrial, +path.fill.tag-power-plant { stroke: rgba(228, 164, 245, 0.3); fill: rgba(228, 164, 245, 0.3); } -.preset-icon-fill-area.tag-landuse-industrial { +.preset-icon-fill-area.tag-landuse-industrial, +.preset-icon-fill-area.tag-power-plant { border-color: rgb(228, 164, 245); background-color: rgba(228, 164, 245, 0.3); } diff --git a/data/presets.yaml b/data/presets.yaml index 57230cc3d..bcc2c8cce 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3322,6 +3322,11 @@ en: # power=minor_line name: Minor Power Line terms: '' + power/plant: + # power=plant + name: Power Station Grounds + # 'terms: coal,gas,generat*,hydro,nuclear,power,station' + terms: '' power/pole: # power=pole name: Power Pole diff --git a/data/presets/presets.json b/data/presets/presets.json index 5100aec59..90182c2d8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -5784,6 +5784,7 @@ "tags": { "landuse": "*" }, + "matchScore": 0.9, "name": "Land Use" }, "landuse/farm": { @@ -5953,6 +5954,7 @@ "landuse": "industrial" }, "terms": [], + "matchScore": 0.9, "name": "Industrial Area" }, "landuse/landfill": { @@ -8338,24 +8340,54 @@ "name": "Power Generator" }, "power/line": { + "icon": "power-line", "geometry": [ "line" ], "tags": { "power": "line" }, - "name": "Power Line", - "icon": "power-line" + "name": "Power Line" }, "power/minor_line": { + "icon": "power-line", "geometry": [ "line" ], "tags": { "power": "minor_line" }, - "name": "Minor Power Line", - "icon": "power-line" + "name": "Minor Power Line" + }, + "power/plant": { + "icon": "industrial", + "fields": [ + "operator" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant" + }, + "addTags": { + "power": "plant", + "landuse": "industrial" + }, + "removeTags": { + "power": "plant", + "landuse": "industrial" + }, + "terms": [ + "coal", + "gas", + "generat*", + "hydro", + "nuclear", + "power", + "station" + ], + "name": "Power Station Grounds" }, "power/pole": { "geometry": [ diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json index da9868b4d..bb7e3f85e 100644 --- a/data/presets/presets/landuse.json +++ b/data/presets/presets/landuse.json @@ -8,5 +8,6 @@ "tags": { "landuse": "*" }, + "matchScore": 0.9, "name": "Land Use" } diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json index b92c3e507..11eadfceb 100644 --- a/data/presets/presets/landuse/industrial.json +++ b/data/presets/presets/landuse/industrial.json @@ -7,5 +7,6 @@ "landuse": "industrial" }, "terms": [], + "matchScore": 0.9, "name": "Industrial Area" } diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json index 710dd5950..c446480e0 100644 --- a/data/presets/presets/power/line.json +++ b/data/presets/presets/power/line.json @@ -1,10 +1,10 @@ { + "icon": "power-line", "geometry": [ "line" ], "tags": { "power": "line" }, - "name": "Power Line", - "icon": "power-line" + "name": "Power Line" } diff --git a/data/presets/presets/power/minor_line.json b/data/presets/presets/power/minor_line.json index 0a7bd2c02..9ca424a31 100644 --- a/data/presets/presets/power/minor_line.json +++ b/data/presets/presets/power/minor_line.json @@ -1,10 +1,10 @@ { + "icon": "power-line", "geometry": [ "line" ], "tags": { "power": "minor_line" }, - "name": "Minor Power Line", - "icon": "power-line" + "name": "Minor Power Line" } diff --git a/data/presets/presets/power/plant.json b/data/presets/presets/power/plant.json new file mode 100644 index 000000000..62d876407 --- /dev/null +++ b/data/presets/presets/power/plant.json @@ -0,0 +1,30 @@ +{ + "icon": "industrial", + "fields": [ + "operator" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant" + }, + "addTags": { + "power": "plant", + "landuse": "industrial" + }, + "removeTags": { + "power": "plant", + "landuse": "industrial" + }, + "terms": [ + "coal", + "gas", + "generat*", + "hydro", + "nuclear", + "power", + "station" + ], + "name": "Power Station Grounds" +} diff --git a/data/taginfo.json b/data/taginfo.json index f99b5ed14..676b368c6 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1899,6 +1899,10 @@ "key": "power", "value": "minor_line" }, + { + "key": "power", + "value": "plant" + }, { "key": "power", "value": "pole" diff --git a/dist/locales/en.json b/dist/locales/en.json index 6566d6891..40322b142 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3626,6 +3626,10 @@ "name": "Minor Power Line", "terms": "" }, + "power/plant": { + "name": "Power Station Grounds", + "terms": "coal,gas,generat*,hydro,nuclear,power,station" + }, "power/pole": { "name": "Power Pole", "terms": ""