switch to regional presets instead of regional fields

also limit to ramps of type motorway, trunk and primary.
This commit is contained in:
Martin Raifer 2022-01-04 12:21:11 +01:00
parent 8b60bddd17
commit 8c59cdac6e
No known key found for this signature in database
GPG key ID: 3CD561F7B1C461BD
29 changed files with 305 additions and 68 deletions

View file

@ -1,9 +0,0 @@
{
"key": "maxspeed:advisory",
"type": "roadspeed",
"label": "Advisory Speed Limit",
"placeholder": "40, 50, 60...",
"locationSet": {
"exclude": ["ca", "us"]
}
}

View file

@ -1,9 +0,0 @@
{
"key": "maxspeed",
"type": "roadspeed",
"label": "Speed Limit",
"placeholder": "40, 50, 60...",
"locationSet": {
"include": ["ca", "us"]
}
}

View file

@ -2,8 +2,7 @@
"icon": "temaki-golf_cart",
"fields": [
"{golf/path}",
"maxspeed",
"maxspeed_mutcd"
"maxspeed"
],
"geometry": [
"line"

View file

@ -14,7 +14,6 @@
"dog",
"lit",
"maxspeed",
"maxspeed_mutcd",
"maxweight_bridge",
"not/name",
"smoothness",

View file

@ -4,7 +4,6 @@
"name",
"oneway",
"maxspeed",
"maxspeed_mutcd",
"lanes",
"surface",
"structure",

View file

@ -5,7 +5,6 @@
"ref_road_number",
"oneway_yes",
"maxspeed",
"maxspeed_mutcd",
"lanes",
"surface",
"structure",
@ -19,7 +18,6 @@
"lit",
"maxheight",
"maxspeed/advisory",
"maxspeed/advisory_mutcd",
"maxweight_bridge",
"minspeed",
"not/name",

View file

@ -0,0 +1,48 @@
{
"name": "Motorway Link",
"icon": "iD-highway-motorway-link",
"fields": [
"destination_oneway",
"destination/ref_oneway",
"junction/ref_oneway",
"oneway",
"maxspeed/advisory",
"lanes",
"surface",
"structure",
"access"
],
"moreFields": [
"charge_toll",
"covered",
"destination/symbol_oneway",
"incline",
"junction_line",
"lit",
"maxheight",
"maxspeed",
"maxweight_bridge",
"name",
"ref_road_number",
"smoothness",
"toll",
"width"
],
"geometry": [
"line"
],
"tags": {
"highway": "motorway_link"
},
"terms": [
"exit",
"ramp",
"road",
"street",
"on ramp",
"off ramp"
],
"locationSet": {
"include": ["ca", "us"]
}
}

View file

@ -1,4 +1,5 @@
{
"name": "Motorway Link",
"icon": "iD-highway-motorway-link",
"fields": [
"destination_oneway",
@ -6,7 +7,6 @@
"junction/ref_oneway",
"oneway",
"maxspeed",
"maxspeed/advisory_mutcd",
"lanes",
"surface",
"structure",
@ -20,7 +20,6 @@
"junction_line",
"lit",
"maxheight",
"maxspeed_mutcd",
"maxspeed/advisory",
"maxweight_bridge",
"name",
@ -43,5 +42,7 @@
"on ramp",
"off ramp"
],
"name": "Motorway Link"
"locationSet": {
"exclude": ["ca", "us"]
}
}

View file

@ -4,7 +4,6 @@
"name",
"oneway",
"maxspeed",
"maxspeed_mutcd",
"lanes",
"surface",
"structure",
@ -21,7 +20,6 @@
"lit",
"maxheight",
"maxspeed/advisory",
"maxspeed/advisory_mutcd",
"maxweight_bridge",
"not/name",
"oneway/bicycle",

View file

@ -0,0 +1,51 @@
{
"name": "Primary Link",
"icon": "iD-highway-primary-link",
"fields": [
"destination_oneway",
"destination/ref_oneway",
"oneway",
"maxspeed/advisory",
"lanes",
"surface",
"structure",
"access"
],
"moreFields": [
"charge_toll",
"covered",
"cycleway",
"destination/symbol_oneway",
"flood_prone",
"incline",
"junction_line",
"junction/ref_oneway",
"lit",
"maxheight",
"maxspeed",
"maxweight_bridge",
"name",
"oneway/bicycle",
"ref_road_number",
"smoothness",
"toll",
"trolley_wire",
"width"
],
"geometry": [
"line"
],
"tags": {
"highway": "primary_link"
},
"terms": [
"on ramp",
"off ramp",
"ramp",
"road",
"street"
],
"locationSet": {
"include": ["ca", "us"]
}
}

View file

@ -1,11 +1,11 @@
{
"name": "Primary Link",
"icon": "iD-highway-primary-link",
"fields": [
"destination_oneway",
"destination/ref_oneway",
"oneway",
"maxspeed",
"maxspeed/advisory_mutcd",
"lanes",
"surface",
"structure",
@ -22,7 +22,6 @@
"junction/ref_oneway",
"lit",
"maxheight",
"maxspeed_mutcd",
"maxspeed/advisory",
"maxweight_bridge",
"name",
@ -46,5 +45,7 @@
"road",
"street"
],
"name": "Primary Link"
"locationSet": {
"exclude": ["ca", "us"]
}
}

View file

@ -4,7 +4,6 @@
"name",
"oneway",
"maxspeed",
"maxspeed_mutcd",
"lanes",
"surface",
"structure",
@ -19,7 +18,6 @@
"lit",
"maxheight",
"maxspeed/advisory",
"maxspeed/advisory_mutcd",
"maxweight_bridge",
"not/name",
"oneway/bicycle",

View file

@ -1,4 +1,5 @@
{
"name": "Secondary Link",
"icon": "iD-highway-secondary-link",
"fields": [
"{highway/primary_link}"
@ -18,6 +19,5 @@
"ramp",
"road",
"street"
],
"name": "Secondary Link"
]
}

View file

@ -5,7 +5,6 @@
"service",
"oneway",
"maxspeed",
"maxspeed_mutcd",
"surface",
"structure",
"access"
@ -18,7 +17,6 @@
"lit",
"maxheight",
"maxspeed/advisory",
"maxspeed/advisory_mutcd",
"maxweight_bridge",
"oneway/bicycle",
"smoothness",

View file

@ -7,8 +7,7 @@
"fields": [
"direction",
"ref",
"maxspeed",
"maxspeed_mutcd"
"maxspeed"
],
"tags": {
"highway": "speed_camera"

View file

@ -1,4 +1,5 @@
{
"name": "Tertiary Link",
"icon": "iD-highway-tertiary-link",
"fields": [
"{highway/primary_link}"
@ -18,6 +19,5 @@
"ramp",
"road",
"street"
],
"name": "Tertiary Link"
]
}

View file

@ -5,7 +5,6 @@
"ref_road_number",
"oneway",
"maxspeed",
"maxspeed_mutcd",
"lanes",
"surface",
"structure",
@ -19,7 +18,6 @@
"lit",
"maxheight",
"maxspeed/advisory",
"maxspeed/advisory_mutcd",
"maxweight_bridge",
"minspeed",
"not/name",

View file

@ -0,0 +1,26 @@
{
"name": "Trunk Link",
"icon": "iD-highway-trunk-link",
"fields": [
"{highway/motorway_link-US-CA}"
],
"moreFields": [
"{highway/motorway_link-US-CA}"
],
"geometry": [
"line"
],
"tags": {
"highway": "trunk_link"
},
"terms": [
"on ramp",
"off ramp",
"ramp",
"road",
"street"
],
"locationSet": {
"include": ["ca", "us"]
}
}

View file

@ -1,4 +1,5 @@
{
"name": "Trunk Link",
"icon": "iD-highway-trunk-link",
"fields": [
"{highway/motorway_link}"
@ -19,5 +20,7 @@
"road",
"street"
],
"name": "Trunk Link"
"locationSet": {
"exclude": ["ca", "us"]
}
}

View file

@ -15,7 +15,6 @@
"highspeed",
"incline",
"maxspeed",
"maxspeed_mutcd",
"service_rail",
"usage_rail",
"voltage_electrified"

View file

@ -13,7 +13,6 @@
"electrified",
"frequency_electrified",
"maxspeed",
"maxspeed_mutcd",
"voltage_electrified"
],
"geometry": [

View file

@ -14,7 +14,6 @@
"frequency_electrified",
"incline",
"maxspeed",
"maxspeed_mutcd",
"voltage_electrified"
],
"geometry": [

View file

@ -2,8 +2,7 @@
"icon": "maki-square-stroked",
"fields": [
"{traffic_sign}",
"maxspeed",
"maxspeed_mutcd"
"maxspeed"
],
"geometry": [
"point",

View file

@ -1,8 +1,7 @@
{
"icon": "iD-relation",
"fields": [
"maxspeed",
"maxspeed_mutcd"
"maxspeed"
],
"geometry": [
"relation"

16
dist/fields.json vendored
View file

@ -1603,11 +1603,23 @@
},
"maxspeed": {
"key": "maxspeed",
"type": "roadspeed"
"type": "roadspeed",
"locationSet": {
"exclude": [
"ca",
"us"
]
}
},
"maxspeed/advisory": {
"key": "maxspeed:advisory",
"type": "roadspeed"
"type": "roadspeed",
"locationSet": {
"include": [
"ca",
"us"
]
}
},
"maxstay": {
"key": "maxstay",

File diff suppressed because one or more lines are too long

129
dist/presets.json vendored
View file

@ -10391,6 +10391,48 @@
"highway": "motorway_junction"
}
},
"highway/motorway_link-US-CA": {
"icon": "iD-highway-motorway-link",
"fields": [
"destination_oneway",
"destination/ref_oneway",
"junction/ref_oneway",
"oneway",
"maxspeed/advisory",
"lanes",
"surface",
"structure",
"access"
],
"moreFields": [
"charge_toll",
"covered",
"destination/symbol_oneway",
"incline",
"junction_line",
"lit",
"maxheight",
"maxspeed",
"maxweight_bridge",
"name",
"ref_road_number",
"smoothness",
"toll",
"width"
],
"geometry": [
"line"
],
"tags": {
"highway": "motorway_link"
},
"locationSet": {
"include": [
"ca",
"us"
]
}
},
"highway/motorway_link": {
"icon": "iD-highway-motorway-link",
"fields": [
@ -10425,6 +10467,12 @@
],
"tags": {
"highway": "motorway_link"
},
"locationSet": {
"exclude": [
"ca",
"us"
]
}
},
"highway/motorway": {
@ -10446,6 +10494,7 @@
"junction_line",
"lit",
"maxheight",
"maxspeed/advisory",
"maxweight_bridge",
"minspeed",
"not/name",
@ -10601,6 +10650,52 @@
"highway": "pedestrian"
}
},
"highway/primary_link-US-CA": {
"icon": "iD-highway-primary-link",
"fields": [
"destination_oneway",
"destination/ref_oneway",
"oneway",
"maxspeed/advisory",
"lanes",
"surface",
"structure",
"access"
],
"moreFields": [
"charge_toll",
"covered",
"cycleway",
"destination/symbol_oneway",
"flood_prone",
"incline",
"junction_line",
"junction/ref_oneway",
"lit",
"maxheight",
"maxspeed",
"maxweight_bridge",
"name",
"oneway/bicycle",
"ref_road_number",
"smoothness",
"toll",
"trolley_wire",
"width"
],
"geometry": [
"line"
],
"tags": {
"highway": "primary_link"
},
"locationSet": {
"include": [
"ca",
"us"
]
}
},
"highway/primary_link": {
"icon": "iD-highway-primary-link",
"fields": [
@ -10639,6 +10734,12 @@
],
"tags": {
"highway": "primary_link"
},
"locationSet": {
"exclude": [
"ca",
"us"
]
}
},
"highway/primary": {
@ -11218,6 +11319,27 @@
"highway": "trailhead"
}
},
"highway/trunk_link-US-CA": {
"icon": "iD-highway-trunk-link",
"fields": [
"{highway/motorway_link-US-CA}"
],
"moreFields": [
"{highway/motorway_link-US-CA}"
],
"geometry": [
"line"
],
"tags": {
"highway": "trunk_link"
},
"locationSet": {
"include": [
"ca",
"us"
]
}
},
"highway/trunk_link": {
"icon": "iD-highway-trunk-link",
"fields": [
@ -11231,6 +11353,12 @@
],
"tags": {
"highway": "trunk_link"
},
"locationSet": {
"exclude": [
"ca",
"us"
]
}
},
"highway/trunk": {
@ -11252,6 +11380,7 @@
"junction_line",
"lit",
"maxheight",
"maxspeed/advisory",
"maxweight_bridge",
"minspeed",
"not/name",

File diff suppressed because one or more lines are too long

View file

@ -1496,18 +1496,6 @@ en:
# maxspeed/advisory field placeholder
placeholder: '40, 50, 60...'
terms: '[translate with synonyms or related terms for ''Advisory Speed Limit'', separated by commas]'
maxspeed/advisory_mutcd:
# 'maxspeed:advisory=*'
label: Advisory Speed Limit
# maxspeed/advisory_mutcd field placeholder
placeholder: '40, 50, 60...'
terms: '[translate with synonyms or related terms for ''Advisory Speed Limit'', separated by commas]'
maxspeed_mutcd:
# maxspeed=*
label: Speed Limit
# maxspeed_mutcd field placeholder
placeholder: '40, 50, 60...'
terms: '[translate with synonyms or related terms for ''Speed Limit'', separated by commas]'
maxstay:
# maxstay=*
label: Max Stay
@ -5584,6 +5572,11 @@ en:
name: Motorway Link
# 'terms: exit,ramp,road,street,on ramp,off ramp'
terms: '<translate with synonyms or related terms for ''Motorway Link'', separated by commas>'
highway/motorway_link-US-CA:
# 'highway=motorway_link\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: Motorway Link
# 'terms: exit,ramp,road,street,on ramp,off ramp'
terms: '<translate with synonyms or related terms for ''Motorway Link'', separated by commas>'
highway/passing_place:
# 'highway=passing_place\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: Passing Place
@ -5624,6 +5617,11 @@ en:
name: Primary Link
# 'terms: on ramp,off ramp,ramp,road,street'
terms: '<translate with synonyms or related terms for ''Primary Link'', separated by commas>'
highway/primary_link-US-CA:
# 'highway=primary_link\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: Primary Link
# 'terms: on ramp,off ramp,ramp,road,street'
terms: '<translate with synonyms or related terms for ''Primary Link'', separated by commas>'
highway/raceway:
# 'highway=raceway\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: Motorsport Racetrack
@ -5768,6 +5766,11 @@ en:
name: Trunk Link
# 'terms: on ramp,off ramp,ramp,road,street'
terms: '<translate with synonyms or related terms for ''Trunk Link'', separated by commas>'
highway/trunk_link-US-CA:
# 'highway=trunk_link\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: Trunk Link
# 'terms: on ramp,off ramp,ramp,road,street'
terms: '<translate with synonyms or related terms for ''Trunk Link'', separated by commas>'
highway/turning_circle:
# 'highway=turning_circle\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
name: Turning Circle