Remove deprecated connector_ids (#284)

* remove connector_ids * updating missed counterexample * fix test after sync from dev
OvertureMaps · Oct 10, 2024 · db8126e · db8126e
1 parent d1b4b5a
commit db8126e
Show file tree

Hide file tree

Showing 40 changed files with 45 additions and 100 deletions.
diff --git a/counterexamples/transportation/segment/bad-class.yaml b/counterexamples/transportation/segment/bad-class.yaml
@@ -13,4 +13,8 @@ properties:
   version: 1
   subtype: road
   class: sidewalk
-  connector_ids: [fooConnector, barConnector]
+  connectors: 
+  - connector_id: fooConnector
+    at: 0
+  - connector_id: barConnector
+    at: 1
diff --git a/counterexamples/transportation/segment/bad-connector-duplicate.json b/counterexamples/transportation/segment/bad-connector-duplicate.json
@@ -13,7 +13,6 @@
     "type": "segment",
     "version": 4,
     "subtype": "rail",
-    "connector_ids": ["fooConnector", "bazConnector", "fooConnector"],
     "connectors": [
       {
         "connector_id": "fooConnector",

diff --git a/counterexamples/transportation/segment/bad-connector.json b/counterexamples/transportation/segment/bad-connector.json
@@ -7,8 +7,6 @@
   },
   "properties": {
     "ext_expected_errors": [
-      "got number, want string",
-      "got boolean, want string",
       "got string, want object",
       "got number, want object",
       "got boolean, want object"
@@ -17,7 +15,6 @@
     "type": "segment",
     "version": 3,
     "subtype": "rail",
-    "connector_ids": ["bazConnector", "qux", 1, false],
     "connectors": [{"connector_id": "foo", "at": 0.0}, {"connector_id": "bar", "at": 1.0}, "bazConnector", "qux", 1, false]
   }
 }
diff --git a/counterexamples/transportation/segment/bad-route.yaml b/counterexamples/transportation/segment/bad-route.yaml
@@ -13,8 +13,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/counterexamples/transportation/segment/road/bad-road-destinations.yaml b/counterexamples/transportation/segment/road/bad-road-destinations.yaml
@@ -10,7 +10,11 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  connectors: 
+  - connector_id: overture:transportation:connector:123
+    at: 0
+  - connector_id: overture:transportation:connector:678
+    at: 1
   destinations:
     - labels:
       - value: Seattle

diff --git a/counterexamples/transportation/segment/road/bad-road-level-invalid-value.yaml b/counterexamples/transportation/segment/road/bad-road-level-invalid-value.yaml
@@ -10,8 +10,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/counterexamples/transportation/segment/road/bad-road-level-unsupported-properties.yaml b/counterexamples/transportation/segment/road/bad-road-level-unsupported-properties.yaml
@@ -10,8 +10,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/...amples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml b/...amples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
@@ -10,7 +10,11 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  connectors:
+    - connector_id: overture:transportation:connector:123
+      at: 0
+    - connector_id: overture:transportation:connector:678
+      at: 1
   destinations:
     - labels:
       - value: Seattle

diff --git a/...terexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml b/...terexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
@@ -10,7 +10,11 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  connectors:
+    - connector_id: overture:transportation:connector:123
+      at: 0
+    - connector_id: overture:transportation:connector:678
+      at: 1
   destinations:
     - labels:
       - value: Seattle

diff --git a/...les/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml b/...les/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
@@ -10,7 +10,11 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  connectors:
+    - connector_id: overture:transportation:connector:123
+      at: 0
+    - connector_id: overture:transportation:connector:678
+      at: 1
   destinations:
     - labels:
       - value:

diff --git a/...amples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml b/...amples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml
@@ -10,7 +10,11 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  connectors:
+    - connector_id: overture:transportation:connector:123
+      at: 0
+    - connector_id: overture:transportation:connector:678
+      at: 1
   destinations:
     - labels:
       - value: Seattle

diff --git a/...transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml b/...transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
@@ -10,7 +10,11 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  connectors:
+    - connector_id: overture:transportation:connector:123
+      at: 0
+    - connector_id: overture:transportation:connector:678
+      at: 1
   destinations:
     - labels:
       - value: Seattle

diff --git a/counterexamples/transportation/segment/road/restrictions/access/bad-access-mode.yaml b/counterexamples/transportation/segment/road/restrictions/access/bad-access-mode.yaml
@@ -18,8 +18,6 @@ properties:
   subclass: link
   subclass_rules:
     - value: link
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/...ples/transportation/segment/road/restrictions/access/bad-access-restrictions-vehicle.yaml b/...ples/transportation/segment/road/restrictions/access/bad-access-restrictions-vehicle.yaml
@@ -13,7 +13,11 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  connector_ids: [fooConnector, barConnector]
+  connectors:
+    - connector_id: fooConnector
+      at: 0
+    - connector_id: barConnector
+      at: 1
   access_restrictions:
     - access_type: allowed
       when: {vehicle: [{dimension: axle_count, comparison: greater_than, value: {is_foo: 5}}]}

diff --git a/...tation/segment/road/restrictions/prohibited_transitions/bad-sequence-duplicate-entry.yaml b/...tation/segment/road/restrictions/prohibited_transitions/bad-sequence-duplicate-entry.yaml
@@ -10,8 +10,6 @@ properties:
   version: 2
   subtype: road
   class: primary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/...s/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-empty.yaml b/...s/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-empty.yaml
@@ -10,8 +10,6 @@ properties:
   version: 2
   subtype: road
   class: primary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/...ransportation/segment/road/restrictions/prohibited_transitions/missing-final-heading.yaml b/...ransportation/segment/road/restrictions/prohibited_transitions/missing-final-heading.yaml
@@ -10,8 +10,6 @@ properties:
   version: 2
   subtype: road
   class: primary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/...examples/transportation/segment/road/restrictions/speed_limits/bad-speed-limits-mode.yaml b/...examples/transportation/segment/road/restrictions/speed_limits/bad-speed-limits-mode.yaml
@@ -15,8 +15,6 @@ properties:
   version: 2
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/docusaurus/access-restriction.yaml b/examples/transportation/docusaurus/access-restriction.yaml
@@ -16,8 +16,6 @@ properties:
   version: 4
   subtype: road
   class: motorway
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/docusaurus/lanes-resolution-segment-01.yaml b/examples/transportation/docusaurus/lanes-resolution-segment-01.yaml
@@ -10,8 +10,6 @@ properties:
   theme: transportation
   type: segment
   version: 1
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/docusaurus/lanes-resolution-segment-02.yaml b/examples/transportation/docusaurus/lanes-resolution-segment-02.yaml
@@ -10,8 +10,6 @@ properties:
   theme: transportation
   type: segment
   version: 2
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/docusaurus/simple-road.yaml b/examples/transportation/docusaurus/simple-road.yaml
@@ -13,10 +13,6 @@ properties:
   version: 5
   subtype: road
   class: residential
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids:
-    - overture:transportation:example:via-turn-restriction-connector1
-    - overture:transportation:example:via-turn-restriction-connector2
   connectors:
     - connector_id: overture:transportation:example:via-turn-restriction-connector1
       at: 0

diff --git a/examples/transportation/docusaurus/turn-restriction-01-exit.yaml b/examples/transportation/docusaurus/turn-restriction-01-exit.yaml
@@ -15,10 +15,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids:
-    - overture:transportation:example:via-turn-restriction-connector1
-    - overture:transportation:example:via-turn-restriction-connector2
   connectors:
     - connector_id: overture:transportation:example:via-turn-restriction-connector1
       at: 0

diff --git a/examples/transportation/docusaurus/turn-restriction-01-source.yaml b/examples/transportation/docusaurus/turn-restriction-01-source.yaml
@@ -13,10 +13,6 @@ properties:
   version: 5
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids:
-    - overture:transportation:example:via-turn-restriction-connector1
-    - overture:transportation:example:via-turn-restriction-connector2
   connectors:
     - connector_id: overture:transportation:example:via-turn-restriction-connector1
       at: 0

diff --git a/examples/transportation/docusaurus/turn-restriction-01-target.yaml b/examples/transportation/docusaurus/turn-restriction-01-target.yaml
@@ -15,10 +15,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids:
-    - overture:transportation:example:via-turn-restriction-connector1
-    - overture:transportation:example:via-turn-restriction-connector2
   connectors:
     - connector_id: overture:transportation:example:via-turn-restriction-connector1
       at: 0

diff --git a/examples/transportation/docusaurus/turn-restriction-02-source.yaml b/examples/transportation/docusaurus/turn-restriction-02-source.yaml
@@ -19,10 +19,6 @@ properties:
   version: 5
   subtype: road
   class: primary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids:
-    - overture:transportation:example:via-turn-restriction-connector1
-    - overture:transportation:example:via-turn-restriction-connector2
   connectors:
     - connector_id: overture:transportation:example:via-turn-restriction-connector1
       at: 0

diff --git a/examples/transportation/docusaurus/turn-restriction-02-target.yaml b/examples/transportation/docusaurus/turn-restriction-02-target.yaml
@@ -17,10 +17,6 @@ properties:
   version: 5
   subtype: road
   class: primary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids:
-    - overture:transportation:example:via-turn-restriction-connector1
-    - overture:transportation:example:via-turn-restriction-connector2
   connectors:
     - connector_id: overture:transportation:example:via-turn-restriction-connector1
       at: 0

diff --git a/examples/transportation/docusaurus/turn-restriction-02-via.yaml b/examples/transportation/docusaurus/turn-restriction-02-via.yaml
@@ -14,10 +14,6 @@ properties:
   version: 5
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids:
-    - overture:transportation:example:via-turn-restriction-connector1
-    - overture:transportation:example:via-turn-restriction-connector2
   connectors:
     - connector_id: overture:transportation:example:via-turn-restriction-connector1
       at: 0

diff --git a/examples/transportation/segment/road/destinations/road-destinations.yaml b/examples/transportation/segment/road/destinations/road-destinations.yaml
@@ -10,7 +10,11 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  connectors:
+    - connector_id: overture:transportation:connector:123
+      at: 0
+    - connector_id: overture:transportation:connector:678
+      at: 1
   destinations:
     - when:
         heading: forward

diff --git a/examples/transportation/segment/road/lanes/lanes-flow-alternating.yaml b/examples/transportation/segment/road/lanes/lanes-flow-alternating.yaml
@@ -10,8 +10,6 @@ properties:
   version: 4
   subtype: road
   class: primary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/lanes/lanes-flow-reversible.yaml b/examples/transportation/segment/road/lanes/lanes-flow-reversible.yaml
@@ -10,8 +10,6 @@ properties:
   version: 5
   subtype: road
   class: primary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/road-multiple-connectors.yaml b/examples/transportation/segment/road/road-multiple-connectors.yaml
@@ -10,8 +10,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector, bazConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/road-oneway-no-lanes.yaml b/examples/transportation/segment/road/road-oneway-no-lanes.yaml
@@ -10,8 +10,6 @@ properties:
   version: 6
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/road-oneway-with-lanes.yaml b/examples/transportation/segment/road/road-oneway-with-lanes.yaml
@@ -10,8 +10,6 @@ properties:
   version: 6
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/road-with-lr-name.yaml b/examples/transportation/segment/road/road-with-lr-name.yaml
@@ -13,8 +13,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/road-with-lr-width.yaml b/examples/transportation/segment/road/road-with-lr-width.yaml
@@ -13,8 +13,6 @@ properties:
   version: 1
   subtype: road
   class: secondary
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/road-with-route.yaml b/examples/transportation/segment/road/road-with-route.yaml
@@ -11,8 +11,6 @@ properties:
   version: 1
   subtype: road
   class: motorway
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0

diff --git a/examples/transportation/segment/road/road.yaml b/examples/transportation/segment/road/road.yaml
@@ -16,8 +16,6 @@ properties:
   subclass: link
   subclass_rules:
     - value: link
-  # `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
-  connector_ids: [fooConnector, barConnector]
   connectors:
     - connector_id: fooConnector
       at: 0