Skip to content

Commit

Permalink
Merge pull request #188 from usdot-jpo-ode/v4.0-lane-types
Browse files Browse the repository at this point in the history 
Refactor and clarify LaneType Enumerated Type
  • Loading branch information
@sknick-iastate
sknick-iastate committed Nov 18, 2021
2 parents ed33d63 + 07ea7b3 commit 9a33418
Show file tree
Hide file tree
Showing 16 changed files with 134 additions and 170 deletions.
56 changes: 28 additions & 28 deletions create-feed/examples/linestring-examples/comprehensive_linestring_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
{
"order": 1,
"status": "open",
"type": "lane",
"type": "general",
"restrictions": [
{
"restriction_type": "local-access-only"
Expand Down Expand Up @@ -286,7 +286,7 @@
{
"order": 1,
"status": "open",
"type": "lane",
"type": "general",
"restrictions": [
{
"restriction_type": "reduced-width",
Expand All @@ -298,7 +298,7 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
}
]
},
Expand Down Expand Up @@ -620,22 +620,22 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 5,
"status": "open",
"type": "right-entrance-ramp"
"type": "entrance-lane"
},
{
"order": 6,
Expand Down Expand Up @@ -719,22 +719,22 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 5,
"status": "open",
"type": "right-exit-lane"
"type": "exit-lane"
},
{
"order": 6,
Expand Down Expand Up @@ -831,17 +831,17 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 5,
Expand Down Expand Up @@ -990,17 +990,17 @@
{
"order": 2,
"status": "shift-right",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "shift-right",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "shift-right",
"type": "lane"
"type": "general"
},
{
"order": 5,
Expand Down Expand Up @@ -1120,12 +1120,12 @@
{
"order": 1,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
Expand Down Expand Up @@ -1197,12 +1197,12 @@
{
"order": 1,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 2,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 3,
Expand Down Expand Up @@ -1300,7 +1300,7 @@
{
"order": 2,
"status": "open",
"type": "lane",
"type": "general",
"restrictions": [
{
"restriction_type": "reduced-width",
Expand All @@ -1312,7 +1312,7 @@
{
"order": 3,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 4,
Expand Down Expand Up @@ -2083,7 +2083,7 @@
{
"order": 1,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 2,
Expand Down Expand Up @@ -2176,7 +2176,7 @@
{
"order": 1,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 2,
Expand Down Expand Up @@ -2261,7 +2261,7 @@
{
"order": 1,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 2,
Expand Down Expand Up @@ -2346,7 +2346,7 @@
{
"order": 1,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 2,
Expand Down Expand Up @@ -2431,7 +2431,7 @@
{
"order": 1,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 2,
Expand Down
2 changes: 1 addition & 1 deletion .../linestring-examples/local_access_only_bidirectional_linestring_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
{
"order": 1,
"status": "open",
"type": "lane",
"type": "general",
"restrictions": [
{
"restriction_type": "local-access-only"
Expand Down
26 changes: 13 additions & 13 deletions ...e-feed/examples/linestring-examples/scenario1_simple_linestring_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
{
"order": 1,
"status": "open",
"type": "lane",
"type": "general",
"restrictions": [
{
"restriction_type": "reduced-width",
Expand All @@ -130,7 +130,7 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
}
]
},
Expand Down Expand Up @@ -452,22 +452,22 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 5,
"status": "open",
"type": "right-entrance-ramp"
"type": "entrance-lane"
},
{
"order": 6,
Expand Down Expand Up @@ -551,22 +551,22 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 5,
"status": "open",
"type": "right-exit-lane"
"type": "exit-lane"
},
{
"order": 6,
Expand Down Expand Up @@ -663,17 +663,17 @@
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 5,
Expand Down
6 changes: 3 additions & 3 deletions ...eed/examples/linestring-examples/scenario2_laneshift_linestring_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@
{
"order": 2,
"status": "shift-right",
"type": "lane"
"type": "general"
},
{
"order": 3,
"status": "shift-right",
"type": "lane"
"type": "general"
},
{
"order": 4,
"status": "shift-right",
"type": "lane"
"type": "general"
},
{
"order": 5,
Expand Down
8 changes: 4 additions & 4 deletions .../linestring-examples/scenario3_shoulder_bidrectional_linestring_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
{
"order": 1,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 2,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 3,
Expand Down Expand Up @@ -142,12 +142,12 @@
{
"order": 1,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 2,
"status": "open",
"type": "lane"
"type": "general"
},
{
"order": 3,
Expand Down
4 changes: 2 additions & 2 deletions ...e-feed/examples/linestring-examples/scenario4_detour_linestring_example.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
{
"order": 2,
"status": "open",
"type": "lane",
"type": "general",
"restrictions": [
{
"restriction_type": "reduced-width",
Expand All @@ -86,7 +86,7 @@
{
"order": 3,
"status": "closed",
"type": "lane"
"type": "general"
},
{
"order": 4,
Expand Down

0 comments on commit 9a33418

Please sign in to comment.