create template for crossing:markings fields, and add regional field for DE-AT-CH

2025-10-26 12:23:52 +01:00 · 2023-04-26 11:32:27 +02:00 · 2023-04-26 11:32:27 +02:00 · 8d45c78e65
commit 8d45c78e65
parent 57fe16f29d
22 changed files with 127 additions and 32 deletions
--- 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"
+        ]
+    }
+}
--- a/data/fields/crossing/markings.json
+++ b/data/fields/crossing/markings.json
@ -37,7 +37,10 @@
    },
    "locationSet": {
        "exclude": [
-            "BG"
+            "BG",
+            "DE",
+            "AT",
+            "CH"
        ]
    }
 }
--- 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"
+}
--- 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"
        ]
    }
 }
--- 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}"
+}
--- 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}"
+}
--- 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": [
--- 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": [
--- 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": [
--- 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",
--- 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": [
--- 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": [
--- 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"
    ],
--- 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"
    ],
--- 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"
    ],
--- 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"
    ],
--- 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"
    ],
--- 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"
    ],
--- 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"
    ],
--- 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",
--- 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"
    ],