crossing: New approach with @templates/crossing/bicycle_relevance and @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.
This commit is contained in:
Tobias 2024-04-24 21:22:26 +02:00
parent 30a8be932d
commit 75d756f2bc
26 changed files with 74 additions and 39 deletions

View file

@ -1,16 +1,13 @@
{
"fields": [
"oneway",
"surface",
"smoothness",
"crossing_raised",
"access"
],
"geometry": [
"point"
"line"
],
"tags": {
"@template": "crossing/geometry_line"
"@template": "crossing/bicycle_relevance"
},
"searchable": false,
"locationSet": {

View file

@ -1,8 +1,8 @@
{
"fields": [
"crossing",
"crossing/island",
"tactile_paving",
"crossing/island"
"crossing_raised"
],
"geometry": [
"point",

View file

@ -0,0 +1,22 @@
{
"fields": [
"surface",
"smoothness"
],
"geometry": [
"line"
],
"tags": {
"@template": "crossing/surfacequality"
},
"searchable": false,
"locationSet": {
"include": [
"999"
],
"exclude": [
"999"
]
},
"name": "{point}"
}

View file

@ -1,8 +1,7 @@
{
"fields": [
"{@templates/crossing/defaults}",
"{@templates/crossing/markings}",
"crossing_raised"
"{@templates/crossing/markings}"
],
"moreFields": [
"flashing_lights",

View file

@ -3,7 +3,6 @@
"fields": [
"{@templates/crossing/markings}",
"{@templates/crossing/defaults}",
"crossing_raised"
],
"moreFields": [
"kerb"

View file

@ -3,7 +3,6 @@
"fields": [
"{@templates/crossing/markings}",
"{@templates/crossing/defaults}",
"crossing_raised"
],
"moreFields": [
"kerb"

View file

@ -1,10 +1,9 @@
{
"icon": "temaki-railway_signals",
"fields": [
"{@templates/crossing/traffic_signal}",
"{@templates/crossing/markings}",
"{@templates/crossing/defaults}",
"{@templates/crossing/traffic_signal}",
"crossing_raised"
],
"moreFields": [
"kerb",

View file

@ -1,9 +1,8 @@
{
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"{@templates/crossing/defaults}",
"{@templates/crossing/markings_yes}",
"crossing_raised"
"{@templates/crossing/defaults}"
],
"moreFields": [
"kerb"

View file

@ -1,8 +1,7 @@
{
"icon": "temaki-pedestrian",
"fields": [
"{@templates/crossing/defaults}",
"crossing_raised"
"{@templates/crossing/defaults}"
],
"moreFields": [
"kerb"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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}"

View file

@ -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"

View file

@ -1,8 +1,9 @@
{
"icon": "fas-biking",
"fields": [
"crossing",
"{@templates/crossing/defaults}",
"{@templates/crossing/geometry_line}"
"{@templates/crossing/surfacequality}"
],
"geometry": [
"line"

View file

@ -1,8 +1,9 @@
{
"fields": [
"crossing",
"{@templates/crossing/markings}",
"{@templates/crossing/defaults}",
"{@templates/crossing/geometry_line}"
"{@templates/crossing/surfacequality}"
],
"moreFields": [
"flashing_lights"

View file

@ -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"

View file

@ -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"

View file

@ -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}"

View file

@ -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"

View file

@ -1,8 +1,9 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"{@templates/crossing/defaults}",
"{@templates/crossing/geometry_line}"
"{@templates/crossing/surfacequality}"
],
"moreFields": [
"flashing_lights"

View file

@ -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"

View file

@ -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"

View file

@ -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}"

View file

@ -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"

View file

@ -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"