From a7955bc3f952c79488807b203497a82a3eef02b5 Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Mon, 4 Feb 2019 21:14:17 -0800 Subject: [PATCH 01/10] Presets for golf paths and cartpaths --- data/presets/categories.json | 12 +++++++++- .../categories/{golf.json => golf-area.json} | 0 data/presets/categories/golf-line.json | 10 ++++++++ data/presets/presets/golf/cartpath.json | 24 +++++++++++++++++++ data/presets/presets/golf/hole.json | 4 ++++ data/presets/presets/golf/path.json | 23 ++++++++++++++++++ data/taginfo.json | 2 ++ 7 files changed, 74 insertions(+), 1 deletion(-) rename data/presets/categories/{golf.json => golf-area.json} (100%) create mode 100644 data/presets/categories/golf-line.json create mode 100644 data/presets/presets/golf/cartpath.json create mode 100644 data/presets/presets/golf/path.json diff --git a/data/presets/categories.json b/data/presets/categories.json index c1a7c16a0..341bfdd03 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -29,7 +29,7 @@ "building/residential" ] }, - "category-golf": { + "category-golf-area": { "icon": "maki-golf", "geometry": "area", "name": "Golf Features", @@ -43,6 +43,16 @@ "golf/water_hazard_area" ] }, + "category-golf-line": { + "icon": "maki-golf", + "geometry": "line", + "name": "Golf Features", + "members": [ + "golf/hole", + "golf/cartpath", + "golf/path" + ] + }, "category-landuse": { "icon": "maki-landuse", "geometry": "area", diff --git a/data/presets/categories/golf.json b/data/presets/categories/golf-area.json similarity index 100% rename from data/presets/categories/golf.json rename to data/presets/categories/golf-area.json diff --git a/data/presets/categories/golf-line.json b/data/presets/categories/golf-line.json new file mode 100644 index 000000000..47c6774ce --- /dev/null +++ b/data/presets/categories/golf-line.json @@ -0,0 +1,10 @@ +{ + "icon": "maki-golf", + "geometry": "line", + "name": "Golf Features", + "members": [ + "golf/hole", + "golf/cartpath", + "golf/path" + ] +} diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json new file mode 100644 index 000000000..edcc8220a --- /dev/null +++ b/data/presets/presets/golf/cartpath.json @@ -0,0 +1,24 @@ +{ + "icon": "maki-golf", + "fields": [ + "name", + "surface", + "width", + "structure", + "access", + "incline" + ], + "geometry": [ + "line" + ], + "tags": { + "golf": "cartpath", + "highway:": "path", + "golf_cart:": "designated" + }, + "reference": { + "key": "golf", + "value": "cartpath" + }, + "name": "Golf Cartpath" +} diff --git a/data/presets/presets/golf/hole.json b/data/presets/presets/golf/hole.json index 8a5fcd06f..af19c8c99 100644 --- a/data/presets/presets/golf/hole.json +++ b/data/presets/presets/golf/hole.json @@ -12,5 +12,9 @@ "tags": { "golf": "hole" }, + "reference": { + "key": "golf", + "value": "hole" + }, "name": "Golf Hole" } diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json new file mode 100644 index 000000000..84bb13b86 --- /dev/null +++ b/data/presets/presets/golf/path.json @@ -0,0 +1,23 @@ +{ + "icon": "maki-golf", + "fields": [ + "name", + "surface", + "width", + "structure", + "access", + "incline" + ], + "geometry": [ + "line" + ], + "tags": { + "golf": "path", + "highway": "footway" + }, + "reference": { + "key": "golf", + "value": "path" + }, + "name": "Golf Walking Path" +} diff --git a/data/taginfo.json b/data/taginfo.json index f067418ac..5daaabf47 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -378,6 +378,8 @@ {"key": "landuse", "value": "grass", "description": "🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, + {"key": "golf", "value": "cartpath", "description": "🄿 Golf CartPath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, + {"key": "golf", "value": "path", "description": "🄿 Golf Walking Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "natural", "value": "water", "description": "🄿 Lateral Water Hazard, 🄿 Water Hazard, 🄿 Water", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "lateral_water_hazard", "description": "🄿 Lateral Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "water_hazard", "description": "🄿 Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, From d3afa9449e456fe746699519fedf913c82d8643e Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Mon, 4 Feb 2019 22:29:06 -0800 Subject: [PATCH 02/10] Add driving range preset --- data/presets/categories.json | 3 ++- data/presets/categories/golf-area.json | 3 ++- data/presets/presets/golf/driving_range.json | 18 ++++++++++++++++++ data/taginfo.json | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 data/presets/presets/golf/driving_range.json diff --git a/data/presets/categories.json b/data/presets/categories.json index 341bfdd03..658594ba9 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -40,7 +40,8 @@ "golf/rough", "golf/bunker", "golf/tee", - "golf/water_hazard_area" + "golf/water_hazard_area", + "golf/driving_range" ] }, "category-golf-line": { diff --git a/data/presets/categories/golf-area.json b/data/presets/categories/golf-area.json index 0416577f8..eb00ffcd8 100644 --- a/data/presets/categories/golf-area.json +++ b/data/presets/categories/golf-area.json @@ -9,6 +9,7 @@ "golf/rough", "golf/bunker", "golf/tee", - "golf/water_hazard_area" + "golf/water_hazard_area", + "golf/driving_range" ] } diff --git a/data/presets/presets/golf/driving_range.json b/data/presets/presets/golf/driving_range.json new file mode 100644 index 000000000..6a7cb955b --- /dev/null +++ b/data/presets/presets/golf/driving_range.json @@ -0,0 +1,18 @@ +{ + "icon": "maki-golf", + "fields": [ + "name" + ], + "geometry": [ + "area" + ], + "tags": { + "golf": "driving_range", + "landuse": "grass" + }, + "reference": { + "key": "golf", + "value": "driving_range" + }, + "name": "Driving Range" +} diff --git a/data/taginfo.json b/data/taginfo.json index 5daaabf47..97ca00b42 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -375,7 +375,7 @@ {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"}, {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"]}, {"key": "natural", "value": "sand", "description": "🄿 Sand Trap, 🄿 Sand", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, - {"key": "landuse", "value": "grass", "description": "🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, + {"key": "landuse", "value": "grass", "description": "🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Driving Range, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "cartpath", "description": "🄿 Golf CartPath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, From 0bc5c13b88376ffb13cfc5e2b942fe3faa36c142 Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Tue, 5 Feb 2019 09:14:07 -0800 Subject: [PATCH 03/10] Cleanup according to comments --- data/presets/presets/golf/cartpath.json | 4 ++-- data/presets/presets/golf/hole.json | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json index edcc8220a..2c76efff3 100644 --- a/data/presets/presets/golf/cartpath.json +++ b/data/presets/presets/golf/cartpath.json @@ -13,8 +13,8 @@ ], "tags": { "golf": "cartpath", - "highway:": "path", - "golf_cart:": "designated" + "highway": "path", + "golf_cart": "designated" }, "reference": { "key": "golf", diff --git a/data/presets/presets/golf/hole.json b/data/presets/presets/golf/hole.json index af19c8c99..8a5fcd06f 100644 --- a/data/presets/presets/golf/hole.json +++ b/data/presets/presets/golf/hole.json @@ -12,9 +12,5 @@ "tags": { "golf": "hole" }, - "reference": { - "key": "golf", - "value": "hole" - }, "name": "Golf Hole" } From c34f010e056f058bc396075ecfcb34307b2b55d2 Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Tue, 5 Feb 2019 10:44:20 -0800 Subject: [PATCH 04/10] Remove golf tags --- data/presets/presets/golf/cartpath.json | 6 +++--- data/presets/presets/golf/path.json | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json index 2c76efff3..889fe5697 100644 --- a/data/presets/presets/golf/cartpath.json +++ b/data/presets/presets/golf/cartpath.json @@ -12,13 +12,13 @@ "line" ], "tags": { - "golf": "cartpath", "highway": "path", + "path": "golf", "golf_cart": "designated" }, "reference": { - "key": "golf", - "value": "cartpath" + "key": "path", + "value": "golf" }, "name": "Golf Cartpath" } diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json index 84bb13b86..f795930ec 100644 --- a/data/presets/presets/golf/path.json +++ b/data/presets/presets/golf/path.json @@ -12,12 +12,12 @@ "line" ], "tags": { - "golf": "path", - "highway": "footway" + "highway": "footway", + "footway": "golf" }, "reference": { - "key": "golf", - "value": "path" + "key": "footway", + "value": "golf" }, "name": "Golf Walking Path" } From 25cc522333b4025149010ba98c600a457b55987a Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Tue, 5 Feb 2019 22:20:16 -0800 Subject: [PATCH 05/10] Update to avoid connectivity errors --- data/presets/presets/golf/cartpath.json | 7 +++---- data/presets/presets/golf/path.json | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json index 889fe5697..323a8ec24 100644 --- a/data/presets/presets/golf/cartpath.json +++ b/data/presets/presets/golf/cartpath.json @@ -12,13 +12,12 @@ "line" ], "tags": { - "highway": "path", - "path": "golf", + "golf": "cartpath", "golf_cart": "designated" }, "reference": { - "key": "path", - "value": "golf" + "key": "golf", + "value": "cartpath" }, "name": "Golf Cartpath" } diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json index f795930ec..7c6b5c9a3 100644 --- a/data/presets/presets/golf/path.json +++ b/data/presets/presets/golf/path.json @@ -12,12 +12,12 @@ "line" ], "tags": { - "highway": "footway", - "footway": "golf" + "golf": "path", + "foot": "designated" }, "reference": { - "key": "footway", - "value": "golf" + "key": "golf", + "value": "path" }, "name": "Golf Walking Path" } From 31a5264c37a47baf23f9ce190b3670236b7ca90b Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Tue, 5 Feb 2019 22:55:38 -0800 Subject: [PATCH 06/10] Add Golf Cartpath Multipurpose --- data/presets/categories.json | 1 + data/presets/categories/golf-line.json | 1 + .../presets/golf/cartpath_multipurpose.json | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 data/presets/presets/golf/cartpath_multipurpose.json diff --git a/data/presets/categories.json b/data/presets/categories.json index 658594ba9..cfead76e5 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -51,6 +51,7 @@ "members": [ "golf/hole", "golf/cartpath", + "golf/cartpath_multipurpose", "golf/path" ] }, diff --git a/data/presets/categories/golf-line.json b/data/presets/categories/golf-line.json index 47c6774ce..dc7623c84 100644 --- a/data/presets/categories/golf-line.json +++ b/data/presets/categories/golf-line.json @@ -5,6 +5,7 @@ "members": [ "golf/hole", "golf/cartpath", + "golf/cartpath_multipurpose", "golf/path" ] } diff --git a/data/presets/presets/golf/cartpath_multipurpose.json b/data/presets/presets/golf/cartpath_multipurpose.json new file mode 100644 index 000000000..204c06a57 --- /dev/null +++ b/data/presets/presets/golf/cartpath_multipurpose.json @@ -0,0 +1,24 @@ +{ + "icon": "maki-golf", + "fields": [ + "name", + "surface", + "width", + "structure", + "access", + "incline" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "track", + "golf": "cartpath", + "golf_cart": "designated" + }, + "reference": { + "key": "golf", + "value": "cartpath" + }, + "name": "Golf Cartpath Multipurpose" +} From a702281fb6e7e9bb59b19c043fda02bd1b0841ed Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 6 Feb 2019 15:56:12 -0500 Subject: [PATCH 07/10] Add "remove" tooltip to raw tag editor remove button --- modules/ui/raw_tag_editor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js index 6e3cac6e5..50b37de57 100644 --- a/modules/ui/raw_tag_editor.js +++ b/modules/ui/raw_tag_editor.js @@ -145,6 +145,7 @@ export function uiRawTagEditor(context) { .append('button') .attr('tabindex', -1) .attr('class', 'form-field-button remove') + .attr('title', t('icons.remove')) .call(svgIcon('#iD-operation-delete')); From 90115b55cac9f8df67bbaffe07d497b81b33bc8d Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Wed, 6 Feb 2019 14:31:11 -0800 Subject: [PATCH 08/10] Update track to service --- data/presets/presets/golf/cartpath_multipurpose.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets/golf/cartpath_multipurpose.json b/data/presets/presets/golf/cartpath_multipurpose.json index 204c06a57..cabc31cb5 100644 --- a/data/presets/presets/golf/cartpath_multipurpose.json +++ b/data/presets/presets/golf/cartpath_multipurpose.json @@ -12,7 +12,7 @@ "line" ], "tags": { - "highway": "track", + "highway": "service", "golf": "cartpath", "golf_cart": "designated" }, From ce3b33e374d5f1ff27bfff3554ffdedc2ec5c98d Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 6 Feb 2019 21:56:22 -0500 Subject: [PATCH 09/10] Add style for golf walking paths and cartpaths Also - use field inheritance to simplify presets - rename multipurpose to "Golf Cartpath / Service Road" (I think users would understand this better) - add `maxspeed` to "Golf Cartpath / Service Road" --- css/30_highways.css | 2 +- css/50_misc.css | 61 ++++++++++++++----- data/presets.yaml | 20 +++++- data/presets/categories.json | 2 +- data/presets/categories/golf-line.json | 2 +- data/presets/presets.json | 4 ++ data/presets/presets/golf/cartpath.json | 7 +-- ...ultipurpose.json => cartpath_service.json} | 10 +-- data/presets/presets/golf/driving_range.json | 3 +- data/presets/presets/golf/path.json | 1 - data/taginfo.json | 7 +-- dist/locales/en.json | 21 ++++++- modules/svg/tag_classes.js | 2 +- 13 files changed, 102 insertions(+), 40 deletions(-) rename data/presets/presets/golf/{cartpath_multipurpose.json => cartpath_service.json} (65%) diff --git a/css/30_highways.css b/css/30_highways.css index 931533625..d1f2e90c4 100644 --- a/css/30_highways.css +++ b/css/30_highways.css @@ -458,7 +458,7 @@ path.line.casing.tag-service { } /* special service roads and bus guideways */ -/* with `service=* tag` (e.g. parking_aisle, alley, drive-through */ +/* with `service=* tag` (e.g. parking_aisle, alley, drive-through) */ .preset-icon .icon.iD-highway-bus_guideway, .preset-icon .icon.iD-highway-service.tag-service { color: #dca; diff --git a/css/50_misc.css b/css/50_misc.css index 265d641bb..fe454adab 100644 --- a/css/50_misc.css +++ b/css/50_misc.css @@ -3,6 +3,7 @@ path.line.shadow.tag-aerialway, path.line.shadow.tag-attraction-summer_toboggan, path.line.shadow.tag-attraction-water_slide, +path.line.shadow.tag-golf-cartpath, path.line.shadow.tag-man_made-pipeline, path.line.shadow.tag-natural-tree_row, path.line.shadow.tag-piste { @@ -11,6 +12,7 @@ path.line.shadow.tag-piste { path.line.casing.tag-aerialway, path.line.casing.tag-attraction-summer_toboggan, path.line.casing.tag-attraction-water_slide, +path.line.casing.tag-golf-cartpath, path.line.casing.tag-man_made-pipeline, path.line.casing.tag-natural-tree_row, path.line.casing.tag-piste { @@ -19,6 +21,7 @@ path.line.casing.tag-piste { path.line.stroke.tag-aerialway, path.line.stroke.tag-attraction-summer_toboggan, path.line.stroke.tag-attraction-water_slide, +path.line.stroke.tag-golf-cartpath, path.line.stroke.tag-man_made-pipeline, path.line.stroke.tag-natural-tree_row, path.line.stroke.tag-piste { @@ -28,6 +31,7 @@ path.line.stroke.tag-piste { .low-zoom path.line.shadow.tag-aerialway, .low-zoom path.line.shadow.tag-attraction-summer_toboggan, .low-zoom path.line.shadow.tag-attraction-water_slide, +.low-zoom path.line.shadow.tag-golf-cartpath, .low-zoom path.line.shadow.tag-man_made-pipeline, .low-zoom path.line.shadow.tag-natural-tree_row, .low-zoom path.line.shadow.tag-piste { @@ -36,6 +40,7 @@ path.line.stroke.tag-piste { .low-zoom path.line.casing.tag-aerialway, .low-zoom path.line.casing.tag-attraction-summer_toboggan, .low-zoom path.line.casing.tag-attraction-water_slide, +.low-zoom path.line.casing.tag-golf-cartpath, .low-zoom path.line.casing.tag-man_made-pipeline, .low-zoom path.line.casing.tag-natural-tree_row, .low-zoom path.line.casing.tag-piste { @@ -44,6 +49,7 @@ path.line.stroke.tag-piste { .low-zoom path.line.stroke.tag-aerialway, .low-zoom path.line.stroke.tag-attraction-summer_toboggan, .low-zoom path.line.stroke.tag-attraction-water_slide, +.low-zoom path.line.stroke.tag-golf-cartpath, .low-zoom path.line.stroke.tag-man_made-pipeline, .low-zoom path.line.stroke.tag-natural-tree_row, .low-zoom path.line.stroke.tag-piste { @@ -84,6 +90,7 @@ path.line.casing.tag-aerialway { stroke: #444; } + /* pistes */ path.line.stroke.tag-piste { stroke: #9ac; @@ -92,6 +99,36 @@ path.line.casing.tag-piste { stroke: #444; } + +/* Attractions */ +path.line.stroke.tag-attraction-summer_toboggan { + stroke: #9e9e9e; +} +path.line.casing.tag-attraction-summer_toboggan { + stroke: #666; +} + +path.line.stroke.tag-attraction-water_slide { + stroke: #aae0cb; +} +path.line.casing.tag-attraction-water_slide { + stroke: #3d6c71; +} + + +/* golf cartpaths (like service roads) */ +.preset-icon .icon.tag-golf-cartpath { + color: #dca; + fill: #666; +} +path.line.stroke.tag-golf-cartpath { + stroke: #dca; +} +path.line.casing.tag-golf-cartpath { + stroke: #666; +} + + /* power and pipeline */ .preset-icon .icon.tag-man_made-pipeline, .preset-icon .icon.tag-power { @@ -362,6 +399,7 @@ path.fill.tag-building { /* "Special" paths - platforms, piers, crossings */ +.preset-icon .icon.tag-golf-path, .preset-icon .icon.tag-public_transport-platform, .preset-icon .icon.tag-railway-platform, .preset-icon .icon.tag-man_made-pier, @@ -371,6 +409,7 @@ path.fill.tag-building { fill: #dca; } +.preset-icon-fill-area.tag-golf-path, .preset-icon-fill-area.tag-public_transport-platform, .preset-icon-fill-area.tag-railway-platform, .preset-icon-fill-area.tag-man_made-pier, @@ -380,6 +419,7 @@ path.fill.tag-building { background-color: #dca; } +path.line.shadow.tag-golf-path, path.line.shadow.tag-public_transport-platform, path.line.shadow.tag-railway-platform, path.line.shadow.tag-man_made-pier, @@ -387,6 +427,7 @@ path.line.shadow.tag-footway.tag-footway-crossing, path.line.shadow.tag-crossing { stroke-width: 16; } +path.line.casing.tag-golf-path, path.line.casing.tag-public_transport-platform, path.line.casing.tag-railway-platform, path.line.casing.tag-man_made-pier, @@ -397,6 +438,7 @@ path.line.casing.tag-crossing { stroke-linecap: round; stroke-dasharray: none; } +path.line.stroke.tag-golf-path, path.line.stroke.tag-public_transport-platform, path.line.stroke.tag-railway-platform, path.line.stroke.tag-man_made-pier, @@ -408,6 +450,7 @@ path.line.stroke.tag-crossing { stroke-dasharray: 6, 6; } +.low-zoom path.line.shadow.tag-golf-path, .low-zoom path.line.shadow.tag-public_transport-platform, .low-zoom path.line.shadow.tag-railway-platform, .low-zoom path.line.shadow.tag-man_made-pier, @@ -415,6 +458,7 @@ path.line.stroke.tag-crossing { .low-zoom path.line.shadow.tag-crossing { stroke-width: 12; } +.low-zoom path.line.casing.tag-golf-path, .low-zoom path.line.casing.tag-public_transport-platform, .low-zoom path.line.casing.tag-railway-platform, .low-zoom path.line.casing.tag-man_made-pier, @@ -422,6 +466,7 @@ path.line.stroke.tag-crossing { .low-zoom path.line.casing.tag-crossing { stroke-width: 3; } +.low-zoom path.line.stroke.tag-golf-path, .low-zoom path.line.stroke.tag-public_transport-platform, .low-zoom path.line.stroke.tag-railway-platform, .low-zoom path.line.stroke.tag-man_made-pier, @@ -432,6 +477,7 @@ path.line.stroke.tag-crossing { stroke-dasharray: 3, 3; } +g.midpoint.tag-golf-path .fill, g.midpoint.tag-public_transport-platform .fill, g.midpoint.tag-railway-platform .fill, g.midpoint.tag-man_made-pier .fill, @@ -462,18 +508,3 @@ path.line.stroke.tag-crossing.tag-crossing-zebra { .low-zoom path.line.stroke.tag-crossing.tag-crossing-zebra { stroke-dasharray: 3, 2; } - -/* Attractions */ -path.line.stroke.tag-attraction-summer_toboggan { - stroke: #9e9e9e; -} -path.line.casing.tag-attraction-summer_toboggan { - stroke: #666; -} - -path.line.stroke.tag-attraction-water_slide { - stroke: #aae0cb; -} -path.line.casing.tag-attraction-water_slide { - stroke: #3d6c71; -} diff --git a/data/presets.yaml b/data/presets.yaml index 312d2fa88..032041999 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5,7 +5,9 @@ en: name: Barrier Features category-building: name: Building Features - category-golf: + category-golf-area: + name: Golf Features + category-golf-line: name: Golf Features category-landuse: name: Land Use Features @@ -3780,6 +3782,18 @@ en: name: Sand Trap # 'terms: hazard,bunker' terms: '' + golf/cartpath: + # 'golf=cartpath, golf_cart=designated' + name: Golf Cartpath + terms: '' + golf/cartpath_service: + # 'highway=service, golf=cartpath, golf_cart=designated' + name: Golf Cartpath / Service Road + terms: '' + golf/driving_range: + # 'golf=driving_range, landuse=grass' + name: Driving Range + terms: '' golf/fairway: # 'golf=fairway, landuse=grass' name: Fairway @@ -3800,6 +3814,10 @@ en: # golf=lateral_water_hazard name: Lateral Water Hazard terms: '' + golf/path: + # 'golf=path, foot=designated' + name: Golf Walking Path + terms: '' golf/rough: # 'golf=rough, landuse=grass' name: Rough diff --git a/data/presets/categories.json b/data/presets/categories.json index cfead76e5..6f8a7230a 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -51,7 +51,7 @@ "members": [ "golf/hole", "golf/cartpath", - "golf/cartpath_multipurpose", + "golf/cartpath_service", "golf/path" ] }, diff --git a/data/presets/categories/golf-line.json b/data/presets/categories/golf-line.json index dc7623c84..f108f968d 100644 --- a/data/presets/categories/golf-line.json +++ b/data/presets/categories/golf-line.json @@ -5,7 +5,7 @@ "members": [ "golf/hole", "golf/cartpath", - "golf/cartpath_multipurpose", + "golf/cartpath_service", "golf/path" ] } diff --git a/data/presets/presets.json b/data/presets/presets.json index 7b5f723e2..3c03ab32a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -375,11 +375,15 @@ "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"}, "ford": {"geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"}, "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "reference": {"key": "golf", "value": "bunker"}, "name": "Sand Trap"}, + "golf/cartpath_service": {"icon": "maki-golf", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"highway": "service", "golf": "cartpath", "golf_cart": "designated"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath / Service Road"}, + "golf/cartpath": {"icon": "maki-golf", "fields": ["{golf/path}"], "geometry": ["line"], "tags": {"golf": "cartpath", "golf_cart": "designated"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath"}, + "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range", "landuse": "grass"}, "reference": {"key": "golf", "value": "driving_range"}, "name": "Driving Range"}, "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway", "landuse": "grass"}, "reference": {"key": "golf", "value": "fairway"}, "name": "Fairway"}, "golf/green": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green", "landuse": "grass", "leisure": "pitch", "sport": "golf"}, "reference": {"key": "golf", "value": "green"}, "name": "Putting Green"}, "golf/hole": {"icon": "maki-golf", "fields": ["name", "ref_golf_hole", "par", "handicap"], "geometry": ["line"], "tags": {"golf": "hole"}, "name": "Golf Hole"}, "golf/lateral_water_hazard_area": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "lateral_water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "lateral_water_hazard"}, "name": "Lateral Water Hazard"}, "golf/lateral_water_hazard_line": {"icon": "maki-golf", "fields": ["name"], "geometry": ["line"], "tags": {"golf": "lateral_water_hazard"}, "name": "Lateral Water Hazard"}, + "golf/path": {"icon": "maki-golf", "fields": ["name", "surface", "width", "structure", "incline"], "geometry": ["line"], "tags": {"golf": "path", "foot": "designated"}, "reference": {"key": "golf", "value": "path"}, "name": "Golf Walking Path"}, "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough", "landuse": "grass"}, "reference": {"key": "golf", "value": "rough"}, "name": "Rough"}, "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "reference": {"key": "golf", "value": "tee"}, "name": "Tee Box"}, "golf/water_hazard_area": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"}, diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json index 323a8ec24..45e5892c9 100644 --- a/data/presets/presets/golf/cartpath.json +++ b/data/presets/presets/golf/cartpath.json @@ -1,12 +1,7 @@ { "icon": "maki-golf", "fields": [ - "name", - "surface", - "width", - "structure", - "access", - "incline" + "{golf/path}" ], "geometry": [ "line" diff --git a/data/presets/presets/golf/cartpath_multipurpose.json b/data/presets/presets/golf/cartpath_service.json similarity index 65% rename from data/presets/presets/golf/cartpath_multipurpose.json rename to data/presets/presets/golf/cartpath_service.json index cabc31cb5..ff3d463b1 100644 --- a/data/presets/presets/golf/cartpath_multipurpose.json +++ b/data/presets/presets/golf/cartpath_service.json @@ -1,12 +1,8 @@ { "icon": "maki-golf", "fields": [ - "name", - "surface", - "width", - "structure", - "access", - "incline" + "{golf/path}", + "maxspeed" ], "geometry": [ "line" @@ -20,5 +16,5 @@ "key": "golf", "value": "cartpath" }, - "name": "Golf Cartpath Multipurpose" + "name": "Golf Cartpath / Service Road" } diff --git a/data/presets/presets/golf/driving_range.json b/data/presets/presets/golf/driving_range.json index 6a7cb955b..4db26eada 100644 --- a/data/presets/presets/golf/driving_range.json +++ b/data/presets/presets/golf/driving_range.json @@ -1,7 +1,8 @@ { "icon": "maki-golf", "fields": [ - "name" + "name", + "capacity" ], "geometry": [ "area" diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json index 7c6b5c9a3..8f4941788 100644 --- a/data/presets/presets/golf/path.json +++ b/data/presets/presets/golf/path.json @@ -5,7 +5,6 @@ "surface", "width", "structure", - "access", "incline" ], "geometry": [ diff --git a/data/taginfo.json b/data/taginfo.json index ad4cbd770..c85088808 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -375,13 +375,13 @@ {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"}, {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"]}, {"key": "natural", "value": "sand", "description": "🄿 Sand Trap, 🄿 Sand", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, - {"key": "landuse", "value": "grass", "description": "🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Driving Range, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, + {"key": "golf_cart", "value": "designated", "description": "🄿 Golf Cartpath / Service Road, 🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, + {"key": "landuse", "value": "grass", "description": "🄿 Driving Range, 🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, - {"key": "golf", "value": "cartpath", "description": "🄿 Golf CartPath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, - {"key": "golf", "value": "path", "description": "🄿 Golf Walking Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "natural", "value": "water", "description": "🄿 Lateral Water Hazard, 🄿 Water Hazard, 🄿 Water", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "lateral_water_hazard", "description": "🄿 Lateral Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, + {"key": "foot", "value": "designated", "description": "🄿 Golf Walking Path, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "water_hazard", "description": "🄿 Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "healthcare", "description": "🄿 Healthcare Facility, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"}, {"key": "healthcare", "value": "alternative", "description": "🄿 Alternative Medicine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"}, @@ -1037,7 +1037,6 @@ {"key": "foot", "value": "no", "description": "🄵 Allowed Access"}, {"key": "foot", "value": "permissive", "description": "🄵 Allowed Access"}, {"key": "foot", "value": "private", "description": "🄵 Allowed Access"}, - {"key": "foot", "value": "designated", "description": "🄵 Allowed Access"}, {"key": "foot", "value": "destination", "description": "🄵 Allowed Access"}, {"key": "foot", "value": "dismount", "description": "🄵 Allowed Access"}, {"key": "foot", "value": "permit", "description": "🄵 Allowed Access"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 1f3f0488c..de0f1d772 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1833,7 +1833,10 @@ "category-building": { "name": "Building Features" }, - "category-golf": { + "category-golf-area": { + "name": "Golf Features" + }, + "category-golf-line": { "name": "Golf Features" }, "category-landuse": { @@ -5146,6 +5149,18 @@ "name": "Sand Trap", "terms": "hazard,bunker" }, + "golf/cartpath_service": { + "name": "Golf Cartpath / Service Road", + "terms": "" + }, + "golf/cartpath": { + "name": "Golf Cartpath", + "terms": "" + }, + "golf/driving_range": { + "name": "Driving Range", + "terms": "" + }, "golf/fairway": { "name": "Fairway", "terms": "" @@ -5166,6 +5181,10 @@ "name": "Lateral Water Hazard", "terms": "" }, + "golf/path": { + "name": "Golf Walking Path", + "terms": "" + }, "golf/rough": { "name": "Rough", "terms": "" diff --git a/modules/svg/tag_classes.js b/modules/svg/tag_classes.js index 0e0a08479..9d3b4a158 100644 --- a/modules/svg/tag_classes.js +++ b/modules/svg/tag_classes.js @@ -15,7 +15,7 @@ export function svgTagClasses() { var secondaries = [ 'oneway', 'bridge', 'tunnel', 'embankment', 'cutting', 'barrier', 'surface', 'tracktype', 'footway', 'crossing', 'service', 'sport', - 'public_transport', 'location', 'parking' + 'public_transport', 'location', 'parking', 'golf' ]; var _tags = function(entity) { return entity.tags; }; From 043b827cc73d63fda2ab4b27029dc923574babbe Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 6 Feb 2019 22:07:07 -0500 Subject: [PATCH 10/10] Remove linear water_hazard and lateral_water_hazard presets From reviewing wiki, these seem like not a thing - they are always areas. re: https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dgolf_course --- data/presets.yaml | 12 ++---------- data/presets/categories.json | 4 ++-- data/presets/categories/golf-area.json | 4 ++-- data/presets/presets.json | 6 ++---- ...r_hazard_area.json => lateral_water_hazard.json} | 0 .../presets/golf/lateral_water_hazard_line.json | 13 ------------- .../{water_hazard_area.json => water_hazard.json} | 0 data/presets/presets/golf/water_hazard_line.json | 13 ------------- data/taginfo.json | 2 -- dist/locales/en.json | 12 ++---------- 10 files changed, 10 insertions(+), 56 deletions(-) rename data/presets/presets/golf/{lateral_water_hazard_area.json => lateral_water_hazard.json} (100%) delete mode 100644 data/presets/presets/golf/lateral_water_hazard_line.json rename data/presets/presets/golf/{water_hazard_area.json => water_hazard.json} (100%) delete mode 100644 data/presets/presets/golf/water_hazard_line.json diff --git a/data/presets.yaml b/data/presets.yaml index 032041999..c41f314c4 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3806,14 +3806,10 @@ en: # golf=hole name: Golf Hole terms: '' - golf/lateral_water_hazard_area: + golf/lateral_water_hazard: # 'golf=lateral_water_hazard, natural=water' name: Lateral Water Hazard terms: '' - golf/lateral_water_hazard_line: - # golf=lateral_water_hazard - name: Lateral Water Hazard - terms: '' golf/path: # 'golf=path, foot=designated' name: Golf Walking Path @@ -3827,14 +3823,10 @@ en: name: Tee Box # 'terms: teeing ground' terms: '' - golf/water_hazard_area: + golf/water_hazard: # 'golf=water_hazard, natural=water' name: Water Hazard terms: '' - golf/water_hazard_line: - # golf=water_hazard - name: Water Hazard - terms: '' healthcare: # healthcare=* name: Healthcare Facility diff --git a/data/presets/categories.json b/data/presets/categories.json index 6f8a7230a..b4343a4a2 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -36,11 +36,11 @@ "members": [ "golf/fairway", "golf/green", - "golf/lateral_water_hazard_area", + "golf/lateral_water_hazard", "golf/rough", "golf/bunker", "golf/tee", - "golf/water_hazard_area", + "golf/water_hazard", "golf/driving_range" ] }, diff --git a/data/presets/categories/golf-area.json b/data/presets/categories/golf-area.json index eb00ffcd8..4e43047b9 100644 --- a/data/presets/categories/golf-area.json +++ b/data/presets/categories/golf-area.json @@ -5,11 +5,11 @@ "members": [ "golf/fairway", "golf/green", - "golf/lateral_water_hazard_area", + "golf/lateral_water_hazard", "golf/rough", "golf/bunker", "golf/tee", - "golf/water_hazard_area", + "golf/water_hazard", "golf/driving_range" ] } diff --git a/data/presets/presets.json b/data/presets/presets.json index 3c03ab32a..7c629c849 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -381,13 +381,11 @@ "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway", "landuse": "grass"}, "reference": {"key": "golf", "value": "fairway"}, "name": "Fairway"}, "golf/green": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green", "landuse": "grass", "leisure": "pitch", "sport": "golf"}, "reference": {"key": "golf", "value": "green"}, "name": "Putting Green"}, "golf/hole": {"icon": "maki-golf", "fields": ["name", "ref_golf_hole", "par", "handicap"], "geometry": ["line"], "tags": {"golf": "hole"}, "name": "Golf Hole"}, - "golf/lateral_water_hazard_area": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "lateral_water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "lateral_water_hazard"}, "name": "Lateral Water Hazard"}, - "golf/lateral_water_hazard_line": {"icon": "maki-golf", "fields": ["name"], "geometry": ["line"], "tags": {"golf": "lateral_water_hazard"}, "name": "Lateral Water Hazard"}, + "golf/lateral_water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "lateral_water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "lateral_water_hazard"}, "name": "Lateral Water Hazard"}, "golf/path": {"icon": "maki-golf", "fields": ["name", "surface", "width", "structure", "incline"], "geometry": ["line"], "tags": {"golf": "path", "foot": "designated"}, "reference": {"key": "golf", "value": "path"}, "name": "Golf Walking Path"}, "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough", "landuse": "grass"}, "reference": {"key": "golf", "value": "rough"}, "name": "Rough"}, "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "reference": {"key": "golf", "value": "tee"}, "name": "Tee Box"}, - "golf/water_hazard_area": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"}, - "golf/water_hazard_line": {"icon": "maki-golf", "fields": ["name"], "geometry": ["line"], "tags": {"golf": "water_hazard"}, "name": "Water Hazard"}, + "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"}, "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"}, "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"}, "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"}, diff --git a/data/presets/presets/golf/lateral_water_hazard_area.json b/data/presets/presets/golf/lateral_water_hazard.json similarity index 100% rename from data/presets/presets/golf/lateral_water_hazard_area.json rename to data/presets/presets/golf/lateral_water_hazard.json diff --git a/data/presets/presets/golf/lateral_water_hazard_line.json b/data/presets/presets/golf/lateral_water_hazard_line.json deleted file mode 100644 index ea9617b8a..000000000 --- a/data/presets/presets/golf/lateral_water_hazard_line.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "icon": "maki-golf", - "fields": [ - "name" - ], - "geometry": [ - "line" - ], - "tags": { - "golf": "lateral_water_hazard" - }, - "name": "Lateral Water Hazard" -} diff --git a/data/presets/presets/golf/water_hazard_area.json b/data/presets/presets/golf/water_hazard.json similarity index 100% rename from data/presets/presets/golf/water_hazard_area.json rename to data/presets/presets/golf/water_hazard.json diff --git a/data/presets/presets/golf/water_hazard_line.json b/data/presets/presets/golf/water_hazard_line.json deleted file mode 100644 index c913830c6..000000000 --- a/data/presets/presets/golf/water_hazard_line.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "icon": "maki-golf", - "fields": [ - "name" - ], - "geometry": [ - "line" - ], - "tags": { - "golf": "water_hazard" - }, - "name": "Water Hazard" -} diff --git a/data/taginfo.json b/data/taginfo.json index c85088808..711676da7 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -380,9 +380,7 @@ {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "natural", "value": "water", "description": "🄿 Lateral Water Hazard, 🄿 Water Hazard, 🄿 Water", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, - {"key": "golf", "value": "lateral_water_hazard", "description": "🄿 Lateral Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "foot", "value": "designated", "description": "🄿 Golf Walking Path, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, - {"key": "golf", "value": "water_hazard", "description": "🄿 Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "healthcare", "description": "🄿 Healthcare Facility, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"}, {"key": "healthcare", "value": "alternative", "description": "🄿 Alternative Medicine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"}, {"key": "healthcare:speciality", "value": "chiropractic", "description": "🄿 Chiropractor", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index de0f1d772..13463be75 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5173,11 +5173,7 @@ "name": "Golf Hole", "terms": "" }, - "golf/lateral_water_hazard_area": { - "name": "Lateral Water Hazard", - "terms": "" - }, - "golf/lateral_water_hazard_line": { + "golf/lateral_water_hazard": { "name": "Lateral Water Hazard", "terms": "" }, @@ -5193,11 +5189,7 @@ "name": "Tee Box", "terms": "teeing ground" }, - "golf/water_hazard_area": { - "name": "Water Hazard", - "terms": "" - }, - "golf/water_hazard_line": { + "golf/water_hazard": { "name": "Water Hazard", "terms": "" },