From a7955bc3f952c79488807b203497a82a3eef02b5 Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Mon, 4 Feb 2019 21:14:17 -0800 Subject: [PATCH 1/7] 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 c1a7c16a02..341bfdd03d 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 0000000000..47c6774cec --- /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 0000000000..edcc8220ae --- /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 8a5fcd06f4..af19c8c998 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 0000000000..84bb13b86b --- /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 f067418acf..5daaabf47e 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 2/7] 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 341bfdd03d..658594ba9e 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 0416577f80..eb00ffcd83 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 0000000000..6a7cb955b7 --- /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 5daaabf47e..97ca00b420 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 3/7] 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 edcc8220ae..2c76efff3c 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 af19c8c998..8a5fcd06f4 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 4/7] 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 2c76efff3c..889fe56974 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 84bb13b86b..f795930ec9 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 5/7] 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 889fe56974..323a8ec246 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 f795930ec9..7c6b5c9a33 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 6/7] 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 658594ba9e..cfead76e51 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 47c6774cec..dc7623c840 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 0000000000..204c06a57f --- /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 90115b55cac9f8df67bbaffe07d497b81b33bc8d Mon Sep 17 00:00:00 2001 From: Chad Rockey Date: Wed, 6 Feb 2019 14:31:11 -0800 Subject: [PATCH 7/7] 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 204c06a57f..cabc31cb57 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" },