From df7a2f978e7cabc3d4e99387b62251a2746033c5 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 9 Apr 2019 19:07:00 -0700 Subject: [PATCH] Use highway tags for golf paths and cart paths (close #6165) Offer to upgrade golf paths missing highway tags --- css/50_misc.css | 42 ------------------- data/presets.yaml | 8 +--- data/presets/categories.json | 1 - data/presets/categories/golf.json | 1 - data/presets/presets.json | 5 +-- data/presets/presets/golf/cartpath.json | 14 ++++++- .../presets/golf/cartpath_service.json | 20 --------- data/presets/presets/golf/path.json | 9 ++++ data/taginfo.json | 5 ++- dist/locales/en.json | 4 -- 10 files changed, 28 insertions(+), 81 deletions(-) delete mode 100644 data/presets/presets/golf/cartpath_service.json diff --git a/css/50_misc.css b/css/50_misc.css index dbf76d81d..6d098ba7b 100644 --- a/css/50_misc.css +++ b/css/50_misc.css @@ -414,45 +414,3 @@ path.fill.tag-building { stroke: rgba(224, 110, 95, 0.3); fill: rgba(224, 110, 95, 0.3); } - - -/* "Special" paths - highways that aren't highways */ -.preset-icon .icon.tag-golf-path { - color: #988; - fill: #dca; -} - -path.line.shadow.tag-golf-path { - stroke-width: 16; -} -path.line.casing.tag-golf-path { - stroke: #dca; - stroke-width: 5; - stroke-linecap: round; - stroke-dasharray: none; -} -path.line.stroke.tag-golf-path { - stroke: #988; - stroke-width: 3; - stroke-linecap: butt; - stroke-dasharray: 6, 6; -} - -.low-zoom path.line.shadow.tag-golf-path { - stroke-width: 12; -} -.low-zoom path.line.casing.tag-golf-path { - stroke-width: 3; -} -.low-zoom path.line.stroke.tag-golf-path { - stroke-width: 1; - stroke-linecap: butt; - stroke-dasharray: 3, 3; -} - -g.midpoint.tag-golf-path .fill { - fill: #fff; - stroke: #333; - stroke-opacity: .8; - opacity: .8; -} diff --git a/data/presets.yaml b/data/presets.yaml index 5429fdb13..05a4c37c9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3940,13 +3940,9 @@ en: # 'terms: hazard,bunker' terms: '' golf/cartpath: - # 'golf=cartpath, golf_cart=designated' + # golf=cartpath 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 @@ -3968,7 +3964,7 @@ en: name: Lateral Water Hazard terms: '' golf/path: - # 'golf=path, foot=designated' + # golf=path name: Golf Walking Path terms: '' golf/rough: diff --git a/data/presets/categories.json b/data/presets/categories.json index 72e385243..bcb42b85d 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -41,7 +41,6 @@ "golf/driving_range", "golf/hole", "golf/cartpath", - "golf/cartpath_service", "golf/path" ] }, diff --git a/data/presets/categories/golf.json b/data/presets/categories/golf.json index 8b175b4ed..4b3212fc3 100644 --- a/data/presets/categories/golf.json +++ b/data/presets/categories/golf.json @@ -12,7 +12,6 @@ "golf/driving_range", "golf/hole", "golf/cartpath", - "golf/cartpath_service", "golf/path" ] } diff --git a/data/presets/presets.json b/data/presets/presets.json index 705a90cbc..8d7b87f25 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -395,14 +395,13 @@ "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "address"], "matchScore": 0.8, "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/cartpath": {"icon": "maki-golf", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "removeTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "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": {"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/path": {"icon": "maki-golf", "fields": ["name", "surface", "width", "structure", "incline"], "geometry": ["line"], "tags": {"golf": "path"}, "addTags": {"golf": "path", "highway": "path", "foot": "designated"}, "removeTags": {"golf": "path", "highway": "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": {"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 45e5892c9..cb469c496 100644 --- a/data/presets/presets/golf/cartpath.json +++ b/data/presets/presets/golf/cartpath.json @@ -1,14 +1,24 @@ { "icon": "maki-golf", "fields": [ - "{golf/path}" + "{golf/path}", + "maxspeed" ], "geometry": [ "line" ], "tags": { + "golf": "cartpath" + }, + "addTags": { "golf": "cartpath", - "golf_cart": "designated" + "golf_cart": "designated", + "highway": "service" + }, + "removeTags": { + "golf": "cartpath", + "golf_cart": "designated", + "highway": "service" }, "reference": { "key": "golf", diff --git a/data/presets/presets/golf/cartpath_service.json b/data/presets/presets/golf/cartpath_service.json deleted file mode 100644 index ff3d463b1..000000000 --- a/data/presets/presets/golf/cartpath_service.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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" -} diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json index 8f4941788..51820a0bc 100644 --- a/data/presets/presets/golf/path.json +++ b/data/presets/presets/golf/path.json @@ -11,7 +11,16 @@ "line" ], "tags": { + "golf": "path" + }, + "addTags": { "golf": "path", + "highway": "path", + "foot": "designated" + }, + "removeTags": { + "golf": "path", + "highway": "path", "foot": "designated" }, "reference": { diff --git a/data/taginfo.json b/data/taginfo.json index bea907d9c..4f66dbb45 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -391,12 +391,12 @@ {"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": "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": "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": "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": "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": "foot", "value": "designated", "description": "🄿 Golf Walking Path, 🄿 Cycle & Foot Path, 🄵 Allowed Access", "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": "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"}, @@ -423,6 +423,7 @@ {"key": "crossing", "value": "marked", "description": "🄿 Marked Crosswalk, 🄿 Marked Cycle Crossing", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "highway", "value": "crossing", "description": "🄿 Unmarked Crossing", "object_types": ["node"]}, {"key": "highway", "value": "cycleway", "description": "🄿 Cycle Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, + {"key": "foot", "value": "designated", "description": "🄿 Cycle & Foot Path, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, {"key": "cycleway", "value": "crossing", "description": "🄿 Unmarked Cycle Crossing", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, {"key": "highway", "value": "elevator", "description": "🄿 Elevator", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/elevator.svg?sanitize=true"}, {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 91947d387..54d854650 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5630,10 +5630,6 @@ "name": "Sand Trap", "terms": "hazard,bunker" }, - "golf/cartpath_service": { - "name": "Golf Cartpath / Service Road", - "terms": "" - }, "golf/cartpath": { "name": "Golf Cartpath", "terms": ""