Merge branch 'main' into patch-3

This commit is contained in:
SteveLz 2025-08-07 14:11:23 +08:00 committed by GitHub
commit 3254c4b2af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
468 changed files with 233689 additions and 29772 deletions

View file

@ -1,15 +1,13 @@
{
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"flashing_lights",
"kerb",
"oneway"
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -0,0 +1,25 @@
# About the crossing presets
## General
These presets use fields `@templates` to make sure all have a similar structure.
Some presets like `traffic_signals` have additional fields and use a different field order.
Try to keep the file structure very similar so they can be easily compared.
## nodes `highway=crossing + crossing=*`
Crossing nodes are handled by `highway/crossing.json` and `highway/crossing/*.json` (as geometry type `vertex`).
Crossing nodes and crossing ways have a big overlap.
However, there are a few tags that should _only_ be expected on the crossing node. When crossing ways are present, this also means there are separate ways attached with additional nodes that may hold these additional tags.
There are places in OSM that follow a different tagging style where only crossing ways are used (without the vertex nodes). Those regions might use other conventions on where to place each tag.
## ways `highway=footway|cycleway|path + *=crossing + crossing=*`
Crossing way presets are duplicated per highway class:
- `/highway/footway/crossing.json` + `/highway/footway/crossing/*.json`
- `/highway/cycleway/crossing.json` + `/highway/cycleway/crossing/*.json`
- `/highway/path/crossing.json` + `/highway/path/crossing/*.json`
The crossing presets for `/cycleway*` and `/path*` are considered to be relevant for bike traffic and have additional fields that target bike vs. foot traffic.

View file

@ -0,0 +1,23 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing"
],
"geometry": [
"vertex"
],
"tags": {
"crossing": "informal"
},
"terms": [
"informal crosswalk",
"informal foot path crossing",
"informal pedestrian crossing"
],
"reference": {
"key": "crossing",
"value": "informal"
},
"name": "Informal Crossing",
"searchable": false
}

View file

@ -2,10 +2,13 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"
@ -23,11 +26,6 @@
"key": "crossing",
"value": "marked"
},
"terms": [
"zebra crossing",
"marked crossing",
"crosswalk"
],
"name": "{highway/crossing/uncontrolled}",
"searchable": false
}

View file

@ -2,10 +2,13 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,19 +2,15 @@
"icon": "temaki-railway_signals",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/traffic_signal}",
"{@templates/crossing/markings}",
"crossing_raised",
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"{@templates/crossing/traffic_signal_more}",
"kerb",
"traffic_signals/arrow",
"traffic_signals/countdown",
"traffic_signals/minimap"
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,10 +2,13 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings_yes}",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,9 +2,12 @@
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"crossing_raised"
"{@templates/crossing/defaults}",
"tactile_paving"
],
"moreFields": [
"kerb",
"flashing_lights"
],
"geometry": [
"vertex"

View file

@ -2,11 +2,13 @@
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -2,12 +2,13 @@
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -4,6 +4,7 @@
"fr",
"lt",
"pl",
"de",
"il",
"ps"
]
@ -11,13 +12,13 @@
"icon": "temaki-ped_cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"smoothness",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -1,19 +1,16 @@
{
"icon": "fas-biking",
"fields": [
"oneway",
"crossing",
"surface",
"crossing/island",
"{@templates/crossing/traffic_signal}",
"{@templates/crossing/markings}",
"crossing_raised",
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"tactile_paving"
"{@templates/crossing/traffic_signal_more}",
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -1,14 +1,14 @@
{
"icon": "temaki-cyclist_crosswalk",
"fields": [
"oneway",
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/defaults}",
"{@templates/crossing/markings_yes}",
"crossing_raised",
"access"
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -2,11 +2,12 @@
"icon": "fas-biking",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}"
],
"geometry": [
"line"

View file

@ -0,0 +1,23 @@
{
"icon": "fas-biking",
"geometry": [
"line"
],
"tags": {
"highway": "cycleway",
"cycleway": "traffic_island"
},
"reference": {
"key": "cycleway",
"value": "traffic_island"
},
"terms": [
"crossing island"
],
"aliases": [
"Crosswalk Island",
"Traffic Island",
"Pedestrian Island"
],
"name": "Cycle Refuge Island"
}

View file

@ -0,0 +1,35 @@
{
"locationSet": {
"exclude": [
"fr",
"lt",
"pl",
"de",
"il",
"ps"
]
},
"icon": "temaki-pedestrian_and_cyclist",
"geometry": [
"line"
],
"tags": {
"highway": "cycleway",
"cycleway": "traffic_island",
"foot": "designated",
"bicycle": "designated"
},
"reference": {
"key": "cycleway",
"value": "traffic_island"
},
"terms": [
"crossing island"
],
"aliases": [
"Crosswalk Island",
"Traffic Island",
"Pedestrian Island"
],
"name": "Cycle & Foot Refuge Island"
}

View file

@ -1,14 +1,12 @@
{
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"flashing_lights"
],
"geometry": [

View file

@ -0,0 +1,24 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}"
],
"geometry": [
"line"
],
"tags": {
"highway": "footway",
"footway": "crossing",
"crossing": "informal"
},
"reference": {
"key": "crossing",
"value": "informal"
},
"name": "{highway/crossing/informal}",
"searchable": false
}

View file

@ -2,14 +2,12 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"flashing_lights"
],
"geometry": [

View file

@ -2,12 +2,13 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"flashing_lights"
],
"geometry": [
"line"

View file

@ -2,20 +2,15 @@
"icon": "temaki-railway_signals",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/traffic_signal}",
"{@templates/crossing/markings}",
"crossing_raised",
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"traffic_signals/arrow",
"traffic_signals/countdown",
"traffic_signals/minimap"
"{@templates/crossing/traffic_signal_more}",
"{@templates/crossing/geometry_way_more}",
"flashing_lights"
],
"geometry": [
"line"

View file

@ -2,14 +2,12 @@
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings_yes}",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"flashing_lights"
],
"geometry": [

View file

@ -2,13 +2,11 @@
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"crossing_raised",
"access"
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"flashing_lights"
],
"geometry": [

View file

@ -4,9 +4,6 @@
"line"
],
"tags": {
"footway": "traffic_island"
},
"addTags": {
"highway": "footway",
"footway": "traffic_island"
},

View file

@ -0,0 +1,30 @@
{
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"{@templates/crossing/markings}",
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}",
"flashing_lights"
],
"geometry": [
"line"
],
"tags": {
"path": "crossing"
},
"addTags": {
"highway": "path",
"path": "crossing"
},
"reference": {
"key": "path",
"value": "crossing"
},
"searchable": false,
"name": "Cycle & Foot Crossing"
}

View file

@ -0,0 +1,32 @@
{
"locationSet": {
"include": [
"fr",
"lt",
"pl",
"de",
"il",
"ps"
]
},
"icon": "temaki-pedestrian_and_cyclist",
"fields": [
"{highway/cycleway/bicycle_foot}"
],
"geometry": [
"line"
],
"tags": {
"highway": "path",
"foot": "designated",
"bicycle": "designated"
},
"removeTags": {
"highway": "path",
"foot": "designated",
"bicycle": "designated",
"segregated": "*"
},
"matchScore": 0.9,
"name": "{highway/cycleway/bicycle_foot}"
}

View file

@ -0,0 +1,24 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}"
],
"geometry": [
"line"
],
"tags": {
"highway": "path",
"path": "crossing",
"crossing": "informal"
},
"reference": {
"key": "crossing",
"value": "informal"
},
"name": "{highway/crossing/informal}",
"searchable": false
}

View file

@ -0,0 +1,34 @@
{
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"{@templates/crossing/markings}",
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}",
"flashing_lights"
],
"geometry": [
"line"
],
"tags": {
"highway": "path",
"path": "crossing",
"crossing": "marked"
},
"addTags": {
"highway": "path",
"path": "crossing",
"crossing": "marked",
"crossing:markings": "yes"
},
"reference": {
"key": "crossing",
"value": "marked"
},
"name": "{highway/path/crossing/uncontrolled}",
"searchable": false
}

View file

@ -0,0 +1,30 @@
{
"icon": "temaki-railway_signals",
"fields": [
"crossing",
"{@templates/crossing/traffic_signal}",
"{@templates/crossing/markings}",
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/traffic_signal_more}",
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}",
"flashing_lights"
],
"geometry": [
"line"
],
"tags": {
"highway": "path",
"path": "crossing",
"crossing": "traffic_signals"
},
"reference": {
"key": "crossing",
"value": "traffic_signals"
},
"name": "Cycle & Foot Crossing With Pedestrian Signals",
"searchable": false
}

View file

@ -0,0 +1,28 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"{@templates/crossing/markings_yes}",
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}",
"flashing_lights"
],
"geometry": [
"line"
],
"tags": {
"highway": "path",
"path": "crossing",
"crossing": "uncontrolled"
},
"reference": {
"key": "crossing",
"value": "uncontrolled"
},
"name": "Marked Cycle & Foot Crossing",
"searchable": false
}

View file

@ -0,0 +1,33 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"{@templates/crossing/defaults}",
"surface"
],
"moreFields": [
"{@templates/crossing/geometry_way_more}",
"{@templates/crossing/bicycle_more}",
"flashing_lights"
],
"geometry": [
"line"
],
"tags": {
"highway": "path",
"path": "crossing",
"crossing": "unmarked"
},
"addTags": {
"highway": "path",
"path": "crossing",
"crossing": "unmarked",
"crossing:markings": "no"
},
"reference": {
"key": "crossing",
"value": "unmarked"
},
"name": "Unmarked Cycle & Foot Crossing",
"searchable": false
}

View file

@ -0,0 +1,38 @@
{
"locationSet": {
"include": [
"fr",
"lt",
"pl",
"de",
"il",
"ps"
]
},
"icon": "temaki-ped_cyclist_crosswalk",
"fields": [
"{highway/cycleway/crossing/bicycle_foot}"
],
"geometry": [
"line"
],
"tags": {
"highway": "path",
"path": "crossing",
"foot": "designated",
"bicycle": "designated"
},
"removeTags": {
"highway": "path",
"path": "crossing",
"foot": "designated",
"bicycle": "designated",
"segregated": "*"
},
"reference": {
"key": "path",
"value": "crossing"
},
"matchScore": 0.9,
"name": "{highway/cycleway/crossing/bicycle_foot}"
}

View file

@ -0,0 +1,30 @@
{
"locationSet": {
"include": [
"fr",
"lt",
"pl",
"de",
"il",
"ps"
]
},
"icon": "temaki-pedestrian_and_cyclist",
"geometry": [
"line"
],
"tags": {
"highway": "path",
"path": "traffic_island",
"foot": "designated",
"bicycle": "designated"
},
"reference": {
"key": "path",
"value": "traffic_island"
},
"fields": [
"{highway/cycleway/traffic_island_shared}"
],
"name": "{highway/cycleway/traffic_island_shared}"
}

View file

@ -13,6 +13,7 @@
"lamp_mount",
"direction",
"height",
"operator",
"ref"
],
"terms": [