From fb69dec6ddf02e455abe85cba98096193fe8ca34 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 8 Dec 2022 16:33:42 +0100 Subject: [PATCH 1/4] fields/parking: centerline parking and orientation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …for case :left, :right, :both. The directionalCombo will show left/right in separate fields when both is present and merge/split the side as needed. Allow tagging `parking:$side` and `parking:$side:orientation` on centerlines (highways). --- data/fields/parking/side/orientation.json | 25 +++++++++++++++++++ data/fields/parking/side/parking.json | 30 +++++++++++++++++++++++ data/presets/highway/living_street.json | 4 ++- data/presets/highway/primary.json | 4 ++- data/presets/highway/primary_link.json | 4 ++- data/presets/highway/residential.json | 4 ++- data/presets/highway/service.json | 4 ++- 7 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 data/fields/parking/side/orientation.json create mode 100644 data/fields/parking/side/parking.json diff --git a/data/fields/parking/side/orientation.json b/data/fields/parking/side/orientation.json new file mode 100644 index 000000000..b94a15f99 --- /dev/null +++ b/data/fields/parking/side/orientation.json @@ -0,0 +1,25 @@ +{ + "keys": [ + "parking:both:orientation", + "parking:left:orientation", + "parking:right:orientation" + ], + "reference": { + "key": "parking:orientation" + }, + "type": "directionalCombo", + "label": "Parking orientation", + "strings": { + "types": { + "parking:left:orientation": "Left side", + "parking:right:orientation": "Right side" + }, + "options": { + "parallel": "Parallel to the Street", + "diagonal": "Diagonal in Relation to the Street (~45°)", + "perpendicular": "Meets the Street at a Straight Angle (~90°)" + } + }, + "autoSuggestions": false, + "customValues": false +} diff --git a/data/fields/parking/side/parking.json b/data/fields/parking/side/parking.json new file mode 100644 index 000000000..d9908ada9 --- /dev/null +++ b/data/fields/parking/side/parking.json @@ -0,0 +1,30 @@ +{ + "keys": [ + "parking:both", + "parking:left", + "parking:right" + ], + "reference": { + "key": "parking" + }, + "type": "directionalCombo", + "label": "Parking", + "strings": { + "types": { + "parking:left": "Left side", + "parking:right": "Right side" + }, + "options": { + "lane": "Roadside Lane", + "street_side": "Street-Side", + "on_kerb": "On Kerb", + "half_on_kerb": "Half On Kerb", + "shoulder": "Shoulder", + "no": "No", + "separate": "Parking mapped separately", + "yes": "Yes (unspecified)" + } + }, + "autoSuggestions": false, + "customValues": false +} diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json index 4e951546d..a2b1a0f1d 100644 --- a/data/presets/highway/living_street.json +++ b/data/presets/highway/living_street.json @@ -21,7 +21,9 @@ "oneway/bicycle", "smoothness", "trolley_wire", - "width" + "width", + "parking/side/parking", + "parking/side/orientation" ], "geometry": [ "line" diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json index 38cb39976..3a4d85059 100644 --- a/data/presets/highway/primary.json +++ b/data/presets/highway/primary.json @@ -31,7 +31,9 @@ "toll", "traffic_calming", "trolley_wire", - "width" + "width", + "parking/side/parking", + "parking/side/orientation" ], "geometry": [ "line" diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json index ce38a7cfc..ad72e5e7e 100644 --- a/data/presets/highway/primary_link.json +++ b/data/presets/highway/primary_link.json @@ -30,7 +30,9 @@ "smoothness", "toll", "trolley_wire", - "width" + "width", + "parking/side/parking", + "parking/side/orientation" ], "geometry": [ "line" diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json index 8de62dc2d..a781188ef 100644 --- a/data/presets/highway/residential.json +++ b/data/presets/highway/residential.json @@ -26,7 +26,9 @@ "smoothness", "traffic_calming", "trolley_wire", - "width" + "width", + "parking/side/parking", + "parking/side/orientation" ], "geometry": [ "line" diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json index a6f31271d..0f3104230 100644 --- a/data/presets/highway/service.json +++ b/data/presets/highway/service.json @@ -23,7 +23,9 @@ "smoothness", "traffic_calming", "trolley_wire", - "width" + "width", + "parking/side/parking", + "parking/side/orientation" ], "geometry": [ "line" From 57a2103f109479114fda3b52fbdc16d76142942d Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 20 Jan 2023 13:39:17 +0100 Subject: [PATCH 2/4] Update source_strings.yaml --- interim/source_strings.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 86eabe203..cf142cffa 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2707,6 +2707,33 @@ en: parallel: Parallel to the Street # parking:orientation=perpendicular perpendicular: Meets the Street at a Straight Angle + parking/side/orientation: + # parking:both:orientation=*, parking:left:orientation=*, parking:right:orientation=* + label: Parking orientation + options: + diagonal: Diagonal in Relation to the Street (~45°) + parallel: Parallel to the Street + perpendicular: Meets the Street at a Straight Angle (~90°) + terms: '[translate with synonyms or related terms for ''Parking orientation'', separated by commas]' + types: + parking:left:orientation: Left side + parking:right:orientation: Right side + parking/side/parking: + # parking:both=*, parking:left=*, parking:right=* + label: Parking + options: + half_on_kerb: Half On Kerb + lane: Roadside Lane + 'no': 'No' + on_kerb: On Kerb + separate: Parking mapped separately + shoulder: Shoulder + street_side: Street-Side + 'yes': Yes (unspecified) + terms: '[translate with synonyms or related terms for ''Parking'', separated by commas]' + types: + parking:left: Left side + parking:right: Right side parking_entrance: # parking=* label: Type From 22db9d34ffce5f0a3abfeaa934e7039990a1ed3f Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 20 Jan 2023 18:57:46 +0100 Subject: [PATCH 3/4] update field to final v6 schema --- data/fields/parking/side/orientation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/parking/side/orientation.json b/data/fields/parking/side/orientation.json index b94a15f99..4c9f87b1f 100644 --- a/data/fields/parking/side/orientation.json +++ b/data/fields/parking/side/orientation.json @@ -1,6 +1,6 @@ { + "key": "parking:both:orientation", "keys": [ - "parking:both:orientation", "parking:left:orientation", "parking:right:orientation" ], From a319517f985a96bc5d95d820237dff4300ad9dbb Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 20 Jan 2023 18:59:05 +0100 Subject: [PATCH 4/4] update field to final v6 schema --- data/fields/parking/side/parking.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/parking/side/parking.json b/data/fields/parking/side/parking.json index d9908ada9..6a0c694a7 100644 --- a/data/fields/parking/side/parking.json +++ b/data/fields/parking/side/parking.json @@ -1,6 +1,6 @@ { + "key": "parking:both", "keys": [ - "parking:both", "parking:left", "parking:right" ],