diff --git a/data/presets.yaml b/data/presets.yaml index 5d6148a94..7ac22e735 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3569,6 +3569,11 @@ en: name: Money Transfer Station # 'terms: money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange' terms: '' + amenity/mortuary: + # amenity=mortuary + name: Morgue + # 'terms: crematorium,funeral home,memorial home,morgue,mortuary,undertaker' + terms: '' amenity/motorcycle_parking: # amenity=motorcycle_parking name: Motorcycle Parking @@ -6749,11 +6754,6 @@ en: name: Military Trench # 'terms: dugout,firestep,fox hole,infantry trench,war trench' terms: '' - mortuary: - # amenity=mortuary - name: Morgue - # 'terms: memorial home' - terms: '' natural: # natural=* name: Natural Feature diff --git a/data/presets/presets.json b/data/presets/presets.json index 9588764e1..e24506e7d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -152,6 +152,7 @@ "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"}, "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "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"}, "amenity/money_transfer": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"}, + "amenity/mortuary": {"icon": "maki-cemetery", "fields": ["name", "operator", "address"], "moreFields": ["religion", "denomination"], "geometry": ["point", "area"], "terms": ["crematorium", "funeral home", "memorial home", "morgue", "mortuary", "undertaker"], "tags": {"amenity": "mortuary"}, "name": "Morgue"}, "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity_parking", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"}, "amenity/music_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"}, "amenity/nightclub": {"icon": "fas-cocktail", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair", "fee"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"}, @@ -827,7 +828,6 @@ "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"}, "military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "moreFields": ["gnis/feature_id", "level"], "geometry": ["point", "area"], "tags": {"military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"}, "military/trench": {"icon": "temaki-trench", "fields": ["name", "trench"], "geometry": ["point", "line"], "tags": {"military": "trench"}, "terms": ["dugout", "firestep", "fox hole", "infantry trench", "war trench"], "name": "Military Trench"}, - "mortuary": {"icon": "maki-cemetery", "fields": ["religion", "denomination"], "geometry": ["point", "area"], "terms": ["memorial home"], "tags": {"amenity": "mortuary"}, "name": "Morgue"}, "natural/bare_rock": {"geometry": ["area"], "tags": {"natural": "bare_rock"}, "terms": ["rock"], "name": "Bare Rock"}, "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"}, "natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"}, diff --git a/data/presets/presets/mortuary.json b/data/presets/presets/amenity/mortuary.json similarity index 54% rename from data/presets/presets/mortuary.json rename to data/presets/presets/amenity/mortuary.json index 7def68f18..16674e654 100644 --- a/data/presets/presets/mortuary.json +++ b/data/presets/presets/amenity/mortuary.json @@ -1,6 +1,11 @@ { "icon": "maki-cemetery", "fields": [ + "name", + "operator", + "address" + ], + "moreFields": [ "religion", "denomination" ], @@ -9,7 +14,12 @@ "area" ], "terms": [ - "memorial home" + "crematorium", + "funeral home", + "memorial home", + "morgue", + "mortuary", + "undertaker" ], "tags": { "amenity": "mortuary" diff --git a/data/taginfo.json b/data/taginfo.json index 597d566fb..87de5b6ad 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -155,6 +155,7 @@ {"key": "amenity", "value": "marketplace", "description": "🄿 Marketplace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "amenity", "value": "monastery", "description": "🄿 Monastery Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"}, {"key": "amenity", "value": "money_transfer", "description": "🄿 Money Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"}, + {"key": "amenity", "value": "mortuary", "description": "🄿 Morgue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"}, {"key": "amenity", "value": "motorcycle_parking", "description": "🄿 Motorcycle Parking", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-motorcycle.svg"}, {"key": "amenity", "value": "music_school", "description": "🄿 Music School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-music.svg"}, {"key": "amenity", "value": "nightclub", "description": "🄿 Nightclub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-cocktail.svg"}, @@ -805,7 +806,6 @@ {"key": "military", "value": "nuclear_explosion_site", "description": "🄿 Nuclear Explosion Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/danger-15.svg"}, {"key": "military", "value": "office", "description": "🄿 Military Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, {"key": "military", "value": "trench", "description": "🄿 Military Trench", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/trench.svg"}, - {"key": "amenity", "value": "mortuary", "description": "🄿 Morgue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"}, {"key": "natural", "value": "bare_rock", "description": "🄿 Bare Rock", "object_types": ["area"]}, {"key": "natural", "value": "bay", "description": "🄿 Bay", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/beach.svg"}, {"key": "natural", "value": "beach", "description": "🄿 Beach", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/beach.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index e77b386c1..cf597ab99 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5954,6 +5954,10 @@ "name": "Money Transfer Station", "terms": "money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange" }, + "amenity/mortuary": { + "name": "Morgue", + "terms": "crematorium,funeral home,memorial home,morgue,mortuary,undertaker" + }, "amenity/motorcycle_parking": { "name": "Motorcycle Parking", "terms": "" @@ -8624,10 +8628,6 @@ "name": "Military Trench", "terms": "dugout,firestep,fox hole,infantry trench,war trench" }, - "mortuary": { - "name": "Morgue", - "terms": "memorial home" - }, "natural/bare_rock": { "name": "Bare Rock", "terms": "rock"