From 58deefc04fb0ce1af44fad217eabe48895f11d73 Mon Sep 17 00:00:00 2001 From: animesh-007 Date: Thu, 1 Oct 2020 04:01:37 +0530 Subject: [PATCH 1/2] added morgue preset --- data/presets.yaml | 5 +++++ data/presets/presets.json | 1 + data/presets/presets/morgue.json | 18 ++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 5 files changed, 29 insertions(+) create mode 100644 data/presets/presets/morgue.json diff --git a/data/presets.yaml b/data/presets.yaml index ff04b7e76..3027fcc3a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6733,6 +6733,11 @@ en: name: Military Trench # 'terms: dugout,firestep,fox hole,infantry trench,war trench' terms: '' + morgue: + # amenity=morgue + name: Morgue + # 'terms: memorial home' + terms: '' natural: # natural=* name: Natural Feature diff --git a/data/presets/presets.json b/data/presets/presets.json index a5882d615..41369bd77 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -824,6 +824,7 @@ "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"}, + "morgue": {"icon": "maki-cemetery", "fields": ["religion", "denomination"], "geometry": ["point", "area"], "terms": ["memorial home"], "tags": {"amenity": "morgue"}, "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/morgue.json b/data/presets/presets/morgue.json new file mode 100644 index 000000000..b4b63465b --- /dev/null +++ b/data/presets/presets/morgue.json @@ -0,0 +1,18 @@ +{ + "icon": "maki-cemetery", + "fields": [ + "religion", + "denomination" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "memorial home" + ], + "tags": { + "amenity": "morgue" + }, + "name": "Morgue" +} diff --git a/data/taginfo.json b/data/taginfo.json index 36d8b4600..3adef0b1a 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -802,6 +802,7 @@ {"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": "morgue", "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 329fc1b90..d957303c3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8610,6 +8610,10 @@ "name": "Military Trench", "terms": "dugout,firestep,fox hole,infantry trench,war trench" }, + "morgue": { + "name": "Morgue", + "terms": "memorial home" + }, "natural/bare_rock": { "name": "Bare Rock", "terms": "rock" From 4c5d2e68fd6db0fdda2ed35a7788c1b6d5708e5c Mon Sep 17 00:00:00 2001 From: animesh-007 Date: Sun, 4 Oct 2020 00:04:44 +0530 Subject: [PATCH 2/2] changed tag to mortuary --- data/presets.yaml | 4 ++-- data/presets/presets.json | 2 +- data/presets/presets/{morgue.json => mortuary.json} | 2 +- data/taginfo.json | 2 +- dist/locales/en.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename data/presets/presets/{morgue.json => mortuary.json} (89%) diff --git a/data/presets.yaml b/data/presets.yaml index 3027fcc3a..c419888be 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6733,8 +6733,8 @@ en: name: Military Trench # 'terms: dugout,firestep,fox hole,infantry trench,war trench' terms: '' - morgue: - # amenity=morgue + mortuary: + # amenity=mortuary name: Morgue # 'terms: memorial home' terms: '' diff --git a/data/presets/presets.json b/data/presets/presets.json index 41369bd77..75e58f762 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -824,7 +824,7 @@ "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"}, - "morgue": {"icon": "maki-cemetery", "fields": ["religion", "denomination"], "geometry": ["point", "area"], "terms": ["memorial home"], "tags": {"amenity": "morgue"}, "name": "Morgue"}, + "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/morgue.json b/data/presets/presets/mortuary.json similarity index 89% rename from data/presets/presets/morgue.json rename to data/presets/presets/mortuary.json index b4b63465b..7def68f18 100644 --- a/data/presets/presets/morgue.json +++ b/data/presets/presets/mortuary.json @@ -12,7 +12,7 @@ "memorial home" ], "tags": { - "amenity": "morgue" + "amenity": "mortuary" }, "name": "Morgue" } diff --git a/data/taginfo.json b/data/taginfo.json index 3adef0b1a..59cf1d7f4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -802,7 +802,7 @@ {"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": "morgue", "description": "🄿 Morgue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.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 d957303c3..935e34945 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8610,7 +8610,7 @@ "name": "Military Trench", "terms": "dugout,firestep,fox hole,infantry trench,war trench" }, - "morgue": { + "mortuary": { "name": "Morgue", "terms": "memorial home" },