Merge remote-tracking branch 'tordans/parking_directionalcombo' into …

…main (keeping moreFields sorted alphabetically)
openstreetmap · Jan 20, 2023 · 9391e2f · 9391e2f
2 parents 8281299 + a319517
commit 9391e2f
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 0 deletions.
diff --git a/data/fields/parking/side/orientation.json b/data/fields/parking/side/orientation.json
@@ -0,0 +1,25 @@
+{
+    "key": "parking:both:orientation",
+    "keys": [
+        "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
@@ -0,0 +1,30 @@
+{
+    "key": "parking:both",
+    "keys": [
+        "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
@@ -19,6 +19,8 @@
         "maxweight_bridge",
         "maxwidth",
         "oneway/bicycle",
+        "parking/side/parking",
+        "parking/side/orientation",
         "smoothness",
         "trolley_wire",
         "width"

diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json
@@ -27,6 +27,8 @@
         "maxwidth",
         "not/name",
         "oneway/bicycle",
+        "parking/side/parking",
+        "parking/side/orientation",
         "smoothness",
         "toll",
         "trolley_wire",

diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json
@@ -26,6 +26,8 @@
         "maxweight_bridge",
         "maxwidth",
         "oneway/bicycle",
+        "parking/side/parking",
+        "parking/side/orientation",
         "ref_road_number",
         "smoothness",
         "toll",

diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json
@@ -23,6 +23,8 @@
         "maxwidth",
         "not/name",
         "oneway/bicycle",
+        "parking/side/parking",
+        "parking/side/orientation",
         "smoothness",
         "trolley_wire",
         "width"

diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json
@@ -20,6 +20,8 @@
         "maxweight_bridge",
         "maxwidth",
         "oneway/bicycle",
+        "parking/side/parking",
+        "parking/side/orientation",
         "smoothness",
         "trolley_wire",
         "width"

diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
@@ -2871,6 +2871,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