From 91285bc4f0e642554d66874bdd7a8cc4bde88c25 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 5 Feb 2019 11:56:09 +0000 Subject: [PATCH 1/4] chore(package): update esm to version 3.2.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd46ec5e3..5d06c3039 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "ecstatic": "^3.0.0", "editor-layer-index": "osmlab/editor-layer-index.git#gh-pages", "eslint": "^5.0.0", - "esm": "~3.1.0", + "esm": "~3.2.1", "gaze": "^1.1.1", "glob": "^7.1.0", "happen": "^0.3.1", From 44d4f2378d47042943e86f4c485a4fefd2e14e8b Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 5 Feb 2019 10:16:22 -0500 Subject: [PATCH 2/4] Update places of worship to use field inheritance Add website to defaults fields for places of worship Add presets for common place of worship denominations --- data/presets.yaml | 84 ++++++++++++++++++- data/presets/presets.json | 34 ++++++-- .../presets/amenity/place_of_worship.json | 4 +- .../amenity/place_of_worship/buddhist.json | 8 -- .../amenity/place_of_worship/christian.json | 8 -- .../place_of_worship/christian/anglican.json | 41 +++++++++ .../place_of_worship/christian/baptist.json | 40 +++++++++ .../place_of_worship/christian/catholic.json | 41 +++++++++ .../christian/evangelical.json | 41 +++++++++ .../christian/greek_orthodox.json | 42 ++++++++++ .../christian/jehovahs_witness.json | 40 +++++++++ .../place_of_worship/christian/lutheran.json | 40 +++++++++ .../place_of_worship/christian/methodist.json | 40 +++++++++ .../place_of_worship/christian/orthodox.json | 42 ++++++++++ .../christian/pentecostal.json | 40 +++++++++ .../christian/presbyterian.json | 40 +++++++++ .../place_of_worship/christian/quaker.json | 40 +++++++++ .../christian/roman_catholic.json | 41 +++++++++ .../christian/russian_orthodox.json | 42 ++++++++++ .../amenity/place_of_worship/hindu.json | 8 -- .../amenity/place_of_worship/jewish.json | 10 +-- .../amenity/place_of_worship/muslim.json | 15 ++-- .../amenity/place_of_worship/muslim/shia.json | 23 +++++ .../place_of_worship/muslim/sunni.json | 23 +++++ .../amenity/place_of_worship/shinto.json | 8 -- .../amenity/place_of_worship/sikh.json | 8 -- .../amenity/place_of_worship/taoist.json | 8 -- data/taginfo.json | 16 ++++ dist/locales/en.json | 68 ++++++++++++++- 29 files changed, 814 insertions(+), 81 deletions(-) create mode 100644 data/presets/presets/amenity/place_of_worship/christian/anglican.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/baptist.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/catholic.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/evangelical.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/lutheran.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/methodist.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/orthodox.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/pentecostal.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/presbyterian.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/quaker.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json create mode 100644 data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json create mode 100644 data/presets/presets/amenity/place_of_worship/muslim/shia.json create mode 100644 data/presets/presets/amenity/place_of_worship/muslim/sunni.json diff --git a/data/presets.yaml b/data/presets.yaml index d8546536e..fcc51f16d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2627,6 +2627,76 @@ en: name: Christian 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' terms: '' + amenity/place_of_worship/christian/anglican: + # 'amenity=place_of_worship, religion=christian, denomination=anglican' + name: Anglican Church + # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church of england,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' + terms: '' + amenity/place_of_worship/christian/baptist: + # 'amenity=place_of_worship, religion=christian, denomination=baptist' + name: Baptist 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' + terms: '' + amenity/place_of_worship/christian/catholic: + # 'amenity=place_of_worship, religion=christian, denomination=catholic' + name: Catholic Church + # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple' + terms: '' + amenity/place_of_worship/christian/evangelical: + # 'amenity=place_of_worship, religion=christian, denomination=evangelical' + name: Evangelical Church + # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,evangelical protestantism,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' + terms: '' + amenity/place_of_worship/christian/greek_orthodox: + # 'amenity=place_of_worship, religion=christian, denomination=greek_orthodox' + name: Greek Orthodox Church + # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' + terms: '' + 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: '' + amenity/place_of_worship/christian/lutheran: + # 'amenity=place_of_worship, religion=christian, denomination=lutheran' + name: Lutheran 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' + terms: '' + amenity/place_of_worship/christian/methodist: + # 'amenity=place_of_worship, religion=christian, denomination=methodist' + name: Methodist 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' + terms: '' + amenity/place_of_worship/christian/orthodox: + # 'amenity=place_of_worship, religion=christian, denomination=orthodox' + name: Eastern Orthodox Church + # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple' + terms: '' + amenity/place_of_worship/christian/pentecostal: + # 'amenity=place_of_worship, religion=christian, denomination=pentecostal' + name: Pentecostal 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' + terms: '' + amenity/place_of_worship/christian/presbyterian: + # 'amenity=place_of_worship, religion=christian, denomination=presbyterian' + name: Presbyterian 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' + 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: '' + amenity/place_of_worship/christian/roman_catholic: + # 'amenity=place_of_worship, religion=christian, denomination=roman_catholic' + name: Roman Catholic Church + # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple' + terms: '' + amenity/place_of_worship/christian/russian_orthodox: + # 'amenity=place_of_worship, religion=christian, denomination=russian_orthodox' + name: Russian Orthodox Church + # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' + terms: '' amenity/place_of_worship/hindu: # 'amenity=place_of_worship, religion=hindu' name: Hindu Temple @@ -2635,13 +2705,23 @@ en: amenity/place_of_worship/jewish: # 'amenity=place_of_worship, religion=jewish' name: Jewish Synagogue - # 'terms: jewish' + # 'terms: judaism' terms: '' amenity/place_of_worship/muslim: # 'amenity=place_of_worship, religion=muslim' name: Muslim Mosque - # 'terms: muslim' + # 'terms: dome,islam,minaret,musalla,shia,sunni' terms: '' + amenity/place_of_worship/muslim/shia: + # 'amenity=place_of_worship, religion=muslim, denomination=shia' + name: Shia Muslim Mosque + # 'terms: dome,islam,minaret,musalla' + terms: '' + amenity/place_of_worship/muslim/sunni: + # 'amenity=place_of_worship, religion=muslim, denomination=sunni' + name: Sunni Muslim Mosque + # 'terms: dome,islam,minaret,musalla' + terms: '' amenity/place_of_worship/shinto: # 'amenity=place_of_worship, religion=shinto' name: Shinto Shrine diff --git a/data/presets/presets.json b/data/presets/presets.json index dd8b20175..47bda6058 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -120,15 +120,31 @@ "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax", "wheelchair"], "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"], "moreFields": ["currency_multi", "wheelchair"], "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", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "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"], "moreFields": ["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", "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", "religion", "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": "Christian Church"}, - "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"}, + "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times", "website"], "moreFields": ["opening_hours", "internet_access", "internet_access/ssid", "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", "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", "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/anglican": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church of england", "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": "anglican"}, "reference": {"key": "denomination", "value": "anglican"}, "name": "Anglican Church"}, + "amenity/place_of_worship/christian/baptist": {"icon": "maki-religious-christian", "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": "baptist"}, "reference": {"key": "denomination", "value": "baptist"}, "name": "Baptist Church"}, + "amenity/place_of_worship/christian/catholic": {"icon": "maki-religious-christian", "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", "priest", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "catholic"}, "reference": {"key": "denomination", "value": "catholic"}, "name": "Catholic Church"}, + "amenity/place_of_worship/christian/evangelical": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "evangelical protestantism", "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": "evangelical"}, "reference": {"key": "denomination", "value": "evangelical"}, "name": "Evangelical Church"}, + "amenity/place_of_worship/christian/greek_orthodox": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "eastern orthodox", "fold", "house of God", "house of prayer", "house of worship", "orthodox catholic church", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "greek_orthodox"}, "reference": {"key": "denomination", "value": "greek_orthodox"}, "name": "Greek Orthodox Church"}, + "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-religious-christian", "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/lutheran": {"icon": "maki-religious-christian", "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": "lutheran"}, "reference": {"key": "denomination", "value": "lutheran"}, "name": "Lutheran Church"}, + "amenity/place_of_worship/christian/methodist": {"icon": "maki-religious-christian", "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": "methodist"}, "reference": {"key": "denomination", "value": "methodist"}, "name": "Methodist Church"}, + "amenity/place_of_worship/christian/orthodox": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "orthodox catholic church", "minster", "mission", "oratory", "parish", "priest", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "orthodox"}, "reference": {"key": "denomination", "value": "orthodox"}, "name": "Eastern Orthodox Church"}, + "amenity/place_of_worship/christian/pentecostal": {"icon": "maki-religious-christian", "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": "pentecostal"}, "reference": {"key": "denomination", "value": "pentecostal"}, "name": "Pentecostal Church"}, + "amenity/place_of_worship/christian/presbyterian": {"icon": "maki-religious-christian", "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": "presbyterian"}, "reference": {"key": "denomination", "value": "presbyterian"}, "name": "Presbyterian Church"}, + "amenity/place_of_worship/christian/quaker": {"icon": "maki-religious-christian", "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/roman_catholic": {"icon": "maki-religious-christian", "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", "priest", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "roman_catholic"}, "reference": {"key": "denomination", "value": "roman_catholic"}, "name": "Roman Catholic Church"}, + "amenity/place_of_worship/christian/russian_orthodox": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "eastern orthodox", "fold", "house of God", "house of prayer", "house of worship", "orthodox catholic church", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "russian_orthodox"}, "reference": {"key": "denomination", "value": "russian_orthodox"}, "name": "Russian Orthodox Church"}, + "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "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", "geometry": ["point", "area"], "terms": ["judaism"], "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", "geometry": ["point", "area"], "terms": ["dome", "islam", "minaret", "musalla", "shia", "sunni"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"}, + "amenity/place_of_worship/muslim/shia": {"icon": "maki-religious-muslim", "geometry": ["point", "area"], "terms": ["dome", "islam", "minaret", "musalla"], "tags": {"amenity": "place_of_worship", "religion": "muslim", "denomination": "shia"}, "reference": {"key": "denomination", "value": "shia"}, "name": "Shia Muslim Mosque"}, + "amenity/place_of_worship/muslim/sunni": {"icon": "maki-religious-muslim", "geometry": ["point", "area"], "terms": ["dome", "islam", "minaret", "musalla"], "tags": {"amenity": "place_of_worship", "religion": "muslim", "denomination": "sunni"}, "reference": {"key": "denomination", "value": "sunni"}, "name": "Sunni Muslim Mosque"}, + "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "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", "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", "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"}, "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"}, "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"}, "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"}, diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json index 5ee14bf9f..7d419b84b 100644 --- a/data/presets/presets/amenity/place_of_worship.json +++ b/data/presets/presets/amenity/place_of_worship.json @@ -6,13 +6,13 @@ "denomination", "address", "building_area", - "service_times" + "service_times", + "website" ], "moreFields": [ "opening_hours", "internet_access", "internet_access/ssid", - "website", "phone", "email", "fax", diff --git a/data/presets/presets/amenity/place_of_worship/buddhist.json b/data/presets/presets/amenity/place_of_worship/buddhist.json index ace4cf645..66c53c812 100644 --- a/data/presets/presets/amenity/place_of_worship/buddhist.json +++ b/data/presets/presets/amenity/place_of_worship/buddhist.json @@ -1,13 +1,5 @@ { "icon": "maki-religious-buddhist", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json index 25f0fdb18..f68ab07eb 100644 --- a/data/presets/presets/amenity/place_of_worship/christian.json +++ b/data/presets/presets/amenity/place_of_worship/christian.json @@ -1,13 +1,5 @@ { "icon": "maki-religious-christian", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/christian/anglican.json b/data/presets/presets/amenity/place_of_worship/christian/anglican.json new file mode 100644 index 000000000..251a00a72 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/anglican.json @@ -0,0 +1,41 @@ +{ + "icon": "maki-religious-christian", + "geometry": [ + "point", + "area" + ], + "terms": [ + "christian", + "abbey", + "basilica", + "bethel", + "cathedral", + "chancel", + "chantry", + "chapel", + "church of england", + "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": "anglican" + }, + "reference": { + "key": "denomination", + "value": "anglican" + }, + "name": "Anglican Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/baptist.json b/data/presets/presets/amenity/place_of_worship/christian/baptist.json new file mode 100644 index 000000000..de06628a8 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/baptist.json @@ -0,0 +1,40 @@ +{ + "icon": "maki-religious-christian", + "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": "baptist" + }, + "reference": { + "key": "denomination", + "value": "baptist" + }, + "name": "Baptist Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/catholic.json b/data/presets/presets/amenity/place_of_worship/christian/catholic.json new file mode 100644 index 000000000..15365d3a0 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/catholic.json @@ -0,0 +1,41 @@ +{ + "icon": "maki-religious-christian", + "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", + "priest", + "sacellum", + "sanctuary", + "shrine", + "tabernacle", + "temple" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "christian", + "denomination": "catholic" + }, + "reference": { + "key": "denomination", + "value": "catholic" + }, + "name": "Catholic Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/evangelical.json b/data/presets/presets/amenity/place_of_worship/christian/evangelical.json new file mode 100644 index 000000000..454c93f2b --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/evangelical.json @@ -0,0 +1,41 @@ +{ + "icon": "maki-religious-christian", + "geometry": [ + "point", + "area" + ], + "terms": [ + "christian", + "abbey", + "basilica", + "bethel", + "cathedral", + "chancel", + "chantry", + "chapel", + "evangelical protestantism", + "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": "evangelical" + }, + "reference": { + "key": "denomination", + "value": "evangelical" + }, + "name": "Evangelical Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json b/data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json new file mode 100644 index 000000000..d27743832 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json @@ -0,0 +1,42 @@ +{ + "icon": "maki-religious-christian", + "geometry": [ + "point", + "area" + ], + "terms": [ + "christian", + "abbey", + "basilica", + "bethel", + "cathedral", + "chancel", + "chantry", + "chapel", + "eastern orthodox", + "fold", + "house of God", + "house of prayer", + "house of worship", + "orthodox catholic church", + "minster", + "mission", + "oratory", + "parish", + "sacellum", + "sanctuary", + "shrine", + "tabernacle", + "temple" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "christian", + "denomination": "greek_orthodox" + }, + "reference": { + "key": "denomination", + "value": "greek_orthodox" + }, + "name": "Greek Orthodox Church" +} 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 new file mode 100644 index 000000000..b7b0e106b --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json @@ -0,0 +1,40 @@ +{ + "icon": "maki-religious-christian", + "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" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/lutheran.json b/data/presets/presets/amenity/place_of_worship/christian/lutheran.json new file mode 100644 index 000000000..3b45aa02f --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/lutheran.json @@ -0,0 +1,40 @@ +{ + "icon": "maki-religious-christian", + "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": "lutheran" + }, + "reference": { + "key": "denomination", + "value": "lutheran" + }, + "name": "Lutheran Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/methodist.json b/data/presets/presets/amenity/place_of_worship/christian/methodist.json new file mode 100644 index 000000000..4a834ad08 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/methodist.json @@ -0,0 +1,40 @@ +{ + "icon": "maki-religious-christian", + "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": "methodist" + }, + "reference": { + "key": "denomination", + "value": "methodist" + }, + "name": "Methodist Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/orthodox.json b/data/presets/presets/amenity/place_of_worship/christian/orthodox.json new file mode 100644 index 000000000..0f0fbc849 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/orthodox.json @@ -0,0 +1,42 @@ +{ + "icon": "maki-religious-christian", + "geometry": [ + "point", + "area" + ], + "terms": [ + "christian", + "abbey", + "basilica", + "bethel", + "cathedral", + "chancel", + "chantry", + "chapel", + "fold", + "house of God", + "house of prayer", + "house of worship", + "orthodox catholic church", + "minster", + "mission", + "oratory", + "parish", + "priest", + "sacellum", + "sanctuary", + "shrine", + "tabernacle", + "temple" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "christian", + "denomination": "orthodox" + }, + "reference": { + "key": "denomination", + "value": "orthodox" + }, + "name": "Eastern Orthodox Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/pentecostal.json b/data/presets/presets/amenity/place_of_worship/christian/pentecostal.json new file mode 100644 index 000000000..8584c50b4 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/pentecostal.json @@ -0,0 +1,40 @@ +{ + "icon": "maki-religious-christian", + "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": "pentecostal" + }, + "reference": { + "key": "denomination", + "value": "pentecostal" + }, + "name": "Pentecostal Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/presbyterian.json b/data/presets/presets/amenity/place_of_worship/christian/presbyterian.json new file mode 100644 index 000000000..bbafb2aae --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/presbyterian.json @@ -0,0 +1,40 @@ +{ + "icon": "maki-religious-christian", + "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": "presbyterian" + }, + "reference": { + "key": "denomination", + "value": "presbyterian" + }, + "name": "Presbyterian Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/quaker.json b/data/presets/presets/amenity/place_of_worship/christian/quaker.json new file mode 100644 index 000000000..4ce4e7236 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/quaker.json @@ -0,0 +1,40 @@ +{ + "icon": "maki-religious-christian", + "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" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json b/data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json new file mode 100644 index 000000000..231921717 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json @@ -0,0 +1,41 @@ +{ + "icon": "maki-religious-christian", + "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", + "priest", + "sacellum", + "sanctuary", + "shrine", + "tabernacle", + "temple" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "christian", + "denomination": "roman_catholic" + }, + "reference": { + "key": "denomination", + "value": "roman_catholic" + }, + "name": "Roman Catholic Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json b/data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json new file mode 100644 index 000000000..6f4dbcb06 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json @@ -0,0 +1,42 @@ +{ + "icon": "maki-religious-christian", + "geometry": [ + "point", + "area" + ], + "terms": [ + "christian", + "abbey", + "basilica", + "bethel", + "cathedral", + "chancel", + "chantry", + "chapel", + "eastern orthodox", + "fold", + "house of God", + "house of prayer", + "house of worship", + "orthodox catholic church", + "minster", + "mission", + "oratory", + "parish", + "sacellum", + "sanctuary", + "shrine", + "tabernacle", + "temple" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "christian", + "denomination": "russian_orthodox" + }, + "reference": { + "key": "denomination", + "value": "russian_orthodox" + }, + "name": "Russian Orthodox Church" +} diff --git a/data/presets/presets/amenity/place_of_worship/hindu.json b/data/presets/presets/amenity/place_of_worship/hindu.json index 2a5b53567..bfbf7ea23 100644 --- a/data/presets/presets/amenity/place_of_worship/hindu.json +++ b/data/presets/presets/amenity/place_of_worship/hindu.json @@ -1,13 +1,5 @@ { "icon": "temaki-hinduism", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json index c0b406055..7a4508d72 100644 --- a/data/presets/presets/amenity/place_of_worship/jewish.json +++ b/data/presets/presets/amenity/place_of_worship/jewish.json @@ -1,19 +1,11 @@ { "icon": "maki-religious-jewish", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" ], "terms": [ - "jewish" + "judaism" ], "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 bc7d80459..25cce622f 100644 --- a/data/presets/presets/amenity/place_of_worship/muslim.json +++ b/data/presets/presets/amenity/place_of_worship/muslim.json @@ -1,19 +1,16 @@ { "icon": "maki-religious-muslim", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" ], "terms": [ - "muslim" + "dome", + "islam", + "minaret", + "musalla", + "shia", + "sunni" ], "tags": { "amenity": "place_of_worship", diff --git a/data/presets/presets/amenity/place_of_worship/muslim/shia.json b/data/presets/presets/amenity/place_of_worship/muslim/shia.json new file mode 100644 index 000000000..c73ef73d6 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/muslim/shia.json @@ -0,0 +1,23 @@ +{ + "icon": "maki-religious-muslim", + "geometry": [ + "point", + "area" + ], + "terms": [ + "dome", + "islam", + "minaret", + "musalla" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "muslim", + "denomination": "shia" + }, + "reference": { + "key": "denomination", + "value": "shia" + }, + "name": "Shia Muslim Mosque" +} diff --git a/data/presets/presets/amenity/place_of_worship/muslim/sunni.json b/data/presets/presets/amenity/place_of_worship/muslim/sunni.json new file mode 100644 index 000000000..733f17fd8 --- /dev/null +++ b/data/presets/presets/amenity/place_of_worship/muslim/sunni.json @@ -0,0 +1,23 @@ +{ + "icon": "maki-religious-muslim", + "geometry": [ + "point", + "area" + ], + "terms": [ + "dome", + "islam", + "minaret", + "musalla" + ], + "tags": { + "amenity": "place_of_worship", + "religion": "muslim", + "denomination": "sunni" + }, + "reference": { + "key": "denomination", + "value": "sunni" + }, + "name": "Sunni Muslim Mosque" +} diff --git a/data/presets/presets/amenity/place_of_worship/shinto.json b/data/presets/presets/amenity/place_of_worship/shinto.json index 1bfe24aeb..6da0203ee 100644 --- a/data/presets/presets/amenity/place_of_worship/shinto.json +++ b/data/presets/presets/amenity/place_of_worship/shinto.json @@ -1,13 +1,5 @@ { "icon": "temaki-shinto", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/sikh.json b/data/presets/presets/amenity/place_of_worship/sikh.json index 83196bc56..9f477a6f8 100644 --- a/data/presets/presets/amenity/place_of_worship/sikh.json +++ b/data/presets/presets/amenity/place_of_worship/sikh.json @@ -1,13 +1,5 @@ { "icon": "temaki-sikhism", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/taoist.json b/data/presets/presets/amenity/place_of_worship/taoist.json index 5c01f1f3b..7cb57f293 100644 --- a/data/presets/presets/amenity/place_of_worship/taoist.json +++ b/data/presets/presets/amenity/place_of_worship/taoist.json @@ -1,13 +1,5 @@ { "icon": "temaki-taoism", - "fields": [ - "name", - "religion", - "denomination", - "building_area", - "address", - "service_times" - ], "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index f067418ac..bdcb3825b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -126,9 +126,25 @@ {"key": "amenity", "value": "place_of_worship", "description": "🄿 Place of Worship", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"}, {"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": "anglican", "description": "🄿 Anglican Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "baptist", "description": "🄿 Baptist Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "catholic", "description": "🄿 Catholic Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "evangelical", "description": "🄿 Evangelical Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "greek_orthodox", "description": "🄿 Greek Orthodox 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/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "lutheran", "description": "🄿 Lutheran Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "methodist", "description": "🄿 Methodist Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "orthodox", "description": "🄿 Eastern Orthodox Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "pentecostal", "description": "🄿 Pentecostal Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "presbyterian", "description": "🄿 Presbyterian Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-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/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "roman_catholic", "description": "🄿 Roman Catholic Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, + {"key": "denomination", "value": "russian_orthodox", "description": "🄿 Russian Orthodox Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-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"}, {"key": "religion", "value": "muslim", "description": "🄿 Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"}, + {"key": "denomination", "value": "shia", "description": "🄿 Shia Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"}, + {"key": "denomination", "value": "sunni", "description": "🄿 Sunni Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"}, {"key": "religion", "value": "shinto", "description": "🄿 Shinto Shrine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/shinto.svg?sanitize=true"}, {"key": "religion", "value": "sikh", "description": "🄿 Sikh Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/sikhism.svg?sanitize=true"}, {"key": "religion", "value": "taoist", "description": "🄿 Taoist Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/taoism.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 7019717d9..224d54d96 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4138,17 +4138,81 @@ "name": "Christian 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" }, + "amenity/place_of_worship/christian/anglican": { + "name": "Anglican Church", + "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church of england,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" + }, + "amenity/place_of_worship/christian/baptist": { + "name": "Baptist 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" + }, + "amenity/place_of_worship/christian/catholic": { + "name": "Catholic Church", + "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple" + }, + "amenity/place_of_worship/christian/evangelical": { + "name": "Evangelical Church", + "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,evangelical protestantism,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" + }, + "amenity/place_of_worship/christian/greek_orthodox": { + "name": "Greek Orthodox Church", + "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" + }, + "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" + }, + "amenity/place_of_worship/christian/lutheran": { + "name": "Lutheran 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" + }, + "amenity/place_of_worship/christian/methodist": { + "name": "Methodist 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" + }, + "amenity/place_of_worship/christian/orthodox": { + "name": "Eastern Orthodox Church", + "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple" + }, + "amenity/place_of_worship/christian/pentecostal": { + "name": "Pentecostal 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" + }, + "amenity/place_of_worship/christian/presbyterian": { + "name": "Presbyterian 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" + }, + "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" + }, + "amenity/place_of_worship/christian/roman_catholic": { + "name": "Roman Catholic Church", + "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple" + }, + "amenity/place_of_worship/christian/russian_orthodox": { + "name": "Russian Orthodox Church", + "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" + }, "amenity/place_of_worship/hindu": { "name": "Hindu Temple", "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple" }, "amenity/place_of_worship/jewish": { "name": "Jewish Synagogue", - "terms": "jewish" + "terms": "judaism" }, "amenity/place_of_worship/muslim": { "name": "Muslim Mosque", - "terms": "muslim" + "terms": "dome,islam,minaret,musalla,shia,sunni" + }, + "amenity/place_of_worship/muslim/shia": { + "name": "Shia Muslim Mosque", + "terms": "dome,islam,minaret,musalla" + }, + "amenity/place_of_worship/muslim/sunni": { + "name": "Sunni Muslim Mosque", + "terms": "dome,islam,minaret,musalla" }, "amenity/place_of_worship/shinto": { "name": "Shinto Shrine", From 7763626b02a30486c889111bab9583a7cbbc1e36 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 5 Feb 2019 10:22:43 -0500 Subject: [PATCH 3/4] Add access_simple field to library preset Update Website field placeholder to use https --- data/presets.yaml | 2 +- data/presets/fields.json | 2 +- data/presets/fields/website.json | 2 +- data/presets/presets.json | 2 +- data/presets/presets/amenity/library.json | 5 +++-- dist/locales/en.json | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index fcc51f16d..1b38403db 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2089,7 +2089,7 @@ en: # website=* label: Website # website field placeholder - placeholder: 'http://example.com/' + placeholder: 'https://example.com' wetland: # wetland=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index c578d98a1..acb9bebba 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -362,7 +362,7 @@ "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (m³)", "snake_case": false}, "water": {"key": "water", "type": "combo", "label": "Type"}, "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"}, - "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "http://example.com/", "label": "Website"}, + "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "https://example.com", "label": "Website"}, "wetland": {"key": "wetland", "type": "combo", "label": "Type"}, "wheelchair": {"key": "wheelchair", "type": "radio", "options": ["yes", "limited", "no"], "icon": "maki-wheelchair", "label": "Wheelchair Access"}, "wholesale": {"key": "wholesale", "type": "typeCombo", "label": "Wholesale"}, diff --git a/data/presets/fields/website.json b/data/presets/fields/website.json index cb00db2eb..cbf614737 100644 --- a/data/presets/fields/website.json +++ b/data/presets/fields/website.json @@ -2,6 +2,6 @@ "key": "website", "type": "url", "icon": "website", - "placeholder": "http://example.com/", + "placeholder": "https://example.com", "label": "Website" } diff --git a/data/presets/presets.json b/data/presets/presets.json index 47bda6058..db9c262fc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -105,7 +105,7 @@ "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["opening_hours", "smoking", "outdoor_seating", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"}, "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"}, "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"}, - "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil"], "moreFields": ["opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"}, + "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil", "internet_access"], "moreFields": ["access_simple", "opening_hours", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"}, "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"}, "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"}, "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["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", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"}, diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json index 4ab447640..1eeb3bba5 100644 --- a/data/presets/presets/amenity/library.json +++ b/data/presets/presets/amenity/library.json @@ -5,11 +5,12 @@ "operator", "building_area", "address", - "ref/isil" + "ref/isil", + "internet_access" ], "moreFields" : [ + "access_simple", "opening_hours", - "internet_access", "internet_access/fee", "internet_access/ssid", "website", diff --git a/dist/locales/en.json b/dist/locales/en.json index 224d54d96..9ddbba14d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3608,7 +3608,7 @@ }, "website": { "label": "Website", - "placeholder": "http://example.com/" + "placeholder": "https://example.com" }, "wetland": { "label": "Type" From 23ab1b66fba64c830397116ae8a2b8f0fa7afa10 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 5 Feb 2019 11:06:31 -0500 Subject: [PATCH 4/4] Revert "Update places of worship to use field inheritance" This reverts commit 44d4f2378d47042943e86f4c485a4fefd2e14e8b. --- data/presets.yaml | 84 +------------------ data/presets/presets.json | 34 ++------ .../presets/amenity/place_of_worship.json | 4 +- .../amenity/place_of_worship/buddhist.json | 8 ++ .../amenity/place_of_worship/christian.json | 8 ++ .../place_of_worship/christian/anglican.json | 41 --------- .../place_of_worship/christian/baptist.json | 40 --------- .../place_of_worship/christian/catholic.json | 41 --------- .../christian/evangelical.json | 41 --------- .../christian/greek_orthodox.json | 42 ---------- .../christian/jehovahs_witness.json | 40 --------- .../place_of_worship/christian/lutheran.json | 40 --------- .../place_of_worship/christian/methodist.json | 40 --------- .../place_of_worship/christian/orthodox.json | 42 ---------- .../christian/pentecostal.json | 40 --------- .../christian/presbyterian.json | 40 --------- .../place_of_worship/christian/quaker.json | 40 --------- .../christian/roman_catholic.json | 41 --------- .../christian/russian_orthodox.json | 42 ---------- .../amenity/place_of_worship/hindu.json | 8 ++ .../amenity/place_of_worship/jewish.json | 10 ++- .../amenity/place_of_worship/muslim.json | 15 ++-- .../amenity/place_of_worship/muslim/shia.json | 23 ----- .../place_of_worship/muslim/sunni.json | 23 ----- .../amenity/place_of_worship/shinto.json | 8 ++ .../amenity/place_of_worship/sikh.json | 8 ++ .../amenity/place_of_worship/taoist.json | 8 ++ data/taginfo.json | 16 ---- dist/locales/en.json | 68 +-------------- 29 files changed, 81 insertions(+), 814 deletions(-) delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/anglican.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/baptist.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/catholic.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/evangelical.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/lutheran.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/methodist.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/orthodox.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/pentecostal.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/presbyterian.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/quaker.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json delete mode 100644 data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json delete mode 100644 data/presets/presets/amenity/place_of_worship/muslim/shia.json delete mode 100644 data/presets/presets/amenity/place_of_worship/muslim/sunni.json diff --git a/data/presets.yaml b/data/presets.yaml index 1b38403db..6dadf809a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2627,76 +2627,6 @@ en: name: Christian 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' terms: '' - amenity/place_of_worship/christian/anglican: - # 'amenity=place_of_worship, religion=christian, denomination=anglican' - name: Anglican Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church of england,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' - terms: '' - amenity/place_of_worship/christian/baptist: - # 'amenity=place_of_worship, religion=christian, denomination=baptist' - name: Baptist 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' - terms: '' - amenity/place_of_worship/christian/catholic: - # 'amenity=place_of_worship, religion=christian, denomination=catholic' - name: Catholic Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple' - terms: '' - amenity/place_of_worship/christian/evangelical: - # 'amenity=place_of_worship, religion=christian, denomination=evangelical' - name: Evangelical Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,evangelical protestantism,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' - terms: '' - amenity/place_of_worship/christian/greek_orthodox: - # 'amenity=place_of_worship, religion=christian, denomination=greek_orthodox' - name: Greek Orthodox Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' - terms: '' - 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: '' - amenity/place_of_worship/christian/lutheran: - # 'amenity=place_of_worship, religion=christian, denomination=lutheran' - name: Lutheran 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' - terms: '' - amenity/place_of_worship/christian/methodist: - # 'amenity=place_of_worship, religion=christian, denomination=methodist' - name: Methodist 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' - terms: '' - amenity/place_of_worship/christian/orthodox: - # 'amenity=place_of_worship, religion=christian, denomination=orthodox' - name: Eastern Orthodox Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple' - terms: '' - amenity/place_of_worship/christian/pentecostal: - # 'amenity=place_of_worship, religion=christian, denomination=pentecostal' - name: Pentecostal 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' - terms: '' - amenity/place_of_worship/christian/presbyterian: - # 'amenity=place_of_worship, religion=christian, denomination=presbyterian' - name: Presbyterian 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' - 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: '' - amenity/place_of_worship/christian/roman_catholic: - # 'amenity=place_of_worship, religion=christian, denomination=roman_catholic' - name: Roman Catholic Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple' - terms: '' - amenity/place_of_worship/christian/russian_orthodox: - # 'amenity=place_of_worship, religion=christian, denomination=russian_orthodox' - name: Russian Orthodox Church - # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple' - terms: '' amenity/place_of_worship/hindu: # 'amenity=place_of_worship, religion=hindu' name: Hindu Temple @@ -2705,23 +2635,13 @@ en: amenity/place_of_worship/jewish: # 'amenity=place_of_worship, religion=jewish' name: Jewish Synagogue - # 'terms: judaism' + # 'terms: jewish' terms: '' amenity/place_of_worship/muslim: # 'amenity=place_of_worship, religion=muslim' name: Muslim Mosque - # 'terms: dome,islam,minaret,musalla,shia,sunni' + # 'terms: muslim' terms: '' - amenity/place_of_worship/muslim/shia: - # 'amenity=place_of_worship, religion=muslim, denomination=shia' - name: Shia Muslim Mosque - # 'terms: dome,islam,minaret,musalla' - terms: '' - amenity/place_of_worship/muslim/sunni: - # 'amenity=place_of_worship, religion=muslim, denomination=sunni' - name: Sunni Muslim Mosque - # 'terms: dome,islam,minaret,musalla' - terms: '' amenity/place_of_worship/shinto: # 'amenity=place_of_worship, religion=shinto' name: Shinto Shrine diff --git a/data/presets/presets.json b/data/presets/presets.json index db9c262fc..7deae01ff 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -120,31 +120,15 @@ "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax", "wheelchair"], "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"], "moreFields": ["currency_multi", "wheelchair"], "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", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "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", "website"], "moreFields": ["opening_hours", "internet_access", "internet_access/ssid", "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", "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", "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/anglican": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church of england", "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": "anglican"}, "reference": {"key": "denomination", "value": "anglican"}, "name": "Anglican Church"}, - "amenity/place_of_worship/christian/baptist": {"icon": "maki-religious-christian", "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": "baptist"}, "reference": {"key": "denomination", "value": "baptist"}, "name": "Baptist Church"}, - "amenity/place_of_worship/christian/catholic": {"icon": "maki-religious-christian", "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", "priest", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "catholic"}, "reference": {"key": "denomination", "value": "catholic"}, "name": "Catholic Church"}, - "amenity/place_of_worship/christian/evangelical": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "evangelical protestantism", "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": "evangelical"}, "reference": {"key": "denomination", "value": "evangelical"}, "name": "Evangelical Church"}, - "amenity/place_of_worship/christian/greek_orthodox": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "eastern orthodox", "fold", "house of God", "house of prayer", "house of worship", "orthodox catholic church", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "greek_orthodox"}, "reference": {"key": "denomination", "value": "greek_orthodox"}, "name": "Greek Orthodox Church"}, - "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-religious-christian", "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/lutheran": {"icon": "maki-religious-christian", "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": "lutheran"}, "reference": {"key": "denomination", "value": "lutheran"}, "name": "Lutheran Church"}, - "amenity/place_of_worship/christian/methodist": {"icon": "maki-religious-christian", "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": "methodist"}, "reference": {"key": "denomination", "value": "methodist"}, "name": "Methodist Church"}, - "amenity/place_of_worship/christian/orthodox": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "orthodox catholic church", "minster", "mission", "oratory", "parish", "priest", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "orthodox"}, "reference": {"key": "denomination", "value": "orthodox"}, "name": "Eastern Orthodox Church"}, - "amenity/place_of_worship/christian/pentecostal": {"icon": "maki-religious-christian", "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": "pentecostal"}, "reference": {"key": "denomination", "value": "pentecostal"}, "name": "Pentecostal Church"}, - "amenity/place_of_worship/christian/presbyterian": {"icon": "maki-religious-christian", "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": "presbyterian"}, "reference": {"key": "denomination", "value": "presbyterian"}, "name": "Presbyterian Church"}, - "amenity/place_of_worship/christian/quaker": {"icon": "maki-religious-christian", "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/roman_catholic": {"icon": "maki-religious-christian", "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", "priest", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "roman_catholic"}, "reference": {"key": "denomination", "value": "roman_catholic"}, "name": "Roman Catholic Church"}, - "amenity/place_of_worship/christian/russian_orthodox": {"icon": "maki-religious-christian", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "eastern orthodox", "fold", "house of God", "house of prayer", "house of worship", "orthodox catholic church", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "russian_orthodox"}, "reference": {"key": "denomination", "value": "russian_orthodox"}, "name": "Russian Orthodox Church"}, - "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "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", "geometry": ["point", "area"], "terms": ["judaism"], "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", "geometry": ["point", "area"], "terms": ["dome", "islam", "minaret", "musalla", "shia", "sunni"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"}, - "amenity/place_of_worship/muslim/shia": {"icon": "maki-religious-muslim", "geometry": ["point", "area"], "terms": ["dome", "islam", "minaret", "musalla"], "tags": {"amenity": "place_of_worship", "religion": "muslim", "denomination": "shia"}, "reference": {"key": "denomination", "value": "shia"}, "name": "Shia Muslim Mosque"}, - "amenity/place_of_worship/muslim/sunni": {"icon": "maki-religious-muslim", "geometry": ["point", "area"], "terms": ["dome", "islam", "minaret", "musalla"], "tags": {"amenity": "place_of_worship", "religion": "muslim", "denomination": "sunni"}, "reference": {"key": "denomination", "value": "sunni"}, "name": "Sunni Muslim Mosque"}, - "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "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", "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", "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"}, + "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["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", "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", "religion", "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": "Christian Church"}, + "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"}, "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"}, "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"}, "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"}, diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json index 7d419b84b..5ee14bf9f 100644 --- a/data/presets/presets/amenity/place_of_worship.json +++ b/data/presets/presets/amenity/place_of_worship.json @@ -6,13 +6,13 @@ "denomination", "address", "building_area", - "service_times", - "website" + "service_times" ], "moreFields": [ "opening_hours", "internet_access", "internet_access/ssid", + "website", "phone", "email", "fax", diff --git a/data/presets/presets/amenity/place_of_worship/buddhist.json b/data/presets/presets/amenity/place_of_worship/buddhist.json index 66c53c812..ace4cf645 100644 --- a/data/presets/presets/amenity/place_of_worship/buddhist.json +++ b/data/presets/presets/amenity/place_of_worship/buddhist.json @@ -1,5 +1,13 @@ { "icon": "maki-religious-buddhist", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json index f68ab07eb..25f0fdb18 100644 --- a/data/presets/presets/amenity/place_of_worship/christian.json +++ b/data/presets/presets/amenity/place_of_worship/christian.json @@ -1,5 +1,13 @@ { "icon": "maki-religious-christian", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/christian/anglican.json b/data/presets/presets/amenity/place_of_worship/christian/anglican.json deleted file mode 100644 index 251a00a72..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/anglican.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "icon": "maki-religious-christian", - "geometry": [ - "point", - "area" - ], - "terms": [ - "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "church of england", - "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": "anglican" - }, - "reference": { - "key": "denomination", - "value": "anglican" - }, - "name": "Anglican Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/baptist.json b/data/presets/presets/amenity/place_of_worship/christian/baptist.json deleted file mode 100644 index de06628a8..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/baptist.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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": "baptist" - }, - "reference": { - "key": "denomination", - "value": "baptist" - }, - "name": "Baptist Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/catholic.json b/data/presets/presets/amenity/place_of_worship/christian/catholic.json deleted file mode 100644 index 15365d3a0..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/catholic.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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", - "priest", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "christian", - "denomination": "catholic" - }, - "reference": { - "key": "denomination", - "value": "catholic" - }, - "name": "Catholic Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/evangelical.json b/data/presets/presets/amenity/place_of_worship/christian/evangelical.json deleted file mode 100644 index 454c93f2b..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/evangelical.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "icon": "maki-religious-christian", - "geometry": [ - "point", - "area" - ], - "terms": [ - "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "evangelical protestantism", - "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": "evangelical" - }, - "reference": { - "key": "denomination", - "value": "evangelical" - }, - "name": "Evangelical Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json b/data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json deleted file mode 100644 index d27743832..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/greek_orthodox.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "icon": "maki-religious-christian", - "geometry": [ - "point", - "area" - ], - "terms": [ - "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "eastern orthodox", - "fold", - "house of God", - "house of prayer", - "house of worship", - "orthodox catholic church", - "minster", - "mission", - "oratory", - "parish", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "christian", - "denomination": "greek_orthodox" - }, - "reference": { - "key": "denomination", - "value": "greek_orthodox" - }, - "name": "Greek Orthodox Church" -} 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 deleted file mode 100644 index b7b0e106b..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/lutheran.json b/data/presets/presets/amenity/place_of_worship/christian/lutheran.json deleted file mode 100644 index 3b45aa02f..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/lutheran.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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": "lutheran" - }, - "reference": { - "key": "denomination", - "value": "lutheran" - }, - "name": "Lutheran Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/methodist.json b/data/presets/presets/amenity/place_of_worship/christian/methodist.json deleted file mode 100644 index 4a834ad08..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/methodist.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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": "methodist" - }, - "reference": { - "key": "denomination", - "value": "methodist" - }, - "name": "Methodist Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/orthodox.json b/data/presets/presets/amenity/place_of_worship/christian/orthodox.json deleted file mode 100644 index 0f0fbc849..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/orthodox.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "icon": "maki-religious-christian", - "geometry": [ - "point", - "area" - ], - "terms": [ - "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "fold", - "house of God", - "house of prayer", - "house of worship", - "orthodox catholic church", - "minster", - "mission", - "oratory", - "parish", - "priest", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "christian", - "denomination": "orthodox" - }, - "reference": { - "key": "denomination", - "value": "orthodox" - }, - "name": "Eastern Orthodox Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/pentecostal.json b/data/presets/presets/amenity/place_of_worship/christian/pentecostal.json deleted file mode 100644 index 8584c50b4..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/pentecostal.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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": "pentecostal" - }, - "reference": { - "key": "denomination", - "value": "pentecostal" - }, - "name": "Pentecostal Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/presbyterian.json b/data/presets/presets/amenity/place_of_worship/christian/presbyterian.json deleted file mode 100644 index bbafb2aae..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/presbyterian.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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": "presbyterian" - }, - "reference": { - "key": "denomination", - "value": "presbyterian" - }, - "name": "Presbyterian Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/quaker.json b/data/presets/presets/amenity/place_of_worship/christian/quaker.json deleted file mode 100644 index 4ce4e7236..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/quaker.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json b/data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json deleted file mode 100644 index 231921717..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/roman_catholic.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "icon": "maki-religious-christian", - "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", - "priest", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "christian", - "denomination": "roman_catholic" - }, - "reference": { - "key": "denomination", - "value": "roman_catholic" - }, - "name": "Roman Catholic Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json b/data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json deleted file mode 100644 index 6f4dbcb06..000000000 --- a/data/presets/presets/amenity/place_of_worship/christian/russian_orthodox.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "icon": "maki-religious-christian", - "geometry": [ - "point", - "area" - ], - "terms": [ - "christian", - "abbey", - "basilica", - "bethel", - "cathedral", - "chancel", - "chantry", - "chapel", - "eastern orthodox", - "fold", - "house of God", - "house of prayer", - "house of worship", - "orthodox catholic church", - "minster", - "mission", - "oratory", - "parish", - "sacellum", - "sanctuary", - "shrine", - "tabernacle", - "temple" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "christian", - "denomination": "russian_orthodox" - }, - "reference": { - "key": "denomination", - "value": "russian_orthodox" - }, - "name": "Russian Orthodox Church" -} diff --git a/data/presets/presets/amenity/place_of_worship/hindu.json b/data/presets/presets/amenity/place_of_worship/hindu.json index bfbf7ea23..2a5b53567 100644 --- a/data/presets/presets/amenity/place_of_worship/hindu.json +++ b/data/presets/presets/amenity/place_of_worship/hindu.json @@ -1,5 +1,13 @@ { "icon": "temaki-hinduism", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json index 7a4508d72..c0b406055 100644 --- a/data/presets/presets/amenity/place_of_worship/jewish.json +++ b/data/presets/presets/amenity/place_of_worship/jewish.json @@ -1,11 +1,19 @@ { "icon": "maki-religious-jewish", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" ], "terms": [ - "judaism" + "jewish" ], "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 25cce622f..bc7d80459 100644 --- a/data/presets/presets/amenity/place_of_worship/muslim.json +++ b/data/presets/presets/amenity/place_of_worship/muslim.json @@ -1,16 +1,19 @@ { "icon": "maki-religious-muslim", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" ], "terms": [ - "dome", - "islam", - "minaret", - "musalla", - "shia", - "sunni" + "muslim" ], "tags": { "amenity": "place_of_worship", diff --git a/data/presets/presets/amenity/place_of_worship/muslim/shia.json b/data/presets/presets/amenity/place_of_worship/muslim/shia.json deleted file mode 100644 index c73ef73d6..000000000 --- a/data/presets/presets/amenity/place_of_worship/muslim/shia.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "icon": "maki-religious-muslim", - "geometry": [ - "point", - "area" - ], - "terms": [ - "dome", - "islam", - "minaret", - "musalla" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "muslim", - "denomination": "shia" - }, - "reference": { - "key": "denomination", - "value": "shia" - }, - "name": "Shia Muslim Mosque" -} diff --git a/data/presets/presets/amenity/place_of_worship/muslim/sunni.json b/data/presets/presets/amenity/place_of_worship/muslim/sunni.json deleted file mode 100644 index 733f17fd8..000000000 --- a/data/presets/presets/amenity/place_of_worship/muslim/sunni.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "icon": "maki-religious-muslim", - "geometry": [ - "point", - "area" - ], - "terms": [ - "dome", - "islam", - "minaret", - "musalla" - ], - "tags": { - "amenity": "place_of_worship", - "religion": "muslim", - "denomination": "sunni" - }, - "reference": { - "key": "denomination", - "value": "sunni" - }, - "name": "Sunni Muslim Mosque" -} diff --git a/data/presets/presets/amenity/place_of_worship/shinto.json b/data/presets/presets/amenity/place_of_worship/shinto.json index 6da0203ee..1bfe24aeb 100644 --- a/data/presets/presets/amenity/place_of_worship/shinto.json +++ b/data/presets/presets/amenity/place_of_worship/shinto.json @@ -1,5 +1,13 @@ { "icon": "temaki-shinto", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/sikh.json b/data/presets/presets/amenity/place_of_worship/sikh.json index 9f477a6f8..83196bc56 100644 --- a/data/presets/presets/amenity/place_of_worship/sikh.json +++ b/data/presets/presets/amenity/place_of_worship/sikh.json @@ -1,5 +1,13 @@ { "icon": "temaki-sikhism", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/amenity/place_of_worship/taoist.json b/data/presets/presets/amenity/place_of_worship/taoist.json index 7cb57f293..5c01f1f3b 100644 --- a/data/presets/presets/amenity/place_of_worship/taoist.json +++ b/data/presets/presets/amenity/place_of_worship/taoist.json @@ -1,5 +1,13 @@ { "icon": "temaki-taoism", + "fields": [ + "name", + "religion", + "denomination", + "building_area", + "address", + "service_times" + ], "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index bdcb3825b..f067418ac 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -126,25 +126,9 @@ {"key": "amenity", "value": "place_of_worship", "description": "🄿 Place of Worship", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"}, {"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": "anglican", "description": "🄿 Anglican Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "baptist", "description": "🄿 Baptist Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "catholic", "description": "🄿 Catholic Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "evangelical", "description": "🄿 Evangelical Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "greek_orthodox", "description": "🄿 Greek Orthodox 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/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "lutheran", "description": "🄿 Lutheran Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "methodist", "description": "🄿 Methodist Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "orthodox", "description": "🄿 Eastern Orthodox Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "pentecostal", "description": "🄿 Pentecostal Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "presbyterian", "description": "🄿 Presbyterian Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-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/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "roman_catholic", "description": "🄿 Roman Catholic Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, - {"key": "denomination", "value": "russian_orthodox", "description": "🄿 Russian Orthodox Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-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"}, {"key": "religion", "value": "muslim", "description": "🄿 Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"}, - {"key": "denomination", "value": "shia", "description": "🄿 Shia Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"}, - {"key": "denomination", "value": "sunni", "description": "🄿 Sunni Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"}, {"key": "religion", "value": "shinto", "description": "🄿 Shinto Shrine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/shinto.svg?sanitize=true"}, {"key": "religion", "value": "sikh", "description": "🄿 Sikh Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/sikhism.svg?sanitize=true"}, {"key": "religion", "value": "taoist", "description": "🄿 Taoist Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/taoism.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 9ddbba14d..65fea780d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4138,81 +4138,17 @@ "name": "Christian 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" }, - "amenity/place_of_worship/christian/anglican": { - "name": "Anglican Church", - "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church of england,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" - }, - "amenity/place_of_worship/christian/baptist": { - "name": "Baptist 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" - }, - "amenity/place_of_worship/christian/catholic": { - "name": "Catholic Church", - "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple" - }, - "amenity/place_of_worship/christian/evangelical": { - "name": "Evangelical Church", - "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,evangelical protestantism,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" - }, - "amenity/place_of_worship/christian/greek_orthodox": { - "name": "Greek Orthodox Church", - "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" - }, - "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" - }, - "amenity/place_of_worship/christian/lutheran": { - "name": "Lutheran 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" - }, - "amenity/place_of_worship/christian/methodist": { - "name": "Methodist 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" - }, - "amenity/place_of_worship/christian/orthodox": { - "name": "Eastern Orthodox Church", - "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple" - }, - "amenity/place_of_worship/christian/pentecostal": { - "name": "Pentecostal 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" - }, - "amenity/place_of_worship/christian/presbyterian": { - "name": "Presbyterian 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" - }, - "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" - }, - "amenity/place_of_worship/christian/roman_catholic": { - "name": "Roman Catholic Church", - "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,priest,sacellum,sanctuary,shrine,tabernacle,temple" - }, - "amenity/place_of_worship/christian/russian_orthodox": { - "name": "Russian Orthodox Church", - "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,eastern orthodox,fold,house of God,house of prayer,house of worship,orthodox catholic church,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple" - }, "amenity/place_of_worship/hindu": { "name": "Hindu Temple", "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple" }, "amenity/place_of_worship/jewish": { "name": "Jewish Synagogue", - "terms": "judaism" + "terms": "jewish" }, "amenity/place_of_worship/muslim": { "name": "Muslim Mosque", - "terms": "dome,islam,minaret,musalla,shia,sunni" - }, - "amenity/place_of_worship/muslim/shia": { - "name": "Shia Muslim Mosque", - "terms": "dome,islam,minaret,musalla" - }, - "amenity/place_of_worship/muslim/sunni": { - "name": "Sunni Muslim Mosque", - "terms": "dome,islam,minaret,musalla" + "terms": "muslim" }, "amenity/place_of_worship/shinto": { "name": "Shinto Shrine",