Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add field parking:$side and parking:$side:orientation #674

Closed
wants to merge 11 commits into from
Closed

Add field parking:$side and parking:$side:orientation #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
43eb751
Add field parking:$side and parking:$side:orientation
tordans Dec 8, 2022
bd84550
Add parking:$side* to highway presets
tordans Dec 8, 2022
2b2a954
files/cycleway: Use renamed `type` `directionalCombo`
tordans Dec 28, 2022
8c8d949
fields/parking: Use `directionalCombo`
tordans Dec 28, 2022
e0d07bf
fields/parking: Listen to `keys`
tordans Dec 28, 2022
d9fc26a
fields/parking: Update label and options
tordans Dec 28, 2022
c4e218a
fields/parking: Placeholder `prerequisiteTag`
tordans Dec 28, 2022
ede72b7
fields/cycleway: Add `:both`
tordans Dec 28, 2022
47f61c8
parking/fields: Split both-case (combo) from left_right-case (directi…
tordans Dec 29, 2022
ae6ce86
cycleway: Split both-case (combo) from left_right-case (directionalCo…
tordans Dec 29, 2022
364e352
fields/parking: Add reference
tordans Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions data/fields/cycleway/both.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"keys": [
"cycleway",
"cycleway:both"
],
"reference": {
"key": "cycleway"
},
"type": "combo",
"label": "Bike Lanes (both/primary sides)",
"placeholder": "none",
"strings": {
"options": {
"none": {
"title": "None",
"description": "No bike lane"
},
"lane": {
"title": "Standard bike lane",
"description": "A bike lane separated from auto traffic by a painted line"
},
"shared_lane": {
"title": "Shared bike lane",
"description": "A bike lane with no separation from auto traffic"
},
"track": {
"title": "Bike track",
"description": "A bike lane separated from traffic by a physical barrier"
},
"share_busway": {
"title": "Bike lane shared with bus",
"description": "A bike lane shared with a bus lane"
},
"opposite_lane": {
"title": "Opposite bike lane",
"description": "A bike lane that travels in the opposite direction of traffic"
},
"opposite": {
"title": "Contraflow bike lane",
"description": "A bike lane that travels in both directions on a one-way street"
},
"separate": {
"title": "Cycleway mapped separately",
"description": "Indicates that cycleway was mapped as a separate geometry"
}
}
}
}
5 changes: 2 additions & 3 deletions data/fields/cycleway.json → data/fields/cycleway/left_right.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
{
"keys": [
"cycleway",
"cycleway:left",
"cycleway:right"
],
"reference": {
"key": "cycleway"
},
"type": "cycleway",
"type": "directionalCombo",
"label": "Bike Lanes",
"placeholder": "none",
"strings": {
"types": {
"cycleway:left": "Left side",
"cycleway:right": "Right side"
"cycleway:right": "Right side",
},
"options": {
"none": {
Expand Down
82 changes: 82 additions & 0 deletions data/fields/parking/both/orientation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"key": "parking:both:orientation",
"type": "combo",
"label": "Parking orientation (both sides)",
"strings": {
"options": {
"parallel": {
"title": "Parallel to the Street",
"description": "Parking "
},
"diagonal": {
"title": "Diagonal in Relation to the Street",
"description": ""
},
"perpendicular": {
"title": "Meets the Street at a Straight Angle",
"description": ""
}
}
},
"prerequisiteTag": {
"key": "parking:both",
"valueNot:": "no"
},
// TODO: Option 3:
// Can we move the "prerequisiteTag" to the string>types area?
// Or maybe use the keys from string>types here, to match per "side"?
//
// TODO: Option 1:
// "prerequisiteTag": {
// "key": "parking:both",
// "valuesNot:": ["no", "separate"]
// },
//
// TODO: Option 2: Which would allow to list :left, :right as well in the future.
// "prerequisiteTag": {
// "and": [
// {
// "key": "parking:both",
// "valueNot:": "no"
// },
// {
// "key": "parking:both",
// "valueNot:": "separate"
// }
// ],
// "or": []
// },
//
// TODO: Option 2 variant for ./left_right/orientation
// "prerequisiteTag": {
// "and": [
// {
// "key": "parking:both",
// "valueNot:": "no"
// },
// {
// "key": "parking:both",
// "valueNot:": "separate"
// },
// {
// "key": "parking:left",
// "valueNot:": "no"
// },
// {
// "key": "parking:left",
// "valueNot:": "separate"
// },
// {
// "key": "parking:right",
// "valueNot:": "no"
// },
// {
// "key": "parking:right",
// "valueNot:": "separate"
// }
// ],
// "or": []
// },
"autoSuggestions": false,
"customValues": false
}
46 changes: 46 additions & 0 deletions data/fields/parking/both/parking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"key": "parking:both",
"reference": {
"key": "parking"
},
"type": "combo",
"label": "Parking",
"strings": {
"options": {
"lane": {
"title": "Roadside Lane",
"description": ""
},
"street_side": {
"title": "Street-Side",
"description": ""
},
"on_kerb": {
"title": "On Kerb",
"description": ""
},
"half_on_kerb": {
"title": "Half On Kerb",
"description": ""
},
"shoulder": {
"title": "Shoulder",
"description": ""
},
"no": {
"title": "No",
"description": ""
},
"separate": {
"title": "Parking mapped separately",
"description": "Indicates that parking was mapped as a separate geometry (point or area)"
},
"yes": {
"title": "Yes (unspecified)",
"description": ""
}
}
},
"autoSuggestions": false,
"customValues": false
}
37 changes: 37 additions & 0 deletions data/fields/parking/left_right/orientation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"keys": [
"parking:left:orientation",
"parking:right:orientationt"
],
"type": "directionalCombo",
"label": "Parking orientation",
"strings": {
"types": {
"parking:left:orientation": "Left side",
"parking:right:orientation": "Right side"
},
"options": {
"parallel": {
"title": "Parallel to the Street",
"description": "Parking "
},
"diagonal": {
"title": "Diagonal in Relation to the Street",
"description": ""
},
"perpendicular": {
"title": "Meets the Street at a Straight Angle",
"description": ""
}
}
},
"prerequisiteTag": {
// TODO
"keys": [
"parking:left",
"parking:right"
]
},
"autoSuggestions": false,
"customValues": false
}
53 changes: 53 additions & 0 deletions data/fields/parking/left_right/parking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"keys": [
"parking:left",
"parking:right"
],
"reference": {
"key": "parking"
},
"type": "directionalCombo",
"label": "Parking",
"strings": {
"types": {
"parking:left": "Left side",
"parking:right": "Right side"
},
"options": {
"lane": {
"title": "Roadside Lane",
"description": ""
},
"street_side": {
"title": "Street-Side",
"description": ""
},
"on_kerb": {
"title": "On Kerb",
"description": ""
},
"half_on_kerb": {
"title": "Half On Kerb",
"description": ""
},
"shoulder": {
"title": "Shoulder",
"description": ""
},
"no": {
"title": "No",
"description": ""
},
"separate": {
"title": "Parking mapped separately",
"description": "Indicates that parking was mapped as a separate geometry (point or area)"
},
"yes": {
"title": "Yes (unspecified)",
"description": ""
}
}
},
"autoSuggestions": false,
"customValues": false
}
4 changes: 3 additions & 1 deletion data/presets/highway/living_street.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"oneway/bicycle",
"smoothness",
"trolley_wire",
"width"
"width",
"parking/parking_side",
"parking/parking_side_orientation"
],
"geometry": [
"line"
Expand Down
4 changes: 3 additions & 1 deletion data/presets/highway/primary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"toll",
"traffic_calming",
"trolley_wire",
"width"
"width",
"parking/parking_side",
"parking/parking_side_orientation"
],
"geometry": [
"line"
Expand Down
4 changes: 3 additions & 1 deletion data/presets/highway/primary_link.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
"smoothness",
"toll",
"trolley_wire",
"width"
"width",
"parking/parking_side",
"parking/parking_side_orientation"
],
"geometry": [
"line"
Expand Down
4 changes: 3 additions & 1 deletion data/presets/highway/residential.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"smoothness",
"traffic_calming",
"trolley_wire",
"width"
"width",
"parking/parking_side",
"parking/parking_side_orientation"
],
"geometry": [
"line"
Expand Down
4 changes: 3 additions & 1 deletion data/presets/highway/service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
"smoothness",
"traffic_calming",
"trolley_wire",
"width"
"width",
"parking/parking_side",
"parking/parking_side_orientation"
],
"geometry": [
"line"
Expand Down