From 65dddf90b8c84f76b285dd17852954c48ec71cfe Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 11 Mar 2020 09:41:19 -0700
Subject: [PATCH] Use US English spelling for man_made=groyne preset name

---
 data/presets.yaml                         | 4 ++--
 data/presets/presets.json                 | 2 +-
 data/presets/presets/man_made/groyne.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 20a929715..15d436ea8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -6137,8 +6137,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Gasometer'', separated by commas>'
       man_made/groyne:
         # man_made=groyne
-        name: Groyne
-        terms: '<translate with synonyms or related terms for ''Groyne'', separated by commas>'
+        name: Groin
+        terms: '<translate with synonyms or related terms for ''Groin'', separated by commas>'
       man_made/lighthouse:
         # man_made=lighthouse
         name: Lighthouse
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 839c466c3..e6af53a2b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -742,7 +742,7 @@
   "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"},
   "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country_flag", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
   "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
-  "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
+  "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groin"},
   "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"},
   "man_made/manhole": {"icon": "temaki-manhole", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
   "man_made/manhole/drain": {"icon": "temaki-manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
diff --git a/data/presets/presets/man_made/groyne.json b/data/presets/presets/man_made/groyne.json
index 7fd5511cb..60b2b6362 100644
--- a/data/presets/presets/man_made/groyne.json
+++ b/data/presets/presets/man_made/groyne.json
@@ -10,5 +10,5 @@
     "tags": {
         "man_made": "groyne"
     },
-    "name": "Groyne"
+    "name": "Groin"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 3abab55bd..1af1c909d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -721,7 +721,7 @@
     {"key": "man_made", "value": "embankment", "description": "🄿 Embankment", "object_types": ["way"]},
     {"key": "man_made", "value": "flagpole", "description": "🄿 Flagpole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/embassy-15.svg"},
     {"key": "man_made", "value": "gasometer", "description": "🄿 Gasometer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
-    {"key": "man_made", "value": "groyne", "description": "🄿 Groyne", "object_types": ["way", "area"]},
+    {"key": "man_made", "value": "groyne", "description": "🄿 Groin", "object_types": ["way", "area"]},
     {"key": "man_made", "value": "lighthouse", "description": "🄿 Lighthouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lighthouse-15.svg"},
     {"key": "manhole", "description": "🄿 Manhole, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/manhole.svg"},
     {"key": "manhole", "value": "drain", "description": "🄿 Storm Drain", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/manhole.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9b44e3550..daefc58d7 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -7840,7 +7840,7 @@
                     "terms": "gas holder"
                 },
                 "man_made/groyne": {
-                    "name": "Groyne",
+                    "name": "Groin",
                     "terms": ""
                 },
                 "man_made/lighthouse": {