From 6645ebbc6b357c4df21ebc5922767ba606350f3c Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 12 Jun 2019 09:35:12 -0400 Subject: [PATCH] Adjust terms and name for some place of worship presets (re: 9d1a085d059efb53d6cf90bbf97c9245a25cb9c8) --- data/presets.yaml | 12 +++++------ data/presets/presets.json | 8 ++++---- .../christian/jehovahs_witness.json | 20 ++----------------- .../christian/la_luz_del_mundo.json | 20 ++----------------- .../place_of_worship/christian/quaker.json | 20 ++----------------- .../amenity/place_of_worship/muslim.json | 1 + data/taginfo.json | 2 +- dist/locales/en.json | 10 +++++----- 8 files changed, 23 insertions(+), 70 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index e69156e2d..06fcbca8e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2863,17 +2863,17 @@ en: amenity/place_of_worship/christian/jehovahs_witness: # 'amenity=place_of_worship, religion=christian, denomination=jehovahs_witness' name: Kingdom Hall of Jehovah's Witnesses - # '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' + # 'terms: christian,church,house of God,house of prayer,house of worship' terms: '' amenity/place_of_worship/christian/la_luz_del_mundo: # 'amenity=place_of_worship, religion=christian, denomination=la_luz_del_mundo' - name: La Luz del Mundo Church - # '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,the light of the world church' - terms: '' + name: La Luz del Mundo Temple + # 'terms: christian,church,house of God,house of prayer,house of worship,the light of the world church' + terms: '' amenity/place_of_worship/christian/quaker: # 'amenity=place_of_worship, religion=christian, denomination=quaker' name: Quaker Friends Meeting House - # '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' + # 'terms: christian,church,house of God,house of prayer,house of worship' terms: '' amenity/place_of_worship/hindu: # 'amenity=place_of_worship, religion=hindu' @@ -2888,7 +2888,7 @@ en: amenity/place_of_worship/muslim: # 'amenity=place_of_worship, religion=muslim' name: Muslim Mosque - # 'terms: islam,muslim' + # 'terms: islam,islamic center,muslim' terms: '' amenity/place_of_worship/shinto: # 'amenity=place_of_worship, religion=shinto' diff --git a/data/presets/presets.json b/data/presets/presets.json index 06caf2d5e..e5c22c347 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -148,12 +148,12 @@ "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "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", "religion", "denomination", "{amenity/place_of_worship}"], "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", "religion", "denomination", "{amenity/place_of_worship}"], "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": "Christian Church"}, - "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "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", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"}, - "amenity/place_of_worship/christian/la_luz_del_mundo": {"icon": "maki-place-of-worship", "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", "the light of the world church"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "la_luz_del_mundo"}, "reference": {"key": "denomination", "value": "la_luz_del_mundo"}, "name": "La Luz del Mundo Church"}, - "amenity/place_of_worship/christian/quaker": {"icon": "maki-place-of-worship", "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", "denomination": "quaker"}, "reference": {"key": "denomination", "value": "quaker"}, "name": "Quaker Friends Meeting House"}, + "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"}, + "amenity/place_of_worship/christian/la_luz_del_mundo": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship", "the light of the world church"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "la_luz_del_mundo"}, "reference": {"key": "denomination", "value": "la_luz_del_mundo"}, "name": "La Luz del Mundo Temple"}, + "amenity/place_of_worship/christian/quaker": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "quaker"}, "reference": {"key": "denomination", "value": "quaker"}, "name": "Quaker Friends Meeting House"}, "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"}, "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Jewish Synagogue"}, - "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["islam", "muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"}, + "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["islam", "islamic center", "muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"}, "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"}, "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"}, "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"}, diff --git a/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json b/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json index 4a5d21b04..2fa3aa320 100644 --- a/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json +++ b/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json @@ -6,26 +6,10 @@ ], "terms": [ "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "fold", + "church", "house of God", "house of prayer", - "house of worship", - "minster", - "mission", - "oratory", - "parish", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" + "house of worship" ], "tags": { "amenity": "place_of_worship", diff --git a/data/presets/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json b/data/presets/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json index ca5b89d17..d683fdec7 100644 --- a/data/presets/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json +++ b/data/presets/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json @@ -6,26 +6,10 @@ ], "terms": [ "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "fold", + "church", "house of God", "house of prayer", "house of worship", - "minster", - "mission", - "oratory", - "parish", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple", "the light of the world church" ], "tags": { @@ -37,5 +21,5 @@ "key": "denomination", "value": "la_luz_del_mundo" }, - "name": "La Luz del Mundo Church" + "name": "La Luz del Mundo Temple" } diff --git a/data/presets/presets/amenity/place_of_worship/christian/quaker.json b/data/presets/presets/amenity/place_of_worship/christian/quaker.json index 52f7259fa..d6e5c09bb 100644 --- a/data/presets/presets/amenity/place_of_worship/christian/quaker.json +++ b/data/presets/presets/amenity/place_of_worship/christian/quaker.json @@ -6,26 +6,10 @@ ], "terms": [ "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "fold", + "church", "house of God", "house of prayer", - "house of worship", - "minster", - "mission", - "oratory", - "parish", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" + "house of worship" ], "tags": { "amenity": "place_of_worship", diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json index e7e883cee..e377cc50b 100644 --- a/data/presets/presets/amenity/place_of_worship/muslim.json +++ b/data/presets/presets/amenity/place_of_worship/muslim.json @@ -12,6 +12,7 @@ ], "terms": [ "islam", + "islamic center", "muslim" ], "tags": { diff --git a/data/taginfo.json b/data/taginfo.json index f2d3db611..89af2919e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -150,7 +150,7 @@ {"key": "religion", "value": "buddhist", "description": "🄿 Buddhist Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-buddhist-15.svg?sanitize=true"}, {"key": "religion", "value": "christian", "description": "🄿 Christian Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, {"key": "denomination", "value": "jehovahs_witness", "description": "🄿 Kingdom Hall of Jehovah's Witnesses", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"}, - {"key": "denomination", "value": "la_luz_del_mundo", "description": "🄿 La Luz del Mundo Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"}, + {"key": "denomination", "value": "la_luz_del_mundo", "description": "🄿 La Luz del Mundo Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"}, {"key": "denomination", "value": "quaker", "description": "🄿 Quaker Friends Meeting House", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"}, {"key": "religion", "value": "hindu", "description": "🄿 Hindu Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/hinduism.svg?sanitize=true"}, {"key": "religion", "value": "jewish", "description": "🄿 Jewish Synagogue", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-jewish-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 1437e54c3..c15337e8c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4918,15 +4918,15 @@ }, "amenity/place_of_worship/christian/jehovahs_witness": { "name": "Kingdom Hall of Jehovah's Witnesses", - "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" + "terms": "christian,church,house of God,house of prayer,house of worship" }, "amenity/place_of_worship/christian/la_luz_del_mundo": { - "name": "La Luz del Mundo Church", - "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,the light of the world church" + "name": "La Luz del Mundo Temple", + "terms": "christian,church,house of God,house of prayer,house of worship,the light of the world church" }, "amenity/place_of_worship/christian/quaker": { "name": "Quaker Friends Meeting House", - "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" + "terms": "christian,church,house of God,house of prayer,house of worship" }, "amenity/place_of_worship/hindu": { "name": "Hindu Temple", @@ -4938,7 +4938,7 @@ }, "amenity/place_of_worship/muslim": { "name": "Muslim Mosque", - "terms": "islam,muslim" + "terms": "islam,islamic center,muslim" }, "amenity/place_of_worship/shinto": { "name": "Shinto Shrine",