From c99ddf8cd4bb044501c8e643235371418e4b5e06 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 3 May 2019 11:17:17 -0700 Subject: [PATCH] Update fields and name for bicycle_parking=building preset (re: #6259) Add derived data for prior merge --- data/presets.yaml | 15 +++++++++++++++ data/presets/presets.json | 3 +++ .../presets/amenity/bicycle_parking/building.json | 5 +++-- data/taginfo.json | 3 +++ dist/locales/en.json | 12 ++++++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index cc5139975..64ad02000 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2463,6 +2463,21 @@ en: name: Bicycle Parking # 'terms: bike' terms: '' + amenity/bicycle_parking/building: + # 'amenity=bicycle_parking, bicycle_parking=building' + name: Bicycle Parking Garage + # 'terms: Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station' + terms: '' + amenity/bicycle_parking/lockers: + # 'amenity=bicycle_parking, bicycle_parking=lockers' + name: Bicycle Lockers + # 'terms: Bike Lockers' + terms: '' + amenity/bicycle_parking/shed: + # 'amenity=bicycle_parking, bicycle_parking=shed' + name: Bicycle Shed + # 'terms: Bike Shed' + terms: '' amenity/bicycle_rental: # amenity=bicycle_rental name: Bicycle Rental diff --git a/data/presets/presets.json b/data/presets/presets.json index fe16b946e..41727c63b 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -69,6 +69,9 @@ "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"}, "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "inscription", "lit"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"}, "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple", "fee", "payment_multi_fee"], "moreFields": ["lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"}, + "amenity/bicycle_parking/building": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "opening_hours", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "building"}, "reference": {"key": "bicycle_parking"}, "terms": ["Multi-Storey Bicycle Park", "Multi-Storey Bike Park", "Bike Parking Station"], "name": "Bicycle Parking Garage"}, + "amenity/bicycle_parking/lockers": {"icon": "maki-bicycle", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Lockers"], "name": "Bicycle Lockers"}, + "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Shed"], "name": "Bicycle Shed"}, "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "fee", "payment_multi_fee"], "moreFields": ["opening_hours", "address", "website", "phone", "email", "fax", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"}, "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "service/bicycle"], "moreFields": ["payment_multi_fee", "covered"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"}, "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"}, diff --git a/data/presets/presets/amenity/bicycle_parking/building.json b/data/presets/presets/amenity/bicycle_parking/building.json index 369b80cc1..c1e4c64c2 100644 --- a/data/presets/presets/amenity/bicycle_parking/building.json +++ b/data/presets/presets/amenity/bicycle_parking/building.json @@ -2,7 +2,8 @@ "icon": "maki-bicycle", "fields": [ "{amenity/bicycle_parking}", - "opening_hours" + "opening_hours", + "building_area" ], "geometry": [ "point", @@ -21,5 +22,5 @@ "Multi-Storey Bike Park", "Bike Parking Station" ], - "name": "Bicycle Parking Station" + "name": "Bicycle Parking Garage" } diff --git a/data/taginfo.json b/data/taginfo.json index 8ce619e98..bcbd5fe66 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -72,6 +72,9 @@ {"key": "amenity", "value": "bbq", "description": "🄿 Barbecue/Grill", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bbq-15.svg?sanitize=true"}, {"key": "amenity", "value": "bench", "description": "🄿 Bench", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/bench.svg?sanitize=true"}, {"key": "amenity", "value": "bicycle_parking", "description": "🄿 Bicycle Parking", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, + {"key": "bicycle_parking", "value": "building", "description": "🄿 Bicycle Parking Garage", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, + {"key": "bicycle_parking", "value": "lockers", "description": "🄿 Bicycle Lockers", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, + {"key": "bicycle_parking", "value": "shed", "description": "🄿 Bicycle Shed", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, {"key": "amenity", "value": "bicycle_rental", "description": "🄿 Bicycle Rental", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, {"key": "amenity", "value": "bicycle_repair_station", "description": "🄿 Bicycle Repair Tool Stand", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, {"key": "amenity", "value": "biergarten", "description": "🄿 Biergarten", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-beer.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index a66c7c6f1..ea9245d00 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4527,6 +4527,18 @@ "name": "Bicycle Parking", "terms": "bike" }, + "amenity/bicycle_parking/building": { + "name": "Bicycle Parking Garage", + "terms": "Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station" + }, + "amenity/bicycle_parking/lockers": { + "name": "Bicycle Lockers", + "terms": "Bike Lockers" + }, + "amenity/bicycle_parking/shed": { + "name": "Bicycle Shed", + "terms": "Bike Shed" + }, "amenity/bicycle_rental": { "name": "Bicycle Rental", "terms": "bike"