Merge pull request #7310 from animesh-007/7274-new

Added new preset, fixes #7274

data/presets.yaml

@@ -5336,6 +5336,11 @@ en:
         # historic=monument
         name: Monument
         terms: '<translate with synonyms or related terms for ''Monument'', separated by commas>'
+      historic/pillory:
+        # historic=pillory
+        name: Historic Pillory
+        # 'terms: attraction'
+        terms: '<translate with synonyms or related terms for ''Historic Pillory'', separated by commas>'
       historic/ruins:
         # historic=ruins
         name: Ruins

data/presets/presets.json

@@ -580,6 +580,7 @@
     "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription", "material"], "moreFields": ["{historic}", "website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"},
     "historic/memorial/plaque": {"icon": "temaki-plaque", "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": ["{historic}", "material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"},
+    "historic/pillory": {"icon": "maki-monument", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "pillory"}, "terms": ["attraction"], "name": "Historic Pillory"},
     "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"},
     "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "moreFields": ["{historic}", "material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"},

data/presets/presets/historic/pillory.json

@@ -0,0 +1,20 @@
+{
+    "icon": "maki-monument",
+    "fields": [
+        "name",
+        "building_area",
+        "access_simple",
+        "start_date"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "historic": "pillory"
+    },
+    "terms": [
+        "attraction"
+    ],
+    "name": "Historic Pillory"
+}

data/taginfo.json

@@ -563,6 +563,7 @@
     {"key": "historic", "value": "memorial", "description": "🄿 Memorial", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/monument-15.svg"},
     {"key": "memorial", "value": "plaque", "description": "🄿 Commemorative Plaque", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/plaque.svg"},
     {"key": "historic", "value": "monument", "description": "🄿 Monument", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/monument-15.svg"},
+    {"key": "historic", "value": "pillory", "description": "🄿 Historic Pillory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/monument-15.svg"},
     {"key": "historic", "value": "ruins", "description": "🄿 Ruins", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"},
     {"key": "historic", "value": "tomb", "description": "🄿 Tomb", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
     {"key": "historic", "value": "wayside_cross", "description": "🄿 Wayside Cross", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},

dist/locales/en.json

@@ -7141,6 +7141,10 @@
                     "name": "Monument",
                     "terms": ""
                 },
+                "historic/pillory": {
+                    "name": "Historic Pillory",
+                    "terms": "attraction"
+                },
                 "historic/ruins": {
                     "name": "Ruins",
                     "terms": ""
@@ -10077,7 +10081,7 @@
             },
             "MAPNIK": {
                 "attribution": {
-                    "text": "© OpenStreetMap contributors, CC-BY-SA"
+                    "text": "© OpenStreetMap contributors, CC-BY-SA 2.0"
                 },
                 "description": "The default OpenStreetMap layer.",
                 "name": "OpenStreetMap (Standard)"