From c735dc8c963dbf2e0c80c1bfc6476d417fa28d44 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 31 Dec 2019 13:00:28 -0500 Subject: [PATCH] Add terms to cemetery, graveyard, and religious area (re: #7187) --- data/presets.yaml | 3 +++ data/presets/presets.json | 6 +++--- data/presets/presets/amenity/grave_yard.json | 11 +++++++++++ data/presets/presets/landuse/cemetery.json | 12 +++++++++++- data/presets/presets/landuse/religious.json | 16 +++++++++++++++- dist/locales/en.json | 6 +++--- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 7abaa5c6c..d1c5236f6 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3168,6 +3168,7 @@ en: amenity/grave_yard: # amenity=grave_yard name: Graveyard + # 'terms: burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb' terms: '' amenity/grit_bin: # amenity=grit_bin @@ -5347,6 +5348,7 @@ en: landuse/cemetery: # landuse=cemetery name: Cemetery + # 'terms: burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb' terms: '' landuse/churchyard: # landuse=churchyard @@ -5499,6 +5501,7 @@ en: landuse/religious: # landuse=religious name: Religious Area + # 'terms: christian,churchyard,hindu,jewish,mosque,muslim,place of worship,shinto,sikh,taoist,temple,shrine,synagogue' terms: '' landuse/reservoir: # landuse=reservoir diff --git a/data/presets/presets.json b/data/presets/presets.json index 3bb456b06..aa3bc53d5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -128,7 +128,7 @@ "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "outdoor_seating", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"}, "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "fountain", "drinking_water", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "terms": ["basin", "water"], "name": "Fountain"}, "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["brand", "building", "email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"}, - "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"}, + "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "terms": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "name": "Graveyard"}, "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"}, "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"}, "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"}, @@ -597,7 +597,7 @@ "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"}, "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"}, "landuse/brownfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"}, - "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"}, + "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "name": "Cemetery"}, "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"}, "landuse/construction": {"icon": "temaki-bulldozer", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": ["building", "bulldozer", "construction site", "construction zone", "crane", "demolition", "development", "infrastructure"], "name": "Construction Area"}, "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"}, @@ -627,7 +627,7 @@ "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"}, "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"}, "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"}, - "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"}, + "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": ["christian", "churchyard", "hindu", "jewish", "mosque", "muslim", "place of worship", "shinto", "sikh", "taoist", "temple", "shrine", "synagogue"], "name": "Religious Area"}, "landuse/residential": {"icon": "maki-building", "fields": ["name", "residential"], "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"}, "landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"}, "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"}, diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json index 4a1689dbd..d2e578163 100644 --- a/data/presets/presets/amenity/grave_yard.json +++ b/data/presets/presets/amenity/grave_yard.json @@ -18,5 +18,16 @@ "tags": { "amenity": "grave_yard" }, + "terms": [ + "burial ground", + "cemetary", + "cemetery", + "churchyard", + "columbarium", + "grave yard", + "graveyard", + "mausoleum", + "tomb" + ], "name": "Graveyard" } diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json index b0c457498..a7e192895 100644 --- a/data/presets/presets/landuse/cemetery.json +++ b/data/presets/presets/landuse/cemetery.json @@ -18,6 +18,16 @@ "tags": { "landuse": "cemetery" }, - "terms": [], + "terms": [ + "burial ground", + "cemetary", + "cemetery", + "churchyard", + "columbarium", + "grave yard", + "graveyard", + "mausoleum", + "tomb" + ], "name": "Cemetery" } diff --git a/data/presets/presets/landuse/religious.json b/data/presets/presets/landuse/religious.json index 937829569..7e913efa8 100644 --- a/data/presets/presets/landuse/religious.json +++ b/data/presets/presets/landuse/religious.json @@ -18,6 +18,20 @@ "tags": { "landuse": "religious" }, - "terms": [], + "terms": [ + "christian", + "churchyard", + "hindu", + "jewish", + "mosque", + "muslim", + "place of worship", + "shinto", + "sikh", + "taoist", + "temple", + "shrine", + "synagogue" + ], "name": "Religious Area" } diff --git a/dist/locales/en.json b/dist/locales/en.json index c4f9a9ea2..686d777da 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5321,7 +5321,7 @@ }, "amenity/grave_yard": { "name": "Graveyard", - "terms": "" + "terms": "burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb" }, "amenity/grit_bin": { "name": "Grit Bin", @@ -7169,7 +7169,7 @@ }, "landuse/cemetery": { "name": "Cemetery", - "terms": "" + "terms": "burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb" }, "landuse/commercial": { "name": "Commercial Area", @@ -7289,7 +7289,7 @@ }, "landuse/religious": { "name": "Religious Area", - "terms": "" + "terms": "christian,churchyard,hindu,jewish,mosque,muslim,place of worship,shinto,sikh,taoist,temple,shrine,synagogue" }, "landuse/residential": { "name": "Residential Area",