From db8126e802ec280064a144190fbaa71a0c791481 Mon Sep 17 00:00:00 2001 From: Cozmin <124632324+ibnt1@users.noreply.github.com> Date: Thu, 10 Oct 2024 09:41:04 -0700 Subject: [PATCH] Remove deprecated `connector_ids` (#284) * remove connector_ids * updating missed counterexample * fix test after sync from dev --- .../transportation/segment/bad-class.yaml | 6 +++++- .../segment/bad-connector-duplicate.json | 1 - .../transportation/segment/bad-connector.json | 3 --- .../transportation/segment/bad-route.yaml | 2 -- .../segment/road/bad-road-destinations.yaml | 6 +++++- .../road/bad-road-level-invalid-value.yaml | 2 -- .../bad-road-level-unsupported-properties.yaml | 2 -- .../bad-road-destinations-bad-label-type.yaml | 6 +++++- .../bad-road-destinations-duplicate.yaml | 6 +++++- ...bad-road-destinations-empty-label-value.yaml | 6 +++++- .../bad-road-destinations-invalid-symbol.yaml | 6 +++++- ...road-destinations-missing-final_heading.yaml | 6 +++++- .../restrictions/access/bad-access-mode.yaml | 2 -- .../access/bad-access-restrictions-vehicle.yaml | 6 +++++- .../bad-sequence-duplicate-entry.yaml | 2 -- .../bad-sequence-empty.yaml | 2 -- .../missing-final-heading.yaml | 2 -- .../speed_limits/bad-speed-limits-mode.yaml | 2 -- .../docusaurus/access-restriction.yaml | 2 -- .../docusaurus/lanes-resolution-segment-01.yaml | 2 -- .../docusaurus/lanes-resolution-segment-02.yaml | 2 -- .../transportation/docusaurus/simple-road.yaml | 4 ---- .../docusaurus/turn-restriction-01-exit.yaml | 4 ---- .../docusaurus/turn-restriction-01-source.yaml | 4 ---- .../docusaurus/turn-restriction-01-target.yaml | 4 ---- .../docusaurus/turn-restriction-02-source.yaml | 4 ---- .../docusaurus/turn-restriction-02-target.yaml | 4 ---- .../docusaurus/turn-restriction-02-via.yaml | 4 ---- .../road/destinations/road-destinations.yaml | 6 +++++- .../road/lanes/lanes-flow-alternating.yaml | 2 -- .../road/lanes/lanes-flow-reversible.yaml | 2 -- .../segment/road/road-multiple-connectors.yaml | 2 -- .../segment/road/road-oneway-no-lanes.yaml | 2 -- .../segment/road/road-oneway-with-lanes.yaml | 2 -- .../segment/road/road-with-lr-name.yaml | 2 -- .../segment/road/road-with-lr-width.yaml | 2 -- .../segment/road/road-with-route.yaml | 2 -- examples/transportation/segment/road/road.yaml | 2 -- .../transportation/segment/road/sidewalk.yaml | 2 -- schema/transportation/segment.yaml | 17 ----------------- 40 files changed, 45 insertions(+), 100 deletions(-) diff --git a/counterexamples/transportation/segment/bad-class.yaml b/counterexamples/transportation/segment/bad-class.yaml index 03fa83cf..55f21a69 100644 --- 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 index 398ff79e..a69232df 100644 --- 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 index 5c505acf..62d0f172 100644 --- 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 index 89564fc0..460f2843 100644 --- 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 index 62194967..ac39be03 100644 --- 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 index 65ece15e..0b7420b5 100644 --- 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 index 203dbe60..30a2d9ed 100644 --- 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/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml index 4d695ac5..e67f43c3 100644 --- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml +++ b/counterexamples/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/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml index c836b364..d1d27933 100644 --- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml +++ b/counterexamples/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/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml index a71b3a21..e9728030 100644 --- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml +++ b/counterexamples/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/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml index 8756e11e..b72aee21 100644 --- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml +++ b/counterexamples/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/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml index b302b078..60ff4f54 100644 --- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml +++ b/counterexamples/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 index 2ad3cd4f..df803eb2 100644 --- 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/counterexamples/transportation/segment/road/restrictions/access/bad-access-restrictions-vehicle.yaml b/counterexamples/transportation/segment/road/restrictions/access/bad-access-restrictions-vehicle.yaml index d8d5d3c9..a2c45f0f 100644 --- a/counterexamples/transportation/segment/road/restrictions/access/bad-access-restrictions-vehicle.yaml +++ b/counterexamples/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/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-duplicate-entry.yaml b/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-duplicate-entry.yaml index 998ac675..2f775d79 100644 --- a/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-duplicate-entry.yaml +++ b/counterexamples/transportation/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/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-empty.yaml b/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-empty.yaml index 546f7972..d4f1232e 100644 --- a/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-empty.yaml +++ b/counterexamples/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/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/missing-final-heading.yaml b/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/missing-final-heading.yaml index c5c7d05a..fe4bf88e 100644 --- a/counterexamples/transportation/segment/road/restrictions/prohibited_transitions/missing-final-heading.yaml +++ b/counterexamples/transportation/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/counterexamples/transportation/segment/road/restrictions/speed_limits/bad-speed-limits-mode.yaml b/counterexamples/transportation/segment/road/restrictions/speed_limits/bad-speed-limits-mode.yaml index e3fcaa9a..4358421e 100644 --- a/counterexamples/transportation/segment/road/restrictions/speed_limits/bad-speed-limits-mode.yaml +++ b/counterexamples/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 index 573075a6..a2a36bd6 100644 --- 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 index 7c17f54f..0b11eff6 100644 --- 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 index 8c87fe21..c970978a 100644 --- 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 index f5b34b78..10ef245d 100644 --- 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 index ad8845a2..bf5784e3 100644 --- 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 index 3ca91999..542448ca 100644 --- 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 index 04e397db..aea108fb 100644 --- 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 index 83222315..7c2af13d 100644 --- 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 index 12ff96ed..ca250305 100644 --- 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 index c2f8b2f5..dc3d35f0 100644 --- 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 index e063ae40..e0cd9c2c 100644 --- 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 index 723b8b64..5353cd26 100644 --- 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 index ea91cf01..f94191a8 100644 --- 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 index ab538447..fd7404b7 100644 --- 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 index 030d4617..b07e4ebf 100644 --- 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 index 4d766a5e..cd0951da 100644 --- 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 index 8ec1066b..e05fccf4 100644 --- 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 index 28db179e..1dbeb69d 100644 --- 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 index 991841ef..3e14acce 100644 --- 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 index ac126c2c..8d109c41 100644 --- 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 diff --git a/examples/transportation/segment/road/sidewalk.yaml b/examples/transportation/segment/road/sidewalk.yaml index 5c234c1e..a4f1d2ed 100644 --- a/examples/transportation/segment/road/sidewalk.yaml +++ b/examples/transportation/segment/road/sidewalk.yaml @@ -13,8 +13,6 @@ properties: subclass: sidewalk subclass_rules: - value: sidewalk - # `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/schema/transportation/segment.yaml b/schema/transportation/segment.yaml index ed681ed7..d7d37493 100644 --- a/schema/transportation/segment.yaml +++ b/schema/transportation/segment.yaml @@ -49,23 +49,6 @@ properties: "$comment": >- Should not be confused with a transport mode. A segment kind has an (implied) set of default transport modes. - connector_ids: - description: >- - ** Deprecated** `connector_ids` is deprecated in favor of `connectors` and - is planned to be removed for the October release. - - List of connector IDs identifying the connectors this segment is physically - connected to. Each connector is a possible routing decision point, meaning - it defines a place along the segment in which there is possibility to - transition to other segments which share the same connector. - type: array - items: - type: string - "$comment": >- - Each entry in this array is the GERS ID of a transportation connector feature. - uniqueItems: true - minItems: 2 - default: [] connectors: description: >- List of connectors which this segment is physically connected to and their