From dd7c627bb5d5a950fa86f5f61b31d60a40152c23 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Wed, 7 Dec 2022 11:46:26 +0000 Subject: [PATCH] Reset the center line to untrimmed before calling intersection_polygon. Will revisit this at some point. #136, closes #143. --- .../src/transform/intersection_geometry.rs | 7 + tests/src/arizona_highways/geometry.json | 892 +++++++++--------- tests/src/kingsway_junction/geometry.json | 306 +++--- tests/src/leeds_cycleway/geometry.json | 220 ++--- .../src/perth_peanut_roundabout/geometry.json | 80 +- tests/src/roosevelt_cycletrack/geometry.json | 194 ++-- tests/src/seattle_slip_lane/geometry.json | 184 ++-- tests/src/taipei/geometry.json | 214 ++--- tests/src/tempe_split/geometry.json | 242 ++--- 9 files changed, 1183 insertions(+), 1156 deletions(-) diff --git a/osm2streets/src/transform/intersection_geometry.rs b/osm2streets/src/transform/intersection_geometry.rs index 5217dc85..ee80e675 100644 --- a/osm2streets/src/transform/intersection_geometry.rs +++ b/osm2streets/src/transform/intersection_geometry.rs @@ -4,6 +4,13 @@ use geom::{Circle, Distance}; use crate::{IntersectionControl, StreetNetwork}; pub fn generate(streets: &mut StreetNetwork, timer: &mut Timer) { + // TODO intersection_polygon assumes untrimmed lines as input, so reset here. Once we always + // maintain a trimmed center_line and this transformation goes away entirely, we'll have to + // revisit how this works. + for road in streets.roads.values_mut() { + road.update_center_line(streets.config.driving_side); + } + let mut remove_dangling_nodes = Vec::new(); timer.start_iter( "find each intersection polygon", diff --git a/tests/src/arizona_highways/geometry.json b/tests/src/arizona_highways/geometry.json index 7983d33d..33590858 100644 --- a/tests/src/arizona_highways/geometry.json +++ b/tests/src/arizona_highways/geometry.json @@ -5,64 +5,64 @@ "coordinates": [ [ [ - -111.88986333252794, - 33.628991249640336 + -111.88986531553223, + 33.62895126579782 ], [ - -111.88986749294871, - 33.62907162202015 + -111.88987152484144, + 33.62907120023827 ], [ - -111.88989609422147, - 33.62918592490816 + -111.88990001594729, + 33.62918505796204 ], [ - -111.88992253427877, - 33.62925352781923 + -111.88992630371503, + 33.62925227506411 ], [ - -111.88996592707866, - 33.62932946654309 + -111.88996947186085, + 33.62932782078439 ], [ - -111.89006368508625, - 33.629456305975516 + -111.89006691772886, + 33.629454256421376 ], [ - -111.89018990287771, - 33.629573734006414 + -111.89019541446318, + 33.6295738041535 ], [ - -111.89021556312612, - 33.629554610829906 + -111.89022107471159, + 33.629554680977 ], [ - -111.89009118144975, - 33.62943888971159 + -111.89009441409236, + 33.629436840157446 ], [ - -111.88999608904925, - 33.629315509070395 + -111.88999963383144, + 33.629313863311694 ], [ - -111.88995458636782, - 33.62924287805173 + -111.88995835364396, + 33.62924162169932 ], [ - -111.88992942511068, - 33.62917854687298 + -111.8899333468365, + 33.629177685322794 ], [ - -111.88990177645763, - 33.62906805171302 + -111.88990580835036, + 33.62906762993114 ], [ - -111.88989773700445, - 33.628990015770974 + -111.88989972000874, + 33.62895003012981 ], [ - -111.88986333252794, - 33.628991249640336 + -111.88986531553223, + 33.62895126579782 ] ] ], @@ -83,40 +83,40 @@ "coordinates": [ [ [ - -111.8909655729375, - 33.63024970825853 + -111.89096544980978, + 33.630261156623696 ], [ - -111.89092921353846, - 33.630148284556505 + -111.89092545166265, + 33.63014958137838 ], [ - -111.89084616065261, - 33.630020501735615 + -111.89084282540357, + 33.63002245596166 ], [ - -111.89061136797557, - 33.629801344233314 + -111.89060834486608, + 33.62980358983959 ], [ - -111.89058567100486, - 33.629820431436954 + -111.89058264789537, + 33.62982267704322 ], [ - -111.89081778727414, - 33.63003709062359 + -111.89081445202508, + 33.63003904484963 ], [ - -111.89089723273386, - 33.63015932283098 + -111.89089347085807, + 33.63016061965286 ], [ - -111.89093257470914, - 33.63025791007238 + -111.89093245158142, + 33.630269358437545 ], [ - -111.8909655729375, - 33.63024970825853 + -111.89096544980978, + 33.630261156623696 ] ] ], @@ -649,8 +649,8 @@ "coordinates": [ [ [ - -111.89107171443057, - 33.628053389313585 + -111.89106745896382, + 33.62805877265325 ], [ -111.89113906637225, @@ -677,12 +677,12 @@ 33.62794601479991 ], [ - -111.8910401375713, - 33.628036084565544 + -111.89103588210456, + 33.628041467905206 ], [ - -111.89107171443057, - 33.628053389313585 + -111.89106745896382, + 33.62805877265325 ] ] ], @@ -703,24 +703,24 @@ "coordinates": [ [ [ - -111.89047498566698, - 33.6295752052967 + -111.8904652110543, + 33.629575186410946 ], [ - -111.8903597230022, - 33.6295749813656 + -111.89036767770081, + 33.62957499665407 ], [ - -111.89035950050825, - 33.62965425837159 + -111.89036745520687, + 33.62965427366006 ], [ - -111.89047476317305, - 33.62965448230269 + -111.89046498856035, + 33.629654463416934 ], [ - -111.89047498566698, - 33.6295752052967 + -111.8904652110543, + 33.629575186410946 ] ] ], @@ -741,24 +741,24 @@ "coordinates": [ [ [ - -111.89057445882207, - 33.62984498471785 + -111.89060108357093, + 33.62984514569643 ], [ - -111.89058835173289, - 33.62984506925409 + -111.89060151343787, + 33.629845148394395 ], [ - -111.89058904729649, - 33.62976579404675 + -111.89060223060282, + 33.629765873187054 ], [ - -111.89057515438566, - 33.62976570951051 + -111.89060180073588, + 33.62976587048909 ], [ - -111.89057445882207, - 33.62984498471785 + -111.89060108357093, + 33.62984514569643 ] ] ], @@ -817,8 +817,8 @@ "coordinates": [ [ [ - -111.89003762845299, - 33.629848424623326 + -111.89001121971766, + 33.629848635064604 ], [ -111.89013234282977, @@ -829,12 +829,12 @@ 33.62976839758305 ], [ - -111.89003671903598, - 33.62976915121463 + -111.89001031030065, + 33.6297693616559 ], [ - -111.89003762845299, - 33.629848424623326 + -111.89001121971766, + 33.629848635064604 ] ] ], @@ -855,24 +855,24 @@ "coordinates": [ [ [ - -111.89018990287771, - 33.629573734006414 + -111.89019541446318, + 33.6295738041535 ], [ - -111.8901128940507, - 33.629572758242375 + -111.8900930456466, + 33.6295725064323 ], [ - -111.89011144459985, - 33.629652026255144 + -111.89009159619573, + 33.62965177444507 ], [ - -111.89018845342684, - 33.62965300201918 + -111.89019396501232, + 33.62965307216627 ], [ - -111.89018990287771, - 33.629573734006414 + -111.89019541446318, + 33.6295738041535 ] ] ], @@ -893,8 +893,8 @@ "coordinates": [ [ [ - -111.89005889714613, - 33.62957207385856 + -111.89003904874201, + 33.62957182204849 ], [ -111.88996802997048, @@ -913,12 +913,12 @@ 33.62965018984024 ], [ - -111.89005744769527, - 33.62965134187134 + -111.89003759929116, + 33.62965109006126 ], [ - -111.89005889714613, - 33.62957207385856 + -111.89003904874201, + 33.62957182204849 ] ] ], @@ -939,24 +939,24 @@ "coordinates": [ [ [ - -111.89069999725095, - 33.629578262091144 + -111.89072021071794, + 33.62957875941604 ], [ - -111.89069942265493, - 33.62957824770199 + -111.89069939889343, + 33.62957824680267 ], [ - -111.89069656047552, - 33.62965748873511 + -111.89069658423702, + 33.62965748963443 ], [ - -111.89069713507153, - 33.629657503124264 + -111.89071739606152, + 33.6296580022478 ], [ - -111.89069999725095, - 33.629578262091144 + -111.89072021071794, + 33.62957875941604 ] ] ], @@ -1091,24 +1091,24 @@ "coordinates": [ [ [ - -111.89034488071188, - 33.62984623297636 + -111.89035406344746, + 33.62984618351367 ], [ - -111.8904881603328, - 33.62984545416377 + -111.89047827447312, + 33.629845508123076 ], [ - -111.89048753821379, - 33.62976617895643 + -111.89047765235414, + 33.629766232915735 ], [ - -111.89034425859288, - 33.629766957769014 + -111.89035344132846, + 33.62976690830632 ], [ - -111.89034488071188, - 33.62984623297636 + -111.89035406344746, + 33.62984618351367 ] ] ], @@ -1129,24 +1129,24 @@ "coordinates": [ [ [ - -111.89050144300536, - 33.629739945742614 + -111.89049155714571, + 33.62973999970191 ], [ - -111.89044712532068, - 33.6297199888949 + -111.89044549009817, + 33.62972307446763 ], [ - -111.89043322268924, - 33.629746222108714 + -111.89043158746674, + 33.62974930768145 ], [ - -111.89048754037393, - 33.62976617895643 + -111.89047765451427, + 33.629766232915735 ], [ - -111.89050144300536, - 33.629739945742614 + -111.89049155714571, + 33.62973999970191 ] ] ], @@ -1167,24 +1167,24 @@ "coordinates": [ [ [ - -111.89034190188515, - 33.629678903383294 + -111.89034985658377, + 33.629678918671765 ], [ - -111.89037068244916, - 33.62969315403486 + -111.8903709719073, + 33.62968937418578 ], [ - -111.89038828323238, - 33.629668509023155 + -111.89038857269053, + 33.629664729174074 ], [ - -111.89035950266839, - 33.62965425837159 + -111.890367457367, + 33.62965427366006 ], [ - -111.89034190188515, - 33.629678903383294 + -111.89034985658377, + 33.629678918671765 ] ] ], @@ -1205,24 +1205,24 @@ "coordinates": [ [ [ - -111.8906971566729, - 33.629657504023584 + -111.89071739390138, + 33.6296580022478 ], [ - -111.89050377703165, - 33.629685453143196 + -111.89052037659214, + 33.62968647747061 ], [ - -111.89050966556076, - 33.6297137044349 + -111.89052626512124, + 33.62971472876231 ], [ - -111.89070304520199, - 33.629685755315286 + -111.89072328243049, + 33.629686253539504 ], [ - -111.8906971566729, - 33.629657504023584 + -111.89071739390138, + 33.6296580022478 ] ] ], @@ -1243,24 +1243,32 @@ "coordinates": [ [ [ - -111.89004534769684, - 33.62979691057736 + -111.89001523648943, + 33.62979774065129 + ], + [ + -111.89003809828243, + 33.62979498782758 + ], + [ + -111.89030924711832, + 33.62973653731339 ], [ - -111.89032323723524, - 33.629737005859994 + -111.89030061521727, + 33.629708778849974 ], [ - -111.89031460533418, - 33.629709247396576 + -111.89003130249647, + 33.62976683366262 ], [ - -111.89003671579577, - 33.62976915211395 + -111.89001030706045, + 33.6297693616559 ], [ - -111.89004534769684, - 33.62979691057736 + -111.89001523648943, + 33.62979774065129 ] ] ], @@ -1281,24 +1289,24 @@ "coordinates": [ [ [ - -111.8910401375713, - 33.628036084565544 + -111.89103588210456, + 33.628041467905206 ], [ - -111.89104945639541, - 33.62778932238384 + -111.89104540830166, + 33.62778921626388 ], [ - -111.89101503679795, - 33.6277884212635 + -111.89101098870421, + 33.62778831514354 ], [ - -111.89100571797384, - 33.628035183445206 + -111.89100146250709, + 33.62804056678487 ], [ - -111.8910401375713, - 33.628036084565544 + -111.89103588210456, + 33.628041467905206 ] ] ], @@ -1433,24 +1441,24 @@ "coordinates": [ [ [ - -111.89039904826716, - 33.6297069891998 + -111.89040882287983, + 33.62970696491812 ], [ - -111.89040602226429, - 33.62970961162186 + -111.89041662420883, + 33.62970989850549 ], [ - -111.89042019491265, - 33.629683479132076 + -111.89043079901732, + 33.629683766015695 ], [ - -111.8904132209155, - 33.62968085671002 + -111.89042299768832, + 33.62968083242833 ], [ - -111.89039904826716, - 33.6297069891998 + -111.89040882287983, + 33.62970696491812 ] ] ], @@ -1471,24 +1479,24 @@ "coordinates": [ [ [ - -111.89040602118422, - 33.62970961162186 + -111.89041662420883, + 33.62970989850549 ], [ - -111.89040373360083, - 33.62971032748194 + -111.89041205984273, + 33.62971132662834 ], [ - -111.89041584764016, - 33.62973716863722 + -111.89042417388205, + 33.62973816778362 ], [ - -111.89041813522354, - 33.62973645277715 + -111.89042873824815, + 33.62973673966077 ], [ - -111.89040602118422, - 33.62970961162186 + -111.89041662420883, + 33.62970989850549 ] ] ], @@ -1509,24 +1517,24 @@ "coordinates": [ [ [ - -111.89044404064732, - 33.629697536429475 + -111.89044236978259, + 33.62969446344725 ], [ - -111.89048896498322, - 33.629680605799265 + -111.89047919037054, + 33.62968058691351 ], [ - -111.89047476425311, - 33.62965448230269 + -111.89046498964042, + 33.629654463416934 ], [ - -111.8904298399172, - 33.62967141293291 + -111.89042816905247, + 33.629668339950676 ], [ - -111.89044404064732, - 33.629697536429475 + -111.89044236978259, + 33.62969446344725 ] ] ], @@ -1547,24 +1555,24 @@ "coordinates": [ [ [ - -111.89036808056606, - 33.629724990922156 + -111.89036833870225, + 33.62972865475874 ], [ - -111.89032886654809, - 33.6297413091143 + -111.89033804928367, + 33.62974125875228 ], [ - -111.89034426183308, - 33.629766957769014 + -111.89035344456866, + 33.629766907407 ], [ - -111.89038347585105, - 33.629750639576876 + -111.89038373398724, + 33.629754303413456 ], [ - -111.89036808056606, - 33.629724990922156 + -111.89036833870225, + 33.62972865475874 ] ] ], @@ -1585,24 +1593,24 @@ "coordinates": [ [ [ - -111.89038115910584, - 33.629720622916686 + -111.89037933379143, + 33.62971760839037 ], [ - -111.89038437662752, - 33.629719461892385 + -111.8903846682458, + 33.629715682942624 ], [ - -111.89037068352923, - 33.62969315313554 + -111.89037097082723, + 33.62968937418578 ], [ - -111.89036746600755, - 33.62969431415985 + -111.89036563637286, + 33.62969129963353 ], [ - -111.89038115910584, - 33.629720622916686 + -111.89037933379143, + 33.62971760839037 ] ] ], @@ -1623,24 +1631,24 @@ "coordinates": [ [ [ - -111.8903797928202, - 33.62969802566048 + -111.89038004987631, + 33.62970168859774 ], [ - -111.89036746708761, - 33.62969431415985 + -111.89037872679339, + 33.62970129019823 ], [ - -111.89035575483348, - 33.629721279421524 + -111.89036701453925, + 33.62972825545991 ], [ - -111.89036808056606, - 33.629724990922156 + -111.89036833762218, + 33.62972865385942 ], [ - -111.8903797928202, - 33.62969802566048 + -111.89038004987631, + 33.62970168859774 ] ] ], @@ -1661,24 +1669,24 @@ "coordinates": [ [ [ - -111.89049884112227, - 33.62974092510394 + -111.89051544068275, + 33.62974194943135 ], [ - -111.89058904189615, - 33.62976579314742 + -111.89060221440181, + 33.629765872287734 ], [ - -111.89059986633464, - 33.62973857247838 + -111.8906130388403, + 33.629738651618695 ], [ - -111.89050966556076, - 33.6297137044349 + -111.89052626512124, + 33.62971472876231 ], [ - -111.89049884112227, - 33.62974092510394 + -111.89051544068275, + 33.62974194943135 ] ] ], @@ -1699,32 +1707,32 @@ "coordinates": [ [ [ - -111.89032588448117, - 33.629682153531895 + -111.89031189436426, + 33.62968168498529 ], [ - -111.89013474166013, - 33.62962699183714 + -111.89013363135055, + 33.629630240187105 ], [ - -111.8901189834724, - 33.629624048357236 + -111.89009913614835, + 33.629623796547165 ], [ - -111.89011144675999, - 33.629652026255144 + -111.8900915972758, + 33.62965177444507 ], [ - -111.89012529106776, - 33.629654611805016 + -111.89012418507845, + 33.62965786195362 ], [ - -111.89031460641425, - 33.62970924649726 + -111.89030061629734, + 33.629708777950654 ], [ - -111.89032588448117, - 33.629682153531895 + -111.89031189436426, + 33.62968168498529 ] ] ], @@ -2522,8 +2530,8 @@ "coordinates": [ [ [ - -111.88976820340514, - 33.62898797790801 + -111.88977018640944, + 33.628947993166165 ], [ -111.88976579485417, @@ -2550,12 +2558,12 @@ 33.62903816995109 ], [ - -111.88986333144787, - 33.628991249640336 + -111.88986531445217, + 33.62895126489849 ], [ - -111.88976820340514, - 33.62898797790801 + -111.88977018640944, + 33.628947993166165 ] ] ], @@ -2652,8 +2660,8 @@ "coordinates": [ [ [ - -111.8910607787451, - 33.63025041422606 + -111.89106065561738, + 33.630261863490546 ], [ -111.89106160067662, @@ -2672,12 +2680,12 @@ 33.63017241695484 ], [ - -111.8909655729375, - 33.630249707359205 + -111.89096544980978, + 33.630261156623696 ], [ - -111.8910607787451, - 33.63025041422606 + -111.89106065561738, + 33.630261863490546 ] ] ], @@ -4641,20 +4649,20 @@ 33.629689371487814 ], [ - -111.89099165009205, - 33.62964404207714 + -111.89099158744811, + 33.62964747478805 ], [ - -111.89070304520199, - 33.629685755315286 + -111.89072328243049, + 33.629686253539504 ], [ - -111.8906971566729, - 33.629657504023584 + -111.89071739390138, + 33.6296580022478 ], [ - -111.89069997348946, - 33.629578261191824 + -111.89072021071794, + 33.62957875941604 ], [ -111.89099158096771, @@ -4812,16 +4820,16 @@ 33.62812140141603 ], [ - -111.89100571797384, - 33.628035183445206 + -111.89100146250709, + 33.62804056678487 ], [ - -111.8910401375713, - 33.628036084565544 + -111.89103588210456, + 33.628041467905206 ], [ - -111.89107171443057, - 33.628053389313585 + -111.89106745896382, + 33.62805877265325 ], [ -111.89106736823814, @@ -4957,16 +4965,16 @@ 33.63061694986964 ], [ - -111.89093257470914, - 33.63025791007238 + -111.89093245158142, + 33.630269358437545 ], [ - -111.8909655729375, - 33.63024970825853 + -111.89096544980978, + 33.630261156623696 ], [ - -111.8910607787451, - 33.63025041422606 + -111.89106065561738, + 33.630261863490546 ], [ -111.89104125328123, @@ -5130,16 +5138,16 @@ 33.62984687239408 ], [ - -111.89058835281296, - 33.62984506925409 + -111.89060152747875, + 33.629845148394395 ], [ - -111.89058904621642, - 33.62976579404675 + -111.89060221656194, + 33.629765873187054 ], [ - -111.89059986633464, - 33.62973857247838 + -111.8906130388403, + 33.629738651618695 ], [ -111.89091942272476, @@ -5265,32 +5273,32 @@ "coordinates": [ [ [ - -111.89069942265493, - 33.62957824770199 + -111.89069939889343, + 33.62957824680267 ], [ - -111.89069656047552, - 33.62965748873511 + -111.89069658423702, + 33.62965748963443 ], [ - -111.89048896390315, - 33.629680605799265 + -111.89047918929047, + 33.62968058691351 ], [ - -111.89047476533318, - 33.62965448230269 + -111.89046499072049, + 33.629654463416934 ], [ - -111.89047498566698, - 33.6295752052967 + -111.8904652110543, + 33.629575186410946 ], [ -111.89065167286192, 33.629536901387105 ], [ - -111.89069942265493, - 33.62957824770199 + -111.89069939889343, + 33.62957824680267 ] ] ], @@ -5316,36 +5324,36 @@ "coordinates": [ [ [ - -111.89057515438566, - 33.62976570951051 + -111.89060180073588, + 33.62976587048909 ], [ - -111.89057445882207, - 33.62984498471785 + -111.89060108357093, + 33.62984514569643 ], [ - -111.89061136797557, - 33.629801344233314 + -111.89060834486608, + 33.62980358983959 ], [ - -111.89058567100486, - 33.629820431436954 + -111.89058264789537, + 33.62982267704322 ], [ - -111.8904881603328, - 33.62984545416377 + -111.89047827447312, + 33.629845508123076 ], [ - -111.89048753821379, - 33.62976617895643 + -111.89047765235414, + 33.629766232915735 ], [ - -111.89050144300536, - 33.629739945742614 + -111.89049155714571, + 33.62973999970191 ], [ - -111.89057515438566, - 33.62976570951051 + -111.89060180073588, + 33.62976587048909 ] ] ], @@ -5550,32 +5558,32 @@ "coordinates": [ [ [ - -111.89050966664082, - 33.6297137044349 + -111.89052626512124, + 33.62971472876231 ], [ - -111.89049884112227, - 33.62974092510394 + -111.89051544068275, + 33.62974194943135 ], [ - -111.89041813630361, - 33.62973645277715 + -111.89042873608801, + 33.62973674056009 ], [ - -111.89040602010415, - 33.62970961162186 + -111.89041662636896, + 33.62970989760616 ], [ - -111.89042019491265, - 33.629683479132076 + -111.89043079793726, + 33.629683766015695 ], [ - -111.89050377703165, - 33.629685453143196 + -111.89052037659214, + 33.62968647747061 ], [ - -111.89050966664082, - 33.6297137044349 + -111.89052626512124, + 33.62971472876231 ] ] ], @@ -5601,40 +5609,40 @@ "coordinates": [ [ [ - -111.89044712532068, - 33.6297199888949 + -111.89044549009817, + 33.62972307446763 ], [ - -111.89043322268924, - 33.629746222108714 + -111.89043158746674, + 33.62974930768145 ], [ - -111.89041244110663, - 33.62973858596821 + -111.89041254911339, + 33.62974231275731 ], [ - -111.89038347585105, - 33.629750639576876 + -111.89038373398724, + 33.629754303413456 ], [ - -111.89036808056606, - 33.629724990922156 + -111.89036833870225, + 33.62972865475874 ], [ - -111.89037979174013, - 33.62969802566048 + -111.89038004879625, + 33.62970168859774 ], [ - -111.89040373360083, - 33.62971032748194 + -111.89041205984273, + 33.62971132662834 ], [ - -111.89041584764016, - 33.62973716863722 + -111.89042417388205, + 33.62973816778362 ], [ - -111.89044712532068, - 33.6297199888949 + -111.89044549009817, + 33.62972307446763 ] ] ], @@ -5661,40 +5669,40 @@ "coordinates": [ [ [ - -111.8904132209155, - 33.62968085671002 + -111.89042299768832, + 33.62968083242833 ], [ - -111.89039904826716, - 33.6297069891998 + -111.89040882287983, + 33.62970696491812 ], [ - -111.89038437770759, - 33.629719461892385 + -111.89038466716573, + 33.629715682942624 ], [ - -111.89037068244916, - 33.62969315313554 + -111.8903709719073, + 33.62968937418578 ], [ - -111.89038828323238, - 33.629668509023155 + -111.89038857269053, + 33.629664729174074 ], [ - -111.89040957352688, - 33.629679050872056 + -111.89040982626273, + 33.62967525303654 ], [ - -111.8904298399172, - 33.62967141293291 + -111.89042816905247, + 33.629668339950676 ], [ - -111.89044404064732, - 33.629697536429475 + -111.89044236978259, + 33.62969446344725 ], [ - -111.8904132209155, - 33.62968085671002 + -111.89042299768832, + 33.62968083242833 ] ] ], @@ -5720,32 +5728,36 @@ "coordinates": [ [ [ - -111.89038115910584, - 33.629720622916686 + -111.89037872679339, + 33.62970129019823 + ], + [ + -111.89036701453925, + 33.62972825545991 ], [ - -111.89035575483348, - 33.629721279421524 + -111.89030924711832, + 33.62973653731339 ], [ - -111.89032323723524, - 33.629737005859994 + -111.89030061521727, + 33.629708778849974 ], [ - -111.89031460533418, - 33.629709247396576 + -111.89031189436426, + 33.62968168498529 ], [ - -111.89032588448117, - 33.629682153531895 + -111.89036563637286, + 33.62969129963353 ], [ - -111.89036746708761, - 33.62969431415985 + -111.89037933379143, + 33.62971760839037 ], [ - -111.89038115910584, - 33.629720622916686 + -111.89037872679339, + 33.62970129019823 ] ] ], @@ -5906,32 +5918,32 @@ "coordinates": [ [ [ - -111.8903597230022, - 33.6295749813656 + -111.89036767770081, + 33.62957499665407 ], [ - -111.89035950050825, - 33.62965425837159 + -111.89036745520687, + 33.62965427366006 ], [ - -111.89034190188515, - 33.629678903383294 + -111.89034985658377, + 33.629678918671765 ], [ - -111.89018845342684, - 33.62965300201918 + -111.89019396501232, + 33.62965307216627 ], [ - -111.89018990287771, - 33.629573734006414 + -111.89019541446318, + 33.6295738041535 ], [ - -111.89021556312612, - 33.629554610829906 + -111.89022107471159, + 33.629554680977 ], [ - -111.8903597230022, - 33.6295749813656 + -111.89036767770081, + 33.62957499665407 ] ] ], @@ -6055,16 +6067,16 @@ 33.62976839758305 ], [ - -111.89032886654809, - 33.6297413091143 + -111.89033804928367, + 33.62974125875228 ], [ - -111.89034426183308, - 33.629766957769014 + -111.89035344456866, + 33.629766907407 ], [ - -111.89034488071188, - 33.62984623297636 + -111.89035406344746, + 33.62984618351367 ], [ -111.89018269990622, @@ -6269,28 +6281,28 @@ "coordinates": [ [ [ - -111.8901189834724, - 33.629624048357236 + -111.89009913614835, + 33.629623796547165 ], [ - -111.89011144675999, - 33.629652026255144 + -111.8900915972758, + 33.62965177444507 ], [ - -111.89005744769527, - 33.62965134187134 + -111.89003759929116, + 33.62965109006126 ], [ - -111.89005889714613, - 33.62957207385856 + -111.89003904874201, + 33.62957182204849 ], [ - -111.8901128940507, - 33.629572758242375 + -111.8900930456466, + 33.6295725064323 ], [ - -111.8901189834724, - 33.629624048357236 + -111.89009913614835, + 33.629623796547165 ] ] ], @@ -6408,16 +6420,16 @@ "coordinates": [ [ [ - -111.88989773700445, - 33.628990015770974 + -111.88989972000874, + 33.62895003012981 ], [ - -111.88986333252794, - 33.628991249640336 + -111.88986531553223, + 33.62895126579782 ], [ - -111.88976820340514, - 33.62898797790801 + -111.88977018640944, + 33.628947993166165 ], [ -111.8897649243196, @@ -6428,8 +6440,8 @@ 33.62878006822214 ], [ - -111.88989773700445, - 33.628990015770974 + -111.88989972000874, + 33.62895003012981 ] ] ], @@ -6656,8 +6668,8 @@ "coordinates": [ [ [ - -111.89003762845299, - 33.629848424623326 + -111.89001121971766, + 33.629848635064604 ], [ -111.8898558130966, @@ -6680,24 +6692,24 @@ 33.629748345407236 ], [ - -111.88985599994832, - 33.62979134917201 + -111.88985605287164, + 33.629787934447535 ], [ -111.88985664798894, 33.62974936164075 ], [ - -111.89003671903598, - 33.62976915121463 + -111.89001031030065, + 33.6297693616559 ], [ - -111.89004534769684, - 33.62979691057736 + -111.89001523648943, + 33.62979774065129 ], [ - -111.89003762845299, - 33.629848424623326 + -111.89001121971766, + 33.629848635064604 ] ] ], @@ -7353,24 +7365,24 @@ "coordinates": [ [ [ - -111.89101611902578, - 33.627759761679755 + -111.89101207093205, + 33.62775965555979 ], [ - -111.89105053862323, - 33.62776066280009 + -111.8910464905295, + 33.62776055668013 ], [ - -111.89104945639541, - 33.62778932238384 + -111.89104540830166, + 33.62778921626388 ], [ - -111.89101503679795, - 33.6277884212635 + -111.89101098870421, + 33.62778831514354 ], [ - -111.89101611902578, - 33.627759761679755 + -111.89101207093205, + 33.62775965555979 ] ] ], diff --git a/tests/src/kingsway_junction/geometry.json b/tests/src/kingsway_junction/geometry.json index 5b491dde..d8644fbc 100644 --- a/tests/src/kingsway_junction/geometry.json +++ b/tests/src/kingsway_junction/geometry.json @@ -135,8 +135,8 @@ "coordinates": [ [ [ - -2.306626300518575, - 53.4461631919987 + -2.3066258143134193, + 53.446170122170614 ], [ -2.306627990156988, @@ -163,12 +163,12 @@ 53.446142043552975 ], [ - -2.3065668838326405, - 53.446161715312705 + -2.306566397627485, + 53.44616864368597 ], [ - -2.306626300518575, - 53.4461631919987 + -2.3066258143134193, + 53.446170122170614 ] ] ], @@ -4557,24 +4557,24 @@ "coordinates": [ [ [ - -2.307563972830267, - 53.445614732653475 + -2.307581207444073, + 53.445599937015224 ], [ - -2.30754490211252, - 53.445631104802416 + -2.3075704580822642, + 53.44560916585304 ], [ - -2.3076488261995878, - 53.44567404740675 + -2.3076743851892396, + 53.44565210665873 ], [ - -2.3076678969173345, - 53.445657675257806 + -2.3076851345510483, + 53.445642877820916 ], [ - -2.307563972830267, - 53.445614732653475 + -2.307581207444073, + 53.445599937015224 ] ] ], @@ -4595,24 +4595,24 @@ "coordinates": [ [ [ - -2.30751670674336, - 53.445690690251475 + -2.3075118748908823, + 53.445688932977156 ], [ - -2.3074456468029085, - 53.44576001085638 + -2.307440814950431, + 53.44575825358206 ], [ - -2.307499624634898, - 53.44577963944868 + -2.3074947927824203, + 53.445777882174355 ], [ - -2.307570684575349, - 53.44571031884377 + -2.3075658527228717, + 53.44570856156945 ], [ - -2.30751670674336, - 53.445690690251475 + -2.3075118748908823, + 53.445688932977156 ] ] ], @@ -4759,12 +4759,12 @@ 53.44564061512788 ], [ - -2.3076420827454736, - 53.445656515133 + -2.3076743836792857, + 53.445652107558054 ], [ - -2.3076488261995878, - 53.44567404650743 + -2.3076811271334, + 53.44566963893248 ], [ -2.3077767947925465, @@ -4801,32 +4801,32 @@ "coordinates": [ [ [ - -2.306229184153034, - 53.446664879428404 + -2.306179724103111, + 53.44670632196438 ], [ - -2.306253032364918, - 53.446647468563064 + -2.306257574306247, + 53.44664948664064 ], [ - -2.3068831376370165, - 53.446106323400066 + -2.3068882911096744, + 53.446107815374525 ], [ - -2.3068587035630195, - 53.44609623121355 + -2.3068638570356774, + 53.44609772318802 ], [ - -2.3062292505910054, - 53.44663681699855 + -2.306233792532334, + 53.44663883507612 ], [ - -2.3062061452764397, - 53.44665368467366 + -2.3061566852265165, + 53.44669512720964 ], [ - -2.306229184153034, - 53.446664879428404 + -2.306179724103111, + 53.44670632196438 ] ] ], @@ -4961,32 +4961,32 @@ "coordinates": [ [ [ - -2.307530257069651, - 53.44559426589349 + -2.307547493193411, + 53.4455794684566 ], [ - -2.3074492737121743, - 53.44564158999245 + -2.3074450020525936, + 53.44563936147363 ], [ - -2.3070621245523224, - 53.445949574350706 + -2.307056493934232, + 53.445948425917074 ], [ - -2.307100664615646, - 53.445966758587005 + -2.3070950339975558, + 53.44596561015338 ], [ - -2.307485615282621, - 53.445660522509854 + -2.30748134362304, + 53.44565829399104 ], [ - -2.307563974340221, - 53.445614732653475 + -2.3075812104639803, + 53.445599935216585 ], [ - -2.307530257069651, - 53.44559426589349 + -2.307547493193411, + 53.4455794684566 ] ] ], @@ -5007,24 +5007,24 @@ "coordinates": [ [ [ - -2.3066959305326833, - 53.4461885906381 + -2.306695444327528, + 53.446195519910695 ], [ - -2.306798204240139, - 53.44608912927122 + -2.306803492098694, + 53.44609044318002 ], [ - -2.306728574226031, - 53.44606373063182 + -2.306733862084586, + 53.44606504454061 ], [ - -2.306626300518575, - 53.4461631919987 + -2.3066258143134193, + 53.446170121271294 ], [ - -2.3066959305326833, - 53.4461885906381 + -2.306695444327528, + 53.446195519910695 ] ] ], @@ -5419,24 +5419,24 @@ "coordinates": [ [ [ - -2.3070165692431828, - 53.446028833358135 + -2.307010934095231, + 53.44602768402518 ], [ - -2.307021165542852, - 53.4460297704512 + -2.3070211610129903, + 53.44602976955188 ], [ - -2.307066717832084, - 53.44595051144376 + -2.307066722361945, + 53.44595051234309 ], [ - -2.3070621215324145, - 53.445949574350706 + -2.307056495444186, + 53.44594842681639 ], [ - -2.3070165692431828, - 53.446028833358135 + -2.307010934095231, + 53.44602768402518 ] ] ], @@ -5999,8 +5999,8 @@ "coordinates": [ [ [ - -2.3067772581596495, - 53.44599420048499 + -2.306778866260552, + 53.44599459978376 ], [ -2.3065707689440234, @@ -6019,12 +6019,12 @@ 53.446014507165735 ], [ - -2.306728574226031, - 53.44606373063182 + -2.3067301823269335, + 53.44606412993059 ], [ - -2.3067772581596495, - 53.44599420048499 + -2.306778866260552, + 53.44599459978376 ] ] ], @@ -6121,24 +6121,24 @@ "coordinates": [ [ [ - -2.306206143766486, - 53.44665368467366 + -2.3061566852265165, + 53.44669512720964 ], [ - -2.3066121507405852, + -2.306612152250539, 53.44631349381182 ], [ - -2.306479048304369, + -2.306479046794415, 53.44625714232308 ], [ - -2.3060730413302695, - 53.446597333184926 + -2.3060235797703927, + 53.4466387757209 ], [ - -2.306206143766486, - 53.44665368467366 + -2.3061566852265165, + 53.44669512720964 ] ] ], @@ -8268,16 +8268,16 @@ 53.445432476146806 ], [ - -2.3076678969173345, - 53.445657674358486 + -2.3076851330410943, + 53.445642878720236 ], [ - -2.307563972830267, - 53.4456147335528 + -2.3075812089540264, + 53.445599936115904 ], [ - -2.307530257069651, - 53.44559426589349 + -2.307547493193411, + 53.4455794684566 ], [ -2.3078503295474384, @@ -8708,28 +8708,28 @@ "coordinates": [ [ [ - -2.3076488261995878, - 53.44567404740675 + -2.3075658527228717, + 53.44570856156945 ], [ - -2.307570684575349, - 53.44571031884377 + -2.3075118748908823, + 53.445688932977156 ], [ - -2.30751670674336, - 53.445690690251475 + -2.3075704580822642, + 53.44560916585304 ], [ - -2.30754490211252, - 53.445631104802416 + -2.3076743851892396, + 53.44565210665873 ], [ - -2.3076420827454736, - 53.445656515133 + -2.3076811271334, + 53.44566963893248 ], [ - -2.3076488261995878, - 53.44567404740675 + -2.3075658527228717, + 53.44570856156945 ] ] ], @@ -8978,8 +8978,8 @@ "coordinates": [ [ [ - -2.3074835390960096, - 53.44579533260984 + -2.3074841702567395, + 53.445788245056654 ], [ -2.307475996876283, @@ -8994,16 +8994,16 @@ 53.44583159235569 ], [ - -2.3074456468029085, - 53.44576001085638 + -2.307440814950431, + 53.44575825358206 ], [ - -2.307499624634898, - 53.44577963944868 + -2.3074947927824203, + 53.445777882174355 ], [ - -2.3074835390960096, - 53.44579533260984 + -2.3074841702567395, + 53.445788245056654 ] ] ], @@ -9738,8 +9738,8 @@ "coordinates": [ [ [ - -2.3070165692431828, - 53.446028833358135 + -2.307010934095231, + 53.44602768402518 ], [ -2.306985150122448, @@ -9754,16 +9754,16 @@ 53.445939599076 ], [ - -2.3070621245523224, - 53.445949574350706 + -2.307056495444186, + 53.44594842681639 ], [ - -2.307100664615646, - 53.445966758587005 + -2.3070950339975558, + 53.44596561015338 ], [ - -2.3070165692431828, - 53.446028833358135 + -2.307010934095231, + 53.44602768402518 ] ] ], @@ -9969,12 +9969,16 @@ 53.44612175485865 ], [ - -2.3068831376370165, - 53.446106323400066 + -2.3068882911096744, + 53.446107815374525 + ], + [ + -2.3068638570356774, + 53.44609772318802 ], [ - -2.3068587035630195, - 53.44609623121355 + -2.3068584061021014, + 53.44609614487869 ], [ -2.3069198914248776, @@ -10129,23 +10133,23 @@ 53.44609557650746 ], [ - -2.3068064546282447, - 53.44608110642361 + -2.306811570352055, + 53.44608258760622 ], [ - -2.306798204240139, - 53.44608912927122 + -2.306803492098694, + 53.44609044318002 ], [ - -2.306728574226031, - 53.44606373063182 + -2.306733862084586, + 53.44606504454061 ], [ - -2.3067772581596495, - 53.44599420048499 + -2.3067301823269335, + 53.44606412993059 ], [ - -2.3067788647505982, + -2.306778866260552, 53.44599459978376 ], [ @@ -10359,16 +10363,16 @@ 53.44625714232308 ], [ - -2.3065668838326405, - 53.446161715312705 + -2.306566397627485, + 53.44616864368597 ], [ - -2.306626300518575, - 53.4461631919987 + -2.3066258143134193, + 53.446170122170614 ], [ - -2.3066959305326833, - 53.4461885906381 + -2.306695444327528, + 53.446195519910695 ], [ -2.306612152250539, @@ -11243,16 +11247,16 @@ 53.4468509418639 ], [ - -2.3060730413302695, - 53.446597333184926 + -2.3060235797703927, + 53.4466387757209 ], [ - -2.306206143766486, - 53.44665368467366 + -2.3061566852265165, + 53.44669512720964 ], [ - -2.306229184153034, - 53.446664879428404 + -2.306179724103111, + 53.44670632196438 ], [ -2.3059032288948553, diff --git a/tests/src/leeds_cycleway/geometry.json b/tests/src/leeds_cycleway/geometry.json index 0b2b5c25..976961b5 100644 --- a/tests/src/leeds_cycleway/geometry.json +++ b/tests/src/leeds_cycleway/geometry.json @@ -17949,8 +17949,8 @@ "coordinates": [ [ [ - -1.5353262492166742, - 53.79888252781914 + -1.5353279270599156, + 53.798891358258565 ], [ -1.5353230579649189, @@ -17969,12 +17969,12 @@ 53.79886566553792 ], [ - -1.5352884231390933, - 53.79888503512794 + -1.5352901009823348, + 53.798893865567365 ], [ - -1.5353262492166742, - 53.79888252781914 + -1.5353279270599156, + 53.798891358258565 ] ] ], @@ -17995,24 +17995,24 @@ "coordinates": [ [ [ - -1.5353729364990336, - 53.79889038339388 + -1.5353746143422753, + 53.79889921383331 ], [ - -1.535421919777408, - 53.79878883828673 + -1.5354273248078143, + 53.798789941754414 ], [ - -1.5353752324950485, - 53.79878098181267 + -1.5353806375254546, + 53.79878208528035 ], [ - -1.5353262492166742, - 53.79888252691981 + -1.5353279270599156, + 53.798891357359246 ], [ - -1.5353729364990336, - 53.79889038339388 + -1.5353746143422753, + 53.79889921383331 ] ] ], @@ -18033,56 +18033,56 @@ "coordinates": [ [ [ - -1.5350100381899285, - 53.79926426558419 + -1.534994782301289, + 53.799272946736224 ], [ - -1.5350418943733621, - 53.799254134725636 + -1.5350450917152927, + 53.799256947803805 ], [ - -1.5351184600547898, - 53.7992169729558 + -1.5351223547217698, + 53.79921944878834 ], [ - -1.5353130487621327, - 53.79909642787984 + -1.5353176864304756, + 53.79909844236037 ], [ - -1.535504380748338, - 53.798892200023644 + -1.535509656362523, + 53.798893534616994 ], [ - -1.5355196625202217, - 53.798863278738224 + -1.535524836123974, + 53.79886480398776 ], [ - -1.5354733223778432, - 53.7988547351824 + -1.5354784959815952, + 53.79885626223059 ], [ - -1.535459514428335, - 53.79888086857066 + -1.5354647900425202, + 53.79888220136537 ], [ - -1.5352735966077986, - 53.7990793155872 + -1.5352782342761415, + 53.79908133006773 ], [ - -1.535085359953091, - 53.7991959270302 + -1.535089254620071, + 53.79919840286274 ], [ - -1.535014726102216, - 53.799230209172066 + -1.5350179234441466, + 53.799233022250235 ], [ - -1.5349870264632919, - 53.79923901802777 + -1.5349717705746524, + 53.7992476991798 ], [ - -1.5350100381899285, - 53.79926426558419 + -1.534994782301289, + 53.799272946736224 ] ] ], @@ -18179,12 +18179,12 @@ "coordinates": [ [ [ - -1.535010041235016, - 53.799264262886226 + -1.5349947868689202, + 53.79927294493758 ], [ - -1.5352120462530938, - 53.79914930979238 + -1.5352120432080063, + 53.79914931249034 ], [ -1.535362810060377, @@ -18195,16 +18195,16 @@ 53.79895578746128 ], [ - -1.5350832999513613, - 53.799087517400785 + -1.535083302996449, + 53.79908751470282 ], [ - -1.53489579564021, - 53.79919421831904 + -1.5348805382290267, + 53.79920290037039 ], [ - -1.535010041235016, - 53.799264262886226 + -1.5349947868689202, + 53.79927294493758 ] ] ], @@ -22473,48 +22473,48 @@ "coordinates": [ [ [ - -1.5378945750240525, - 53.798783755320684 + -1.5378953515213785, + 53.7987804143407 ], [ - -1.5368300291635746, - 53.79869753735267 + -1.536831359866835, + 53.79869424133877 ], [ - -1.5365601598017513, - 53.79864272279787 + -1.536561361088791, + 53.79863940070364 ], [ - -1.5365131269019545, - 53.798640177717566 + -1.5365130172788026, + 53.79863678547624 ], [ - -1.5364012245020204, - 53.798648912828895 + -1.5364013265124534, + 53.798645504399786 ], [ - -1.5364051526649636, - 53.79866646938644 + -1.5364052546753966, + 53.798663060957324 ], [ - -1.5365137267842024, - 53.79865799327975 + -1.536513620206138, + 53.79865460103842 ], [ - -1.536553822974554, - 53.79866016424224 + -1.536555027306681, + 53.79865684214801 ], [ - -1.5368230528679911, - 53.79871484749608 + -1.5368243835712516, + 53.79871155148218 ], [ - -1.5378905006969068, - 53.798801301086364 + -1.5378912771942328, + 53.79879796010638 ], [ - -1.5378945750240525, - 53.798783755320684 + -1.5378953515213785, + 53.7987804143407 ] ] ], @@ -34887,16 +34887,16 @@ 53.79881560569677 ], [ - -1.5378905006969068, - 53.798801301086364 + -1.5378912771942328, + 53.79879796010638 ], [ - -1.5378945750240525, - 53.798783755320684 + -1.5378953515213785, + 53.7987804143407 ], [ - -1.5379167234683677, - 53.798785549467404 + -1.537916878767833, + 53.798782158125405 ], [ -1.5379176156790209, @@ -41862,8 +41862,8 @@ "coordinates": [ [ [ - -1.5363984793555916, - 53.79866699009368 + -1.536398435201822, + 53.798667112401425 ], [ -1.5362745153638608, @@ -41878,16 +41878,16 @@ 53.798634187335956 ], [ - -1.5364012245020204, - 53.798648912828895 + -1.5364013265124534, + 53.798645504399786 ], [ - -1.5364051526649636, - 53.79866646938644 + -1.5364052546753966, + 53.798663060957324 ], [ - -1.5363984793555916, - 53.79866699009368 + -1.536398435201822, + 53.798667112401425 ] ] ], @@ -45646,16 +45646,16 @@ 53.798866217721425 ], [ - -1.5355196625202217, - 53.798863278738224 + -1.535524836123974, + 53.79886480398776 ], [ - -1.5354733223778432, - 53.7988547351824 + -1.5354784959815952, + 53.79885626223059 ], [ - -1.5354740455861369, - 53.79885336641483 + -1.5354795023830314, + 53.798854357467306 ], [ -1.5354719292502876, @@ -45909,12 +45909,12 @@ 53.79879329262694 ], [ - -1.535421919777408, - 53.79878883828673 + -1.5354273248078143, + 53.798789941754414 ], [ - -1.5353752324950485, - 53.79878098181267 + -1.5353806375254546, + 53.79878208528035 ], [ -1.5353613484183515, @@ -46359,16 +46359,16 @@ 53.79895578746128 ], [ - -1.5352884231390933, - 53.79888503512794 + -1.5352901009823348, + 53.798893865567365 ], [ - -1.5353262492166742, - 53.79888252781914 + -1.5353279270599156, + 53.798891358258565 ], [ - -1.5353729364990336, - 53.79889038339388 + -1.5353746143422753, + 53.79889921383331 ], [ -1.535362810060377, @@ -48080,16 +48080,16 @@ 53.79927706832741 ], [ - -1.53489579564021, - 53.79919421831904 + -1.5348805382290267, + 53.79920290037039 ], [ - -1.5349870264632919, - 53.79923901802777 + -1.5349717705746524, + 53.7992476991798 ], [ - -1.535010041235016, - 53.799264262886226 + -1.5349947868689202, + 53.79927294493758 ], [ -1.5348285509717816, diff --git a/tests/src/perth_peanut_roundabout/geometry.json b/tests/src/perth_peanut_roundabout/geometry.json index ff68a19d..73d704ab 100644 --- a/tests/src/perth_peanut_roundabout/geometry.json +++ b/tests/src/perth_peanut_roundabout/geometry.json @@ -1421,48 +1421,48 @@ "coordinates": [ [ [ - 115.90101379863036, - -31.981449851732673 + 115.90101168659761, + -31.98144332085829 ], [ - 115.90097271047533, - -31.981415236839396 + 115.90097573751021, + -31.98141303529981 ], [ - 115.90093359545932, - -31.98136975544169 + 115.9009364358889, + -31.981367336266246 ], [ - 115.90089207683978, - -31.98134426596598 + 115.90089499996944, + -31.98134189715255 ], [ - 115.90087094378929, - -31.98131701202104 + 115.90087426557572, + -31.98131515851896 ], [ - 115.90084270065266, - -31.9813327681377 + 115.9008460224391, + -31.981330916434263 ], [ - 115.90086723924993, - -31.98136441257131 + 115.90087015813856, + -31.981362041959237 ], [ - 115.90090944067524, - -31.98139032113095 + 115.90091228110481, + -31.9813879019555 ], [ - 115.90094698438976, - -31.981433976905546 + 115.90095001142464, + -31.98143177536596 ], [ - 115.9009899767671, - -31.981470196188784 + 115.90098786473435, + -31.9814636653144 ], [ - 115.90101379863036, - -31.981449851732673 + 115.90101168659761, + -31.98144332085829 ] ] ], @@ -1491,12 +1491,12 @@ -31.98139933143533 ], [ - 115.90101379969062, - -31.981449853531316 + 115.90101168765787, + -31.981443321757613 ], [ - 115.90107900127968, - -31.981434683772424 + 115.90107688924695, + -31.98142815199872 ], [ 115.90106137025938, @@ -2384,16 +2384,16 @@ -31.98130377490454 ], [ - 115.90086276390345, - -31.98130646297718 + 115.90086689466628, + -31.981305653587626 ], [ - 115.90087094378929, - -31.98131701202104 + 115.90087426557572, + -31.98131515851896 ], [ - 115.90084270065266, - -31.9813327681377 + 115.9008460224391, + -31.981330916434263 ], [ 115.90084759480082, @@ -2588,16 +2588,16 @@ "coordinates": [ [ [ - 115.9009899767671, - -31.981470196188784 + 115.90098786473435, + -31.9814636653144 ], [ - 115.90101379863036, - -31.981449851732673 + 115.90101168659761, + -31.98144332085829 ], [ - 115.90107900127968, - -31.981434683772424 + 115.90107688924695, + -31.98142815199872 ], [ 115.901094342144, @@ -2612,8 +2612,8 @@ -31.98153245083602 ], [ - 115.9009899767671, - -31.981470196188784 + 115.90098786473435, + -31.9814636653144 ] ] ], diff --git a/tests/src/roosevelt_cycletrack/geometry.json b/tests/src/roosevelt_cycletrack/geometry.json index 670b201e..1f6c415e 100644 --- a/tests/src/roosevelt_cycletrack/geometry.json +++ b/tests/src/roosevelt_cycletrack/geometry.json @@ -1974,48 +1974,48 @@ "coordinates": [ [ [ - -122.31749514964814, - 47.661671898844105 + -122.31749015615286, + 47.66167165332931 ], [ - -122.31750418734055, - 47.66158798494282 + -122.31749921253748, + 47.661587566758264 ], [ - -122.3175332203766, - 47.66147726136485 + -122.31752830699088, + 47.661476608457356 ], [ - -122.31755785005775, - 47.661398589609256 + -122.31755300743545, + 47.66139771097204 ], [ - -122.31756553523391, - 47.661382756152896 + -122.31756028538807, + 47.66138271658274 ], [ - -122.3175096000758, - 47.66137043724541 + -122.31750435022995, + 47.661370399473896 ], [ - -122.31750092421154, - 47.66138831036319 + -122.31749608158924, + 47.661387435323256 ], [ - -122.31747544269885, - 47.66146970706328 + -122.31747052931313, + 47.66146905415579 ], [ - -122.3174457127097, - 47.66158308903594 + -122.31744073790665, + 47.661582670851395 ], [ - -122.3174364560512, - 47.661669030008156 + -122.31743146255592, + 47.66166878449335 ], [ - -122.31749514964814, - 47.661671898844105 + -122.31749015615286, + 47.66167165332931 ] ] ], @@ -2464,32 +2464,32 @@ "coordinates": [ [ [ - -122.31759081780788, - 47.661542997278325 + -122.31759356423028, + 47.66153136904984 ], [ - -122.3177085147587, - 47.661378139935046 + -122.31770423290325, + 47.661376357479604 ], [ - -122.31771640688453, - 47.66137125382944 + -122.31771006888397, + 47.661371265520614 ], [ - -122.31769559442345, - 47.66136043139311 + -122.31768925642288, + 47.66136044308429 ], [ - -122.31768601999707, - 47.6613687851916 + -122.31768173814162, + 47.66136700273616 ], [ - -122.31756712407332, - 47.661535322467664 + -122.31756987049572, + 47.66152369423917 ], [ - -122.31759081780788, - 47.661542997278325 + -122.31759356423028, + 47.66153136904984 ] ] ], @@ -2968,24 +2968,24 @@ "coordinates": [ [ [ - -122.31751174701174, - 47.66123381860085 + -122.31750649583074, + 47.661233780829335 ], [ - -122.31719004975676, + -122.3171900484216, 47.66123152892801 ], [ - -122.31718790549114, + -122.31718790682629, 47.661368146673254 ], [ - -122.31750960274611, - 47.66137043634608 + -122.31750435423544, + 47.661370398574576 ], [ - -122.31751174701174, - 47.66123381860085 + -122.31750649583074, + 47.661233780829335 ] ] ], @@ -3329,12 +3329,12 @@ 47.66124555204996 ], [ - -122.31776188908152, - 47.66124561320383 + -122.31775555108096, + 47.66124562489501 ], [ - -122.31776235505208, - 47.661360309085374 + -122.31775601838667, + 47.66136032077655 ], [ -122.3177953428296, @@ -3947,8 +3947,8 @@ "coordinates": [ [ [ - -122.31756712407332, - 47.661535322467664 + -122.31756987049572, + 47.66152369423917 ], [ -122.31759119165245, @@ -3975,12 +3975,12 @@ 47.66142896239817 ], [ - -122.31754075200946, - 47.66153249679915 + -122.31754349843187, + 47.66152086857066 ], [ - -122.31756712407332, - 47.661535322467664 + -122.31756987049572, + 47.66152369423917 ] ] ], @@ -4093,24 +4093,24 @@ "coordinates": [ [ [ - -122.31769513779902, - 47.66124573641089 + -122.31768882516647, + 47.661245748102075 ], [ - -122.31768711349243, + -122.31768713485498, 47.66124575080004 ], [ - -122.31768756744654, + -122.31768753807305, 47.661360446681584 ], [ - -122.31769559175314, - 47.66136043229243 + -122.31768922838454, + 47.66136044398362 ], [ - -122.31769513779902, - 47.66124573641089 + -122.31768882516647, + 47.661245748102075 ] ] ], @@ -6807,28 +6807,28 @@ "coordinates": [ [ [ - -122.31776235505208, - 47.661360309085374 + -122.31775601838667, + 47.66136032077655 ], [ - -122.31771640688453, - 47.66137125382944 + -122.31771006888397, + 47.661371265520614 ], [ - -122.31769559575861, - 47.66136043229243 + -122.31768925642288, + 47.66136044308429 ], [ - -122.31769513379353, - 47.66124573641089 + -122.31768880246877, + 47.661245748102075 ], [ - -122.31776188908152, - 47.66124561320383 + -122.31775555108096, + 47.66124562489501 ], [ - -122.31776235505208, - 47.661360309085374 + -122.31775601838667, + 47.66136032077655 ] ] ], @@ -7068,11 +7068,11 @@ 47.66128879682916 ], [ - -122.31768711349243, + -122.31768713485498, 47.66124575080004 ], [ - -122.31768756744654, + -122.31768753807305, 47.661360446681584 ], [ @@ -7111,20 +7111,20 @@ 47.66136000781263 ], [ - -122.31757662373079, - 47.66135991518251 + -122.31757136720915, + 47.66135988910218 ], [ - -122.31756553523391, - 47.661382756152896 + -122.31756028538807, + 47.66138271658274 ], [ - -122.3175096000758, - 47.66137043724541 + -122.31750435022995, + 47.661370399473896 ], [ - -122.31751174701174, - 47.66123381860085 + -122.31750649583074, + 47.661233780829335 ], [ -122.31756395574061, @@ -7178,16 +7178,16 @@ 47.66164393623712 ], [ - -122.31754075200946, - 47.66153249679915 + -122.31754349843187, + 47.66152086857066 ], [ - -122.31756712407332, - 47.661535322467664 + -122.31756987049572, + 47.66152369423917 ], [ - -122.31759081780788, - 47.661542997278325 + -122.31759356423028, + 47.66153136904984 ], [ -122.31754518740821, @@ -7505,12 +7505,12 @@ 47.661712552677734 ], [ - -122.3174364560512, - 47.661669030008156 + -122.31743146255592, + 47.66166878449335 ], [ - -122.31749514964814, - 47.661671898844105 + -122.31749015615286, + 47.66167165332931 ], [ -122.31745403208646, @@ -8982,15 +8982,15 @@ 47.661231486659894 ], [ - -122.31719004975676, + -122.3171900484216, 47.66123152892801 ], [ - -122.31718790549114, + -122.31718790682629, 47.661368146673254 ], [ - -122.31715480956572, + -122.31715481223604, 47.66136791105099 ], [ diff --git a/tests/src/seattle_slip_lane/geometry.json b/tests/src/seattle_slip_lane/geometry.json index 35ef73ac..62d4871e 100644 --- a/tests/src/seattle_slip_lane/geometry.json +++ b/tests/src/seattle_slip_lane/geometry.json @@ -233,48 +233,48 @@ "coordinates": [ [ [ - -122.31749515200504, - 47.66167189910386 + -122.31749015813293, + 47.66167165358903 ], [ - -122.31750419037945, - 47.661587985193755 + -122.31749921520098, + 47.661587567009164 ], [ - -122.31753322560647, - 47.66147725530891 + -122.3175283105147, + 47.661476607797276 ], [ - -122.31755785180523, - 47.66139858894098 + -122.31755300881748, + 47.661397710303675 ], [ - -122.31756553756134, - 47.661382754583634 + -122.31756028731932, + 47.66138271681213 ], [ - -122.31750959818214, - 47.6613704374735 + -122.31750434794013, + 47.66137039970199 ], [ - -122.31750092166317, - 47.66138831149248 + -122.31749607867543, + 47.66138743645246 ], [ - -122.31747544089806, - 47.66146971359705 + -122.3174705284768, + 47.66146905529356 ], [ - -122.31744571133588, - 47.66158308928637 + -122.31744073615741, + 47.661582671101776 ], [ - -122.31743645397884, - 47.6616690302676 + -122.31743146010673, + 47.66166878475278 ], [ - -122.31749515200504, - 47.66167189910386 + -122.31749015813293, + 47.66167165358903 ] ] ], @@ -495,32 +495,32 @@ "coordinates": [ [ [ - -122.31759082070798, - 47.66154299662522 + -122.31759356733764, + 47.66153136749619 ], [ - -122.31770851852912, - 47.661378136566654 + -122.31770423501528, + 47.661376356808994 ], [ - -122.31771640858, - 47.66137125225897 + -122.31771007010114, + 47.66137126574879 ], [ - -122.31769559454833, - 47.66136043162015 + -122.31768925606947, + 47.66136044331134 ], [ - -122.31768601939942, - 47.66136878721816 + -122.3176817385561, + 47.661367002064566 ], [ - -122.31756712518539, - 47.66153532181375 + -122.31756987181505, + 47.66152369268472 ], [ - -122.31759082070798, - 47.66154299662522 + -122.31759356733764, + 47.66153136749619 ] ] ], @@ -541,8 +541,8 @@ "coordinates": [ [ [ - -122.31751174661535, - 47.66123381881459 + -122.31750649637334, + 47.66123378104308 ], [ -122.31719005178901, @@ -553,12 +553,12 @@ 47.661368146001784 ], [ - -122.31750960218793, - 47.661370436574174 + -122.3175043519459, + 47.66137039880267 ], [ - -122.31751174661535, - 47.66123381881459 + -122.31750649637334, + 47.66123378104308 ] ] ], @@ -588,12 +588,12 @@ 47.66124555226494 ], [ - -122.31776189420927, - 47.661245613418814 + -122.31775555573041, + 47.66124562511 ], [ - -122.31776236155024, - 47.6613603093124 + -122.31775602307138, + 47.661360321003585 ], [ -122.31779534247033, @@ -748,8 +748,8 @@ "coordinates": [ [ [ - -122.31756712518539, - 47.66153532181375 + -122.31756987181505, + 47.66152369268472 ], [ -122.31759119191024, @@ -776,12 +776,12 @@ 47.66142896353173 ], [ - -122.3175407511314, - 47.661532496144936 + -122.31754349776106, + 47.66152086701591 ], [ - -122.31756712518539, - 47.66153532181375 + -122.31756987181505, + 47.66152369268472 ] ] ], @@ -1130,24 +1130,24 @@ "coordinates": [ [ [ - -122.31769513788943, - 47.66124573662589 + -122.31768882478052, + 47.66124574831707 ], [ - -122.3176871129773, + -122.31768713434145, 47.66124575101504 ], [ - -122.31768756696567, + -122.31768753758996, 47.661360446908624 ], [ - -122.31769559187781, - 47.66136043251947 + -122.31768922802901, + 47.66136044421066 ], [ - -122.31769513788943, - 47.66124573662589 + -122.31768882478052, + 47.66124574831707 ] ] ], @@ -2185,28 +2185,28 @@ "coordinates": [ [ [ - -122.31776236155024, - 47.6613603093124 + -122.31775602307138, + 47.661360321003585 ], [ - -122.31771640858, - 47.66137125225897 + -122.31771007010114, + 47.66137126574879 ], [ - -122.31769559588359, - 47.66136043251947 + -122.31768925606947, + 47.66136044331134 ], [ - -122.31769513388366, - 47.66124573662589 + -122.31768880208111, + 47.66124574831707 ], [ - -122.31776189420927, - 47.661245613418814 + -122.31775555573041, + 47.66124562511 ], [ - -122.31776236155024, - 47.6613603093124 + -122.31775602307138, + 47.661360321003585 ] ] ], @@ -2350,11 +2350,11 @@ 47.66128879614936 ], [ - -122.3176871129773, + -122.31768713434145, 47.66124575101504 ], [ - -122.31768756696567, + -122.31768753758996, 47.661360446908624 ], [ @@ -2393,20 +2393,20 @@ 47.66136000803963 ], [ - -122.31757662555974, - 47.66135991540949 + -122.31757136864142, + 47.66135988932916 ], [ - -122.31756553756134, - 47.661382754583634 + -122.31756028731932, + 47.66138271681213 ], [ - -122.31750959818214, - 47.6613704374735 + -122.31750434794013, + 47.66137039970199 ], [ - -122.31751174661535, - 47.66123381881459 + -122.31750649637334, + 47.66123378104308 ], [ -122.3175639566136, @@ -2460,16 +2460,16 @@ 47.66164394278918 ], [ - -122.3175407511314, - 47.661532496144936 + -122.31754349776106, + 47.66152086701591 ], [ - -122.31756712518539, - 47.66153532181375 + -122.31756987181505, + 47.66152369268472 ], [ - -122.31759082070798, - 47.66154299662522 + -122.31759356733764, + 47.66153136749619 ], [ -122.31754518820011, @@ -2506,12 +2506,12 @@ 47.66171255294175 ], [ - -122.31743645397884, - 47.6616690302676 + -122.31743146010673, + 47.66166878475278 ], [ - -122.31749515200504, - 47.66167189910386 + -122.31749015813293, + 47.66167165358903 ], [ -122.31745403000521, diff --git a/tests/src/taipei/geometry.json b/tests/src/taipei/geometry.json index 07983156..42d836d3 100644 --- a/tests/src/taipei/geometry.json +++ b/tests/src/taipei/geometry.json @@ -295,8 +295,8 @@ "coordinates": [ [ [ - 121.52245659525192, - 25.05307078276369 + 121.52245956245311, + 25.053071119109998 ], [ 121.52244971380708, @@ -307,12 +307,12 @@ 25.053030396025882 ], [ - 121.52246206903826, - 25.0530311766371 + 121.52246503623944, + 25.053031512983402 ], [ - 121.52245659525192, - 25.05307078276369 + 121.52245956245311, + 25.053071119109998 ] ] ], @@ -1156,24 +1156,24 @@ "coordinates": [ [ [ - 121.5224963283491, - 25.052266222613074 + 121.52250008574507, + 25.052266243297474 ], [ - 121.52248987178287, - 25.05222165133151 + 121.52249345247697, + 25.052220450737074 ], [ - 121.52252125323616, - 25.0522179209452 + 121.52252483393026, + 25.052216720350764 ], [ - 121.52252770980242, - 25.052262492226763 + 121.52253146719836, + 25.052262512911163 ], [ - 121.5224963283491, - 25.052266222613074 + 121.52250008574507, + 25.052266243297474 ] ] ], @@ -1194,24 +1194,24 @@ "coordinates": [ [ [ - 121.52249582306125, - 25.05234155519255 + 121.52249918436712, + 25.052341574078305 ], [ - 121.52247632033978, + 121.52247631934706, 25.05234144817327 ], [ - 121.52247682463492, + 121.52247682562762, 25.052266115593795 ], [ - 121.52249632735641, - 25.052266222613074 + 121.52249969064768, + 25.05226624149883 ], [ - 121.52249582306125, - 25.05234155519255 + 121.52249918436712, + 25.052341574078305 ] ] ], @@ -1362,24 +1362,24 @@ "coordinates": [ [ [ - 121.5224136040904, - 25.05226120799541 + 121.52241727214272, + 25.052260528108224 ], [ - 121.52241273249366, - 25.052252928840065 + 121.52241640054598, + 25.05225224355695 ], [ - 121.52246617189624, - 25.052248311722582 + 121.52246983994856, + 25.052247630036753 ], [ - 121.52246704349297, - 25.052256590877928 + 121.5224707115453, + 25.05225591458803 ], [ - 121.5224136040904, - 25.05226120799541 + 121.52241727214272, + 25.052260528108224 ] ] ], @@ -1400,8 +1400,8 @@ "coordinates": [ [ [ - 121.52243505351028, - 25.052356509113373 + 121.52243872255531, + 25.05235583192415 ], [ 121.52118741043357, @@ -1412,12 +1412,12 @@ 25.052491647483595 ], [ - 121.5224136050831, - 25.052261206196768 + 121.52241727412813, + 25.052260529007548 ], [ - 121.52243505351028, - 25.052356509113373 + 121.52243872255531, + 25.05235583192415 ] ] ], @@ -1838,12 +1838,12 @@ 25.05231776813423 ], [ - 121.52239112126254, - 25.05215765560108 + 121.52239478931486, + 25.052156973015926 ], [ - 121.52241273050825, - 25.052252927940746 + 121.52241639856057, + 25.052252245355593 ], [ 121.5215525707501, @@ -1994,23 +1994,23 @@ "coordinates": [ [ [ - 121.52244835479121, + 121.5224483528058, 25.052155244519664 ], [ - 121.52246100187824, - 25.052151003318645 + 121.52246458058693, + 25.052149801824886 ], [ - 121.52248986979745, - 25.052221652230834 + 121.52249345247697, + 25.052220450737074 ], [ - 121.52247722271042, + 121.52247722469583, 25.052225893431856 ], [ - 121.52244835479121, + 121.5224483528058, 25.052155244519664 ] ] @@ -2306,32 +2306,32 @@ "coordinates": [ [ [ - 121.52246206804554, - 25.0530311766371 + 121.52246580062382, + 25.053031599318285 ], [ - 121.52244955596667, - 25.05246689725176 + 121.52245327365434, + 25.052466664327447 ], [ - 121.52243578910617, - 25.05235637421512 + 121.52243945219494, + 25.0523556970259 ], [ - 121.52246724004895, - 25.05235315824081 + 121.52247090313774, + 25.05235248285023 ], [ - 121.52248117169881, - 25.052465010474886 + 121.52248488938649, + 25.052464779349215 ], [ - 121.5224937135589, - 25.053030601071224 + 121.52249744613718, + 25.053031023752414 ], [ - 121.52246206804554, - 25.0530311766371 + 121.52246580062382, + 25.053031599318285 ] ] ], @@ -3659,20 +3659,20 @@ 25.05215591271567 ], [ - 121.52239112126254, - 25.05215765560108 + 121.52239478931486, + 25.052156973015926 ], [ - 121.52241273050825, - 25.052252927940746 + 121.52241639856057, + 25.052252245355593 ], [ - 121.52246617189624, - 25.052248312621906 + 121.52246983994856, + 25.052247630036753 ], [ - 121.52246426986964, - 25.05223023805487 + 121.52246788233037, + 25.052229026668574 ], [ 121.52247722370313, @@ -3720,20 +3720,20 @@ "coordinates": [ [ [ - 121.5224136050831, - 25.052261206196768 + 121.52241727412813, + 25.052260529007548 ], [ - 121.52243505351028, - 25.052356509113373 + 121.52243872255531, + 25.05235583192415 ], [ - 121.52246724004895, - 25.05235315824081 + 121.52247090313774, + 25.05235248285023 ], [ - 121.52246577481344, - 25.052341389717363 + 121.52246952426773, + 25.05234141040176 ], [ 121.52247631934706, @@ -3744,12 +3744,12 @@ 25.052266115593795 ], [ - 121.52246704349297, - 25.052256590877928 + 121.5224707115453, + 25.05225591458803 ], [ - 121.5224136050831, - 25.052261206196768 + 121.52241727412813, + 25.052260529007548 ] ] ], @@ -3784,16 +3784,16 @@ 25.053082178967962 ], [ - 121.5224937135589, - 25.053030601071224 + 121.52249744613718, + 25.053031023752414 ], [ - 121.52246206804554, - 25.0530311766371 + 121.52246580062382, + 25.053031599318285 ], [ - 121.52245659525192, - 25.05307078276369 + 121.52245956245311, + 25.053071119109998 ], [ 121.52244817014771, @@ -3827,20 +3827,20 @@ 25.05214675672169 ], [ - 121.52246100187824, - 25.052151003318645 + 121.52246458058693, + 25.052149801824886 ], [ - 121.52248986979745, - 25.052221652230834 + 121.52249345247697, + 25.052220450737074 ], [ - 121.52252125323616, - 25.0522179209452 + 121.52252483393026, + 25.052216720350764 ], [ - 121.52252040050087, - 25.052212028589583 + 121.52252406656777, + 25.05221142064813 ], [ 121.52253826525582, @@ -3907,20 +3907,20 @@ 25.052263190999707 ], [ - 121.52252813269558, - 25.052265416820852 + 121.52253180968228, + 25.05226487902649 ], [ - 121.52252770980242, - 25.052262492226763 + 121.52253146719836, + 25.052262512911163 ], [ - 121.5224963283491, - 25.052266222613074 + 121.52250008574507, + 25.052266243297474 ], [ - 121.52249582306125, - 25.05234155519255 + 121.52249918436712, + 25.052341574078305 ], [ 121.52250508501746, diff --git a/tests/src/tempe_split/geometry.json b/tests/src/tempe_split/geometry.json index e23f613e..5bc74b7e 100644 --- a/tests/src/tempe_split/geometry.json +++ b/tests/src/tempe_split/geometry.json @@ -249,24 +249,24 @@ "coordinates": [ [ [ - -111.93942200733333, - 33.4220183553787 + -111.93942199224844, + 33.422014982923685 ], [ - -111.93983093312481, - 33.42201703067837 + -111.9398309180399, + 33.42201365822336 ], [ - -111.93983065513164, - 33.42195743445207 + -111.93983064004674, + 33.421954061997056 ], [ - -111.93942172934017, - 33.421958759152396 + -111.93942171425527, + 33.421955386697384 ], [ - -111.93942200733333, - 33.4220183553787 + -111.93942199224844, + 33.422014982923685 ] ] ], @@ -287,24 +287,24 @@ "coordinates": [ [ [ - -111.93991815509672, - 33.421980607264935 + -111.9399179460631, + 33.421975919102806 ], [ - -111.93994058311121, - 33.42196110817972 + -111.93993766849295, + 33.42195877264221 ], [ - -111.93988907464113, - 33.421919834726324 + -111.93988616002285, + 33.42191749918881 ], [ - -111.93986664662663, - 33.42193933381153 + -111.93986643759301, + 33.42193464564941 ], [ - -111.93991815509672, - 33.421980607264935 + -111.9399179460631, + 33.421975919102806 ] ] ], @@ -477,24 +477,24 @@ "coordinates": [ [ [ - -111.93992980494984, - 33.42191701985054 + -111.93992706165295, + 33.4219194965815 ], [ - -111.93989636819049, - 33.42189121562344 + -111.93989658045659, + 33.42189597303331 ], [ - -111.93986573075767, - 33.42191887155317 + -111.93986594302378, + 33.421923628963036 ], [ - -111.93989916751703, - 33.42194467578027 + -111.93989642422012, + 33.42194715251123 ], [ - -111.93992980494984, - 33.42191701985054 + -111.93992706165295, + 33.4219194965815 ] ] ], @@ -515,24 +515,24 @@ "coordinates": [ [ [ - -111.9398267653823, - 33.42186769297457 + -111.93982677831222, + 33.421871065429585 ], [ - -111.93829503273783, - 33.421871728229405 + -111.93829504566774, + 33.42187510068442 ], [ - -111.93829517496688, - 33.42190939540425 + -111.9382951878968, + 33.42191276785926 ], [ - -111.93982690761136, - 33.42190536014942 + -111.93982692054128, + 33.42190873260443 ], [ - -111.9398267653823, - 33.42186769297457 + -111.93982677831222, + 33.421871065429585 ] ] ], @@ -762,12 +762,12 @@ 33.42206615071043 ], [ - -111.93986910115544, - 33.42201671771454 + -111.93986904297081, + 33.42201334525953 ], [ - -111.93984755345262, - 33.422016976719085 + -111.93984749526801, + 33.42201360426408 ], [ -111.93984824735804, @@ -800,24 +800,24 @@ "coordinates": [ [ [ - -111.93986664554913, - 33.421939334710856 + -111.93986643651552, + 33.42193464654873 ], [ - -111.93986573075767, - 33.42191887065385 + -111.93986594302378, + 33.421923628063716 ], [ - -111.93984419598478, - 33.42191954154757 + -111.93984440825088, + 33.421924300756075 ], [ - -111.93984511077625, - 33.42194000560457 + -111.93984490174262, + 33.421935319241086 ], [ - -111.93986664554913, - 33.421939334710856 + -111.93986643651552, + 33.42193464654873 ] ] ], @@ -838,8 +838,8 @@ "coordinates": [ [ [ - -111.9398640444813, - 33.42186734223925 + -111.93986411128586, + 33.42187056630624 ], [ -111.93986349819241, @@ -898,12 +898,12 @@ 33.42184844030341 ], [ - -111.9398424967785, - 33.421867651605794 + -111.93984256358306, + 33.42187087567278 ], [ - -111.9398640444813, - 33.42186734223925 + -111.93986411128586, + 33.42187056630624 ] ] ], @@ -1792,20 +1792,20 @@ 33.421936294105414 ], [ - -111.93994058311121, - 33.42196110817972 + -111.93993766849295, + 33.42195877264221 ], [ - -111.93988907464113, - 33.421919834726324 + -111.93988616002285, + 33.42191749918881 ], [ - -111.93989916751703, - 33.42194467578027 + -111.93989642422012, + 33.42194715251123 ], [ - -111.93992980494984, - 33.42191701985054 + -111.93992706165295, + 33.4219194965815 ], [ -111.93982953022906, @@ -1955,40 +1955,40 @@ "coordinates": [ [ [ - -111.93986910115544, - 33.42201671771454 + -111.93986904297081, + 33.42201334525953 ], [ - -111.93984755345262, - 33.422016976719085 + -111.93984749526801, + 33.42201360426408 ], [ - -111.93983093312481, - 33.42201703067837 + -111.9398309180399, + 33.42201365822336 ], [ - -111.93983065513164, - 33.42195743445207 + -111.93983064004674, + 33.421954061997056 ], [ - -111.93984588872611, - 33.42195738498939 + -111.9398457378771, + 33.421954013433705 ], [ - -111.93984511077625, - 33.42194000560457 + -111.93984490174262, + 33.42193531834177 ], [ - -111.93986664554913, - 33.421939334710856 + -111.93986643651552, + 33.42193464744805 ], [ - -111.93991815509672, - 33.421980607264935 + -111.9399179460631, + 33.421975919102806 ], [ - -111.93986910115544, - 33.42201671771454 + -111.93986904297081, + 33.42201334525953 ] ] ], @@ -2053,40 +2053,40 @@ "coordinates": [ [ [ - -111.93989636819049, - 33.42189121562344 + -111.93989658045659, + 33.42189597303331 ], [ - -111.93986573075767, - 33.42191887155317 + -111.93986594302378, + 33.421923628963036 ], [ - -111.93984419598478, - 33.42191954154757 + -111.93984440825088, + 33.421924300756075 ], [ - -111.93984355918649, - 33.42190531608267 + -111.93984371003549, + 33.421908688537684 ], [ - -111.93982690761136, - 33.42190536014942 + -111.93982692054128, + 33.42190873260443 ], [ - -111.9398267653823, - 33.42186769297457 + -111.93982677831222, + 33.421871065429585 ], [ - -111.9398424967785, - 33.421867651605794 + -111.93984256573803, + 33.4218710240608 ], [ - -111.9398640444813, - 33.42186734223925 + -111.93986411128586, + 33.42187056630624 ], [ - -111.93989636819049, - 33.42189121562344 + -111.93989658045659, + 33.42189597303331 ] ] ], @@ -2352,6 +2352,10 @@ "geometry": { "coordinates": [ [ + [ + -111.93941644962501, + 33.422015000910115 + ], [ -111.93941644962501, 33.42204832166494 @@ -2369,16 +2373,16 @@ 33.4219291489974 ], [ - -111.93942172934017, - 33.421958759152396 + -111.93942171425527, + 33.421955386697384 ], [ - -111.93942200733333, - 33.4220183553787 + -111.93942199224844, + 33.422014982923685 ], [ -111.93941644962501, - 33.42204832166494 + 33.422015000910115 ] ] ], @@ -2674,24 +2678,24 @@ "coordinates": [ [ [ - -111.9382500452547, - 33.42190951411467 + -111.93825005818461, + 33.42191288656968 ], [ - -111.93824990302564, - 33.42187184693982 + -111.93824991595555, + 33.421875219394835 ], [ - -111.93829503273783, - 33.421871728229405 + -111.93829504566774, + 33.42187510068442 ], [ - -111.93829517496688, - 33.42190939540425 + -111.9382951878968, + 33.42191276785926 ], [ - -111.9382500452547, - 33.42190951411467 + -111.93825005818461, + 33.42191288656968 ] ] ],