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

Rename connectors to connector_ids #137

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Rename connectors to connector_ids #137

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f644c3
Rename connectors to connector_ids
brad-richardson Feb 28, 2024
2751447
Update description
brad-richardson Mar 1, 2024
552d4dd
Merge branch 'dev' into connector_ids
vcschapp Mar 5, 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
4 changes: 2 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 connectors array",
"id": "segment with an invalid entry in the connector_ids array",
"type": "Feature",
"geometry": {
"type": "LineString",
Expand All @@ -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"]
}
}
4 changes: 2 additions & 2 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 connectors array",
"id": "segment with an invalid entry in the connector_ids array",
"type": "Feature",
"geometry": {
"type": "LineString",
Expand All @@ -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]
}
}
2 changes: 1 addition & 1 deletion counterexamples/transportation/segment/road/restrictions/bad-access-mode-not.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion counterexamples/transportation/segment/road/restrictions/bad-access-mode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion ...terexamples/transportation/segment/road/restrictions/bad-access-restrictions-vehicle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
widthMeters: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion counterexamples/transportation/segment/road/restrictions/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,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion ...xamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-modes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion ...les/transportation/segment/road/restrictions/turns/bad-access-restrictions-not-modes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion ...es/transportation/segment/road/restrictions/turns/bad-access-restrictions-recognized.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion ...xamples/transportation/segment/road/restrictions/turns/bad-access-restrictions-using.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion ...mples/transportation/segment/road/restrictions/turns/bad-access-restrictions-vehicle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
2 changes: 1 addition & 1 deletion counterexamples/transportation/segment/road/restrictions/turns/bad-turns-duplicate-via.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
4 changes: 2 additions & 2 deletions counterexamples/transportation/segment/road/restrictions/turns/bad-turns-no-turn-target.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
flags: [is_link, is_tunnel, isPrivate]
restrictions:
restrictions:
turns:
- toDirection: forward
reason: legal
Expand Down
2 changes: 1 addition & 1 deletion counterexamples/transportation/segment/road/restrictions/turns/bad-turns-no-via-target.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
Expand Down
4 changes: 2 additions & 2 deletions counterexamples/transportation/segment/road/restrictions/turns/bad-turns-reason.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ properties:
subtype: road
level: -1
width: 10
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
surface: gravel
flags: [is_link, is_tunnel, isPrivate]
restrictions:
restrictions:
turns:
- segment_id: overture:transportation:segment:234
connector_id: overture:transportation:connector:123
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/docusaurus/access-restriction.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 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 @@ -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.
Expand Down
2 changes: 1 addition & 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 @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/docusaurus/simple-road.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion 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,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
6 changes: 3 additions & 3 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,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}
2 changes: 1 addition & 1 deletion 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,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
2 changes: 1 addition & 1 deletion 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,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
Expand Down
2 changes: 1 addition & 1 deletion 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,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
Expand Down
2 changes: 1 addition & 1 deletion 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,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:
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/segment/road/road-flow-alternating.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: paved
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/segment/road/road-flow-reversible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: paved
Expand Down
2 changes: 1 addition & 1 deletion 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,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)
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/segment/road/road-oneway-with-lanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/segment/road/road-with-lr-name.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/segment/road/road-with-lr-width.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ properties:
version: 0
subtype: road
level: 1
connectors: [fooConnector, barConnector]
connector_ids: [fooConnector, barConnector]
road:
class: secondary
width:
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/segment/road/road.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/transportation/segment/road/sidewalk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: paved
Loading
Loading