Merge pull request #862 from openstreetmap/crossing-kerbs

Add "kerb" tag as an optional field to crossings

Author: tyrasd

data/presets/barrier/kerb/flush.json

@@ -9,9 +9,6 @@
         "line"
     ],
     "tags": {
-        "kerb": "flush"
-    },
-    "addTags": {
         "barrier": "kerb",
         "kerb": "flush"
     },

data/presets/barrier/kerb/lowered.json

@@ -10,9 +10,6 @@
         "line"
     ],
     "tags": {
-        "kerb": "lowered"
-    },
-    "addTags": {
         "barrier": "kerb",
         "kerb": "lowered"
     },

data/presets/barrier/kerb/raised.json

@@ -10,9 +10,6 @@
         "line"
     ],
     "tags": {
-        "kerb": "raised"
-    },
-    "addTags": {
         "barrier": "kerb",
         "kerb": "raised"
     },

data/presets/barrier/kerb/rolled.json

@@ -10,9 +10,6 @@
         "line"
     ],
     "tags": {
-        "kerb": "rolled"
-    },
-    "addTags": {
         "barrier": "kerb",
         "kerb": "rolled"
     },

data/presets/highway/crossing.json

@@ -7,7 +7,8 @@
         "crossing_raised"
     ],
     "moreFields": [
-        "flashing_lights"
+        "flashing_lights",
+        "kerb"
     ],
     "geometry": [
         "vertex"

data/presets/highway/crossing/_marked.json

@@ -7,9 +7,6 @@
         "crossing/markings",
         "crossing_raised"
     ],
-    "moreFields": [
-        "flashing_lights"
-    ],
     "geometry": [
         "vertex"
     ],

data/presets/highway/crossing/traffic_signals.json

@@ -11,6 +11,7 @@
         "traffic_signals/vibration"
     ],
     "moreFields": [
+        "kerb",
         "traffic_signals/arrow",
         "traffic_signals/countdown",
         "traffic_signals/minimap"

data/presets/highway/crossing/uncontrolled.json

@@ -7,9 +7,6 @@
         "crossing/markings_yes",
         "crossing_raised"
     ],
-    "moreFields": [
-        "flashing_lights"
-    ],
     "geometry": [
         "vertex"
     ],

data/presets/highway/crossing/unmarked.json

@@ -6,9 +6,6 @@
         "crossing/island",
         "crossing_raised"
     ],
-    "moreFields": [
-        "flashing_lights"
-    ],
     "geometry": [
         "vertex"
     ],

interim/source_strings.yaml

@@ -2711,6 +2711,7 @@ en:
       kerb:
         # kerb=*
         label: Curb
+        terms: '[translate with synonyms or related terms for ''Curb'', separated by commas]'
       kerb/height:
         # kerb:height=*
         label: Height
@@ -7223,22 +7224,22 @@ en:
         name: Curb
         terms: <translate with synonyms or related terms for 'Curb', separated by commas>
       barrier/kerb/flush:
-        # kerb=flush | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # barrier=kerb + kerb=flush | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Flush Curb
         # 'terms: even curb,level curb,tactile curb'
         terms: <translate with synonyms or related terms for 'Flush Curb', separated by commas>
       barrier/kerb/lowered:
-        # kerb=lowered | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # barrier=kerb + kerb=lowered | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Lowered Curb
         # 'terms: curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp'
         terms: <translate with synonyms or related terms for 'Lowered Curb', separated by commas>
       barrier/kerb/raised:
-        # kerb=raised | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # barrier=kerb + kerb=raised | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Raised Curb
         # 'terms: step'
         terms: <translate with synonyms or related terms for 'Raised Curb', separated by commas>
       barrier/kerb/rolled:
-        # kerb=rolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # barrier=kerb + kerb=rolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Rolled Curb
         # 'terms: gutter'
         terms: <translate with synonyms or related terms for 'Rolled Curb', separated by commas>