mnalis/id-tagging-schema
1
0
Fork 0
mirror of https://github.com/openstreetmap/id-tagging-schema.git synced 2025-10-26 12:23:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #590 from openstreetmap/crossing_markings

Browse source 
refactor crossing presets to use approved "crossing:markings" tag: add field for the new tag, change "Marked Crosswalk" presets to use "crossing=uncontrolled" tag and add preset for "Cycle Crossing With Traffic Signals"
This commit is contained in:
Martin Raifer 2022-11-09 13:16:07 +01:00 • committed by GitHub
commit 6a013006cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 280 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

14
data/fields/crossing.json
View file

@ -1,5 +1,17 @@
{
"key": "crossing",
"type": "combo",
"label": "Type"
"label": "Type",
"options": [
"traffic_signals",
"uncontrolled",
"unmarked"
],
"strings": {
"options": {
"traffic_signals": "Crossing With Traffic Signals",
"uncontrolled": "Only Road Markings",
"unmarked": "No Road Markings or Traffic Signals"
}
}
}

24
data/fields/crossing/markings.json Normal file
View file

@ -0,0 +1,24 @@
{
"key": "crossing:markings",
"type": "combo",
"label": "Crossing Markings",
"strings": {
"options": {
"zebra": "Longitudinal Bars",
"lines": "Transverse Lines",
"no": "Unmarked",
"ladder": "Ladder With Longitudinal Bars",
"dots": "Dotted Transverse Lines",
"dashes": "Dashed Transverse Lines",
"yes": "Marked Somehow",
"surface": "Surface Treatment Only",
"ladder:skewed": "Ladder With Diagonal Bars",
"pictograms": "Painted Pictograms",
"lines:paired": "Double Transverse Lines",
"zebra:double": "Triple-Four",
"zebra:paired": "Paired Longitudinal Bars",
"zebra:bicolour": "Longitudinal Bars With Alternating Colors",
"ladder:paired": "Ladder With Paired Longitudinal Bars"
}
}
}

2
data/preset_categories/path.json
View file

@ -4,7 +4,7 @@
"members": [
"highway/path",
"highway/footway",
"highway/footway/marked",
"highway/footway/crossing/uncontrolled",
"highway/footway/sidewalk",
"highway/steps",
"highway/cycleway",

3
data/preset_defaults.json
View file

@ -36,7 +36,8 @@
"point"
],
"vertex": [
"highway/crossing/marked",
"highway/crossing/traffic_signals",
"highway/crossing/uncontrolled",
"highway/crossing/unmarked",
"railway/level_crossing",
"highway/traffic_signals",

4
data/presets/highway/crossing/marked.json → data/presets/highway/crossing/_marked.json
View file

@ -4,6 +4,7 @@
"crossing",
"tactile_paving",
"crossing/island",
"crossing/markings",
"crossing_raised"
],
"moreFields": [
@ -25,5 +26,6 @@
"marked crossing",
"crosswalk"
],
"name": "Marked Crosswalk"
"name": "Marked Crosswalk",
"searchable": false
}

1
data/presets/highway/crossing/_zebra.json
View file

@ -4,6 +4,7 @@
"crossing",
"tactile_paving",
"crossing/island",
"crossing/markings",
"crossing_raised"
],
"geometry": [

1
data/presets/highway/crossing/traffic_signals.json
View file

@ -4,6 +4,7 @@
"crossing",
"tactile_paving",
"crossing/island",
"crossing/markings",
"crossing_raised",
"button_operated",
"traffic_signals/sound",

4
data/presets/highway/crossing/_uncontrolled.json → data/presets/highway/crossing/uncontrolled.json
View file

@ -4,6 +4,7 @@
"crossing",
"tactile_paving",
"crossing/island",
"crossing/markings",
"crossing_raised"
],
"geometry": [
@ -17,6 +18,5 @@
"key": "crossing",
"value": "uncontrolled"
},
"name": "Marked Crosswalk",
"searchable": false
"name": "Marked Crosswalk"
}

5
data/presets/highway/cycleway/_crossing.json
View file

@ -2,10 +2,11 @@
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island"
"crossing/island",
"crossing/markings",
"access"
],
"geometry": [
"line"

27
data/presets/highway/cycleway/crossing/_marked.json Normal file
View file

@ -0,0 +1,27 @@
{
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"crossing/markings",
"crossing_raised",
"access"
],
"geometry": [
"line"
],
"tags": {
"highway": "cycleway",
"cycleway": "crossing",
"crossing": "marked"
},
"reference": {
"key": "crossing",
"value": "marked"
},
"matchScore": 0.95,
"name": "Marked Cycle Crossing",
"searchable": false
}

6
data/presets/highway/cycleway/crossing/bicycle_foot.json
View file

@ -9,11 +9,13 @@
"icon": "temaki-ped_cyclist_crosswalk",
"fields": [
"crossing",
"access",
"surface",
"smoothness",
"tactile_paving",
"crossing/island"
"crossing/island",
"crossing/markings",
"crossing_raised",
"access"
],
"geometry": [
"line"

34
data/presets/highway/cycleway/crossing/traffic_signals.json Normal file
View file

@ -0,0 +1,34 @@
{
"icon": "fas-biking",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"crossing_raised",
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration",
"access"
],
"geometry": [
"line"
],
"tags": {
"highway": "cycleway",
"cycleway": "crossing",
"crossing": "traffic_signals"
},
"reference": {
"key": "crossing",
"value": "traffic_signals"
},
"terms": [
"cycle path crossing",
"cycleway crossing",
"bicycle crossing",
"bike crossing"
],
"matchScore": 0.95,
"name": "Cycle Crossing With Traffic Signals"
}

10
data/presets/highway/cycleway/crossing/marked.json → data/presets/highway/cycleway/crossing/uncontrolled.json
View file

@ -2,10 +2,12 @@
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island"
"crossing/island",
"crossing/markings",
"crossing_raised",
"access"
],
"geometry": [
"line"
@ -13,11 +15,11 @@
"tags": {
"highway": "cycleway",
"cycleway": "crossing",
"crossing": "marked"
"crossing": "uncontrolled"
},
"reference": {
"key": "crossing",
"value": "marked"
"value": "uncontrolled"
},
"terms": [
"cycle crosswalk",

5
data/presets/highway/cycleway/crossing/unmarked.json
View file

@ -2,10 +2,11 @@
"icon": "fas-biking",
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island"
"crossing/island",
"crossing_raised",
"access"
],
"geometry": [
"line"

6
data/presets/highway/footway/_crossing.json
View file

@ -1,10 +1,12 @@
{
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island"
"crossing/island",
"crossing/markings",
"crossing_raised",
"access"
],
"geometry": [
"line"

29
data/presets/highway/footway/crossing/_marked.json Normal file
View file

@ -0,0 +1,29 @@
{
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"crossing/markings",
"crossing_raised",
"access"
],
"moreFields": [
"flashing_lights"
],
"geometry": [
"line"
],
"tags": {
"highway": "footway",
"footway": "crossing",
"crossing": "marked"
},
"reference": {
"key": "crossing",
"value": "marked"
},
"name": "Marked Crossing",
"searchable": false
}

7
data/presets/highway/footway/_zebra.json → data/presets/highway/footway/crossing/_zebra.json
View file

@ -2,11 +2,12 @@
"icon": "temaki-pedestrian_crosswalk",
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island",
"crossing_raised"
"crossing/markings",
"crossing_raised",
"access"
],
"geometry": [
"line"
@ -20,6 +21,6 @@
"key": "crossing",
"value": "zebra"
},
"name": "Marked Crosswalk",
"name": "Marked Crossing",
"searchable": false
}

5
data/presets/highway/footway/traffic_signals.json → data/presets/highway/footway/crossing/traffic_signals.json
View file

@ -2,14 +2,15 @@
"icon": "temaki-railway_signals",
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island",
"crossing/markings",
"crossing_raised",
"button_operated",
"traffic_signals/sound",
"traffic_signals/vibration"
"traffic_signals/vibration",
"access"
],
"moreFields": [
"traffic_signals/arrow",

15
data/presets/highway/footway/marked.json → data/presets/highway/footway/crossing/uncontrolled.json
View file

@ -1,12 +1,13 @@
{
"icon": "temaki-pedestrian_crosswalk",
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island",
"crossing_raised"
"crossing/markings",
"crossing_raised",
"access"
],
"moreFields": [
"flashing_lights"
@ -17,18 +18,18 @@
"tags": {
"highway": "footway",
"footway": "crossing",
"crossing": "marked"
"crossing": "uncontrolled"
},
"reference": {
"key": "crossing",
"value": "marked"
"value": "uncontrolled"
},
"terms": [
"marked foot path crossing",
"marked crossing",
"marked crosswalk",
"marked pedestrian crosswalk",
"zebra crossing",
"crosswalk"
],
"name": "Marked Crosswalk"
"name": "Marked Crossing"
}

4
data/presets/highway/footway/unmarked.json → data/presets/highway/footway/crossing/unmarked.json
View file

@ -2,11 +2,11 @@
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"access",
"surface",
"tactile_paving",
"crossing/island",
"crossing_raised"
"crossing_raised",
"access"
],
"moreFields": [
"flashing_lights"

25
data/presets/highway/footway/traffic_island.json Normal file
View file

@ -0,0 +1,25 @@
{
"icon": "temaki-pedestrian",
"geometry": [
"line"
],
"tags": {
"footway": "traffic_island"
},
"addTags": {
"highway": "footway",
"footway": "traffic_island"
},
"reference": {
"key": "footway",
"value": "traffic_island"
},
"terms": [
"crossing island"
],
"aliases": [
"Crosswalk Island",
"Traffic Island"
],
"name": "Refuge Island"
}

4
data/presets/railway/crossing.json
View file

@ -1,10 +1,14 @@
{
"icon": "temaki-pedestrian",
"fields": [
"crossing",
"crossing/barrier",
"crossing/bell",
"crossing/light"
],
"moreFields": [
"crossing/markings"
],
"geometry": [
"vertex"
],

97
interim/source_strings.yaml
View file

@ -758,6 +758,13 @@ en:
crossing:
# crossing=*
label: Type
options:
# crossing=traffic_signals
traffic_signals: Crossing With Traffic Signals
# crossing=uncontrolled
uncontrolled: Only Road Markings
# crossing=unmarked
unmarked: No Road Markings or Traffic Signals
crossing/barrier:
# crossing:barrier=*
label: Barrier Arm
@ -781,6 +788,41 @@ en:
crossing/light:
# crossing:light=*
label: Lights
crossing/markings:
# crossing:markings=*
label: Crossing Markings
options:
# crossing:markings=dashes
dashes: Dashed Transverse Lines
# crossing:markings=dots
dots: Dotted Transverse Lines
# crossing:markings=ladder
ladder: Ladder With Longitudinal Bars
#paired': crossing:markings=ladder:paired
ladder:paired: Ladder With Paired Longitudinal Bars
#skewed': crossing:markings=ladder:skewed
ladder:skewed: Ladder With Diagonal Bars
# crossing:markings=lines
lines: Transverse Lines
#paired': crossing:markings=lines:paired
lines:paired: Double Transverse Lines
# crossing:markings=no
'no': Unmarked
# crossing:markings=pictograms
pictograms: Painted Pictograms
# crossing:markings=surface
surface: Surface Treatment Only
# crossing:markings=yes
'yes': Marked Somehow
# crossing:markings=zebra
zebra: Longitudinal Bars
#bicolour': crossing:markings=zebra:bicolour
zebra:bicolour: Longitudinal Bars With Alternating Colors
#double': crossing:markings=zebra:double
zebra:double: Triple-Four
#paired': crossing:markings=zebra:paired
zebra:paired: Paired Longitudinal Bars
terms: '[translate with synonyms or related terms for ''Crossing Markings'', separated by commas]'
crossing_raised:
# traffic_calming=*
label: Raised
@ -6829,8 +6871,6 @@ en:
highway/crossing/marked:
# highway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Crosswalk
# 'terms: zebra crossing,marked crossing,crosswalk'
terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
highway/crossing/traffic_signals:
# highway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Crossing With Pedestrian Signals
@ -6839,6 +6879,7 @@ en:
highway/crossing/uncontrolled:
# highway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Crosswalk
terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
highway/crossing/unmarked:
# highway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Unmarked Crossing
@ -6868,6 +6909,14 @@ en:
highway/cycleway/crossing/marked:
# highway=cycleway + cycleway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Cycle Crossing
highway/cycleway/crossing/traffic_signals:
# highway=cycleway + cycleway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Cycle Crossing With Traffic Signals
# 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
terms: <translate with synonyms or related terms for 'Cycle Crossing With Traffic Signals', separated by commas>
highway/cycleway/crossing/uncontrolled:
# highway=cycleway + cycleway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Cycle Crossing
# 'terms: cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
terms: <translate with synonyms or related terms for 'Marked Cycle Crossing', separated by commas>
highway/cycleway/crossing/unmarked:
@ -6922,32 +6971,40 @@ en:
highway/footway/crossing:
# highway=footway + footway=crossing | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Pedestrian Crossing
highway/footway/crossing/marked:
# highway=footway + footway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Crossing
highway/footway/crossing/traffic_signals:
# highway=footway + footway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Crossing With Pedestrian Signals
# 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
highway/footway/crossing/uncontrolled:
# highway=footway + footway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Crossing
# 'terms: marked foot path crossing,marked crosswalk,marked pedestrian crosswalk,zebra crossing,crosswalk'
terms: <translate with synonyms or related terms for 'Marked Crossing', separated by commas>
highway/footway/crossing/unmarked:
# highway=footway + footway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Unmarked Crossing
# 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
highway/footway/crossing/zebra:
# highway=footway + footway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Crossing
highway/footway/informal:
# highway=footway + informal=yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Informal Foot Path
highway/footway/marked:
# highway=footway + footway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Crosswalk
# 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk'
terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
highway/footway/sidewalk:
# footway=sidewalk | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Sidewalk
# 'terms: pavement,sidepath'
terms: <translate with synonyms or related terms for 'Sidewalk', separated by commas>
highway/footway/traffic_signals:
# highway=footway + footway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Crossing With Pedestrian Signals
# 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
highway/footway/unmarked:
# highway=footway + footway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Unmarked Crossing
# 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
highway/footway/zebra:
# highway=footway + footway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Marked Crosswalk
highway/footway/traffic_island:
# footway=traffic_island | Crosswalk Island, Traffic Island | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Refuge Island
# 'terms: crossing island'
terms: <translate with synonyms or related terms for 'Refuge Island', separated by commas>
highway/give_way:
# highway=give_way | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Yield Sign