Remove mixed schema types for roads.flags property

OvertureMaps · Mar 1, 2024 · c6ebccd · c6ebccd
1 parent 5aadbff
commit c6ebccd
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 25 deletions.
diff --git a/counterexamples/transportation/segment/road/bad-road-flags-invalid-string-value.json b/counterexamples/transportation/segment/road/bad-road-flags-invalid-string-value.json
@@ -0,0 +1,21 @@
+{
+    "id": "invalid-road-flag-string-value",
+    "type": "Feature",
+    "geometry": {
+      "type": "LineString",
+      "coordinates": [[2, 2], [3, 3]]
+    },
+    "properties": {
+      "ext_expected_errors": [
+        "[I#/properties/road/flags/0] [S#/$defs/propertyDefinitions/road/properties/flags/items/type] expected object, but got string"
+      ],
+      "theme": "transportation",
+      "type": "segment",
+      "version": 19,
+      "update_time": "2023-02-23T00:04:00-08:00",
+      "subtype": "road",
+      "road": {
+        "flags": ["is_tunnel"]
+      }
+    }
+  }
diff --git a/counterexamples/transportation/segment/road/restrictions/bad-access-mode-not.yaml b/counterexamples/transportation/segment/road/restrictions/bad-access-mode-not.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       access:
         - allowed:

diff --git a/counterexamples/transportation/segment/road/restrictions/bad-access-mode.yaml b/counterexamples/transportation/segment/road/restrictions/bad-access-mode.yaml
@@ -21,7 +21,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel]
+    flags: 
+      - [is_link, is_tunnel]
     restrictions:
       access:
         - allowed:

diff --git a/...terexamples/transportation/segment/road/restrictions/bad-access-restrictions-vehicle.yaml b/...terexamples/transportation/segment/road/restrictions/bad-access-restrictions-vehicle.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       access:
         - allowed:

diff --git a/counterexamples/transportation/segment/road/restrictions/bad-speed-limits-mode.yaml b/counterexamples/transportation/segment/road/restrictions/bad-speed-limits-mode.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       speed_limits:
         - max_speed: [110, "mph"]

diff --git a/...xamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-modes.yaml b/...xamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-modes.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       access:
         - allowed:

diff --git a/...les/transportation/segment/road/restrictions/turns/bad-access-restrictions-not-modes.yaml b/...les/transportation/segment/road/restrictions/turns/bad-access-restrictions-not-modes.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       access:
         - allowed:

diff --git a/...es/transportation/segment/road/restrictions/turns/bad-access-restrictions-recognized.yaml b/...es/transportation/segment/road/restrictions/turns/bad-access-restrictions-recognized.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       access:
         - allowed:

diff --git a/...xamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-using.yaml b/...xamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-using.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       access:
         - allowed:

diff --git a/...mples/transportation/segment/road/restrictions/turns/bad-access-restrictions-vehicle.yaml b/...mples/transportation/segment/road/restrictions/turns/bad-access-restrictions-vehicle.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       access:
         - allowed:

diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-duplicate-via.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-duplicate-via.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       turns:
         - segment_id: overture:transportation:segment:345

diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-no-turn-target.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-no-turn-target.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions: 
       turns:
         - toDirection: forward

diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-no-via-target.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-no-via-target.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions:
       turns:
         - segment_id: overture:transportation:segment:345

diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-reason.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-reason.yaml
@@ -19,7 +19,8 @@ properties:
   road:
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel, isPrivate]
+    flags: 
+      - [is_link, is_tunnel, isPrivate]
     restrictions: 
       turns:
         - segment_id: overture:transportation:segment:234

diff --git a/examples/transportation/segment/road/road.yaml b/examples/transportation/segment/road/road.yaml
@@ -21,7 +21,8 @@ properties:
     # no access nor lanes information -> means by default road is accessible in both directions with at least one lane in each direction
     class: secondary
     surface: gravel
-    flags: [is_link, is_tunnel]
+    flags: 
+      - values: [is_link, is_tunnel]
     width:
       - value: 10
     restrictions:

diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
@@ -172,17 +172,15 @@ properties:
             as an array of flag rules.
           type: array
           items:
-            oneOf:
-              - { "$ref": "#/$defs/propertyDefinitions/roadFlag" }
-              - type: object
-                allOf:
-                  - { "$ref": "../defs.yaml#/$defs/propertyContainers/atRangeContainer" }
-                unevaluatedProperties: false
-                properties:
-                  values:
-                    type: array
-                    items: { "$ref": "#/$defs/propertyDefinitions/roadFlag" }
-                    uniqueItems: true
+            type: object
+            allOf:
+              - { "$ref": "../defs.yaml#/$defs/propertyContainers/atRangeContainer" }
+            unevaluatedProperties: false
+            properties:
+              values:
+                type: array
+                items: { "$ref": "#/$defs/propertyDefinitions/roadFlag" }
+                uniqueItems: true
           uniqueItems: true
         width:
           description: >-