crossing: New approach with @templates/crossing/bicycle_more, addin…

…g `segregated` The fields `oneway` and `access` are important for `highway=cycleway|path` crossings but not essential. They are more of a advanced user setup which should be visible when prev filled in but only added by users that read more about it before. They are moved to the `moreFields` for that reason. The `segregated` is added here for the same reasons and because of it's importance for highway types that likely have bike traffic. Ping openstreetmap#317 The `surface` and `smoothness` is extracted from the `@template` because it makes more sense to split them up in `fields` and `moreFields`. A templates adds too much abstraction in this case.
tordans · Apr 25, 2024 · 23d9fe8 · 23d9fe8
1 parent 3c11df5
commit 23d9fe8
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 27 deletions.
diff --git a/...templates/crossing/bicycle_relevance.json → ...ets/@templates/crossing/bicycle_more.json b/...templates/crossing/bicycle_relevance.json → ...ets/@templates/crossing/bicycle_more.json
@@ -1,13 +1,14 @@
 {
     "fields": [
         "oneway",
-        "access"
+        "access",
+        "segregated"
     ],
     "geometry": [
         "line"
     ],
     "tags": {
-        "@template": "crossing/bicycle_relevance"
+        "@template": "crossing/bicycle_more"
     },
     "searchable": false,
     "locationSet": {

diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json
@@ -4,7 +4,11 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
+    ],
+    "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
@@ -4,7 +4,11 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
+    ],
+    "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -13,7 +13,11 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
+    ],
+    "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -5,10 +5,12 @@
         "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
     ],
     "moreFields": [
-        "{@templates/crossing/traffic_signal_more}"
+        "{@templates/crossing/traffic_signal_more}",
+        "smoothness",
+        "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json
@@ -4,7 +4,11 @@
         "crossing",
         "{@templates/crossing/defaults}",
         "{@templates/crossing/markings_yes}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
+    ],
+    "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -3,7 +3,11 @@
     "fields": [
         "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
+    ],
+    "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json
@@ -3,9 +3,10 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
     ],
     "moreFields": [
+        "smoothness",
         "flashing_lights"
     ],
     "geometry": [

diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
@@ -4,9 +4,10 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
     ],
     "moreFields": [
+        "smoothness",
         "flashing_lights"
     ],
     "geometry": [

diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
@@ -4,7 +4,10 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
+    ],
+    "moreFields": [
+        "smoothness",
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json
@@ -5,10 +5,11 @@
         "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
     ],
     "moreFields": [
-        "{@templates/crossing/traffic_signal_more}"
+        "{@templates/crossing/traffic_signal_more}",
+        "smoothness",
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json
@@ -4,9 +4,10 @@
         "crossing",
         "{@templates/crossing/markings_yes}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
     ],
     "moreFields": [
+        "smoothness",
         "flashing_lights"
     ],
     "geometry": [

diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json
@@ -3,9 +3,10 @@
     "fields": [
         "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}"
+        "surface"
     ],
     "moreFields": [
+        "smoothness",
         "flashing_lights"
     ],
     "geometry": [

diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json
@@ -4,8 +4,11 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}",
-        "{@templates/crossing/bicycle_relevance}"
+        "surface"
+    ],
+    "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}",
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json
@@ -4,10 +4,11 @@
         "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}",
-        "{@templates/crossing/bicycle_relevance}"
+        "surface"
     ],
     "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],
     "geometry": [

diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json
@@ -5,11 +5,12 @@
         "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}",
-        "{@templates/crossing/bicycle_relevance}"
+        "surface"
     ],
     "moreFields": [
-        "{@templates/crossing/traffic_signal_more}"
+        "{@templates/crossing/traffic_signal_more}",
+        "smoothness",
+        "{@templates/crossing/bicycle_more}",
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json
@@ -4,10 +4,11 @@
         "crossing",
         "{@templates/crossing/markings_yes}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}",
-        "{@templates/crossing/bicycle_relevance}"
+        "surface"
     ],
     "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],
     "geometry": [

diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json
@@ -3,10 +3,11 @@
     "fields": [
         "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/surfacequality}",
-        "{@templates/crossing/bicycle_relevance}"
+        "surface"
     ],
     "moreFields": [
+        "smoothness",
+        "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],
     "geometry": [