Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Connectors LR #257

Merged
merged 6 commits into from
Aug 5, 2024
Merged

Connectors LR #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67f93eb
Connector reference with LR
brad-richardson Jul 24, 2024
47ad571
Consistent numbers
brad-richardson Jul 24, 2024
15d0106
Add multiple connector example
brad-richardson Jul 24, 2024
0d121d5
Add deprecation notice, min entries, cleanup
brad-richardson Jul 24, 2024
c7ee7fe
More cleanup
brad-richardson Jul 24, 2024
7cdda0f
Deprecation notice on connector_ids
brad-richardson Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions counterexamples/transportation/segment/bad-connector-duplicate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "segment with an invalid entry in the connector_ids array",
"id": "segment with an invalid entry in the connectors array",
"type": "Feature",
"geometry": {
"type": "LineString",
Expand All @@ -13,6 +13,20 @@
"type": "segment",
"version": 4,
"subtype": "rail",
"connector_ids": ["fooConnector", "bazConnector", "fooConnector"]
"connector_ids": ["fooConnector", "bazConnector", "fooConnector"],
"connectors": [
{
"connector_id": "fooConnector",
"at": 0
},
{
"connector_id": "bazConnector",
"at": 1
},
{
"connector_id": "fooConnector",
"at": 0
}
]
}
}
10 changes: 7 additions & 3 deletions counterexamples/transportation/segment/bad-connector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "segment with an invalid entry in the connector_ids array",
"id": "segment with an invalid entry in the connectors array",
"type": "Feature",
"geometry": {
"type": "LineString",
Expand All @@ -8,12 +8,16 @@
"properties": {
"ext_expected_errors": [
"expected string, but got number",
"expected string, but got boolean"
"expected string, but got boolean",
"expected object, but got string",
"expected object, but got number",
"expected object, but got boolean"
],
"theme": "transportation",
"type": "segment",
"version": 3,
"subtype": "rail",
"connector_ids": ["bazConnector", "qux", 1, false]
"connector_ids": ["bazConnector", "qux", 1, false],
"connectors": [{"connector_id": "foo", "at": 0.0}, {"connector_id": "bar", "at": 1.0}, "bazConnector", "qux", 1, false]
}
}
6 changes: 6 additions & 0 deletions counterexamples/transportation/segment/bad-route.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ 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
- connector_id: barConnector
at: 1
routes:
- name: ""
ref: 1234
6 changes: 6 additions & 0 deletions counterexamples/transportation/segment/road/bad-road-level-invalid-value.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ 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
- connector_id: barConnector
at: 1
level_rules:
- value: 1.5
ext_expected_errors:
Expand Down
6 changes: 6 additions & 0 deletions counterexamples/transportation/segment/road/bad-road-level-unsupported-properties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ 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
- connector_id: barConnector
at: 1
level_rules:
- value: 1
foo: bar
Expand Down
6 changes: 6 additions & 0 deletions counterexamples/transportation/segment/road/restrictions/access/bad-access-mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ 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
- connector_id: barConnector
at: 1
road_surface: gravel
road_flags:
- [is_link, is_tunnel] # Note: `is_link` is deprecated and will be removed in a future release in favor of the link subclass
Expand Down
9 changes: 7 additions & 2 deletions ...tation/segment/road/restrictions/prohibited_transitions/bad-sequence-duplicate-entry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ properties:
version: 2
subtype: road
class: primary
connector_ids:
- overture:transportation:example:connector: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
- connector_id: barConnector
at: 1
prohibited_transitions:
- sequence:
- segment_id: foo
Expand Down
9 changes: 7 additions & 2 deletions ...s/transportation/segment/road/restrictions/prohibited_transitions/bad-sequence-empty.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ properties:
version: 2
subtype: road
class: primary
connector_ids:
- overture:transportation:example:connector: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
- connector_id: barConnector
at: 1
prohibited_transitions:
- sequence: []
final_heading: forward
Expand Down
9 changes: 7 additions & 2 deletions ...ransportation/segment/road/restrictions/prohibited_transitions/missing-final-heading.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ properties:
version: 2
subtype: road
class: primary
connector_ids:
- overture:transportation:example:connector: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
- connector_id: barConnector
at: 1
prohibited_transitions:
- sequence:
- segment_id: foo
Expand Down
6 changes: 6 additions & 0 deletions ...examples/transportation/segment/road/restrictions/speed_limits/bad-speed-limits-mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ 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
- connector_id: barConnector
at: 1
speed_limits:
- max_speed:
value: 110
Expand Down
10 changes: 7 additions & 3 deletions examples/transportation/docusaurus/access-restriction.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ properties:
version: 4
subtype: road
class: motorway
connector_ids:
- overture:transportation:example:simple-road-connector-1
- overture:transportation:example:simple-road-connector-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
- connector_id: barConnector
at: 1
names:
primary: SR 520
access_restrictions:
Expand Down
8 changes: 7 additions & 1 deletion examples/transportation/docusaurus/lanes-resolution-segment-01.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ properties:
theme: transportation
type: segment
version: 1
connector_ids: [lanes-resolution-example-connector]
# `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
- connector_id: barConnector
at: 1
subtype: road
class: motorway
lanes: # A list of two geometrically-scoped rules for resolving the lane block.
Expand Down
8 changes: 7 additions & 1 deletion examples/transportation/docusaurus/lanes-resolution-segment-02.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ properties:
theme: transportation
type: segment
version: 2
connector_ids: [lanes-resolution-example-connector]
# `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
- connector_id: barConnector
at: 1
subtype: road
class: motorway
lanes:
Expand Down
10 changes: 8 additions & 2 deletions examples/transportation/docusaurus/simple-road.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ 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:simple-road-connector-1
- overture:transportation:example:simple-road-connector-2
- 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
- connector_id: overture:transportation:example:via-turn-restriction-connector2
at: 1
names:
primary: Nicola Street
lanes:
Expand Down
10 changes: 8 additions & 2 deletions examples/transportation/docusaurus/turn-restriction-01-exit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ 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:simple-turn-restriction-connector1
- overture:transportation:example:simple-turn-restriction-connector3
- 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
- connector_id: overture:transportation:example:via-turn-restriction-connector2
at: 1
10 changes: 8 additions & 2 deletions examples/transportation/docusaurus/turn-restriction-01-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ 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:simple-turn-restriction-connector1
- overture:transportation:example:simple-turn-restriction-connector2
- 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
- connector_id: overture:transportation:example:via-turn-restriction-connector2
at: 1
prohibited_transitions:
- sequence:
- segment_id: overture:transportation:example:simple-turn-restriction-target
Expand Down
10 changes: 8 additions & 2 deletions examples/transportation/docusaurus/turn-restriction-01-target.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ 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:simple-turn-restriction-connector2
- overture:transportation:example:simple-turn-restriction-connector3
- 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
- connector_id: overture:transportation:example:via-turn-restriction-connector2
at: 1
7 changes: 7 additions & 0 deletions examples/transportation/docusaurus/turn-restriction-02-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,15 @@ 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
- connector_id: overture:transportation:example:via-turn-restriction-connector2
at: 1
names:
primary: Arborway
prohibited_transitions:
Expand Down
7 changes: 7 additions & 0 deletions examples/transportation/docusaurus/turn-restriction-02-target.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,15 @@ 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
- connector_id: overture:transportation:example:via-turn-restriction-connector2
at: 1
names:
primary: Arborway
road_surface:
Expand Down
6 changes: 6 additions & 0 deletions examples/transportation/docusaurus/turn-restriction-02-via.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@ 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
- connector_id: overture:transportation:example:via-turn-restriction-connector2
at: 1
names:
primary: Washington Street
road_surface:
Expand Down
6 changes: 6 additions & 0 deletions examples/transportation/segment/road/lanes/lanes-flow-alternating.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ 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
- connector_id: barConnector
at: 1
road_surface:
- value: paved
lanes:
Expand Down
6 changes: 6 additions & 0 deletions examples/transportation/segment/road/lanes/lanes-flow-reversible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ 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
- connector_id: barConnector
at: 1
road_surface:
- value: paved
lanes:
Expand Down
23 changes: 23 additions & 0 deletions examples/transportation/segment/road/road-multiple-connectors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
id: overture:transportation:segment:123
type: Feature
geometry:
type: LineString
coordinates: [[0, 0], [0.03, 0], [0.10, 0]]
properties:
theme: transportation
type: segment
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
- connector_id: barConnector
at: 0.3
- connector_id: bazConnector
at: 1
road_surface:
- value: paved
6 changes: 6 additions & 0 deletions examples/transportation/segment/road/road-oneway-no-lanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ 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
- connector_id: barConnector
at: 1
# one way road in backward direction (forward access is denied)
access_restrictions:
- access_type: denied
Expand Down
Loading
Loading