From 742afda778db25349c554bc369affc893ce30dc7 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 22 Apr 2019 09:21:15 -0700 Subject: [PATCH] Add highway tags to addTags of slipways as lines --- data/presets.yaml | 5 +++++ data/presets/presets.json | 3 ++- data/presets/presets/leisure/slipway.json | 22 +++++++++++++++---- .../presets/leisure/slipway_point.json | 22 +++++++++++++++++++ data/taginfo.json | 2 +- dist/locales/en.json | 4 ++++ 6 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 data/presets/presets/leisure/slipway_point.json diff --git a/data/presets.yaml b/data/presets.yaml index f94a8496e..eb357a538 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5069,6 +5069,11 @@ en: name: Slipway # 'terms: boat launch,boat ramp,boat landing' terms: '' + leisure/slipway_point: + # leisure=slipway + name: Slipway + # 'terms: boat launch,boat ramp,boat landing' + terms: '' leisure/sports_centre: # leisure=sports_centre name: Sports Center / Complex diff --git a/data/presets/presets.json b/data/presets/presets.json index 0e52da0aa..bf47bf6dc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -627,7 +627,8 @@ "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "playground/max_age", "playground/min_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"}, "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "name": "Resort"}, "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"}, - "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "access_simple", "fee", "payment_multi_fee"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"}, + "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"}, + "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "surface", "access_simple", "fee", "payment_multi_fee", "lanes"], "moreFields": ["lit", "opening_hours", "seamark/type", "width"], "geometry": ["line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "addTags": {"leisure": "slipway", "highway": "service", "service": "slipway"}, "removeTags": {"leisure": "slipway", "highway": "service", "service": "slipway"}, "matchScore": 1.1, "name": "Slipway"}, "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee"], "moreFields": ["opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"}, "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"}, "leisure/sports_centre/swimming": {"icon": "maki-swimming", "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"}, diff --git a/data/presets/presets/leisure/slipway.json b/data/presets/presets/leisure/slipway.json index a989eda16..4cd9d592f 100644 --- a/data/presets/presets/leisure/slipway.json +++ b/data/presets/presets/leisure/slipway.json @@ -2,16 +2,19 @@ "icon": "maki-slipway", "fields": [ "name", + "surface", "access_simple", "fee", - "payment_multi_fee" + "payment_multi_fee", + "lanes" ], "moreFields": [ - "seamark/type" + "lit", + "opening_hours", + "seamark/type", + "width" ], "geometry": [ - "point", - "vertex", "line" ], "terms": [ @@ -22,5 +25,16 @@ "tags": { "leisure": "slipway" }, + "addTags": { + "leisure": "slipway", + "highway": "service", + "service": "slipway" + }, + "removeTags": { + "leisure": "slipway", + "highway": "service", + "service": "slipway" + }, + "matchScore": 1.1, "name": "Slipway" } diff --git a/data/presets/presets/leisure/slipway_point.json b/data/presets/presets/leisure/slipway_point.json new file mode 100644 index 000000000..80b119e94 --- /dev/null +++ b/data/presets/presets/leisure/slipway_point.json @@ -0,0 +1,22 @@ +{ + "icon": "maki-slipway", + "fields": [ + "{leisure/slipway}" + ], + "moreFields": [ + "{leisure/slipway}" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "boat launch", + "boat ramp", + "boat landing" + ], + "tags": { + "leisure": "slipway" + }, + "name": "Slipway" +} diff --git a/data/taginfo.json b/data/taginfo.json index 08369f496..acd7a222e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -607,7 +607,7 @@ {"key": "leisure", "value": "playground", "description": "🄿 Playground", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/playground-15.svg?sanitize=true"}, {"key": "leisure", "value": "resort", "description": "🄿 Resort", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"}, {"key": "leisure", "value": "sauna", "description": "🄿 Sauna", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-thermometer-three-quarters.svg?sanitize=true"}, - {"key": "leisure", "value": "slipway", "description": "🄿 Slipway", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/slipway-15.svg?sanitize=true"}, + {"key": "leisure", "value": "slipway", "description": "🄿 Slipway", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/slipway-15.svg?sanitize=true"}, {"key": "leisure", "value": "sports_centre", "description": "🄿 Sports Center / Complex", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"}, {"key": "sport", "value": "climbing", "description": "🄿 Climbing Gym", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/abseiling.svg?sanitize=true"}, {"key": "sport", "value": "swimming", "description": "🄿 Swimming Pool Facility", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/swimming-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 2d3f7df03..d5644eddf 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6611,6 +6611,10 @@ "name": "Sauna", "terms": "" }, + "leisure/slipway_point": { + "name": "Slipway", + "terms": "boat launch,boat ramp,boat landing" + }, "leisure/slipway": { "name": "Slipway", "terms": "boat launch,boat ramp,boat landing"