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.

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

Rename connectors to connector_ids #137

Merged
merged 3 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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]
}
}
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
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
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
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
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
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
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
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
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
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
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
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
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 examples/transportation/docusaurus/access-restriction.yaml
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
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
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
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
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
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}
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
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
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
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
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:
Expand Down
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:
Expand Down
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
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
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
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
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
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:
Expand Down
Loading
Loading