From 78b21bfc33af4a2a856a8ff4250bef40c4e10069 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Sun, 7 Jun 2020 19:49:38 -0400
Subject: [PATCH] Correct man_made=cross preset name (close #7678)

---
 data/presets.yaml                        | 4 ++--
 data/presets/presets.json                | 2 +-
 data/presets/presets/man_made/cross.json | 2 +-
 data/taginfo.json                        | 2 +-
 dist/locales/en.json                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 25f3703ae..f08693b81 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -6266,8 +6266,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Crane'', separated by commas>'
       man_made/cross:
         # man_made=cross
-        name: Summit Cross
-        terms: '<translate with synonyms or related terms for ''Summit Cross'', separated by commas>'
+        name: Cross
+        terms: '<translate with synonyms or related terms for ''Cross'', separated by commas>'
       man_made/cutline:
         # man_made=cutline
         name: Cut line
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 85ac8dbf6..e49f69e69 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -750,7 +750,7 @@
   "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
   "man_made/courtyard": {"icon": "maki-square-stroked", "fields": ["name"], "moreFields": [], "geometry": ["area"], "tags": {"man_made": "courtyard"}, "terms": ["court", "enclosed open air", "quadrangle", "yard"], "name": "Courtyard"},
   "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "manufacturer", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
-  "man_made/cross": {"icon": "maki-religious-christian", "fields": ["name", "material", "height", "ele_node", "inscription", "direction"], "geometry": ["point", "vertex"], "tags": {"man_made": "cross"}, "name": "Summit Cross"},
+  "man_made/cross": {"icon": "maki-religious-christian", "fields": ["name", "material", "height", "ele_node", "inscription", "direction"], "geometry": ["point", "vertex"], "tags": {"man_made": "cross"}, "name": "Cross"},
   "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
   "man_made/dyke": {"geometry": ["line"], "tags": {"man_made": "dyke"}, "terms": ["Dike", "Dyke", "Floodbank", "Stopbank"], "name": "Levee"},
   "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"},
diff --git a/data/presets/presets/man_made/cross.json b/data/presets/presets/man_made/cross.json
index 33f54afd6..ebf9d6658 100644
--- a/data/presets/presets/man_made/cross.json
+++ b/data/presets/presets/man_made/cross.json
@@ -15,5 +15,5 @@
     "tags": {
         "man_made": "cross"
     },
-    "name": "Summit Cross"
+    "name": "Cross"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 3f494420e..e7cc3de4d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -729,7 +729,7 @@
     {"key": "man_made", "value": "clearcut", "description": "🄿 Clearcut Forest", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/logging-15.svg"},
     {"key": "man_made", "value": "courtyard", "description": "🄿 Courtyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/square-stroked-15.svg"},
     {"key": "man_made", "value": "crane", "description": "🄿 Crane", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/crane.svg"},
-    {"key": "man_made", "value": "cross", "description": "🄿 Summit Cross", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
+    {"key": "man_made", "value": "cross", "description": "🄿 Cross", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
     {"key": "man_made", "value": "cutline", "description": "🄿 Cut line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/logging-15.svg"},
     {"key": "man_made", "value": "dyke", "description": "🄿 Levee", "object_types": ["way"]},
     {"key": "man_made", "value": "embankment", "description": "🄿 Embankment", "object_types": ["way"]},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 3a278b754..91aed26e2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -8000,7 +8000,7 @@
                     "terms": ""
                 },
                 "man_made/cross": {
-                    "name": "Summit Cross",
+                    "name": "Cross",
                     "terms": ""
                 },
                 "man_made/cutline": {