From 679616c451461949e461571f5913911a9d07292a Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Wed, 25 Nov 2020 15:56:39 -0500
Subject: [PATCH] Fix crossing preset references (close #57) Remove unnecessary
 addTags in crossing presets

---
 data/presets/highway/crossing/_zebra.json         |  4 ++--
 data/presets/highway/crossing/marked-raised.json  |  5 -----
 data/presets/highway/crossing/marked.json         |  4 ----
 data/presets/highway/crossing/unmarked.json       |  4 ----
 data/presets/highway/footway/_crossing.json       |  3 ---
 data/presets/highway/footway/_zebra.json          |  4 ++--
 data/presets/highway/footway/conveying.json       |  3 +++
 data/presets/highway/footway/marked-raised.json   |  5 -----
 data/presets/highway/footway/marked.json          |  8 ++------
 data/presets/highway/footway/unmarked-raised.json |  5 -----
 data/presets/highway/footway/unmarked.json        |  8 ++------
 interim/source_strings.yaml                       | 10 +++++-----
 12 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json
index 87014d7e..7ede4d2d 100644
--- a/data/presets/highway/crossing/_zebra.json
+++ b/data/presets/highway/crossing/_zebra.json
@@ -13,8 +13,8 @@
         "crossing": "zebra"
     },
     "reference": {
-        "key": "highway",
-        "value": "crossing"
+        "key": "crossing",
+        "value": "zebra"
     },
     "name": "Marked Crosswalk",
     "searchable": false
diff --git a/data/presets/highway/crossing/marked-raised.json b/data/presets/highway/crossing/marked-raised.json
index 83fa6f47..684f1a0b 100644
--- a/data/presets/highway/crossing/marked-raised.json
+++ b/data/presets/highway/crossing/marked-raised.json
@@ -13,11 +13,6 @@
         "crossing": "marked",
         "traffic_calming": "table"
     },
-    "addTags": {
-        "highway": "crossing",
-        "crossing": "marked",
-        "traffic_calming": "table"
-    },
     "reference": {
         "key": "traffic_calming",
         "value": "table"
diff --git a/data/presets/highway/crossing/marked.json b/data/presets/highway/crossing/marked.json
index 924ace9c..ea2c976f 100644
--- a/data/presets/highway/crossing/marked.json
+++ b/data/presets/highway/crossing/marked.json
@@ -12,10 +12,6 @@
         "highway": "crossing",
         "crossing": "marked"
     },
-    "addTags": {
-        "highway": "crossing",
-        "crossing": "marked"
-    },
     "reference": {
         "key": "highway",
         "value": "crossing"
diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json
index 0ca68c8a..ef4801d9 100644
--- a/data/presets/highway/crossing/unmarked.json
+++ b/data/presets/highway/crossing/unmarked.json
@@ -12,10 +12,6 @@
         "highway": "crossing",
         "crossing": "unmarked"
     },
-    "addTags": {
-        "highway": "crossing",
-        "crossing": "unmarked"
-    },
     "reference": {
         "key": "crossing",
         "value": "unmarked"
diff --git a/data/presets/highway/footway/_crossing.json b/data/presets/highway/footway/_crossing.json
index 61a3e50f..2b0a3f08 100644
--- a/data/presets/highway/footway/_crossing.json
+++ b/data/presets/highway/footway/_crossing.json
@@ -10,9 +10,6 @@
         "line"
     ],
     "tags": {
-        "footway": "crossing"
-    },
-    "addTags": {
         "highway": "footway",
         "footway": "crossing"
     },
diff --git a/data/presets/highway/footway/_zebra.json b/data/presets/highway/footway/_zebra.json
index 05ffdcc9..9aa730e9 100644
--- a/data/presets/highway/footway/_zebra.json
+++ b/data/presets/highway/footway/_zebra.json
@@ -16,8 +16,8 @@
         "crossing": "zebra"
     },
     "reference": {
-        "key": "footway",
-        "value": "crossing"
+        "key": "crossing",
+        "value": "zebra"
     },
     "terms": [
         "zebra crossing",
diff --git a/data/presets/highway/footway/conveying.json b/data/presets/highway/footway/conveying.json
index 01d92297..26acd914 100644
--- a/data/presets/highway/footway/conveying.json
+++ b/data/presets/highway/footway/conveying.json
@@ -24,5 +24,8 @@
         "highway": "footway",
         "conveying": "*"
     },
+    "reference": {
+        "key": "conveying"
+    },
     "name": "Moving Walkway"
 }
diff --git a/data/presets/highway/footway/marked-raised.json b/data/presets/highway/footway/marked-raised.json
index bf27ab08..9bb6bc11 100644
--- a/data/presets/highway/footway/marked-raised.json
+++ b/data/presets/highway/footway/marked-raised.json
@@ -11,11 +11,6 @@
         "line"
     ],
     "tags": {
-        "footway": "crossing",
-        "crossing": "marked",
-        "traffic_calming": "table"
-    },
-    "addTags": {
         "highway": "footway",
         "footway": "crossing",
         "crossing": "marked",
diff --git a/data/presets/highway/footway/marked.json b/data/presets/highway/footway/marked.json
index 59cb0f86..3418f277 100644
--- a/data/presets/highway/footway/marked.json
+++ b/data/presets/highway/footway/marked.json
@@ -11,17 +11,13 @@
         "line"
     ],
     "tags": {
-        "footway": "crossing",
-        "crossing": "marked"
-    },
-    "addTags": {
         "highway": "footway",
         "footway": "crossing",
         "crossing": "marked"
     },
     "reference": {
-        "key": "footway",
-        "value": "crossing"
+        "key": "crossing",
+        "value": "marked"
     },
     "terms": [
         "marked foot path crossing",
diff --git a/data/presets/highway/footway/unmarked-raised.json b/data/presets/highway/footway/unmarked-raised.json
index 4120e091..b1c183b1 100644
--- a/data/presets/highway/footway/unmarked-raised.json
+++ b/data/presets/highway/footway/unmarked-raised.json
@@ -11,11 +11,6 @@
         "line"
     ],
     "tags": {
-        "footway": "crossing",
-        "crossing": "unmarked",
-        "traffic_calming": "table"
-    },
-    "addTags": {
         "highway": "footway",
         "footway": "crossing",
         "crossing": "unmarked",
diff --git a/data/presets/highway/footway/unmarked.json b/data/presets/highway/footway/unmarked.json
index 4dfeb586..1c7755c7 100644
--- a/data/presets/highway/footway/unmarked.json
+++ b/data/presets/highway/footway/unmarked.json
@@ -11,17 +11,13 @@
         "line"
     ],
     "tags": {
-        "footway": "crossing",
-        "crossing": "unmarked"
-    },
-    "addTags": {
         "highway": "footway",
         "footway": "crossing",
         "crossing": "unmarked"
     },
     "reference": {
-        "key": "footway",
-        "value": "crossing"
+        "key": "crossing",
+        "value": "unmarked"
     },
     "terms": [
         "unmarked foot path crossing",
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index c0c7a346..79f7683d 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -5334,15 +5334,15 @@ en:
         # 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor'
         terms: '<translate with synonyms or related terms for ''Moving Walkway'', separated by commas>'
       highway/footway/crossing:
-        # footway=crossing
+        # 'highway=footway, footway=crossing'
         name: Pedestrian Crossing
       highway/footway/marked:
-        # 'footway=crossing, crossing=marked'
+        # 'highway=footway, footway=crossing, crossing=marked'
         name: Marked Crosswalk
         # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing'
         terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
       highway/footway/marked-raised:
-        # 'footway=crossing, crossing=marked, traffic_calming=table'
+        # 'highway=footway, footway=crossing, crossing=marked, traffic_calming=table'
         name: Marked Crosswalk (Raised)
         # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Marked Crosswalk (Raised)'', separated by commas>'
@@ -5352,12 +5352,12 @@ en:
         # 'terms: pavement,sidepath'
         terms: '<translate with synonyms or related terms for ''Sidewalk'', separated by commas>'
       highway/footway/unmarked:
-        # 'footway=crossing, crossing=unmarked'
+        # 'highway=footway, footway=crossing, crossing=unmarked'
         name: Unmarked Crossing
         # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
         terms: '<translate with synonyms or related terms for ''Unmarked Crossing'', separated by commas>'
       highway/footway/unmarked-raised:
-        # 'footway=crossing, crossing=unmarked, traffic_calming=table'
+        # 'highway=footway, footway=crossing, crossing=unmarked, traffic_calming=table'
         name: Unmarked Crossing (Raised)
         # 'terms: flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Unmarked Crossing (Raised)'', separated by commas>'