From 0e6b5d46d6487ed498b96afe1bc20fc71aee3086 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 28 Mar 2019 12:21:58 -0400 Subject: [PATCH] Add Commemorative Plaque preset Deprecate memorial=plate --- data/deprecated.json | 4 +++ data/presets.yaml | 5 ++++ data/presets/presets.json | 3 +- data/presets/presets/historic/memorial.json | 4 +-- .../presets/historic/memorial/plaque.json | 28 +++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 +++ 7 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 data/presets/presets/historic/memorial/plaque.json diff --git a/data/deprecated.json b/data/deprecated.json index 40c5d811d..e4c008af9 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -279,6 +279,10 @@ "old": {"man_made": "well"}, "replace": {"man_made": "water_well"} }, + { + "old": {"memorial": "plate"}, + "replace": {"memorial": "plaque"} + }, { "old": {"mining_resource": "*"}, "replace": {"resource": "$1"} diff --git a/data/presets.yaml b/data/presets.yaml index bc6f13270..6d97788e9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4357,6 +4357,11 @@ en: name: Memorial # 'terms: dedicatory,epitaph,remember,remembrance,memory,monument,stolperstein' terms: '' + historic/memorial/plaque: + # 'historic=memorial, memorial=plaque' + name: Commemorative Plaque + # 'terms: dedicatory,epitaph,historical marker,remember,remembrance,memory' + terms: '' historic/monument: # historic=monument name: Monument diff --git a/data/presets/presets.json b/data/presets/presets.json index 98ca4bb05..c402654e5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -488,7 +488,8 @@ "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "site_type", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"}, "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, "historic/castle": {"icon": "maki-castle", "fields": ["name", "castle_type", "building_area", "historic/civilization", "access_simple"], "geometry": ["point", "area"], "tags": {"historic": "castle"}, "name": "Castle"}, - "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription"], "moreFields": ["material", "website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"}, + "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription", "material"], "moreFields": ["website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"}, + "historic/memorial/plaque": {"icon": "maki-monument", "fields": ["{historic/memorial}", "direction"], "geometry": ["point", "vertex"], "terms": ["dedicatory", "epitaph", "historical marker", "remember", "remembrance", "memory"], "tags": {"historic": "memorial", "memorial": "plaque"}, "reference": {"key": "memorial", "value": "plaque"}, "name": "Commemorative Plaque"}, "historic/monument": {"icon": "maki-monument", "fields": ["name", "inscription", "access_simple"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"}, "historic/ruins": {"icon": "temaki-ruins", "fields": ["name", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "ruins"}, "name": "Ruins"}, "historic/tomb": {"icon": "maki-cemetery", "fields": ["name", "tomb", "building_area", "inscription", "access_simple"], "geometry": ["point", "area"], "tags": {"historic": "tomb"}, "name": "Tomb"}, diff --git a/data/presets/presets/historic/memorial.json b/data/presets/presets/historic/memorial.json index 181e7566d..c8258e472 100644 --- a/data/presets/presets/historic/memorial.json +++ b/data/presets/presets/historic/memorial.json @@ -3,10 +3,10 @@ "fields": [ "name", "memorial", - "inscription" + "inscription", + "material" ], "moreFields": [ - "material", "website" ], "geometry": [ diff --git a/data/presets/presets/historic/memorial/plaque.json b/data/presets/presets/historic/memorial/plaque.json new file mode 100644 index 000000000..49bb3f6de --- /dev/null +++ b/data/presets/presets/historic/memorial/plaque.json @@ -0,0 +1,28 @@ +{ + "icon": "maki-monument", + "fields": [ + "{historic/memorial}", + "direction" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "dedicatory", + "epitaph", + "historical marker", + "remember", + "remembrance", + "memory" + ], + "tags": { + "historic": "memorial", + "memorial": "plaque" + }, + "reference": { + "key": "memorial", + "value": "plaque" + }, + "name": "Commemorative Plaque" +} diff --git a/data/taginfo.json b/data/taginfo.json index 6bfd7a016..93b1f1990 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -470,6 +470,7 @@ {"key": "historic", "value": "boundary_stone", "description": "🄿 Boundary Stone", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/milestone.svg?sanitize=true"}, {"key": "historic", "value": "castle", "description": "🄿 Castle", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/castle-15.svg?sanitize=true"}, {"key": "historic", "value": "memorial", "description": "🄿 Memorial", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"}, + {"key": "memorial", "value": "plaque", "description": "🄿 Commemorative Plaque", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"}, {"key": "historic", "value": "monument", "description": "🄿 Monument", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"}, {"key": "historic", "value": "ruins", "description": "🄿 Ruins", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/ruins.svg?sanitize=true"}, {"key": "historic", "value": "tomb", "description": "🄿 Tomb", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/cemetery-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 31185ef2f..fb4e60742 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5941,6 +5941,10 @@ "name": "Memorial", "terms": "dedicatory,epitaph,remember,remembrance,memory,monument,stolperstein" }, + "historic/memorial/plaque": { + "name": "Commemorative Plaque", + "terms": "dedicatory,epitaph,historical marker,remember,remembrance,memory" + }, "historic/monument": { "name": "Monument", "terms": ""