crossing: New approach with @templates/crossing/bicycle_relevance a…

…nd `@templates/crossing/defaults` The field "crossing" is removed from the `/defaults` fields. - it is only relevant for the geometry line because it is hidden on geometry vertex. - but on geometry line, we want it to be on the first position of fields - the `/defaults` fields however should be positioned below the `markings` which are more relevant for specifying the kind of crossing - the `/defaults` fields now includes `crossing_raised` which was removed from the previous and discontinued `/geomery_line` fields template. The new `@templates/crossing/bicycle_relevance` - is used on all highways that have bicycle relevance which are `highway=path|cycleway` and not on `highway=footway` For all traffic_signal presets, the order of fields is different to give the `/traffic_signal` more prominence.
openstreetmap · Apr 24, 2024 · b24e74a · b24e74a
1 parent 64f4482
commit b24e74a
Show file tree

Hide file tree

Showing 23 changed files with 72 additions and 33 deletions.
diff --git a/...ts/@templates/crossing/geometry_line.json → ...templates/crossing/bicycle_relevance.json b/...ts/@templates/crossing/geometry_line.json → ...templates/crossing/bicycle_relevance.json
@@ -1,16 +1,13 @@
 {
     "fields": [
         "oneway",
-        "surface",
-        "smoothness",
-        "crossing_raised",
         "access"
     ],
     "geometry": [
         "point"
     ],
     "tags": {
-        "@template": "crossing/geometry_line"
+        "@template": "crossing/bicycle_relevance"
     },
     "searchable": false,
     "locationSet": {

diff --git a/data/presets/@templates/crossing/defaults.json b/data/presets/@templates/crossing/defaults.json
@@ -1,8 +1,8 @@
 {
     "fields": [
-        "crossing",
+        "crossing/island",
         "tactile_paving",
-        "crossing/island"
+        "crossing_raised"
     ],
     "geometry": [
         "point"

diff --git a/data/presets/@templates/crossing/surfacequality.json b/data/presets/@templates/crossing/surfacequality.json
@@ -0,0 +1,22 @@
+{
+    "fields": [
+        "surface",
+        "smoothness"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "@template": "crossing/surfacequality"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json
@@ -1,9 +1,9 @@
 {
     "icon": "temaki-railway_signals",
     "fields": [
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
         "crossing_raised"
     ],
     "moreFields": [

diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json
@@ -1,9 +1,8 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
-        "{@templates/crossing/defaults}",
         "{@templates/crossing/markings_yes}",
-        "crossing_raised"
+        "{@templates/crossing/defaults}"
     ],
     "moreFields": [
         "kerb"

diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json
@@ -1,8 +1,7 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "{@templates/crossing/defaults}",
-        "crossing_raised"
+        "{@templates/crossing/defaults}"
     ],
     "moreFields": [
         "kerb"

diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -10,9 +10,10 @@
     },
     "icon": "temaki-ped_cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -1,10 +1,11 @@
 {
     "icon": "fas-biking",
     "fields": [
+        "crossing",
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}"

diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
         "{@templates/crossing/markings_yes}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -1,8 +1,9 @@
 {
     "icon": "fas-biking",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json
@@ -1,8 +1,9 @@
 {
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"

diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"

diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json
@@ -1,10 +1,11 @@
 {
     "icon": "temaki-railway_signals",
     "fields": [
+        "crossing",
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}"

diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "{@templates/crossing/defaults}",
+        "crossing",
         "{@templates/crossing/markings_yes}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/defaults}",
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"

diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json
@@ -1,8 +1,9 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"

diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json
@@ -1,9 +1,11 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json
@@ -1,9 +1,11 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "flashing_lights"

diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json
@@ -1,10 +1,12 @@
 {
     "icon": "temaki-railway_signals",
     "fields": [
+        "crossing",
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}"

diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json
@@ -1,9 +1,11 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "{@templates/crossing/defaults}",
+        "crossing",
         "{@templates/crossing/markings_yes}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/defaults}",
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "flashing_lights"

diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json
@@ -1,8 +1,10 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "flashing_lights"