From 043b827cc73d63fda2ab4b27029dc923574babbe Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 6 Feb 2019 22:07:07 -0500 Subject: [PATCH] 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": "" },