diff --git a/counterexamples/transportation/segment/bad-connector-duplicate.json b/counterexamples/transportation/segment/bad-connector-duplicate.json index 9e56d8e0..ffdab841 100644 --- a/counterexamples/transportation/segment/bad-connector-duplicate.json +++ b/counterexamples/transportation/segment/bad-connector-duplicate.json @@ -1,5 +1,5 @@ { - "id": "segment with an invalid entry in the connectors array", + "id": "segment with an invalid entry in the connector_ids array", "type": "Feature", "geometry": { "type": "LineString", @@ -14,6 +14,6 @@ "version": 4, "update_time": "2023-02-23T00:04:00-08:00", "subtype": "rail", - "connectors": ["fooConnector", "bazConnector", "fooConnector"] + "connector_ids": ["fooConnector", "bazConnector", "fooConnector"] } } diff --git a/counterexamples/transportation/segment/bad-connector.json b/counterexamples/transportation/segment/bad-connector.json index 6d0ffc5a..b25fb664 100644 --- a/counterexamples/transportation/segment/bad-connector.json +++ b/counterexamples/transportation/segment/bad-connector.json @@ -1,5 +1,5 @@ { - "id": "segment with an invalid entry in the connectors array", + "id": "segment with an invalid entry in the connector_ids array", "type": "Feature", "geometry": { "type": "LineString", @@ -15,6 +15,6 @@ "version": 3, "update_time": "2023-02-23T00:04:00-08:00", "subtype": "rail", - "connectors": ["bazConnector", "qux", 1, false] + "connector_ids": ["bazConnector", "qux", 1, false] } } diff --git a/counterexamples/transportation/segment/road/restrictions/bad-access-mode-not.yaml b/counterexamples/transportation/segment/road/restrictions/bad-access-mode-not.yaml index 7958b614..86124b9e 100644 --- a/counterexamples/transportation/segment/road/restrictions/bad-access-mode-not.yaml +++ b/counterexamples/transportation/segment/road/restrictions/bad-access-mode-not.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/bad-access-mode.yaml b/counterexamples/transportation/segment/road/restrictions/bad-access-mode.yaml index 4e66e52e..5fd7f903 100644 --- a/counterexamples/transportation/segment/road/restrictions/bad-access-mode.yaml +++ b/counterexamples/transportation/segment/road/restrictions/bad-access-mode.yaml @@ -17,7 +17,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/bad-access-restrictions-vehicle.yaml b/counterexamples/transportation/segment/road/restrictions/bad-access-restrictions-vehicle.yaml index e5a66d58..71551564 100644 --- a/counterexamples/transportation/segment/road/restrictions/bad-access-restrictions-vehicle.yaml +++ b/counterexamples/transportation/segment/road/restrictions/bad-access-restrictions-vehicle.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 widthMeters: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/bad-speed-limits-mode.yaml b/counterexamples/transportation/segment/road/restrictions/bad-speed-limits-mode.yaml index 92ef2c77..85c2dc39 100644 --- a/counterexamples/transportation/segment/road/restrictions/bad-speed-limits-mode.yaml +++ b/counterexamples/transportation/segment/road/restrictions/bad-speed-limits-mode.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-modes.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-modes.yaml index 0863b572..66b4a88e 100644 --- a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-modes.yaml +++ b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-modes.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-not-modes.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-not-modes.yaml index 7958b614..86124b9e 100644 --- a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-not-modes.yaml +++ b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-not-modes.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-recognized.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-recognized.yaml index 162ebc4c..f11534e3 100644 --- a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-recognized.yaml +++ b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-recognized.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-using.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-using.yaml index 4170f7eb..0c0dc4c2 100644 --- a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-using.yaml +++ b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-using.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-vehicle.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-vehicle.yaml index 0d726d89..843906fe 100644 --- a/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-vehicle.yaml +++ b/counterexamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-vehicle.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel 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 index 1cf5aed8..7a487096 100644 --- a/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-duplicate-via.yaml +++ b/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-duplicate-via.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel 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 index e9aa4003..7f362444 100644 --- 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 @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel 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 index 1360c48a..a4794d89 100644 --- 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 @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-reason.yaml b/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-reason.yaml index 884d5f89..a4650203 100644 --- a/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-reason.yaml +++ b/counterexamples/transportation/segment/road/restrictions/turns/bad-turns-reason.yaml @@ -15,7 +15,7 @@ properties: subtype: road level: -1 width: 10 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary surface: gravel diff --git a/examples/transportation/docusaurus/access-restriction.yaml b/examples/transportation/docusaurus/access-restriction.yaml index dd3a4aa2..48a1d6d5 100644 --- a/examples/transportation/docusaurus/access-restriction.yaml +++ b/examples/transportation/docusaurus/access-restriction.yaml @@ -16,7 +16,7 @@ properties: version: 3 update_time: "2023-06-06T16:42:00-06:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:simple-road-connector-1 - overture:transportation:example:simple-road-connector-2 names: diff --git a/examples/transportation/docusaurus/lanes-resolution-segment-01.yaml b/examples/transportation/docusaurus/lanes-resolution-segment-01.yaml index e73df3c2..e71cb1c6 100644 --- a/examples/transportation/docusaurus/lanes-resolution-segment-01.yaml +++ b/examples/transportation/docusaurus/lanes-resolution-segment-01.yaml @@ -11,7 +11,7 @@ properties: type: segment version: 0 update_time: "2023-06-20T13:51:00-06:00" - connectors: [lanes-resolution-example-connector] + connector_ids: [lanes-resolution-example-connector] subtype: road road: lanes: # A list of two geometrically-scoped rules for resolving the lane block. diff --git a/examples/transportation/docusaurus/lanes-resolution-segment-02.yaml b/examples/transportation/docusaurus/lanes-resolution-segment-02.yaml index 19e90a34..c3595f8a 100644 --- a/examples/transportation/docusaurus/lanes-resolution-segment-02.yaml +++ b/examples/transportation/docusaurus/lanes-resolution-segment-02.yaml @@ -11,7 +11,7 @@ properties: type: segment version: 0 update_time: "2023-06-20T13:51:00-06:00" - connectors: [lanes-resolution-example-connector] + connector_ids: [lanes-resolution-example-connector] subtype: road road: lanes: # One static, unchanging lane block. diff --git a/examples/transportation/docusaurus/simple-road.yaml b/examples/transportation/docusaurus/simple-road.yaml index e0e7bc85..18f04bd5 100644 --- a/examples/transportation/docusaurus/simple-road.yaml +++ b/examples/transportation/docusaurus/simple-road.yaml @@ -13,7 +13,7 @@ properties: version: 3 update_time: "2023-06-01T16:42:00-06:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:simple-road-connector-1 - overture:transportation:example:simple-road-connector-2 names: diff --git a/examples/transportation/docusaurus/turn-restriction-01-exit.yaml b/examples/transportation/docusaurus/turn-restriction-01-exit.yaml index 4383fb30..77424d00 100644 --- a/examples/transportation/docusaurus/turn-restriction-01-exit.yaml +++ b/examples/transportation/docusaurus/turn-restriction-01-exit.yaml @@ -15,6 +15,6 @@ properties: version: 0 update_time: "2023-06-21T14:12:56-07:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:simple-turn-restriction-connector1 - overture:transportation:example:simple-turn-restriction-connector3 diff --git a/examples/transportation/docusaurus/turn-restriction-01-source.yaml b/examples/transportation/docusaurus/turn-restriction-01-source.yaml index 4e931141..372b6c5a 100644 --- a/examples/transportation/docusaurus/turn-restriction-01-source.yaml +++ b/examples/transportation/docusaurus/turn-restriction-01-source.yaml @@ -13,14 +13,14 @@ properties: version: 4 update_time: "2023-08-21T16:23:13-06:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:simple-turn-restriction-connector1 - overture:transportation:example:simple-turn-restriction-connector2 road: restrictions: prohibited_transitions: - - sequence: + - sequence: - segment_id: overture:transportation:example:simple-turn-restriction-target connector_id: overture:transportation:example:simple-turn-restriction-connector2 final_heading: forward - when: {heading: forward} + when: {heading: forward} diff --git a/examples/transportation/docusaurus/turn-restriction-01-target.yaml b/examples/transportation/docusaurus/turn-restriction-01-target.yaml index c54ebb95..f1e3dd54 100644 --- a/examples/transportation/docusaurus/turn-restriction-01-target.yaml +++ b/examples/transportation/docusaurus/turn-restriction-01-target.yaml @@ -15,6 +15,6 @@ properties: version: 0 update_time: "2023-06-21T13:42:35-07:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:simple-turn-restriction-connector2 - overture:transportation:example:simple-turn-restriction-connector3 diff --git a/examples/transportation/docusaurus/turn-restriction-02-source.yaml b/examples/transportation/docusaurus/turn-restriction-02-source.yaml index 2dbd81ad..72483ed2 100644 --- a/examples/transportation/docusaurus/turn-restriction-02-source.yaml +++ b/examples/transportation/docusaurus/turn-restriction-02-source.yaml @@ -19,7 +19,7 @@ properties: version: 4 update_time: "2023-08-18T11:05:03-07:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:via-turn-restriction-connector1 names: primary: Arborway diff --git a/examples/transportation/docusaurus/turn-restriction-02-target.yaml b/examples/transportation/docusaurus/turn-restriction-02-target.yaml index 35ffa02a..cf12f60f 100644 --- a/examples/transportation/docusaurus/turn-restriction-02-target.yaml +++ b/examples/transportation/docusaurus/turn-restriction-02-target.yaml @@ -17,7 +17,7 @@ properties: version: 4 update_time: "2023-08-18T11:22:00-06:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:via-turn-restriction-connector2 names: primary: Arborway diff --git a/examples/transportation/docusaurus/turn-restriction-02-via.yaml b/examples/transportation/docusaurus/turn-restriction-02-via.yaml index f112f1df..68d36f13 100644 --- a/examples/transportation/docusaurus/turn-restriction-02-via.yaml +++ b/examples/transportation/docusaurus/turn-restriction-02-via.yaml @@ -14,7 +14,7 @@ properties: version: 4 update_time: "2023-08-18T11:22:30-06:00" subtype: road - connectors: + connector_ids: - overture:transportation:example:via-turn-restriction-connector1 - overture:transportation:example:via-turn-restriction-connector2 names: diff --git a/examples/transportation/segment/road/lanes/lanes-flow-reversible.yaml b/examples/transportation/segment/road/lanes/lanes-flow-reversible.yaml index 50423026..605e129c 100644 --- a/examples/transportation/segment/road/lanes/lanes-flow-reversible.yaml +++ b/examples/transportation/segment/road/lanes/lanes-flow-reversible.yaml @@ -10,7 +10,7 @@ properties: update_time: "2023-02-23T00:03:45-08:00" version: 3 subtype: road - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: primary surface: diff --git a/examples/transportation/segment/road/road-flow-alternating.yaml b/examples/transportation/segment/road/road-flow-alternating.yaml index 2df583d7..98130781 100644 --- a/examples/transportation/segment/road/road-flow-alternating.yaml +++ b/examples/transportation/segment/road/road-flow-alternating.yaml @@ -10,7 +10,7 @@ properties: update_time: "2023-02-23T00:03:40-08:00" version: 2 subtype: road - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: primary surface: diff --git a/examples/transportation/segment/road/road-oneway-no-lanes.yaml b/examples/transportation/segment/road/road-oneway-no-lanes.yaml index f336e88c..ae7c368a 100644 --- a/examples/transportation/segment/road/road-oneway-no-lanes.yaml +++ b/examples/transportation/segment/road/road-oneway-no-lanes.yaml @@ -10,7 +10,7 @@ properties: update_time: "2023-05-11T00:03:50-08:00" version: 4 subtype: road - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary # one way road in backward direction (forward access is denied) diff --git a/examples/transportation/segment/road/road-oneway-with-lanes.yaml b/examples/transportation/segment/road/road-oneway-with-lanes.yaml index 950892a5..7a61bf90 100644 --- a/examples/transportation/segment/road/road-oneway-with-lanes.yaml +++ b/examples/transportation/segment/road/road-oneway-with-lanes.yaml @@ -10,7 +10,7 @@ properties: update_time: "2023-05-11T00:03:50-08:00" version: 4 subtype: road - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary # one way road in forward direction (lanes only in forward direction) diff --git a/examples/transportation/segment/road/road-with-lr-name.yaml b/examples/transportation/segment/road/road-with-lr-name.yaml index 56bd2bb4..2dc322b0 100644 --- a/examples/transportation/segment/road/road-with-lr-name.yaml +++ b/examples/transportation/segment/road/road-with-lr-name.yaml @@ -14,7 +14,7 @@ properties: version: 0 subtype: road level: 1 - connectors: [fooConnector, barConnector] # Topology: To discuss further. + connector_ids: [fooConnector, barConnector] # Topology: To discuss further. names: primary: Common Road Name 1 rules: diff --git a/examples/transportation/segment/road/road-with-lr-width.yaml b/examples/transportation/segment/road/road-with-lr-width.yaml index ba7356af..573f8224 100644 --- a/examples/transportation/segment/road/road-with-lr-width.yaml +++ b/examples/transportation/segment/road/road-with-lr-width.yaml @@ -14,7 +14,7 @@ properties: version: 0 subtype: road level: 1 - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: secondary width: diff --git a/examples/transportation/segment/road/road.yaml b/examples/transportation/segment/road/road.yaml index a614ea23..5ac80bb5 100644 --- a/examples/transportation/segment/road/road.yaml +++ b/examples/transportation/segment/road/road.yaml @@ -14,7 +14,7 @@ properties: version: 0 subtype: road level: -1 - connectors: [fooConnector, barConnector] # Topology: To discuss further. + connector_ids: [fooConnector, barConnector] # Topology: To discuss further. names: primary: Common Road Name road: diff --git a/examples/transportation/segment/road/sidewalk.yaml b/examples/transportation/segment/road/sidewalk.yaml index 8d9a703f..4790df36 100644 --- a/examples/transportation/segment/road/sidewalk.yaml +++ b/examples/transportation/segment/road/sidewalk.yaml @@ -10,7 +10,7 @@ properties: update_time: "2023-11-13T00:02:30-08:00" version: 0 subtype: road - connectors: [fooConnector, barConnector] + connector_ids: [fooConnector, barConnector] road: class: sidewalk surface: diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml index dd2687a2..448315c9 100644 --- a/schema/transportation/segment.yaml +++ b/schema/transportation/segment.yaml @@ -35,13 +35,12 @@ properties: "$comment": >- Should not be confused with a transport mode. A segment kind has an (implied) set of default transport modes. - connectors: - "$comment": 'FIXME: Must rename to connectorIds to meet schema standard' + connector_ids: description: >- - List of connectors this segment is physically connected to. - Each connector is a possible routing decision point meaning it - defines place along segment in which there is possibility to - transition to other segments which share same connector. + 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 @@ -182,7 +181,7 @@ properties: description: >- Edge-to-edge width of the road modeled by this segment, in meters. - + Examples: (1) If this segment models a carriageway without sidewalk, this value represents the edge-to-edge width of the carriageway, inclusive of any shoulder. (2) If this segment