improve terms of crossing and traffic calming presets/fields (#508)

Squashed commit of the following: commit d49ade3 Author: Minh Nguyễn <mxn@1ec5.org> Date: Wed Jun 22 01:58:14 2022 -0700 Added table terms to Raised field commit b29faf0 Author: Minh Nguyễn <mxn@1ec5.org> Date: Wed Jun 22 01:48:00 2022 -0700 Renamed crossing=traffic_signals presets to correct name commit fe3caad Author: Minh Nguyễn <mxn@1ec5.org> Date: Wed Jun 22 01:37:45 2022 -0700 Removed table-related terms from crossing presets These terms only made sense for the raised crossing presets, which got merged with the unraised crossing presets.
openstreetmap · Jun 22, 2022 · febe27d · febe27d
1 parent 3da4577
commit febe27d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 34 deletions.
diff --git a/data/fields/crossing_raised.json b/data/fields/crossing_raised.json
@@ -13,5 +13,11 @@
             "undefined": "No",
             "table": "Yes"
         }
-    }
+    },
+    "terms": [
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
+    ]
 }
diff --git a/data/presets/highway/crossing/marked.json b/data/presets/highway/crossing/marked.json
@@ -23,11 +23,7 @@
     "terms": [
         "zebra crossing",
         "marked crossing",
-        "crosswalk",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "crosswalk"
     ],
     "name": "Marked Crosswalk"
 }
diff --git a/data/presets/highway/crossing/signals.json → ...ets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/signals.json → ...ets/highway/crossing/traffic_signals.json
diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json
@@ -23,11 +23,7 @@
     "terms": [
         "unmarked foot path crossing",
         "unmarked crosswalk",
-        "unmarked pedestrian crossing",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"
 }
diff --git a/data/presets/highway/footway/marked.json b/data/presets/highway/footway/marked.json
@@ -28,11 +28,7 @@
         "marked crossing",
         "marked pedestrian crosswalk",
         "zebra crossing",
-        "crosswalk",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "crosswalk"
     ],
     "name": "Marked Crosswalk"
 }
diff --git a/data/presets/highway/footway/signals.json → ...sets/highway/footway/traffic_signals.json b/data/presets/highway/footway/signals.json → ...sets/highway/footway/traffic_signals.json
@@ -34,10 +34,6 @@
         "pedestrian traffic signals",
         "pedestrian crossing (lights)",
         "bicycle crossing (lights)",
-        "crosswalk (lights)",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "crosswalk (lights)"
     ]
 }
diff --git a/data/presets/highway/footway/unmarked.json b/data/presets/highway/footway/unmarked.json
@@ -26,11 +26,7 @@
     "terms": [
         "unmarked foot path crossing",
         "unmarked crosswalk",
-        "unmarked pedestrian crossing",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
@@ -6019,20 +6019,20 @@ en:
       highway/crossing/marked:
         # highway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Marked Crosswalk
-        # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow'
+        # 'terms: zebra crossing,marked crossing,crosswalk'
         terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
-      highway/crossing/signals:
+      highway/crossing/traffic_signals:
         # highway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Crossing With Pedestrian Signals
-        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights),flat top,hump,speed,slow'
+        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
         terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
       highway/crossing/uncontrolled:
         # highway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Marked Crosswalk
       highway/crossing/unmarked:
         # highway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Unmarked Crossing
-        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing,flat top,hump,speed,slow'
+        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
         terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
       highway/crossing/zebra:
         # highway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -6109,22 +6109,22 @@ en:
       highway/footway/marked:
         # highway=footway + footway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Marked Crosswalk
-        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk,flat top,hump,speed,slow'
+        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk'
         terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
       highway/footway/sidewalk:
         # footway=sidewalk | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Sidewalk
         # 'terms: pavement,sidepath'
         terms: <translate with synonyms or related terms for 'Sidewalk', separated by commas>
-      highway/footway/signals:
+      highway/footway/traffic_signals:
         # highway=footway + footway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Crossing With Pedestrian Signals
-        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights),flat top,hump,speed,slow'
+        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
         terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
       highway/footway/unmarked:
         # highway=footway + footway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Unmarked Crossing
-        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing,flat top,hump,speed,slow'
+        # '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/zebra:
         # highway=footway + footway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).