Skip to content

Commit

Permalink
Merge pull request #147 from usdot-jpo-ode/simplify-lane-types
Browse files Browse the repository at this point in the history 
Refactor LaneType enumeration to deprecate values that can be determined from other properties, such as order, status, and restrictions
  • Loading branch information
@j-d-b
j-d-b committed Mar 4, 2021
2 parents 4a2a9ec + 462cb62 commit 919539a
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 56 deletions.
10 changes: 5 additions & 5 deletions create-feed/examples/linestring_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"order": 1,
"lane_number": 1,
"status": "open",
"type": "left-lane",
"type": "lane",
"restrictions": [
{
"restriction_type": "reduced-width",
Expand All @@ -89,13 +89,13 @@
"order": 2,
"lane_number": 2,
"status": "closed",
"type": "middle-lane"
"type": "lane"
},
{
"order": 3,
"lane_number": 3,
"status": "closed",
"type": "right-lane"
"type": "lane"
}
]
},
Expand Down Expand Up @@ -306,7 +306,7 @@
"order": 1,
"lane_number": 1,
"status": "open",
"type": "left-lane",
"type": "lane",
"restrictions": [
{
"restriction_type": "no-trucks"
Expand All @@ -317,7 +317,7 @@
"order": 2,
"lane_number": 2,
"status": "open",
"type": "right-lane"
"type": "lane"
}
]
},
Expand Down
10 changes: 5 additions & 5 deletions create-feed/examples/multipoint_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"order": 1,
"lane_number": 1,
"status": "open",
"type": "left-lane",
"type": "lane",
"restrictions": [
{
"restriction_type": "reduced-width",
Expand All @@ -89,13 +89,13 @@
"order": 2,
"lane_number": 2,
"status": "closed",
"type": "middle-lane"
"type": "lane"
},
{
"order": 3,
"lane_number": 3,
"status": "closed",
"type": "right-lane"
"type": "lane"
}
]
},
Expand Down Expand Up @@ -155,7 +155,7 @@
"order": 1,
"lane_number": 1,
"status": "open",
"type": "left-lane",
"type": "lane",
"restrictions": [
{
"restriction_type": "no-trucks"
Expand All @@ -166,7 +166,7 @@
"order": 2,
"lane_number": 2,
"status": "open",
"type": "right-lane"
"type": "lane"
}
]
},
Expand Down
32 changes: 17 additions & 15 deletions create-feed/schemas/wzdx_vNext_feed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,21 +473,32 @@
"LaneStatus": {
"title": "Lane Status Enumerated Type",
"description": "The status of the lane for the traveling public",
"enum": ["open", "closed", "shift-left", "shift-right", "merge-left", "merge-right", "alternating-one-way"]
"enum": ["open", "closed", "shift-left", "shift-right", "merge-left", "merge-right", "alternating-one-way", "alternating-flow"]
},
"LaneType": {
"title": "Lane Type Enumerated Type",
"description": "An indication of the type of lane or shoulder",
"enum": [
"left-lane",
"right-lane",
"middle-lane",
"center-lane",
"lane",
"right-turning-lane",
"left-turning-lane",
"right-exit-lane",
"left-exit-lane",
"right-entrance-lane",
"left-entrance-lane",
"sidewalk",
"bike-lane",
"alternating-flow-lane",
"shoulder",
"hov-lane",
"reversible-lane",
"center-left-turn-lane",
"left-lane",
"right-lane",
"middle-lane",
"center-lane",
"right-shoulder",
"left-shoulder",
"right-merging-lane",
"left-merging-lane",
"right-exit-ramp",
Expand All @@ -497,16 +508,7 @@
"right-entrance-ramp",
"right-second-entrance-ramp",
"left-entrance-ramp",
"left-second-entrance-ramp",
"sidewalk",
"bike-lane",
"alternating-flow-lane",
"right-shoulder",
"left-shoulder",
"shoulder",
"hov-lane",
"reversible-lane",
"center-left-turn-lane"
"left-second-entrance-ramp"
]
},
"LaneRestrictionUnit": {
Expand Down
5 changes: 3 additions & 2 deletions spec-content/enumerated-types/LaneStatus.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ Value | Description
`shift-left` | The lane shifts left from its current bearing and continues
`shift-right` | The lane shifts right from its current bearing and continues
`merge-left` | The lane gradually tapers while merging into the lane directly to the left
`merge-right` | The lane gradually tapers while merging into the lane directly to the right
`alternating-one-way` | The lane alternates the direction of travel via either automated controls or onsite personnel
`merge-right` | The lane gradually tapers while merging into the lane directly to the right
`alternating-flow` | Traffic may travel in either direction, depending on certain conditions. Example conditions include time of day (e.g. reversible lanes), automated controls, or on-site personnel
`alternating-one-way` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `alternating-flow` instead* — The lane alternates the direction of travel via either automated controls or onsite personnel

## Used By
Property | Object
Expand Down
58 changes: 29 additions & 29 deletions spec-content/enumerated-types/derived-from-its-standards/LaneType.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
A description of the type of a lane on the roadway.

## Values
WZDx Lane Type | TMDD LaneRoadway Enumeration Value | Description
WZDx Lane Type | Description | TMDD LaneRoadway Enumeration Value
--- | --- | ---
`left-lane` | left-lane (8194) | The leftmost lane
`right-lane` | right-lane (8195) | The rightmost lane
`middle-lane` | middle-lanes (8197) | A lane that is not the rightmost or leftmost lane
`center-lane` | center-lane (8196) | The center-most lane when the total number of lanes is odd
`lane` | | Generic lane type, intended to be used for regular, driveable lanes where `left-lane`, `right-lane`, and `middle-lane` are unsuitable (e.g. single-lane roadway)
`right-turning-lane` | right-turning-lanes (8199) | A right lane where right turns are permissible
`left-turning-lane` | left-turning-lanes (8200) | A left lane where left turns are permissible
`right-exit-lane` | right-exit-lanes (8204) | The right lane where the lane provides an egress with a ramp
`left-exit-lane` | left-exit-lanes (8205) | The left lane where the lane provides an egress with a ramp
`right-merging-lane` | right-merging-lanes (8206) | The right lane where the lane ends with a gradual merge with the second most lane
`left-merging-lane` | left-merging-lanes (8207) | The left lane where the lanes ends by a gradual merge with the second most left lane
`right-exit-ramp` | right-exit-ramp (8208) | The (first) exit ramp with an egress on the right in the direction of flow at an interchange
`right-second-exit-ramp` | right-second-exit-ramp (8209) | The second exit ramp with an egress on the right in the direction of flow at an interchange
`right-entrance-ramp` | right-entrance-ramp (8210) | The (first) entrance ramp with an ingress on the right in the direction of flow at an interchange
`right-second-entrance-ramp` | right-second-entrance-ramp (8211) | The second entrance ramp with an ingress on the right in the direction of flow at an interchange
`left-exit-ramp` | left-exit_ramp (8212) | The (first) exit ramp with an egress on the left in the direction of flow at an interchange
`left-second-exit-ramp` | left-second-exit-ramp (8213) | The second exit ramp with an egress on the left in the direction of flow at an interchange
`left-entrance-ramp` | left-entrance-ramp (8214) | The (first) entrance ramp with an ingress on the left in the direction of flow at an interchange
`left-second-entrance-ramp` | left-second-entrance-ramp (8215) | The second entrance ramp with an ingress on the left in the direction of flow at an interchange
`sidewalk` | sidewalk (8222) | The sidewalk or pedestrian way
`bike-lane` | cycle-lane (8242) | Bike lane
`shoulder` | | Generic shoulder; useful when the shoulder is neither left nor right (e.g. between HOV Lane and main roadway). It can also be used in place of `left-shoulder` or `right-shoulder`.
`right-shoulder` | right-shoulder (8219) | The outer shoulder or the rightmost shoulder
`left-shoulder` | left-shoulder (8220) | The inner shoulder or the leftmost shoulder
`hov-lane` | hov-lanes (8233) | A high-occupancy vehicle lane
`alternating-flow-lane` | | A lane where signal or flagger controls lane flow
`center-left-turn-lane` | | A lane in the center of a bidirectional roadway in which traffic from both directions pulls to make a left turn
`reversible-lane` | | A lane in which traffic may travel in either direction, depending on certain conditions such as time of day
`lane` | Generic lane type, intended to be used for normal, driveable lanes |
`right-turning-lane` | A lane where right turns are permissible | right-turning-lanes (8199)
`left-turning-lane`| A lane where left turns are permissible | left-turning-lanes (8200)
`right-exit-lane` | A lane with an egress on the right |
`left-exit-lane` | A lane with an egress on the left |
`left-exit-ramp`| An exit ramp with an egress on the left in the direction of flow at an interchange | left-exit_ramp (8212)
`right-exit-ramp` | An exit ramp with an egress on the right in the direction of flow at an interchange | right-exit-ramp (8208)
`right-entrance-ramp` | A lane or ramp with an ingress on the right |
`left-entrance-ramp` | A lane or ramp with an ingress on the left |
`sidewalk` | A sidewalk or pedestrian way | sidewalk (8222)
`bike-lane` | A lane on the roadway for cyclists only | cycle-lane (8242)
`shoulder` | A generic shoulder |
`center-left-turn-lane` | A lane in the center of a bidirectional roadway in which traffic from both directions uses to make a left turn |
`left-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `lane` instead* - The leftmost lane | left-lane (8194)
`right-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `lane` instead* - The rightmost lane | right-lane (8195)
`middle-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `lane` instead* - A lane that is not the rightmost or leftmost lane | middle-lanes (8197)
`center-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `lane` instead* - The center-most lane when the total number of lanes is odd | center-lane (8196)
`right-shoulder` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `shoulder` instead* — The outer shoulder or the rightmost shoulder | right-shoulder (8219)
`left-shoulder` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `shoulder` instead* — The inner shoulder or the leftmost shoulder | left-shoulder (8220)
`right-second-exit-ramp` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `right-exit-lane` instead* — The second exit ramp with an egress on the right in the direction of flow at an interchange | right-second-exit-ramp (8209)
`left-second-exit-ramp` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `left-exit-lane` instead* — The second exit ramp with an egress on the left in the direction of flow at an interchange | left-second-exit-ramp (8213)
`right-second-entrance-ramp` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `right-entrance-lane` instead* — The second entrance ramp with an ingress on the right in the direction of flow at an interchange | right-second-entrance-ramp (8211)
`left-second-entrance-ramp` (DEPRECATED) | *This value is deprecated and will be removed in a future version; use `left-entrance-lane` instead* — The second entrance ramp with an ingress on the left in the direction of flow at an interchange | left-second-entrance-ramp (8215)
`right-merging-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; specify merging lanes via the lane's `status` property* — The right lane where the lane ends with a gradual merge with the second most lane | right-merging-lanes (8206)
`left-merging-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; specify merging lanes via the lane's `status` property* — The left lane where the lanes ends by a gradual merge with the second most left lane | left-merging-lanes (8207)
`hov-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; specify hovs via the lane's `restrictions` property* — A high-occupancy vehicle lane | hov-lanes (8233)
`alternating-flow-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; specify alternating flow via the lane's `status` property (value of `alternating-flow`)* — A lane where signal or flagger controls lane flow |
`reversible-lane` (DEPRECATED) | *This value is deprecated and will be removed in a future version; specify reversible status via the lane's `status` property (value of `alternating-flow`)* — A lane in which traffic may travel in either direction, depending on certain conditions such as time of day |

The following values from the TMDD LaneRoadway Enumeration are not used in the WZDx specification:

Expand Down

0 comments on commit 919539a

Please sign in to comment.