Skip to content

Commit b24e74a

Browse files
tordanstordans
committed
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.
1 parent 64f4482 commit b24e74a

23 files changed

+72
-33
lines changed

data/presets/@templates/crossing/geometry_line.json renamed to data/presets/@templates/crossing/bicycle_relevance.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
{
22
"fields": [
33
"oneway",
4-
"surface",
5-
"smoothness",
6-
"crossing_raised",
74
"access"
85
],
96
"geometry": [
107
"point"
118
],
129
"tags": {
13-
"@template": "crossing/geometry_line"
10+
"@template": "crossing/bicycle_relevance"
1411
},
1512
"searchable": false,
1613
"locationSet": {

‎data/presets/@templates/crossing/defaults.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"fields": [
3-
"crossing",
3+
"crossing/island",
44
"tactile_paving",
5-
"crossing/island"
5+
"crossing_raised"
66
],
77
"geometry": [
88
"point"

‎data/presets/@templates/crossing/surfacequality.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"fields": [
3+
"surface",
4+
"smoothness"
5+
],
6+
"geometry": [
7+
"point"
8+
],
9+
"tags": {
10+
"@template": "crossing/surfacequality"
11+
},
12+
"searchable": false,
13+
"locationSet": {
14+
"include": [
15+
"999"
16+
],
17+
"exclude": [
18+
"999"
19+
]
20+
},
21+
"name": "{point}"
22+
}

‎data/presets/highway/crossing/traffic_signals.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"icon": "temaki-railway_signals",
33
"fields": [
4+
"{@templates/crossing/traffic_signal}",
45
"{@templates/crossing/markings}",
56
"{@templates/crossing/defaults}",
6-
"{@templates/crossing/traffic_signal}",
77
"crossing_raised"
88
],
99
"moreFields": [

‎data/presets/highway/crossing/uncontrolled.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"icon": "temaki-pedestrian_crosswalk",
33
"fields": [
4-
"{@templates/crossing/defaults}",
54
"{@templates/crossing/markings_yes}",
6-
"crossing_raised"
5+
"{@templates/crossing/defaults}"
76
],
87
"moreFields": [
98
"kerb"

‎data/presets/highway/crossing/unmarked.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"icon": "temaki-pedestrian",
33
"fields": [
4-
"{@templates/crossing/defaults}",
5-
"crossing_raised"
4+
"{@templates/crossing/defaults}"
65
],
76
"moreFields": [
87
"kerb"

‎data/presets/highway/cycleway/_crossing.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"icon": "temaki-cyclist_crosswalk",
33
"fields": [
4+
"crossing",
45
"{@templates/crossing/markings}",
56
"{@templates/crossing/defaults}",
6-
"{@templates/crossing/geometry_line}"
7+
"{@templates/crossing/surfacequality}"
78
],
89
"geometry": [
910
"line"

‎data/presets/highway/cycleway/crossing/_marked.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"icon": "temaki-cyclist_crosswalk",
33
"fields": [
4+
"crossing",
45
"{@templates/crossing/markings}",
56
"{@templates/crossing/defaults}",
6-
"{@templates/crossing/geometry_line}"
7+
"{@templates/crossing/surfacequality}"
78
],
89
"geometry": [
910
"line"

‎data/presets/highway/cycleway/crossing/bicycle_foot.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
},
1111
"icon": "temaki-ped_cyclist_crosswalk",
1212
"fields": [
13+
"crossing",
1314
"{@templates/crossing/markings}",
1415
"{@templates/crossing/defaults}",
15-
"{@templates/crossing/geometry_line}"
16+
"{@templates/crossing/surfacequality}"
1617
],
1718
"geometry": [
1819
"line"

‎data/presets/highway/cycleway/crossing/traffic_signals.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"icon": "fas-biking",
33
"fields": [
4+
"crossing",
5+
"{@templates/crossing/traffic_signal}",
46
"{@templates/crossing/markings}",
57
"{@templates/crossing/defaults}",
6-
"{@templates/crossing/traffic_signal}",
7-
"{@templates/crossing/geometry_line}"
8+
"{@templates/crossing/surfacequality}"
89
],
910
"moreFields": [
1011
"{@templates/crossing/traffic_signal_more}"

0 commit comments

Comments
 (0)
⚡