create template for crossing:markings fields, and add regional field …

…for DE-AT-CH
openstreetmap · May 11, 2023 · 8d45c78 · 8d45c78
1 parent 57fe16f
commit 8d45c78
Show file tree

Hide file tree

Showing 22 changed files with 127 additions and 32 deletions.
diff --git a/data/fields/crossing/markings-DE-AT-CH.json b/data/fields/crossing/markings-DE-AT-CH.json
@@ -0,0 +1,23 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "yes",
+        "no",
+        "dots",
+        "dashes",
+        "surface"
+    ],
+    "autoSuggestions": false,
+    "iconsCrossReference": "{crossing/markings}",
+    "stringsCrossReference": "{crossing/markings}",
+    "locationSet": {
+        "include": [
+            "DE",
+            "AT",
+            "CH"
+        ]
+    }
+}
diff --git a/data/fields/crossing/markings.json b/data/fields/crossing/markings.json
@@ -37,7 +37,10 @@
     },
     "locationSet": {
         "exclude": [
-            "BG"
+            "BG",
+            "DE",
+            "AT",
+            "CH"
         ]
     }
 }
diff --git a/data/fields/crossing/markings_yes-DE-AT-CH.json b/data/fields/crossing/markings_yes-DE-AT-CH.json
@@ -0,0 +1,24 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "options": [
+        "zebra",
+        "yes",
+        "no",
+        "dots",
+        "dashes",
+        "surface"
+    ],
+    "autoSuggestions": false,
+    "iconsCrossReference": "{crossing/markings}",
+    "stringsCrossReference": "{crossing/markings}",
+    "locationSet": {
+        "include": [
+            "DE",
+            "AT",
+            "CH"
+        ]
+    },
+    "default": "yes"
+}
diff --git a/data/fields/crossing/markings_yes.json b/data/fields/crossing/markings_yes.json
@@ -7,7 +7,10 @@
     "default": "yes",
     "locationSet": {
         "exclude": [
-            "BG"
+            "BG",
+            "DE",
+            "AT",
+            "CH"
         ]
     }
 }
diff --git a/data/presets/@templates/crossing/markings.json b/data/presets/@templates/crossing/markings.json
@@ -0,0 +1,23 @@
+{
+    "fields": [
+        "crossing/markings",
+        "crossing/markings-BG",
+        "crossing/markings-DE-AT-CH"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "@template": "crossing/markings"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/@templates/crossing/markings_yes.json b/data/presets/@templates/crossing/markings_yes.json
@@ -0,0 +1,23 @@
+{
+    "fields": [
+        "crossing/markings_yes",
+        "crossing/markings_yes-BG",
+        "crossing/markings_yes-DE-AT-CH"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "@template": "crossing/markings_yes"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json
@@ -3,7 +3,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
+        "{@templates/crossing/markings}",
         "crossing_raised"
     ],
     "moreFields": [

diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json
@@ -4,8 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised"
     ],
     "geometry": [

diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json
@@ -4,8 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised"
     ],
     "geometry": [

diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json
@@ -4,8 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "button_operated",
         "traffic_signals/sound",

diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json
@@ -4,8 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings_yes",
-        "crossing/markings_yes-BG",
+        "{@templates/crossing/markings_yes}",
         "crossing_raised"
     ],
     "geometry": [

diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json
@@ -5,8 +5,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "access"
     ],
     "geometry": [

diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
@@ -5,8 +5,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "access"
     ],

diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -13,8 +13,7 @@
         "smoothness",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "access"
     ],

diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -4,16 +4,17 @@
         "oneway",
         "crossing",
         "surface",
-        "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "button_operated",
         "traffic_signals/sound",
         "traffic_signals/vibration",
         "access"
     ],
+    "moreFields": [
+        "tactile_paving"
+    ],
     "geometry": [
         "line"
     ],

diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json
@@ -6,8 +6,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings_yes",
-        "crossing/markings_yes-BG",
+        "{@templates/crossing/markings_yes}",
         "crossing_raised",
         "access"
     ],

diff --git a/data/presets/highway/footway/_crossing.json b/data/presets/highway/footway/_crossing.json
@@ -4,8 +4,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "access"
     ],

diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
@@ -5,8 +5,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "access"
     ],

diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
@@ -5,8 +5,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "access"
     ],

diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json
@@ -5,8 +5,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
-        "crossing/markings-BG",
+        "{@templates/crossing/markings}",
         "crossing_raised",
         "button_operated",
         "traffic_signals/sound",

diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json
@@ -5,8 +5,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings_yes",
-        "crossing/markings_yes-BG",
+        "{@templates/crossing/markings_yes}",
         "crossing_raised",
         "access"
     ],

diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
@@ -1387,10 +1387,14 @@ en:
         terms: '[translate with synonyms or related terms for ''Crossing Markings'', separated by commas]'
       crossing/markings-BG:
         # crossing:markings=* | Local preset for countries "BG"
+      crossing/markings-DE-AT-CH:
+        # crossing:markings=* | Local preset for countries "DE", "AT", "CH"
       crossing/markings_yes:
         # crossing:markings=*
       crossing/markings_yes-BG:
         # crossing:markings=* | Local preset for countries "BG"
+      crossing/markings_yes-DE-AT-CH:
+        # crossing:markings=* | Local preset for countries "DE", "AT", "CH"
       crossing_raised:
         # traffic_calming=*
         label: Raised
@@ -5542,6 +5546,10 @@ en:
     presets:
       '@templates/contact':
         # '@template=contact | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"'
+      '@templates/crossing/markings':
+        # '@template=crossing/markings | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"'
+      '@templates/crossing/markings_yes':
+        # '@template=crossing/markings_yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"'
       '@templates/internet_access':
         # '@template=internet_access | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"'
       '@templates/poi':