Fix crossing preset references (close #57)

quincylvania · quincylvania · commit 679616c45146 · 2020-11-25T15:56:39.000-05:00
Remove unnecessary addTags in crossing presets
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>'

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,8 @@`
`24`	`24`	`"highway": "footway",`
`25`	`25`	`"conveying": "*"`
`26`	`26`	`},`
	`27`	`+ "reference": {`
	`28`	`+ "key": "conveying"`
	`29`	`+ },`
`27`	`30`	`"name": "Moving Walkway"`
`28`	`31`	`}`