From d3d74b33cb3a34d0dc31510960b989b93e6b98c6 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Fri, 16 Dec 2022 13:37:05 +0000 Subject: [PATCH] Merge roads that're so short they vanish when calculating geometry normally. #136 Immense improvement to many tests --- .../src/transform/intersection_geometry.rs | 5 +- osm2streets/src/transform/mod.rs | 3 + tests/src/arizona_highways/geometry.json | 808 +-- tests/src/arizona_highways/road_network.dot | 151 +- tests/src/borough_sausage_links/geometry.json | 209 +- .../borough_sausage_links/road_network.dot | 90 +- .../bristol_contraflow_cycleway/geometry.json | 403 +- .../road_network.dot | 110 +- tests/src/bristol_sausage_links/geometry.json | 106 +- .../bristol_sausage_links/road_network.dot | 55 +- tests/src/cycleway_rejoin_road/geometry.json | 346 +- .../src/cycleway_rejoin_road/road_network.dot | 137 +- tests/src/kingsway_junction/geometry.json | 1034 +-- tests/src/kingsway_junction/road_network.dot | 290 +- tests/src/leeds_cycleway/geometry.json | 5603 +++++------------ tests/src/leeds_cycleway/road_network.dot | 1289 ++-- tests/src/roosevelt_cycletrack/geometry.json | 715 +-- .../src/roosevelt_cycletrack/road_network.dot | 252 +- tests/src/seattle_slip_lane/geometry.json | 399 +- tests/src/seattle_slip_lane/road_network.dot | 106 +- tests/src/seattle_triangle/geometry.json | 134 +- tests/src/seattle_triangle/road_network.dot | 102 +- tests/src/st_georges_cycletrack/geometry.json | 716 +-- .../st_georges_cycletrack/road_network.dot | 274 +- tests/src/tiny_loop/geometry.json | 128 +- tests/src/tiny_loop/road_network.dot | 33 +- 26 files changed, 3956 insertions(+), 9542 deletions(-) diff --git a/osm2streets/src/transform/intersection_geometry.rs b/osm2streets/src/transform/intersection_geometry.rs index 18ab40b2..23cddb0f 100644 --- a/osm2streets/src/transform/intersection_geometry.rs +++ b/osm2streets/src/transform/intersection_geometry.rs @@ -60,9 +60,10 @@ pub fn generate(streets: &mut StreetNetwork, timer: &mut Timer) { { road.center_line = pl; } else { - // TODO Mark for collapsing? - error!("{} got trimmed into oblivion", road.id); + error!("{} got trimmed into oblivion, collapse it later", road.id); road.center_line = untrimmed; + // Collapse it later + road.internal_junction_road = true; } } diff --git a/osm2streets/src/transform/mod.rs b/osm2streets/src/transform/mod.rs index 63a19038..6e9824f8 100644 --- a/osm2streets/src/transform/mod.rs +++ b/osm2streets/src/transform/mod.rs @@ -40,6 +40,9 @@ impl Transformation { Transformation::CollapseDegenerateIntersections, Transformation::ShrinkOverlappingRoads, Transformation::GenerateIntersectionGeometry, + // The above may discover more roads to collapse + Transformation::CollapseShortRoads, + Transformation::GenerateIntersectionGeometry, ] } diff --git a/tests/src/arizona_highways/geometry.json b/tests/src/arizona_highways/geometry.json index 0cecf8d3..06ae82ec 100644 --- a/tests/src/arizona_highways/geometry.json +++ b/tests/src/arizona_highways/geometry.json @@ -479,45 +479,7 @@ "coordinates": [ [ [ - -111.89057409740485, - 33.62984498264833 - ], - [ - -111.89088939670158, - 33.629846882914805 - ], - [ - -111.89089008579066, - 33.62976760771849 - ], - [ - -111.89057478649394, - 33.629765707452016 - ], - [ - -111.89057409740485, - 33.62984498264833 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 32, - "osm_way_ids": [ - 237561059 - ], - "src_i": 36, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.8908877020609, + -111.89088770098081, 33.62984687212295 ], [ @@ -529,11 +491,11 @@ 33.629773172720355 ], [ - -111.89089417172168, + -111.8908941706416, 33.62976777858959 ], [ - -111.8908877020609, + -111.89088770098081, 33.62984687212295 ] ] @@ -545,83 +507,7 @@ "osm_way_ids": [ 237561059 ], - "src_i": 32, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.8898168327898, - 33.629850181626324 - ], - [ - -111.89024403237646, - 33.62984678129147 - ], - [ - -111.89024312295169, - 33.629767507893796 - ], - [ - -111.88981592336503, - 33.62977090822865 - ], - [ - -111.8898168327898, - 33.629850181626324 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 51, - "osm_way_ids": [ - 237561060 - ], - "src_i": 64, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89027574775534, - 33.62957482195236 - ], - [ - -111.88996804787988, - 33.62957092159472 - ], - [ - -111.88996659841663, - 33.62965018959646 - ], - [ - -111.89027429829211, - 33.62965408995411 - ], - [ - -111.89027574775534, - 33.62957482195236 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 56, - "osm_way_ids": [ - 237561061 - ], - "src_i": 48, + "src_i": 36, "type": "road" }, "type": "Feature" @@ -631,8 +517,8 @@ "coordinates": [ [ [ - -111.89016088373432, - 33.62957274451954 + -111.88996783186448, + 33.62957091889675 ], [ -111.88985927873296, @@ -643,12 +529,12 @@ 33.62964916436987 ], [ - -111.8901598036574, - 33.62965201611857 + -111.88996675178755, + 33.62965019049578 ], [ - -111.89016088373432, - 33.62957274451954 + -111.88996783186448, + 33.62957091889675 ] ] ], @@ -659,7 +545,7 @@ "osm_way_ids": [ 237561061 ], - "src_i": 56, + "src_i": 48, "type": "road" }, "type": "Feature" @@ -859,7 +745,7 @@ "coordinates": [ [ [ - -111.89035406521339, + -111.89035406629347, 33.62984618324263 ], [ @@ -871,11 +757,11 @@ 33.62976623265581 ], [ - -111.89035344308908, + -111.89035344416915, 33.62976690804631 ], [ - -111.89035406521339, + -111.89035406629347, 33.62984618324263 ] ] @@ -887,7 +773,7 @@ "osm_way_ids": [ 237561065 ], - "src_i": 51, + "src_i": 64, "type": "road" }, "type": "Feature" @@ -897,23 +783,23 @@ "coordinates": [ [ [ - -111.89049155468588, + -111.89049155576595, 33.62973999854632 ], [ - -111.89045787680722, - 33.62972762568017 + -111.89042645196903, + 33.629716079290546 ], [ - -111.89044397621717, - 33.62975385889034 + -111.89041254921882, + 33.62974231250072 ], [ - -111.89047765409583, + -111.89047765301575, 33.62976623175649 ], [ - -111.89049155468588, + -111.89049155576595, 33.62973999854632 ] ] @@ -921,7 +807,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 42, + "dst_i": 44, "osm_way_ids": [ 237561066 ], @@ -935,23 +821,23 @@ "coordinates": [ [ [ - -111.8903498561536, + -111.89034985507352, 33.629678918423984 ], [ - -111.8903709727376, - 33.62968937393655 + -111.89037097165753, + 33.62968937483587 ], [ - -111.8903885736712, - 33.62966472892827 + -111.89038857475128, + 33.62966472982759 ], [ - -111.89036745708721, + -111.89036745816728, 33.62965427341571 ], [ - -111.8903498561536, + -111.89034985507352, 33.629678918423984 ] ] @@ -959,7 +845,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 43, + "dst_i": 44, "osm_way_ids": [ 237561067 ], @@ -997,7 +883,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 41, + "dst_i": 44, "osm_way_ids": [ 237561068 ], @@ -1015,11 +901,11 @@ 33.62976814911007 ], [ - -111.89030924850138, + -111.89030924958146, 33.629736537057596 ], [ - -111.89030061652659, + -111.89030061760666, 33.629708778598044 ], [ @@ -1163,100 +1049,24 @@ "coordinates": [ [ [ - -111.89040024714262, - 33.629703739699295 - ], - [ - -111.89046354721108, - 33.62972754024462 - ], - [ - -111.89047771998052, - 33.62970140775847 - ], - [ - -111.89041441991206, - 33.62967760721314 - ], - [ - -111.89040024714262, - 33.629703739699295 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 41, - "osm_way_ids": [ - 237881876 - ], - "src_i": 43, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.8904648195417, - 33.629694822026615 + -111.89042402611625, + 33.629701375382886 ], [ - -111.89040471974118, - 33.62971362234402 - ], - [ - -111.89041683172384, - 33.62974046529421 - ], - [ - -111.89047693152436, - 33.62972166497681 - ], - [ - -111.8904648195417, - 33.629694822026615 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 42, - "osm_way_ids": [ - 237881877 - ], - "src_i": 41, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89045079906312, - 33.629691285894204 - ], - [ - -111.89047918780506, - 33.62968058756482 + -111.89047918888514, + 33.6296805866655 ], [ - -111.89046498911378, - 33.62965446407188 + -111.8904649880337, + 33.62965446317256 ], [ - -111.89043660037183, - 33.62966516240127 + -111.89040982526481, + 33.62967525188995 ], [ - -111.89045079906312, - 33.629691285894204 + -111.89042402611625, + 33.629701375382886 ] ] ], @@ -1267,7 +1077,7 @@ "osm_way_ids": [ 237881878 ], - "src_i": 43, + "src_i": 44, "type": "road" }, "type": "Feature" @@ -1301,91 +1111,15 @@ "type": "Polygon" }, "properties": { - "dst_i": 51, + "dst_i": 64, "osm_way_ids": [ 237881879 ], - "src_i": 42, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89035455772847, - 33.62972654919225 - ], - [ - -111.89041745816846, - 33.6297038485172 - ], - [ - -111.89040376279303, - 33.629677539764025 - ], - [ - -111.89034086235303, - 33.62970024043907 - ], - [ - -111.89035455772847, - 33.62972654919225 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 43, - "osm_way_ids": [ - 237881880 - ], "src_i": 44, "type": "road" }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89041943254908, - 33.62971354590169 - ], - [ - -111.89035333184115, - 33.629693645714006 - ], - [ - -111.89034162164711, - 33.62972061097193 - ], - [ - -111.89040772235504, - 33.62974051115961 - ], - [ - -111.89041943254908, - 33.62971354590169 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 44, - "osm_way_ids": [ - 237881881 - ], - "src_i": 42, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1415,11 +1149,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 32, + "dst_i": 36, "osm_way_ids": [ 237881882 ], - "src_i": 41, + "src_i": 44, "type": "road" }, "type": "Feature" @@ -1453,7 +1187,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 56, + "dst_i": 48, "osm_way_ids": [ 237881883 ], @@ -1581,7 +1315,7 @@ "osm_way_ids": [ 237881885 ], - "src_i": 51, + "src_i": 64, "type": "road" }, "type": "Feature" @@ -4288,53 +4022,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89089417280175, - 33.62976777858959 - ], - [ - -111.89088770314096, - 33.62984687212295 - ], - [ - -111.89060152811857, - 33.6298451481235 - ], - [ - -111.89060221720764, - 33.62976587292718 - ], - [ - -111.89061303957845, - 33.62973865226193 - ], - [ - -111.89089417280175, - 33.62976777858959 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 32, - "intersection_kind": "Fork", - "movements": [ - "Road #18 -> Road #19", - "Road #44 -> Road #19" - ], - "osm_node_ids": [ - 2457540697 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -4479,16 +4166,20 @@ "coordinates": [ [ [ - -111.89065389024799, - 33.629766184092446 + -111.89089417172168, + 33.62976777858959 + ], + [ + -111.8908877020609, + 33.62984687212295 ], [ - -111.89065320115891, - 33.62984545928876 + -111.89065320439914, + 33.629845461087406 ], [ -111.89062750504874, - 33.62986454738907 + 33.62986454828839 ], [ -111.8904782729799, @@ -4500,11 +4191,19 @@ ], [ -111.89049155576595, - 33.62973999944564 + 33.62973999854632 + ], + [ + -111.8906022150475, + 33.62976587292718 + ], + [ + -111.89061303957845, + 33.62973865226193 ], [ - -111.89065389024799, - 33.629766184092446 + -111.89089417172168, + 33.62976777858959 ] ] ], @@ -4513,13 +4212,15 @@ "properties": { "control": "Signalled", "id": 36, - "intersection_kind": "Intersection", + "intersection_kind": "Fork", "movements": [ "Road #2 -> Road #29", - "Road #28 -> Road #18" + "Road #44 -> Road #19", + "Road #44 -> Road #29" ], "osm_node_ids": [ - 2454435301 + 2454435301, + 2457540697 ], "type": "intersection" }, @@ -4709,59 +4410,12 @@ 33.6297419491748 ], [ - -111.89042873633173, - 33.629736741203594 - ], - [ - -111.89041662650922, - 33.6297098982534 - ], - [ - -111.89043079927866, - 33.62968376576725 - ], - [ - -111.89052037653867, - 33.629686477221775 - ], - [ - -111.89052626511807, - 33.62971472850955 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 41, - "intersection_kind": "Intersection", - "movements": [ - "Road #38 -> Road #44", - "Road #31 -> Road #39" - ], - "osm_node_ids": [ - 2457540691 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.8904578778873, - 33.62972762568017 - ], - [ - -111.89044397513709, - 33.62975385889034 + -111.89042645196903, + 33.629716079290546 ], [ -111.89041254921882, - 33.62974231340004 + 33.62974231250072 ], [ -111.89038373384649, @@ -4772,143 +4426,40 @@ 33.62972865540337 ], [ - -111.89038004862402, - 33.62970168924612 - ], - [ - -111.89041206210413, - 33.62971132727537 - ], - [ - -111.89044576590463, - 33.629700783629296 - ], - [ - -111.8904578778873, - 33.62972762478085 - ], - [ - -111.8904578778873, - 33.62972762568017 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 42, - "intersection_kind": "Intersection", - "movements": [ - "Road #29 -> Road #41", - "Road #29 -> Road #43", - "Road #39 -> Road #41" - ], - "osm_node_ids": [ - 2457540692 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89045079906312, - 33.629691285894204 - ], - [ - -111.89043662629368, - 33.62971741838036 + -111.89030924850138, + 33.629736537057596 ], [ - -111.89040882295343, - 33.62970696466644 + -111.89030061652659, + 33.629708778598044 ], [ - -111.89038466703296, - 33.629715682689735 + -111.89031189468986, + 33.629681685636456 ], [ - -111.89037097165753, + -111.8903709727376, 33.62968937393655 ], [ - -111.89038857259112, + -111.8903885736712, 33.62966472892827 ], [ - -111.89040982526481, - 33.62967525278927 - ], - [ - -111.89043659929176, - 33.62966516240127 - ], - [ - -111.8904508001432, - 33.629691285894204 - ], - [ - -111.89045079906312, - 33.629691285894204 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 43, - "intersection_kind": "Intersection", - "movements": [ - "Road #42 -> Road #40", - "Road #30 -> Road #38" - ], - "osm_node_ids": [ - 2457540689 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.8904037077091, - 33.629708811872945 - ], - [ - -111.89039199751507, - 33.629735777130875 - ], - [ - -111.89030924742131, - 33.629736537057596 - ], - [ - -111.8903006154465, - 33.629708778598044 - ], - [ - -111.89031189468986, - 33.629681685636456 + -111.8904098263449, + 33.62967525188995 ], [ - -111.89039001125359, - 33.62968250311976 + -111.89042402503617, + 33.629701375382886 ], [ - -111.89040370662903, - 33.629708811872945 + -111.89052037653867, + 33.629686477221775 ], [ - -111.8904037077091, - 33.629708811872945 + -111.89052626511807, + 33.62971472850955 ] ] ], @@ -4917,13 +4468,18 @@ "properties": { "control": "Signed", "id": 44, - "intersection_kind": "Intersection", + "intersection_kind": "Fork", "movements": [ - "Road #43 -> Road #45", - "Road #32 -> Road #42" + "Road #29 -> Road #44", + "Road #29 -> Road #41", + "Road #29 -> Road #45", + "Road #29 -> Road #40" ], "osm_node_ids": [ - 2457540690 + 2457540690, + 2457540689, + 2457540691, + 2457540692 ], "type": "intersection" }, @@ -5073,12 +4629,24 @@ 33.62965427341571 ], [ - -111.89034985723369, + -111.8903498561536, 33.629678918423984 ], [ - -111.89019396433044, - 33.62965307192209 + -111.8902136076895, + 33.62965332103417 + ], + [ + -111.89020232952623, + 33.62968041399576 + ], + [ + -111.88996675178755, + 33.62965019049578 + ], + [ + -111.88996783186448, + 33.62957091889675 ], [ -111.89019541379368, @@ -5099,13 +4667,15 @@ "properties": { "control": "Signalled", "id": 48, - "intersection_kind": "Intersection", + "intersection_kind": "Fork", "movements": [ - "Road #17 -> Road #21", + "Road #45 -> Road #30", + "Road #45 -> Road #22", "Road #0 -> Road #30" ], "osm_node_ids": [ - 2454435293 + 2454435293, + 2457540685 ], "type": "intersection" }, @@ -5193,58 +4763,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89018270020817, - 33.62988679480604 - ], - [ - -111.89013234486168, - 33.6298476707205 - ], - [ - -111.89013143327676, - 33.62976839732283 - ], - [ - -111.89033804983272, - 33.629741258495834 - ], - [ - -111.89035344524923, - 33.62976690714699 - ], - [ - -111.89035406413332, - 33.62984618324263 - ], - [ - -111.89018270020817, - 33.62988679480604 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 51, - "intersection_kind": "Intersection", - "movements": [ - "Road #20 -> Road #47", - "Road #20 -> Road #28", - "Road #41 -> Road #47" - ], - "osm_node_ids": [ - 608494024 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -5411,53 +4929,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -111.89021505607266, - 33.62957405303242 - ], - [ - -111.89021360660944, - 33.62965332103417 - ], - [ - -111.89020232952623, - 33.62968041399576 - ], - [ - -111.89015960924355, - 33.629652636650455 - ], - [ - -111.89016105870678, - 33.62957336864871 - ], - [ - -111.89021505607266, - 33.62957405303242 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 56, - "intersection_kind": "Fork", - "movements": [ - "Road #21 -> Road #22", - "Road #45 -> Road #22" - ], - "osm_node_ids": [ - 2457540685 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -5754,6 +5225,14 @@ "geometry": { "coordinates": [ [ + [ + -111.89018269912809, + 33.62988679480604 + ], + [ + -111.8901323437816, + 33.6298476707205 + ], [ -111.88985581384617, 33.62987167810979 @@ -5783,16 +5262,20 @@ 33.62976814911007 ], [ - -111.89016351480171, - 33.629847422507744 + -111.89033804983272, + 33.62974125939516 ], [ - -111.88985581168602, - 33.629849873159024 + -111.89035344524923, + 33.62976690804631 ], [ - -111.88985581384617, - 33.62987167810979 + -111.89035406521339, + 33.62984618324263 + ], + [ + -111.89018269912809, + 33.62988679480604 ] ] ], @@ -5803,13 +5286,16 @@ "id": 64, "intersection_kind": "Intersection", "movements": [ + "Road #88 -> Road #47", "Road #88 -> Road #37", "Road #88 -> Road #32", - "Road #88 -> Road #20", - "Road #35 -> Road #37" + "Road #88 -> Road #28", + "Road #35 -> Road #37", + "Road #41 -> Road #47" ], "osm_node_ids": [ - 1950975946 + 1950975946, + 608494024 ], "type": "intersection" }, diff --git a/tests/src/arizona_highways/road_network.dot b/tests/src/arizona_highways/road_network.dot index c55921aa..ec60ba8b 100644 --- a/tests/src/arizona_highways/road_network.dot +++ b/tests/src/arizona_highways/road_network.dot @@ -21,114 +21,101 @@ digraph { 19 [ label = "Merge" ] 20 [ label = "MapEdge" ] 21 [ label = "MapEdge" ] - 22 [ label = "Merge" ] + 22 [ label = "Slice" ] 23 [ label = "Slice" ] - 24 [ label = "Slice" ] - 25 [ label = "Lights RoadIntersection" ] - 26 [ label = "Lights RoadIntersection" ] + 24 [ label = "Lights RoadIntersection" ] + 25 [ label = "Merge" ] + 26 [ label = "Slice" ] 27 [ label = "Slice" ] - 28 [ label = "Slice" ] - 29 [ label = "Merge" ] - 30 [ label = "MapEdge" ] - 31 [ label = "Uncontrolled RoadIntersection" ] - 32 [ label = "Uncontrolled RoadIntersection" ] - 33 [ label = "Uncontrolled RoadIntersection" ] - 34 [ label = "Uncontrolled RoadIntersection" ] + 28 [ label = "Merge" ] + 29 [ label = "MapEdge" ] + 30 [ label = "Merge" ] + 31 [ label = "Slice" ] + 32 [ label = "Merge" ] + 33 [ label = "Slice" ] + 34 [ label = "Merge" ] 35 [ label = "Slice" ] - 36 [ label = "Merge" ] + 36 [ label = "MapEdge" ] 37 [ label = "Slice" ] - 38 [ label = "Lights RoadIntersection" ] + 38 [ label = "Slice" ] 39 [ label = "Slice" ] 40 [ label = "MapEdge" ] - 41 [ label = "Lights RoadIntersection" ] - 42 [ label = "Slice" ] - 43 [ label = "Slice" ] + 41 [ label = "MapEdge" ] + 42 [ label = "Merge" ] + 43 [ label = "Merge" ] 44 [ label = "Slice" ] - 45 [ label = "MapEdge" ] + 45 [ label = "Lights RoadIntersection" ] 46 [ label = "Merge" ] - 47 [ label = "MapEdge" ] - 48 [ label = "Merge" ] - 49 [ label = "Merge" ] - 50 [ label = "Slice" ] - 51 [ label = "Lights RoadIntersection" ] - 52 [ label = "Merge" ] - 53 [ label = "Lights RoadIntersection" ] + 47 [ label = "Lights RoadIntersection" ] + 48 [ label = "MapEdge" ] + 49 [ label = "Terminus" ] + 50 [ label = "Merge" ] + 51 [ label = "Terminus" ] + 52 [ label = "MapEdge" ] + 53 [ label = "MapEdge" ] 54 [ label = "MapEdge" ] - 55 [ label = "Terminus" ] - 56 [ label = "Merge" ] - 57 [ label = "Terminus" ] - 58 [ label = "MapEdge" ] - 59 [ label = "MapEdge" ] - 60 [ label = "MapEdge" ] - 48 -> 38 [ label = "3 lanes" ] - 19 -> 26 [ label = "3 lanes" ] - 50 -> 54 [ label = "5 lanes" ] + 42 -> 34 [ label = "3 lanes" ] + 19 -> 25 [ label = "3 lanes" ] + 44 -> 48 [ label = "5 lanes" ] 20 -> 19 [ label = "4 lanes" ] - 35 -> 37 [ label = "4 lanes" ] - 23 -> 21 [ label = "1 lanes" ] - 43 -> 42 [ label = "1 lanes" ] - 30 -> 29 [ label = "5 lanes" ] - 47 -> 48 [ label = "5 lanes" ] + 31 -> 33 [ label = "4 lanes" ] + 22 -> 21 [ label = "1 lanes" ] + 38 -> 37 [ label = "1 lanes" ] + 29 -> 28 [ label = "5 lanes" ] + 41 -> 42 [ label = "5 lanes" ] 5 -> 6 [ label = "2 lanes" ] - 25 -> 38 [ label = "4 lanes" ] - 26 -> 22 [ label = "4 lanes" ] - 22 -> 15 [ label = "4 lanes" ] - 53 -> 41 [ label = "4 lanes" ] - 38 -> 46 [ label = "4 lanes" ] - 46 -> 51 [ label = "4 lanes" ] - 13 -> 25 [ label = "4 lanes" ] + 24 -> 34 [ label = "4 lanes" ] + 25 -> 15 [ label = "4 lanes" ] + 34 -> 45 [ label = "4 lanes" ] + 13 -> 24 [ label = "4 lanes" ] 15 -> 10 [ label = "4 lanes" ] 10 -> 8 [ label = "4 lanes" ] - 51 -> 56 [ label = "4 lanes" ] - 56 -> 58 [ label = "4 lanes" ] - 41 -> 26 [ label = "4 lanes" ] - 26 -> 32 [ label = "3 lanes" ] - 38 -> 33 [ label = "3 lanes" ] - 13 -> 31 [ label = "3 lanes" ] - 53 -> 34 [ label = "3 lanes" ] - 51 -> 53 [ label = "4 lanes" ] + 45 -> 50 [ label = "4 lanes" ] + 50 -> 52 [ label = "4 lanes" ] + 47 -> 25 [ label = "4 lanes" ] + 25 -> 30 [ label = "3 lanes" ] + 34 -> 30 [ label = "3 lanes" ] + 13 -> 30 [ label = "3 lanes" ] + 47 -> 30 [ label = "3 lanes" ] + 45 -> 47 [ label = "4 lanes" ] 15 -> 13 [ label = "3 lanes" ] - 53 -> 52 [ label = "4 lanes" ] - 33 -> 31 [ label = "3 lanes" ] - 31 -> 32 [ label = "3 lanes" ] - 33 -> 25 [ label = "3 lanes" ] - 32 -> 41 [ label = "3 lanes" ] - 34 -> 33 [ label = "3 lanes" ] - 32 -> 34 [ label = "3 lanes" ] - 31 -> 22 [ label = "3 lanes" ] - 34 -> 46 [ label = "3 lanes" ] - 49 -> 56 [ label = "2 lanes" ] - 41 -> 52 [ label = "3 lanes" ] - 25 -> 18 [ label = "3 lanes" ] + 47 -> 46 [ label = "4 lanes" ] + 30 -> 24 [ label = "3 lanes" ] + 30 -> 47 [ label = "3 lanes" ] + 30 -> 25 [ label = "3 lanes" ] + 30 -> 34 [ label = "3 lanes" ] + 43 -> 50 [ label = "2 lanes" ] + 47 -> 46 [ label = "3 lanes" ] + 24 -> 18 [ label = "3 lanes" ] 17 -> 10 [ label = "2 lanes" ] - 52 -> 50 [ label = "5 lanes" ] + 46 -> 44 [ label = "5 lanes" ] 0 -> 5 [ label = "4 lanes" ] - 37 -> 36 [ label = "4 lanes" ] - 42 -> 36 [ label = "1 lanes" ] - 29 -> 28 [ label = "4 lanes" ] - 39 -> 40 [ label = "5 lanes" ] + 33 -> 32 [ label = "4 lanes" ] + 37 -> 32 [ label = "1 lanes" ] 28 -> 27 [ label = "4 lanes" ] - 29 -> 24 [ label = "1 lanes" ] - 24 -> 23 [ label = "1 lanes" ] + 35 -> 36 [ label = "5 lanes" ] + 27 -> 26 [ label = "4 lanes" ] + 28 -> 23 [ label = "1 lanes" ] + 23 -> 22 [ label = "1 lanes" ] 18 -> 16 [ label = "4 lanes" ] - 48 -> 49 [ label = "4 lanes" ] - 49 -> 51 [ label = "3 lanes" ] + 42 -> 43 [ label = "4 lanes" ] + 43 -> 45 [ label = "3 lanes" ] 14 -> 12 [ label = "3 lanes" ] 19 -> 17 [ label = "4 lanes" ] 17 -> 15 [ label = "3 lanes" ] 3 -> 1 [ label = "6 lanes" ] 7 -> 13 [ label = "6 lanes" ] - 55 -> 57 [ label = "1 lanes" ] + 49 -> 51 [ label = "1 lanes" ] 5 -> 7 [ label = "4 lanes" ] - 27 -> 9 [ label = "4 lanes" ] - 11 -> 35 [ label = "4 lanes" ] - 44 -> 43 [ label = "1 lanes" ] - 45 -> 44 [ label = "2 lanes" ] - 36 -> 39 [ label = "5 lanes" ] - 60 -> 53 [ label = "6 lanes" ] + 26 -> 9 [ label = "4 lanes" ] + 11 -> 31 [ label = "4 lanes" ] + 39 -> 38 [ label = "1 lanes" ] + 40 -> 39 [ label = "2 lanes" ] + 32 -> 35 [ label = "5 lanes" ] + 54 -> 47 [ label = "6 lanes" ] 8 -> 4 [ label = "5 lanes" ] 4 -> 3 [ label = "5 lanes" ] - 59 -> 52 [ label = "3 lanes" ] + 53 -> 46 [ label = "3 lanes" ] 6 -> 14 [ label = "2 lanes" ] 4 -> 2 [ label = "1 lanes" ] 2 -> 4 [ label = "1 lanes" ] diff --git a/tests/src/borough_sausage_links/geometry.json b/tests/src/borough_sausage_links/geometry.json index 7ac68dfe..9c07a0aa 100644 --- a/tests/src/borough_sausage_links/geometry.json +++ b/tests/src/borough_sausage_links/geometry.json @@ -413,11 +413,11 @@ 51.501565226724104 ], [ - -0.09166957632674179, + -0.0916695777714097, 51.501558941365786 ], [ - -0.09166693836313633, + -0.09166693980780424, 51.5015768522538 ], [ @@ -442,44 +442,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.09165569595745308, - 51.5015581490635 - ], - [ - -0.09164079565261922, - 51.50155724884262 - ], - [ - -0.09163800455421521, - 51.50157515073742 - ], - [ - -0.09165290485904906, - 51.5015760509583 - ], - [ - -0.09165569595745308, - 51.5015581490635 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 53, - "osm_way_ids": [ - 100799873 - ], - "src_i": 52, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -513,7 +475,7 @@ "osm_way_ids": [ 100799873 ], - "src_i": 53, + "src_i": 52, "type": "road" }, "type": "Feature" @@ -661,7 +623,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 53, + "dst_i": 52, "osm_way_ids": [ 100799946 ], @@ -1888,45 +1850,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.09199139777393148, - 51.501134279031376 - ], - [ - -0.09199969739108006, - 51.501164578973075 - ], - [ - -0.0920709021830765, - 51.50115702107476 - ], - [ - -0.09206260256592791, - 51.501126721133055 - ], - [ - -0.09199139777393148, - 51.501134279031376 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 39, - "osm_way_ids": [ - 539534598, - 1059353228 - ], - "src_i": 41, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2040,7 +1963,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 39, + "dst_i": 41, "osm_way_ids": [ 539534605 ], @@ -2090,7 +2013,7 @@ "osm_way_ids": [ 539534605 ], - "src_i": 39, + "src_i": 41, "type": "road" }, "type": "Feature" @@ -2565,7 +2488,7 @@ 852420879, 539534598 ], - "src_i": 39, + "src_i": 41, "type": "road" }, "type": "Feature" @@ -4217,7 +4140,11 @@ "coordinates": [ [ [ - -0.09208798538112385, + -0.09208406021840972, + 51.5011475584134 + ], + [ + -0.09208798682579176, 51.50116537757061 ], [ @@ -4232,58 +4159,6 @@ -0.0919961247273362, 51.501151534313976 ], - [ - -0.09206732951933265, - 51.501143975516335 - ], - [ - -0.09206867161582194, - 51.50114887232218 - ], - [ - -0.09208406021840972, - 51.5011475584134 - ], - [ - -0.09208798682579176, - 51.50116537757061 - ], - [ - -0.09208798538112385, - 51.50116537757061 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 39, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 2217475451 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.09206913390955346, - 51.501150558550094 - ], - [ - -0.0919979262282212, - 51.50115811464976 - ], - [ - -0.09199706954015, - 51.50115498770873 - ], [ -0.09198940413221432, 51.50115499670195 @@ -4305,12 +4180,16 @@ 51.50111571793388 ], [ - -0.09206913390955346, + -0.09206913102021763, 51.50115055765077 ], [ - -0.09206913390955346, - 51.501150558550094 + -0.09212941412280705, + 51.50114368503548 + ], + [ + -0.09208406021840972, + 51.5011475584134 ] ] ], @@ -4324,7 +4203,8 @@ "Road #49 -> Road #50" ], "osm_node_ids": [ - 5220719449 + 5220719449, + 2217475451 ], "type": "intersection" }, @@ -4787,11 +4667,11 @@ "coordinates": [ [ [ - -0.09166957488207388, + -0.09166957632674179, 51.501558941365786 ], [ - -0.09166693691846843, + -0.09166693836313633, 51.5015768522538 ], [ @@ -4802,42 +4682,6 @@ -0.09163815913368169, 51.50157515973064 ], - [ - -0.09164089966870881, - 51.501557254238556 - ], - [ - -0.09166957488207388, - 51.501558941365786 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 52, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 2317365390 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.0916548970560983, - 51.501558100500134 - ], - [ - -0.09165210017902264, - 51.501576002394934 - ], [ -0.0916520279456271, 51.50157640798895 @@ -4851,8 +4695,8 @@ 51.50155640707766 ], [ - -0.0916548970560983, - 51.501558100500134 + -0.09166957632674179, + 51.501558941365786 ] ] ], @@ -4860,10 +4704,11 @@ }, "properties": { "control": "Signed", - "id": 53, + "id": 52, "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ + 2317365390, 1165071224 ], "type": "intersection" diff --git a/tests/src/borough_sausage_links/road_network.dot b/tests/src/borough_sausage_links/road_network.dot index 661a3fd6..e9ae8588 100644 --- a/tests/src/borough_sausage_links/road_network.dot +++ b/tests/src/borough_sausage_links/road_network.dot @@ -30,47 +30,44 @@ digraph { 28 [ label = "Slice" ] 29 [ label = "Slice" ] 30 [ label = "Slice" ] - 31 [ label = "Slice" ] - 32 [ label = "Merge" ] + 31 [ label = "Merge" ] + 32 [ label = "Slice" ] 33 [ label = "Slice" ] 34 [ label = "Slice" ] 35 [ label = "Slice" ] 36 [ label = "Slice" ] - 37 [ label = "Slice" ] - 38 [ label = "MapEdge" ] + 37 [ label = "MapEdge" ] + 38 [ label = "Slice" ] 39 [ label = "Slice" ] - 40 [ label = "Slice" ] - 41 [ label = "Uncontrolled RoadIntersection" ] + 40 [ label = "Uncontrolled RoadIntersection" ] + 41 [ label = "Slice" ] 42 [ label = "Slice" ] - 43 [ label = "Slice" ] + 43 [ label = "MapEdge" ] 44 [ label = "Slice" ] - 45 [ label = "MapEdge" ] + 45 [ label = "Slice" ] 46 [ label = "Slice" ] - 47 [ label = "Slice" ] - 48 [ label = "Slice" ] + 47 [ label = "MapEdge" ] + 48 [ label = "MapEdge" ] 49 [ label = "MapEdge" ] 50 [ label = "MapEdge" ] 51 [ label = "MapEdge" ] - 52 [ label = "MapEdge" ] - 53 [ label = "MapEdge" ] - 49 -> 41 [ label = "2 lanes" ] - 41 -> 49 [ label = "2 lanes" ] - 20 -> 44 [ label = "1 lanes" ] - 44 -> 46 [ label = "1 lanes" ] - 46 -> 50 [ label = "1 lanes" ] - 41 -> 39 [ label = "5 lanes" ] - 53 -> 47 [ label = "1 lanes" ] - 47 -> 35 [ label = "1 lanes" ] - 35 -> 29 [ label = "1 lanes" ] + 47 -> 40 [ label = "2 lanes" ] + 40 -> 47 [ label = "2 lanes" ] + 20 -> 42 [ label = "1 lanes" ] + 42 -> 44 [ label = "1 lanes" ] + 44 -> 48 [ label = "1 lanes" ] + 40 -> 38 [ label = "5 lanes" ] + 51 -> 45 [ label = "1 lanes" ] + 45 -> 34 [ label = "1 lanes" ] + 34 -> 29 [ label = "1 lanes" ] 29 -> 28 [ label = "1 lanes" ] - 29 -> 36 [ label = "1 lanes" ] - 36 -> 42 [ label = "1 lanes" ] - 42 -> 43 [ label = "1 lanes" ] - 43 -> 48 [ label = "1 lanes" ] - 48 -> 52 [ label = "1 lanes" ] - 36 -> 35 [ label = "1 lanes" ] - 48 -> 47 [ label = "1 lanes" ] - 46 -> 43 [ label = "1 lanes" ] + 29 -> 35 [ label = "1 lanes" ] + 35 -> 41 [ label = "1 lanes" ] + 41 -> 46 [ label = "1 lanes" ] + 46 -> 50 [ label = "1 lanes" ] + 35 -> 34 [ label = "1 lanes" ] + 46 -> 45 [ label = "1 lanes" ] + 44 -> 41 [ label = "1 lanes" ] 1 -> 2 [ label = "2 lanes" ] 2 -> 1 [ label = "2 lanes" ] 25 -> 26 [ label = "2 lanes" ] @@ -83,46 +80,45 @@ digraph { 7 -> 10 [ label = "2 lanes" ] 18 -> 17 [ label = "2 lanes" ] 17 -> 18 [ label = "2 lanes" ] - 40 -> 32 [ label = "2 lanes" ] - 32 -> 26 [ label = "2 lanes" ] + 39 -> 31 [ label = "2 lanes" ] + 31 -> 26 [ label = "2 lanes" ] 2 -> 4 [ label = "2 lanes" ] 4 -> 2 [ label = "2 lanes" ] 19 -> 25 [ label = "2 lanes" ] 13 -> 14 [ label = "2 lanes" ] 13 -> 19 [ label = "2 lanes" ] - 42 -> 44 [ label = "1 lanes" ] + 41 -> 42 [ label = "1 lanes" ] 12 -> 21 [ label = "1 lanes" ] 6 -> 5 [ label = "2 lanes" ] 5 -> 6 [ label = "2 lanes" ] 11 -> 12 [ label = "1 lanes" ] 12 -> 9 [ label = "1 lanes" ] - 38 -> 20 [ label = "2 lanes" ] - 20 -> 38 [ label = "2 lanes" ] + 37 -> 20 [ label = "2 lanes" ] + 20 -> 37 [ label = "2 lanes" ] 20 -> 15 [ label = "2 lanes" ] 15 -> 20 [ label = "2 lanes" ] 15 -> 10 [ label = "2 lanes" ] 10 -> 15 [ label = "2 lanes" ] 18 -> 22 [ label = "2 lanes" ] 22 -> 18 [ label = "2 lanes" ] - 22 -> 45 [ label = "2 lanes" ] - 45 -> 22 [ label = "2 lanes" ] - 32 -> 31 [ label = "2 lanes" ] + 22 -> 43 [ label = "2 lanes" ] + 43 -> 22 [ label = "2 lanes" ] + 31 -> 30 [ label = "2 lanes" ] 14 -> 8 [ label = "2 lanes" ] 14 -> 19 [ label = "2 lanes" ] 22 -> 23 [ label = "3 lanes" ] - 26 -> 31 [ label = "2 lanes" ] - 31 -> 40 [ label = "2 lanes" ] - 24 -> 37 [ label = "3 lanes" ] - 31 -> 30 [ label = "2 lanes" ] - 39 -> 33 [ label = "3 lanes" ] - 37 -> 41 [ label = "5 lanes" ] - 34 -> 30 [ label = "1 lanes" ] + 26 -> 30 [ label = "2 lanes" ] + 30 -> 39 [ label = "2 lanes" ] + 24 -> 36 [ label = "3 lanes" ] + 38 -> 32 [ label = "3 lanes" ] + 36 -> 40 [ label = "5 lanes" ] + 33 -> 30 [ label = "1 lanes" ] 30 -> 12 [ label = "1 lanes" ] - 40 -> 51 [ label = "2 lanes" ] - 51 -> 40 [ label = "2 lanes" ] + 39 -> 49 [ label = "2 lanes" ] + 49 -> 39 [ label = "2 lanes" ] 16 -> 17 [ label = "2 lanes" ] 17 -> 16 [ label = "2 lanes" ] - 33 -> 32 [ label = "5 lanes" ] + 32 -> 31 [ label = "5 lanes" ] 25 -> 16 [ label = "2 lanes" ] 28 -> 27 [ label = "1 lanes" ] 3 -> 0 [ label = "2 lanes" ] diff --git a/tests/src/bristol_contraflow_cycleway/geometry.json b/tests/src/bristol_contraflow_cycleway/geometry.json index a2b881bc..0121f6bf 100644 --- a/tests/src/bristol_contraflow_cycleway/geometry.json +++ b/tests/src/bristol_contraflow_cycleway/geometry.json @@ -56,11 +56,11 @@ ], [ -2.5519820927147867, - 51.45770632892237 + 51.45770632802305 ], [ -2.552095319971202, - 51.45771267813007 + 51.45771267723075 ], [ -2.552127120304416, @@ -84,44 +84,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.551980181779318, - 51.457719552541356 - ], - [ - -2.5519740823735106, - 51.45776215248749 - ], - [ - -2.5520873182897543, - 51.45776844773592 - ], - [ - -2.5520934176955623, - 51.45772584778979 - ], - [ - -2.551980181779318, - 51.457719552541356 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 22, - "osm_way_ids": [ - 4019483 - ], - "src_i": 21, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -163,7 +125,7 @@ "osm_way_ids": [ 4019484 ], - "src_i": 22, + "src_i": 21, "type": "road" }, "type": "Feature" @@ -201,7 +163,7 @@ "osm_way_ids": [ 8454004 ], - "src_i": 4, + "src_i": 5, "type": "road" }, "type": "Feature" @@ -380,11 +342,11 @@ ], [ -2.554635416509495, - 51.457849299410164 + 51.457849298510844 ], [ -2.5545259014328563, - 51.457830289558544 + 51.457830288659224 ], [ -2.554506307127782, @@ -412,44 +374,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.5546466699565094, - 51.45782411751712 - ], - [ - -2.554683469897323, - 51.45773701735915 - ], - [ - -2.554573530489092, - 51.457718982371716 - ], - [ - -2.554536730548279, - 51.457806082529686 - ], - [ - -2.5546466699565094, - 51.45782411751712 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 4, - "osm_way_ids": [ - 24042783 - ], - "src_i": 5, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -483,7 +407,7 @@ "osm_way_ids": [ 24042783 ], - "src_i": 4, + "src_i": 5, "type": "road" }, "type": "Feature" @@ -602,44 +526,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.55436634842438, - 51.45756096354221 - ], - [ - -2.554228048078118, - 51.45756946302691 - ], - [ - -2.5542357524387906, - 51.45761813608914 - ], - [ - -2.5543740527850525, - 51.45760963660443 - ], - [ - -2.55436634842438, - 51.45756096354221 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 9, - "osm_way_ids": [ - 116868118 - ], - "src_i": 7, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -831,7 +717,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 9, + "dst_i": 7, "osm_way_ids": [ 280732115 ], @@ -873,7 +759,7 @@ "osm_way_ids": [ 824782255 ], - "src_i": 9, + "src_i": 7, "type": "road" }, "type": "Feature" @@ -967,11 +853,11 @@ 51.45772239529569 ], [ - -2.5520928663531537, + -2.552092864909849, 51.457729680696765 ], [ - -2.5520987406034226, + -2.552098739160118, 51.45779647508126 ], [ @@ -991,7 +877,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 22, + "dst_i": 21, "osm_way_ids": [ 824782255 ], @@ -1119,7 +1005,7 @@ "coordinates": [ [ [ - -2.552094104708616, + -2.5520941032653113, 51.45773514856969 ], [ @@ -1187,11 +1073,11 @@ 51.45771429870688 ], [ - -2.552095317084593, + -2.5520953156412878, 51.45771267813007 ], [ - -2.552094104708616, + -2.5520941032653113, 51.45773514856969 ] ] @@ -1251,7 +1137,7 @@ "coordinates": [ [ [ - -2.5519665497661017, + -2.5519665512094063, 51.457730413643546 ], [ @@ -1271,11 +1157,11 @@ 51.45780177028451 ], [ - -2.551968071009292, + -2.5519680724525964, 51.45780124418161 ], [ - -2.5519665497661017, + -2.5519665512094063, 51.457730413643546 ] ] @@ -1287,7 +1173,7 @@ "osm_way_ids": [ 1004031465 ], - "src_i": 22, + "src_i": 21, "type": "road" }, "type": "Feature" @@ -1517,16 +1403,16 @@ "coordinates": [ [ [ - -2.554674306355564, - 51.45775870449 + -2.554635416509495, + 51.457849299410164 ], [ - -2.5545643669473335, - 51.4577406713012 + -2.5545259014328563, + 51.457830289558544 ], [ - -2.5545729113113613, - 51.45772044826528 + -2.554539201485984, + 51.457786091518635 ], [ -2.5545865115718738, @@ -1540,60 +1426,9 @@ -2.5547193634427634, 51.45775346864194 ], - [ - -2.554674306355564, - 51.45775870449 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 4, - "intersection_kind": "Intersection", - "movements": [ - "Road #10 -> Road #11", - "Road #10 -> Road #4", - "Road #11 -> Road #10", - "Road #11 -> Road #4", - "Road #4 -> Road #10", - "Road #4 -> Road #11" - ], - "osm_node_ids": [ - 282229032 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.554635416509495, - 51.45784930030948 - ], - [ - -2.5545259014328563, - 51.45783029045787 - ], - [ - -2.554539202929289, - 51.457786092417955 - ], - [ - -2.554544886663333, - 51.457786756117 - ], - [ - -2.5545722055353464, - 51.45772211560679 - ], [ -2.554682144943577, - 51.45774015419151 + 51.457740152392866 ], [ -2.55471707291815, @@ -1601,7 +1436,7 @@ ], [ -2.554635416509495, - 51.45784930030948 + 51.457849299410164 ] ] ], @@ -1610,13 +1445,18 @@ "properties": { "control": "Signalled", "id": 5, - "intersection_kind": "Connection", + "intersection_kind": "Intersection", "movements": [ - "Road #9 -> Road #10", - "Road #10 -> Road #9" + "Road #9 -> Road #11", + "Road #9 -> Road #4", + "Road #11 -> Road #9", + "Road #11 -> Road #4", + "Road #4 -> Road #9", + "Road #4 -> Road #11" ], "osm_node_ids": [ - 2847905817 + 2847905817, + 282229032 ], "type": "intersection" }, @@ -1675,12 +1515,24 @@ 51.45762233681848 ], [ - -2.5542785060116335, - 51.457615508272575 + -2.554313790482476, + 51.45761334090847 + ], + [ + -2.5542625358447473, + 51.45764499521623 + ], + [ + -2.5542343235671034, + 51.457627260602074 + ], + [ + -2.5542238235251604, + 51.45756068475263 ], [ -2.5542708016509614, - 51.45756683521035 + 51.45756683700899 ], [ -2.5543576770495355, @@ -1699,13 +1551,14 @@ "id": 7, "intersection_kind": "Intersection", "movements": [ - "Road #6 -> Road #16", + "Road #6 -> Road #21", "Road #6 -> Road #7", "Road #7 -> Road #6", - "Road #7 -> Road #16" + "Road #7 -> Road #21" ], "osm_node_ids": [ - 260742852 + 260742852, + 2847905819 ], "type": "intersection" }, @@ -1762,56 +1615,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.554313790482476, - 51.45761334090847 - ], - [ - -2.5542625358447473, - 51.45764499521623 - ], - [ - -2.5542343235671034, - 51.457627260602074 - ], - [ - -2.5542238235251604, - 51.45756068475263 - ], - [ - -2.5543060832351943, - 51.45756466694692 - ], - [ - -2.5543137875958664, - 51.45761334000915 - ], - [ - -2.554313790482476, - 51.45761334090847 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 9, - "intersection_kind": "Connection", - "movements": [ - "Road #16 -> Road #21" - ], - "osm_node_ids": [ - 2847905819 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2184,90 +1987,43 @@ "coordinates": [ [ [ - -2.5520953185278974, - 51.45771267813007 - ], - [ - -2.5520941061519204, - 51.45773514856969 - ], - [ - -2.552092092741816, - 51.45773510630159 - ], - [ - -2.551978856825572, - 51.45772881015384 - ], - [ - -2.551982091271482, - 51.45770632982169 - ], - [ - -2.5520953185278974, - 51.45771267902939 - ], - [ - -2.5520953185278974, - 51.45771267813007 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 21, - "intersection_kind": "Connection", - "movements": [ - "Road #2 -> Road #1", - "Road #1 -> Road #2" - ], - "osm_node_ids": [ - 8411977276 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.5520812419768224, + -2.552081240533518, 51.45780799718453 ], [ - -2.5519680724525964, + -2.551968071009292, 51.45780124328228 ], [ - -2.5519665483227967, + -2.5519665497661017, 51.457730413643546 ], [ - -2.5519786417731667, - 51.45773031291957 + -2.5519820927147867, + 51.45770632892237 + ], + [ + -2.552095319971202, + 51.45771267813007 ], [ - -2.551979633323519, - 51.45772338454901 + -2.552094104708616, + 51.45773514856969 ], [ - -2.5520928692397633, - 51.4577296779988 + -2.5520928663531537, + 51.457729680696765 ], [ - -2.5520987420467276, - 51.45779647418194 + -2.5520987406034226, + 51.45779647508126 ], [ - -2.552082930643362, - 51.45779701377466 + -2.5520829277567523, + 51.45779701467398 ], [ - -2.5520812419768224, + -2.552081240533518, 51.45780799718453 ] ] @@ -2276,20 +2032,21 @@ }, "properties": { "control": "Signed", - "id": 22, + "id": 21, "intersection_kind": "Intersection", "movements": [ "Road #3 -> Road #31", - "Road #3 -> Road #2", + "Road #3 -> Road #1", "Road #31 -> Road #3", - "Road #31 -> Road #2", - "Road #2 -> Road #3", - "Road #2 -> Road #31", + "Road #31 -> Road #1", + "Road #1 -> Road #3", + "Road #1 -> Road #31", "Road #24 -> Road #3", "Road #24 -> Road #31", - "Road #24 -> Road #2" + "Road #24 -> Road #1" ], "osm_node_ids": [ + 8411977276, 21310516 ], "type": "intersection" diff --git a/tests/src/bristol_contraflow_cycleway/road_network.dot b/tests/src/bristol_contraflow_cycleway/road_network.dot index f6bf4b5f..d1a4c45d 100644 --- a/tests/src/bristol_contraflow_cycleway/road_network.dot +++ b/tests/src/bristol_contraflow_cycleway/road_network.dot @@ -3,80 +3,72 @@ digraph { 1 [ label = "MapEdge" ] 2 [ label = "Slice" ] 3 [ label = "Uncontrolled RoadIntersection" ] - 4 [ label = "Uncontrolled RoadIntersection" ] - 5 [ label = "Slice" ] - 6 [ label = "MapEdge" ] - 7 [ label = "Uncontrolled RoadIntersection" ] - 8 [ label = "Slice" ] - 9 [ label = "Slice" ] - 10 [ label = "Merge" ] - 11 [ label = "Terminus" ] - 12 [ label = "MapEdge" ] - 13 [ label = "Merge" ] - 14 [ label = "Terminus" ] - 15 [ label = "Terminus" ] - 16 [ label = "Merge" ] + 4 [ label = "Lights RoadIntersection" ] + 5 [ label = "MapEdge" ] + 6 [ label = "Uncontrolled RoadIntersection" ] + 7 [ label = "Slice" ] + 8 [ label = "Merge" ] + 9 [ label = "Terminus" ] + 10 [ label = "MapEdge" ] + 11 [ label = "Merge" ] + 12 [ label = "Terminus" ] + 13 [ label = "Terminus" ] + 14 [ label = "Merge" ] + 15 [ label = "Slice" ] + 16 [ label = "Uncontrolled RoadIntersection" ] 17 [ label = "Slice" ] 18 [ label = "Slice" ] - 19 [ label = "Uncontrolled RoadIntersection" ] - 20 [ label = "Slice" ] - 21 [ label = "Slice" ] - 22 [ label = "Terminus" ] + 19 [ label = "Terminus" ] + 20 [ label = "MapEdge" ] + 21 [ label = "MapEdge" ] + 22 [ label = "MapEdge" ] 23 [ label = "MapEdge" ] 24 [ label = "MapEdge" ] 25 [ label = "MapEdge" ] - 26 [ label = "MapEdge" ] - 27 [ label = "MapEdge" ] - 28 [ label = "MapEdge" ] - 23 -> 17 [ label = "2 lanes" ] - 17 -> 23 [ label = "2 lanes" ] - 17 -> 18 [ label = "2 lanes" ] - 18 -> 17 [ label = "2 lanes" ] - 18 -> 19 [ label = "2 lanes" ] - 19 -> 18 [ label = "2 lanes" ] - 19 -> 25 [ label = "2 lanes" ] - 25 -> 19 [ label = "2 lanes" ] + 20 -> 15 [ label = "2 lanes" ] + 15 -> 20 [ label = "2 lanes" ] + 15 -> 16 [ label = "2 lanes" ] + 16 -> 15 [ label = "2 lanes" ] + 16 -> 22 [ label = "2 lanes" ] + 22 -> 16 [ label = "2 lanes" ] 4 -> 2 [ label = "2 lanes" ] 2 -> 4 [ label = "2 lanes" ] 2 -> 0 [ label = "2 lanes" ] 0 -> 2 [ label = "2 lanes" ] - 3 -> 7 [ label = "2 lanes" ] - 7 -> 3 [ label = "2 lanes" ] - 7 -> 8 [ label = "2 lanes" ] - 8 -> 7 [ label = "2 lanes" ] - 8 -> 12 [ label = "2 lanes" ] - 12 -> 8 [ label = "2 lanes" ] - 6 -> 5 [ label = "2 lanes" ] - 5 -> 6 [ label = "2 lanes" ] + 3 -> 6 [ label = "2 lanes" ] + 6 -> 3 [ label = "2 lanes" ] + 6 -> 7 [ label = "2 lanes" ] + 7 -> 6 [ label = "2 lanes" ] + 7 -> 10 [ label = "2 lanes" ] + 10 -> 7 [ label = "2 lanes" ] 5 -> 4 [ label = "2 lanes" ] 4 -> 5 [ label = "2 lanes" ] 4 -> 3 [ label = "2 lanes" ] 3 -> 4 [ label = "2 lanes" ] - 14 -> 27 [ label = "2 lanes" ] - 27 -> 14 [ label = "2 lanes" ] - 13 -> 28 [ label = "1 lanes" ] - 28 -> 13 [ label = "1 lanes" ] - 11 -> 10 [ label = "2 lanes" ] - 10 -> 11 [ label = "2 lanes" ] - 7 -> 9 [ label = "3 lanes" ] + 12 -> 24 [ label = "2 lanes" ] + 24 -> 12 [ label = "2 lanes" ] + 11 -> 25 [ label = "1 lanes" ] + 25 -> 11 [ label = "1 lanes" ] + 9 -> 8 [ label = "2 lanes" ] + 8 -> 9 [ label = "2 lanes" ] 3 -> 1 [ label = "2 lanes" ] 1 -> 3 [ label = "2 lanes" ] - 22 -> 24 [ label = "2 lanes" ] - 24 -> 22 [ label = "2 lanes" ] - 2 -> 5 [ label = "2 lanes" ] - 5 -> 9 [ label = "2 lanes" ] - 9 -> 10 [ label = "4 lanes" ] - 10 -> 13 [ label = "4 lanes" ] - 13 -> 16 [ label = "4 lanes" ] - 16 -> 19 [ label = "4 lanes" ] - 22 -> 20 [ label = "1 lanes" ] - 20 -> 17 [ label = "1 lanes" ] - 21 -> 20 [ label = "1 lanes" ] - 18 -> 8 [ label = "1 lanes" ] - 16 -> 15 [ label = "1 lanes" ] - 15 -> 16 [ label = "1 lanes" ] 19 -> 21 [ label = "2 lanes" ] 21 -> 19 [ label = "2 lanes" ] - 21 -> 26 [ label = "2 lanes" ] - 26 -> 21 [ label = "2 lanes" ] + 2 -> 4 [ label = "2 lanes" ] + 4 -> 6 [ label = "2 lanes" ] + 6 -> 8 [ label = "4 lanes" ] + 8 -> 11 [ label = "4 lanes" ] + 11 -> 14 [ label = "4 lanes" ] + 14 -> 16 [ label = "4 lanes" ] + 19 -> 17 [ label = "1 lanes" ] + 17 -> 15 [ label = "1 lanes" ] + 18 -> 17 [ label = "1 lanes" ] + 16 -> 7 [ label = "1 lanes" ] + 14 -> 13 [ label = "1 lanes" ] + 13 -> 14 [ label = "1 lanes" ] + 16 -> 18 [ label = "2 lanes" ] + 18 -> 16 [ label = "2 lanes" ] + 18 -> 23 [ label = "2 lanes" ] + 23 -> 18 [ label = "2 lanes" ] } diff --git a/tests/src/bristol_sausage_links/geometry.json b/tests/src/bristol_sausage_links/geometry.json index ff192cda..9c74213d 100644 --- a/tests/src/bristol_sausage_links/geometry.json +++ b/tests/src/bristol_sausage_links/geometry.json @@ -75,7 +75,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 9, + "dst_i": 8, "osm_way_ids": [ 4019484 ], @@ -313,44 +313,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.550955892384323, - 51.4596383187448 - ], - [ - -2.550885093499392, - 51.4596422191008 - ], - [ - -2.550895107620687, - 51.45971278163995 - ], - [ - -2.5509659065056183, - 51.45970888128395 - ], - [ - -2.550955892384323, - 51.4596383187448 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 9, - "osm_way_ids": [ - 481131863 - ], - "src_i": 8, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -462,7 +424,7 @@ "osm_way_ids": [ 481131868 ], - "src_i": 9, + "src_i": 8, "type": "road" }, "type": "Feature" @@ -538,7 +500,7 @@ "osm_way_ids": [ 481131870 ], - "src_i": 9, + "src_i": 8, "type": "road" }, "type": "Feature" @@ -954,49 +916,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.5509773639998303, - 51.45971094252812 - ], - [ - -2.5509515276246235, - 51.45970967358592 - ], - [ - -2.550941516390074, - 51.45963911104677 - ], - [ - -2.550973285027968, - 51.459635651358155 - ], - [ - -2.5509773639998303, - 51.45971094252812 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 8, - "intersection_kind": "Connection", - "movements": [ - "Road #9 -> Road #7", - "Road #7 -> Road #9" - ], - "osm_node_ids": [ - 4740760678 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1030,12 +949,12 @@ 51.45963891949136 ], [ - -2.5509550234738274, - 51.459709481131185 + -2.550973285027968, + 51.459635651358155 ], [ - -2.550949182143634, - 51.45970980308817 + -2.5509773639998303, + 51.45971094252812 ], [ -2.550949182143634, @@ -1047,18 +966,21 @@ }, "properties": { "control": "Signalled", - "id": 9, + "id": 8, "intersection_kind": "Intersection", "movements": [ "Road #14 -> Road #16", "Road #14 -> Road #1", - "Road #14 -> Road #9", + "Road #14 -> Road #7", "Road #1 -> Road #16", "Road #1 -> Road #14", - "Road #9 -> Road #16", - "Road #9 -> Road #14" + "Road #1 -> Road #7", + "Road #7 -> Road #16", + "Road #7 -> Road #14", + "Road #7 -> Road #1" ], "osm_node_ids": [ + 4740760678, 1316487047 ], "type": "intersection" diff --git a/tests/src/bristol_sausage_links/road_network.dot b/tests/src/bristol_sausage_links/road_network.dot index b021980e..2063cd3d 100644 --- a/tests/src/bristol_sausage_links/road_network.dot +++ b/tests/src/bristol_sausage_links/road_network.dot @@ -5,43 +5,40 @@ digraph { 3 [ label = "MapEdge" ] 4 [ label = "Slice" ] 5 [ label = "Merge" ] - 6 [ label = "Slice" ] - 7 [ label = "Lights RoadIntersection" ] - 8 [ label = "Slice" ] - 9 [ label = "Lights RoadIntersection" ] + 6 [ label = "Lights RoadIntersection" ] + 7 [ label = "Slice" ] + 8 [ label = "Lights RoadIntersection" ] + 9 [ label = "Slice" ] 10 [ label = "Slice" ] 11 [ label = "Slice" ] - 12 [ label = "Slice" ] - 13 [ label = "MapEdge" ] - 14 [ label = "Merge" ] + 12 [ label = "MapEdge" ] + 13 [ label = "Merge" ] + 14 [ label = "MapEdge" ] 15 [ label = "MapEdge" ] 16 [ label = "MapEdge" ] - 17 [ label = "MapEdge" ] 0 -> 5 [ label = "2 lanes" ] 5 -> 0 [ label = "2 lanes" ] - 2 -> 7 [ label = "2 lanes" ] - 7 -> 2 [ label = "2 lanes" ] - 13 -> 14 [ label = "3 lanes" ] - 16 -> 12 [ label = "1 lanes" ] - 12 -> 10 [ label = "1 lanes" ] - 10 -> 17 [ label = "1 lanes" ] - 3 -> 12 [ label = "1 lanes" ] + 2 -> 6 [ label = "2 lanes" ] + 6 -> 2 [ label = "2 lanes" ] + 12 -> 13 [ label = "3 lanes" ] + 15 -> 11 [ label = "1 lanes" ] + 11 -> 9 [ label = "1 lanes" ] + 9 -> 16 [ label = "1 lanes" ] + 3 -> 11 [ label = "1 lanes" ] 6 -> 4 [ label = "2 lanes" ] 4 -> 6 [ label = "2 lanes" ] - 6 -> 7 [ label = "2 lanes" ] - 7 -> 6 [ label = "2 lanes" ] 1 -> 4 [ label = "3 lanes" ] 4 -> 1 [ label = "2 lanes" ] - 9 -> 11 [ label = "2 lanes" ] - 11 -> 9 [ label = "2 lanes" ] - 7 -> 9 [ label = "2 lanes" ] - 9 -> 7 [ label = "2 lanes" ] - 5 -> 8 [ label = "2 lanes" ] - 7 -> 5 [ label = "2 lanes" ] - 8 -> 9 [ label = "2 lanes" ] - 11 -> 14 [ label = "2 lanes" ] - 14 -> 11 [ label = "2 lanes" ] - 14 -> 15 [ label = "3 lanes" ] - 15 -> 14 [ label = "2 lanes" ] - 10 -> 8 [ label = "1 lanes" ] + 8 -> 10 [ label = "2 lanes" ] + 10 -> 8 [ label = "2 lanes" ] + 6 -> 8 [ label = "2 lanes" ] + 8 -> 6 [ label = "2 lanes" ] + 5 -> 7 [ label = "2 lanes" ] + 6 -> 5 [ label = "2 lanes" ] + 7 -> 8 [ label = "2 lanes" ] + 10 -> 13 [ label = "2 lanes" ] + 13 -> 10 [ label = "2 lanes" ] + 13 -> 14 [ label = "3 lanes" ] + 14 -> 13 [ label = "2 lanes" ] + 9 -> 7 [ label = "1 lanes" ] } diff --git a/tests/src/cycleway_rejoin_road/geometry.json b/tests/src/cycleway_rejoin_road/geometry.json index 95b4d6a9..3a7e74c8 100644 --- a/tests/src/cycleway_rejoin_road/geometry.json +++ b/tests/src/cycleway_rejoin_road/geometry.json @@ -158,7 +158,7 @@ [ [ -0.11534592004337299, - 51.488998386088994 + 51.488998386988314 ], [ -0.1157289084823592, @@ -170,11 +170,11 @@ ], [ -0.1154091082540651, - 51.48892317401331 + 51.48892317491263 ], [ -0.11534592004337299, - 51.488998386088994 + 51.488998386988314 ] ] ], @@ -239,7 +239,7 @@ "osm_way_ids": [ 4256703 ], - "src_i": 36, + "src_i": 31, "type": "road" }, "type": "Feature" @@ -605,7 +605,7 @@ "osm_way_ids": [ 473149319 ], - "src_i": 55, + "src_i": 56, "type": "road" }, "type": "Feature" @@ -938,44 +938,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.11537290249256499, - 51.48896085379553 - ], - [ - -0.11541690315173607, - 51.48891505403733 - ], - [ - -0.11534949757932464, - 51.488889946773014 - ], - [ - -0.11530549692015354, - 51.48893574653122 - ], - [ - -0.11537290249256499, - 51.48896085379553 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 55, - "osm_way_ids": [ - 605012633 - ], - "src_i": 56, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1009,7 +971,7 @@ "osm_way_ids": [ 605012633 ], - "src_i": 55, + "src_i": 56, "type": "road" }, "type": "Feature" @@ -1211,7 +1173,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 36, + "dst_i": 31, "osm_way_ids": [ 605014316 ], @@ -1220,44 +1182,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.11627022707926338, - 51.49070396865299 - ], - [ - -0.11634052703280001, - 51.4907318683113 - ], - [ - -0.11640167300052254, - 51.4906721317641 - ], - [ - -0.11633137304698592, - 51.49064423210579 - ], - [ - -0.11627022707926338, - 51.49070396865299 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 33, - "osm_way_ids": [ - 605014316 - ], - "src_i": 36, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1304,44 +1228,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.11637762392860862, - 51.49064861270198 - ], - [ - -0.11633762398586307, - 51.49068921258189 - ], - [ - -0.11640457604745948, - 51.49071478749351 - ], - [ - -0.11644457599020504, - 51.4906741876136 - ], - [ - -0.11637762392860862, - 51.49064861270198 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 33, - "osm_way_ids": [ - 784643057 - ], - "src_i": 31, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2116,7 +2002,7 @@ "osm_way_ids": [ 1068255164 ], - "src_i": 33, + "src_i": 31, "type": "road" }, "type": "Feature" @@ -2852,48 +2738,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.1163700716736667, - 51.49065627852048 - ], - [ - -0.11635845948591894, - 51.49063298069151 - ], - [ - -0.11647772994166646, - 51.49067408329228 - ], - [ - -0.11643702373526311, - 51.4906818534321 - ], - [ - -0.1163700716736667, - 51.49065627852048 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 31, - "intersection_kind": "Connection", - "movements": [ - "Road #187 -> Road #108" - ], - "osm_node_ids": [ - 8013569055 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2907,20 +2751,24 @@ 51.49075146363268 ], [ - -0.11630657871526132, - 51.49071839557233 + -0.11631020969038543, + 51.49072578619838 ], [ - -0.11636772468298384, - 51.49065865902513 + -0.11621869582967975, + 51.49068370333692 ], [ - -0.11637408683311182, - 51.490652202794365 + -0.11627944750296756, + 51.49062381120706 ], [ - -0.11644103889470823, - 51.49067777770598 + -0.11635845948591894, + 51.49063298069151 + ], + [ + -0.11647772994166646, + 51.49067408329228 ], [ -0.11644103889470823, @@ -2932,15 +2780,22 @@ }, "properties": { "control": "Signed", - "id": 33, + "id": 31, "intersection_kind": "Intersection", "movements": [ - "Road #188 -> Road #93", - "Road #93 -> Road #188", - "Road #108 -> Road #188", - "Road #108 -> Road #93" + "Road #188 -> Road #12", + "Road #188 -> Road #92", + "Road #12 -> Road #188", + "Road #12 -> Road #92", + "Road #92 -> Road #188", + "Road #92 -> Road #12", + "Road #187 -> Road #188", + "Road #187 -> Road #12", + "Road #187 -> Road #92" ], "osm_node_ids": [ + 8013569055, + 2246184959, 25502865 ], "type": "intersection" @@ -2987,57 +2842,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.11637615507351665, - 51.490662004502 - ], - [ - -0.1163150091057941, - 51.4907217410492 - ], - [ - -0.11631020969038543, - 51.49072578619838 - ], - [ - -0.11621869582967975, - 51.49068370333692 - ], - [ - -0.11627944750296756, - 51.49062381120706 - ], - [ - -0.11637615507351665, - 51.490662004502 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 36, - "intersection_kind": "Intersection", - "movements": [ - "Road #93 -> Road #12", - "Road #93 -> Road #92", - "Road #12 -> Road #93", - "Road #12 -> Road #92", - "Road #92 -> Road #93", - "Road #92 -> Road #12" - ], - "osm_node_ids": [ - 2246184959 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -3422,11 +3226,23 @@ "coordinates": [ [ [ - -0.11539857495988047, - 51.4889341322487 + -0.1154091082540651, + 51.48892317401331 + ], + [ + -0.11534592004337299, + 51.488998386088994 + ], + [ + -0.11534220818733919, + 51.48899717650126 ], [ - -0.11533116649886511, + -0.11527272570871118, + 51.488974365205344 + ], + [ + -0.11533116938746903, 51.48890902498439 ], [ @@ -3442,63 +3258,7 @@ 51.488904565247886 ], [ - -0.11541652907752878, - 51.48891544434296 - ], - [ - -0.11539857495988047, - 51.4889341322487 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 55, - "intersection_kind": "Fork", - "movements": [ - "Road #83 -> Road #52", - "Road #83 -> Road #84", - "Road #52 -> Road #84" - ], - "osm_node_ids": [ - 4673133618 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.11540910680976314, - 51.48892317401331 - ], - [ - -0.11534591859907103, - 51.488998386088994 - ], - [ - -0.11534220674303723, - 51.48899717740058 - ], - [ - -0.11527272570871118, - 51.488974365205344 - ], - [ - -0.11534169834874777, - 51.488898064950355 - ], - [ - -0.11540910392115922, - 51.48892317221466 - ], - [ - -0.11540910680976314, + -0.1154091082540651, 51.48892317401331 ] ] @@ -3508,13 +3268,17 @@ "properties": { "control": "Signed", "id": 56, - "intersection_kind": "Fork", + "intersection_kind": "Intersection", "movements": [ "Road #82 -> Road #11", - "Road #82 -> Road #83" + "Road #82 -> Road #52", + "Road #82 -> Road #84", + "Road #52 -> Road #11", + "Road #52 -> Road #84" ], "osm_node_ids": [ - 25504033 + 25504033, + 4673133618 ], "type": "intersection" }, diff --git a/tests/src/cycleway_rejoin_road/road_network.dot b/tests/src/cycleway_rejoin_road/road_network.dot index 86a2a7ec..d98f162d 100644 --- a/tests/src/cycleway_rejoin_road/road_network.dot +++ b/tests/src/cycleway_rejoin_road/road_network.dot @@ -15,86 +15,79 @@ digraph { 13 [ label = "Uncontrolled RoadIntersection" ] 14 [ label = "Slice" ] 15 [ label = "Slice" ] - 16 [ label = "Slice" ] - 17 [ label = "Uncontrolled RoadIntersection" ] - 18 [ label = "MapEdge" ] - 19 [ label = "Uncontrolled RoadIntersection" ] + 16 [ label = "Uncontrolled RoadIntersection" ] + 17 [ label = "MapEdge" ] + 18 [ label = "Slice" ] + 19 [ label = "Slice" ] 20 [ label = "Slice" ] - 21 [ label = "Slice" ] + 21 [ label = "MapEdge" ] 22 [ label = "Slice" ] - 23 [ label = "MapEdge" ] - 24 [ label = "Slice" ] + 23 [ label = "Slice" ] + 24 [ label = "MapEdge" ] 25 [ label = "Slice" ] - 26 [ label = "MapEdge" ] - 27 [ label = "Slice" ] + 26 [ label = "Slice" ] + 27 [ label = "Uncontrolled RoadIntersection" ] 28 [ label = "Slice" ] - 29 [ label = "Merge" ] - 30 [ label = "Merge" ] - 31 [ label = "Slice" ] - 32 [ label = "Slice" ] - 33 [ label = "MapEdge" ] - 34 [ label = "Uncontrolled RoadIntersection" ] - 35 [ label = "Terminus" ] - 36 [ label = "Uncontrolled RoadIntersection" ] - 37 [ label = "Slice" ] - 38 [ label = "MapEdge" ] + 29 [ label = "Slice" ] + 30 [ label = "MapEdge" ] + 31 [ label = "Uncontrolled RoadIntersection" ] + 32 [ label = "Terminus" ] + 33 [ label = "Uncontrolled RoadIntersection" ] + 34 [ label = "Slice" ] + 35 [ label = "MapEdge" ] + 36 [ label = "Slice" ] + 37 [ label = "MapEdge" ] + 38 [ label = "Uncontrolled RoadIntersection" ] 39 [ label = "Slice" ] - 40 [ label = "MapEdge" ] - 41 [ label = "Uncontrolled RoadIntersection" ] - 42 [ label = "Slice" ] - 43 [ label = "Slice" ] + 40 [ label = "Slice" ] + 41 [ label = "MapEdge" ] + 42 [ label = "MapEdge" ] + 43 [ label = "MapEdge" ] 44 [ label = "MapEdge" ] - 45 [ label = "MapEdge" ] - 46 [ label = "MapEdge" ] - 47 [ label = "MapEdge" ] - 41 -> 34 [ label = "2 lanes" ] - 46 -> 42 [ label = "2 lanes" ] - 42 -> 46 [ label = "2 lanes" ] - 42 -> 41 [ label = "2 lanes" ] - 41 -> 42 [ label = "2 lanes" ] + 38 -> 31 [ label = "2 lanes" ] + 43 -> 39 [ label = "2 lanes" ] + 39 -> 43 [ label = "2 lanes" ] + 39 -> 38 [ label = "2 lanes" ] + 38 -> 39 [ label = "2 lanes" ] 6 -> 13 [ label = "5 lanes" ] - 30 -> 24 [ label = "5 lanes" ] + 27 -> 22 [ label = "5 lanes" ] + 16 -> 19 [ label = "2 lanes" ] + 19 -> 16 [ label = "2 lanes" ] 19 -> 21 [ label = "2 lanes" ] 21 -> 19 [ label = "2 lanes" ] - 21 -> 23 [ label = "2 lanes" ] - 23 -> 21 [ label = "2 lanes" ] - 36 -> 40 [ label = "2 lanes" ] - 40 -> 36 [ label = "2 lanes" ] - 34 -> 38 [ label = "2 lanes" ] - 38 -> 34 [ label = "2 lanes" ] + 33 -> 37 [ label = "2 lanes" ] + 37 -> 33 [ label = "2 lanes" ] + 31 -> 35 [ label = "2 lanes" ] + 35 -> 31 [ label = "2 lanes" ] 2 -> 3 [ label = "2 lanes" ] 3 -> 2 [ label = "2 lanes" ] 3 -> 5 [ label = "2 lanes" ] 5 -> 3 [ label = "2 lanes" ] 5 -> 6 [ label = "2 lanes" ] 6 -> 5 [ label = "2 lanes" ] - 34 -> 32 [ label = "5 lanes" ] + 31 -> 29 [ label = "5 lanes" ] 1 -> 7 [ label = "1 lanes" ] - 29 -> 35 [ label = "1 lanes" ] - 35 -> 29 [ label = "1 lanes" ] + 27 -> 32 [ label = "1 lanes" ] + 32 -> 27 [ label = "1 lanes" ] 15 -> 14 [ label = "1 lanes" ] 11 -> 14 [ label = "5 lanes" ] - 13 -> 31 [ label = "3 lanes" ] - 24 -> 20 [ label = "3 lanes" ] - 20 -> 9 [ label = "3 lanes" ] + 13 -> 28 [ label = "3 lanes" ] + 22 -> 18 [ label = "3 lanes" ] + 18 -> 9 [ label = "3 lanes" ] 9 -> 3 [ label = "3 lanes" ] - 31 -> 34 [ label = "5 lanes" ] - 32 -> 30 [ label = "3 lanes" ] - 30 -> 29 [ label = "3 lanes" ] - 29 -> 26 [ label = "3 lanes" ] - 34 -> 39 [ label = "1 lanes" ] - 41 -> 39 [ label = "2 lanes" ] - 39 -> 41 [ label = "2 lanes" ] - 39 -> 37 [ label = "2 lanes" ] - 37 -> 39 [ label = "2 lanes" ] - 37 -> 36 [ label = "2 lanes" ] - 36 -> 37 [ label = "2 lanes" ] - 36 -> 19 [ label = "2 lanes" ] - 19 -> 36 [ label = "2 lanes" ] - 19 -> 17 [ label = "2 lanes" ] - 17 -> 19 [ label = "2 lanes" ] + 28 -> 31 [ label = "5 lanes" ] + 29 -> 27 [ label = "3 lanes" ] + 27 -> 24 [ label = "3 lanes" ] + 31 -> 36 [ label = "1 lanes" ] + 38 -> 36 [ label = "2 lanes" ] + 36 -> 38 [ label = "2 lanes" ] + 36 -> 34 [ label = "2 lanes" ] + 34 -> 36 [ label = "2 lanes" ] + 34 -> 33 [ label = "2 lanes" ] + 33 -> 34 [ label = "2 lanes" ] + 33 -> 16 [ label = "2 lanes" ] + 16 -> 33 [ label = "2 lanes" ] 14 -> 15 [ label = "2 lanes" ] - 16 -> 17 [ label = "3 lanes" ] 6 -> 7 [ label = "2 lanes" ] 7 -> 6 [ label = "2 lanes" ] 7 -> 8 [ label = "2 lanes" ] @@ -103,22 +96,22 @@ digraph { 11 -> 8 [ label = "2 lanes" ] 13 -> 10 [ label = "1 lanes" ] 10 -> 13 [ label = "1 lanes" ] - 47 -> 43 [ label = "1 lanes" ] - 43 -> 37 [ label = "1 lanes" ] - 43 -> 42 [ label = "1 lanes" ] - 33 -> 25 [ label = "1 lanes" ] - 25 -> 21 [ label = "1 lanes" ] - 45 -> 27 [ label = "1 lanes" ] - 27 -> 25 [ label = "1 lanes" ] - 27 -> 28 [ label = "1 lanes" ] - 44 -> 22 [ label = "1 lanes" ] + 44 -> 40 [ label = "1 lanes" ] + 40 -> 34 [ label = "1 lanes" ] + 40 -> 39 [ label = "1 lanes" ] + 30 -> 23 [ label = "1 lanes" ] + 23 -> 19 [ label = "1 lanes" ] + 42 -> 25 [ label = "1 lanes" ] + 25 -> 23 [ label = "1 lanes" ] + 25 -> 26 [ label = "1 lanes" ] + 41 -> 20 [ label = "1 lanes" ] 8 -> 4 [ label = "1 lanes" ] 4 -> 8 [ label = "1 lanes" ] 0 -> 5 [ label = "1 lanes" ] 5 -> 0 [ label = "1 lanes" ] 10 -> 9 [ label = "1 lanes" ] - 20 -> 18 [ label = "1 lanes" ] + 18 -> 17 [ label = "1 lanes" ] 15 -> 16 [ label = "5 lanes" ] - 17 -> 12 [ label = "2 lanes" ] - 12 -> 17 [ label = "3 lanes" ] + 16 -> 12 [ label = "2 lanes" ] + 12 -> 16 [ label = "3 lanes" ] } diff --git a/tests/src/kingsway_junction/geometry.json b/tests/src/kingsway_junction/geometry.json index ff8a7767..11543762 100644 --- a/tests/src/kingsway_junction/geometry.json +++ b/tests/src/kingsway_junction/geometry.json @@ -167,7 +167,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 82, + "dst_i": 84, "osm_way_ids": [ 4852875 ], @@ -263,7 +263,7 @@ "osm_way_ids": [ 4905402 ], - "src_i": 54, + "src_i": 64, "type": "road" }, "type": "Feature" @@ -421,44 +421,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.307724360988972, - 53.44528818016909 - ], - [ - -2.30763146045, - 53.445255180462524 - ], - [ - -2.3075705394399177, - 53.44531601956836 - ], - [ - -2.307663439978889, - 53.44534901927493 - ], - [ - -2.307724360988972, - 53.44528818016909 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 40, - "osm_way_ids": [ - 60007839 - ], - "src_i": 37, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -492,7 +454,7 @@ "osm_way_ids": [ 60007839 ], - "src_i": 40, + "src_i": 37, "type": "road" }, "type": "Feature" @@ -538,7 +500,7 @@ "osm_way_ids": [ 60577044 ], - "src_i": 82, + "src_i": 84, "type": "road" }, "type": "Feature" @@ -652,7 +614,7 @@ "osm_way_ids": [ 60577052 ], - "src_i": 54, + "src_i": 64, "type": "road" }, "type": "Feature" @@ -686,7 +648,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 54, + "dst_i": 64, "osm_way_ids": [ 60577053 ], @@ -858,7 +820,7 @@ "osm_way_ids": [ 81981154 ], - "src_i": 86, + "src_i": 89, "type": "road" }, "type": "Feature" @@ -1022,7 +984,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 86, + "dst_i": 89, "osm_way_ids": [ 81981181 ], @@ -1150,24 +1112,24 @@ "coordinates": [ [ [ - -2.3047466816576034, - 53.44561769519842 + -2.304746678637675, + 53.44561769699707 ], [ -2.3046303947952254, - 53.44572012253205 + 53.44572012343137 ], [ - -2.3047289199503314, - 53.44575980239942 + -2.304728922970259, + 53.4457598015001 ], [ -2.304845206812709, 53.44565737506579 ], [ - -2.3047466816576034, - 53.44561769519842 + -2.304746678637675, + 53.44561769699707 ] ] ], @@ -1178,7 +1140,7 @@ "osm_way_ids": [ 112414473 ], - "src_i": 132, + "src_i": 129, "type": "road" }, "type": "Feature" @@ -1288,7 +1250,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 132, + "dst_i": 129, "osm_way_ids": [ 112414483 ], @@ -1330,45 +1292,7 @@ "osm_way_ids": [ 112414483 ], - "src_i": 132, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.305456085423826, - 53.445906300987765 - ], - [ - -2.3054724851435138, - 53.44585850114572 - ], - [ - -2.3053985150239993, - 53.44584949893657 - ], - [ - -2.3053821153043117, - 53.44589729877861 - ], - [ - -2.305456085423826, - 53.445906300987765 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 109, - "osm_way_ids": [ - 217211130 - ], - "src_i": 113, + "src_i": 129, "type": "road" }, "type": "Feature" @@ -1406,45 +1330,7 @@ "osm_way_ids": [ 217211130 ], - "src_i": 109, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.305525262917405, - 53.445730417066336 - ], - [ - -2.3055487624881166, - 53.44568781710175 - ], - [ - -2.3054770361751995, - 53.44567378228896 - ], - [ - -2.305453536604488, - 53.44571638225354 - ], - [ - -2.305525262917405, - 53.445730417066336 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 106, - "osm_way_ids": [ - 217211130 - ], - "src_i": 108, + "src_i": 113, "type": "road" }, "type": "Feature" @@ -2216,44 +2102,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.306434925667473, - 53.44602726603741 - ], - [ - -2.30646762544922, - 53.44595946618244 - ], - [ - -2.306409573370857, - 53.44594953407476 - ], - [ - -2.30637687358911, - 53.446017333929724 - ], - [ - -2.306434925667473, - 53.44602726603741 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 82, - "osm_way_ids": [ - 288281502 - ], - "src_i": 84, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2406,44 +2254,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.3048140970231206, - 53.44557001406683 - ], - [ - -2.304778996398514, - 53.445612713856114 - ], - [ - -2.3048468028447235, - 53.44563248634068 - ], - [ - -2.3048819034693304, - 53.445589786551395 - ], - [ - -2.3048140970231206, - 53.44557001406683 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 132, - "osm_way_ids": [ - 413175085 - ], - "src_i": 129, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2953,7 +2763,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 54, + "dst_i": 64, "osm_way_ids": [ 690683796 ], @@ -3046,44 +2856,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.3070077169450673, - 53.446027027717186 - ], - [ - -2.3071244175375982, - 53.446050827363855 - ], - [ - -2.307169982213161, - 53.445971571950416 - ], - [ - -2.30705328162063, - 53.445947772303754 - ], - [ - -2.3070077169450673, - 53.446027027717186 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 54, - "osm_way_ids": [ - 690683799 - ], - "src_i": 64, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -3189,7 +2961,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 109, + "dst_i": 113, "osm_way_ids": [ 773118442 ], @@ -3269,7 +3041,7 @@ "osm_way_ids": [ 965055858 ], - "src_i": 109, + "src_i": 113, "type": "road" }, "type": "Feature" @@ -3433,7 +3205,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 82, + "dst_i": 84, "osm_way_ids": [ 999493421 ], @@ -3556,45 +3328,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.306352637155936, - 53.445782153239 - ], - [ - -2.3063632371036578, - 53.44575785356953 - ], - [ - -2.306290163902797, - 53.44574654729845 - ], - [ - -2.306279563955075, - 53.44577084696792 - ], - [ - -2.306352637155936, - 53.445782153239 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 86, - "osm_way_ids": [ - 1007914061, - 965055861 - ], - "src_i": 89, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -3868,12 +3601,12 @@ 53.445971696956114 ], [ - -2.3054637620811222, - 53.44588393485972 + -2.3054637635910864, + 53.44588393575904 ], [ - -2.3054497767939712, - 53.44592812212692 + -2.3054497783039354, + 53.44592812302624 ], [ -2.3062281073997384, @@ -4007,7 +3740,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 40, + "dst_i": 37, "osm_way_ids": [ 1007914071 ], @@ -4049,7 +3782,7 @@ "osm_way_ids": [ 1007914071 ], - "src_i": 40, + "src_i": 37, "type": "road" }, "type": "Feature" @@ -4063,11 +3796,11 @@ 53.44568090671462 ], [ - -2.3054644204254537, + -2.3054644219354175, 53.44569664843981 ], [ - -2.305483050362062, + -2.305483051872026, 53.44565307271129 ], [ @@ -4083,7 +3816,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 106, + "dst_i": 108, "osm_way_ids": [ 1016864436 ], @@ -4141,7 +3874,7 @@ "osm_way_ids": [ 1016864436 ], - "src_i": 106, + "src_i": 108, "type": "road" }, "type": "Feature" @@ -4189,7 +3922,7 @@ "coordinates": [ [ [ - -2.305389708913584, + -2.3053897104235483, 53.44587516917215 ], [ @@ -4201,11 +3934,11 @@ 53.44589394790635 ], [ - -2.305374252921436, + -2.3053742544314, 53.4459191837696 ], [ - -2.305389708913584, + -2.3053897104235483, 53.44587516917215 ] ] @@ -4513,6 +4246,14 @@ "geometry": { "coordinates": [ [ + [ + -2.3076461720298656, + 53.44526040731963 + ], + [ + -2.30778354856031, + 53.44531299604916 + ], [ -2.3077492678461895, 53.44534442733887 @@ -4522,20 +4263,32 @@ 53.44528445517905 ], [ - -2.307585252529747, - 53.445321246425465 + -2.3075792685421654, + 53.445319606062874 ], [ - -2.3076461765597576, - 53.44526040731963 + -2.3075545745898802, + 53.44530925127404 ], [ - -2.30778354856031, - 53.44531299604916 + -2.307552743003472, + 53.445308451777144 ], [ - -2.3077492678461895, - 53.44534442733887 + -2.3076230227708168, + 53.44525130348713 + ], + [ + -2.3076235935372327, + 53.44525081785347 + ], + [ + -2.3076482995692302, + 53.445261161850446 + ], + [ + -2.3076461720298656, + 53.44526040731963 ] ] ], @@ -4546,12 +4299,13 @@ "id": 37, "intersection_kind": "Fork", "movements": [ - "Road #127 -> Road #31", "Road #127 -> Road #135", - "Road #31 -> Road #135" + "Road #127 -> Road #32", + "Road #32 -> Road #135" ], "osm_node_ids": [ - 955166004 + 955166004, + 9298401919 ], "type": "intersection" }, @@ -4652,75 +4406,12 @@ "coordinates": [ [ [ - -2.307648301079194, - 53.445261162749766 + -2.3056885927101636, + 53.44519814188975 ], [ - -2.3075873800691116, - 53.4453220018556 - ], - [ - -2.3075796747224984, - 53.445319264320666 - ], - [ - -2.3075792700521296, - 53.445319606062874 - ], - [ - -2.3075545760998444, - 53.44530925127404 - ], - [ - -2.307552743003472, - 53.445308451777144 - ], - [ - -2.3076230227708168, - 53.44525130348713 - ], - [ - -2.3076235935372327, - 53.44525081785347 - ], - [ - -2.3076482995692302, - 53.445261161850446 - ], - [ - -2.307648301079194, - 53.445261162749766 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 40, - "intersection_kind": "Connection", - "movements": [ - "Road #31 -> Road #32", - "Road #32 -> Road #31" - ], - "osm_node_ids": [ - 9298401919 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.3056885927101636, - 53.44519814188975 - ], - [ - -2.3057541553497756, - 53.4452204378707 + -2.3057541553497756, + 53.4452204378707 ], [ -2.305720135859438, @@ -5267,79 +4958,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.307264146592053, - 53.44599419168715 - ], - [ - -2.307211587762951, - 53.44606271459668 - ], - [ - -2.3071653828626255, - 53.44605014298012 - ], - [ - -2.307143597101126, - 53.44606911686711 - ], - [ - -2.3070578855010577, - 53.44603420520283 - ], - [ - -2.3070268330901036, - 53.446040199181255 - ], - [ - -2.307021155625227, - 53.44602976884941 - ], - [ - -2.307066718790826, - 53.44595051163733 - ], - [ - -2.307141043751895, - 53.445965668803474 - ], - [ - -2.3071644753742238, - 53.445947808276614 - ], - [ - -2.3072641450820894, - 53.44599419168715 - ], - [ - -2.307264146592053, - 53.44599419168715 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 54, - "intersection_kind": "Intersection", - "movements": [ - "Road #137 -> Road #5", - "Road #140 -> Road #5", - "Road #140 -> Road #43", - "Road #44 -> Road #43" - ], - "osm_node_ids": [ - 21653578 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -5638,16 +5256,32 @@ "coordinates": [ [ [ - -2.3071043652148426, - 53.4459581900451 + -2.307264146592053, + 53.44599419168715 + ], + [ + -2.307211587762951, + 53.44606271459668 + ], + [ + -2.3071653828626255, + 53.44605014298012 + ], + [ + -2.307143597101126, + 53.44606911686711 + ], + [ + -2.3070578855010577, + 53.44603420520283 ], [ - -2.30705880053928, - 53.446037445458536 + -2.3070268330901036, + 53.446040199181255 ], [ - -2.307013468398183, - 53.44602820043254 + -2.307021155625227, + 53.44602976884941 ], [ -2.306985150532147, @@ -5670,8 +5304,16 @@ 53.44595818914578 ], [ - -2.3071043652148426, - 53.4459581900451 + -2.3071644753742238, + 53.445947808276614 + ], + [ + -2.3072641450820894, + 53.44599419168715 + ], + [ + -2.307264146592053, + 53.44599419168715 ] ] ], @@ -5682,11 +5324,13 @@ "id": 64, "intersection_kind": "Intersection", "movements": [ - "Road #40 -> Road #140", - "Road #128 -> Road #139" + "Road #137 -> Road #5", + "Road #128 -> Road #139", + "Road #44 -> Road #43" ], "osm_node_ids": [ - 6480352153 + 6480352153, + 21653578 ], "type": "intersection" }, @@ -6271,64 +5915,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.3065541901789834, - 53.44594036009517 - ], - [ - -2.3065225352923684, - 53.446013296875094 - ], - [ - -2.3064722142300074, - 53.446032172736025 - ], - [ - -2.3064449805181684, - 53.44600641976286 - ], - [ - -2.3064424966272847, - 53.446011568378985 - ], - [ - -2.3063844445489217, - 53.446001636271305 - ], - [ - -2.3064213405207994, - 53.445910939688545 - ], - [ - -2.3065541901789834, - 53.44594036009517 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 82, - "intersection_kind": "Intersection", - "movements": [ - "Road #160 -> Road #92", - "Road #160 -> Road #38", - "Road #3 -> Road #92", - "Road #3 -> Road #38", - "Road #92 -> Road #38" - ], - "osm_node_ids": [ - 2918402992 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -6373,6 +5959,22 @@ "geometry": { "coordinates": [ [ + [ + -2.3065541901789834, + 53.44594036009517 + ], + [ + -2.3065225352923684, + 53.446013296875094 + ], + [ + -2.3064722142300074, + 53.446032172736025 + ], + [ + -2.306472855964734, + 53.4460327797781 + ], [ -2.3064699553237693, 53.44603087681361 @@ -6394,31 +5996,35 @@ 53.44599526637645 ], [ - -2.3063872787514677, - 53.44599576100333 + -2.306384446058886, + 53.446001636271305 ], [ - -2.3064453308298307, - 53.44600569311101 + -2.3064213405207994, + 53.445910939688545 ], [ - -2.3064699553237693, - 53.44603087681361 + -2.3065541901789834, + 53.44594036009517 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 84, - "intersection_kind": "Connection", + "intersection_kind": "Intersection", "movements": [ - "Road #91 -> Road #92", - "Road #92 -> Road #91" + "Road #160 -> Road #91", + "Road #160 -> Road #38", + "Road #3 -> Road #91", + "Road #3 -> Road #38", + "Road #91 -> Road #38" ], "osm_node_ids": [ - 6480352139 + 6480352139, + 2918402992 ], "type": "intersection" }, @@ -6473,28 +6079,24 @@ "coordinates": [ [ [ - -2.3063575445391407, - 53.44577090542382 - ], - [ - -2.3062844713382793, - 53.4457595973541 + -2.3063343077021763, + 53.445575488237374 ], [ - -2.3062575894480672, - 53.445744845781995 + -2.306361893235642, + 53.445606336766694 ], [ - -2.306308750050447, - 53.445711777726984 + -2.306299030411774, + 53.44563123898163 ], [ - -2.3063806681288, - 53.445725457307745 + -2.306282685050793, + 53.44563930589633 ], [ - -2.3063575445391407, - 53.44577090542382 + -2.3063343077021763, + 53.445575488237374 ] ] ], @@ -6502,51 +6104,11 @@ }, "properties": { "control": "Signed", - "id": 86, - "intersection_kind": "Connection", + "id": 88, + "intersection_kind": "Terminus", "movements": [], "osm_node_ids": [ - 955166095 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.3063343077021763, - 53.445575488237374 - ], - [ - -2.306361893235642, - 53.445606336766694 - ], - [ - -2.306299030411774, - 53.44563123898163 - ], - [ - -2.306282685050793, - 53.44563930589633 - ], - [ - -2.3063343077021763, - 53.445575488237374 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 88, - "intersection_kind": "Terminus", - "movements": [], - "osm_node_ids": [ - 955165990 + 955165990 ], "type": "intersection" }, @@ -6573,8 +6135,20 @@ 53.44574927134356 ], [ - -2.3062894647894354, - 53.445748148990205 + -2.306256937143592, + 53.445744487852 + ], + [ + -2.3062575894480672, + 53.445744845781995 + ], + [ + -2.306308750050447, + 53.445711777726984 + ], + [ + -2.3063806681288, + 53.445725457307745 ], [ -2.306362537990297, @@ -6590,7 +6164,8 @@ "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 955165980 + 955165980, + 955166095 ], "type": "intersection" }, @@ -7040,50 +6615,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.305542787560319, - 53.445658986650095 - ], - [ - -2.305539879369534, - 53.44570391855557 - ], - [ - -2.3055361482483345, - 53.4457106832526 - ], - [ - -2.3054644219354175, - 53.44569664843981 - ], - [ - -2.305483048852098, - 53.44565307271129 - ], - [ - -2.305542787560319, - 53.445658986650095 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 106, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 9298401787 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -7137,12 +6668,12 @@ "coordinates": [ [ [ - -2.3055482068213413, - 53.44568882164397 + -2.3055482128611975, + 53.44568882074465 ], [ - -2.3055173069167574, - 53.445757799610234 + -2.305517300876901, + 53.445757798710915 ], [ -2.305514273398955, @@ -7161,20 +6692,24 @@ 53.44567670508414 ], [ - -2.3054753646449817, - 53.44567681030476 + -2.3054644204254537, + 53.44569664843981 + ], + [ + -2.305483050362062, + 53.44565307271129 ], [ - -2.3054764850383163, - 53.445674779636605 + -2.305542787560319, + 53.445658986650095 ], [ - -2.305548205311377, - 53.4456888270399 + -2.305539879369534, + 53.44570391855557 ], [ - -2.3055482068213413, - 53.44568882164397 + -2.3055482128611975, + 53.44568882074465 ] ] ], @@ -7188,69 +6723,8 @@ "Road #159 -> Road #0" ], "osm_node_ids": [ - 9298401799 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.3054819193989786, - 53.445835708739246 - ], - [ - -2.3054686437949377, - 53.44589250809248 - ], - [ - -2.3054610335760604, - 53.44589187676872 - ], - [ - -2.3054606304156557, - 53.44589305398068 - ], - [ - -2.3053866602961413, - 53.44588405177153 - ], - [ - -2.3054065812520235, - 53.445827944895925 - ], - [ - -2.305407340763947, - 53.445828040224015 - ], - [ - -2.3054086061138315, - 53.445824975336016 - ], - [ - -2.3054819209089428, - 53.445835709638565 - ], - [ - -2.3054819193989786, - 53.445835708739246 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 109, - "intersection_kind": "Connection", - "movements": [ - "Road #146 -> Road #153" - ], - "osm_node_ids": [ - 2265010779 + 9298401799, + 9298401787 ], "type": "intersection" }, @@ -7303,31 +6777,47 @@ "coordinates": [ [ [ - -2.305463760571158, + -2.3054637620811222, 53.44588393485972 ], [ - -2.305449775284007, + -2.3054497767939712, 53.44592812212692 ], [ - -2.305374251411472, + -2.305374252921436, 53.4459191837696 ], [ - -2.30538970740362, + -2.305389708913584, 53.44587516917215 ], [ - -2.3053897889416795, - 53.44587493265057 + -2.305386661806105, + 53.44588405177153 ], [ - -2.305463759061194, - 53.44588393485972 + -2.3054065812520235, + 53.445827944895925 ], [ - -2.305463760571158, + -2.305407340763947, + 53.445828040224015 + ], + [ + -2.3054086061138315, + 53.445824975336016 + ], + [ + -2.3054819209089428, + 53.445835709638565 + ], + [ + -2.3054686437949377, + 53.44589250809248 + ], + [ + -2.3054637620811222, 53.44588393485972 ] ] @@ -7335,12 +6825,15 @@ "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 113, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #146 -> Road #153" + ], "osm_node_ids": [ - 9298401802 + 9298401802, + 2265010779 ], "type": "intersection" }, @@ -7719,16 +7212,24 @@ "coordinates": [ [ [ - -2.3048870388571085, - 53.44556261984469 + -2.3048747794588818, + 53.445588186658284 ], [ - -2.304868414960356, - 53.4456061955732 + -2.3048452113426015, + 53.44565737326715 + ], + [ + -2.3047466801476393, + 53.44561769519842 ], [ - -2.30486039252129, - 53.445615954111815 + -2.304774969324358, + 53.445646262148855 + ], + [ + -2.3048078563416485, + 53.445577609737015 ], [ -2.3047925860750804, @@ -7753,6 +7254,14 @@ [ -2.3048870388571085, 53.44556261984469 + ], + [ + -2.304868414960356, + 53.4456061955732 + ], + [ + -2.3048747794588818, + 53.445588186658284 ] ] ], @@ -7761,10 +7270,15 @@ "properties": { "control": "Signed", "id": 129, - "intersection_kind": "Connection", - "movements": [], + "intersection_kind": "Intersection", + "movements": [ + "Road #59 -> Road #63", + "Road #62 -> Road #63", + "Road #62 -> Road #59" + ], "osm_node_ids": [ - 6439595293 + 6439595293, + 4145063897 ], "type": "intersection" }, @@ -7810,58 +7324,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -2.3048747794588818, - 53.445588186658284 - ], - [ - -2.3048452113426015, - 53.44565737326715 - ], - [ - -2.3047466801476393, - 53.44561769519842 - ], - [ - -2.304774969324358, - 53.445646262148855 - ], - [ - -2.3048078563416485, - 53.445577609737015 - ], - [ - -2.30487565976793, - 53.44559738222158 - ], - [ - -2.3048747794588818, - 53.445588186658284 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 132, - "intersection_kind": "Intersection", - "movements": [ - "Road #59 -> Road #63", - "Road #62 -> Road #63", - "Road #62 -> Road #59" - ], - "osm_node_ids": [ - 4145063897 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ diff --git a/tests/src/kingsway_junction/road_network.dot b/tests/src/kingsway_junction/road_network.dot index 8c0dcc06..f28af32f 100644 --- a/tests/src/kingsway_junction/road_network.dot +++ b/tests/src/kingsway_junction/road_network.dot @@ -9,57 +9,57 @@ digraph { 7 [ label = "Merge" ] 8 [ label = "Slice" ] 9 [ label = "MapEdge" ] - 10 [ label = "Slice" ] - 11 [ label = "MapEdge" ] + 10 [ label = "MapEdge" ] + 11 [ label = "Merge" ] 12 [ label = "Merge" ] - 13 [ label = "Merge" ] + 13 [ label = "Slice" ] 14 [ label = "Slice" ] 15 [ label = "Slice" ] 16 [ label = "Slice" ] - 17 [ label = "Slice" ] - 18 [ label = "Merge" ] - 19 [ label = "MapEdge" ] - 20 [ label = "Slice" ] - 21 [ label = "MapEdge" ] + 17 [ label = "Merge" ] + 18 [ label = "MapEdge" ] + 19 [ label = "Slice" ] + 20 [ label = "MapEdge" ] + 21 [ label = "Slice" ] 22 [ label = "Slice" ] 23 [ label = "Slice" ] - 24 [ label = "Lights RoadIntersection" ] - 25 [ label = "Slice" ] + 24 [ label = "Slice" ] + 25 [ label = "Merge" ] 26 [ label = "Slice" ] - 27 [ label = "Merge" ] + 27 [ label = "Lights RoadIntersection" ] 28 [ label = "Slice" ] 29 [ label = "Lights RoadIntersection" ] 30 [ label = "Slice" ] - 31 [ label = "Lights RoadIntersection" ] + 31 [ label = "Slice" ] 32 [ label = "Slice" ] - 33 [ label = "Slice" ] - 34 [ label = "Slice" ] - 35 [ label = "Lights RoadIntersection" ] + 33 [ label = "Lights RoadIntersection" ] + 34 [ label = "Lights RoadIntersection" ] + 35 [ label = "Slice" ] 36 [ label = "Lights RoadIntersection" ] 37 [ label = "Slice" ] - 38 [ label = "Lights RoadIntersection" ] - 39 [ label = "Slice" ] - 40 [ label = "MapEdge" ] - 41 [ label = "Merge" ] - 42 [ label = "Merge" ] - 43 [ label = "Slice" ] - 44 [ label = "Lights RoadIntersection" ] - 45 [ label = "Slice" ] + 38 [ label = "MapEdge" ] + 39 [ label = "Merge" ] + 40 [ label = "Merge" ] + 41 [ label = "Slice" ] + 42 [ label = "Slice" ] + 43 [ label = "Lights RoadIntersection" ] + 44 [ label = "Slice" ] + 45 [ label = "Terminus" ] 46 [ label = "Slice" ] - 47 [ label = "Slice" ] - 48 [ label = "Slice" ] + 47 [ label = "Terminus" ] + 48 [ label = "Uncontrolled RoadIntersection" ] 49 [ label = "Terminus" ] 50 [ label = "Slice" ] - 51 [ label = "Terminus" ] - 52 [ label = "Uncontrolled RoadIntersection" ] - 53 [ label = "Terminus" ] + 51 [ label = "Slice" ] + 52 [ label = "MapEdge" ] + 53 [ label = "Slice" ] 54 [ label = "Slice" ] - 55 [ label = "Slice" ] + 55 [ label = "Merge" ] 56 [ label = "MapEdge" ] 57 [ label = "Slice" ] 58 [ label = "Slice" ] - 59 [ label = "Merge" ] - 60 [ label = "MapEdge" ] + 59 [ label = "Slice" ] + 60 [ label = "Slice" ] 61 [ label = "Slice" ] 62 [ label = "Slice" ] 63 [ label = "Slice" ] @@ -67,136 +67,120 @@ digraph { 65 [ label = "Slice" ] 66 [ label = "Slice" ] 67 [ label = "Slice" ] - 68 [ label = "Slice" ] + 68 [ label = "MapEdge" ] 69 [ label = "Slice" ] - 70 [ label = "Slice" ] + 70 [ label = "Uncontrolled RoadIntersection" ] 71 [ label = "Slice" ] 72 [ label = "Slice" ] - 73 [ label = "Slice" ] + 73 [ label = "MapEdge" ] 74 [ label = "MapEdge" ] - 75 [ label = "Slice" ] - 76 [ label = "Slice" ] - 77 [ label = "Slice" ] - 78 [ label = "Uncontrolled RoadIntersection" ] - 79 [ label = "Slice" ] + 75 [ label = "MapEdge" ] + 76 [ label = "MapEdge" ] + 77 [ label = "MapEdge" ] + 78 [ label = "MapEdge" ] + 79 [ label = "MapEdge" ] 80 [ label = "MapEdge" ] 81 [ label = "MapEdge" ] - 82 [ label = "MapEdge" ] - 83 [ label = "MapEdge" ] - 84 [ label = "MapEdge" ] - 85 [ label = "MapEdge" ] - 86 [ label = "MapEdge" ] - 87 [ label = "MapEdge" ] - 88 [ label = "MapEdge" ] - 63 -> 59 [ label = "4 lanes" ] - 59 -> 27 [ label = "2 lanes" ] - 29 -> 35 [ label = "4 lanes" ] - 42 -> 44 [ label = "2 lanes" ] - 18 -> 13 [ label = "2 lanes" ] - 24 -> 13 [ label = "4 lanes" ] - 74 -> 72 [ label = "2 lanes" ] - 41 -> 37 [ label = "3 lanes" ] - 37 -> 9 [ label = "3 lanes" ] - 40 -> 52 [ label = "2 lanes" ] - 52 -> 40 [ label = "2 lanes" ] - 7 -> 10 [ label = "2 lanes" ] - 10 -> 7 [ label = "2 lanes" ] - 10 -> 21 [ label = "2 lanes" ] - 21 -> 10 [ label = "2 lanes" ] - 44 -> 57 [ label = "5 lanes" ] - 38 -> 36 [ label = "4 lanes" ] - 36 -> 31 [ label = "4 lanes" ] - 24 -> 29 [ label = "3 lanes" ] - 18 -> 24 [ label = "4 lanes" ] - 13 -> 3 [ label = "4 lanes" ] - 67 -> 62 [ label = "1 lanes" ] - 52 -> 49 [ label = "2 lanes" ] - 49 -> 52 [ label = "2 lanes" ] - 48 -> 49 [ label = "2 lanes" ] - 72 -> 69 [ label = "2 lanes" ] - 58 -> 62 [ label = "2 lanes" ] - 62 -> 54 [ label = "2 lanes" ] - 54 -> 48 [ label = "2 lanes" ] - 69 -> 67 [ label = "2 lanes" ] - 67 -> 58 [ label = "2 lanes" ] - 58 -> 11 [ label = "2 lanes" ] - 78 -> 88 [ label = "2 lanes" ] - 88 -> 78 [ label = "2 lanes" ] - 75 -> 65 [ label = "4 lanes" ] - 70 -> 79 [ label = "3 lanes" ] - 81 -> 78 [ label = "4 lanes" ] - 78 -> 75 [ label = "4 lanes" ] - 66 -> 64 [ label = "2 lanes" ] - 64 -> 63 [ label = "2 lanes" ] + 58 -> 55 [ label = "4 lanes" ] + 55 -> 25 [ label = "2 lanes" ] + 27 -> 33 [ label = "4 lanes" ] + 40 -> 43 [ label = "2 lanes" ] + 17 -> 12 [ label = "2 lanes" ] + 29 -> 12 [ label = "4 lanes" ] + 68 -> 66 [ label = "2 lanes" ] + 39 -> 35 [ label = "3 lanes" ] + 35 -> 9 [ label = "3 lanes" ] + 38 -> 48 [ label = "2 lanes" ] + 48 -> 38 [ label = "2 lanes" ] + 7 -> 20 [ label = "2 lanes" ] + 20 -> 7 [ label = "2 lanes" ] + 43 -> 53 [ label = "5 lanes" ] + 36 -> 34 [ label = "4 lanes" ] + 34 -> 29 [ label = "4 lanes" ] + 29 -> 27 [ label = "3 lanes" ] + 17 -> 29 [ label = "4 lanes" ] + 12 -> 3 [ label = "4 lanes" ] + 61 -> 57 [ label = "1 lanes" ] + 48 -> 45 [ label = "2 lanes" ] + 45 -> 48 [ label = "2 lanes" ] + 46 -> 45 [ label = "2 lanes" ] + 66 -> 63 [ label = "2 lanes" ] + 54 -> 57 [ label = "2 lanes" ] + 57 -> 50 [ label = "2 lanes" ] + 50 -> 46 [ label = "2 lanes" ] 63 -> 61 [ label = "2 lanes" ] - 37 -> 39 [ label = "1 lanes" ] - 33 -> 32 [ label = "1 lanes" ] - 20 -> 23 [ label = "1 lanes" ] - 23 -> 28 [ label = "1 lanes" ] - 28 -> 30 [ label = "1 lanes" ] - 17 -> 20 [ label = "1 lanes" ] - 23 -> 22 [ label = "1 lanes" ] - 32 -> 30 [ label = "1 lanes" ] - 45 -> 43 [ label = "1 lanes" ] - 28 -> 45 [ label = "1 lanes" ] - 15 -> 22 [ label = "1 lanes" ] - 22 -> 33 [ label = "1 lanes" ] - 33 -> 34 [ label = "1 lanes" ] - 53 -> 55 [ label = "1 lanes" ] + 61 -> 54 [ label = "2 lanes" ] + 54 -> 10 [ label = "2 lanes" ] + 70 -> 81 [ label = "2 lanes" ] + 81 -> 70 [ label = "2 lanes" ] + 69 -> 59 [ label = "4 lanes" ] + 64 -> 72 [ label = "3 lanes" ] + 74 -> 70 [ label = "4 lanes" ] + 70 -> 69 [ label = "4 lanes" ] + 60 -> 58 [ label = "2 lanes" ] + 35 -> 37 [ label = "1 lanes" ] + 31 -> 30 [ label = "1 lanes" ] + 19 -> 22 [ label = "1 lanes" ] + 22 -> 26 [ label = "1 lanes" ] + 26 -> 28 [ label = "1 lanes" ] + 16 -> 19 [ label = "1 lanes" ] + 22 -> 21 [ label = "1 lanes" ] + 30 -> 28 [ label = "1 lanes" ] + 42 -> 41 [ label = "1 lanes" ] + 26 -> 42 [ label = "1 lanes" ] + 14 -> 21 [ label = "1 lanes" ] + 21 -> 31 [ label = "1 lanes" ] + 31 -> 32 [ label = "1 lanes" ] + 49 -> 51 [ label = "1 lanes" ] 5 -> 0 [ label = "1 lanes" ] - 46 -> 47 [ label = "2 lanes" ] - 51 -> 46 [ label = "1 lanes" ] - 46 -> 51 [ label = "1 lanes" ] - 46 -> 44 [ label = "1 lanes" ] - 44 -> 46 [ label = "1 lanes" ] - 60 -> 47 [ label = "2 lanes" ] - 47 -> 51 [ label = "2 lanes" ] - 36 -> 27 [ label = "5 lanes" ] - 53 -> 54 [ label = "2 lanes" ] - 76 -> 78 [ label = "2 lanes" ] - 84 -> 4 [ label = "4 lanes" ] - 4 -> 12 [ label = "4 lanes" ] - 12 -> 18 [ label = "4 lanes" ] - 83 -> 12 [ label = "1 lanes" ] - 86 -> 35 [ label = "2 lanes" ] - 27 -> 25 [ label = "5 lanes" ] - 25 -> 8 [ label = "5 lanes" ] + 43 -> 44 [ label = "2 lanes" ] + 47 -> 43 [ label = "1 lanes" ] + 43 -> 47 [ label = "1 lanes" ] + 56 -> 44 [ label = "2 lanes" ] + 44 -> 47 [ label = "2 lanes" ] + 34 -> 25 [ label = "5 lanes" ] + 49 -> 50 [ label = "2 lanes" ] + 77 -> 4 [ label = "4 lanes" ] + 4 -> 11 [ label = "4 lanes" ] + 11 -> 17 [ label = "4 lanes" ] + 76 -> 11 [ label = "1 lanes" ] + 79 -> 33 [ label = "2 lanes" ] + 25 -> 23 [ label = "5 lanes" ] + 23 -> 8 [ label = "5 lanes" ] 8 -> 7 [ label = "5 lanes" ] - 4 -> 31 [ label = "3 lanes" ] - 42 -> 38 [ label = "5 lanes" ] - 76 -> 19 [ label = "1 lanes" ] + 4 -> 29 [ label = "3 lanes" ] + 40 -> 36 [ label = "5 lanes" ] + 70 -> 18 [ label = "1 lanes" ] 7 -> 2 [ label = "5 lanes" ] - 35 -> 24 [ label = "1 lanes" ] - 35 -> 38 [ label = "4 lanes" ] - 31 -> 38 [ label = "2 lanes" ] - 31 -> 24 [ label = "4 lanes" ] - 16 -> 17 [ label = "1 lanes" ] - 1 -> 29 [ label = "5 lanes" ] - 57 -> 64 [ label = "3 lanes" ] - 79 -> 87 [ label = "3 lanes" ] - 64 -> 70 [ label = "3 lanes" ] - 52 -> 53 [ label = "2 lanes" ] - 53 -> 52 [ label = "2 lanes" ] - 59 -> 36 [ label = "4 lanes" ] - 65 -> 63 [ label = "4 lanes" ] - 38 -> 44 [ label = "4 lanes" ] - 29 -> 41 [ label = "4 lanes" ] - 41 -> 56 [ label = "4 lanes" ] - 85 -> 42 [ label = "5 lanes" ] - 50 -> 48 [ label = "2 lanes" ] - 82 -> 76 [ label = "2 lanes" ] - 50 -> 26 [ label = "2 lanes" ] - 26 -> 14 [ label = "2 lanes" ] - 14 -> 8 [ label = "2 lanes" ] - 73 -> 68 [ label = "2 lanes" ] - 25 -> 26 [ label = "1 lanes" ] - 46 -> 66 [ label = "2 lanes" ] - 77 -> 80 [ label = "2 lanes" ] - 71 -> 77 [ label = "2 lanes" ] - 14 -> 10 [ label = "1 lanes" ] - 10 -> 6 [ label = "1 lanes" ] - 68 -> 61 [ label = "2 lanes" ] - 61 -> 50 [ label = "2 lanes" ] - 76 -> 73 [ label = "2 lanes" ] - 66 -> 71 [ label = "2 lanes" ] + 33 -> 29 [ label = "1 lanes" ] + 33 -> 36 [ label = "4 lanes" ] + 29 -> 36 [ label = "2 lanes" ] + 15 -> 16 [ label = "1 lanes" ] + 1 -> 27 [ label = "5 lanes" ] + 53 -> 60 [ label = "3 lanes" ] + 72 -> 80 [ label = "3 lanes" ] + 60 -> 64 [ label = "3 lanes" ] + 48 -> 49 [ label = "2 lanes" ] + 49 -> 48 [ label = "2 lanes" ] + 55 -> 34 [ label = "4 lanes" ] + 59 -> 58 [ label = "4 lanes" ] + 36 -> 43 [ label = "4 lanes" ] + 27 -> 39 [ label = "4 lanes" ] + 39 -> 52 [ label = "4 lanes" ] + 78 -> 40 [ label = "5 lanes" ] + 75 -> 70 [ label = "2 lanes" ] + 46 -> 24 [ label = "2 lanes" ] + 24 -> 13 [ label = "2 lanes" ] + 13 -> 8 [ label = "2 lanes" ] + 67 -> 62 [ label = "2 lanes" ] + 23 -> 24 [ label = "1 lanes" ] + 43 -> 60 [ label = "2 lanes" ] + 71 -> 73 [ label = "2 lanes" ] + 65 -> 71 [ label = "2 lanes" ] + 13 -> 7 [ label = "1 lanes" ] + 7 -> 6 [ label = "1 lanes" ] + 62 -> 58 [ label = "2 lanes" ] + 58 -> 46 [ label = "2 lanes" ] + 70 -> 67 [ label = "2 lanes" ] + 60 -> 65 [ label = "2 lanes" ] } diff --git a/tests/src/leeds_cycleway/geometry.json b/tests/src/leeds_cycleway/geometry.json index 3ff0d8d9..f1eadc69 100644 --- a/tests/src/leeds_cycleway/geometry.json +++ b/tests/src/leeds_cycleway/geometry.json @@ -703,12 +703,12 @@ 53.79616396926956 ], [ - -1.5334727209662418, - 53.79632071924083 + -1.5334727224887952, + 53.79632071834151 ], [ - -1.5334828855330858, - 53.7963423856989 + -1.5334828870556392, + 53.79634238479958 ], [ -1.5344405077069947, @@ -1075,7 +1075,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 432, + "dst_i": 451, "osm_way_ids": [ 29053006 ], @@ -1279,7 +1279,7 @@ "osm_way_ids": [ 30831663 ], - "src_i": 368, + "src_i": 344, "type": "road" }, "type": "Feature" @@ -1453,11 +1453,11 @@ 53.79918388789489 ], [ - -1.536473092204233, + -1.5364730906816795, 53.799138305775216 ], [ - -1.5364647638368518, + -1.5364647623142984, 53.79917338111963 ], [ @@ -1822,11 +1822,11 @@ ], [ -1.5363508022335413, - 53.79879666695641 + 53.79879666785574 ], [ -1.5364097859542625, - 53.79879028896701 + 53.79879028986634 ], [ -1.5363879768986195, @@ -1888,44 +1888,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5363749301380913, - 53.79888198020886 - ], - [ - -1.536392329878938, - 53.79895257965921 - ], - [ - -1.5364516698771666, - 53.798947476907955 - ], - [ - -1.53643427013632, - 53.798876877457616 - ], - [ - -1.5363749301380913, - 53.79888198020886 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 221, - "osm_way_ids": [ - 30831675 - ], - "src_i": 224, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1959,7 +1921,7 @@ "osm_way_ids": [ 30831675 ], - "src_i": 221, + "src_i": 224, "type": "road" }, "type": "Feature" @@ -2002,44 +1964,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.53641027012626, - 53.79914439148507 - ], - [ - -1.5364021701418966, - 53.79918419186562 - ], - [ - -1.5364617050269673, - 53.799188418677545 - ], - [ - -1.5364698050113306, - 53.799148618297 - ], - [ - -1.53641027012626, - 53.79914439148507 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 220, - "osm_way_ids": [ - 30831675 - ], - "src_i": 218, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2073,7 +1997,7 @@ "osm_way_ids": [ 30831675 ], - "src_i": 220, + "src_i": 218, "type": "road" }, "type": "Feature" @@ -2301,7 +2225,7 @@ "osm_way_ids": [ 30832035 ], - "src_i": 467, + "src_i": 444, "type": "road" }, "type": "Feature" @@ -2541,7 +2465,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 279, + "dst_i": 269, "osm_way_ids": [ 38732418 ], @@ -2583,7 +2507,7 @@ "osm_way_ids": [ 38732418 ], - "src_i": 279, + "src_i": 269, "type": "road" }, "type": "Feature" @@ -2780,7 +2704,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 368, + "dst_i": 344, "osm_way_ids": [ 38732625 ], @@ -3407,55 +3331,17 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5341256192923165, - 53.799438007425145 - ], - [ - -1.5341391197737733, - 53.79948190691394 - ], - [ - -1.534169080580597, - 53.799478692738234 - ], - [ - -1.5341555800991402, - 53.79943479324944 - ], - [ - -1.5341256192923165, - 53.799438007425145 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 455, - "osm_way_ids": [ - 121485718 - ], - "src_i": 460, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ [ [ -1.5341510992243317, - 53.79951992843619 + 53.79951993023484 ], [ -1.534154231116782, - 53.79952986953811 + 53.79952987043744 ], [ -1.5341533328102455, @@ -3467,7 +3353,7 @@ ], [ -1.534186168197986, - 53.79953293082914 + 53.79953292992981 ], [ -1.5341810356703, @@ -3475,7 +3361,7 @@ ], [ -1.5341510992243317, - 53.79951992843619 + 53.79951993023484 ] ] ], @@ -3486,7 +3372,7 @@ "osm_way_ids": [ 121485718 ], - "src_i": 455, + "src_i": 460, "type": "road" }, "type": "Feature" @@ -3691,44 +3577,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5337157281099092, - 53.799705141938844 - ], - [ - -1.5337170268480036, - 53.79966954228989 - ], - [ - -1.5336789721470303, - 53.799669058454825 - ], - [ - -1.533677673408936, - 53.79970465810378 - ], - [ - -1.5337157281099092, - 53.799705141938844 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 514, - "osm_way_ids": [ - 143460612 - ], - "src_i": 515, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -3762,7 +3610,7 @@ "osm_way_ids": [ 143460612 ], - "src_i": 514, + "src_i": 515, "type": "road" }, "type": "Feature" @@ -4004,7 +3852,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 450, + "dst_i": 457, "osm_way_ids": [ 145796715 ], @@ -4046,7 +3894,7 @@ "osm_way_ids": [ 145796715 ], - "src_i": 450, + "src_i": 457, "type": "road" }, "type": "Feature" @@ -4454,49 +4302,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 454, - "osm_way_ids": [ - 147479103 - ], - "src_i": 432, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5341975142663085, - 53.79661628670897 - ], - [ - -1.5341952654548603, - 53.79661122892381 - ], - [ - -1.5340654525475634, - 53.796631366535 - ], - [ - -1.5340677013590118, - 53.79663642432017 - ], - [ - -1.5341975142663085, - 53.79661628670897 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 463, + "dst_i": 472, "osm_way_ids": [ 147479103 ], - "src_i": 454, + "src_i": 451, "type": "road" }, "type": "Feature" @@ -4506,35 +4316,35 @@ "coordinates": [ [ [ - -1.5341857845145161, - 53.796589895214765 + -1.5341975173114153, + 53.79661629300422 ], [ - -1.5341603852778338, - 53.7965323952841 + -1.5341952700225205, + 53.79661123521906 ], [ - -1.534030517558613, - 53.79655240878891 + -1.53406545102501, + 53.79663136023976 ], [ - -1.5340559167952952, - 53.79660990871957 + -1.5340676983139048, + 53.79663641802492 ], [ - -1.5341857845145161, - 53.796589895214765 + -1.5341975173114153, + 53.79661629300422 ] ] ], "type": "Polygon" }, "properties": { - "dst_i": 467, + "dst_i": 444, "osm_way_ids": [ 147479103 ], - "src_i": 463, + "src_i": 472, "type": "road" }, "type": "Feature" @@ -4867,44 +4677,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5340225378559724, - 53.80001771468075 - ], - [ - -1.5339358375722156, - 53.80000501445989 - ], - [ - -1.5339124663767312, - 53.800060677076345 - ], - [ - -1.533999166660488, - 53.800073377297196 - ], - [ - -1.5340225378559724, - 53.80001771468075 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 496, - "osm_way_ids": [ - 162428102 - ], - "src_i": 477, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -4938,7 +4710,7 @@ "osm_way_ids": [ 162428102 ], - "src_i": 496, + "src_i": 477, "type": "road" }, "type": "Feature" @@ -5200,45 +4972,7 @@ "coordinates": [ [ [ - -1.5361290225300983, - 53.79657250772928 - ], - [ - -1.5360596230212138, - 53.79657190788171 - ], - [ - -1.536059178435606, - 53.7965898925168 - ], - [ - -1.5361285779444904, - 53.796590492364366 - ], - [ - -1.5361290225300983, - 53.79657250772928 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 262, - "osm_way_ids": [ - 177344221 - ], - "src_i": 253, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5360433301767267, + -1.53604333169928, 53.79657227300632 ], [ @@ -5250,11 +4984,11 @@ 53.79659361840655 ], [ - -1.5360445238586329, + -1.5360445253811863, 53.7965902450509 ], [ - -1.5360433301767267, + -1.53604333169928, 53.79657227300632 ] ] @@ -5266,7 +5000,7 @@ "osm_way_ids": [ 177344221 ], - "src_i": 262, + "src_i": 253, "type": "road" }, "type": "Feature" @@ -6009,7 +5743,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 216, + "dst_i": 212, "osm_way_ids": [ 190821091 ], @@ -6056,44 +5790,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.535870569081663, - 53.79819523568616 - ], - [ - -1.5358061681157604, - 53.79824323518252 - ], - [ - -1.535865830895321, - 53.79827116451681 - ], - [ - -1.5359302318612233, - 53.798223165020445 - ], - [ - -1.535870569081663, - 53.79819523568616 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 279, - "osm_way_ids": [ - 190821093 - ], - "src_i": 269, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -6151,7 +5847,7 @@ "osm_way_ids": [ 190821093 ], - "src_i": 279, + "src_i": 269, "type": "road" }, "type": "Feature" @@ -6199,88 +5895,12 @@ "coordinates": [ [ [ - -1.5364803669646254, - 53.7988654021129 + -1.5364561492294218, + 53.79892297488861 ], [ - -1.5364700668905242, - 53.79889100220402 - ], - [ - -1.5365441330257383, - 53.798901398362716 - ], - [ - -1.5365544330998395, - 53.798875798271595 - ], - [ - -1.5364803669646254, - 53.7988654021129 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 214, - "osm_way_ids": [ - 190821094 - ], - "src_i": 212, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5364700668905242, - 53.79889100400266 - ], - [ - -1.536451566343532, - 53.798937003407595 - ], - [ - -1.5365256324787462, - 53.798947395969 - ], - [ - -1.5365441330257383, - 53.79890139656407 - ], - [ - -1.5364700668905242, - 53.79889100400266 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 216, - "osm_way_ids": [ - 190821094 - ], - "src_i": 214, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5364561492294218, - 53.79892297488861 - ], - [ - -1.5364459131025656, - 53.7989241314163 + -1.5364459131025656, + 53.7989241314163 ], [ -1.5364602159696914, @@ -6299,11 +5919,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 221, + "dst_i": 224, "osm_way_ids": [ 190821094 ], - "src_i": 216, + "src_i": 212, "type": "road" }, "type": "Feature" @@ -6812,7 +6432,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 587, + "dst_i": 539, "osm_way_ids": [ 313390689 ], @@ -6854,87 +6474,11 @@ "osm_way_ids": [ 313390689 ], - "src_i": 587, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5334736390659731, - 53.79632062481206 - ], - [ - -1.5328235391931426, - 53.79638742462827 - ], - [ - -1.53283006181213, - 53.796409574921405 - ], - [ - -1.5334801616849605, - 53.79634277510519 - ], - [ - -1.5334736390659731, - 53.79632062481206 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 587, - "osm_way_ids": [ - 330225647 - ], "src_i": 539, "type": "road" }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.533180870307842, - 53.80002644529568 - ], - [ - -1.5331373709557254, - 53.79999794579144 - ], - [ - -1.533080829410741, - 53.8000280550815 - ], - [ - -1.5331243287628575, - 53.80005655458574 - ], - [ - -1.533180870307842, - 53.80002644529568 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 569, - "osm_way_ids": [ - 331099341 - ], - "src_i": 566, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -6968,7 +6512,7 @@ "osm_way_ids": [ 331099341 ], - "src_i": 569, + "src_i": 566, "type": "road" }, "type": "Feature" @@ -7248,51 +6792,13 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.53275343474201, - 53.798006693793944 - ], - [ - -1.5327931353232644, - 53.79801339374051 - ], - [ - -1.5328098651405924, - 53.79797880582845 - ], - [ - -1.532770164559338, - 53.79797210588189 - ], - [ - -1.53275343474201, - 53.798006693793944 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 589, - "osm_way_ids": [ - 438378831 - ], - "src_i": 595, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ [ [ -1.532818198075634, - 53.79801756569381 + 53.79801756659313 ], [ -1.533102315685052, @@ -7320,11 +6826,11 @@ ], [ -1.5328347177805854, - 53.79798294180889 + 53.79798294270821 ], [ -1.532818198075634, - 53.79801756569381 + 53.79801756659313 ] ] ], @@ -7335,7 +6841,7 @@ "osm_way_ids": [ 438378831 ], - "src_i": 589, + "src_i": 595, "type": "road" }, "type": "Feature" @@ -7463,44 +6969,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5335342625767616, - 53.799912781826386 - ], - [ - -1.5334887625894094, - 53.799870781704996 - ], - [ - -1.5334246387282353, - 53.79989501842444 - ], - [ - -1.5334701387155876, - 53.79993701854583 - ], - [ - -1.5335342625767616, - 53.799912781826386 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 541, - "osm_way_ids": [ - 454077550 - ], - "src_i": 535, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -7534,7 +7002,7 @@ "osm_way_ids": [ 454077550 ], - "src_i": 541, + "src_i": 535, "type": "road" }, "type": "Feature" @@ -7699,44 +7167,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5354566355198411, - 53.79876890579528 - ], - [ - -1.5354745361807733, - 53.79871480619992 - ], - [ - -1.5353792486955486, - 53.79870380569705 - ], - [ - -1.5353613480346164, - 53.79875790529241 - ], - [ - -1.5354566355198411, - 53.79876890579528 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 321, - "osm_way_ids": [ - 491178799 - ], - "src_i": 322, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -7778,7 +7208,7 @@ "osm_way_ids": [ 491178799 ], - "src_i": 321, + "src_i": 306, "type": "road" }, "type": "Feature" @@ -7951,7 +7381,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 496, + "dst_i": 477, "osm_way_ids": [ 491178801 ], @@ -7993,7 +7423,7 @@ "osm_way_ids": [ 491178801 ], - "src_i": 496, + "src_i": 477, "type": "road" }, "type": "Feature" @@ -8118,7 +7548,7 @@ [ [ -1.5328358536054605, - 53.797977090821995 + 53.797977089922675 ], [ -1.532860415437744, @@ -8130,11 +7560,11 @@ ], [ -1.5327753503763946, - 53.79797298092189 + 53.79797298002257 ], [ -1.5328358536054605, - 53.797977090821995 + 53.797977089922675 ] ] ], @@ -8145,7 +7575,7 @@ "osm_way_ids": [ 573276645 ], - "src_i": 589, + "src_i": 595, "type": "road" }, "type": "Feature" @@ -8155,7 +7585,7 @@ "coordinates": [ [ [ - -1.5327295245626036, + -1.5327295230400502, 53.797996320118294 ], [ @@ -8175,11 +7605,11 @@ 53.798034904615925 ], [ - -1.5327515285050883, + -1.532751526982535, 53.79800875234128 ], [ - -1.5327295245626036, + -1.5327295230400502, 53.797996320118294 ] ] @@ -9089,11 +8519,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 487, + "dst_i": 500, "osm_way_ids": [ 603499175 ], - "src_i": 467, + "src_i": 444, "type": "road" }, "type": "Feature" @@ -9142,23 +8572,23 @@ [ [ -1.5345035703484131, - 53.79649117217665 + 53.796491171277324 ], [ - -1.5343844914429512, - 53.796498855081815 + -1.5343844929655046, + 53.796498853283175 ], [ - -1.5343950336030512, + -1.5343950351256046, 53.79655586308351 ], [ -1.5345141125085129, - 53.79654818017834 + 53.79654818107767 ], [ -1.5345035703484131, - 53.79649117217665 + 53.796491171277324 ] ] ], @@ -9221,12 +8651,12 @@ 53.798889077655616 ], [ - -1.536552870959998, - 53.798879675247385 + -1.5365512083316286, + 53.7988794603095 ], [ - -1.5365320850602746, - 53.798935693995226 + -1.5365304224319054, + 53.79893547905734 ], [ -1.5366047169501371, @@ -9241,7 +8671,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 214, + "dst_i": 212, "osm_way_ids": [ 616128591 ], @@ -9283,7 +8713,7 @@ "osm_way_ids": [ 616128591 ], - "src_i": 214, + "src_i": 212, "type": "road" }, "type": "Feature" @@ -9431,11 +8861,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 494, + "dst_i": 490, "osm_way_ids": [ 619360566 ], - "src_i": 467, + "src_i": 444, "type": "road" }, "type": "Feature" @@ -9481,7 +8911,7 @@ "osm_way_ids": [ 619360566 ], - "src_i": 494, + "src_i": 490, "type": "road" }, "type": "Feature" @@ -9778,11 +9208,11 @@ ], [ -1.5342765652415236, - 53.79650615397662 + 53.79650615487594 ], [ -1.5343723125378907, - 53.79649665174368 + 53.79649665264301 ], [ -1.5343550285111063, @@ -9851,11 +9281,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 514, + "dst_i": 515, "osm_way_ids": [ 663639106 ], - "src_i": 532, + "src_i": 524, "type": "road" }, "type": "Feature" @@ -9893,7 +9323,7 @@ "osm_way_ids": [ 663639106 ], - "src_i": 514, + "src_i": 515, "type": "road" }, "type": "Feature" @@ -9977,7 +9407,7 @@ "osm_way_ids": [ 663639107 ], - "src_i": 532, + "src_i": 524, "type": "road" }, "type": "Feature" @@ -10058,44 +9488,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5336120422198447, - 53.79972575708986 - ], - [ - -1.5335357424987168, - 53.79973635739458 - ], - [ - -1.5335444575946746, - 53.79975824328714 - ], - [ - -1.5336207573158025, - 53.79974764298242 - ], - [ - -1.5336120422198447, - 53.79972575708986 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 532, - "osm_way_ids": [ - 663639108 - ], - "src_i": 524, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -10231,7 +9623,7 @@ "coordinates": [ [ [ - -1.5336495762075373, + -1.5336495731624304, 53.79968860071507 ], [ @@ -10255,7 +9647,7 @@ 53.79973226278294 ], [ - -1.5336495762075373, + -1.5336495731624304, 53.79968860071507 ] ] @@ -10301,7 +9693,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 541, + "dst_i": 535, "osm_way_ids": [ 663639111 ], @@ -10347,7 +9739,7 @@ "osm_way_ids": [ 663639111 ], - "src_i": 541, + "src_i": 535, "type": "road" }, "type": "Feature" @@ -10389,7 +9781,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 569, + "dst_i": 566, "osm_way_ids": [ 663639111 ], @@ -10398,44 +9790,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5341254472437764, - 53.799571367838006 - ], - [ - -1.5342191467057509, - 53.79961556859957 - ], - [ - -1.5342666534185527, - 53.79958043210128 - ], - [ - -1.5341729539565783, - 53.79953623133972 - ], - [ - -1.5341254472437764, - 53.799571367838006 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 450, - "osm_way_ids": [ - 663639112 - ], - "src_i": 457, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -10477,45 +9831,7 @@ "osm_way_ids": [ 663639112 ], - "src_i": 450, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5343957431129598, - 53.7996463775619 - ], - [ - -1.5344650436558698, - 53.79968537754615 - ], - [ - -1.534517556524421, - 53.7996528221011 - ], - [ - -1.5344482559815107, - 53.799613822116854 - ], - [ - -1.5343957431129598, - 53.7996463775619 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 424, - "osm_way_ids": [ - 663639112 - ], - "src_i": 433, + "src_i": 457, "type": "road" }, "type": "Feature" @@ -10595,7 +9911,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 365, + "dst_i": 372, "osm_way_ids": [ 663639113 ], @@ -10637,7 +9953,7 @@ "osm_way_ids": [ 663639113 ], - "src_i": 365, + "src_i": 372, "type": "road" }, "type": "Feature" @@ -10717,7 +10033,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 322, + "dst_i": 306, "osm_way_ids": [ 663639115 ], @@ -10787,7 +10103,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 316, + "dst_i": 306, "osm_way_ids": [ 663639116 ], @@ -10796,44 +10112,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5355552985060683, - 53.798843911921885 - ], - [ - -1.5355922980774994, - 53.79876441188481 - ], - [ - -1.5354986793108578, - 53.79874921154967 - ], - [ - -1.5354616797394267, - 53.798828711586744 - ], - [ - -1.5355552985060683, - 53.798843911921885 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 312, - "osm_way_ids": [ - 663639116 - ], - "src_i": 316, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -10867,7 +10145,7 @@ "osm_way_ids": [ 663639116 ], - "src_i": 312, + "src_i": 306, "type": "road" }, "type": "Feature" @@ -11313,44 +10591,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5338803389763456, - 53.79652000263127 - ], - [ - -1.5339901394410724, - 53.796495702959305 - ], - [ - -1.5339430499079165, - 53.79642146575274 - ], - [ - -1.5338332494431899, - 53.79644576542471 - ], - [ - -1.5338803389763456, - 53.79652000263127 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 487, - "osm_way_ids": [ - 668984461 - ], - "src_i": 500, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -11456,7 +10696,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 438, + "dst_i": 451, "osm_way_ids": [ 668997030 ], @@ -11465,44 +10705,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.534409778010678, - 53.79711992214177 - ], - [ - -1.534374278154397, - 53.79708242132677 - ], - [ - -1.5343211227682891, - 53.797099977884734 - ], - [ - -1.5343566226245704, - 53.79713747869973 - ], - [ - -1.534409778010678, - 53.79711992214177 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 441, - "osm_way_ids": [ - 668997030 - ], - "src_i": 438, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -11552,7 +10754,7 @@ "osm_way_ids": [ 668997030 ], - "src_i": 441, + "src_i": 451, "type": "road" }, "type": "Feature" @@ -11590,45 +10792,7 @@ "osm_way_ids": [ 668997031 ], - "src_i": 438, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5339940006366262, - 53.79657614638482 - ], - [ - -1.533962400039735, - 53.79654264575269 - ], - [ - -1.5339091989770237, - 53.79656015374728 - ], - [ - -1.533940799573915, - 53.796593654379414 - ], - [ - -1.5339940006366262, - 53.79657614638482 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 494, - "osm_way_ids": [ - 668997032 - ], - "src_i": 490, + "src_i": 451, "type": "road" }, "type": "Feature" @@ -11639,23 +10803,23 @@ [ [ -1.533939016663823, - 53.79652306212365 + 53.79652306302297 ], [ - -1.5339237439301483, - 53.79651039607702 + -1.5339158205619854, + 53.796503825632776 ], [ - -1.5338741360935833, - 53.79653126573607 + -1.5338662127254203, + 53.79652469349318 ], [ -1.5338894088272579, - 53.7965439317827 + 53.796543930883374 ], [ -1.533939016663823, - 53.79652306212365 + 53.79652306302297 ] ] ], @@ -11666,45 +10830,7 @@ "osm_way_ids": [ 668997032 ], - "src_i": 494, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.533883582015198, - 53.796477265965414 - ], - [ - -1.5338305819295424, - 53.796441965790585 - ], - [ - -1.533785017994945, - 53.79646583378814 - ], - [ - -1.5338380180806006, - 53.79650113396297 - ], - [ - -1.533883582015198, - 53.796477265965414 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 505, - "osm_way_ids": [ - 668997032 - ], - "src_i": 500, + "src_i": 490, "type": "road" }, "type": "Feature" @@ -12012,8 +11138,8 @@ "coordinates": [ [ [ - -1.5338907760802574, - 53.796413526540896 + -1.5338996251609192, + 53.79641767061523 ], [ -1.53388652511102, @@ -12040,12 +11166,12 @@ 53.79643597540883 ], [ - -1.533853519197293, - 53.79644127960814 + -1.5338623682779546, + 53.796445423682464 ], [ - -1.5338907760802574, - 53.796413526540896 + -1.5338996251609192, + 53.79641767061523 ] ] ], @@ -12056,7 +11182,7 @@ "osm_way_ids": [ 673731116 ], - "src_i": 487, + "src_i": 500, "type": "road" }, "type": "Feature" @@ -12500,44 +11626,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5351883478986608, - 53.79797921951643 - ], - [ - -1.535267248141084, - 53.79795701886128 - ], - [ - -1.535254151136292, - 53.79794078070891 - ], - [ - -1.5351752508938687, - 53.79796298136406 - ], - [ - -1.5351883478986608, - 53.79797921951643 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 365, - "osm_way_ids": [ - 673734329 - ], - "src_i": 372, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -12571,7 +11659,7 @@ "osm_way_ids": [ 673734329 ], - "src_i": 365, + "src_i": 372, "type": "road" }, "type": "Feature" @@ -12740,7 +11828,7 @@ "osm_way_ids": [ 673734333 ], - "src_i": 368, + "src_i": 344, "type": "road" }, "type": "Feature" @@ -12873,7 +11961,7 @@ [ [ -1.5360445299488465, - 53.796590427613204 + 53.79659042671388 ], [ -1.5360663237789551, @@ -12885,11 +11973,11 @@ ], [ -1.5360749749276679, - 53.79659002831437 + 53.79659002741505 ], [ -1.5360445299488465, - 53.796590427613204 + 53.79659042671388 ] ] ], @@ -12900,7 +11988,7 @@ "osm_way_ids": [ 692442629 ], - "src_i": 262, + "src_i": 253, "type": "road" }, "type": "Feature" @@ -13188,58 +12276,20 @@ "coordinates": [ [ [ - -1.534061160469383, - 53.79669361758213 + -1.5342237021856786, + 53.796658514358754 ], [ - -1.5341677605267543, - 53.79667061743 + -1.5342520597437175, + 53.796652378286886 ], [ - -1.5341416395997358, - 53.79662838168633 + -1.5342916811521925, + 53.79674013229839 ], [ - -1.5340350395423648, - 53.79665138183846 - ], - [ - -1.534061160469383, - 53.79669361758213 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 454, - "osm_way_ids": [ - 701166712 - ], - "src_i": 472, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5342237021856786, - 53.796658514358754 - ], - [ - -1.5342520597437175, - 53.796652378286886 - ], - [ - -1.5342916811521925, - 53.79674013229839 - ], - [ - -1.5343709376721237, - 53.79672738171552 + -1.5343709376721237, + 53.79672738171552 ], [ -1.5343509313197676, @@ -13270,7 +12320,7 @@ "osm_way_ids": [ 701166712 ], - "src_i": 454, + "src_i": 472, "type": "road" }, "type": "Feature" @@ -13376,44 +12426,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5343091235245359, - 53.79651571466547 - ], - [ - -1.5341214231350035, - 53.7965888142301 - ], - [ - -1.5341423765156066, - 53.79660758487233 - ], - [ - -1.534330076905139, - 53.7965344853077 - ], - [ - -1.5343091235245359, - 53.79651571466547 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 463, - "osm_way_ids": [ - 702394734 - ], - "src_i": 444, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -13447,7 +12459,7 @@ "osm_way_ids": [ 702394734 ], - "src_i": 463, + "src_i": 444, "type": "road" }, "type": "Feature" @@ -13706,12 +12718,12 @@ 53.79956650160836 ], [ - -1.5345056547240885, - 53.79964612395318 + -1.53447846191944, + 53.79966080178242 ], [ - -1.5345313310654989, - 53.79966272003558 + -1.5345041382608506, + 53.79967739786482 ], [ -1.5346788375664584, @@ -13726,7 +12738,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 424, + "dst_i": 433, "osm_way_ids": [ 717747209 ], @@ -13740,7 +12752,7 @@ "coordinates": [ [ [ - -1.5344526470256656, + -1.534452648548219, 53.79967839970918 ], [ @@ -13752,11 +12764,11 @@ 53.799932085766386 ], [ - -1.5344815024586833, + -1.5344815039812367, 53.79969306224996 ], [ - -1.5344526470256656, + -1.534452648548219, 53.79967839970918 ] ] @@ -13768,7 +12780,7 @@ "osm_way_ids": [ 717747209 ], - "src_i": 424, + "src_i": 433, "type": "road" }, "type": "Feature" @@ -14328,7 +13340,7 @@ "osm_way_ids": [ 760129761 ], - "src_i": 487, + "src_i": 500, "type": "road" }, "type": "Feature" @@ -14366,7 +13378,7 @@ "osm_way_ids": [ 760129762 ], - "src_i": 487, + "src_i": 500, "type": "road" }, "type": "Feature" @@ -14476,7 +13488,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 375, + "dst_i": 369, "osm_way_ids": [ 775795899 ], @@ -14518,7 +13530,7 @@ "osm_way_ids": [ 775795899 ], - "src_i": 375, + "src_i": 369, "type": "road" }, "type": "Feature" @@ -14587,11 +13599,11 @@ ], [ -1.5350151026315992, - 53.79846873020283 + 53.79846873110215 ], [ -1.534938990184546, - 53.79846785965943 + 53.79846786055875 ], [ -1.534935246225608, @@ -14615,44 +13627,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5349830574491001, - 53.79842614102573 - ], - [ - -1.534919958266399, - 53.79842084132303 - ], - [ - -1.5349092425352056, - 53.79846535954515 - ], - [ - -1.5349723417179066, - 53.79847065924784 - ], - [ - -1.5349830574491001, - 53.79842614102573 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 386, - "osm_way_ids": [ - 775795899 - ], - "src_i": 382, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -14686,7 +13660,7 @@ "osm_way_ids": [ 775795899 ], - "src_i": 386, + "src_i": 382, "type": "road" }, "type": "Feature" @@ -14848,7 +13822,7 @@ "coordinates": [ [ [ - -1.5348752865481246, + -1.534875288070678, 53.798431741101865 ], [ @@ -14860,11 +13834,11 @@ 53.79844366880539 ], [ - -1.5348722566667556, + -1.534872258189309, 53.798449637603426 ], [ - -1.5348752865481246, + -1.534875288070678, 53.798431741101865 ] ] @@ -14876,7 +13850,7 @@ "osm_way_ids": [ 775795902 ], - "src_i": 386, + "src_i": 382, "type": "road" }, "type": "Feature" @@ -15070,7 +14044,7 @@ "osm_way_ids": [ 775795909 ], - "src_i": 375, + "src_i": 369, "type": "road" }, "type": "Feature" @@ -15113,44 +14087,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.535218843121746, - 53.79844202574467 - ], - [ - -1.5351434417071546, - 53.79843762536366 - ], - [ - -1.5351359568343859, - 53.79848237381213 - ], - [ - -1.535211358248977, - 53.79848677419314 - ], - [ - -1.535218843121746, - 53.79844202574467 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 375, - "osm_way_ids": [ - 775795910 - ], - "src_i": 369, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -15214,44 +14150,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.535711905309009, - 53.79904655517814 - ], - [ - -1.535765904189729, - 53.799089254971804 - ], - [ - -1.5358268946358993, - 53.79906234546831 - ], - [ - -1.5357728957551793, - 53.79901964567464 - ], - [ - -1.535711905309009, - 53.79904655517814 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 285, - "osm_way_ids": [ - 775795915 - ], - "src_i": 292, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -15281,11 +14179,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 322, + "dst_i": 306, "osm_way_ids": [ 775795916 ], - "src_i": 316, + "src_i": 306, "type": "road" }, "type": "Feature" @@ -15617,7 +14515,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 312, + "dst_i": 306, "osm_way_ids": [ 775795922 ], @@ -15626,44 +14524,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5355737320607086, - 53.79874376975415 - ], - [ - -1.5354553322140863, - 53.79869577025779 - ], - [ - -1.5354208676941523, - 53.798725429887 - ], - [ - -1.5355392675407746, - 53.79877342938336 - ], - [ - -1.5355737320607086, - 53.79874376975415 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 321, - "osm_way_ids": [ - 775795922 - ], - "src_i": 312, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -15697,7 +14557,7 @@ "osm_way_ids": [ 775795922 ], - "src_i": 321, + "src_i": 306, "type": "road" }, "type": "Feature" @@ -16019,83 +14879,7 @@ "osm_way_ids": [ 776103800 ], - "src_i": 505, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5352871463921451, - 53.79762537420438 - ], - [ - -1.5352037470042716, - 53.79768357470663 - ], - [ - -1.5352462536515379, - 53.797704825678075 - ], - [ - -1.5353296530394112, - 53.79764662517582 - ], - [ - -1.5352871463921451, - 53.79762537420438 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 368, - "osm_way_ids": [ - 777360594 - ], - "src_i": 344, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5343150340770355, - 53.7965033373011 - ], - [ - -1.534101934450821, - 53.79651893693507 - ], - [ - -1.5341138743149898, - 53.796575849608665 - ], - [ - -1.5343269739412042, - 53.796560249974696 - ], - [ - -1.5343150340770355, - 53.7965033373011 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 467, - "osm_way_ids": [ - 778025015 - ], - "src_i": 444, + "src_i": 500, "type": "road" }, "type": "Feature" @@ -16305,36 +15089,35 @@ "coordinates": [ [ [ - -1.5356016039241964, - 53.79883718499567 + -1.5361316002130923, + 53.79875628111745 ], [ - -1.5355365041062599, - 53.798817984477665 + -1.5361599592936845, + 53.79878013382653 ], [ - -1.5355024963523614, - 53.79885821473398 + -1.5362222591358234, + 53.79875429091856 ], [ - -1.5355675961702981, - 53.79887741525199 + -1.5361939000552312, + 53.79873043820947 ], [ - -1.5356016039241964, - 53.79883718499567 + -1.5361316002130923, + 53.79875628111745 ] ] ], "type": "Polygon" }, "properties": { - "dst_i": 316, + "dst_i": 248, "osm_way_ids": [ - 778102279, - 775795916 + 778102285 ], - "src_i": 306, + "src_i": 251, "type": "road" }, "type": "Feature" @@ -16344,46 +15127,8 @@ "coordinates": [ [ [ - -1.5361316002130923, - 53.79875628111745 - ], - [ - -1.5361599592936845, - 53.79878013382653 - ], - [ - -1.5362222591358234, - 53.79875429091856 - ], - [ - -1.5361939000552312, - 53.79873043820947 - ], - [ - -1.5361316002130923, - 53.79875628111745 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 248, - "osm_way_ids": [ - 778102285 - ], - "src_i": 251, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5362199265839354, - 53.798818101389486 + -1.5362199265839354, + 53.798818101389486 ], [ -1.536259307428965, @@ -16453,44 +15198,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5363838644817462, - 53.79883940991752 - ], - [ - -1.5364293644690985, - 53.79883380984138 - ], - [ - -1.5364138344238907, - 53.79878978984348 - ], - [ - -1.5363683344365384, - 53.79879538991962 - ], - [ - -1.5363838644817462, - 53.79883940991752 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 219, - "osm_way_ids": [ - 778102285 - ], - "src_i": 226, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -16520,7 +15227,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 285, + "dst_i": 292, "osm_way_ids": [ 778102286 ], @@ -16577,11 +15284,11 @@ 53.798984915669756 ], [ - -1.5364020346346394, + -1.536402033112086, 53.798976996242985 ], [ - -1.5363749940853364, + -1.5363749925627828, 53.79893496194737 ], [ @@ -16597,7 +15304,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 221, + "dst_i": 224, "osm_way_ids": [ 778102288, 190821094 @@ -16668,7 +15375,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 219, + "dst_i": 226, "osm_way_ids": [ 778102289 ], @@ -16686,20 +15393,20 @@ 53.79883680278395 ], [ - -1.5364337235396308, - 53.79886051250089 + -1.5364337250621842, + 53.798860513400214 ], [ - -1.5364747198138728, - 53.79887943422917 + -1.5364429380331208, + 53.79886476539315 ], [ - -1.5365215931444385, - 53.79884400275338 + -1.5364898083185796, + 53.79882933211871 ], [ - -1.5364892754248716, - 53.79882908660388 + -1.5364892739023182, + 53.79882908570456 ], [ -1.5364670050355327, @@ -16718,7 +15425,7 @@ "osm_way_ids": [ 778102289 ], - "src_i": 219, + "src_i": 226, "type": "road" }, "type": "Feature" @@ -16840,7 +15547,7 @@ "osm_way_ids": [ 778102291 ], - "src_i": 220, + "src_i": 218, "type": "road" }, "type": "Feature" @@ -16883,82 +15590,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5342310424158696, - 53.79713588240374 - ], - [ - -1.5343586430530007, - 53.797110081763876 - ], - [ - -1.5343293613050166, - 53.797059554274256 - ], - [ - -1.5342017606678853, - 53.79708535491412 - ], - [ - -1.5342310424158696, - 53.79713588240374 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 441, - "osm_way_ids": [ - 779181824 - ], - "src_i": 451, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.534358687207051, - 53.797110073669984 - ], - [ - -1.5344359872457964, - 53.797094374211305 - ], - [ - -1.5344065867386432, - 53.79704387010405 - ], - [ - -1.5343292866998974, - 53.79705956956273 - ], - [ - -1.534358687207051, - 53.797110073669984 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 432, - "osm_way_ids": [ - 779181824 - ], - "src_i": 441, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -17002,62 +15633,24 @@ "coordinates": [ [ [ - -1.5339336511854589, - 53.797150368677464 - ], - [ - -1.5339768505945455, - 53.79714696834216 - ], - [ - -1.5339689302714894, - 53.797111860622174 - ], - [ - -1.5339257308624028, - 53.79711526095747 - ], - [ - -1.5339336511854589, - 53.797150368677464 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 485, - "osm_way_ids": [ - 779181825 - ], - "src_i": 495, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.53399777809174, - 53.79714534236856 + -1.5339768201434765, + 53.79714697104013 ], [ - -1.5342225222067536, + -1.5342225206842, 53.797127871246154 ], [ - -1.5342146962820116, + -1.534214697804565, 53.79709275453295 ], [ - -1.533989952166998, - 53.79711022565535 + -1.5339689972638413, + 53.79711185432692 ], [ - -1.53399777809174, - 53.79714534236856 + -1.5339768201434765, + 53.79714697104013 ] ] ], @@ -17068,7 +15661,7 @@ "osm_way_ids": [ 779181825 ], - "src_i": 485, + "src_i": 495, "type": "road" }, "type": "Feature" @@ -17114,7 +15707,7 @@ "osm_way_ids": [ 779181826 ], - "src_i": 285, + "src_i": 292, "type": "road" }, "type": "Feature" @@ -17274,7 +15867,7 @@ "osm_way_ids": [ 813941484 ], - "src_i": 368, + "src_i": 344, "type": "road" }, "type": "Feature" @@ -17308,7 +15901,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 455, + "dst_i": 460, "osm_way_ids": [ 823888306 ], @@ -17350,7 +15943,7 @@ "osm_way_ids": [ 823888306 ], - "src_i": 455, + "src_i": 460, "type": "road" }, "type": "Feature" @@ -19146,7 +17739,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 327, + "dst_i": 332, "osm_way_ids": [ 1010049066 ], @@ -19196,7 +17789,7 @@ "osm_way_ids": [ 1010049066 ], - "src_i": 327, + "src_i": 332, "type": "road" }, "type": "Feature" @@ -19331,44 +17924,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5353156775212775, - 53.799210049162745 - ], - [ - -1.5353527775812366, - 53.799241649528156 - ], - [ - -1.5354028239131956, - 53.79922115038964 - ], - [ - -1.5353657238532368, - 53.799189550024224 - ], - [ - -1.5353156775212775, - 53.799210049162745 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 327, - "osm_way_ids": [ - 1010049073 - ], - "src_i": 332, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -19494,7 +18049,7 @@ "osm_way_ids": [ 1060145090 ], - "src_i": 485, + "src_i": 495, "type": "road" }, "type": "Feature" @@ -20902,44 +19457,80 @@ "coordinates": [ [ [ - -1.5365386777167207, - 53.79885188890524 + -1.536551209854182, + 53.7988794603095 ], [ - -1.5365008544438723, - 53.79889091227185 + -1.5365304239544588, + 53.79893547905734 ], [ - -1.5365487874716404, - 53.798889830387864 + -1.5365258791324052, + 53.79893489090096 ], [ - -1.5364747213364263, - 53.79887943422917 + -1.5365345455066526, + 53.79894287867617 + ], + [ + -1.5364704490514407, + 53.79896714057663 + ], + [ + -1.5364561507519752, + 53.79892297488861 + ], + [ + -1.5364460805834452, + 53.79892411253055 + ], + [ + -1.5364561857707046, + 53.798925515472376 + ], + [ + -1.5364784028706726, + 53.79886968917938 + ], + [ + -1.5364429380331208, + 53.79886476539315 ], [ - -1.5365215931444385, - 53.79884400275338 + -1.5364898083185796, + 53.79882933211871 ], [ - -1.5365386898971483, - 53.798851892502526 + -1.5365392471517116, + 53.79885208136008 ], [ -1.5365386777167207, 53.79885188890524 + ], + [ + -1.5365008544438723, + 53.79889091227185 + ], + [ + -1.536551209854182, + 53.7988794603095 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 212, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #411 -> Road #412" + ], "osm_node_ids": [ - 7261942269 + 7261942269, + 2014304915, + 2014304919 ], "type": "intersection" }, @@ -20990,151 +19581,41 @@ "coordinates": [ [ [ - -1.5365528724825515, - 53.798879675247385 - ], - [ - -1.536532086582828, - 53.798935693995226 - ], - [ - -1.5365304254770122, - 53.79893547905734 - ], - [ - -1.5365302534284722, - 53.7989359089331 + -1.5364866946967708, + 53.79904551016634 ], [ - -1.536456187293258, - 53.79892551457306 + -1.536427007556355, + 53.79904210173714 ], [ - -1.5364784028706726, - 53.79886968917938 + -1.5364273272925801, + 53.79904015110841 ], [ - -1.536478629731137, - 53.79886972065564 + -1.5364097966121366, + 53.798996375726006 ], [ - -1.5364788078698908, - 53.798869278189365 + -1.5364681499957284, + 53.7989882224756 ], [ - -1.536552870959998, - 53.79887967794535 + -1.5365080271931835, + 53.79901467332503 ], [ - -1.5365528724825515, - 53.798879675247385 + -1.5364866946967708, + 53.79904551016634 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signalled", - "id": 214, - "intersection_kind": "Connection", - "movements": [ - "Road #411 -> Road #412" - ], - "osm_node_ids": [ - 2014304915 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5365345455066526, - 53.79894287867617 - ], - [ - -1.5364704490514407, - 53.79896714057663 - ], - [ - -1.5364561507519752, - 53.79892297488861 - ], - [ - -1.536457259170888, - 53.7989228498829 - ], - [ - -1.5365313253061021, - 53.798933242444306 - ], - [ - -1.5365293688249166, - 53.798938106875305 - ], - [ - -1.5365345455066526, - 53.79894287867617 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 216, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 2014304919 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5364866946967708, - 53.79904551016634 - ], - [ - -1.536427007556355, - 53.79904210173714 - ], - [ - -1.5364273272925801, - 53.79904015110841 - ], - [ - -1.5364097966121366, - 53.798996375726006 - ], - [ - -1.5364681499957284, - 53.7989882224756 - ], - [ - -1.5365080271931835, - 53.79901467332503 - ], - [ - -1.5364866946967708, - 53.79904551016634 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 217, - "intersection_kind": "Fork", + "control": "Signed", + "id": 217, + "intersection_kind": "Fork", "movements": [ "Road #114 -> Road #115", "Road #248 -> Road #115" @@ -21151,20 +19632,20 @@ "coordinates": [ [ [ - -1.5364730937267863, - 53.799138305775216 + -1.5364575423658302, + 53.79920646626515 ], [ - -1.5364647653594052, - 53.79917338111963 + -1.5363981292850357, + 53.79920168007513 ], [ - -1.5364052304743347, - 53.79916915340838 + -1.5363967513741619, + 53.79920155776738 ], [ - -1.5364102411977445, - 53.79914452998061 + -1.5364058745144449, + 53.79916599139333 ], [ -1.5364118398788689, @@ -21175,99 +19656,12 @@ 53.79913817717222 ], [ - -1.5364730937267863, + -1.536473092204233, 53.799138305775216 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 218, - "intersection_kind": "Fork", - "movements": [ - "Road #99 -> Road #116", - "Road #115 -> Road #116" - ], - "osm_node_ids": [ - 342579578 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5364670080806397, - 53.798810669395074 - ], - [ - -1.5364050553806878, - 53.79883680188463 - ], - [ - -1.536394685269128, - 53.7988380780221 - ], - [ - -1.536379152178813, - 53.7987940580242 ], [ - -1.5364546023151149, - 53.79878806584381 - ], - [ - -1.5364580630791107, - 53.798803271574876 - ], - [ - -1.5364670080806397, - 53.798810669395074 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 219, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 7261942271 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5364575423658302, - 53.79920646626515 - ], - [ - -1.5363981292850357, - 53.79920168007513 - ], - [ - -1.5363967513741619, - 53.79920155776738 - ], - [ - -1.5364058745144449, - 53.79916599139333 - ], - [ - -1.5364654093995154, - 53.799170219104575 + -1.5364647638368518, + 53.79917338111963 ], [ -1.5364575423658302, @@ -21279,14 +19673,17 @@ }, "properties": { "control": "Signed", - "id": 220, + "id": 218, "intersection_kind": "Intersection", "movements": [ "Road #690 -> Road #117", - "Road #116 -> Road #117", - "Road #116 -> Road #690" + "Road #115 -> Road #117", + "Road #115 -> Road #690", + "Road #99 -> Road #117", + "Road #99 -> Road #690" ], "osm_node_ids": [ + 342579578, 800488938 ], "type": "intersection" @@ -21298,27 +19695,7 @@ "coordinates": [ [ [ - -1.5364603880182315, - 53.79896884209326 - ], - [ - -1.5364020346346394, - 53.798976995343665 - ], - [ - -1.5363749956078898, - 53.79893496104805 - ], - [ - -1.5363873069751006, - 53.79893219743251 - ], - [ - -1.5363865761494437, - 53.79892923416755 - ], - [ - -1.5364459161476725, + -1.5364459131025656, 53.7989241314163 ], [ @@ -21328,40 +19705,14 @@ [ -1.5364603880182315, 53.79896884209326 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 221, - "intersection_kind": "Connection", - "movements": [ - "Road #113 -> Road #114" - ], - "osm_node_ids": [ - 2014304920 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5364681195446594, - 53.79886826195586 ], [ - -1.5364459054897983, - 53.79892408824886 + -1.5364020346346394, + 53.798976995343665 ], [ - -1.5363865654915696, - 53.79892919189943 + -1.5363749940853364, + 53.79893496194737 ], [ -1.536348448365905, @@ -21382,6 +19733,18 @@ [ -1.5364681195446594, 53.79886826195586 + ], + [ + -1.5364459054897983, + 53.79892408824886 + ], + [ + -1.5364460805834452, + 53.79892411253055 + ], + [ + -1.5364459131025656, + 53.7989241314163 ] ] ], @@ -21392,13 +19755,14 @@ "id": 224, "intersection_kind": "Intersection", "movements": [ - "Road #412 -> Road #113", - "Road #412 -> Road #413", - "Road #112 -> Road #113", - "Road #112 -> Road #413" + "Road #112 -> Road #114", + "Road #112 -> Road #413", + "Road #412 -> Road #114", + "Road #412 -> Road #413" ], "osm_node_ids": [ - 1675168064 + 1675168064, + 2014304920 ], "type": "intersection" }, @@ -21408,6 +19772,18 @@ "geometry": { "coordinates": [ [ + [ + -1.5364670050355327, + 53.79881066849575 + ], + [ + -1.5364050553806878, + 53.79883680278395 + ], + [ + -1.5364286625719572, + 53.79885632795708 + ], [ -1.5364231844246379, 53.798836260492976 @@ -21417,32 +19793,36 @@ 53.798841899239946 ], [ - -1.5363482017122458, - 53.79879790891967 + -1.5363482032347993, + 53.79879790981899 ], [ -1.5363510762931627, - 53.798797549190986 + 53.79879755098963 ], [ -1.5363508022335413, - 53.79879666605709 + 53.79879666695641 ], [ -1.5364097859542625, - 53.79879028806769 + 53.79879028896701 + ], + [ + -1.5363791537013665, + 53.79879405712488 ], [ - -1.5364253099092564, - 53.79883430896491 + -1.5364546023151149, + 53.79878806584381 ], [ - -1.5364227383164764, - 53.79883462552615 + -1.5364580646016641, + 53.79880327427284 ], [ - -1.5364231844246379, - 53.798836260492976 + -1.5364670050355327, + 53.79881066849575 ] ] ], @@ -21456,7 +19836,8 @@ "Road #111 -> Road #112" ], "osm_node_ids": [ - 2014304911 + 2014304911, + 7261942271 ], "type": "intersection" }, @@ -22313,20 +20694,28 @@ 53.796616902744326 ], [ - -1.5361032517903739, - 53.79659027203055 - ], + -1.5360749749276679, + 53.79659002831437 + ], + [ + -1.5360445299488465, + 53.796590427613204 + ], + [ + -1.5360445223360795, + 53.7965902450509 + ], [ - -1.536066482124514, - 53.796589955469315 + -1.5360433301767267, + 53.79657227300632 ], [ -1.536066926710122, 53.796571970834236 ], [ - -1.536103040155444, - 53.79654693281917 + -1.5361030386328907, + 53.79654693191984 ], [ -1.5361980231299783, @@ -22342,7 +20731,8 @@ "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 342579554 + 342579554, + 6500031458 ], "type": "intersection" }, @@ -22673,50 +21063,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5360754195132758, - 53.79657204457861 - ], - [ - -1.5360749749276679, - 53.7965900292137 - ], - [ - -1.5360445299488465, - 53.79659042851252 - ], - [ - -1.5360445223360795, - 53.7965902450509 - ], - [ - -1.5360433286541733, - 53.79657227300632 - ], - [ - -1.5360754195132758, - 53.79657204457861 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 262, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6500031458 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -22915,20 +21261,36 @@ 53.79824047066766 ], [ - -1.53584734861897, - 53.79821254223269 + -1.5359082477119335, + 53.798251444190875 + ], + [ + -1.5358364867226453, + 53.798290071855945 + ], + [ + -1.5357804932969035, + 53.79825960733382 + ], + [ + -1.53577569268587, + 53.79825028766319 + ], + [ + -1.5358480292003631, + 53.79821203591458 ], [ - -1.5358502140645665, - 53.798210406343685 + -1.5358502171096733, + 53.798210407243005 ], [ - -1.5359058405549262, + -1.5359058420774796, 53.798179707997924 ], [ - -1.5359260326588033, - 53.79819247296994 + -1.5359260402715706, + 53.79819247656722 ], [ -1.5359532132830243, @@ -22939,12 +21301,15 @@ "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 269, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #143 -> Road #144" + ], "osm_node_ids": [ - 2014304855 + 2014304855, + 2014304856 ], "type": "intersection" }, @@ -23309,60 +21674,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5359082477119335, - 53.798251444190875 - ], - [ - -1.5358364867226453, - 53.798290071855945 - ], - [ - -1.5357804932969035, - 53.79825960733382 - ], - [ - -1.5357756942084235, - 53.79825028766319 - ], - [ - -1.5358480307229165, - 53.79821203591458 - ], - [ - -1.535907693502477, - 53.79823996434955 - ], - [ - -1.5358997137998365, - 53.79824591246318 - ], - [ - -1.5359082477119335, - 53.798251444190875 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 279, - "intersection_kind": "Connection", - "movements": [ - "Road #143 -> Road #144" - ], - "osm_node_ids": [ - 2014304856 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -23461,50 +21772,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5358120421269774, - 53.79909629666061 - ], - [ - -1.5357807566986508, - 53.799055303779504 - ], - [ - -1.5357464809753447, - 53.79907389635604 - ], - [ - -1.5358074714215153, - 53.799046986852545 - ], - [ - -1.5358428129322375, - 53.79908681511207 - ], - [ - -1.5358120421269774, - 53.79909629666061 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 285, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 7237437041 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -23791,16 +22058,20 @@ "coordinates": [ [ [ - -1.5358084565135985, - 53.79904776566513 + -1.5358074714215153, + 53.799046987751865 + ], + [ + -1.5358428129322375, + 53.79908681511207 ], [ - -1.5357474660674282, - 53.799074675168626 + -1.5358120421269774, + 53.79909629666061 ], [ - -1.5357471432860963, - 53.79907441976127 + -1.5357807566986508, + 53.799055303779504 ], [ -1.535746080543787, @@ -23811,24 +22082,24 @@ 53.79902793562194 ], [ - -1.5356887959927181, + -1.5356887975152715, 53.79902667387362 ], [ - -1.5357515921872824, - 53.799001253646836 + -1.535751590664729, + 53.79900125184819 ], [ - -1.535810804291021, + -1.5358108027684676, 53.79904670086825 ], [ - -1.535808458036152, - 53.79904776746377 + -1.5358159383412604, + 53.799044366229154 ], [ - -1.5358084565135985, - 53.79904776566513 + -1.5358074714215153, + 53.799046987751865 ] ] ], @@ -23842,7 +22113,8 @@ "Road #4 -> Road #350" ], "osm_node_ids": [ - 7237437075 + 7237437075, + 7237437041 ], "type": "intersection" }, @@ -24461,139 +22733,305 @@ "coordinates": [ [ [ - -1.5356309998636894, - 53.79884681763025 + -1.5355530892810096, + 53.798833076894205 ], [ - -1.535593995724598, - 53.798886114390655 + -1.5355533389797758, + 53.7988302566214 ], [ - -1.535566790739522, - 53.79887717603242 + -1.535554088076074, + 53.79882746782485 ], [ - -1.5355287817151524, - 53.798865966886915 + -1.5355553243894768, + 53.79882473928285 ], [ - -1.535562789469051, - 53.798825736630604 + -1.5355570387846635, + 53.79882210337099 ], [ - -1.5356347438226274, - 53.79884041715781 + -1.5355592084233323, + 53.79881958706891 ], [ - -1.5356309998636894, - 53.798846818529576 + -1.535561811989735, + 53.79881721825559 ], [ - -1.5356309998636894, - 53.79884681763025 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 306, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 7237437048 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ + -1.535564822077909, + 53.79881502391068 + ], [ - -1.5356224278877562, - 53.798651962499804 + -1.535568202146572, + 53.79881302741653 ], [ - -1.535502289285092, - 53.79867555170763 + -1.5355719171769942, + 53.79881124945756 ], [ - -1.5355965201182211, - 53.7986588755856 + -1.535575927582786, + 53.79880971161747 ], [ - -1.535499445155244, - 53.798657893526325 + -1.535580187687344, + 53.79880843008407 ], [ - -1.5354958717222928, - 53.798653959893265 + -1.5355846502915111, + 53.798807417447854 ], [ - -1.5356224294103096, - 53.798651963399124 + -1.5355892697186837, + 53.79880668719864 ], [ - -1.5356224278877562, - 53.798651962499804 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 310, - "intersection_kind": "Fork", - "movements": [ - "Road #527 -> Road #711", - "Road #490 -> Road #711" - ], - "osm_node_ids": [ - 6211583013 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ + -1.5355939911569376, + 53.798806244732376 + ], [ - -1.5356231206495767, - 53.79880358094154 + -1.5355987658845625, + 53.79880609724362 ], [ - -1.5355673495166389, - 53.798818034839684 + -1.535603540612187, + 53.798806244732376 ], [ - -1.5354737292274439, - 53.798802824612004 + -1.535608262050441, + 53.79880668719864 ], [ - -1.5354956418167216, - 53.798755744222404 + -1.5356128814776135, + 53.798807417447854 ], [ - -1.5354633834767393, - 53.79874266628644 + -1.5356173440817806, + 53.79880843008407 ], [ - -1.5354978479966732, - 53.79871300665722 + -1.5356216041863386, + 53.79880971161747 ], [ - -1.5355949229596502, - 53.79871398781719 + -1.5356256145921308, + 53.79881124945756 ], [ - -1.5356231206495767, - 53.79880358094154 + -1.535629329622553, + 53.79881302741653 + ], + [ + -1.535632709691216, + 53.79881502391068 + ], + [ + -1.53563571977939, + 53.79881721825559 + ], + [ + -1.5356383233457924, + 53.79881958706891 + ], + [ + -1.5356404929844611, + 53.79882210337099 + ], + [ + -1.5356422073796479, + 53.79882473928285 + ], + [ + -1.5356434436930506, + 53.79882746782485 + ], + [ + -1.535644192789349, + 53.7988302566214 + ], + [ + -1.535644442488115, + 53.798833076894205 + ], + [ + -1.535644192789349, + 53.79883589716702 + ], + [ + -1.5356434436930506, + 53.79883868596357 + ], + [ + -1.5356422073796479, + 53.79884141450556 + ], + [ + -1.5356404929844611, + 53.79884405041742 + ], + [ + -1.5356383233457924, + 53.798846566719504 + ], + [ + -1.53563571977939, + 53.798848935532824 + ], + [ + -1.535632709691216, + 53.79885112987774 + ], + [ + -1.535629329622553, + 53.79885312637188 + ], + [ + -1.5356256145921308, + 53.79885490433085 + ], + [ + -1.5356216041863386, + 53.79885644217094 + ], + [ + -1.5356173440817806, + 53.798857723704344 + ], + [ + -1.5356128814776135, + 53.79885873634056 + ], + [ + -1.535608262050441, + 53.79885946658977 + ], + [ + -1.535603540612187, + 53.79885990905604 + ], + [ + -1.5355987658845625, + 53.7988600565448 + ], + [ + -1.5355939911569376, + 53.79885990905604 + ], + [ + -1.5355892697186837, + 53.79885946658977 + ], + [ + -1.5355846502915111, + 53.79885873634056 + ], + [ + -1.535580187687344, + 53.798857723704344 + ], + [ + -1.535575927582786, + 53.79885644217094 + ], + [ + -1.5355719171769942, + 53.79885490433085 + ], + [ + -1.535568202146572, + 53.79885312637188 + ], + [ + -1.535564822077909, + 53.79885112987774 + ], + [ + -1.535561811989735, + 53.798848935532824 + ], + [ + -1.5355592084233323, + 53.798846566719504 + ], + [ + -1.5355570387846635, + 53.79884405041742 + ], + [ + -1.5355553243894768, + 53.79884141450556 + ], + [ + -1.535554088076074, + 53.79883868596357 + ], + [ + -1.5355533389797758, + 53.79883589716702 + ], + [ + -1.5355530892810096, + 53.798833076894205 + ] + ] + ], + "type": "Polygon" + }, + "properties": { + "control": "Signalled", + "id": 306, + "intersection_kind": "Intersection", + "movements": [ + "Road #488 -> Road #349", + "Road #488 -> Road #490", + "Road #487 -> Road #349", + "Road #487 -> Road #490" + ], + "osm_node_ids": [ + 7237437048, + 6211583022, + 6211583020, + 682218116, + 5452444914 + ], + "type": "intersection" + }, + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ + [ + -1.5356224278877562, + 53.798651962499804 + ], + [ + -1.535502289285092, + 53.79867555170763 + ], + [ + -1.5355965201182211, + 53.7986588755856 + ], + [ + -1.535499445155244, + 53.798657893526325 + ], + [ + -1.5354958717222928, + 53.798653959893265 + ], + [ + -1.5356224294103096, + 53.798651963399124 + ], + [ + -1.5356224278877562, + 53.798651962499804 ] ] ], @@ -24601,13 +23039,14 @@ }, "properties": { "control": "Signed", - "id": 312, - "intersection_kind": "Connection", + "id": 310, + "intersection_kind": "Fork", "movements": [ - "Road #489 -> Road #490" + "Road #527 -> Road #711", + "Road #490 -> Road #711" ], "osm_node_ids": [ - 6211583020 + 6211583013 ], "type": "intersection" }, @@ -24707,60 +23146,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5355636420989838, - 53.798825988440676 - ], - [ - -1.5355296343450855, - 53.79886621869699 - ], - [ - -1.5355248352566055, - 53.798864803164655 - ], - [ - -1.535478494819748, - 53.79885626140728 - ], - [ - -1.5354705349103022, - 53.798798761476625 - ], - [ - -1.5354953982081694, - 53.79875626133237 - ], - [ - -1.5355890169748108, - 53.79877146256683 - ], - [ - -1.5355636420989838, - 53.798825988440676 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 316, - "intersection_kind": "Connection", - "movements": [ - "Road #488 -> Road #489" - ], - "osm_node_ids": [ - 6211583022 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -24893,54 +23278,58 @@ "coordinates": [ [ [ - -1.5354995532565392, - 53.79871369733628 + -1.5354807436311961, + 53.79790149833765 ], [ - -1.5354650887366053, - 53.798743356965495 + -1.5353969971011359, + 53.7979305122539 ], [ - -1.5354600704004282, - 53.79875852222709 + -1.5353892001049094, + 53.79792266027626 ], [ - -1.5353647829152035, - 53.79874752352286 + -1.5353879455208652, + 53.79792301370968 ], [ - -1.5353419446134273, - 53.798714174876096 + -1.5353748363356454, + 53.797906779154594 ], [ - -1.5353786777380043, - 53.79870539839576 + -1.535461862445841, + 53.79788135173324 ], [ - -1.5353830124476815, - 53.798693195499794 + -1.5354654191307042, + 53.79788559922956 ], [ - -1.5354780350086055, - 53.79870497121796 + -1.535470787654175, + 53.79788450205711 + ], + [ + -1.5354807451537495, + 53.79790149923698 ], [ - -1.5354995532565392, - 53.79871369733628 + -1.5354807436311961, + 53.79790149833765 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signed", - "id": 321, + "control": "Signalled", + "id": 323, "intersection_kind": "Connection", "movements": [ - "Road #348 -> Road #349" + "Road #141 -> Road #142" ], "osm_node_ids": [ - 5452444914 + 2014304851 ], "type": "intersection" }, @@ -24951,42 +23340,36 @@ "coordinates": [ [ [ - -1.5354630074060367, - 53.79874964951933 - ], - [ - -1.5354381441081695, - 53.79879214966358 + -1.535243500874897, + 53.80007034748244 ], [ - -1.5354273263658949, - 53.798789940929524 + -1.5351950532240621, + 53.80000554595901 ], [ - -1.5353806372642966, - 53.798782085354595 + -1.5353047608130284, + 53.79997693044227 ], [ - -1.535367719920812, - 53.798738649016464 + -1.5353532084638633, + 53.8000417319657 ], [ - -1.5354630074060367, - 53.79874964951933 + -1.535243500874897, + 53.80007034748244 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signalled", - "id": 322, - "intersection_kind": "Connection", - "movements": [ - "Road #487 -> Road #348" - ], + "control": "Signed", + "id": 324, + "intersection_kind": "Terminus", + "movements": [], "osm_node_ids": [ - 682218116 + 342579609 ], "type": "intersection" }, @@ -24997,166 +23380,16 @@ "coordinates": [ [ [ - -1.5354807436311961, - 53.79790149833765 + -1.5353633258315502, + 53.79846072354185 ], [ - -1.5353969971011359, - 53.7979305122539 + -1.535361474406553, + 53.798478675801356 ], [ - -1.5353892001049094, - 53.79792266027626 - ], - [ - -1.5353879455208652, - 53.79792301370968 - ], - [ - -1.5353748363356454, - 53.797906779154594 - ], - [ - -1.535461862445841, - 53.79788135173324 - ], - [ - -1.5354654191307042, - 53.79788559922956 - ], - [ - -1.535470787654175, - 53.79788450205711 - ], - [ - -1.5354807451537495, - 53.79790149923698 - ], - [ - -1.5354807436311961, - 53.79790149833765 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 323, - "intersection_kind": "Connection", - "movements": [ - "Road #141 -> Road #142" - ], - "osm_node_ids": [ - 2014304851 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.535243500874897, - 53.80007034748244 - ], - [ - -1.5351950532240621, - 53.80000554595901 - ], - [ - -1.5353047608130284, - 53.79997693044227 - ], - [ - -1.5353532084638633, - 53.8000417319657 - ], - [ - -1.535243500874897, - 53.80007034748244 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 324, - "intersection_kind": "Terminus", - "movements": [], - "osm_node_ids": [ - 342579609 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.535373574138834, - 53.79925607284936 - ], - [ - -1.5353363081205489, - 53.799227620109846 - ], - [ - -1.5353354098140124, - 53.79922685568641 - ], - [ - -1.5353854561459714, - 53.7992063565479 - ], - [ - -1.5354202099510612, - 53.799235895668005 - ], - [ - -1.5353958277800848, - 53.79924590331973 - ], - [ - -1.535373574138834, - 53.79925607284936 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 327, - "intersection_kind": "Terminus", - "movements": [], - "osm_node_ids": [ - 9319419267 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5353633258315502, - 53.79846072354185 - ], - [ - -1.535361474406553, - 53.798478675801356 - ], - [ - -1.5353310796719954, - 53.798477582226184 + -1.5353310796719954, + 53.798477582226184 ], [ -1.5353329310969928, @@ -25501,12 +23734,16 @@ "coordinates": [ [ [ - -1.5354000102344167, - 53.799218753697346 + -1.535373574138834, + 53.79925607284936 + ], + [ + -1.5353363081205489, + 53.799227620109846 ], [ -1.5353499639024577, - 53.79923925283586 + 53.79923925373518 ], [ -1.5352941105516333, @@ -25521,8 +23758,20 @@ 53.79921856663844 ], [ - -1.5354000102344167, - 53.799218753697346 + -1.5353854561459714, + 53.79920635474925 + ], + [ + -1.5354202099510612, + 53.799235895668005 + ], + [ + -1.5353958277800848, + 53.79924590331973 + ], + [ + -1.535373574138834, + 53.79925607284936 ] ] ], @@ -25531,14 +23780,13 @@ "properties": { "control": "Signed", "id": 332, - "intersection_kind": "Fork", + "intersection_kind": "Connection", "movements": [ - "Road #845 -> Road #351", - "Road #350 -> Road #845", "Road #350 -> Road #351" ], "osm_node_ids": [ - 9319419293 + 9319419293, + 9319419267 ], "type": "intersection" }, @@ -25787,12 +24035,44 @@ 53.79768332379588 ], [ - -1.5352345604410285, - 53.79766207192511 + -1.535276468724788, + 53.79769148424086 + ], + [ + -1.5352687661268756, + 53.79768911542754 + ], + [ + -1.5352430501990753, + 53.79771829302033 + ], + [ + -1.5352825132619914, + 53.79768186779407 + ], + [ + -1.5351996589482537, + 53.79771176304556 + ], + [ + -1.5351981683684246, + 53.79771220371319 + ], + [ + -1.53518452324439, + 53.79769612384144 + ], + [ + -1.535166987996286, + 53.797677049228476 + ], + [ + -1.5352523118917223, + 53.7976496846682 ], [ -1.5352811855953814, - 53.7976295344665 + 53.797629533567175 ], [ -1.5353367648865843, @@ -25813,10 +24093,14 @@ "properties": { "control": "Signalled", "id": 344, - "intersection_kind": "Connection", - "movements": [], + "intersection_kind": "Fork", + "movements": [ + "Road #149 -> Road #704", + "Road #149 -> Road #554" + ], "osm_node_ids": [ - 5452444895 + 5452444895, + 5452444896 ], "type": "intersection" }, @@ -25929,46 +24213,44 @@ "coordinates": [ [ [ - -1.5353023841070903, - 53.79795160584405 + -1.5353556308464051, + 53.798057411939766 ], [ - -1.535212008379301, - 53.79797256363663 + -1.5353156851340448, + 53.79809569066802 ], [ - -1.5351988093634277, - 53.79795635336323 + -1.5352454862845981, + 53.79811308984469 ], [ - -1.5352830248399512, - 53.79792781698681 + -1.5351998157712594, + 53.79804880363258 ], [ - -1.535286707896751, - 53.79793160852704 + -1.5351952481109041, + 53.79804287080742 ], [ - -1.5352998718938948, - 53.79794782779365 + -1.5352645456087073, + 53.798024253049874 ], [ - -1.5353023841070903, - 53.79795160584405 + -1.5353556308464051, + 53.798057411939766 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signalled", - "id": 365, + "control": "Signed", + "id": 366, "intersection_kind": "Connection", - "movements": [ - "Road #484 -> Road #485" - ], + "movements": [], "osm_node_ids": [ - 8174077586 + 5452456322 ], "type": "intersection" }, @@ -25979,60 +24261,12 @@ "coordinates": [ [ [ - -1.5353556308464051, - 53.798057411939766 + -1.535255970587667, + 53.798270287678164 ], [ - -1.5353156851340448, - 53.79809569066802 - ], - [ - -1.5352454862845981, - 53.79811308984469 - ], - [ - -1.5351998157712594, - 53.79804880363258 - ], - [ - -1.5351952481109041, - 53.79804287080742 - ], - [ - -1.5352645456087073, - 53.798024253049874 - ], - [ - -1.5353556308464051, - 53.798057411939766 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 366, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 5452456322 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.535255970587667, - 53.798270287678164 - ], - [ - -1.5351819470839496, - 53.7982597889968 + -1.5351819470839496, + 53.7982597889968 ], [ -1.535165896325461, @@ -26071,87 +24305,48 @@ "coordinates": [ [ [ - -1.5352687661268756, - 53.79768911542754 - ], - [ - -1.5352430501990753, - 53.79771829302033 - ], - [ - -1.5352825132619914, - 53.79768186779407 - ], - [ - -1.5351996589482537, - 53.79771176304556 + -1.5352548058342763, + 53.798456818687086 ], [ - -1.5351981683684246, - 53.79771220371319 + -1.535252954409279, + 53.79847477094659 ], [ - -1.53518452324439, - 53.79769612384144 + -1.535252738206689, + 53.798485292110996 ], [ - -1.535166987996286, - 53.797677049228476 + -1.5351766166243148, + 53.79848474712206 ], [ - -1.5352523118917223, - 53.7976496846682 + -1.535168959703006, + 53.798484299259854 ], [ - -1.5352948185389885, - 53.797670934740324 + -1.5350949392443956, + 53.79847379158527 ], [ - -1.5352687661268756, - 53.79768911542754 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 368, - "intersection_kind": "Fork", - "movements": [ - "Road #149 -> Road #704", - "Road #149 -> Road #554" - ], - "osm_node_ids": [ - 5452444896 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5352548058342763, - 53.798456818687086 + -1.5350980772270595, + 53.798466078103175 ], [ - -1.535252954409279, - 53.79847477094659 + -1.5351017404906644, + 53.798448222970414 ], [ - -1.535252738206689, - 53.798485292110996 + -1.5351052393184967, + 53.79844847388116 ], [ - -1.5351766166243148, - 53.79848474712206 + -1.5351128855819314, + 53.79842966366877 ], [ - -1.5351840999745303, - 53.79843999777427 + -1.5351869090856487, + 53.79844016235014 ], [ -1.5352548058342763, @@ -26167,7 +24362,8 @@ "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 7237437002 + 7237437002, + 7237437001 ], "type": "intersection" }, @@ -26217,6 +24413,14 @@ "geometry": { "coordinates": [ [ + [ + -1.5353023841070903, + 53.79795160584405 + ], + [ + -1.535212008379301, + 53.79797256363663 + ], [ -1.5352230179633106, 53.797970323426306 @@ -26226,12 +24430,12 @@ 53.79798893938521 ], [ - -1.5351406478215706, + -1.5351406508666776, 53.79797269403827 ], [ -1.5351411091552665, - 53.797972564535954 + 53.79797256543527 ], [ -1.5351405656036843, @@ -26242,28 +24446,39 @@ 53.79795324081088 ], [ - -1.5352229616288329, - 53.797969479862566 + -1.5351988063183208, + 53.79795635246391 + ], + [ + -1.5352830248399512, + 53.79792781698681 ], [ - -1.5352224744117284, - 53.79796961655946 + -1.535286707896751, + 53.79793160852704 ], [ - -1.5352230179633106, - 53.797970323426306 + -1.5352998718938948, + 53.79794782779365 + ], + [ + -1.5353023841070903, + 53.79795160584405 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 372, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #484 -> Road #485" + ], "osm_node_ids": [ - 6309407701 + 6309407701, + 8174077586 ], "type": "intersection" }, @@ -26371,66 +24586,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5351869106082023, - 53.79844016235014 - ], - [ - -1.5351794257354334, - 53.79848491079861 - ], - [ - -1.535168959703006, - 53.79848430015918 - ], - [ - -1.5350949392443956, - 53.79847379158527 - ], - [ - -1.5350980772270595, - 53.798466078103175 - ], - [ - -1.5351017404906644, - 53.798448222970414 - ], - [ - -1.5351052393184967, - 53.79844847388116 - ], - [ - -1.5351128855819314, - 53.79842966366877 - ], - [ - -1.5351869090856487, - 53.79844016235014 - ], - [ - -1.5351869106082023, - 53.79844016235014 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 375, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 7237437001 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -26712,15 +24867,31 @@ ], [ -1.5350151026315992, - 53.7984687293035 + 53.79846873020283 ], [ -1.534938990184546, - 53.79846785876011 + 53.79846785965943 + ], + [ + -1.534938690241516, + 53.798477000365054 + ], + [ + -1.534942677809006, + 53.798468169026094 + ], + [ + -1.534869120206645, + 53.79845658396413 + ], + [ + -1.5348722551442022, + 53.798449637603426 ], [ - -1.534949707438293, - 53.798423339638674 + -1.5348752865481246, + 53.798431741101865 ], [ -1.5350190475675927, @@ -26736,7 +24907,8 @@ "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 7237435065 + 7237435065, + 7237435066 ], "type": "intersection" }, @@ -26875,28 +25047,24 @@ "coordinates": [ [ [ - -1.534953395062753, - 53.798423649904656 - ], - [ - -1.5349426793315597, - 53.79846816812677 + -1.5348614846010844, + 53.79835407658036 ], [ - -1.534869120206645, - 53.79845658396413 + -1.5348875248327698, + 53.79834474701718 ], [ - -1.5348722551442022, - 53.798449637603426 + -1.5349033137120645, + 53.79836012721666 ], [ - -1.5348752850255711, - 53.798431741101865 + -1.534877279570593, + 53.79836945318255 ], [ - -1.534953395062753, - 53.798423649904656 + -1.5348614846010844, + 53.79835407658036 ] ] ], @@ -26904,11 +25072,11 @@ }, "properties": { "control": "Signed", - "id": 386, + "id": 387, "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 7237435066 + 5506378765 ], "type": "intersection" }, @@ -26919,48 +25087,8 @@ "coordinates": [ [ [ - -1.5348614846010844, - 53.79835407658036 - ], - [ - -1.5348875248327698, - 53.79834474701718 - ], - [ - -1.5349033137120645, - 53.79836012721666 - ], - [ - -1.534877279570593, - 53.79836945318255 - ], - [ - -1.5348614846010844, - 53.79835407658036 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 387, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 5506378765 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.534793315315389, - 53.79656667742679 + -1.534793315315389, + 53.79656667742679 ], [ -1.5347575809858762, @@ -28507,54 +26635,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5344815024586833, - 53.79969306314928 - ], - [ - -1.5344526470256656, - 53.7996784006085 - ], - [ - -1.5345051598942168, - 53.79964584516346 - ], - [ - -1.5345056547240885, - 53.79964612305386 - ], - [ - -1.5345313310654989, - 53.79966272003558 - ], - [ - -1.534504992413337, - 53.799676936512796 - ], - [ - -1.5344815024586833, - 53.79969306314928 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 424, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6211583005 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -28783,63 +26863,16 @@ "coordinates": [ [ [ - -1.5344692291553086, - 53.79707772596825 - ], - [ - -1.5343837986811306, - 53.7971049736167 - ], - [ - -1.5343602204183768, - 53.797109761605356 - ], - [ - -1.5343308473171855, - 53.79705925390081 - ], - [ - -1.5344565127888796, - 53.79703143608241 - ], - [ - -1.5344692291553086, - 53.79707772596825 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 432, - "intersection_kind": "Fork", - "movements": [ - "Road #69 -> Road #211", - "Road #694 -> Road #211" - ], - "osm_node_ids": [ - 26661432 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.53450528931126, - 53.799645918907835 + -1.5344815024586833, + 53.79969306224996 ], [ - -1.534452776442709, - 53.79967847435288 + -1.5344526470256656, + 53.79967839970918 ], [ - -1.534452152195794, - 53.7996781227181 + -1.5344253643903636, + 53.79969712988194 ], [ -1.5344091111322662, @@ -28874,8 +26907,24 @@ 53.79964591980716 ], [ - -1.53450528931126, - 53.799645918907835 + -1.5345269308860232, + 53.79963463871592 + ], + [ + -1.53447846191944, + 53.79966080178242 + ], + [ + -1.5345041382608506, + 53.79967739786482 + ], + [ + -1.5345049802329094, + 53.79967694370737 + ], + [ + -1.5344815024586833, + 53.79969306224996 ] ] ], @@ -28889,7 +26938,8 @@ "Road #352 -> Road #353" ], "osm_node_ids": [ - 643950 + 643950, + 6211583005 ], "type": "intersection" }, @@ -29005,50 +27055,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5344096820898105, - 53.797119821417745 - ], - [ - -1.534356867755676, - 53.79713773410709 - ], - [ - -1.534332898196685, - 53.79713415120949 - ], - [ - -1.5343365705956107, - 53.79711629607673 - ], - [ - -1.534389727504272, - 53.79709874041809 - ], - [ - -1.5344096820898105, - 53.797119821417745 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 438, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6264670253 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -29141,109 +27147,63 @@ "coordinates": [ [ [ - -1.534393718116869, - 53.79710295733748 - ], - [ - -1.5343405627307611, - 53.79712051389544 - ], - [ - -1.5343351789817559, - 53.797114826585094 - ], - [ - -1.5343254894515888, - 53.79711678530773 - ], - [ - -1.5342962077036046, - 53.7970662578181 - ], - [ - -1.5343520838927307, - 53.79705195140872 + -1.5343950336030512, + 53.79655586398283 ], [ - -1.5343539931747592, - 53.79705455314636 + -1.5343010463784743, + 53.796570244136596 ], [ - -1.534364319132269, - 53.79705245592819 + -1.5341952669774137, + 53.796611231621775 ], [ - -1.5343937196394224, - 53.7971029582368 + -1.53406545102501, + 53.796631363837044 ], [ - -1.534393718116869, - 53.79710295733748 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 441, - "intersection_kind": "Connection", - "movements": [ - "Road #693 -> Road #694" - ], - "osm_node_ids": [ - 6264670255 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5343950336030512, - 53.79655586398283 + -1.534047841171787, + 53.79661142857322 ], [ - -1.5343010463784743, - 53.796570244136596 + -1.5340165420404794, + 53.79657093031904 ], [ - -1.5342918866969086, - 53.79654935649111 + -1.5340102143083338, + 53.79653570928452 ], [ - -1.5341851191586577, - 53.79659093842792 + -1.5339885453276085, + 53.79652362330038 ], [ - -1.5341641657780547, - 53.79657216778568 + -1.5340552027177263, + 53.79648192714971 ], [ - -1.5341522228687792, - 53.796515255112084 + -1.5341519061776612, + 53.796487041592144 ], [ -1.5342765652415236, - 53.796506152177976 + 53.79650615397662 ], [ -1.5343723125378907, - 53.79649665084436 + 53.79649665174368 ], [ -1.5343731468971822, - 53.79649958623035 + 53.79649958712967 ], [ - -1.5343844899203978, + -1.5343844914429512, 53.796498855081815 ], [ - -1.5343950320804978, + -1.5343950336030512, 53.79655586308351 ], [ @@ -29259,12 +27219,20 @@ "id": 444, "intersection_kind": "Intersection", "movements": [ + "Road #212 -> Road #6", + "Road #212 -> Road #417", + "Road #212 -> Road #404", + "Road #212 -> Road #134", "Road #465 -> Road #6", "Road #409 -> Road #6", - "Road #409 -> Road #669" + "Road #409 -> Road #417", + "Road #409 -> Road #404", + "Road #409 -> Road #134" ], "osm_node_ids": [ - 643914 + 643914, + 6905278501, + 342628235 ], "type": "intersection" }, @@ -29415,180 +27383,248 @@ "coordinates": [ [ [ - -1.534297506441699, - 53.799608175275985 + -1.5343808357921136, + 53.797091349792474 ], [ - -1.5343488834853751, - 53.79964135664892 + -1.5343810854908797, + 53.79708852951967 ], [ - -1.5342713017742409, - 53.799645556481195 + -1.534381834587178, + 53.79708574072312 ], [ - -1.5341419791291557, - 53.79957916495703 + -1.5343830709005808, + 53.79708301218112 ], [ - -1.5341894827968505, - 53.79954402845874 + -1.5343847852957675, + 53.79708037626926 ], [ - -1.5341952806803947, - 53.79954676329599 + -1.5343869549344362, + 53.79707785996718 ], [ - -1.53428093496993, - 53.79950444661336 + -1.5343895585008387, + 53.79707549115386 ], [ - -1.5343908633291468, - 53.79958207785997 + -1.5343925685890127, + 53.79707329680895 ], [ - -1.534297506441699, - 53.799608175275985 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 450, - "intersection_kind": "Connection", - "movements": [ - "Road #199 -> Road #200" - ], - "osm_node_ids": [ - 1152092781 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ + -1.5343959486576757, + 53.7970713003148 + ], [ - -1.5343301773936668, - 53.79711583742267 + -1.5343996636880979, + 53.79706952235583 ], [ - -1.5343265049947412, - 53.797133692555434 + -1.53440367409389, + 53.79706798451574 ], [ - -1.5342225206842, - 53.797127871246154 + -1.534407934198448, + 53.79706670298234 ], [ - -1.534214697804565, - 53.79709275453295 + -1.534412396802615, + 53.79706569034612 ], [ - -1.534300894123129, - 53.797065309933046 + -1.5344170162297877, + 53.79706496009691 ], [ - -1.5343301758711134, - 53.79711583742267 + -1.5344217376680416, + 53.797064517630645 ], [ - -1.5343301773936668, - 53.79711583742267 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 451, - "intersection_kind": "Connection", - "movements": [ - "Road #697 -> Road #693" - ], - "osm_node_ids": [ - 26661455 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ + -1.5344265123956662, + 53.79706437014189 + ], [ - -1.5341986637941645, - 53.79897871934334 + -1.534431287123291, + 53.797064517630645 ], [ - -1.5341684593787885, - 53.79897643326761 + -1.534436008561545, + 53.79706496009691 ], [ - -1.534171032494122, - 53.798964573912535 + -1.5344406279887175, + 53.79706569034612 ], [ - -1.5341729417761505, - 53.79894662345168 + -1.5344450905928846, + 53.79706670298234 ], [ - -1.5341990961993448, - 53.79893375325902 + -1.5344493506974426, + 53.79706798451574 ], [ - -1.5341986668392713, - 53.79897871934334 + -1.5344533611032345, + 53.79706952235583 ], [ - -1.5341986637941645, - 53.79897871934334 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 452, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 7237437091 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ + -1.5344570761336567, + 53.7970713003148 + ], [ - -1.5341482413915026, - 53.79749379264981 + -1.5344604562023196, + 53.79707329680895 ], [ - -1.5341633573021718, - 53.79750940667293 + -1.534463466290494, + 53.79707549115386 ], [ - -1.5341369227291424, - 53.79751833513863 + -1.5344660698568964, + 53.79707785996718 ], [ - -1.5341218068184734, - 53.797502721115514 + -1.534468239495565, + 53.79708037626926 ], [ - -1.5341482413915026, - 53.79749379264981 + -1.5344699538907518, + 53.79708301218112 + ], + [ + -1.5344711902041546, + 53.79708574072312 + ], + [ + -1.534471939300453, + 53.79708852951967 + ], + [ + -1.534472188999219, + 53.797091349792474 + ], + [ + -1.534471939300453, + 53.797094170065286 + ], + [ + -1.5344711902041546, + 53.797096958861836 + ], + [ + -1.5344699538907518, + 53.79709968740383 + ], + [ + -1.534468239495565, + 53.79710232331569 + ], + [ + -1.5344660698568964, + 53.79710483961777 + ], + [ + -1.534463466290494, + 53.79710720843109 + ], + [ + -1.5344604562023196, + 53.79710940277601 + ], + [ + -1.5344570761336567, + 53.79711139927015 + ], + [ + -1.5344533611032345, + 53.79711317722912 + ], + [ + -1.5344493506974426, + 53.797114715069206 + ], + [ + -1.5344450905928846, + 53.79711599660261 + ], + [ + -1.5344406279887175, + 53.79711700923883 + ], + [ + -1.534436008561545, + 53.79711773948804 + ], + [ + -1.534431287123291, + 53.79711818195431 + ], + [ + -1.5344265123956662, + 53.797118329443066 + ], + [ + -1.5344217376680416, + 53.79711818195431 + ], + [ + -1.5344170162297877, + 53.79711773948804 + ], + [ + -1.534412396802615, + 53.79711700923883 + ], + [ + -1.534407934198448, + 53.79711599660261 + ], + [ + -1.53440367409389, + 53.797114715069206 + ], + [ + -1.5343996636880979, + 53.79711317722912 + ], + [ + -1.5343959486576757, + 53.79711139927015 + ], + [ + -1.5343925685890127, + 53.79710940277601 + ], + [ + -1.5343895585008387, + 53.79710720843109 + ], + [ + -1.5343869549344362, + 53.79710483961777 + ], + [ + -1.5343847852957675, + 53.79710232331569 + ], + [ + -1.5343830709005808, + 53.79709968740383 + ], + [ + -1.534381834587178, + 53.797096958861836 + ], + [ + -1.5343810854908797, + 53.797094170065286 + ], + [ + -1.5343808357921136, + 53.797091349792474 ] ] ], @@ -29596,73 +27632,65 @@ }, "properties": { "control": "Signed", - "id": 453, - "intersection_kind": "Connection", - "movements": [], + "id": 451, + "intersection_kind": "Fork", + "movements": [ + "Road #69 -> Road #211", + "Road #697 -> Road #211" + ], "osm_node_ids": [ - 8990249596 + 26661455, + 6264670253, + 6264670255, + 26661432 ], "type": "intersection" }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5342203510455312, - 53.79665923741339 - ], - [ - -1.5340946703483027, - 53.79668705882907 - ], - [ - -1.5340942958001536, - 53.79668646797472 - ], + "type": "Feature" + }, + { + "geometry": { + "coordinates": [ + [ [ - -1.5340681763956887, - 53.79664423223105 + -1.5341986637941645, + 53.79897871934334 ], [ - -1.5340709093791347, - 53.796643642276024 + -1.5341684593787885, + 53.79897643326761 ], [ - -1.5340676983139048, - 53.796636419823564 + -1.534171032494122, + 53.798964573912535 ], [ - -1.5341975173114153, - 53.79661629120558 + -1.5341729417761505, + 53.79894662345168 ], [ - -1.5342237021856786, - 53.796658514358754 + -1.5341990961993448, + 53.79893375325902 ], [ - -1.5342203525680849, - 53.796659239212026 + -1.5341986668392713, + 53.79897871934334 ], [ - -1.5342203510455312, - 53.79665923741339 + -1.5341986637941645, + 53.79897871934334 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signalled", - "id": 454, + "control": "Signed", + "id": 452, "intersection_kind": "Connection", - "movements": [ - "Road #211 -> Road #212" - ], + "movements": [], "osm_node_ids": [ - 643852 + 7237437091 ], "type": "intersection" }, @@ -29673,55 +27701,36 @@ "coordinates": [ [ [ - -1.5341810356703, - 53.799516637818144 - ], - [ - -1.5341510992243317, - 53.79951992753687 - ], - [ - -1.534101937495928, - 53.79945531577032 - ], - [ - -1.5341287527073202, - 53.79944819673985 - ], - [ - -1.5341282380842536, - 53.79944652220287 + -1.5341482413915026, + 53.79749379264981 ], [ - -1.5341581988910773, - 53.799443308027165 + -1.5341633573021718, + 53.79750940667293 ], [ - -1.5341860448711564, - 53.79951221045748 + -1.5341369227291424, + 53.79751833513863 ], [ - -1.5341799135484062, - 53.79951307470562 + -1.5341218068184734, + 53.797502721115514 ], [ - -1.5341810356703, - 53.799516637818144 + -1.5341482413915026, + 53.79749379264981 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signalled", - "id": 455, + "control": "Signed", + "id": 453, "intersection_kind": "Connection", - "movements": [ - "Road #705 -> Road #706", - "Road #706 -> Road #705" - ], + "movements": [], "osm_node_ids": [ - 1152092841 + 8990249596 ], "type": "intersection" }, @@ -29776,12 +27785,28 @@ "coordinates": [ [ [ - -1.5341928461174255, - 53.79954561576152 + -1.534297506441699, + 53.799608175275985 + ], + [ + -1.5343488834853751, + 53.79964135664892 + ], + [ + -1.5342713017742409, + 53.799645555581876 + ], + [ + -1.5341419791291557, + 53.799579164057704 + ], + [ + -1.5341343694070038, + 53.799584336056725 ], [ - -1.5341453394046236, - 53.79958075225981 + -1.5341453424497307, + 53.79958075136048 ], [ -1.534108499701305, @@ -29796,20 +27821,31 @@ 53.799539540843526 ], [ - -1.5341928461174255, - 53.79954561576152 + -1.53428093496993, + 53.79950444661336 + ], + [ + -1.5343908633291468, + 53.79958207785997 + ], + [ + -1.534297506441699, + 53.799608175275985 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 457, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #199 -> Road #200" + ], "osm_node_ids": [ - 1591373154 + 1591373154, + 1152092781 ], "type": "intersection" }, @@ -29860,94 +27896,48 @@ "coordinates": [ [ [ - -1.53412279343311, - 53.79942881635751 - ], - [ - -1.5341527542399338, - 53.799425602181806 - ], - [ - -1.5341581958459702, - 53.799443299033946 - ], - [ - -1.5341282350391467, - 53.79944651320965 - ], - [ - -1.53412279343311, - 53.79942881635751 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 460, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6211583011 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5341952669774137, - 53.796611231621775 - ], - [ - -1.53406545102501, - 53.7966313620384 - ], - [ - -1.534047841171787, - 53.79661142857322 + -1.5341810356703, + 53.79951663871746 ], [ - -1.5340555392020392, - 53.79660905616261 + -1.5341510992243317, + 53.79951992843619 ], [ - -1.5340460628293555, - 53.796587601944466 + -1.534101937495928, + 53.79945531577032 ], [ - -1.5341759305485763, - 53.79656758843966 + -1.5341582004136307, + 53.799443308027165 ], [ - -1.5341968839291793, - 53.79658635728325 + -1.5341860448711564, + 53.79951221045748 ], [ - -1.5341860814124393, - 53.7965905643101 + -1.5341799135484062, + 53.79951307470562 ], [ - -1.5341952669774137, - 53.796611231621775 + -1.5341810356703, + 53.79951663871746 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signed", - "id": 463, + "control": "Signalled", + "id": 460, "intersection_kind": "Connection", "movements": [ - "Road #212 -> Road #213" + "Road #705 -> Road #706", + "Road #706 -> Road #705" ], "osm_node_ids": [ - 6905278501 + 6211583011, + 1152092841 ], "type": "intersection" }, @@ -30062,80 +28052,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.534177523139487, - 53.79657119202165 - ], - [ - -1.534047655420266, - 53.79659120552646 - ], - [ - -1.5340381029199097, - 53.79656957863855 - ], - [ - -1.5340165420404794, - 53.79657093031904 - ], - [ - -1.5340102143083338, - 53.79653570928452 - ], - [ - -1.5339885453276085, - 53.79652362330038 - ], - [ - -1.5340552027177263, - 53.79648192714971 - ], - [ - -1.5341519061776612, - 53.796487041592144 - ], - [ - -1.5341475790807513, - 53.79651559595501 - ], - [ - -1.5341655802302112, - 53.79651427754941 - ], - [ - -1.53417752009438, - 53.79657119022301 - ], - [ - -1.534177523139487, - 53.79657119202165 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 467, - "intersection_kind": "Intersection", - "movements": [ - "Road #213 -> Road #404", - "Road #213 -> Road #134", - "Road #669 -> Road #417", - "Road #669 -> Road #404", - "Road #669 -> Road #134" - ], - "osm_node_ids": [ - 342628235 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -30319,6 +28235,18 @@ "geometry": { "coordinates": [ [ + [ + -1.5342203510455312, + 53.79665923741339 + ], + [ + -1.5340946703483027, + 53.79668705882907 + ], + [ + -1.5340915597716007, + 53.79668215662656 + ], [ -1.534099154268218, 53.796685420264964 @@ -30336,28 +28264,43 @@ 53.79664440490082 ], [ - -1.5340730348637532, - 53.79664318452129 + -1.5340758454974253, + 53.79665475069749 ], [ - -1.5340991557907715, - 53.796685420264964 + -1.5340676983139048, + 53.796636419823564 ], [ - -1.534099154268218, - 53.796685420264964 + -1.5341975173114153, + 53.79661629120558 + ], + [ + -1.5342237021856786, + 53.796658514358754 + ], + [ + -1.5342203525680849, + 53.796659239212026 + ], + [ + -1.5342203510455312, + 53.79665923741339 ] ] ], "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 472, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #211 -> Road #212" + ], "osm_node_ids": [ - 3672602007 + 3672602007, + 643852 ], "type": "intersection" }, @@ -30556,24 +28499,36 @@ 53.8000771841259 ], [ - -1.534006389654063, + -1.5340063881315096, 53.80007443310086 ], [ - -1.5340031511828711, - 53.80007849533692 + -1.5340031496603177, + 53.80007849443759 + ], + [ + -1.533968712546346, + 53.80006891666164 + ], + [ + -1.5339757589237206, + 53.80007745302308 + ], + [ + -1.5338556812231945, + 53.80005206157459 ], [ - -1.5339687140688993, - 53.80006891576231 + -1.5338798456690272, + 53.799996516769276 ], [ - -1.5339920852643838, - 53.80001325404518 + -1.5338947316741252, + 53.799998775865355 ], [ - -1.5340108629161042, - 53.8000160041709 + -1.534001715414966, + 53.800039788531535 ], [ -1.5340140861617617, @@ -30594,12 +28549,16 @@ "properties": { "control": "Signed", "id": 477, - "intersection_kind": "Connection", + "intersection_kind": "Intersection", "movements": [ - "Road #223 -> Road #224" + "Road #223 -> Road #354", + "Road #223 -> Road #225", + "Road #353 -> Road #354", + "Road #353 -> Road #225" ], "osm_node_ids": [ - 6935272506 + 6935272506, + 9823132 ], "type": "intersection" }, @@ -30853,54 +28812,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5339357127228326, - 53.79715020590024 - ], - [ - -1.5339277710840282, - 53.79711509997889 - ], - [ - -1.5339844938128733, - 53.7971019878687 - ], - [ - -1.5339899536895514, - 53.79711022565535 - ], - [ - -1.53399777809174, - 53.79714534236856 - ], - [ - -1.5339357127228326, - 53.79715020590024 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 485, - "intersection_kind": "Fork", - "movements": [ - "Road #696 -> Road #860", - "Road #696 -> Road #697", - "Road #860 -> Road #697" - ], - "osm_node_ids": [ - 9740274255 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -30948,73 +28859,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5340519809946225, - 53.796480130304985 - ], - [ - -1.5339853236045045, - 53.796521826455646 - ], - [ - -1.5339531611853896, - 53.79650388768597 - ], - [ - -1.5339006132981092, - 53.796515515915374 - ], - [ - -1.5338535237649533, - 53.79644127870881 - ], - [ - -1.5338907760802574, - 53.796413526540896 - ], - [ - -1.5338996266834726, - 53.796417672413874 - ], - [ - -1.5339563859536005, - 53.79640624833049 - ], - [ - -1.5339661668369746, - 53.79642320594021 - ], - [ - -1.5340213654898145, - 53.79641425499146 - ], - [ - -1.5340519809946225, - 53.796480130304985 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 487, - "intersection_kind": "Fork", - "movements": [ - "Road #404 -> Road #528", - "Road #404 -> Road #614" - ], - "osm_node_ids": [ - 5728993707 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -31138,10 +28982,6 @@ "geometry": { "coordinates": [ [ - [ - -1.5339865903689764, - 53.79656828901125 - ], [ -1.5340079122075148, 53.7965811879822 @@ -31151,12 +28991,32 @@ 53.7966040919069 ], [ - -1.5339333893062652, - 53.796585798804486 + -1.5338971936430565, + 53.79657904939523 + ], + [ + -1.5338894073047042, + 53.796543930883374 + ], + [ + -1.533939016663823, + 53.79652306302297 + ], + [ + -1.5339581962696547, + 53.79653896932563 + ], + [ + -1.5339842852230505, + 53.79653733435881 + ], + [ + -1.533990612955196, + 53.79657255539333 ], [ - -1.5339865903689764, - 53.79656828901125 + -1.5340079122075148, + 53.7965811879822 ] ] ], @@ -31166,9 +29026,12 @@ "control": "Signalled", "id": 490, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #417 -> Road #418" + ], "osm_node_ids": [ - 7241259893 + 7241259893, + 6905278495 ], "type": "intersection" }, @@ -31293,117 +29156,7 @@ ], [ -1.5339472932643865, - 53.79847091375588 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 493, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 9316506599 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5339906144777493, - 53.79657255539333 - ], - [ - -1.5339374103699313, - 53.79659006158928 - ], - [ - -1.5339249954690857, - 53.79657689911708 - ], - [ - -1.5338971936430565, - 53.79657904939523 - ], - [ - -1.5338894073047042, - 53.796543930883374 - ], - [ - -1.533939016663823, - 53.79652306302297 - ], - [ - -1.5339581962696547, - 53.79653896932563 - ], - [ - -1.5339842852230505, - 53.79653733435881 - ], - [ - -1.533990612955196, - 53.79657255539333 - ], - [ - -1.5339906144777493, - 53.79657255539333 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 494, - "intersection_kind": "Connection", - "movements": [ - "Road #417 -> Road #418" - ], - "osm_node_ids": [ - 6905278495 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5339702381449045, - 53.79714748904942 - ], - [ - -1.5339143482527975, - 53.79716178106966 - ], - [ - -1.5339075911605786, - 53.79715256122373 - ], - [ - -1.5338991333761542, - 53.797117496671184 - ], - [ - -1.533962316299295, - 53.797112381329434 - ], - [ - -1.533970239667458, - 53.79714748904942 - ], - [ - -1.5339702381449045, - 53.79714748904942 + 53.79847091375588 ] ] ], @@ -31411,15 +29164,11 @@ }, "properties": { "control": "Signed", - "id": 495, - "intersection_kind": "Intersection", - "movements": [ - "Road #214 -> Road #696", - "Road #695 -> Road #214", - "Road #695 -> Road #696" - ], + "id": 493, + "intersection_kind": "Connection", + "movements": [], "osm_node_ids": [ - 26661454 + 9316506599 ], "type": "intersection" }, @@ -31430,36 +29179,44 @@ "coordinates": [ [ [ - -1.5340033064833232, - 53.80001489800522 + -1.5339702381449045, + 53.79714748904942 ], [ - -1.5339799383329458, - 53.80007056062168 + -1.5339143482527975, + 53.79716178106966 ], [ - -1.5339757589237206, - 53.80007745302308 + -1.5339075911605786, + 53.79715256122373 ], [ - -1.5338556812231945, - 53.80005206157459 + -1.5338991333761542, + 53.797117496671184 ], [ - -1.5338798456690272, - 53.799996516769276 + -1.5339277817419024, + 53.79711509997889 ], [ - -1.5338947316741252, - 53.799998775865355 + -1.5339844938128733, + 53.7971019878687 ], [ - -1.534001715414966, - 53.800039788531535 + -1.5339899536895514, + 53.79711022565535 + ], + [ + -1.5339689972638413, + 53.79711185432692 ], [ - -1.5340033064833232, - 53.80001489800522 + -1.5339768201434765, + 53.79714697104013 + ], + [ + -1.5339702381449045, + 53.79714748904942 ] ] ], @@ -31467,16 +29224,20 @@ }, "properties": { "control": "Signed", - "id": 496, + "id": 495, "intersection_kind": "Intersection", "movements": [ - "Road #224 -> Road #354", - "Road #224 -> Road #225", - "Road #353 -> Road #354", - "Road #353 -> Road #225" + "Road #214 -> Road #860", + "Road #214 -> Road #697", + "Road #695 -> Road #214", + "Road #695 -> Road #860", + "Road #695 -> Road #697", + "Road #860 -> Road #214", + "Road #860 -> Road #697" ], "osm_node_ids": [ - 9823132 + 26661454, + 9740274255 ], "type": "intersection" }, @@ -31646,40 +29407,60 @@ "coordinates": [ [ [ - -1.5339237439301483, - 53.79651039697634 + -1.5340519809946225, + 53.796480130304985 + ], + [ + -1.5339853236045045, + 53.796521826455646 ], [ - -1.5338741360935833, - 53.796531264836744 + -1.5339158205619854, + 53.796503825632776 ], [ -1.5338662127254203, - 53.79652469259386 + 53.79652469349318 ], [ -1.5338036677521756, 53.79645455089826 ], [ - -1.5337899662936634, - 53.7964691289028 + -1.5337718616105684, + 53.79646444523545 + ], + [ + -1.5337700863132437, + 53.79646339302908 + ], + [ + -1.5338240273369326, + 53.7964316613627 + ], + [ + -1.5338623682779546, + 53.796445423682464 ], [ - -1.5338355271831536, - 53.7964452591066 + -1.5338996251609192, + 53.79641767061523 + ], + [ + -1.5339563859536005, + 53.79640624833049 ], [ - -1.5338766498293321, - 53.796436160669096 + -1.5339661668369746, + 53.79642320594021 ], [ - -1.5339237424075949, - 53.79651039787566 + -1.5340213654898145, + 53.79641425499146 ], [ - -1.5339237439301483, - 53.79651039697634 + -1.5340519809946225, + 53.796480130304985 ] ] ], @@ -31688,10 +29469,15 @@ "properties": { "control": "Signalled", "id": 500, - "intersection_kind": "Connection", - "movements": [], + "intersection_kind": "Fork", + "movements": [ + "Road #404 -> Road #528", + "Road #404 -> Road #614" + ], "osm_node_ids": [ - 5728993834 + 5728993834, + 5728993707, + 7241259894 ], "type": "intersection" }, @@ -31840,46 +29626,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5337951201370974, - 53.796472562512996 - ], - [ - -1.5337700863132437, - 53.79646339302908 - ], - [ - -1.5338240273369326, - 53.7964316613627 - ], - [ - -1.5338406840716947, - 53.79644869451544 - ], - [ - -1.5337951201370974, - 53.796472562512996 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 505, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 7241259894 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -32200,8 +29946,24 @@ "coordinates": [ [ [ - -1.5337164756836539, - 53.79968465898812 + -1.5337167360402941, + 53.79967753456172 + ], + [ + -1.533739839266371, + 53.7997203800455 + ], + [ + -1.5337050702357469, + 53.799736774679836 + ], + [ + -1.5336677798566065, + 53.79973226188362 + ], + [ + -1.5336495762075373, + 53.79968860071507 ], [ -1.5336784209826808, @@ -32228,60 +29990,8 @@ 53.799677146954075 ], [ - -1.5337167223373132, - 53.79967789788768 - ], - [ - -1.5337164756836539, - 53.79968465898812 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 514, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6211582994 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5337050702357469, - 53.799736774679836 - ], - [ - -1.5336677798566065, - 53.79973226188362 - ], - [ - -1.5336495777300907, - 53.79968860071507 - ], - [ - -1.5336786798167676, - 53.79967704982733 - ], - [ - -1.5337167345177407, - 53.79967753546104 - ], - [ - -1.533739839266371, - 53.7997203800455 - ], - [ - -1.5337050702357469, - 53.799736774679836 + -1.5337167360402941, + 53.79967753456172 ] ] ], @@ -32293,7 +30003,8 @@ "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 6211583002 + 6211583002, + 6211582994 ], "type": "intersection" }, @@ -32618,8 +30329,24 @@ 53.79975773337174 ], [ - -1.5335394148976424, - 53.799735847479184 + -1.5335728958480466, + 53.79975871183373 + ], + [ + -1.5335073042453449, + 53.79973588884798 + ], + [ + -1.5335454990212356, + 53.79971920733002 + ], + [ + -1.5335784957996421, + 53.79973041647552 + ], + [ + -1.5336046349973018, + 53.799705925248034 ], [ -1.5335843774236262, @@ -32647,7 +30374,8 @@ "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 6211583003 + 6211583003, + 6211583004 ], "type": "intersection" }, @@ -32937,50 +30665,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5335728958480466, - 53.79975871183373 - ], - [ - -1.5335073042453449, - 53.79973588884798 - ], - [ - -1.5335454990212356, - 53.79971920733002 - ], - [ - -1.5335784957996421, - 53.79973041647552 - ], - [ - -1.5335872124181533, - 53.7997523032674 - ], - [ - -1.5335728958480466, - 53.79975871183373 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 532, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6211583004 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -33030,20 +30714,40 @@ 53.79994542900224 ], [ - -1.5335455751489082, - 53.79997866613313 + -1.5335455751489082, + 53.79997866613313 + ], + [ + -1.5335087400132499, + 53.79998433006111 + ], + [ + -1.5334568148503311, + 53.79992471672449 + ], + [ + -1.5333925600495604, + 53.79990060231279 + ], + [ + -1.533411550858764, + 53.79988294862809 + ], + [ + -1.5334756579718503, + 53.79985869662018 ], [ - -1.5335087400132499, - 53.79998433096043 + -1.5334379762964727, + 53.79985857161446 ], [ - -1.5334507261590777, - 53.79991909956124 + -1.5335019448571947, + 53.799882950426735 ], [ -1.5335148500202518, - 53.79989486284179 + 53.79989486194247 ], [ -1.533545928381309, @@ -33062,12 +30766,13 @@ "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 535, "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 3381506667 + 3381506667, + 6211582997 ], "type": "intersection" }, @@ -33166,15 +30871,27 @@ 53.796379820863415 ], [ - -1.5331131075439182, - 53.79635767057028 + -1.5328310316786788, + 53.7964094750967 + ], + [ + -1.5328206539543516, + 53.7963878446115 + ], + [ + -1.5331866088118016, + 53.79632741289215 + ], + [ + -1.533196858641639, + 53.79634906496106 ], [ - -1.5334727103083676, - 53.79632072014016 + -1.5334727209662418, + 53.79632071924083 ], [ - -1.5334828840105321, + -1.5334828855330858, 53.7963423856989 ], [ @@ -33191,7 +30908,8 @@ "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 3371780106 + 3371780106, + 3371780107 ], "type": "intersection" }, @@ -33237,58 +30955,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.533520937188952, - 53.79990048180368 - ], - [ - -1.5334568133277777, - 53.79992471672449 - ], - [ - -1.5333925600495604, - 53.79990060231279 - ], - [ - -1.533411550858764, - 53.79988294862809 - ], - [ - -1.5334756579718503, - 53.79985869662018 - ], - [ - -1.5334379762964727, - 53.79985857161446 - ], - [ - -1.5335019448571947, - 53.799882950426735 - ], - [ - -1.533520937188952, - 53.79990048180368 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 541, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6211582997 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -34022,6 +31688,14 @@ "geometry": { "coordinates": [ [ + [ + -1.533140740366514, + 53.80000015182753 + ], + [ + -1.533220969798101, + 53.800052805313626 + ], [ -1.5331927112060364, 53.80006782758307 @@ -34031,20 +31705,20 @@ 53.80001517229834 ], [ - -1.5330841972989762, - 53.80003026201691 + -1.5330539076206071, + 53.800010437369664 ], [ - -1.5331407418890675, - 53.8000001545255 + -1.533110403488988, + 53.799980297502664 ], [ - -1.533220969798101, - 53.800052805313626 + -1.533164446523758, + 53.80001197700839 ], [ - -1.5331927112060364, - 53.80006782758307 + -1.533140740366514, + 53.80000015182753 ] ] ], @@ -34055,11 +31729,12 @@ "id": 566, "intersection_kind": "Connection", "movements": [ - "Road #23 -> Road #22", - "Road #22 -> Road #23" + "Road #22 -> Road #23", + "Road #23 -> Road #22" ], "osm_node_ids": [ - 3381506663 + 3381506663, + 6211583000 ], "type": "intersection" }, @@ -34109,54 +31784,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5331614821121873, - 53.800013742376855 - ], - [ - -1.533104940567203, - 53.80004385166691 - ], - [ - -1.5330539076206071, - 53.800010437369664 - ], - [ - -1.533110403488988, - 53.799980297502664 - ], - [ - -1.533164446523758, - 53.80001197700839 - ], - [ - -1.5331614821121873, - 53.800013741477535 - ], - [ - -1.5331614821121873, - 53.800013742376855 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 569, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6211583000 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -34460,109 +32087,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.5328310316786788, - 53.7964094750967 - ], - [ - -1.5328206539543516, - 53.7963878446115 - ], - [ - -1.5331866088118016, - 53.79632741289215 - ], - [ - -1.533196858641639, - 53.79634906496106 - ], - [ - -1.5332033797380729, - 53.7963712152542 - ], - [ - -1.5328310347237857, - 53.7964094750967 - ], - [ - -1.5328310316786788, - 53.7964094750967 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 587, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 3371780107 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -1.532834716258032, - 53.79798294180889 - ], - [ - -1.5328181965530805, - 53.79801756569381 - ], - [ - -1.5327586205590666, - 53.798007569733265 - ], - [ - -1.5327753503763946, - 53.79797298002257 - ], - [ - -1.5328358536054605, - 53.79797709172132 - ], - [ - -1.5328347147354786, - 53.79798294090957 - ], - [ - -1.532834716258032, - 53.79798294180889 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 589, - "intersection_kind": "Intersection", - "movements": [ - "Road #303 -> Road #302", - "Road #303 -> Road #374", - "Road #302 -> Road #303", - "Road #302 -> Road #374", - "Road #374 -> Road #303", - "Road #374 -> Road #302" - ], - "osm_node_ids": [ - 5506378754 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -34674,32 +32198,40 @@ "coordinates": [ [ [ - -1.5327770845647761, - 53.797973273201436 - ], - [ - -1.5327603547474482, - 53.79800786291214 + -1.5328347177805854, + 53.79798294180889 ], [ - -1.532754553818797, - 53.79800688355082 + -1.532818198075634, + 53.79801756569381 ], [ -1.5327515285050883, - 53.79800875144196 + 53.79800875234128 ], [ -1.5327295245626036, - 53.797996319218974 + 53.797996320118294 ], [ -1.5327706944079391, - 53.797969810812944 + 53.79796981171227 + ], + [ + -1.5327753503763946, + 53.79797298092189 + ], + [ + -1.5328358536054605, + 53.797977090821995 + ], + [ + -1.5328347147354786, + 53.79798294090957 ], [ - -1.5327770845647761, - 53.797973273201436 + -1.5328347177805854, + 53.79798294180889 ] ] ], @@ -34708,13 +32240,18 @@ "properties": { "control": "Signed", "id": 595, - "intersection_kind": "Connection", + "intersection_kind": "Intersection", "movements": [ - "Road #302 -> Road #301", - "Road #301 -> Road #302" + "Road #303 -> Road #301", + "Road #303 -> Road #374", + "Road #301 -> Road #303", + "Road #301 -> Road #374", + "Road #374 -> Road #303", + "Road #374 -> Road #301" ], "osm_node_ids": [ - 5506378775 + 5506378775, + 5506378754 ], "type": "intersection" }, diff --git a/tests/src/leeds_cycleway/road_network.dot b/tests/src/leeds_cycleway/road_network.dot index e6245ec8..a2092d6c 100644 --- a/tests/src/leeds_cycleway/road_network.dot +++ b/tests/src/leeds_cycleway/road_network.dot @@ -30,168 +30,168 @@ digraph { 28 [ label = "Slice" ] 29 [ label = "Slice" ] 30 [ label = "MapEdge" ] - 31 [ label = "Slice" ] - 32 [ label = "Slice" ] - 33 [ label = "Merge" ] - 34 [ label = "Merge" ] - 35 [ label = "Slice" ] - 36 [ label = "Uncontrolled RoadIntersection" ] + 31 [ label = "Merge" ] + 32 [ label = "Uncontrolled RoadIntersection" ] + 33 [ label = "Uncontrolled RoadIntersection" ] + 34 [ label = "Slice" ] + 35 [ label = "Uncontrolled RoadIntersection" ] + 36 [ label = "Merge" ] 37 [ label = "Slice" ] - 38 [ label = "Uncontrolled RoadIntersection" ] + 38 [ label = "Merge" ] 39 [ label = "Slice" ] - 40 [ label = "Uncontrolled RoadIntersection" ] - 41 [ label = "Merge" ] - 42 [ label = "Slice" ] - 43 [ label = "Merge" ] + 40 [ label = "Merge" ] + 41 [ label = "Terminus" ] + 42 [ label = "Uncontrolled RoadIntersection" ] + 43 [ label = "Slice" ] 44 [ label = "Slice" ] - 45 [ label = "Merge" ] - 46 [ label = "Terminus" ] - 47 [ label = "Uncontrolled RoadIntersection" ] + 45 [ label = "Uncontrolled RoadIntersection" ] + 46 [ label = "Slice" ] + 47 [ label = "Merge" ] 48 [ label = "Slice" ] 49 [ label = "Slice" ] - 50 [ label = "Uncontrolled RoadIntersection" ] + 50 [ label = "Slice" ] 51 [ label = "Slice" ] - 52 [ label = "Merge" ] + 52 [ label = "Slice" ] 53 [ label = "Slice" ] - 54 [ label = "Slice" ] + 54 [ label = "Merge" ] 55 [ label = "Slice" ] 56 [ label = "Slice" ] 57 [ label = "Slice" ] - 58 [ label = "Slice" ] + 58 [ label = "Merge" ] 59 [ label = "Merge" ] - 60 [ label = "Slice" ] - 61 [ label = "Slice" ] + 60 [ label = "Merge" ] + 61 [ label = "MapEdge" ] 62 [ label = "Slice" ] - 63 [ label = "Merge" ] - 64 [ label = "Merge" ] - 65 [ label = "Slice" ] - 66 [ label = "Merge" ] - 67 [ label = "MapEdge" ] + 63 [ label = "MapEdge" ] + 64 [ label = "Slice" ] + 65 [ label = "MapEdge" ] + 66 [ label = "Slice" ] + 67 [ label = "Slice" ] 68 [ label = "Slice" ] - 69 [ label = "MapEdge" ] - 70 [ label = "Slice" ] - 71 [ label = "MapEdge" ] + 69 [ label = "Terminus" ] + 70 [ label = "MapEdge" ] + 71 [ label = "Slice" ] 72 [ label = "Slice" ] 73 [ label = "Slice" ] - 74 [ label = "Slice" ] - 75 [ label = "Terminus" ] - 76 [ label = "MapEdge" ] + 74 [ label = "MapEdge" ] + 75 [ label = "Slice" ] + 76 [ label = "Slice" ] 77 [ label = "Slice" ] - 78 [ label = "Slice" ] + 78 [ label = "Uncontrolled RoadIntersection" ] 79 [ label = "Slice" ] 80 [ label = "Slice" ] - 81 [ label = "MapEdge" ] + 81 [ label = "Slice" ] 82 [ label = "Slice" ] 83 [ label = "Slice" ] 84 [ label = "Slice" ] 85 [ label = "Slice" ] - 86 [ label = "Uncontrolled RoadIntersection" ] + 86 [ label = "Merge" ] 87 [ label = "Slice" ] 88 [ label = "Slice" ] 89 [ label = "Slice" ] - 90 [ label = "Slice" ] - 91 [ label = "Slice" ] - 92 [ label = "Slice" ] + 90 [ label = "Lights RoadIntersection" ] + 91 [ label = "Merge" ] + 92 [ label = "Merge" ] 93 [ label = "Slice" ] 94 [ label = "Merge" ] 95 [ label = "Slice" ] 96 [ label = "Slice" ] 97 [ label = "Slice" ] - 98 [ label = "Slice" ] - 99 [ label = "Merge" ] + 98 [ label = "Terminus" ] + 99 [ label = "Slice" ] 100 [ label = "Slice" ] - 101 [ label = "Merge" ] + 101 [ label = "Slice" ] 102 [ label = "Slice" ] 103 [ label = "Slice" ] - 104 [ label = "Merge" ] + 104 [ label = "Slice" ] 105 [ label = "Slice" ] 106 [ label = "Slice" ] 107 [ label = "Slice" ] - 108 [ label = "Slice" ] + 108 [ label = "Merge" ] 109 [ label = "Slice" ] - 110 [ label = "Terminus" ] - 111 [ label = "Terminus" ] + 110 [ label = "Slice" ] + 111 [ label = "Slice" ] 112 [ label = "Slice" ] 113 [ label = "Slice" ] 114 [ label = "Slice" ] - 115 [ label = "Merge" ] + 115 [ label = "Slice" ] 116 [ label = "Slice" ] 117 [ label = "Slice" ] 118 [ label = "Slice" ] 119 [ label = "Slice" ] - 120 [ label = "Slice" ] + 120 [ label = "Terminus" ] 121 [ label = "Slice" ] 122 [ label = "Slice" ] - 123 [ label = "Slice" ] + 123 [ label = "Merge" ] 124 [ label = "Slice" ] 125 [ label = "Slice" ] 126 [ label = "Slice" ] - 127 [ label = "Merge" ] + 127 [ label = "Slice" ] 128 [ label = "Slice" ] - 129 [ label = "Slice" ] - 130 [ label = "Slice" ] + 129 [ label = "Merge" ] + 130 [ label = "MapEdge" ] 131 [ label = "Slice" ] 132 [ label = "Slice" ] - 133 [ label = "Slice" ] + 133 [ label = "Merge" ] 134 [ label = "Slice" ] 135 [ label = "Slice" ] - 136 [ label = "Terminus" ] - 137 [ label = "Slice" ] + 136 [ label = "Slice" ] + 137 [ label = "Merge" ] 138 [ label = "Slice" ] - 139 [ label = "Merge" ] + 139 [ label = "Slice" ] 140 [ label = "Slice" ] 141 [ label = "Slice" ] 142 [ label = "Slice" ] 143 [ label = "Slice" ] 144 [ label = "Slice" ] 145 [ label = "Slice" ] - 146 [ label = "Merge" ] - 147 [ label = "MapEdge" ] + 146 [ label = "Slice" ] + 147 [ label = "Slice" ] 148 [ label = "Slice" ] 149 [ label = "Slice" ] - 150 [ label = "Merge" ] + 150 [ label = "Slice" ] 151 [ label = "Slice" ] 152 [ label = "Slice" ] 153 [ label = "Slice" ] - 154 [ label = "Merge" ] + 154 [ label = "Slice" ] 155 [ label = "Slice" ] 156 [ label = "Slice" ] - 157 [ label = "Slice" ] - 158 [ label = "Slice" ] + 157 [ label = "Merge" ] + 158 [ label = "Merge" ] 159 [ label = "Slice" ] 160 [ label = "Slice" ] 161 [ label = "Slice" ] 162 [ label = "Slice" ] 163 [ label = "Slice" ] 164 [ label = "Slice" ] - 165 [ label = "Slice" ] - 166 [ label = "Slice" ] - 167 [ label = "Slice" ] - 168 [ label = "Slice" ] + 165 [ label = "Terminus" ] + 166 [ label = "Merge" ] + 167 [ label = "Lights RoadIntersection" ] + 168 [ label = "Terminus" ] 169 [ label = "Slice" ] 170 [ label = "Slice" ] - 171 [ label = "Slice" ] + 171 [ label = "Merge" ] 172 [ label = "Slice" ] 173 [ label = "Slice" ] 174 [ label = "Slice" ] - 175 [ label = "Merge" ] - 176 [ label = "Merge" ] + 175 [ label = "Slice" ] + 176 [ label = "MapEdge" ] 177 [ label = "Slice" ] 178 [ label = "Slice" ] - 179 [ label = "Slice" ] - 180 [ label = "Merge" ] + 179 [ label = "Merge" ] + 180 [ label = "Slice" ] 181 [ label = "Slice" ] 182 [ label = "Slice" ] 183 [ label = "Slice" ] 184 [ label = "Slice" ] - 185 [ label = "Terminus" ] - 186 [ label = "Merge" ] + 185 [ label = "MapEdge" ] + 186 [ label = "Slice" ] 187 [ label = "Slice" ] - 188 [ label = "Lights RoadIntersection" ] - 189 [ label = "Terminus" ] - 190 [ label = "Slice" ] + 188 [ label = "Uncontrolled RoadIntersection" ] + 189 [ label = "Slice" ] + 190 [ label = "MapEdge" ] 191 [ label = "Slice" ] - 192 [ label = "Slice" ] + 192 [ label = "Terminus" ] 193 [ label = "Slice" ] 194 [ label = "Slice" ] 195 [ label = "Slice" ] @@ -199,673 +199,596 @@ digraph { 197 [ label = "Slice" ] 198 [ label = "Slice" ] 199 [ label = "Slice" ] - 200 [ label = "MapEdge" ] + 200 [ label = "Uncontrolled RoadIntersection" ] 201 [ label = "Slice" ] - 202 [ label = "Slice" ] + 202 [ label = "Uncontrolled RoadIntersection" ] 203 [ label = "Slice" ] - 204 [ label = "Merge" ] - 205 [ label = "Uncontrolled RoadIntersection" ] - 206 [ label = "Slice" ] + 204 [ label = "Slice" ] + 205 [ label = "Slice" ] + 206 [ label = "Merge" ] 207 [ label = "Slice" ] 208 [ label = "Slice" ] - 209 [ label = "Slice" ] + 209 [ label = "Uncontrolled RoadIntersection" ] 210 [ label = "Slice" ] - 211 [ label = "MapEdge" ] + 211 [ label = "Slice" ] 212 [ label = "Slice" ] - 213 [ label = "Slice" ] - 214 [ label = "Slice" ] + 213 [ label = "Terminus" ] + 214 [ label = "Merge" ] 215 [ label = "Slice" ] - 216 [ label = "MapEdge" ] - 217 [ label = "Slice" ] - 218 [ label = "Terminus" ] + 216 [ label = "Slice" ] + 217 [ label = "Uncontrolled RoadIntersection" ] + 218 [ label = "Slice" ] 219 [ label = "Slice" ] 220 [ label = "Slice" ] - 221 [ label = "Merge" ] + 221 [ label = "Slice" ] 222 [ label = "Slice" ] - 223 [ label = "Merge" ] + 223 [ label = "Slice" ] 224 [ label = "Slice" ] 225 [ label = "Slice" ] 226 [ label = "Slice" ] - 227 [ label = "Slice" ] - 228 [ label = "Uncontrolled RoadIntersection" ] + 227 [ label = "Terminus" ] + 228 [ label = "Slice" ] 229 [ label = "Slice" ] 230 [ label = "Slice" ] - 231 [ label = "Uncontrolled RoadIntersection" ] - 232 [ label = "Uncontrolled RoadIntersection" ] - 233 [ label = "Slice" ] + 231 [ label = "Slice" ] + 232 [ label = "MapEdge" ] + 233 [ label = "Terminus" ] 234 [ label = "Slice" ] - 235 [ label = "Slice" ] - 236 [ label = "Slice" ] + 235 [ label = "MapEdge" ] + 236 [ label = "Terminus" ] 237 [ label = "Slice" ] 238 [ label = "Slice" ] - 239 [ label = "Uncontrolled RoadIntersection" ] + 239 [ label = "Terminus" ] 240 [ label = "Slice" ] 241 [ label = "Slice" ] 242 [ label = "Slice" ] 243 [ label = "Slice" ] - 244 [ label = "Terminus" ] - 245 [ label = "Merge" ] + 244 [ label = "Uncontrolled RoadIntersection" ] + 245 [ label = "Slice" ] 246 [ label = "Slice" ] - 247 [ label = "Slice" ] - 248 [ label = "Slice" ] - 249 [ label = "Uncontrolled RoadIntersection" ] - 250 [ label = "Slice" ] + 247 [ label = "Terminus" ] + 248 [ label = "Terminus" ] + 249 [ label = "Slice" ] + 250 [ label = "Terminus" ] 251 [ label = "Slice" ] 252 [ label = "Slice" ] 253 [ label = "Slice" ] 254 [ label = "Slice" ] 255 [ label = "Slice" ] - 256 [ label = "Slice" ] + 256 [ label = "Merge" ] 257 [ label = "Slice" ] - 258 [ label = "Slice" ] - 259 [ label = "Terminus" ] - 260 [ label = "Slice" ] + 258 [ label = "Terminus" ] + 259 [ label = "MapEdge" ] + 260 [ label = "Uncontrolled RoadIntersection" ] 261 [ label = "Slice" ] 262 [ label = "Slice" ] - 263 [ label = "Slice" ] + 263 [ label = "Uncontrolled RoadIntersection" ] 264 [ label = "Slice" ] - 265 [ label = "MapEdge" ] + 265 [ label = "Slice" ] 266 [ label = "Terminus" ] - 267 [ label = "Slice" ] - 268 [ label = "MapEdge" ] - 269 [ label = "Slice" ] - 270 [ label = "Terminus" ] - 271 [ label = "Slice" ] - 272 [ label = "Slice" ] - 273 [ label = "Terminus" ] - 274 [ label = "Slice" ] - 275 [ label = "Slice" ] - 276 [ label = "Slice" ] - 277 [ label = "Slice" ] + 267 [ label = "MapEdge" ] + 268 [ label = "Slice" ] + 269 [ label = "Uncontrolled RoadIntersection" ] + 270 [ label = "Uncontrolled RoadIntersection" ] + 271 [ label = "Merge" ] + 272 [ label = "Uncontrolled RoadIntersection" ] + 273 [ label = "MapEdge" ] + 274 [ label = "Terminus" ] + 275 [ label = "Terminus" ] + 276 [ label = "Uncontrolled RoadIntersection" ] + 277 [ label = "Uncontrolled RoadIntersection" ] 278 [ label = "Uncontrolled RoadIntersection" ] - 279 [ label = "Slice" ] + 279 [ label = "Terminus" ] 280 [ label = "Slice" ] - 281 [ label = "Terminus" ] - 282 [ label = "Terminus" ] - 283 [ label = "Slice" ] - 284 [ label = "Terminus" ] - 285 [ label = "Slice" ] - 286 [ label = "Slice" ] - 287 [ label = "Slice" ] - 288 [ label = "Slice" ] - 289 [ label = "Slice" ] - 290 [ label = "Slice" ] - 291 [ label = "Merge" ] - 292 [ label = "Slice" ] - 293 [ label = "Terminus" ] + 281 [ label = "Merge" ] + 282 [ label = "Slice" ] + 283 [ label = "MapEdge" ] + 284 [ label = "MapEdge" ] + 285 [ label = "MapEdge" ] + 286 [ label = "MapEdge" ] + 287 [ label = "MapEdge" ] + 288 [ label = "MapEdge" ] + 289 [ label = "MapEdge" ] + 290 [ label = "MapEdge" ] + 291 [ label = "MapEdge" ] + 292 [ label = "MapEdge" ] + 293 [ label = "MapEdge" ] 294 [ label = "MapEdge" ] - 295 [ label = "Uncontrolled RoadIntersection" ] - 296 [ label = "Slice" ] - 297 [ label = "Uncontrolled RoadIntersection" ] - 298 [ label = "Slice" ] - 299 [ label = "Slice" ] - 300 [ label = "Slice" ] - 301 [ label = "Slice" ] - 302 [ label = "Slice" ] - 303 [ label = "Terminus" ] + 295 [ label = "MapEdge" ] + 296 [ label = "MapEdge" ] + 297 [ label = "MapEdge" ] + 298 [ label = "MapEdge" ] + 299 [ label = "MapEdge" ] + 300 [ label = "MapEdge" ] + 301 [ label = "MapEdge" ] + 302 [ label = "MapEdge" ] + 303 [ label = "MapEdge" ] 304 [ label = "MapEdge" ] - 305 [ label = "Slice" ] - 306 [ label = "Uncontrolled RoadIntersection" ] - 307 [ label = "Uncontrolled RoadIntersection" ] - 308 [ label = "Merge" ] - 309 [ label = "Uncontrolled RoadIntersection" ] + 305 [ label = "MapEdge" ] + 306 [ label = "MapEdge" ] + 307 [ label = "MapEdge" ] + 308 [ label = "MapEdge" ] + 309 [ label = "MapEdge" ] 310 [ label = "MapEdge" ] - 311 [ label = "Terminus" ] - 312 [ label = "Terminus" ] - 313 [ label = "Uncontrolled RoadIntersection" ] - 314 [ label = "Uncontrolled RoadIntersection" ] - 315 [ label = "Uncontrolled RoadIntersection" ] - 316 [ label = "Terminus" ] - 317 [ label = "Slice" ] - 318 [ label = "Merge" ] - 319 [ label = "Slice" ] - 320 [ label = "MapEdge" ] - 321 [ label = "MapEdge" ] - 322 [ label = "MapEdge" ] - 323 [ label = "MapEdge" ] - 324 [ label = "MapEdge" ] - 325 [ label = "MapEdge" ] - 326 [ label = "MapEdge" ] - 327 [ label = "MapEdge" ] - 328 [ label = "MapEdge" ] - 329 [ label = "MapEdge" ] - 330 [ label = "MapEdge" ] - 331 [ label = "MapEdge" ] - 332 [ label = "MapEdge" ] - 333 [ label = "MapEdge" ] - 334 [ label = "MapEdge" ] - 335 [ label = "MapEdge" ] - 336 [ label = "MapEdge" ] - 337 [ label = "MapEdge" ] - 338 [ label = "MapEdge" ] - 339 [ label = "MapEdge" ] - 340 [ label = "MapEdge" ] - 341 [ label = "MapEdge" ] - 342 [ label = "MapEdge" ] - 343 [ label = "MapEdge" ] - 344 [ label = "MapEdge" ] - 345 [ label = "MapEdge" ] - 346 [ label = "MapEdge" ] - 347 [ label = "MapEdge" ] - 348 [ label = "MapEdge" ] - 349 [ label = "MapEdge" ] - 350 [ label = "MapEdge" ] - 351 [ label = "MapEdge" ] - 352 [ label = "MapEdge" ] - 353 [ label = "MapEdge" ] - 354 [ label = "MapEdge" ] - 52 -> 3 [ label = "2 lanes" ] - 63 -> 89 [ label = "3 lanes" ] - 188 -> 183 [ label = "3 lanes" ] - 183 -> 176 [ label = "3 lanes" ] - 101 -> 104 [ label = "3 lanes" ] - 92 -> 91 [ label = "1 lanes" ] - 91 -> 81 [ label = "1 lanes" ] - 309 -> 291 [ label = "2 lanes" ] - 291 -> 280 [ label = "2 lanes" ] - 312 -> 306 [ label = "2 lanes" ] + 311 [ label = "MapEdge" ] + 312 [ label = "MapEdge" ] + 313 [ label = "MapEdge" ] + 314 [ label = "MapEdge" ] + 315 [ label = "MapEdge" ] + 316 [ label = "MapEdge" ] + 317 [ label = "MapEdge" ] + 47 -> 3 [ label = "2 lanes" ] + 58 -> 81 [ label = "3 lanes" ] + 167 -> 164 [ label = "3 lanes" ] + 164 -> 158 [ label = "3 lanes" ] + 92 -> 94 [ label = "3 lanes" ] + 84 -> 83 [ label = "1 lanes" ] + 83 -> 74 [ label = "1 lanes" ] + 272 -> 256 [ label = "2 lanes" ] + 256 -> 246 [ label = "2 lanes" ] + 275 -> 269 [ label = "2 lanes" ] 8 -> 9 [ label = "2 lanes" ] - 9 -> 340 [ label = "2 lanes" ] - 337 -> 5 [ label = "2 lanes" ] + 9 -> 303 [ label = "2 lanes" ] + 300 -> 5 [ label = "2 lanes" ] 5 -> 6 [ label = "2 lanes" ] - 281 -> 286 [ label = "2 lanes" ] - 286 -> 281 [ label = "2 lanes" ] - 286 -> 294 [ label = "2 lanes" ] - 294 -> 286 [ label = "2 lanes" ] - 105 -> 178 [ label = "1 lanes" ] - 178 -> 267 [ label = "1 lanes" ] - 267 -> 336 [ label = "1 lanes" ] - 146 -> 165 [ label = "2 lanes" ] - 165 -> 176 [ label = "2 lanes" ] - 50 -> 339 [ label = "2 lanes" ] - 339 -> 50 [ label = "2 lanes" ] - 139 -> 152 [ label = "1 lanes" ] - 152 -> 151 [ label = "1 lanes" ] - 139 -> 153 [ label = "3 lanes" ] - 153 -> 180 [ label = "3 lanes" ] - 147 -> 203 [ label = "1 lanes" ] - 291 -> 293 [ label = "1 lanes" ] - 293 -> 291 [ label = "1 lanes" ] - 176 -> 151 [ label = "1 lanes" ] - 127 -> 122 [ label = "1 lanes" ] - 122 -> 97 [ label = "1 lanes" ] - 97 -> 90 [ label = "1 lanes" ] - 90 -> 68 [ label = "1 lanes" ] - 307 -> 303 [ label = "2 lanes" ] - 303 -> 307 [ label = "2 lanes" ] - 9 -> 34 [ label = "2 lanes" ] - 47 -> 86 [ label = "2 lanes" ] - 86 -> 47 [ label = "2 lanes" ] - 86 -> 136 [ label = "2 lanes" ] - 136 -> 86 [ label = "2 lanes" ] - 86 -> 102 [ label = "2 lanes" ] - 102 -> 86 [ label = "2 lanes" ] - 102 -> 110 [ label = "2 lanes" ] - 110 -> 102 [ label = "2 lanes" ] + 247 -> 252 [ label = "2 lanes" ] + 252 -> 247 [ label = "2 lanes" ] + 252 -> 259 [ label = "2 lanes" ] + 259 -> 252 [ label = "2 lanes" ] + 95 -> 160 [ label = "1 lanes" ] + 160 -> 234 [ label = "1 lanes" ] + 234 -> 299 [ label = "1 lanes" ] + 129 -> 148 [ label = "2 lanes" ] + 148 -> 158 [ label = "2 lanes" ] + 45 -> 302 [ label = "2 lanes" ] + 302 -> 45 [ label = "2 lanes" ] + 123 -> 135 [ label = "1 lanes" ] + 135 -> 134 [ label = "1 lanes" ] + 123 -> 136 [ label = "3 lanes" ] + 136 -> 171 [ label = "3 lanes" ] + 130 -> 178 [ label = "1 lanes" ] + 256 -> 258 [ label = "1 lanes" ] + 258 -> 256 [ label = "1 lanes" ] + 158 -> 134 [ label = "1 lanes" ] + 108 -> 109 [ label = "1 lanes" ] + 109 -> 89 [ label = "1 lanes" ] + 89 -> 82 [ label = "1 lanes" ] + 82 -> 62 [ label = "1 lanes" ] + 270 -> 266 [ label = "2 lanes" ] + 266 -> 270 [ label = "2 lanes" ] + 9 -> 32 [ label = "2 lanes" ] + 42 -> 78 [ label = "2 lanes" ] + 78 -> 42 [ label = "2 lanes" ] + 78 -> 120 [ label = "2 lanes" ] + 120 -> 78 [ label = "2 lanes" ] + 78 -> 93 [ label = "2 lanes" ] + 93 -> 78 [ label = "2 lanes" ] + 93 -> 98 [ label = "2 lanes" ] + 98 -> 93 [ label = "2 lanes" ] 15 -> 27 [ label = "3 lanes" ] - 27 -> 44 [ label = "3 lanes" ] - 73 -> 74 [ label = "1 lanes" ] - 45 -> 39 [ label = "2 lanes" ] - 39 -> 38 [ label = "2 lanes" ] - 38 -> 37 [ label = "2 lanes" ] - 37 -> 33 [ label = "2 lanes" ] - 33 -> 34 [ label = "2 lanes" ] - 34 -> 36 [ label = "2 lanes" ] - 36 -> 40 [ label = "2 lanes" ] - 40 -> 47 [ label = "2 lanes" ] - 47 -> 50 [ label = "2 lanes" ] - 266 -> 278 [ label = "2 lanes" ] - 278 -> 266 [ label = "2 lanes" ] - 278 -> 307 [ label = "2 lanes" ] - 307 -> 278 [ label = "2 lanes" ] - 307 -> 329 [ label = "2 lanes" ] - 329 -> 307 [ label = "2 lanes" ] - 205 -> 204 [ label = "3 lanes" ] - 241 -> 290 [ label = "0 lanes" ] - 245 -> 264 [ label = "0 lanes" ] - 191 -> 154 [ label = "2 lanes" ] - 123 -> 109 [ label = "3 lanes" ] - 109 -> 94 [ label = "3 lanes" ] - 94 -> 79 [ label = "3 lanes" ] - 79 -> 66 [ label = "3 lanes" ] - 83 -> 94 [ label = "2 lanes" ] - 151 -> 143 [ label = "1 lanes" ] - 176 -> 152 [ label = "3 lanes" ] - 152 -> 127 [ label = "3 lanes" ] - 154 -> 67 [ label = "1 lanes" ] - 332 -> 312 [ label = "3 lanes" ] - 327 -> 276 [ label = "2 lanes" ] - 175 -> 150 [ label = "5 lanes" ] - 200 -> 203 [ label = "3 lanes" ] - 203 -> 190 [ label = "3 lanes" ] - 208 -> 225 [ label = "1 lanes" ] - 225 -> 235 [ label = "1 lanes" ] - 235 -> 246 [ label = "1 lanes" ] - 246 -> 258 [ label = "1 lanes" ] - 252 -> 250 [ label = "0 lanes" ] - 313 -> 314 [ label = "2 lanes" ] - 314 -> 313 [ label = "2 lanes" ] - 314 -> 315 [ label = "2 lanes" ] - 315 -> 314 [ label = "2 lanes" ] - 249 -> 218 [ label = "2 lanes" ] - 218 -> 249 [ label = "2 lanes" ] - 1 -> 105 [ label = "1 lanes" ] - 201 -> 197 [ label = "1 lanes" ] - 197 -> 199 [ label = "1 lanes" ] - 322 -> 315 [ label = "2 lanes" ] - 315 -> 322 [ label = "2 lanes" ] - 315 -> 311 [ label = "2 lanes" ] - 311 -> 315 [ label = "2 lanes" ] - 276 -> 250 [ label = "0 lanes" ] - 264 -> 248 [ label = "0 lanes" ] - 248 -> 247 [ label = "0 lanes" ] - 247 -> 252 [ label = "0 lanes" ] - 250 -> 249 [ label = "2 lanes" ] - 249 -> 250 [ label = "2 lanes" ] - 249 -> 321 [ label = "2 lanes" ] - 321 -> 249 [ label = "2 lanes" ] - 278 -> 282 [ label = "2 lanes" ] - 282 -> 278 [ label = "2 lanes" ] - 250 -> 228 [ label = "2 lanes" ] - 228 -> 250 [ label = "2 lanes" ] - 245 -> 192 [ label = "5 lanes" ] - 192 -> 175 [ label = "5 lanes" ] - 290 -> 323 [ label = "0 lanes" ] - 186 -> 208 [ label = "2 lanes" ] - 208 -> 233 [ label = "2 lanes" ] - 233 -> 350 [ label = "2 lanes" ] - 351 -> 258 [ label = "0 lanes" ] - 258 -> 261 [ label = "0 lanes" ] - 261 -> 264 [ label = "0 lanes" ] - 84 -> 93 [ label = "2 lanes" ] - 120 -> 143 [ label = "1 lanes" ] - 180 -> 196 [ label = "4 lanes" ] - 196 -> 202 [ label = "4 lanes" ] - 202 -> 205 [ label = "4 lanes" ] - 231 -> 224 [ label = "1 lanes" ] - 224 -> 231 [ label = "1 lanes" ] - 224 -> 222 [ label = "1 lanes" ] - 222 -> 224 [ label = "1 lanes" ] - 222 -> 207 [ label = "1 lanes" ] - 207 -> 222 [ label = "1 lanes" ] - 317 -> 328 [ label = "1 lanes" ] - 263 -> 285 [ label = "1 lanes" ] - 76 -> 161 [ label = "3 lanes" ] - 161 -> 186 [ label = "3 lanes" ] - 186 -> 214 [ label = "3 lanes" ] - 214 -> 232 [ label = "3 lanes" ] - 232 -> 245 [ label = "3 lanes" ] + 27 -> 39 [ label = "3 lanes" ] + 67 -> 68 [ label = "1 lanes" ] + 40 -> 34 [ label = "2 lanes" ] + 34 -> 33 [ label = "2 lanes" ] + 33 -> 31 [ label = "2 lanes" ] + 31 -> 32 [ label = "2 lanes" ] + 32 -> 35 [ label = "2 lanes" ] + 35 -> 42 [ label = "2 lanes" ] + 42 -> 45 [ label = "2 lanes" ] + 233 -> 244 [ label = "2 lanes" ] + 244 -> 233 [ label = "2 lanes" ] + 244 -> 270 [ label = "2 lanes" ] + 270 -> 244 [ label = "2 lanes" ] + 270 -> 292 [ label = "2 lanes" ] + 292 -> 270 [ label = "2 lanes" ] + 167 -> 179 [ label = "3 lanes" ] + 210 -> 255 [ label = "0 lanes" ] + 214 -> 231 [ label = "0 lanes" ] + 170 -> 137 [ label = "2 lanes" ] + 110 -> 97 [ label = "3 lanes" ] + 97 -> 86 [ label = "3 lanes" ] + 86 -> 64 [ label = "3 lanes" ] + 64 -> 60 [ label = "3 lanes" ] + 75 -> 86 [ label = "2 lanes" ] + 134 -> 127 [ label = "1 lanes" ] + 158 -> 135 [ label = "3 lanes" ] + 135 -> 108 [ label = "3 lanes" ] + 137 -> 61 [ label = "1 lanes" ] + 295 -> 275 [ label = "3 lanes" ] + 290 -> 242 [ label = "2 lanes" ] + 157 -> 133 [ label = "5 lanes" ] + 176 -> 178 [ label = "3 lanes" ] + 178 -> 169 [ label = "3 lanes" ] + 182 -> 197 [ label = "1 lanes" ] + 197 -> 205 [ label = "1 lanes" ] + 205 -> 215 [ label = "1 lanes" ] + 215 -> 226 [ label = "1 lanes" ] + 220 -> 218 [ label = "0 lanes" ] + 276 -> 277 [ label = "2 lanes" ] + 277 -> 276 [ label = "2 lanes" ] + 277 -> 278 [ label = "2 lanes" ] + 278 -> 277 [ label = "2 lanes" ] + 217 -> 192 [ label = "2 lanes" ] + 192 -> 217 [ label = "2 lanes" ] + 1 -> 95 [ label = "1 lanes" ] + 177 -> 175 [ label = "1 lanes" ] + 285 -> 278 [ label = "2 lanes" ] + 278 -> 285 [ label = "2 lanes" ] + 278 -> 274 [ label = "2 lanes" ] + 274 -> 278 [ label = "2 lanes" ] + 242 -> 218 [ label = "0 lanes" ] + 231 -> 216 [ label = "0 lanes" ] + 216 -> 220 [ label = "0 lanes" ] + 218 -> 217 [ label = "2 lanes" ] + 217 -> 218 [ label = "2 lanes" ] + 217 -> 284 [ label = "2 lanes" ] + 284 -> 217 [ label = "2 lanes" ] + 244 -> 248 [ label = "2 lanes" ] + 248 -> 244 [ label = "2 lanes" ] + 218 -> 200 [ label = "2 lanes" ] + 200 -> 218 [ label = "2 lanes" ] + 214 -> 175 [ label = "5 lanes" ] + 175 -> 157 [ label = "5 lanes" ] + 255 -> 286 [ label = "0 lanes" ] + 166 -> 182 [ label = "2 lanes" ] + 182 -> 203 [ label = "2 lanes" ] + 203 -> 313 [ label = "2 lanes" ] + 314 -> 226 [ label = "0 lanes" ] + 226 -> 229 [ label = "0 lanes" ] + 229 -> 231 [ label = "0 lanes" ] + 76 -> 85 [ label = "2 lanes" ] + 107 -> 127 [ label = "1 lanes" ] + 171 -> 183 [ label = "4 lanes" ] + 183 -> 167 [ label = "4 lanes" ] + 202 -> 196 [ label = "1 lanes" ] + 196 -> 202 [ label = "1 lanes" ] + 196 -> 195 [ label = "1 lanes" ] + 195 -> 196 [ label = "1 lanes" ] + 195 -> 181 [ label = "1 lanes" ] + 181 -> 195 [ label = "1 lanes" ] + 280 -> 291 [ label = "1 lanes" ] + 230 -> 251 [ label = "1 lanes" ] + 70 -> 144 [ label = "3 lanes" ] + 144 -> 166 [ label = "3 lanes" ] + 166 -> 188 [ label = "3 lanes" ] + 188 -> 214 [ label = "3 lanes" ] 27 -> 25 [ label = "1 lanes" ] 25 -> 23 [ label = "1 lanes" ] 23 -> 24 [ label = "1 lanes" ] 24 -> 26 [ label = "1 lanes" ] - 26 -> 343 [ label = "1 lanes" ] - 344 -> 57 [ label = "1 lanes" ] - 57 -> 65 [ label = "1 lanes" ] - 65 -> 74 [ label = "1 lanes" ] - 72 -> 88 [ label = "1 lanes" ] - 173 -> 171 [ label = "1 lanes" ] - 171 -> 168 [ label = "1 lanes" ] - 168 -> 167 [ label = "1 lanes" ] - 173 -> 165 [ label = "1 lanes" ] - 88 -> 90 [ label = "1 lanes" ] - 90 -> 87 [ label = "1 lanes" ] - 87 -> 83 [ label = "1 lanes" ] - 83 -> 78 [ label = "1 lanes" ] + 26 -> 306 [ label = "1 lanes" ] + 307 -> 52 [ label = "1 lanes" ] + 52 -> 68 [ label = "1 lanes" ] + 66 -> 80 [ label = "1 lanes" ] + 156 -> 154 [ label = "1 lanes" ] + 154 -> 151 [ label = "1 lanes" ] + 151 -> 150 [ label = "1 lanes" ] + 156 -> 148 [ label = "1 lanes" ] + 80 -> 82 [ label = "1 lanes" ] + 82 -> 79 [ label = "1 lanes" ] + 79 -> 75 [ label = "1 lanes" ] + 75 -> 72 [ label = "1 lanes" ] 16 -> 28 [ label = "2 lanes" ] - 28 -> 33 [ label = "2 lanes" ] - 77 -> 58 [ label = "1 lanes" ] - 58 -> 84 [ label = "1 lanes" ] - 84 -> 77 [ label = "1 lanes" ] - 28 -> 32 [ label = "2 lanes" ] - 51 -> 48 [ label = "2 lanes" ] - 70 -> 79 [ label = "2 lanes" ] - 79 -> 80 [ label = "2 lanes" ] - 80 -> 77 [ label = "2 lanes" ] - 29 -> 31 [ label = "2 lanes" ] - 31 -> 32 [ label = "2 lanes" ] - 32 -> 37 [ label = "2 lanes" ] - 58 -> 55 [ label = "1 lanes" ] + 28 -> 31 [ label = "2 lanes" ] + 71 -> 53 [ label = "1 lanes" ] + 53 -> 76 [ label = "1 lanes" ] + 76 -> 71 [ label = "1 lanes" ] + 28 -> 29 [ label = "2 lanes" ] + 46 -> 43 [ label = "2 lanes" ] + 64 -> 73 [ label = "2 lanes" ] + 73 -> 71 [ label = "2 lanes" ] + 29 -> 33 [ label = "2 lanes" ] + 53 -> 50 [ label = "1 lanes" ] 7 -> 15 [ label = "2 lanes" ] - 274 -> 191 [ label = "2 lanes" ] - 154 -> 69 [ label = "2 lanes" ] - 308 -> 318 [ label = "2 lanes" ] - 308 -> 309 [ label = "2 lanes" ] - 309 -> 308 [ label = "2 lanes" ] - 309 -> 313 [ label = "2 lanes" ] - 313 -> 309 [ label = "2 lanes" ] - 313 -> 295 [ label = "2 lanes" ] - 295 -> 313 [ label = "2 lanes" ] - 295 -> 284 [ label = "2 lanes" ] - 284 -> 295 [ label = "2 lanes" ] - 179 -> 106 [ label = "1 lanes" ] - 106 -> 0 [ label = "1 lanes" ] - 335 -> 296 [ label = "1 lanes" ] - 296 -> 179 [ label = "1 lanes" ] - 267 -> 296 [ label = "1 lanes" ] - 286 -> 288 [ label = "0 lanes" ] - 288 -> 289 [ label = "0 lanes" ] - 310 -> 307 [ label = "3 lanes" ] - 251 -> 260 [ label = "1 lanes" ] - 266 -> 260 [ label = "2 lanes" ] - 241 -> 334 [ label = "2 lanes" ] - 252 -> 228 [ label = "2 lanes" ] - 314 -> 326 [ label = "1 lanes" ] - 326 -> 314 [ label = "1 lanes" ] - 314 -> 300 [ label = "1 lanes" ] - 300 -> 314 [ label = "1 lanes" ] - 300 -> 297 [ label = "1 lanes" ] - 297 -> 300 [ label = "1 lanes" ] - 297 -> 270 [ label = "1 lanes" ] - 270 -> 297 [ label = "1 lanes" ] - 74 -> 72 [ label = "1 lanes" ] - 346 -> 50 [ label = "2 lanes" ] - 50 -> 346 [ label = "2 lanes" ] + 240 -> 170 [ label = "2 lanes" ] + 137 -> 63 [ label = "2 lanes" ] + 271 -> 281 [ label = "2 lanes" ] + 271 -> 272 [ label = "2 lanes" ] + 272 -> 271 [ label = "2 lanes" ] + 272 -> 276 [ label = "2 lanes" ] + 276 -> 272 [ label = "2 lanes" ] + 276 -> 260 [ label = "2 lanes" ] + 260 -> 276 [ label = "2 lanes" ] + 260 -> 250 [ label = "2 lanes" ] + 250 -> 260 [ label = "2 lanes" ] + 161 -> 96 [ label = "1 lanes" ] + 96 -> 0 [ label = "1 lanes" ] + 298 -> 234 [ label = "1 lanes" ] + 234 -> 161 [ label = "1 lanes" ] + 252 -> 254 [ label = "0 lanes" ] + 273 -> 270 [ label = "3 lanes" ] + 219 -> 228 [ label = "1 lanes" ] + 233 -> 228 [ label = "2 lanes" ] + 210 -> 297 [ label = "2 lanes" ] + 220 -> 200 [ label = "2 lanes" ] + 277 -> 289 [ label = "1 lanes" ] + 289 -> 277 [ label = "1 lanes" ] + 277 -> 263 [ label = "1 lanes" ] + 263 -> 277 [ label = "1 lanes" ] + 263 -> 236 [ label = "1 lanes" ] + 236 -> 263 [ label = "1 lanes" ] + 68 -> 66 [ label = "1 lanes" ] + 309 -> 45 [ label = "2 lanes" ] + 45 -> 309 [ label = "2 lanes" ] 14 -> 17 [ label = "1 lanes" ] - 264 -> 269 [ label = "0 lanes" ] - 269 -> 271 [ label = "0 lanes" ] - 271 -> 330 [ label = "0 lanes" ] - 352 -> 246 [ label = "3 lanes" ] - 246 -> 245 [ label = "3 lanes" ] - 261 -> 245 [ label = "0 lanes" ] - 108 -> 107 [ label = "3 lanes" ] - 107 -> 104 [ label = "3 lanes" ] - 89 -> 115 [ label = "3 lanes" ] - 115 -> 169 [ label = "3 lanes" ] - 169 -> 181 [ label = "4 lanes" ] - 181 -> 232 [ label = "4 lanes" ] - 232 -> 235 [ label = "4 lanes" ] - 235 -> 349 [ label = "4 lanes" ] - 113 -> 125 [ label = "2 lanes" ] - 316 -> 320 [ label = "2 lanes" ] - 320 -> 316 [ label = "2 lanes" ] - 297 -> 295 [ label = "1 lanes" ] - 295 -> 297 [ label = "1 lanes" ] - 300 -> 311 [ label = "1 lanes" ] - 287 -> 254 [ label = "1 lanes" ] - 177 -> 182 [ label = "2 lanes" ] - 182 -> 210 [ label = "2 lanes" ] - 210 -> 229 [ label = "2 lanes" ] - 159 -> 170 [ label = "2 lanes" ] - 170 -> 172 [ label = "2 lanes" ] - 155 -> 159 [ label = "2 lanes" ] - 145 -> 155 [ label = "1 lanes" ] - 142 -> 145 [ label = "1 lanes" ] - 135 -> 142 [ label = "1 lanes" ] - 256 -> 270 [ label = "1 lanes" ] - 279 -> 275 [ label = "1 lanes" ] - 283 -> 279 [ label = "1 lanes" ] - 237 -> 254 [ label = "1 lanes" ] - 254 -> 256 [ label = "1 lanes" ] - 284 -> 256 [ label = "1 lanes" ] - 280 -> 283 [ label = "1 lanes" ] - 283 -> 284 [ label = "1 lanes" ] - 338 -> 8 [ label = "2 lanes" ] - 276 -> 252 [ label = "2 lanes" ] - 131 -> 146 [ label = "3 lanes" ] - 205 -> 223 [ label = "3 lanes" ] - 146 -> 171 [ label = "3 lanes" ] - 171 -> 188 [ label = "3 lanes" ] + 231 -> 237 [ label = "0 lanes" ] + 237 -> 293 [ label = "0 lanes" ] + 315 -> 215 [ label = "3 lanes" ] + 215 -> 214 [ label = "3 lanes" ] + 229 -> 214 [ label = "0 lanes" ] + 90 -> 94 [ label = "3 lanes" ] + 81 -> 102 [ label = "3 lanes" ] + 102 -> 152 [ label = "3 lanes" ] + 152 -> 162 [ label = "4 lanes" ] + 162 -> 188 [ label = "4 lanes" ] + 188 -> 205 [ label = "4 lanes" ] + 205 -> 312 [ label = "4 lanes" ] + 100 -> 111 [ label = "2 lanes" ] + 279 -> 283 [ label = "2 lanes" ] + 283 -> 279 [ label = "2 lanes" ] + 263 -> 260 [ label = "1 lanes" ] + 260 -> 263 [ label = "1 lanes" ] + 263 -> 274 [ label = "1 lanes" ] + 253 -> 222 [ label = "1 lanes" ] + 159 -> 163 [ label = "2 lanes" ] + 163 -> 184 [ label = "2 lanes" ] + 184 -> 201 [ label = "2 lanes" ] + 142 -> 153 [ label = "2 lanes" ] + 153 -> 155 [ label = "2 lanes" ] + 138 -> 142 [ label = "2 lanes" ] + 128 -> 138 [ label = "1 lanes" ] + 126 -> 128 [ label = "1 lanes" ] + 119 -> 126 [ label = "1 lanes" ] + 224 -> 236 [ label = "1 lanes" ] + 245 -> 241 [ label = "1 lanes" ] + 249 -> 245 [ label = "1 lanes" ] + 207 -> 222 [ label = "1 lanes" ] + 222 -> 224 [ label = "1 lanes" ] + 250 -> 224 [ label = "1 lanes" ] + 246 -> 249 [ label = "1 lanes" ] + 249 -> 250 [ label = "1 lanes" ] + 301 -> 8 [ label = "2 lanes" ] + 242 -> 220 [ label = "2 lanes" ] + 116 -> 129 [ label = "3 lanes" ] + 167 -> 206 [ label = "3 lanes" ] + 129 -> 154 [ label = "3 lanes" ] + 154 -> 167 [ label = "3 lanes" ] 8 -> 16 [ label = "3 lanes" ] - 16 -> 31 [ label = "3 lanes" ] - 31 -> 38 [ label = "3 lanes" ] - 38 -> 51 [ label = "3 lanes" ] - 51 -> 59 [ label = "3 lanes" ] - 318 -> 333 [ label = "3 lanes" ] - 205 -> 230 [ label = "2 lanes" ] - 230 -> 298 [ label = "2 lanes" ] - 298 -> 306 [ label = "2 lanes" ] - 71 -> 206 [ label = "2 lanes" ] - 206 -> 241 [ label = "2 lanes" ] + 16 -> 29 [ label = "3 lanes" ] + 29 -> 33 [ label = "3 lanes" ] + 33 -> 46 [ label = "3 lanes" ] + 46 -> 54 [ label = "3 lanes" ] + 281 -> 296 [ label = "3 lanes" ] + 167 -> 198 [ label = "2 lanes" ] + 198 -> 261 [ label = "2 lanes" ] + 261 -> 269 [ label = "2 lanes" ] + 65 -> 180 [ label = "2 lanes" ] + 180 -> 210 [ label = "2 lanes" ] 10 -> 15 [ label = "1 lanes" ] - 64 -> 41 [ label = "1 lanes" ] - 190 -> 168 [ label = "0 lanes" ] - 168 -> 131 [ label = "0 lanes" ] - 190 -> 188 [ label = "3 lanes" ] - 262 -> 247 [ label = "0 lanes" ] - 247 -> 242 [ label = "0 lanes" ] - 242 -> 228 [ label = "0 lanes" ] - 262 -> 271 [ label = "0 lanes" ] - 271 -> 277 [ label = "0 lanes" ] - 277 -> 281 [ label = "0 lanes" ] - 255 -> 262 [ label = "0 lanes" ] - 238 -> 199 [ label = "0 lanes" ] - 242 -> 238 [ label = "0 lanes" ] - 238 -> 248 [ label = "0 lanes" ] - 248 -> 255 [ label = "0 lanes" ] - 255 -> 269 [ label = "0 lanes" ] - 269 -> 277 [ label = "0 lanes" ] - 277 -> 288 [ label = "0 lanes" ] - 199 -> 192 [ label = "2 lanes" ] - 192 -> 181 [ label = "2 lanes" ] - 181 -> 174 [ label = "2 lanes" ] - 104 -> 113 [ label = "3 lanes" ] - 113 -> 124 [ label = "3 lanes" ] - 124 -> 139 [ label = "3 lanes" ] - 117 -> 116 [ label = "1 lanes" ] - 117 -> 108 [ label = "3 lanes" ] - 150 -> 103 [ label = "3 lanes" ] - 103 -> 100 [ label = "3 lanes" ] - 100 -> 99 [ label = "3 lanes" ] - 150 -> 117 [ label = "5 lanes" ] - 224 -> 207 [ label = "1 lanes" ] - 207 -> 157 [ label = "1 lanes" ] - 157 -> 166 [ label = "1 lanes" ] - 166 -> 224 [ label = "1 lanes" ] - 312 -> 299 [ label = "2 lanes" ] - 299 -> 292 [ label = "2 lanes" ] - 292 -> 236 [ label = "3 lanes" ] - 236 -> 223 [ label = "3 lanes" ] - 148 -> 157 [ label = "2 lanes" ] - 157 -> 166 [ label = "2 lanes" ] - 166 -> 184 [ label = "2 lanes" ] - 184 -> 187 [ label = "2 lanes" ] - 187 -> 209 [ label = "2 lanes" ] - 184 -> 193 [ label = "1 lanes" ] - 226 -> 230 [ label = "2 lanes" ] - 230 -> 236 [ label = "2 lanes" ] - 236 -> 240 [ label = "2 lanes" ] - 243 -> 260 [ label = "2 lanes" ] - 209 -> 213 [ label = "2 lanes" ] - 213 -> 226 [ label = "2 lanes" ] - 73 -> 92 [ label = "3 lanes" ] - 92 -> 73 [ label = "3 lanes" ] - 92 -> 131 [ label = "3 lanes" ] - 131 -> 92 [ label = "3 lanes" ] - 63 -> 93 [ label = "3 lanes" ] - 93 -> 99 [ label = "3 lanes" ] - 223 -> 253 [ label = "2 lanes" ] - 253 -> 268 [ label = "2 lanes" ] - 253 -> 354 [ label = "2 lanes" ] - 260 -> 304 [ label = "2 lanes" ] - 165 -> 156 [ label = "1 lanes" ] - 78 -> 70 [ label = "2 lanes" ] - 70 -> 61 [ label = "2 lanes" ] - 61 -> 41 [ label = "2 lanes" ] - 41 -> 13 [ label = "2 lanes" ] - 134 -> 130 [ label = "1 lanes" ] - 130 -> 124 [ label = "1 lanes" ] - 124 -> 109 [ label = "1 lanes" ] - 109 -> 87 [ label = "1 lanes" ] - 119 -> 126 [ label = "1 lanes" ] - 126 -> 135 [ label = "1 lanes" ] - 127 -> 139 [ label = "1 lanes" ] - 185 -> 138 [ label = "1 lanes" ] - 121 -> 122 [ label = "1 lanes" ] - 122 -> 123 [ label = "1 lanes" ] - 65 -> 62 [ label = "1 lanes" ] - 62 -> 60 [ label = "1 lanes" ] - 41 -> 22 [ label = "1 lanes" ] - 41 -> 22 [ label = "1 lanes" ] - 56 -> 61 [ label = "1 lanes" ] - 319 -> 325 [ label = "1 lanes" ] - 209 -> 196 [ label = "2 lanes" ] - 196 -> 183 [ label = "2 lanes" ] - 183 -> 173 [ label = "2 lanes" ] + 59 -> 36 [ label = "1 lanes" ] + 169 -> 151 [ label = "0 lanes" ] + 151 -> 116 [ label = "0 lanes" ] + 169 -> 167 [ label = "3 lanes" ] + 223 -> 216 [ label = "0 lanes" ] + 216 -> 211 [ label = "0 lanes" ] + 211 -> 200 [ label = "0 lanes" ] + 223 -> 237 [ label = "0 lanes" ] + 237 -> 243 [ label = "0 lanes" ] + 243 -> 247 [ label = "0 lanes" ] + 208 -> 175 [ label = "0 lanes" ] + 211 -> 208 [ label = "0 lanes" ] + 208 -> 216 [ label = "0 lanes" ] + 216 -> 223 [ label = "0 lanes" ] + 223 -> 231 [ label = "0 lanes" ] + 231 -> 243 [ label = "0 lanes" ] + 243 -> 252 [ label = "0 lanes" ] + 175 -> 162 [ label = "2 lanes" ] + 94 -> 100 [ label = "3 lanes" ] + 100 -> 115 [ label = "3 lanes" ] + 115 -> 123 [ label = "3 lanes" ] + 104 -> 103 [ label = "1 lanes" ] + 104 -> 90 [ label = "3 lanes" ] + 133 -> 90 [ label = "3 lanes" ] + 90 -> 91 [ label = "3 lanes" ] + 133 -> 104 [ label = "5 lanes" ] + 196 -> 181 [ label = "1 lanes" ] + 181 -> 140 [ label = "1 lanes" ] + 140 -> 149 [ label = "1 lanes" ] + 149 -> 196 [ label = "1 lanes" ] + 275 -> 262 [ label = "2 lanes" ] + 262 -> 257 [ label = "2 lanes" ] + 257 -> 206 [ label = "3 lanes" ] + 131 -> 140 [ label = "2 lanes" ] + 140 -> 149 [ label = "2 lanes" ] + 149 -> 171 [ label = "2 lanes" ] + 171 -> 183 [ label = "2 lanes" ] + 171 -> 171 [ label = "1 lanes" ] + 198 -> 206 [ label = "2 lanes" ] + 212 -> 228 [ label = "2 lanes" ] + 183 -> 187 [ label = "2 lanes" ] + 187 -> 198 [ label = "2 lanes" ] + 67 -> 84 [ label = "3 lanes" ] + 84 -> 67 [ label = "3 lanes" ] + 84 -> 116 [ label = "3 lanes" ] + 116 -> 84 [ label = "3 lanes" ] + 58 -> 85 [ label = "3 lanes" ] + 85 -> 91 [ label = "3 lanes" ] + 206 -> 221 [ label = "2 lanes" ] + 221 -> 235 [ label = "2 lanes" ] + 221 -> 317 [ label = "2 lanes" ] + 228 -> 267 [ label = "2 lanes" ] + 148 -> 139 [ label = "1 lanes" ] + 72 -> 64 [ label = "2 lanes" ] + 64 -> 56 [ label = "2 lanes" ] + 56 -> 36 [ label = "2 lanes" ] + 36 -> 13 [ label = "2 lanes" ] + 118 -> 115 [ label = "1 lanes" ] + 115 -> 97 [ label = "1 lanes" ] + 97 -> 79 [ label = "1 lanes" ] + 106 -> 112 [ label = "1 lanes" ] + 112 -> 119 [ label = "1 lanes" ] + 108 -> 123 [ label = "1 lanes" ] + 165 -> 122 [ label = "1 lanes" ] + 108 -> 109 [ label = "1 lanes" ] + 109 -> 110 [ label = "1 lanes" ] + 52 -> 57 [ label = "1 lanes" ] + 57 -> 55 [ label = "1 lanes" ] + 36 -> 22 [ label = "1 lanes" ] + 36 -> 22 [ label = "1 lanes" ] + 51 -> 56 [ label = "1 lanes" ] + 282 -> 288 [ label = "1 lanes" ] + 183 -> 164 [ label = "2 lanes" ] + 164 -> 156 [ label = "2 lanes" ] 10 -> 22 [ label = "1 lanes" ] 22 -> 10 [ label = "1 lanes" ] - 188 -> 202 [ label = "1 lanes" ] - 202 -> 213 [ label = "1 lanes" ] - 166 -> 222 [ label = "1 lanes" ] - 259 -> 275 [ label = "1 lanes" ] - 275 -> 272 [ label = "1 lanes" ] - 272 -> 257 [ label = "1 lanes" ] - 207 -> 234 [ label = "1 lanes" ] - 234 -> 207 [ label = "1 lanes" ] - 234 -> 259 [ label = "1 lanes" ] - 259 -> 234 [ label = "1 lanes" ] - 163 -> 174 [ label = "1 lanes" ] - 174 -> 206 [ label = "1 lanes" ] - 206 -> 214 [ label = "1 lanes" ] - 214 -> 225 [ label = "1 lanes" ] - 225 -> 233 [ label = "1 lanes" ] - 233 -> 211 [ label = "1 lanes" ] - 2 -> 43 [ label = "2 lanes" ] - 217 -> 215 [ label = "1 lanes" ] - 44 -> 57 [ label = "1 lanes" ] - 57 -> 73 [ label = "1 lanes" ] - 68 -> 83 [ label = "2 lanes" ] - 44 -> 68 [ label = "2 lanes" ] - 68 -> 44 [ label = "2 lanes" ] + 167 -> 187 [ label = "1 lanes" ] + 149 -> 195 [ label = "1 lanes" ] + 227 -> 241 [ label = "1 lanes" ] + 241 -> 238 [ label = "1 lanes" ] + 238 -> 225 [ label = "1 lanes" ] + 181 -> 204 [ label = "1 lanes" ] + 204 -> 181 [ label = "1 lanes" ] + 204 -> 227 [ label = "1 lanes" ] + 227 -> 204 [ label = "1 lanes" ] + 146 -> 162 [ label = "1 lanes" ] + 162 -> 180 [ label = "1 lanes" ] + 180 -> 188 [ label = "1 lanes" ] + 188 -> 197 [ label = "1 lanes" ] + 197 -> 203 [ label = "1 lanes" ] + 203 -> 185 [ label = "1 lanes" ] + 2 -> 38 [ label = "2 lanes" ] + 191 -> 189 [ label = "1 lanes" ] + 39 -> 52 [ label = "1 lanes" ] + 52 -> 67 [ label = "1 lanes" ] + 62 -> 75 [ label = "2 lanes" ] + 39 -> 62 [ label = "2 lanes" ] + 62 -> 39 [ label = "2 lanes" ] 19 -> 26 [ label = "1 lanes" ] - 223 -> 353 [ label = "2 lanes" ] - 223 -> 204 [ label = "3 lanes" ] - 189 -> 185 [ label = "1 lanes" ] - 185 -> 189 [ label = "1 lanes" ] - 272 -> 284 [ label = "1 lanes" ] - 126 -> 133 [ label = "2 lanes" ] - 133 -> 137 [ label = "2 lanes" ] - 137 -> 141 [ label = "2 lanes" ] - 141 -> 140 [ label = "2 lanes" ] - 140 -> 144 [ label = "2 lanes" ] - 144 -> 149 [ label = "2 lanes" ] - 149 -> 158 [ label = "2 lanes" ] - 158 -> 159 [ label = "2 lanes" ] - 160 -> 159 [ label = "1 lanes" ] - 112 -> 128 [ label = "1 lanes" ] - 144 -> 158 [ label = "1 lanes" ] - 158 -> 194 [ label = "2 lanes" ] - 149 -> 141 [ label = "1 lanes" ] - 137 -> 129 [ label = "1 lanes" ] - 133 -> 140 [ label = "1 lanes" ] - 129 -> 128 [ label = "2 lanes" ] - 128 -> 133 [ label = "2 lanes" ] - 98 -> 89 [ label = "2 lanes" ] - 89 -> 82 [ label = "2 lanes" ] - 103 -> 108 [ label = "2 lanes" ] - 95 -> 98 [ label = "2 lanes" ] - 114 -> 116 [ label = "2 lanes" ] - 116 -> 119 [ label = "2 lanes" ] - 119 -> 125 [ label = "2 lanes" ] - 125 -> 130 [ label = "2 lanes" ] - 130 -> 148 [ label = "2 lanes" ] - 148 -> 153 [ label = "2 lanes" ] - 96 -> 100 [ label = "2 lanes" ] - 100 -> 107 [ label = "2 lanes" ] - 107 -> 114 [ label = "2 lanes" ] - 93 -> 95 [ label = "2 lanes" ] - 95 -> 96 [ label = "2 lanes" ] - 227 -> 198 [ label = "1 lanes" ] - 198 -> 194 [ label = "1 lanes" ] - 194 -> 212 [ label = "1 lanes" ] - 198 -> 219 [ label = "1 lanes" ] - 118 -> 97 [ label = "1 lanes" ] - 240 -> 243 [ label = "2 lanes" ] - 121 -> 127 [ label = "1 lanes" ] - 188 -> 205 [ label = "3 lanes" ] - 204 -> 216 [ label = "3 lanes" ] - 204 -> 190 [ label = "0 lanes" ] - 331 -> 302 [ label = "2 lanes" ] - 302 -> 243 [ label = "2 lanes" ] - 98 -> 103 [ label = "2 lanes" ] - 55 -> 54 [ label = "2 lanes" ] - 54 -> 48 [ label = "2 lanes" ] - 48 -> 39 [ label = "2 lanes" ] - 39 -> 35 [ label = "2 lanes" ] - 85 -> 82 [ label = "2 lanes" ] - 51 -> 53 [ label = "2 lanes" ] - 49 -> 37 [ label = "2 lanes" ] - 14 -> 35 [ label = "2 lanes" ] - 35 -> 29 [ label = "2 lanes" ] + 206 -> 316 [ label = "2 lanes" ] + 206 -> 179 [ label = "3 lanes" ] + 168 -> 165 [ label = "1 lanes" ] + 165 -> 168 [ label = "1 lanes" ] + 238 -> 250 [ label = "1 lanes" ] + 112 -> 113 [ label = "2 lanes" ] + 113 -> 121 [ label = "2 lanes" ] + 121 -> 125 [ label = "2 lanes" ] + 125 -> 124 [ label = "2 lanes" ] + 124 -> 132 [ label = "2 lanes" ] + 132 -> 141 [ label = "2 lanes" ] + 141 -> 142 [ label = "2 lanes" ] + 143 -> 142 [ label = "1 lanes" ] + 99 -> 113 [ label = "1 lanes" ] + 124 -> 141 [ label = "1 lanes" ] + 141 -> 172 [ label = "2 lanes" ] + 132 -> 125 [ label = "1 lanes" ] + 121 -> 114 [ label = "1 lanes" ] + 113 -> 124 [ label = "1 lanes" ] + 114 -> 113 [ label = "2 lanes" ] + 90 -> 81 [ label = "2 lanes" ] + 90 -> 90 [ label = "2 lanes" ] + 87 -> 90 [ label = "2 lanes" ] + 101 -> 103 [ label = "2 lanes" ] + 103 -> 106 [ label = "2 lanes" ] + 106 -> 111 [ label = "2 lanes" ] + 111 -> 115 [ label = "2 lanes" ] + 115 -> 131 [ label = "2 lanes" ] + 131 -> 136 [ label = "2 lanes" ] + 88 -> 90 [ label = "2 lanes" ] + 90 -> 101 [ label = "2 lanes" ] + 85 -> 87 [ label = "2 lanes" ] + 87 -> 88 [ label = "2 lanes" ] + 199 -> 174 [ label = "1 lanes" ] + 174 -> 172 [ label = "1 lanes" ] + 172 -> 186 [ label = "1 lanes" ] + 174 -> 193 [ label = "1 lanes" ] + 105 -> 89 [ label = "1 lanes" ] + 206 -> 212 [ label = "2 lanes" ] + 179 -> 190 [ label = "3 lanes" ] + 179 -> 169 [ label = "0 lanes" ] + 294 -> 265 [ label = "2 lanes" ] + 265 -> 212 [ label = "2 lanes" ] + 50 -> 49 [ label = "2 lanes" ] + 49 -> 43 [ label = "2 lanes" ] + 43 -> 34 [ label = "2 lanes" ] + 77 -> 81 [ label = "2 lanes" ] + 46 -> 48 [ label = "2 lanes" ] + 44 -> 33 [ label = "2 lanes" ] + 14 -> 34 [ label = "2 lanes" ] + 34 -> 29 [ label = "2 lanes" ] 29 -> 18 [ label = "2 lanes" ] 18 -> 17 [ label = "1 lanes" ] - 36 -> 42 [ label = "1 lanes" ] - 42 -> 36 [ label = "1 lanes" ] - 42 -> 46 [ label = "1 lanes" ] - 46 -> 42 [ label = "1 lanes" ] - 193 -> 187 [ label = "3 lanes" ] - 187 -> 180 [ label = "3 lanes" ] - 280 -> 231 [ label = "2 lanes" ] - 231 -> 221 [ label = "2 lanes" ] - 221 -> 193 [ label = "2 lanes" ] - 82 -> 53 [ label = "2 lanes" ] - 53 -> 49 [ label = "2 lanes" ] - 49 -> 42 [ label = "2 lanes" ] - 324 -> 274 [ label = "2 lanes" ] - 127 -> 123 [ label = "3 lanes" ] - 228 -> 197 [ label = "2 lanes" ] - 197 -> 228 [ label = "2 lanes" ] - 197 -> 175 [ label = "2 lanes" ] - 175 -> 197 [ label = "2 lanes" ] - 101 -> 80 [ label = "3 lanes" ] - 80 -> 66 [ label = "3 lanes" ] - 99 -> 101 [ label = "3 lanes" ] - 43 -> 45 [ label = "3 lanes" ] - 45 -> 54 [ label = "3 lanes" ] - 54 -> 59 [ label = "3 lanes" ] - 52 -> 43 [ label = "3 lanes" ] - 66 -> 64 [ label = "3 lanes" ] - 64 -> 52 [ label = "3 lanes" ] - 118 -> 121 [ label = "1 lanes" ] - 120 -> 118 [ label = "1 lanes" ] - 143 -> 120 [ label = "1 lanes" ] - 59 -> 63 [ label = "3 lanes" ] - 161 -> 348 [ label = "1 lanes" ] - 208 -> 347 [ label = "1 lanes" ] + 32 -> 37 [ label = "1 lanes" ] + 37 -> 32 [ label = "1 lanes" ] + 37 -> 41 [ label = "1 lanes" ] + 41 -> 37 [ label = "1 lanes" ] + 246 -> 202 [ label = "2 lanes" ] + 202 -> 171 [ label = "2 lanes" ] + 81 -> 48 [ label = "2 lanes" ] + 48 -> 44 [ label = "2 lanes" ] + 44 -> 37 [ label = "2 lanes" ] + 287 -> 240 [ label = "2 lanes" ] + 108 -> 110 [ label = "3 lanes" ] + 200 -> 177 [ label = "2 lanes" ] + 177 -> 200 [ label = "2 lanes" ] + 177 -> 157 [ label = "2 lanes" ] + 157 -> 177 [ label = "2 lanes" ] + 92 -> 73 [ label = "3 lanes" ] + 73 -> 60 [ label = "3 lanes" ] + 91 -> 92 [ label = "3 lanes" ] + 38 -> 40 [ label = "3 lanes" ] + 40 -> 49 [ label = "3 lanes" ] + 49 -> 54 [ label = "3 lanes" ] + 47 -> 38 [ label = "3 lanes" ] + 60 -> 59 [ label = "3 lanes" ] + 59 -> 47 [ label = "3 lanes" ] + 105 -> 108 [ label = "1 lanes" ] + 107 -> 105 [ label = "1 lanes" ] + 127 -> 107 [ label = "1 lanes" ] + 54 -> 58 [ label = "3 lanes" ] + 144 -> 311 [ label = "1 lanes" ] + 182 -> 310 [ label = "1 lanes" ] 11 -> 20 [ label = "1 lanes" ] 20 -> 25 [ label = "1 lanes" ] 12 -> 21 [ label = "1 lanes" ] 21 -> 23 [ label = "1 lanes" ] - 342 -> 24 [ label = "1 lanes" ] + 305 -> 24 [ label = "1 lanes" ] 20 -> 21 [ label = "1 lanes" ] - 21 -> 341 [ label = "1 lanes" ] - 265 -> 258 [ label = "1 lanes" ] - 303 -> 302 [ label = "2 lanes" ] - 302 -> 301 [ label = "2 lanes" ] - 301 -> 299 [ label = "2 lanes" ] - 299 -> 298 [ label = "2 lanes" ] - 162 -> 132 [ label = "1 lanes" ] - 132 -> 91 [ label = "1 lanes" ] - 131 -> 132 [ label = "1 lanes" ] - 234 -> 220 [ label = "1 lanes" ] - 220 -> 195 [ label = "1 lanes" ] - 220 -> 189 [ label = "1 lanes" ] - 218 -> 210 [ label = "1 lanes" ] + 21 -> 304 [ label = "1 lanes" ] + 232 -> 226 [ label = "1 lanes" ] + 266 -> 265 [ label = "2 lanes" ] + 265 -> 264 [ label = "2 lanes" ] + 264 -> 262 [ label = "2 lanes" ] + 262 -> 261 [ label = "2 lanes" ] + 145 -> 117 [ label = "1 lanes" ] + 117 -> 83 [ label = "1 lanes" ] + 116 -> 117 [ label = "1 lanes" ] + 204 -> 194 [ label = "1 lanes" ] + 194 -> 173 [ label = "1 lanes" ] + 194 -> 168 [ label = "1 lanes" ] + 192 -> 184 [ label = "1 lanes" ] 4 -> 5 [ label = "1 lanes" ] - 72 -> 62 [ label = "1 lanes" ] - 285 -> 287 [ label = "1 lanes" ] - 287 -> 305 [ label = "1 lanes" ] - 170 -> 182 [ label = "2 lanes" ] - 172 -> 177 [ label = "1 lanes" ] - 229 -> 237 [ label = "1 lanes" ] - 237 -> 263 [ label = "1 lanes" ] - 163 -> 164 [ label = "2 lanes" ] - 164 -> 111 [ label = "2 lanes" ] - 111 -> 85 [ label = "2 lanes" ] - 164 -> 169 [ label = "1 lanes" ] - 102 -> 345 [ label = "1 lanes" ] - 40 -> 75 [ label = "2 lanes" ] - 75 -> 40 [ label = "2 lanes" ] - 115 -> 111 [ label = "1 lanes" ] - 111 -> 115 [ label = "1 lanes" ] - 306 -> 308 [ label = "2 lanes" ] - 306 -> 318 [ label = "2 lanes" ] - 221 -> 239 [ label = "1 lanes" ] - 239 -> 221 [ label = "1 lanes" ] - 239 -> 273 [ label = "1 lanes" ] - 273 -> 239 [ label = "1 lanes" ] - 239 -> 244 [ label = "1 lanes" ] - 244 -> 239 [ label = "1 lanes" ] - 30 -> 73 [ label = "3 lanes" ] - 73 -> 30 [ label = "3 lanes" ] + 66 -> 57 [ label = "1 lanes" ] + 251 -> 253 [ label = "1 lanes" ] + 253 -> 268 [ label = "1 lanes" ] + 153 -> 163 [ label = "2 lanes" ] + 155 -> 159 [ label = "1 lanes" ] + 201 -> 207 [ label = "1 lanes" ] + 207 -> 230 [ label = "1 lanes" ] + 146 -> 147 [ label = "2 lanes" ] + 147 -> 102 [ label = "2 lanes" ] + 102 -> 77 [ label = "2 lanes" ] + 147 -> 152 [ label = "1 lanes" ] + 93 -> 308 [ label = "1 lanes" ] + 35 -> 69 [ label = "2 lanes" ] + 69 -> 35 [ label = "2 lanes" ] + 269 -> 271 [ label = "2 lanes" ] + 269 -> 281 [ label = "2 lanes" ] + 202 -> 209 [ label = "1 lanes" ] + 209 -> 202 [ label = "1 lanes" ] + 209 -> 239 [ label = "1 lanes" ] + 239 -> 209 [ label = "1 lanes" ] + 209 -> 213 [ label = "1 lanes" ] + 213 -> 209 [ label = "1 lanes" ] + 30 -> 67 [ label = "3 lanes" ] + 67 -> 30 [ label = "3 lanes" ] } diff --git a/tests/src/roosevelt_cycletrack/geometry.json b/tests/src/roosevelt_cycletrack/geometry.json index da8c26bc..00cbbccf 100644 --- a/tests/src/roosevelt_cycletrack/geometry.json +++ b/tests/src/roosevelt_cycletrack/geometry.json @@ -305,44 +305,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31744852972345, - 47.66854128420529 - ], - [ - -122.31738662993094, - 47.66854078418246 - ], - [ - -122.31738536944937, - 47.66861161655281 - ], - [ - -122.31744726924188, - 47.66861211657564 - ], - [ - -122.31744852972345, - 47.66854128420529 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 131, - "osm_way_ids": [ - 6517852 - ], - "src_i": 116, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -376,7 +338,7 @@ "osm_way_ids": [ 6517852 ], - "src_i": 131, + "src_i": 116, "type": "road" }, "type": "Feature" @@ -807,44 +769,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31747307840297, - 47.664873162610675 - ], - [ - -122.3174128783912, - 47.664872363113744 - ], - [ - -122.31740952155789, - 47.66498703741363 - ], - [ - -122.31746972156967, - 47.66498783691056 - ], - [ - -122.31747307840297, - 47.664873162610675 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 127, - "osm_way_ids": [ - 332753236 - ], - "src_i": 111, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1292,7 +1216,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 131, + "dst_i": 116, "osm_way_ids": [ 421652698 ], @@ -1335,7 +1259,7 @@ 421652698, 421652699 ], - "src_i": 131, + "src_i": 116, "type": "road" }, "type": "Feature" @@ -1545,7 +1469,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 106, + "dst_i": 96, "osm_way_ids": [ 428097445 ], @@ -1564,11 +1488,11 @@ ], [ -122.31747932339476, - 47.66498845834181 + 47.66498845924113 ], [ -122.31736162325863, - 47.6649877802533 + 47.66498778115262 ], [ -122.31735847873101, @@ -1583,7 +1507,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 127, + "dst_i": 111, "osm_way_ids": [ 428097446 ], @@ -1598,7 +1522,7 @@ [ [ -122.31746406141995, - 47.6648729890416 + 47.66487298814228 ], [ -122.31746600154676, @@ -1610,11 +1534,11 @@ ], [ -122.3173789148224, - 47.66487280378134 + 47.66487280288202 ], [ -122.31746406141995, - 47.6648729890416 + 47.66487298814228 ] ] ], @@ -1625,7 +1549,7 @@ "osm_way_ids": [ 428097447 ], - "src_i": 127, + "src_i": 111, "type": "road" }, "type": "Feature" @@ -1863,45 +1787,7 @@ 754995509, 363224303 ], - "src_i": 106, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.3174857579929, - 47.66170349092968 - ], - [ - -122.31757755817054, - 47.661581991677934 - ], - [ - -122.31753069068883, - 47.66156592799495 - ], - [ - -122.31743889051118, - 47.6616874272467 - ], - [ - -122.3174857579929, - 47.66170349092968 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 107, - "osm_way_ids": [ - 486283205 - ], - "src_i": 114, + "src_i": 96, "type": "road" }, "type": "Feature" @@ -1947,7 +1833,7 @@ "osm_way_ids": [ 486283205 ], - "src_i": 107, + "src_i": 114, "type": "road" }, "type": "Feature" @@ -2287,7 +2173,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 127, + "dst_i": 111, "osm_way_ids": [ 621351851 ], @@ -2330,7 +2216,7 @@ 621646780, 331771747 ], - "src_i": 106, + "src_i": 96, "type": "road" }, "type": "Feature" @@ -2658,12 +2544,12 @@ 47.66124621375899 ], [ - -122.31775616466881, - 47.66124543494646 + -122.3177956775611, + 47.6612455527576 ], [ - -122.31775540891398, - 47.66136012903142 + -122.31779492180625, + 47.661360246842555 ], [ -122.31801606955716, @@ -2925,11 +2811,11 @@ ], [ -122.31746109581663, - 47.668612196615264 + 47.668612197514584 ], [ -122.31743439069884, - 47.66861214265597 + 47.668612143555286 ], [ -122.3174315038756, @@ -3174,7 +3060,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 107, + "dst_i": 114, "osm_way_ids": [ 712316019 ], @@ -3228,11 +3114,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 104, + "dst_i": 96, "osm_way_ids": [ 712316019 ], - "src_i": 107, + "src_i": 114, "type": "road" }, "type": "Feature" @@ -3242,8 +3128,8 @@ "coordinates": [ [ [ - -122.31775605384257, - 47.66124562380401 + -122.3176983240542, + 47.66130786495481 ], [ -122.31778776216417, @@ -3270,12 +3156,12 @@ 47.6612043611289 ], [ - -122.31773340523218, - 47.661236094592 + -122.31767567544381, + 47.6612983357428 ], [ - -122.31775605384257, - 47.66124562380401 + -122.3176983240542, + 47.66130786495481 ] ] ], @@ -3286,7 +3172,7 @@ "osm_way_ids": [ 712316019 ], - "src_i": 104, + "src_i": 96, "type": "road" }, "type": "Feature" @@ -3329,82 +3215,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.3177950660139, - 47.66124555185827 - ], - [ - -122.31768676607922, - 47.661245752407 - ], - [ - -122.31768723341878, - 47.6613604482906 - ], - [ - -122.31779553335346, - 47.661360247741875 - ], - [ - -122.3177950660139, - 47.66124555185827 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 104, - "osm_way_ids": [ - 754995508 - ], - "src_i": 96, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31768761263146, - 47.66124575420564 - ], - [ - -122.31756361275804, - 47.66124515345879 - ], - [ - -122.31756238699313, - 47.66135984574511 - ], - [ - -122.31768638686655, - 47.66136044649196 - ], - [ - -122.31768761263146, - 47.66124575420564 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 106, - "osm_way_ids": [ - 754995508 - ], - "src_i": 104, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -5439,12 +5249,12 @@ "coordinates": [ [ [ - -122.31775555312161, - 47.66124562470333 + -122.3177956775611, + 47.6612455527576 ], [ - -122.31775602046118, - 47.66136032058693 + -122.31779492180625, + 47.661360246842555 ], [ -122.31771006762975, @@ -5455,12 +5265,44 @@ 47.661360444693315 ], [ - -122.31768879967395, - 47.66124574880971 + -122.3176370504967, + 47.66137004585106 + ], + [ + -122.31761479979255, + 47.66136009935381 + ], + [ + -122.31756028930613, + 47.6613827154942 + ], + [ + -122.3175043500959, + 47.66137039658649 + ], + [ + -122.31750649585211, + 47.66123378063744 ], [ - -122.31775555312161, - 47.66124562470333 + -122.31757795207103, + 47.66122308140799 + ], + [ + -122.3176562568174, + 47.66124560401893 + ], + [ + -122.31767567544381, + 47.6612983357428 + ], + [ + -122.3176983240542, + 47.66130786495481 + ], + [ + -122.3177956775611, + 47.6612455527576 ] ] ], @@ -5471,13 +5313,21 @@ "id": 96, "intersection_kind": "Intersection", "movements": [ - "Road #90 -> Road #109", + "Road #90 -> Road #82", + "Road #90 -> Road #62", "Road #66 -> Road #90", - "Road #66 -> Road #109", - "Road #109 -> Road #90" + "Road #66 -> Road #82", + "Road #66 -> Road #62", + "Road #54 -> Road #90", + "Road #54 -> Road #82", + "Road #54 -> Road #62", + "Road #82 -> Road #90", + "Road #82 -> Road #62" ], "osm_node_ids": [ - 4694379084 + 4694379084, + 5674754357, + 53079358 ], "type": "intersection" }, @@ -5891,170 +5741,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.3176370504967, - 47.66137004585106 - ], - [ - -122.31761479979255, - 47.66136009935381 - ], - [ - -122.3176160242222, - 47.66124540706749 - ], - [ - -122.31773340523218, - 47.661236094592 - ], - [ - -122.31775605384257, - 47.66124562380401 - ], - [ - -122.31775651717636, - 47.66136031968761 - ], - [ - -122.3176370504967, - 47.66137004585106 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 104, - "intersection_kind": "Intersection", - "movements": [ - "Road #110 -> Road #109", - "Road #109 -> Road #110" - ], - "osm_node_ids": [ - 5674754357 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.3176562568174, - 47.66124560222028 - ], - [ - -122.3176550310525, - 47.6613602945066 - ], - [ - -122.3175713692595, - 47.66135988891255 - ], - [ - -122.31756028930613, - 47.6613827154942 - ], - [ - -122.3175043500959, - 47.66137039658649 - ], - [ - -122.31750649585211, - 47.66123378063744 - ], - [ - -122.31757795207103, - 47.66122308140799 - ], - [ - -122.3176562568174, - 47.66124560401893 - ], - [ - -122.3176562568174, - 47.66124560222028 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 106, - "intersection_kind": "Intersection", - "movements": [ - "Road #110 -> Road #82", - "Road #110 -> Road #62", - "Road #54 -> Road #82", - "Road #54 -> Road #62", - "Road #82 -> Road #110", - "Road #82 -> Road #62" - ], - "osm_node_ids": [ - 53079358 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31754518756202, - 47.66166178578834 - ], - [ - -122.31751861329931, - 47.66166000513151 - ], - [ - -122.3174717458176, - 47.661643942347844 - ], - [ - -122.31754349846332, - 47.66152086658528 - ], - [ - -122.31756987243764, - 47.661523692253844 - ], - [ - -122.31759356788866, - 47.66153136706465 - ], - [ - -122.31754518756202, - 47.66166178578834 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 107, - "intersection_kind": "Connection", - "movements": [ - "Road #65 -> Road #66" - ], - "osm_node_ids": [ - 5674754355 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -6179,8 +5865,28 @@ 47.66498753833578 ], [ - -122.31745057266495, - 47.66487286403589 + -122.31747932339476, + 47.66498845834181 + ], + [ + -122.31736162325863, + 47.6649877802533 + ], + [ + -122.3173579740043, + 47.66487310865138 + ], + [ + -122.3173789148224, + 47.66487280557999 + ], + [ + -122.31746406141995, + 47.6648729890416 + ], + [ + -122.31746388650143, + 47.664909327930765 ], [ -122.31747517742524, @@ -6199,15 +5905,21 @@ "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 111, "intersection_kind": "Intersection", "movements": [ - "Road #33 -> Road #34", - "Road #34 -> Road #33" + "Road #33 -> Road #81", + "Road #33 -> Road #56", + "Road #55 -> Road #33", + "Road #55 -> Road #81", + "Road #55 -> Road #56", + "Road #81 -> Road #33", + "Road #81 -> Road #56" ], "osm_node_ids": [ - 4384739635 + 4384739635, + 53162656 ], "type": "intersection" }, @@ -6324,6 +6036,14 @@ "geometry": { "coordinates": [ [ + [ + -122.31754518756202, + 47.66166178578834 + ], + [ + -122.31751861329931, + 47.66166000513151 + ], [ -122.31752210098769, 47.66169560837558 @@ -6341,12 +6061,20 @@ 47.6616109138616 ], [ - -122.31754356789662, - 47.66162697844391 + -122.31754349846332, + 47.66152086658528 ], [ - -122.31752210098769, - 47.66169560837558 + -122.31756987243764, + 47.661523692253844 + ], + [ + -122.31759356788866, + 47.66153136706465 + ], + [ + -122.31754518756202, + 47.66166178578834 ] ] ], @@ -6358,10 +6086,11 @@ "intersection_kind": "Fork", "movements": [ "Road #53 -> Road #54", - "Road #53 -> Road #65" + "Road #53 -> Road #66" ], "osm_node_ids": [ - 59711142 + 59711142, + 5674754355 ], "type": "intersection" }, @@ -6423,18 +6152,38 @@ ], [ -122.31743439069884, - 47.66861214175664 + 47.66861214265597 ], [ - -122.31743439069884, - 47.66861201225433 + -122.31743332783515, + 47.66885285328523 ], [ - -122.31743362025618, - 47.668612005959076 + -122.31743790642759, + 47.668612139958 + ], + [ + -122.31735276784157, + 47.668611406111545 + ], + [ + -122.31735225109755, + 47.66861140251426 + ], + [ + -122.317353260551, + 47.66854056834527 ], [ - -122.31743488073775, + -122.31743840714854, + 47.66854037319248 + ], + [ + -122.31743717871313, + 47.66829789179892 + ], + [ + -122.317434882073, 47.66854117358873 ], [ @@ -6454,11 +6203,17 @@ "id": 116, "intersection_kind": "Intersection", "movements": [ - "Road #11 -> Road #13", - "Road #13 -> Road #11" + "Road #11 -> Road #14", + "Road #11 -> Road #48", + "Road #47 -> Road #11", + "Road #47 -> Road #14", + "Road #47 -> Road #48", + "Road #14 -> Road #11", + "Road #14 -> Road #48" ], "osm_node_ids": [ - 4384739631 + 4384739631, + 53231060 ], "type": "intersection" }, @@ -6988,66 +6743,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31746406141995, - 47.664873043000895 - ], - [ - -122.31746070725715, - 47.66498771730078 - ], - [ - -122.31747932339476, - 47.66498845744248 - ], - [ - -122.31736162325863, - 47.66498777935397 - ], - [ - -122.3173579740043, - 47.66487310865138 - ], - [ - -122.3173789148224, - 47.66487280557999 - ], - [ - -122.31746406141995, - 47.66487298994092 - ], - [ - -122.31746406141995, - 47.664873043000895 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 127, - "intersection_kind": "Intersection", - "movements": [ - "Road #34 -> Road #81", - "Road #34 -> Road #56", - "Road #55 -> Road #34", - "Road #55 -> Road #81", - "Road #55 -> Road #56", - "Road #81 -> Road #34", - "Road #81 -> Road #56" - ], - "osm_node_ids": [ - 53162656 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -7186,70 +6881,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31743917091492, - 47.668541208662276 - ], - [ - -122.31743791043336, - 47.66861204103262 - ], - [ - -122.31743790642759, - 47.668612139958 - ], - [ - -122.31735276784157, - 47.668611406111545 - ], - [ - -122.31735225109755, - 47.66861140251426 - ], - [ - -122.317353260551, - 47.66854056834527 - ], - [ - -122.31743840714854, - 47.66854037319248 - ], - [ - -122.31743841115431, - 47.668541202367024 - ], - [ - -122.31743917091492, - 47.668541208662276 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 131, - "intersection_kind": "Intersection", - "movements": [ - "Road #13 -> Road #14", - "Road #13 -> Road #48", - "Road #47 -> Road #13", - "Road #47 -> Road #14", - "Road #47 -> Road #48", - "Road #14 -> Road #13", - "Road #14 -> Road #48" - ], - "osm_node_ids": [ - 53231060 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ diff --git a/tests/src/roosevelt_cycletrack/road_network.dot b/tests/src/roosevelt_cycletrack/road_network.dot index e49db855..a09279b2 100644 --- a/tests/src/roosevelt_cycletrack/road_network.dot +++ b/tests/src/roosevelt_cycletrack/road_network.dot @@ -30,141 +30,131 @@ digraph { 28 [ label = "Slice" ] 29 [ label = "Merge" ] 30 [ label = "Slice" ] - 31 [ label = "Uncontrolled RoadIntersection" ] - 32 [ label = "Lights RoadIntersection" ] - 33 [ label = "Slice" ] - 34 [ label = "Slice" ] + 31 [ label = "Slice" ] + 32 [ label = "Uncontrolled RoadIntersection" ] + 33 [ label = "Lights RoadIntersection" ] + 34 [ label = "Terminus" ] 35 [ label = "Uncontrolled RoadIntersection" ] - 36 [ label = "Uncontrolled RoadIntersection" ] - 37 [ label = "Terminus" ] + 36 [ label = "Merge" ] + 37 [ label = "Slice" ] 38 [ label = "Uncontrolled RoadIntersection" ] - 39 [ label = "Merge" ] - 40 [ label = "Slice" ] + 39 [ label = "Uncontrolled RoadIntersection" ] + 40 [ label = "Uncontrolled RoadIntersection" ] 41 [ label = "Uncontrolled RoadIntersection" ] 42 [ label = "Uncontrolled RoadIntersection" ] - 43 [ label = "Uncontrolled RoadIntersection" ] + 43 [ label = "Slice" ] 44 [ label = "Uncontrolled RoadIntersection" ] 45 [ label = "Uncontrolled RoadIntersection" ] - 46 [ label = "Slice" ] + 46 [ label = "Lights RoadIntersection" ] 47 [ label = "Uncontrolled RoadIntersection" ] 48 [ label = "Uncontrolled RoadIntersection" ] - 49 [ label = "Lights RoadIntersection" ] - 50 [ label = "Uncontrolled RoadIntersection" ] + 49 [ label = "Slice" ] + 50 [ label = "Merge" ] 51 [ label = "Uncontrolled RoadIntersection" ] - 52 [ label = "Lights RoadIntersection" ] - 53 [ label = "Slice" ] + 52 [ label = "Merge" ] + 53 [ label = "Merge" ] 54 [ label = "Merge" ] 55 [ label = "Uncontrolled RoadIntersection" ] - 56 [ label = "Uncontrolled RoadIntersection" ] - 57 [ label = "Merge" ] + 56 [ label = "Merge" ] + 57 [ label = "Uncontrolled RoadIntersection" ] 58 [ label = "Merge" ] - 59 [ label = "Merge" ] - 60 [ label = "Uncontrolled RoadIntersection" ] - 61 [ label = "Merge" ] + 59 [ label = "Terminus" ] + 60 [ label = "MapEdge" ] + 61 [ label = "Uncontrolled RoadIntersection" ] 62 [ label = "Uncontrolled RoadIntersection" ] - 63 [ label = "Merge" ] + 63 [ label = "Uncontrolled RoadIntersection" ] 64 [ label = "Terminus" ] - 65 [ label = "MapEdge" ] - 66 [ label = "Uncontrolled RoadIntersection" ] - 67 [ label = "Uncontrolled RoadIntersection" ] - 68 [ label = "Uncontrolled RoadIntersection" ] - 69 [ label = "Terminus" ] - 70 [ label = "Terminus" ] - 71 [ label = "Terminus" ] - 72 [ label = "Terminus" ] - 73 [ label = "Terminus" ] - 74 [ label = "MapEdge" ] - 75 [ label = "MapEdge" ] - 76 [ label = "MapEdge" ] - 77 [ label = "MapEdge" ] - 78 [ label = "MapEdge" ] - 0 -> 44 [ label = "2 lanes" ] - 44 -> 0 [ label = "2 lanes" ] - 44 -> 63 [ label = "2 lanes" ] - 63 -> 44 [ label = "2 lanes" ] - 1 -> 45 [ label = "2 lanes" ] - 45 -> 1 [ label = "2 lanes" ] - 45 -> 58 [ label = "2 lanes" ] - 58 -> 45 [ label = "2 lanes" ] - 3 -> 42 [ label = "2 lanes" ] - 42 -> 3 [ label = "2 lanes" ] - 42 -> 61 [ label = "2 lanes" ] - 61 -> 42 [ label = "2 lanes" ] - 60 -> 76 [ label = "2 lanes" ] - 76 -> 60 [ label = "2 lanes" ] - 7 -> 41 [ label = "2 lanes" ] - 41 -> 7 [ label = "2 lanes" ] - 41 -> 56 [ label = "2 lanes" ] - 56 -> 41 [ label = "2 lanes" ] - 56 -> 77 [ label = "2 lanes" ] - 77 -> 56 [ label = "2 lanes" ] - 62 -> 74 [ label = "1 lanes" ] - 74 -> 62 [ label = "1 lanes" ] - 65 -> 67 [ label = "1 lanes" ] - 67 -> 65 [ label = "1 lanes" ] - 4 -> 38 [ label = "2 lanes" ] - 38 -> 4 [ label = "2 lanes" ] - 38 -> 57 [ label = "2 lanes" ] - 57 -> 38 [ label = "2 lanes" ] - 2 -> 43 [ label = "2 lanes" ] - 43 -> 2 [ label = "2 lanes" ] - 43 -> 59 [ label = "2 lanes" ] - 59 -> 43 [ label = "2 lanes" ] - 30 -> 34 [ label = "1 lanes" ] + 65 [ label = "Terminus" ] + 66 [ label = "Terminus" ] + 67 [ label = "Terminus" ] + 68 [ label = "Terminus" ] + 69 [ label = "MapEdge" ] + 70 [ label = "MapEdge" ] + 71 [ label = "MapEdge" ] + 72 [ label = "MapEdge" ] + 73 [ label = "MapEdge" ] + 0 -> 41 [ label = "2 lanes" ] + 41 -> 0 [ label = "2 lanes" ] + 41 -> 58 [ label = "2 lanes" ] + 58 -> 41 [ label = "2 lanes" ] + 1 -> 42 [ label = "2 lanes" ] + 42 -> 1 [ label = "2 lanes" ] + 42 -> 53 [ label = "2 lanes" ] + 53 -> 42 [ label = "2 lanes" ] + 3 -> 39 [ label = "2 lanes" ] + 39 -> 3 [ label = "2 lanes" ] + 39 -> 56 [ label = "2 lanes" ] + 56 -> 39 [ label = "2 lanes" ] + 55 -> 71 [ label = "2 lanes" ] + 71 -> 55 [ label = "2 lanes" ] + 7 -> 38 [ label = "2 lanes" ] + 38 -> 7 [ label = "2 lanes" ] + 38 -> 72 [ label = "2 lanes" ] + 72 -> 38 [ label = "2 lanes" ] + 57 -> 69 [ label = "1 lanes" ] + 69 -> 57 [ label = "1 lanes" ] + 60 -> 62 [ label = "1 lanes" ] + 62 -> 60 [ label = "1 lanes" ] + 4 -> 35 [ label = "2 lanes" ] + 35 -> 4 [ label = "2 lanes" ] + 35 -> 52 [ label = "2 lanes" ] + 52 -> 35 [ label = "2 lanes" ] + 2 -> 40 [ label = "2 lanes" ] + 40 -> 2 [ label = "2 lanes" ] + 40 -> 54 [ label = "2 lanes" ] + 54 -> 40 [ label = "2 lanes" ] + 30 -> 31 [ label = "1 lanes" ] 28 -> 30 [ label = "1 lanes" ] - 67 -> 68 [ label = "3 lanes" ] - 68 -> 67 [ label = "4 lanes" ] - 68 -> 69 [ label = "3 lanes" ] - 69 -> 68 [ label = "4 lanes" ] - 6 -> 36 [ label = "3 lanes" ] - 36 -> 6 [ label = "3 lanes" ] - 36 -> 52 [ label = "3 lanes" ] - 52 -> 36 [ label = "3 lanes" ] + 62 -> 63 [ label = "3 lanes" ] + 63 -> 62 [ label = "4 lanes" ] + 63 -> 64 [ label = "3 lanes" ] + 64 -> 63 [ label = "4 lanes" ] + 6 -> 33 [ label = "3 lanes" ] + 33 -> 6 [ label = "3 lanes" ] 29 -> 27 [ label = "3 lanes" ] 13 -> 11 [ label = "1 lanes" ] 14 -> 13 [ label = "1 lanes" ] 15 -> 14 [ label = "1 lanes" ] 16 -> 15 [ label = "1 lanes" ] - 64 -> 62 [ label = "3 lanes" ] - 62 -> 61 [ label = "3 lanes" ] - 61 -> 58 [ label = "3 lanes" ] - 58 -> 63 [ label = "3 lanes" ] - 63 -> 60 [ label = "3 lanes" ] - 60 -> 59 [ label = "3 lanes" ] - 59 -> 56 [ label = "3 lanes" ] - 56 -> 57 [ label = "3 lanes" ] - 57 -> 55 [ label = "3 lanes" ] + 59 -> 57 [ label = "3 lanes" ] + 57 -> 56 [ label = "3 lanes" ] + 56 -> 53 [ label = "3 lanes" ] + 53 -> 58 [ label = "3 lanes" ] + 58 -> 55 [ label = "3 lanes" ] 55 -> 54 [ label = "3 lanes" ] - 54 -> 53 [ label = "3 lanes" ] - 40 -> 39 [ label = "4 lanes" ] - 39 -> 32 [ label = "4 lanes" ] - 53 -> 52 [ label = "4 lanes" ] + 54 -> 38 [ label = "3 lanes" ] + 38 -> 52 [ label = "3 lanes" ] 52 -> 51 [ label = "3 lanes" ] 51 -> 50 [ label = "3 lanes" ] 50 -> 49 [ label = "3 lanes" ] - 49 -> 48 [ label = "3 lanes" ] + 37 -> 36 [ label = "4 lanes" ] + 36 -> 26 [ label = "4 lanes" ] + 49 -> 33 [ label = "4 lanes" ] + 33 -> 48 [ label = "3 lanes" ] 48 -> 47 [ label = "3 lanes" ] - 47 -> 40 [ label = "3 lanes" ] - 32 -> 29 [ label = "3 lanes" ] - 39 -> 33 [ label = "2 lanes" ] - 33 -> 26 [ label = "2 lanes" ] + 47 -> 46 [ label = "3 lanes" ] + 46 -> 45 [ label = "3 lanes" ] + 45 -> 44 [ label = "3 lanes" ] + 44 -> 37 [ label = "3 lanes" ] + 26 -> 29 [ label = "3 lanes" ] + 36 -> 26 [ label = "2 lanes" ] 9 -> 8 [ label = "1 lanes" ] - 54 -> 37 [ label = "1 lanes" ] - 37 -> 54 [ label = "1 lanes" ] - 66 -> 50 [ label = "1 lanes" ] - 50 -> 66 [ label = "1 lanes" ] - 47 -> 48 [ label = "1 lanes" ] - 48 -> 47 [ label = "1 lanes" ] - 49 -> 66 [ label = "2 lanes" ] - 66 -> 49 [ label = "2 lanes" ] - 66 -> 72 [ label = "2 lanes" ] - 72 -> 66 [ label = "2 lanes" ] - 55 -> 75 [ label = "2 lanes" ] - 75 -> 55 [ label = "2 lanes" ] - 73 -> 52 [ label = "3 lanes" ] - 52 -> 73 [ label = "3 lanes" ] - 32 -> 67 [ label = "3 lanes" ] - 67 -> 32 [ label = "4 lanes" ] + 50 -> 34 [ label = "1 lanes" ] + 34 -> 50 [ label = "1 lanes" ] + 61 -> 47 [ label = "1 lanes" ] + 47 -> 61 [ label = "1 lanes" ] + 44 -> 45 [ label = "1 lanes" ] + 45 -> 44 [ label = "1 lanes" ] + 46 -> 61 [ label = "2 lanes" ] + 61 -> 46 [ label = "2 lanes" ] + 61 -> 67 [ label = "2 lanes" ] + 67 -> 61 [ label = "2 lanes" ] + 51 -> 70 [ label = "2 lanes" ] + 70 -> 51 [ label = "2 lanes" ] + 68 -> 33 [ label = "3 lanes" ] + 33 -> 68 [ label = "3 lanes" ] + 26 -> 62 [ label = "3 lanes" ] + 62 -> 26 [ label = "4 lanes" ] 17 -> 16 [ label = "1 lanes" ] 19 -> 17 [ label = "1 lanes" ] 24 -> 28 [ label = "1 lanes" ] @@ -178,25 +168,21 @@ digraph { 10 -> 5 [ label = "4 lanes" ] 10 -> 18 [ label = "3 lanes" ] 18 -> 10 [ label = "4 lanes" ] - 42 -> 46 [ label = "1 lanes" ] - 45 -> 42 [ label = "1 lanes" ] - 44 -> 45 [ label = "1 lanes" ] - 43 -> 44 [ label = "1 lanes" ] - 41 -> 43 [ label = "1 lanes" ] - 38 -> 41 [ label = "1 lanes" ] - 37 -> 38 [ label = "1 lanes" ] - 36 -> 37 [ label = "1 lanes" ] - 35 -> 36 [ label = "1 lanes" ] - 33 -> 35 [ label = "1 lanes" ] - 31 -> 33 [ label = "1 lanes" ] - 25 -> 31 [ label = "1 lanes" ] + 39 -> 43 [ label = "1 lanes" ] + 42 -> 39 [ label = "1 lanes" ] + 41 -> 42 [ label = "1 lanes" ] + 40 -> 41 [ label = "1 lanes" ] + 38 -> 40 [ label = "1 lanes" ] + 35 -> 38 [ label = "1 lanes" ] + 34 -> 35 [ label = "1 lanes" ] + 33 -> 34 [ label = "1 lanes" ] + 32 -> 33 [ label = "1 lanes" ] + 36 -> 32 [ label = "1 lanes" ] + 26 -> 36 [ label = "1 lanes" ] + 25 -> 26 [ label = "1 lanes" ] 23 -> 25 [ label = "1 lanes" ] - 26 -> 31 [ label = "3 lanes" ] - 31 -> 26 [ label = "3 lanes" ] - 31 -> 32 [ label = "3 lanes" ] - 32 -> 31 [ label = "3 lanes" ] - 51 -> 70 [ label = "1 lanes" ] - 70 -> 51 [ label = "1 lanes" ] + 48 -> 65 [ label = "1 lanes" ] + 65 -> 48 [ label = "1 lanes" ] 10 -> 12 [ label = "1 lanes" ] 12 -> 10 [ label = "1 lanes" ] 12 -> 21 [ label = "1 lanes" ] @@ -209,10 +195,10 @@ digraph { 29 -> 25 [ label = "1 lanes" ] 12 -> 21 [ label = "1 lanes" ] 21 -> 12 [ label = "1 lanes" ] - 78 -> 35 [ label = "2 lanes" ] - 35 -> 78 [ label = "2 lanes" ] - 35 -> 49 [ label = "2 lanes" ] - 49 -> 35 [ label = "2 lanes" ] - 68 -> 71 [ label = "1 lanes" ] - 71 -> 68 [ label = "1 lanes" ] + 73 -> 32 [ label = "2 lanes" ] + 32 -> 73 [ label = "2 lanes" ] + 32 -> 46 [ label = "2 lanes" ] + 46 -> 32 [ label = "2 lanes" ] + 63 -> 66 [ label = "1 lanes" ] + 66 -> 63 [ label = "1 lanes" ] } diff --git a/tests/src/seattle_slip_lane/geometry.json b/tests/src/seattle_slip_lane/geometry.json index 680bea14..94d03873 100644 --- a/tests/src/seattle_slip_lane/geometry.json +++ b/tests/src/seattle_slip_lane/geometry.json @@ -281,7 +281,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 19, + "dst_i": 13, "osm_way_ids": [ 428097445 ], @@ -447,45 +447,7 @@ 754995509, 363224303 ], - "src_i": 19, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31748575918377, - 47.66170349033539 - ], - [ - -122.31757755814765, - 47.661581990202336 - ], - [ - -122.3175306906039, - 47.66156592652173 - ], - [ - -122.31743889164002, - 47.661687426654794 - ], - [ - -122.31748575918377, - 47.66170349033539 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 20, - "osm_way_ids": [ - 486283205 - ], - "src_i": 21, + "src_i": 13, "type": "road" }, "type": "Feature" @@ -531,7 +493,7 @@ "osm_way_ids": [ 486283205 ], - "src_i": 20, + "src_i": 21, "type": "road" }, "type": "Feature" @@ -570,7 +532,7 @@ 621646780, 331771747 ], - "src_i": 19, + "src_i": 13, "type": "road" }, "type": "Feature" @@ -584,12 +546,12 @@ 47.661246213232495 ], [ - -122.31775616621753, - 47.6612454353194 + -122.31779567782685, + 47.66124555313051 ], [ - -122.3177554104617, - 47.66136012938736 + -122.31779492207102, + 47.66136024719847 ], [ -122.31801607011458, @@ -726,7 +688,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 20, + "dst_i": 21, "osm_way_ids": [ 712316019 ], @@ -780,11 +742,11 @@ "type": "Polygon" }, "properties": { - "dst_i": 17, + "dst_i": 13, "osm_way_ids": [ 712316019 ], - "src_i": 20, + "src_i": 21, "type": "road" }, "type": "Feature" @@ -794,8 +756,8 @@ "coordinates": [ [ [ - -122.31775605405589, - 47.661245624176914 + -122.31769832419113, + 47.661307864419165 ], [ -122.3177877610842, @@ -822,12 +784,12 @@ 47.661204361507934 ], [ - -122.31773340541552, - 47.66123609496632 + -122.31767567555076, + 47.66129833520857 ], [ - -122.31775605405589, - 47.661245624176914 + -122.31769832419113, + 47.661307864419165 ] ] ], @@ -838,7 +800,7 @@ "osm_way_ids": [ 712316019 ], - "src_i": 17, + "src_i": 13, "type": "road" }, "type": "Feature" @@ -957,82 +919,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31779506627885, - 47.66124555223119 - ], - [ - -122.31768676620085, - 47.661245751880564 - ], - [ - -122.31768723354102, - 47.66136044774717 - ], - [ - -122.31779553361902, - 47.66136024809779 - ], - [ - -122.31779506627885, - 47.66124555223119 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 17, - "osm_way_ids": [ - 754995508 - ], - "src_i": 13, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31768761141895, - 47.66124575367921 - ], - [ - -122.31756361138143, - 47.66124515383177 - ], - [ - -122.31756238828541, - 47.661359846101085 - ], - [ - -122.31768638832293, - 47.661360445948525 - ], - [ - -122.31768761141895, - 47.66124575367921 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 19, - "osm_way_ids": [ - 754995508 - ], - "src_i": 17, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1927,28 +1813,60 @@ "coordinates": [ [ [ - -122.31775555466953, - 47.66124562507623 + -122.3177956764916, + 47.66124555313051 ], [ - -122.31775602200972, - 47.66136032094284 + -122.31779492340627, + 47.66136024719847 ], [ - -122.31771006911747, - 47.661371265685474 + -122.31771006778222, + 47.66137126478615 ], [ - -122.31768925512112, - 47.66136044325056 + -122.31768925378586, + 47.661360444149885 ], [ - -122.31768880113351, - 47.66124574828328 + -122.31763704921727, + 47.66137004620552 ], [ - -122.31775555466953, - 47.66124562507623 + -122.31761479848369, + 47.661360099709746 + ], + [ + -122.31756028926037, + 47.661382715846784 + ], + [ + -122.31750434997612, + 47.6613703969409 + ], + [ + -122.31750649707043, + 47.6612337810121 + ], + [ + -122.31757795204865, + 47.661223080884916 + ], + [ + -122.31765625689866, + 47.66124560349252 + ], + [ + -122.31767567555076, + 47.66129833520857 + ], + [ + -122.31769832419113, + 47.661307864419165 + ], + [ + -122.3177956764916, + 47.66124555313051 ] ] ], @@ -1959,13 +1877,21 @@ "id": 13, "intersection_kind": "Intersection", "movements": [ - "Road #16 -> Road #29", + "Road #16 -> Road #15", + "Road #16 -> Road #12", "Road #14 -> Road #16", - "Road #14 -> Road #29", - "Road #29 -> Road #16" + "Road #14 -> Road #15", + "Road #14 -> Road #12", + "Road #8 -> Road #16", + "Road #8 -> Road #15", + "Road #8 -> Road #12", + "Road #15 -> Road #16", + "Road #15 -> Road #12" ], "osm_node_ids": [ - 4694379084 + 4694379084, + 5674754357, + 53079358 ], "type": "intersection" }, @@ -2067,120 +1993,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31763704921727, - 47.66137004620552 - ], - [ - -122.31761479848369, - 47.661360099709746 - ], - [ - -122.31761602291495, - 47.66124540744043 - ], - [ - -122.31773340541552, - 47.66123609496632 - ], - [ - -122.31775605405589, - 47.661245624176914 - ], - [ - -122.31775651739031, - 47.661360320043514 - ], - [ - -122.31763704921727, - 47.66137004620552 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 17, - "intersection_kind": "Intersection", - "movements": [ - "Road #30 -> Road #29", - "Road #29 -> Road #30" - ], - "osm_node_ids": [ - 5674754357 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.31765625823391, - 47.66124560169388 - ], - [ - -122.31765503246739, - 47.66136029396319 - ], - [ - -122.31757137056367, - 47.6613598883692 - ], - [ - -122.31756028926037, - 47.661382715846784 - ], - [ - -122.31750434997612, - 47.6613703969409 - ], - [ - -122.31750649707043, - 47.6612337810121 - ], - [ - -122.31757795204865, - 47.661223080884916 - ], - [ - -122.31765625689866, - 47.66124560349252 - ], - [ - -122.31765625823391, - 47.66124560169388 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 19, - "intersection_kind": "Intersection", - "movements": [ - "Road #30 -> Road #15", - "Road #30 -> Road #12", - "Road #8 -> Road #15", - "Road #8 -> Road #12", - "Road #15 -> Road #30", - "Road #15 -> Road #12" - ], - "osm_node_ids": [ - 53079358 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -2193,48 +2005,6 @@ -122.3175186131984, 47.66166000634231 ], - [ - -122.31747174565467, - 47.661643942661705 - ], - [ - -122.31754349839535, - 47.661520866018066 - ], - [ - -122.31756987240458, - 47.66152369168621 - ], - [ - -122.31759356788695, - 47.66153136649588 - ], - [ - -122.31754518749628, - 47.66166178699888 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 20, - "intersection_kind": "Connection", - "movements": [ - "Road #13 -> Road #14" - ], - "osm_node_ids": [ - 5674754355 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ [ -122.31752210222666, 47.6616956095811 @@ -2252,12 +2022,20 @@ 47.661610915079685 ], [ - -122.31754356782875, - 47.66162697786096 + -122.31754349839535, + 47.661520866018066 ], [ - -122.31752210222666, - 47.6616956095811 + -122.31756987240458, + 47.66152369168621 + ], + [ + -122.31759356788695, + 47.66153136649588 + ], + [ + -122.31754518749628, + 47.66166178699888 ] ] ], @@ -2269,10 +2047,11 @@ "intersection_kind": "Fork", "movements": [ "Road #7 -> Road #8", - "Road #7 -> Road #13" + "Road #7 -> Road #14" ], "osm_node_ids": [ - 59711142 + 59711142, + 5674754355 ], "type": "intersection" }, diff --git a/tests/src/seattle_slip_lane/road_network.dot b/tests/src/seattle_slip_lane/road_network.dot index 6cde0ec6..ff3eace6 100644 --- a/tests/src/seattle_slip_lane/road_network.dot +++ b/tests/src/seattle_slip_lane/road_network.dot @@ -9,64 +9,56 @@ digraph { 7 [ label = "Lights RoadIntersection" ] 8 [ label = "MapEdge" ] 9 [ label = "Merge" ] - 10 [ label = "Uncontrolled RoadIntersection" ] - 11 [ label = "Lights RoadIntersection" ] - 12 [ label = "Slice" ] - 13 [ label = "Merge" ] - 14 [ label = "Slice" ] - 15 [ label = "MapEdge" ] - 16 [ label = "MapEdge" ] - 17 [ label = "MapEdge" ] + 10 [ label = "Merge" ] + 11 [ label = "Slice" ] + 12 [ label = "MapEdge" ] + 13 [ label = "MapEdge" ] + 14 [ label = "MapEdge" ] + 15 [ label = "Uncontrolled RoadIntersection" ] + 16 [ label = "Uncontrolled RoadIntersection" ] + 17 [ label = "Terminus" ] 18 [ label = "Uncontrolled RoadIntersection" ] 19 [ label = "Uncontrolled RoadIntersection" ] - 20 [ label = "Terminus" ] - 21 [ label = "Uncontrolled RoadIntersection" ] + 20 [ label = "Uncontrolled RoadIntersection" ] + 21 [ label = "MapEdge" ] 22 [ label = "Uncontrolled RoadIntersection" ] 23 [ label = "Uncontrolled RoadIntersection" ] - 24 [ label = "MapEdge" ] - 25 [ label = "Uncontrolled RoadIntersection" ] - 26 [ label = "Uncontrolled RoadIntersection" ] - 27 [ label = "Uncontrolled RoadIntersection" ] - 28 [ label = "Terminus" ] - 24 -> 23 [ label = "1 lanes" ] - 23 -> 24 [ label = "1 lanes" ] - 17 -> 18 [ label = "1 lanes" ] - 18 -> 17 [ label = "1 lanes" ] - 18 -> 19 [ label = "3 lanes" ] - 19 -> 18 [ label = "4 lanes" ] - 19 -> 23 [ label = "3 lanes" ] - 23 -> 19 [ label = "4 lanes" ] + 24 [ label = "Uncontrolled RoadIntersection" ] + 25 [ label = "Terminus" ] + 21 -> 20 [ label = "1 lanes" ] + 20 -> 21 [ label = "1 lanes" ] + 14 -> 15 [ label = "1 lanes" ] + 15 -> 14 [ label = "1 lanes" ] + 15 -> 16 [ label = "3 lanes" ] + 16 -> 15 [ label = "4 lanes" ] + 16 -> 20 [ label = "3 lanes" ] + 20 -> 16 [ label = "4 lanes" ] 9 -> 8 [ label = "3 lanes" ] - 14 -> 13 [ label = "4 lanes" ] - 13 -> 11 [ label = "4 lanes" ] - 16 -> 14 [ label = "3 lanes" ] - 23 -> 27 [ label = "3 lanes" ] - 27 -> 23 [ label = "3 lanes" ] - 27 -> 28 [ label = "3 lanes" ] - 28 -> 27 [ label = "3 lanes" ] - 11 -> 9 [ label = "3 lanes" ] - 13 -> 12 [ label = "2 lanes" ] - 12 -> 7 [ label = "2 lanes" ] - 11 -> 18 [ label = "3 lanes" ] - 18 -> 11 [ label = "4 lanes" ] + 11 -> 10 [ label = "4 lanes" ] + 10 -> 7 [ label = "4 lanes" ] + 13 -> 11 [ label = "3 lanes" ] + 20 -> 24 [ label = "3 lanes" ] + 24 -> 20 [ label = "3 lanes" ] + 24 -> 25 [ label = "3 lanes" ] + 25 -> 24 [ label = "3 lanes" ] + 7 -> 9 [ label = "3 lanes" ] + 10 -> 7 [ label = "2 lanes" ] + 7 -> 15 [ label = "3 lanes" ] + 15 -> 7 [ label = "4 lanes" ] 3 -> 7 [ label = "3 lanes" ] 7 -> 3 [ label = "3 lanes" ] 0 -> 1 [ label = "3 lanes" ] 1 -> 0 [ label = "4 lanes" ] 1 -> 3 [ label = "3 lanes" ] 3 -> 1 [ label = "4 lanes" ] - 12 -> 15 [ label = "1 lanes" ] 10 -> 12 [ label = "1 lanes" ] - 6 -> 10 [ label = "1 lanes" ] + 7 -> 10 [ label = "1 lanes" ] + 6 -> 7 [ label = "1 lanes" ] 5 -> 6 [ label = "1 lanes" ] - 25 -> 21 [ label = "1 lanes" ] - 21 -> 25 [ label = "1 lanes" ] - 21 -> 20 [ label = "1 lanes" ] - 20 -> 21 [ label = "1 lanes" ] - 7 -> 10 [ label = "3 lanes" ] - 10 -> 7 [ label = "3 lanes" ] - 10 -> 11 [ label = "3 lanes" ] - 11 -> 10 [ label = "3 lanes" ] + 22 -> 18 [ label = "1 lanes" ] + 18 -> 22 [ label = "1 lanes" ] + 18 -> 17 [ label = "1 lanes" ] + 17 -> 18 [ label = "1 lanes" ] 1 -> 2 [ label = "1 lanes" ] 2 -> 1 [ label = "1 lanes" ] 2 -> 4 [ label = "1 lanes" ] @@ -79,16 +71,16 @@ digraph { 9 -> 6 [ label = "1 lanes" ] 2 -> 4 [ label = "1 lanes" ] 4 -> 2 [ label = "1 lanes" ] - 19 -> 22 [ label = "1 lanes" ] - 22 -> 19 [ label = "1 lanes" ] - 22 -> 26 [ label = "1 lanes" ] - 26 -> 22 [ label = "1 lanes" ] - 26 -> 25 [ label = "1 lanes" ] - 25 -> 26 [ label = "1 lanes" ] - 27 -> 26 [ label = "1 lanes" ] - 26 -> 27 [ label = "1 lanes" ] - 26 -> 25 [ label = "1 lanes" ] - 25 -> 26 [ label = "1 lanes" ] - 22 -> 21 [ label = "1 lanes" ] - 21 -> 22 [ label = "1 lanes" ] + 16 -> 19 [ label = "1 lanes" ] + 19 -> 16 [ label = "1 lanes" ] + 19 -> 23 [ label = "1 lanes" ] + 23 -> 19 [ label = "1 lanes" ] + 23 -> 22 [ label = "1 lanes" ] + 22 -> 23 [ label = "1 lanes" ] + 24 -> 23 [ label = "1 lanes" ] + 23 -> 24 [ label = "1 lanes" ] + 23 -> 22 [ label = "1 lanes" ] + 22 -> 23 [ label = "1 lanes" ] + 19 -> 18 [ label = "1 lanes" ] + 18 -> 19 [ label = "1 lanes" ] } diff --git a/tests/src/seattle_triangle/geometry.json b/tests/src/seattle_triangle/geometry.json index f3a01c6c..785bba33 100644 --- a/tests/src/seattle_triangle/geometry.json +++ b/tests/src/seattle_triangle/geometry.json @@ -261,7 +261,7 @@ "osm_way_ids": [ 428087110 ], - "src_i": 2, + "src_i": 12, "type": "road" }, "type": "Feature" @@ -876,52 +876,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.3381236970514, - 47.61676166440252 - ], - [ - -122.33833147443603, - 47.61682423921268 - ], - [ - -122.33841796496425, - 47.616836886375026 - ], - [ - -122.33842503576172, - 47.61681491414504 - ], - [ - -122.33834192587516, - 47.61680276160969 - ], - [ - -122.33813730233301, - 47.61674113648333 - ], - [ - -122.3381236970514, - 47.61676166440252 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 2, - "osm_way_ids": [ - 948577962 - ], - "src_i": 12, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -989,7 +943,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 2, + "dst_i": 12, "osm_way_ids": [ 1054971765 ], @@ -1078,53 +1032,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -122.33846423466193, - 47.61679246257655 - ], - [ - -122.33836570510044, - 47.616869557836345 - ], - [ - -122.33818065966258, - 47.61677881896566 - ], - [ - -122.3381942649442, - 47.61675829104648 - ], - [ - -122.33827530562192, - 47.61669478004232 - ], - [ - -122.33846423466193, - 47.61679246257655 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 2, - "intersection_kind": "Intersection", - "movements": [ - "Road #6 -> Road #25", - "Road #25 -> Road #6" - ], - "osm_node_ids": [ - 8780140700 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1490,12 +1397,16 @@ "coordinates": [ [ [ - -122.33823846143069, - 47.6167716019083 + -122.33846423466193, + 47.61679246257655 + ], + [ + -122.33836570510044, + 47.616869557836345 ], [ -122.33822485614907, - 47.61679212982748 + 47.61679213162613 ], [ -122.33805634970673, @@ -1518,8 +1429,16 @@ 47.61674505842566 ], [ - -122.33823846143069, - 47.6167716019083 + -122.3381942649442, + 47.6167582919458 + ], + [ + -122.3382753042878, + 47.61669478004232 + ], + [ + -122.33846423466193, + 47.61679246257655 ] ] ], @@ -1530,11 +1449,22 @@ "id": 12, "intersection_kind": "Intersection", "movements": [ + "Road #6 -> Road #4", + "Road #6 -> Road #3", + "Road #6 -> Road #25", + "Road #4 -> Road #6", "Road #4 -> Road #3", - "Road #3 -> Road #4" + "Road #4 -> Road #25", + "Road #3 -> Road #6", + "Road #3 -> Road #4", + "Road #3 -> Road #25", + "Road #25 -> Road #6", + "Road #25 -> Road #4", + "Road #25 -> Road #3" ], "osm_node_ids": [ - 8780140703 + 8780140703, + 8780140700 ], "type": "intersection" }, diff --git a/tests/src/seattle_triangle/road_network.dot b/tests/src/seattle_triangle/road_network.dot index 80576d06..b3f05ce3 100644 --- a/tests/src/seattle_triangle/road_network.dot +++ b/tests/src/seattle_triangle/road_network.dot @@ -1,71 +1,69 @@ digraph { 0 [ label = "MapEdge" ] 1 [ label = "MapEdge" ] - 2 [ label = "Uncontrolled RoadIntersection" ] - 3 [ label = "Slice" ] - 4 [ label = "MapEdge" ] + 2 [ label = "Slice" ] + 3 [ label = "MapEdge" ] + 4 [ label = "Slice" ] 5 [ label = "Slice" ] 6 [ label = "Slice" ] 7 [ label = "Slice" ] 8 [ label = "Slice" ] 9 [ label = "Slice" ] 10 [ label = "Slice" ] - 11 [ label = "Slice" ] - 12 [ label = "Uncontrolled RoadIntersection" ] - 13 [ label = "Lights RoadIntersection" ] - 14 [ label = "Slice" ] - 15 [ label = "Lights RoadIntersection" ] + 11 [ label = "Uncontrolled RoadIntersection" ] + 12 [ label = "Lights RoadIntersection" ] + 13 [ label = "Slice" ] + 14 [ label = "Lights RoadIntersection" ] + 15 [ label = "Slice" ] 16 [ label = "Slice" ] - 17 [ label = "Slice" ] - 18 [ label = "MapEdge" ] + 17 [ label = "MapEdge" ] + 18 [ label = "Slice" ] 19 [ label = "Slice" ] 20 [ label = "Slice" ] 21 [ label = "Slice" ] - 22 [ label = "Slice" ] - 23 [ label = "Lights RoadIntersection" ] - 24 [ label = "Slice" ] - 25 [ label = "Uncontrolled RoadIntersection" ] + 22 [ label = "Lights RoadIntersection" ] + 23 [ label = "Slice" ] + 24 [ label = "Uncontrolled RoadIntersection" ] + 25 [ label = "Slice" ] 26 [ label = "Slice" ] 27 [ label = "Slice" ] 28 [ label = "Slice" ] - 29 [ label = "Slice" ] + 29 [ label = "MapEdge" ] 30 [ label = "MapEdge" ] 31 [ label = "MapEdge" ] - 32 [ label = "MapEdge" ] - 18 -> 15 [ label = "3 lanes" ] - 15 -> 18 [ label = "3 lanes" ] - 23 -> 15 [ label = "1 lanes" ] - 15 -> 23 [ label = "2 lanes" ] - 15 -> 13 [ label = "2 lanes" ] - 13 -> 15 [ label = "3 lanes" ] - 13 -> 12 [ label = "3 lanes" ] - 12 -> 13 [ label = "3 lanes" ] - 12 -> 4 [ label = "3 lanes" ] - 4 -> 12 [ label = "3 lanes" ] - 23 -> 13 [ label = "3 lanes" ] - 2 -> 0 [ label = "4 lanes" ] - 0 -> 2 [ label = "1 lanes" ] - 31 -> 23 [ label = "4 lanes" ] - 23 -> 31 [ label = "2 lanes" ] - 30 -> 25 [ label = "2 lanes" ] - 25 -> 30 [ label = "2 lanes" ] - 25 -> 23 [ label = "2 lanes" ] - 23 -> 25 [ label = "2 lanes" ] - 7 -> 6 [ label = "1 lanes" ] - 3 -> 5 [ label = "1 lanes" ] - 21 -> 19 [ label = "1 lanes" ] - 26 -> 29 [ label = "1 lanes" ] - 27 -> 28 [ label = "1 lanes" ] - 24 -> 22 [ label = "1 lanes" ] - 11 -> 10 [ label = "1 lanes" ] - 9 -> 8 [ label = "1 lanes" ] - 17 -> 20 [ label = "1 lanes" ] - 14 -> 16 [ label = "1 lanes" ] - 25 -> 32 [ label = "1 lanes" ] - 12 -> 25 [ label = "1 lanes" ] - 2 -> 12 [ label = "1 lanes" ] - 15 -> 1 [ label = "3 lanes" ] - 1 -> 15 [ label = "1 lanes" ] - 13 -> 2 [ label = "3 lanes" ] - 2 -> 13 [ label = "1 lanes" ] + 17 -> 14 [ label = "3 lanes" ] + 14 -> 17 [ label = "3 lanes" ] + 22 -> 14 [ label = "1 lanes" ] + 14 -> 22 [ label = "2 lanes" ] + 14 -> 12 [ label = "2 lanes" ] + 12 -> 14 [ label = "3 lanes" ] + 12 -> 11 [ label = "3 lanes" ] + 11 -> 12 [ label = "3 lanes" ] + 11 -> 3 [ label = "3 lanes" ] + 3 -> 11 [ label = "3 lanes" ] + 22 -> 12 [ label = "3 lanes" ] + 11 -> 0 [ label = "4 lanes" ] + 0 -> 11 [ label = "1 lanes" ] + 30 -> 22 [ label = "4 lanes" ] + 22 -> 30 [ label = "2 lanes" ] + 29 -> 24 [ label = "2 lanes" ] + 24 -> 29 [ label = "2 lanes" ] + 24 -> 22 [ label = "2 lanes" ] + 22 -> 24 [ label = "2 lanes" ] + 6 -> 5 [ label = "1 lanes" ] + 2 -> 4 [ label = "1 lanes" ] + 20 -> 18 [ label = "1 lanes" ] + 25 -> 28 [ label = "1 lanes" ] + 26 -> 27 [ label = "1 lanes" ] + 23 -> 21 [ label = "1 lanes" ] + 10 -> 9 [ label = "1 lanes" ] + 8 -> 7 [ label = "1 lanes" ] + 16 -> 19 [ label = "1 lanes" ] + 13 -> 15 [ label = "1 lanes" ] + 24 -> 31 [ label = "1 lanes" ] + 11 -> 24 [ label = "1 lanes" ] + 14 -> 1 [ label = "3 lanes" ] + 1 -> 14 [ label = "1 lanes" ] + 12 -> 11 [ label = "3 lanes" ] + 11 -> 12 [ label = "1 lanes" ] } diff --git a/tests/src/st_georges_cycletrack/geometry.json b/tests/src/st_georges_cycletrack/geometry.json index 3c815d4d..3d31f688 100644 --- a/tests/src/st_georges_cycletrack/geometry.json +++ b/tests/src/st_georges_cycletrack/geometry.json @@ -337,44 +337,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.1047345373075248, - 51.496189842968256 - ], - [ - -0.10479473741339984, - 51.49614024267844 - ], - [ - -0.104732061470557, - 51.49611075751713 - ], - [ - -0.10467186136468196, - 51.49616035780694 - ], - [ - -0.1047345373075248, - 51.496189842968256 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 65, - "osm_way_ids": [ - 4255754 - ], - "src_i": 67, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -719,44 +681,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10539725848458228, - 51.49641649002353 - ], - [ - -0.10545745859045733, - 51.496364990366274 - ], - [ - -0.10539394196084946, - 51.49633621027318 - ], - [ - -0.10533374185497442, - 51.496387709930424 - ], - [ - -0.10539725848458228, - 51.49641649002353 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 59, - "osm_way_ids": [ - 10873090 - ], - "src_i": 60, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -1078,7 +1002,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 127, + "dst_i": 120, "osm_way_ids": [ 38893561 ], @@ -2463,7 +2387,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 65, + "dst_i": 67, "osm_way_ids": [ 372964760, 1067864761, @@ -2507,7 +2431,7 @@ "osm_way_ids": [ 372964760 ], - "src_i": 65, + "src_i": 67, "type": "road" }, "type": "Feature" @@ -4072,60 +3996,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10119602604540792, - 51.49485099487193 - ], - [ - -0.10113297020459394, - 51.49481935943243 - ], - [ - -0.10105815774938037, - 51.49480385602561 - ], - [ - -0.10097868251602676, - 51.49482011216469 - ], - [ - -0.10099671828054245, - 51.494854288188 - ], - [ - -0.10105804219106215, - 51.494841744448905 - ], - [ - -0.1011048288651502, - 51.49485144003617 - ], - [ - -0.10115977251202535, - 51.49487900514565 - ], - [ - -0.10119602604540792, - 51.49485099487193 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 127, - "osm_way_ids": [ - 416813994 - ], - "src_i": 120, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -4159,7 +4029,7 @@ "osm_way_ids": [ 416813994 ], - "src_i": 127, + "src_i": 120, "type": "road" }, "type": "Feature" @@ -5012,46 +4882,8 @@ "coordinates": [ [ [ - -0.10169373716644668, - 51.49515775440371 - ], - [ - -0.10170943720845542, - 51.49513745401494 - ], - [ - -0.10164436343050957, - 51.495117945928584 - ], - [ - -0.10162866338850085, - 51.49513824631735 - ], - [ - -0.10169373716644668, - 51.49515775440371 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 110, - "osm_way_ids": [ - 692655614 - ], - "src_i": 112, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10167524350209506, - 51.495098686055016 + -0.1016814244276407, + 51.49510160885055 ], [ -0.10157670981310955, @@ -5070,12 +4902,12 @@ 51.495086900444115 ], [ - -0.10163156534676707, - 51.49513449704518 + -0.10163774627231269, + 51.49513741984071 ], [ - -0.10167524350209506, - 51.495098686055016 + -0.1016814244276407, + 51.49510160885055 ] ] ], @@ -5086,45 +4918,7 @@ "osm_way_ids": [ 692655614 ], - "src_i": 110, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10158032101055382, - 51.495245648710906 - ], - [ - -0.10160182063565806, - 51.495226648741316 - ], - [ - -0.10154277900192314, - 51.49520075187359 - ], - [ - -0.1015212793768189, - 51.49521975184318 - ], - [ - -0.10158032101055382, - 51.495245648710906 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 114, - "osm_way_ids": [ - 692655615 - ], - "src_i": 115, + "src_i": 113, "type": "road" }, "type": "Feature" @@ -5162,45 +4956,7 @@ "osm_way_ids": [ 692655616 ], - "src_i": 114, - "type": "road" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.1016494104400577, - 51.49518467649817 - ], - [ - -0.10168331091718558, - 51.49515957642948 - ], - [ - -0.10163908963776196, - 51.49513642429159 - ], - [ - -0.10160518916063407, - 51.495161524360284 - ], - [ - -0.1016494104400577, - 51.49518467649817 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 112, - "osm_way_ids": [ - 692655616 - ], - "src_i": 113, + "src_i": 115, "type": "road" }, "type": "Feature" @@ -5248,8 +5004,8 @@ "coordinates": [ [ [ - -0.1017009884509148, - 51.49514837717633 + -0.10166894124031532, + 51.49513520481136 ], [ -0.10173363078685309, @@ -5260,12 +5016,12 @@ 51.49514678537691 ], [ - -0.10171690660924916, - 51.495133367497125 + -0.10168485939864969, + 51.49512019513216 ], [ - -0.1017009884509148, - 51.49514837717633 + -0.10166894124031532, + 51.49513520481136 ] ] ], @@ -5276,7 +5032,7 @@ "osm_way_ids": [ 692655620 ], - "src_i": 110, + "src_i": 113, "type": "road" }, "type": "Feature" @@ -5314,7 +5070,7 @@ "osm_way_ids": [ 692657140 ], - "src_i": 127, + "src_i": 120, "type": "road" }, "type": "Feature" @@ -6081,7 +5837,7 @@ 1067864758, 1067864759 ], - "src_i": 59, + "src_i": 60, "type": "road" }, "type": "Feature" @@ -6115,7 +5871,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 59, + "dst_i": 60, "osm_way_ids": [ 1067864760 ], @@ -8699,55 +8455,20 @@ 51.49639784888329 ], [ - -0.10535553182035318, - 51.496369068790194 - ], - [ - -0.10535979158885844, - 51.496365424738656 - ], - [ - -0.10542164995659989, - 51.49629613200154 + -0.10553006821522988, + 51.496433658074814 ], - [ - -0.10549382334872118, - 51.49630798686021 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 59, - "intersection_kind": "Fork", - "movements": [ - "Road #19 -> Road #148", - "Road #150 -> Road #148" - ], - "osm_node_ids": [ - 96619956 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ [ -0.10542142606235835, - 51.496395816416246 + 51.496395817315566 ], [ -0.10538616344155449, - 51.49643505921802 + 51.49643506011734 ], [ -0.10538286714052736, - 51.49643391078421 + 51.49643391168353 ], [ -0.10531346281460634, @@ -8762,20 +8483,16 @@ 51.49637077930007 ], [ - -0.10535217051777204, - 51.49637194482099 - ], - [ - -0.1053579079882715, - 51.49636703632315 + -0.10535978869990048, + 51.496365424738656 ], [ - -0.10542142461787937, - 51.496395816416246 + -0.10542164995659989, + 51.49629613200154 ], [ - -0.10542142606235835, - 51.496395816416246 + -0.10549382334872118, + 51.49630798686021 ] ] ], @@ -8784,12 +8501,14 @@ "properties": { "control": "Signed", "id": 60, - "intersection_kind": "Connection", + "intersection_kind": "Fork", "movements": [ - "Road #18 -> Road #19" + "Road #18 -> Road #148", + "Road #150 -> Road #148" ], "osm_node_ids": [ - 4156272585 + 4156272585, + 96619956 ], "type": "intersection" }, @@ -8990,53 +8709,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10482528525482046, - 51.496093277401215 - ], - [ - -0.10476641984752082, - 51.49616357557999 - ], - [ - -0.10475842176742123, - 51.49617016401078 - ], - [ - -0.1046957458245784, - 51.496140678849464 - ], - [ - -0.10475447545085413, - 51.4960703357046 - ], - [ - -0.10482528525482046, - 51.496093277401215 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 65, - "intersection_kind": "Fork", - "movements": [ - "Road #9 -> Road #61", - "Road #60 -> Road #61" - ], - "osm_node_ids": [ - 4156273389 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -9082,15 +8754,23 @@ "coordinates": [ [ [ - -0.10475978680005517, + -0.10482528525482046, + 51.496093277401215 + ], + [ + -0.10476641984752082, + 51.49616357557999 + ], + [ + -0.10475978824453415, 51.49616903985865 ], [ - -0.10472453862404109, + -0.10472454006852007, 51.49620828805636 ], [ - -0.1047219197836545, + -0.10472192122813348, 51.496207377043476 ], [ @@ -9106,20 +8786,16 @@ 51.496144213183754 ], [ - -0.10468978445983738, - 51.49614559184393 - ], - [ - -0.1046971123016913, - 51.49613955379802 + -0.1046957458245784, + 51.496140677050825 ], [ - -0.10475978824453415, - 51.49616903895933 + -0.10475447545085413, + 51.4960703357046 ], [ - -0.10475978680005517, - 51.49616903985865 + -0.10482528525482046, + 51.496093277401215 ] ] ], @@ -9128,12 +8804,14 @@ "properties": { "control": "Signalled", "id": 67, - "intersection_kind": "Connection", + "intersection_kind": "Fork", "movements": [ - "Road #8 -> Road #9" + "Road #8 -> Road #61", + "Road #60 -> Road #61" ], "osm_node_ids": [ - 3799274009 + 3799274009, + 4156273389 ], "type": "intersection" }, @@ -10701,50 +10379,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10171690660924916, - 51.495133367497125 - ], - [ - -0.1017009884509148, - 51.49514837717633 - ], - [ - -0.10169663912471291, - 51.495154001534246 - ], - [ - -0.1016315624578091, - 51.49513449704518 - ], - [ - -0.10167524350209506, - 51.495098686055016 - ], - [ - -0.10171690660924916, - 51.495133367497125 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 110, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 4169653677 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -10790,76 +10424,48 @@ "coordinates": [ [ [ - -0.101700003316252, - 51.49514965151518 - ], - [ - -0.10167401425048503, - 51.49516645983778 - ], - [ - -0.10162979297106141, - 51.49514330769989 + -0.10168485939864969, + 51.49512019513216 ], [ - -0.10163492953830615, - 51.495130143428824 + -0.10166894124031532, + 51.49513520481136 ], - [ - -0.101700003316252, - 51.49514965151518 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 112, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 4169653676 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ [ -0.10167432192450729, - 51.495148773777196 + 51.495148772877876 ], [ -0.10162995908614385, - 51.49519903326982 + 51.49519903237049 ], [ - -0.10162231056995688, - 51.49520468011078 + -0.10162231201443586, + 51.49520468101011 ], [ - -0.10157814418073441, - 51.495181488402736 + -0.10157814562521339, + 51.495181487503416 ], [ -0.10162193500542267, 51.49513103555595 ], [ - -0.1016387501852022, - 51.49513667430302 + -0.1016299431968751, + 51.49513372992377 ], [ - -0.1016829396860883, - 51.49515985162192 + -0.10163774627231269, + 51.49513741984071 ], [ - -0.10167432192450729, - 51.495148773777196 + -0.1016814244276407, + 51.49510160885055 + ], + [ + -0.10168485939864969, + 51.49512019513216 ] ] ], @@ -10873,47 +10479,9 @@ "Road #68 -> Road #39" ], "osm_node_ids": [ - 3890206825 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10153446024749051, - 51.49520810292918 - ], - [ - -0.10155952918014866, - 51.49519523003834 - ], - [ - -0.10160369556937113, - 51.49521842174639 - ], - [ - -0.10159350188122543, - 51.49523400159555 - ], - [ - -0.10153446024749051, - 51.49520810292918 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 114, - "intersection_kind": "Connection", - "movements": [], - "osm_node_ids": [ - 6502835827 + 3890206825, + 4169653676, + 4169653677 ], "type": "intersection" }, @@ -10940,12 +10508,16 @@ 51.49523841096985 ], [ - -0.1015422431002224, - 51.495201224017485 + -0.10155952918014866, + 51.49519523003834 ], [ - -0.10160125584437778, - 51.49522714786486 + -0.10160369556937113, + 51.49521842174639 + ], + [ + -0.10159535514775384, + 51.49522457940208 ], [ -0.10160127173364653, @@ -10956,12 +10528,13 @@ "type": "Polygon" }, "properties": { - "control": "Signed", + "control": "Signalled", "id": 115, "intersection_kind": "Connection", "movements": [], "osm_node_ids": [ - 3890206820 + 3890206820, + 6502835827 ], "type": "intersection" }, @@ -11160,10 +10733,6 @@ "geometry": { "coordinates": [ [ - [ - -0.10118477788760849, - 51.49484535162825 - ], [ -0.1012110096258437, 51.49485229439179 @@ -11173,12 +10742,36 @@ 51.49488841654726 ], [ - -0.10114852435422592, - 51.49487336190197 + -0.10116691546057012, + 51.49488791652439 + ], + [ + -0.10114944882077165, + 51.49487382505265 + ], + [ + -0.10102075729968951, + 51.49493565701693 + ], + [ + -0.10093840899764923, + 51.49486922052554 + ], + [ + -0.10091649191812044, + 51.49483593662936 + ], + [ + -0.10093358010442674, + 51.49486527520123 + ], + [ + -0.10105846686788161, + 51.49480048986448 ], [ - -0.10118477788760849, - 51.49484535162825 + -0.1012110096258437, + 51.49485229439179 ] ] ], @@ -11188,9 +10781,12 @@ "control": "Signalled", "id": 120, "intersection_kind": "Connection", - "movements": [], + "movements": [ + "Road #26 -> Road #128" + ], "osm_node_ids": [ - 4175070882 + 4175070882, + 3890206831 ], "type": "intersection" }, @@ -11467,64 +11063,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -0.10114944882077165, - 51.49487382505265 - ], - [ - -0.10102075729968951, - 51.49493565701693 - ], - [ - -0.10093840899764923, - 51.49486922052554 - ], - [ - -0.10091649191812044, - 51.49483593662936 - ], - [ - -0.10093358010442674, - 51.49486527520123 - ], - [ - -0.10105846686788161, - 51.49480048986448 - ], - [ - -0.10118570668759115, - 51.49484581657757 - ], - [ - -0.10114945026525063, - 51.49487382685129 - ], - [ - -0.10114944882077165, - 51.49487382505265 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signalled", - "id": 127, - "intersection_kind": "Connection", - "movements": [ - "Road #26 -> Road #128" - ], - "osm_node_ids": [ - 3890206831 - ], - "type": "intersection" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ diff --git a/tests/src/st_georges_cycletrack/road_network.dot b/tests/src/st_georges_cycletrack/road_network.dot index b387ee29..cdc28def 100644 --- a/tests/src/st_georges_cycletrack/road_network.dot +++ b/tests/src/st_georges_cycletrack/road_network.dot @@ -53,114 +53,106 @@ digraph { 51 [ label = "Merge" ] 52 [ label = "Slice" ] 53 [ label = "Merge" ] - 54 [ label = "Slice" ] - 55 [ label = "Terminus" ] - 56 [ label = "Uncontrolled RoadIntersection" ] - 57 [ label = "Merge" ] - 58 [ label = "Slice" ] + 54 [ label = "Terminus" ] + 55 [ label = "Uncontrolled RoadIntersection" ] + 56 [ label = "Merge" ] + 57 [ label = "Slice" ] + 58 [ label = "MapEdge" ] 59 [ label = "Merge" ] - 60 [ label = "MapEdge" ] + 60 [ label = "Slice" ] 61 [ label = "Slice" ] - 62 [ label = "Slice" ] - 63 [ label = "Slice" ] - 64 [ label = "Terminus" ] - 65 [ label = "Uncontrolled RoadIntersection" ] + 62 [ label = "Terminus" ] + 63 [ label = "Uncontrolled RoadIntersection" ] + 64 [ label = "Slice" ] + 65 [ label = "Merge" ] 66 [ label = "Slice" ] - 67 [ label = "Merge" ] + 67 [ label = "Slice" ] 68 [ label = "Slice" ] - 69 [ label = "Slice" ] - 70 [ label = "Slice" ] + 69 [ label = "Terminus" ] + 70 [ label = "MapEdge" ] 71 [ label = "Terminus" ] 72 [ label = "MapEdge" ] - 73 [ label = "Terminus" ] - 74 [ label = "MapEdge" ] + 73 [ label = "Uncontrolled RoadIntersection" ] + 74 [ label = "Slice" ] 75 [ label = "Uncontrolled RoadIntersection" ] - 76 [ label = "Slice" ] - 77 [ label = "Uncontrolled RoadIntersection" ] - 78 [ label = "MapEdge" ] - 79 [ label = "Merge" ] + 76 [ label = "MapEdge" ] + 77 [ label = "Merge" ] + 78 [ label = "Slice" ] + 79 [ label = "Slice" ] 80 [ label = "Slice" ] 81 [ label = "Slice" ] - 82 [ label = "Slice" ] - 83 [ label = "Slice" ] - 84 [ label = "MapEdge" ] + 82 [ label = "MapEdge" ] + 83 [ label = "Uncontrolled RoadIntersection" ] + 84 [ label = "Slice" ] 85 [ label = "Uncontrolled RoadIntersection" ] - 86 [ label = "Slice" ] - 87 [ label = "Uncontrolled RoadIntersection" ] - 88 [ label = "Merge" ] - 89 [ label = "Slice" ] - 90 [ label = "Slice" ] - 91 [ label = "Terminus" ] - 92 [ label = "Terminus" ] + 86 [ label = "Merge" ] + 87 [ label = "Slice" ] + 88 [ label = "Slice" ] + 89 [ label = "Terminus" ] + 90 [ label = "Terminus" ] + 91 [ label = "Slice" ] + 92 [ label = "Slice" ] 93 [ label = "Slice" ] 94 [ label = "Slice" ] 95 [ label = "Slice" ] 96 [ label = "Slice" ] 97 [ label = "Slice" ] - 98 [ label = "Slice" ] + 98 [ label = "Uncontrolled RoadIntersection" ] 99 [ label = "Slice" ] 100 [ label = "Slice" ] - 101 [ label = "Slice" ] + 101 [ label = "Terminus" ] 102 [ label = "Slice" ] - 103 [ label = "Uncontrolled RoadIntersection" ] + 103 [ label = "Merge" ] 104 [ label = "Slice" ] 105 [ label = "Slice" ] - 106 [ label = "Terminus" ] + 106 [ label = "Slice" ] 107 [ label = "Slice" ] - 108 [ label = "Merge" ] - 109 [ label = "Slice" ] - 110 [ label = "Slice" ] - 111 [ label = "Slice" ] - 112 [ label = "Slice" ] - 113 [ label = "Slice" ] - 114 [ label = "Slice" ] - 115 [ label = "Terminus" ] - 116 [ label = "Terminus" ] + 108 [ label = "Slice" ] + 109 [ label = "Terminus" ] + 110 [ label = "Terminus" ] + 111 [ label = "MapEdge" ] + 112 [ label = "MapEdge" ] + 113 [ label = "MapEdge" ] + 114 [ label = "MapEdge" ] + 115 [ label = "MapEdge" ] + 116 [ label = "MapEdge" ] 117 [ label = "MapEdge" ] - 118 [ label = "MapEdge" ] - 119 [ label = "MapEdge" ] - 120 [ label = "MapEdge" ] - 121 [ label = "MapEdge" ] - 122 [ label = "MapEdge" ] - 123 [ label = "MapEdge" ] 52 -> 51 [ label = "1 lanes" ] - 60 -> 67 [ label = "2 lanes" ] - 67 -> 60 [ label = "2 lanes" ] - 72 -> 77 [ label = "2 lanes" ] - 77 -> 72 [ label = "2 lanes" ] - 77 -> 79 [ label = "2 lanes" ] - 79 -> 77 [ label = "2 lanes" ] - 84 -> 87 [ label = "2 lanes" ] - 87 -> 84 [ label = "2 lanes" ] - 87 -> 88 [ label = "2 lanes" ] - 88 -> 87 [ label = "2 lanes" ] + 58 -> 65 [ label = "2 lanes" ] + 65 -> 58 [ label = "2 lanes" ] + 70 -> 75 [ label = "2 lanes" ] + 75 -> 70 [ label = "2 lanes" ] + 75 -> 77 [ label = "2 lanes" ] + 77 -> 75 [ label = "2 lanes" ] + 82 -> 85 [ label = "2 lanes" ] + 85 -> 82 [ label = "2 lanes" ] 85 -> 86 [ label = "2 lanes" ] 86 -> 85 [ label = "2 lanes" ] - 74 -> 61 [ label = "3 lanes" ] - 61 -> 59 [ label = "3 lanes" ] + 83 -> 84 [ label = "2 lanes" ] + 84 -> 83 [ label = "2 lanes" ] + 72 -> 59 [ label = "3 lanes" ] 15 -> 40 [ label = "1 lanes" ] 40 -> 41 [ label = "1 lanes" ] 41 -> 42 [ label = "1 lanes" ] 42 -> 43 [ label = "1 lanes" ] - 75 -> 76 [ label = "2 lanes" ] - 76 -> 75 [ label = "2 lanes" ] - 76 -> 81 [ label = "2 lanes" ] - 81 -> 76 [ label = "2 lanes" ] - 81 -> 73 [ label = "2 lanes" ] - 73 -> 81 [ label = "2 lanes" ] - 120 -> 54 [ label = "3 lanes" ] - 54 -> 53 [ label = "3 lanes" ] + 73 -> 74 [ label = "2 lanes" ] + 74 -> 73 [ label = "2 lanes" ] + 74 -> 79 [ label = "2 lanes" ] + 79 -> 74 [ label = "2 lanes" ] + 79 -> 71 [ label = "2 lanes" ] + 71 -> 79 [ label = "2 lanes" ] + 114 -> 53 [ label = "3 lanes" ] 47 -> 48 [ label = "3 lanes" ] - 48 -> 121 [ label = "3 lanes" ] + 48 -> 115 [ label = "3 lanes" ] 49 -> 40 [ label = "1 lanes" ] - 65 -> 66 [ label = "1 lanes" ] - 66 -> 65 [ label = "1 lanes" ] - 66 -> 71 [ label = "1 lanes" ] - 71 -> 66 [ label = "1 lanes" ] - 103 -> 101 [ label = "5 lanes" ] - 117 -> 112 [ label = "5 lanes" ] - 77 -> 78 [ label = "1 lanes" ] - 78 -> 77 [ label = "1 lanes" ] + 63 -> 64 [ label = "1 lanes" ] + 64 -> 63 [ label = "1 lanes" ] + 64 -> 69 [ label = "1 lanes" ] + 69 -> 64 [ label = "1 lanes" ] + 98 -> 96 [ label = "5 lanes" ] + 111 -> 100 [ label = "5 lanes" ] + 75 -> 76 [ label = "1 lanes" ] + 76 -> 75 [ label = "1 lanes" ] 41 -> 6 [ label = "1 lanes" ] 17 -> 26 [ label = "1 lanes" ] 26 -> 32 [ label = "1 lanes" ] @@ -169,17 +161,17 @@ digraph { 3 -> 4 [ label = "2 lanes" ] 19 -> 10 [ label = "2 lanes" ] 39 -> 34 [ label = "4 lanes" ] - 98 -> 88 [ label = "3 lanes" ] - 88 -> 85 [ label = "3 lanes" ] - 102 -> 106 [ label = "5 lanes" ] + 94 -> 86 [ label = "3 lanes" ] + 86 -> 83 [ label = "3 lanes" ] + 97 -> 101 [ label = "5 lanes" ] 51 -> 47 [ label = "5 lanes" ] 47 -> 45 [ label = "5 lanes" ] 45 -> 42 [ label = "5 lanes" ] 42 -> 39 [ label = "5 lanes" ] + 54 -> 55 [ label = "3 lanes" ] 55 -> 56 [ label = "3 lanes" ] - 56 -> 57 [ label = "3 lanes" ] - 119 -> 1 [ label = "2 lanes" ] - 1 -> 119 [ label = "2 lanes" ] + 113 -> 1 [ label = "2 lanes" ] + 1 -> 113 [ label = "2 lanes" ] 1 -> 2 [ label = "2 lanes" ] 2 -> 1 [ label = "2 lanes" ] 36 -> 19 [ label = "2 lanes" ] @@ -189,23 +181,23 @@ digraph { 33 -> 30 [ label = "1 lanes" ] 27 -> 16 [ label = "1 lanes" ] 16 -> 13 [ label = "1 lanes" ] - 118 -> 1 [ label = "2 lanes" ] - 1 -> 118 [ label = "2 lanes" ] + 112 -> 1 [ label = "2 lanes" ] + 1 -> 112 [ label = "2 lanes" ] 5 -> 7 [ label = "1 lanes" ] - 65 -> 59 [ label = "4 lanes" ] - 59 -> 57 [ label = "4 lanes" ] - 86 -> 80 [ label = "2 lanes" ] + 63 -> 59 [ label = "4 lanes" ] + 59 -> 56 [ label = "4 lanes" ] + 84 -> 78 [ label = "2 lanes" ] 37 -> 34 [ label = "1 lanes" ] 44 -> 38 [ label = "2 lanes" ] 38 -> 44 [ label = "2 lanes" ] - 108 -> 103 [ label = "3 lanes" ] - 108 -> 116 [ label = "2 lanes" ] - 115 -> 108 [ label = "2 lanes" ] 103 -> 98 [ label = "3 lanes" ] - 100 -> 90 [ label = "2 lanes" ] - 90 -> 89 [ label = "2 lanes" ] - 89 -> 86 [ label = "2 lanes" ] - 100 -> 101 [ label = "1 lanes" ] + 103 -> 110 [ label = "2 lanes" ] + 109 -> 103 [ label = "2 lanes" ] + 98 -> 94 [ label = "3 lanes" ] + 95 -> 88 [ label = "2 lanes" ] + 88 -> 87 [ label = "2 lanes" ] + 87 -> 84 [ label = "2 lanes" ] + 95 -> 96 [ label = "1 lanes" ] 17 -> 22 [ label = "1 lanes" ] 8 -> 17 [ label = "1 lanes" ] 22 -> 25 [ label = "1 lanes" ] @@ -214,33 +206,32 @@ digraph { 24 -> 22 [ label = "1 lanes" ] 51 -> 49 [ label = "3 lanes" ] 49 -> 50 [ label = "3 lanes" ] - 80 -> 76 [ label = "2 lanes" ] - 76 -> 70 [ label = "2 lanes" ] - 70 -> 66 [ label = "2 lanes" ] - 66 -> 61 [ label = "2 lanes" ] - 61 -> 58 [ label = "2 lanes" ] - 58 -> 54 [ label = "2 lanes" ] - 54 -> 52 [ label = "2 lanes" ] + 78 -> 74 [ label = "2 lanes" ] + 74 -> 68 [ label = "2 lanes" ] + 68 -> 64 [ label = "2 lanes" ] + 64 -> 59 [ label = "2 lanes" ] + 59 -> 57 [ label = "2 lanes" ] + 57 -> 53 [ label = "2 lanes" ] + 53 -> 52 [ label = "2 lanes" ] 52 -> 48 [ label = "2 lanes" ] 48 -> 46 [ label = "2 lanes" ] 46 -> 43 [ label = "2 lanes" ] 43 -> 37 [ label = "2 lanes" ] 37 -> 36 [ label = "2 lanes" ] - 90 -> 88 [ label = "1 lanes" ] - 67 -> 70 [ label = "2 lanes" ] - 57 -> 58 [ label = "1 lanes" ] - 79 -> 80 [ label = "2 lanes" ] - 86 -> 91 [ label = "2 lanes" ] - 91 -> 86 [ label = "2 lanes" ] - 105 -> 112 [ label = "2 lanes" ] - 112 -> 113 [ label = "2 lanes" ] - 111 -> 110 [ label = "1 lanes" ] - 110 -> 109 [ label = "1 lanes" ] - 109 -> 107 [ label = "1 lanes" ] - 104 -> 105 [ label = "2 lanes" ] + 88 -> 86 [ label = "1 lanes" ] + 65 -> 68 [ label = "2 lanes" ] + 56 -> 57 [ label = "1 lanes" ] + 77 -> 78 [ label = "2 lanes" ] + 84 -> 89 [ label = "2 lanes" ] + 89 -> 84 [ label = "2 lanes" ] + 100 -> 107 [ label = "2 lanes" ] + 106 -> 105 [ label = "1 lanes" ] + 105 -> 104 [ label = "1 lanes" ] + 104 -> 102 [ label = "1 lanes" ] + 99 -> 100 [ label = "2 lanes" ] 19 -> 12 [ label = "2 lanes" ] - 122 -> 109 [ label = "1 lanes" ] - 109 -> 104 [ label = "1 lanes" ] + 116 -> 104 [ label = "1 lanes" ] + 104 -> 99 [ label = "1 lanes" ] 2 -> 4 [ label = "1 lanes" ] 14 -> 21 [ label = "1 lanes" ] 21 -> 29 [ label = "1 lanes" ] @@ -254,37 +245,34 @@ digraph { 34 -> 19 [ label = "4 lanes" ] 16 -> 18 [ label = "1 lanes" ] 20 -> 21 [ label = "1 lanes" ] - 56 -> 64 [ label = "1 lanes" ] - 64 -> 56 [ label = "1 lanes" ] - 97 -> 95 [ label = "2 lanes" ] - 95 -> 104 [ label = "2 lanes" ] - 100 -> 99 [ label = "2 lanes" ] - 99 -> 98 [ label = "2 lanes" ] - 98 -> 97 [ label = "2 lanes" ] - 96 -> 93 [ label = "1 lanes" ] - 95 -> 94 [ label = "1 lanes" ] - 112 -> 103 [ label = "5 lanes" ] - 88 -> 89 [ label = "1 lanes" ] - 82 -> 83 [ label = "1 lanes" ] - 114 -> 116 [ label = "1 lanes" ] - 101 -> 102 [ label = "5 lanes" ] - 87 -> 92 [ label = "1 lanes" ] - 92 -> 87 [ label = "1 lanes" ] + 55 -> 62 [ label = "1 lanes" ] + 62 -> 55 [ label = "1 lanes" ] + 94 -> 99 [ label = "2 lanes" ] + 95 -> 94 [ label = "2 lanes" ] + 93 -> 91 [ label = "1 lanes" ] + 94 -> 92 [ label = "1 lanes" ] + 100 -> 98 [ label = "5 lanes" ] + 86 -> 87 [ label = "1 lanes" ] + 80 -> 81 [ label = "1 lanes" ] + 108 -> 110 [ label = "1 lanes" ] + 96 -> 97 [ label = "5 lanes" ] + 85 -> 90 [ label = "1 lanes" ] + 90 -> 85 [ label = "1 lanes" ] 45 -> 46 [ label = "2 lanes" ] - 123 -> 110 [ label = "1 lanes" ] - 63 -> 62 [ label = "1 lanes" ] + 117 -> 105 [ label = "1 lanes" ] + 61 -> 60 [ label = "1 lanes" ] 11 -> 9 [ label = "1 lanes" ] - 115 -> 114 [ label = "1 lanes" ] - 69 -> 68 [ label = "1 lanes" ] - 68 -> 71 [ label = "1 lanes" ] - 68 -> 81 [ label = "1 lanes" ] + 109 -> 108 [ label = "1 lanes" ] + 67 -> 66 [ label = "1 lanes" ] + 66 -> 69 [ label = "1 lanes" ] + 66 -> 79 [ label = "1 lanes" ] 28 -> 32 [ label = "1 lanes" ] 24 -> 23 [ label = "1 lanes" ] 26 -> 25 [ label = "1 lanes" ] 53 -> 51 [ label = "5 lanes" ] - 57 -> 53 [ label = "4 lanes" ] - 75 -> 67 [ label = "4 lanes" ] - 79 -> 75 [ label = "4 lanes" ] - 85 -> 79 [ label = "4 lanes" ] - 67 -> 65 [ label = "4 lanes" ] + 56 -> 53 [ label = "4 lanes" ] + 73 -> 65 [ label = "4 lanes" ] + 77 -> 73 [ label = "4 lanes" ] + 83 -> 77 [ label = "4 lanes" ] + 65 -> 63 [ label = "4 lanes" ] } diff --git a/tests/src/tiny_loop/geometry.json b/tests/src/tiny_loop/geometry.json index 85318b2a..836fe035 100644 --- a/tests/src/tiny_loop/geometry.json +++ b/tests/src/tiny_loop/geometry.json @@ -186,44 +186,6 @@ }, "type": "Feature" }, - { - "geometry": { - "coordinates": [ - [ - [ - -88.43562056516919, - 44.243128143253955 - ], - [ - -88.43572056545815, - 44.24315514358554 - ], - [ - -88.43575543538392, - 44.24308885639104 - ], - [ - -88.43565543509496, - 44.243061856059455 - ], - [ - -88.43562056516919, - 44.243128143253955 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "dst_i": 1, - "osm_way_ids": [ - 21639584 - ], - "src_i": 2, - "type": "road" - }, - "type": "Feature" - }, { "geometry": { "coordinates": [ @@ -281,7 +243,7 @@ "osm_way_ids": [ 21639584 ], - "src_i": 1, + "src_i": 2, "type": "road" }, "type": "Feature" @@ -419,7 +381,7 @@ "type": "Polygon" }, "properties": { - "dst_i": 1, + "dst_i": 2, "osm_way_ids": [ 21640660 ], @@ -565,63 +527,16 @@ "coordinates": [ [ [ - -88.43578812735156, + -88.43578812609626, 44.243096567174206 ], [ - -88.43575709113423, + -88.43575708987893, 44.243163825636 ], [ - -88.43565503590725, - 44.24313745033291 - ], - [ - -88.43568990583302, - 44.24307116313841 - ], - [ - -88.43578876881358, - 44.2430725175167 - ], - [ - -88.43578812735156, - 44.243096567174206 - ] - ] - ], - "type": "Polygon" - }, - "properties": { - "control": "Signed", - "id": 1, - "intersection_kind": "Intersection", - "movements": [ - "Road #4 -> Road #3", - "Road #4 -> Road #5", - "Road #3 -> Road #4", - "Road #3 -> Road #5", - "Road #5 -> Road #4", - "Road #5 -> Road #3" - ], - "osm_node_ids": [ - 233087070 - ], - "type": "intersection" - }, - "type": "Feature" - }, - { - "geometry": { - "coordinates": [ - [ - [ - -88.43571748744469, - 44.243078610420355 - ], - [ - -88.43568261751892, - 44.243144897614854 + -88.4356826150083, + 44.243144896715535 ], [ -88.4355839855149, @@ -636,12 +551,16 @@ 44.24305250851102 ], [ - -88.43565598240893, - 44.24306200354819 + -88.43568990834363, + 44.24307116313841 + ], + [ + -88.43578876881358, + 44.2430725175167 ], [ - -88.43571748744469, - 44.243078610420355 + -88.43578812609626, + 44.243096567174206 ] ] ], @@ -652,15 +571,22 @@ "id": 2, "intersection_kind": "Intersection", "movements": [ - "Road #3 -> Road #7", - "Road #3 -> Road #2", - "Road #7 -> Road #3", + "Road #4 -> Road #7", + "Road #4 -> Road #2", + "Road #4 -> Road #5", + "Road #7 -> Road #4", "Road #7 -> Road #2", - "Road #2 -> Road #3", - "Road #2 -> Road #7" + "Road #7 -> Road #5", + "Road #2 -> Road #4", + "Road #2 -> Road #7", + "Road #2 -> Road #5", + "Road #5 -> Road #4", + "Road #5 -> Road #7", + "Road #5 -> Road #2" ], "osm_node_ids": [ - 233087064 + 233087064, + 233087070 ], "type": "intersection" }, diff --git a/tests/src/tiny_loop/road_network.dot b/tests/src/tiny_loop/road_network.dot index ba5ff3cd..d89b30cb 100644 --- a/tests/src/tiny_loop/road_network.dot +++ b/tests/src/tiny_loop/road_network.dot @@ -1,26 +1,23 @@ digraph { 0 [ label = "MapEdge" ] 1 [ label = "Uncontrolled RoadIntersection" ] - 2 [ label = "Uncontrolled RoadIntersection" ] - 3 [ label = "Terminus" ] + 2 [ label = "Terminus" ] + 3 [ label = "Uncontrolled RoadIntersection" ] 4 [ label = "Uncontrolled RoadIntersection" ] - 5 [ label = "Uncontrolled RoadIntersection" ] - 6 [ label = "Terminus" ] - 7 [ label = "MapEdge" ] - 7 -> 5 [ label = "2 lanes" ] - 5 -> 7 [ label = "2 lanes" ] + 5 [ label = "Terminus" ] + 6 [ label = "MapEdge" ] + 6 -> 4 [ label = "2 lanes" ] + 4 -> 6 [ label = "2 lanes" ] + 4 -> 3 [ label = "2 lanes" ] + 3 -> 4 [ label = "2 lanes" ] + 3 -> 1 [ label = "2 lanes" ] + 1 -> 3 [ label = "2 lanes" ] + 1 -> 0 [ label = "2 lanes" ] + 0 -> 1 [ label = "2 lanes" ] + 3 -> 1 [ label = "2 lanes" ] + 1 -> 3 [ label = "2 lanes" ] 5 -> 4 [ label = "2 lanes" ] 4 -> 5 [ label = "2 lanes" ] - 4 -> 2 [ label = "2 lanes" ] - 2 -> 4 [ label = "2 lanes" ] - 2 -> 1 [ label = "2 lanes" ] 1 -> 2 [ label = "2 lanes" ] - 1 -> 0 [ label = "2 lanes" ] - 0 -> 1 [ label = "2 lanes" ] - 4 -> 1 [ label = "2 lanes" ] - 1 -> 4 [ label = "2 lanes" ] - 6 -> 5 [ label = "2 lanes" ] - 5 -> 6 [ label = "2 lanes" ] - 2 -> 3 [ label = "2 lanes" ] - 3 -> 2 [ label = "2 lanes" ] + 2 -> 1 [ label = "2 lanes" ] }