From c5c76b361bd352425781817a492bf754463eeccb Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 24 Sep 2019 12:28:31 +0200 Subject: [PATCH] Add additional terms to make sure bike-related presets appear when searching "cycling" and "cycle" (close #6825) --- data/presets.yaml | 14 +++++++------- data/presets/presets.json | 14 +++++++------- data/presets/presets/amenity/bicycle_parking.json | 4 +++- .../presets/amenity/bicycle_parking/building.json | 6 ++++-- .../presets/amenity/bicycle_parking/lockers.json | 2 ++ .../presets/amenity/bicycle_parking/shed.json | 2 ++ data/presets/presets/amenity/bicycle_rental.json | 6 ++++-- .../presets/amenity/bicycle_repair_station.json | 14 +++++++------- data/presets/presets/highway/cycleway.json | 3 ++- dist/locales/en.json | 14 +++++++------- 10 files changed, 45 insertions(+), 34 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 035cd984d..29d6194de 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2738,32 +2738,32 @@ en: amenity/bicycle_parking: # amenity=bicycle_parking name: Bicycle Parking - # 'terms: bike' + # 'terms: bike,cycle parking,cycling' 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: Bike Parking Station,cycle parking,cycling,Multi-Storey Bicycle Park,Multi-Storey Bike Park' terms: '' amenity/bicycle_parking/lockers: # 'amenity=bicycle_parking, bicycle_parking=lockers' name: Bicycle Lockers - # 'terms: Bike Lockers' + # 'terms: cycle locker,cycling,Bike Lockers' terms: '' amenity/bicycle_parking/shed: # 'amenity=bicycle_parking, bicycle_parking=shed' name: Bicycle Shed - # 'terms: Bike Shed' + # 'terms: cycle shed,cycling,Bike Shed' terms: '' amenity/bicycle_rental: # amenity=bicycle_rental name: Bicycle Rental - # 'terms: bike,bicycle,bikeshare,bike share,bicycle share,hub,dock' + # 'terms: bike,bicycle,bikeshare,bike share,bicycle share,cycle dock,cycle hub,cycleshare,cycling' terms: '' amenity/bicycle_repair_station: # amenity=bicycle_repair_station name: Bicycle Repair Tool Stand - # 'terms: bike,repair,chain,pump,tools,stand,multitool' + # 'terms: bike chain,bike multitool,bike repair,bike tools,cycle pump,cycle repair,cycling' terms: '' amenity/biergarten: # amenity=biergarten @@ -4642,7 +4642,7 @@ en: highway/cycleway: # highway=cycleway name: Cycle Path - # 'terms: bike path,bicyle path' + # 'terms: bicyle path,bike path,cycling path' terms: '' highway/cycleway/bicycle_foot: # 'highway=cycleway, foot=designated' diff --git a/data/presets/presets.json b/data/presets/presets.json index 0eed055a3..23754cd0f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -72,12 +72,12 @@ "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"}, "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", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"}, - "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "operator/type", "covered", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["colour", "indoor", "level", "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", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "email", "covered", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "hub", "dock"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"}, - "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump", "tools", "stand", "multitool"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"}, + "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "operator/type", "covered", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["colour", "indoor", "level", "lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "cycle parking", "cycling"], "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": ["Bike Parking Station", "cycle parking", "cycling", "Multi-Storey Bicycle Park", "Multi-Storey Bike Park"], "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": ["cycle locker", "cycling", "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": ["cycle shed", "cycling", "Bike Shed"], "name": "Bicycle Shed"}, + "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "email", "covered", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"}, + "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike chain", "bike multitool", "bike repair", "bike tools", "cycle pump", "cycle repair", "cycling"], "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"}, "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"}, "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"}, @@ -478,7 +478,7 @@ "highway/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked"}, "addTags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"}, "highway/crossing/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"}, "highway/crossing/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "crossing", "crossing": "unmarked"}, "reference": {"key": "crossing", "value": "unmarked"}, "terms": [], "name": "Unmarked Crossing"}, - "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike path", "bicyle path"], "matchScore": 0.9, "name": "Cycle Path"}, + "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bicyle path", "bike path", "cycling path"], "matchScore": 0.9, "name": "Cycle Path"}, "highway/cycleway/crossing": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing"}, "addTags": {"highway": "cycleway", "cycleway": "crossing"}, "reference": {"key": "cycleway", "value": "crossing"}, "searchable": false, "matchScore": 0.95, "name": "Cycle Crossing"}, "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr"], "icon": "fas-biking", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.95, "name": "Cycle & Foot Path"}, "highway/cycleway/crossing/marked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Marked Cycle Crossing"}, diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json index fe380e9dc..d314ffd4d 100644 --- a/data/presets/presets/amenity/bicycle_parking.json +++ b/data/presets/presets/amenity/bicycle_parking.json @@ -23,7 +23,9 @@ "area" ], "terms": [ - "bike" + "bike", + "cycle parking", + "cycling" ], "tags": { "amenity": "bicycle_parking" diff --git a/data/presets/presets/amenity/bicycle_parking/building.json b/data/presets/presets/amenity/bicycle_parking/building.json index c1e4c64c2..3489b45a9 100644 --- a/data/presets/presets/amenity/bicycle_parking/building.json +++ b/data/presets/presets/amenity/bicycle_parking/building.json @@ -18,9 +18,11 @@ "key": "bicycle_parking" }, "terms": [ + "Bike Parking Station", + "cycle parking", + "cycling", "Multi-Storey Bicycle Park", - "Multi-Storey Bike Park", - "Bike Parking Station" + "Multi-Storey Bike Park" ], "name": "Bicycle Parking Garage" } diff --git a/data/presets/presets/amenity/bicycle_parking/lockers.json b/data/presets/presets/amenity/bicycle_parking/lockers.json index 34b60afc1..ba78e0187 100644 --- a/data/presets/presets/amenity/bicycle_parking/lockers.json +++ b/data/presets/presets/amenity/bicycle_parking/lockers.json @@ -13,6 +13,8 @@ "key": "bicycle_parking" }, "terms": [ + "cycle locker", + "cycling", "Bike Lockers" ], "name": "Bicycle Lockers" diff --git a/data/presets/presets/amenity/bicycle_parking/shed.json b/data/presets/presets/amenity/bicycle_parking/shed.json index cbd45b90a..f8fa3d03b 100644 --- a/data/presets/presets/amenity/bicycle_parking/shed.json +++ b/data/presets/presets/amenity/bicycle_parking/shed.json @@ -17,6 +17,8 @@ "key": "bicycle_parking" }, "terms": [ + "cycle shed", + "cycling", "Bike Shed" ], "name": "Bicycle Shed" diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json index dc387b69e..fde94d208 100644 --- a/data/presets/presets/amenity/bicycle_rental.json +++ b/data/presets/presets/amenity/bicycle_rental.json @@ -30,8 +30,10 @@ "bikeshare", "bike share", "bicycle share", - "hub", - "dock" + "cycle dock", + "cycle hub", + "cycleshare", + "cycling" ], "tags": { "amenity": "bicycle_rental" diff --git a/data/presets/presets/amenity/bicycle_repair_station.json b/data/presets/presets/amenity/bicycle_repair_station.json index 63e9dbc7b..ebd5fa92a 100644 --- a/data/presets/presets/amenity/bicycle_repair_station.json +++ b/data/presets/presets/amenity/bicycle_repair_station.json @@ -21,13 +21,13 @@ "vertex" ], "terms": [ - "bike", - "repair", - "chain", - "pump", - "tools", - "stand", - "multitool" + "bike chain", + "bike multitool", + "bike repair", + "bike tools", + "cycle pump", + "cycle repair", + "cycling" ], "tags": { "amenity": "bicycle_repair_station" diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json index 8cf1df18e..0135da430 100644 --- a/data/presets/presets/highway/cycleway.json +++ b/data/presets/presets/highway/cycleway.json @@ -27,8 +27,9 @@ "highway": "cycleway" }, "terms": [ + "bicyle path", "bike path", - "bicyle path" + "cycling path" ], "matchScore": 0.9, "name": "Cycle Path" diff --git a/dist/locales/en.json b/dist/locales/en.json index 8ba563df0..e67eceda7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5147,27 +5147,27 @@ }, "amenity/bicycle_parking": { "name": "Bicycle Parking", - "terms": "bike" + "terms": "bike,cycle parking,cycling" }, "amenity/bicycle_parking/building": { "name": "Bicycle Parking Garage", - "terms": "Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station" + "terms": "Bike Parking Station,cycle parking,cycling,Multi-Storey Bicycle Park,Multi-Storey Bike Park" }, "amenity/bicycle_parking/lockers": { "name": "Bicycle Lockers", - "terms": "Bike Lockers" + "terms": "cycle locker,cycling,Bike Lockers" }, "amenity/bicycle_parking/shed": { "name": "Bicycle Shed", - "terms": "Bike Shed" + "terms": "cycle shed,cycling,Bike Shed" }, "amenity/bicycle_rental": { "name": "Bicycle Rental", - "terms": "bike,bicycle,bikeshare,bike share,bicycle share,hub,dock" + "terms": "bike,bicycle,bikeshare,bike share,bicycle share,cycle dock,cycle hub,cycleshare,cycling" }, "amenity/bicycle_repair_station": { "name": "Bicycle Repair Tool Stand", - "terms": "bike,repair,chain,pump,tools,stand,multitool" + "terms": "bike chain,bike multitool,bike repair,bike tools,cycle pump,cycle repair,cycling" }, "amenity/biergarten": { "name": "Biergarten", @@ -6771,7 +6771,7 @@ }, "highway/cycleway": { "name": "Cycle Path", - "terms": "bike path,bicyle path" + "terms": "bicyle path,bike path,cycling path" }, "highway/cycleway/crossing": { "name": "Cycle Crossing",