CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 00:07:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add style for golf walking paths and cartpaths

Browse Source 
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"
This commit is contained in:
Bryan Housel
2019-02-06 21:56:22 -05:00
parent e045c0f178
commit ce3b33e374
13 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+19 -1
View File
@@ -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: '<translate with synonyms or related terms for ''Sand Trap'', separated by commas>'
golf/cartpath:
# 'golf=cartpath, golf_cart=designated'
name: Golf Cartpath
terms: '<translate with synonyms or related terms for ''Golf Cartpath'', separated by commas>'
golf/cartpath_service:
# 'highway=service, golf=cartpath, golf_cart=designated'
name: Golf Cartpath / Service Road
terms: '<translate with synonyms or related terms for ''Golf Cartpath / Service Road'', separated by commas>'
golf/driving_range:
# 'golf=driving_range, landuse=grass'
name: Driving Range
terms: '<translate with synonyms or related terms for ''Driving Range'', separated by commas>'
golf/fairway:
# 'golf=fairway, landuse=grass'
name: Fairway
@@ -3800,6 +3814,10 @@ en:
# golf=lateral_water_hazard
name: Lateral Water Hazard
terms: '<translate with synonyms or related terms for ''Lateral Water Hazard'', separated by commas>'
golf/path:
# 'golf=path, foot=designated'
name: Golf Walking Path
terms: '<translate with synonyms or related terms for ''Golf Walking Path'', separated by commas>'
golf/rough:
# 'golf=rough, landuse=grass'
name: Rough
data/presets/categories.json
+1 -1
View File
@@ -51,7 +51,7 @@
"members": [
"golf/hole",
"golf/cartpath",
"golf/cartpath_multipurpose",
"golf/cartpath_service",
"golf/path"
]
},
data/presets/categories/golf-line.json
+1 -1
View File
@@ -5,7 +5,7 @@
"members": [
"golf/hole",
"golf/cartpath",
"golf/cartpath_multipurpose",
"golf/cartpath_service",
"golf/path"
]
}
data/presets/presets.json
+4
View File
@@ -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"},
data/presets/presets/golf/cartpath.json
+1 -6
View File
@@ -1,12 +1,7 @@
{
"icon": "maki-golf",
"fields": [
"name",
"surface",
"width",
"structure",
"access",
"incline"
"{golf/path}"
],
"geometry": [
"line"
data/presets/presets/golf/cartpath_multipurpose.json → data/presets/presets/golf/cartpath_service.json
+3 -7
View File
@@ -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"
}
data/presets/presets/golf/driving_range.json
+2 -1
View File
@@ -1,7 +1,8 @@
{
"icon": "maki-golf",
"fields": [
"name"
"name",
"capacity"
],
"geometry": [
"area"
data/presets/presets/golf/path.json
-1
View File
@@ -5,7 +5,6 @@
"surface",
"width",
"structure",
"access",
"incline"
],
"geometry": [
data/taginfo.json
+3 -4
View File
@@ -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"},