From 21f1891899fd47b72d5428d57036530b7c210404 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 4 Jan 2019 01:37:18 -0500 Subject: [PATCH] Adjust pharmacy/chemist terms so they both appear on searches (re: 3213) --- data/presets.yaml | 4 ++-- data/presets/presets.json | 4 ++-- data/presets/presets/amenity/pharmacy.json | 3 ++- data/presets/presets/shop/chemist.json | 10 ++++++++-- dist/locales/en.json | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index fb785aef9..5e65082f4 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2554,7 +2554,7 @@ en: amenity/pharmacy: # amenity=pharmacy name: Pharmacy Counter - # 'terms: apothecary,drug*,med*,prescription' + # 'terms: apothecary,drug store,drugstore,med*,prescription' terms: '' amenity/place_of_worship: # amenity=place_of_worship @@ -5982,7 +5982,7 @@ en: shop/chemist: # shop=chemist name: Drugstore - # 'terms: apothecary,med*,drug*,gift' + # 'terms: apothecary,beauty,drug store,drugstore,gift,hair,med*,pharmacy,prescription,tooth' terms: '' shop/chocolate: # shop=chocolate diff --git a/data/presets/presets.json b/data/presets/presets.json index e6b3b3420..c1a223348 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -117,7 +117,7 @@ "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "operator", "building", "levels", "height", "address", "capacity", "fee", "access_simple"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"}, "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"}, "amenity/payment_terminal": {"icon": "maki-bank", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"}, - "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug*", "med*", "prescription"], "name": "Pharmacy Counter"}, + "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"}, "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"}, "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"}, "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Church"}, @@ -862,7 +862,7 @@ "shop/catalogue": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"}, "shop/charity": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"}, "shop/cheese": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"}, - "shop/chemist": {"icon": "maki-grocery", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "med*", "drug*", "gift"], "name": "Drugstore"}, + "shop/chemist": {"icon": "maki-grocery", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"}, "shop/chocolate": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "name": "Chocolate Store"}, "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "name": "Clothing Store"}, "shop/coffee": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"}, diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json index 815956f29..495097150 100644 --- a/data/presets/presets/amenity/pharmacy.json +++ b/data/presets/presets/amenity/pharmacy.json @@ -31,7 +31,8 @@ }, "terms": [ "apothecary", - "drug*", + "drug store", + "drugstore", "med*", "prescription" ], diff --git a/data/presets/presets/shop/chemist.json b/data/presets/presets/shop/chemist.json index f093f4610..5dd15f2e0 100644 --- a/data/presets/presets/shop/chemist.json +++ b/data/presets/presets/shop/chemist.json @@ -17,9 +17,15 @@ }, "terms": [ "apothecary", + "beauty", + "drug store", + "drugstore", + "gift", + "hair", "med*", - "drug*", - "gift" + "pharmacy", + "prescription", + "tooth" ], "name": "Drugstore" } diff --git a/dist/locales/en.json b/dist/locales/en.json index b50e0117d..7f0522eab 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3689,7 +3689,7 @@ }, "amenity/pharmacy": { "name": "Pharmacy Counter", - "terms": "apothecary,drug*,med*,prescription" + "terms": "apothecary,drug store,drugstore,med*,prescription" }, "amenity/place_of_worship": { "name": "Place of Worship", @@ -6669,7 +6669,7 @@ }, "shop/chemist": { "name": "Drugstore", - "terms": "apothecary,med*,drug*,gift" + "terms": "apothecary,beauty,drug store,drugstore,gift,hair,med*,pharmacy,prescription,tooth" }, "shop/chocolate": { "name": "Chocolate Store",