diff --git a/polar_route/crossing_smoothing.py b/polar_route/crossing_smoothing.py index 52b78182..06d58f1e 100644 --- a/polar_route/crossing_smoothing.py +++ b/polar_route/crossing_smoothing.py @@ -1037,8 +1037,8 @@ def blocked(self,new_cell,cell_a,cell_b): Args: new_cell (dict) - New cell to add environmental parameters as dict - cell_a (dict) - Start cell to add environmental parameters as dict - cell_b (dict) - End cell to add environmental parameters as dict + cell_a (dict) - Start cell to add environmental parameters as dict + cell_b (dict) - End cell to add environmental parameters as dict Return: True if the cell cannot be entered, False if the cell can @@ -1047,8 +1047,10 @@ def blocked(self,new_cell,cell_a,cell_b): end = cell_b['SIC'] max_new = new_cell['SIC'] - percentage_diff = (max_new-start) - if percentage_diff < self.blocked_sic: + percentage_diff1 = (max_new-start) + percentage_diff2 = (max_new-end) + + if (percentage_diff1 <= self.blocked_sic*start) or (percentage_diff2 <= self.blocked_sic*end) or (max_new<=self.blocked_sic): return False else: return True diff --git a/tests/regression_tests/example_routes/smoothed/fuel/gaussian_random_field.json b/tests/regression_tests/example_routes/smoothed/fuel/gaussian_random_field.json index 98c195b2..9840c354 100644 --- a/tests/regression_tests/example_routes/smoothed/fuel/gaussian_random_field.json +++ b/tests/regression_tests/example_routes/smoothed/fuel/gaussian_random_field.json @@ -172465,6 +172465,7 @@ } }, "paths": { + "type": "FeatureCollection", "features": [ { "type": "Feature", @@ -172476,19 +172477,19 @@ 1.5630000000000002 ], [ - -9.000608309699073, + -9.000608309699077, 1.25 ], [ - -8.930607153848905, + -8.93060715384891, 0.9375 ], [ - -8.86516530590895, + -8.865165305908956, 0.625 ], [ - -8.804079594757901, + -8.804079594757905, 0.3125 ], [ @@ -172552,48 +172553,60 @@ -5.3125 ], [ - -7.718746917287891, + -7.718727614872524, -5.625 ], [ -7.5, + -6.249837009377048 + ], + [ + -7.499852197332748, -6.25 ], [ -6.25, + -6.743749234487475 + ], + [ + -5.893691682701032, -6.875 ], [ -5.625, - -7.026527856665913 + -6.960277228887083 ], [ -5.3125, - -7.060286356988308 + -7.011033276702394 ], [ -5.0, - -7.013901282891913 + -6.979190584057645 ], [ -4.6875, - -6.938291952035813 + -6.91909434178208 ], [ - -4.375, + -4.376133547732589, -6.875 ], + [ + -4.375, + -6.874549300583045 + ], [ -4.0625, - -6.774341744066521 + -6.773845058324422 ], [ -3.75, - -6.696241513378535 + -6.6958290836764265 ], [ -3.4375, - -6.630476704971869 + -6.630254624512667 ], [ -3.125, @@ -172609,34 +172622,42 @@ ], [ -0.625, - -5.99848663592421 + -5.998455354138962 ], [ 0.0, - -5.704333938968808 + -5.704280320962604 ], [ - 1.25, + 1.2498307649069806, -5.0 ], [ - 2.0213777972690252, + 1.25, + -4.9998062305804485 + ], + [ + 2.0088588314930345, -3.75 ], [ 2.1875, - -3.537457614659975 + -3.5167379047849665 ], [ - 2.2474065195042923, + 2.235073752548823, -3.4375 ], [ - 2.5, + 2.4936046781770425, -3.125 ], [ - 2.5030136959074585, + 2.5, + -3.11918396313515 + ], + [ + 2.502993914675529, -2.5 ], [ @@ -172704,52 +172725,56 @@ 3.75 ], [ - 0.09024660942150525, + 0.09025746046760824, 4.0625 ], [ - 0.17935018335884367, + 0.17937457791839595, 4.375 ], [ - 0.24354519523339596, + 0.24358368355470716, 4.6875 ], [ - 0.2739649693430166, + 0.2740176675876224, 5.0 ], [ - 0.2896440923855486, + 0.28971335408061855, 5.3125 ], [ - 0.31241136923555773, + 0.3125, 5.625 ], [ - 0.3051137867095309, + 0.3125, 5.9375 ], [ - 0.28314755660648205, + 0.3005452794979835, 6.25 ], [ - 0.3152201293849721, + 0.36043570687841237, 6.875 ], [ - 0.5207973436194493, + 0.625, 7.5 ], [ 1.25, - 8.75 + 8.125 + ], + [ + 1.875, + 8.133457054902602 ], [ 2.5, - 8.75 + 8.125 ], [ 5.0, @@ -172766,11 +172791,11 @@ "to": "B", "traveltime": [ 0.0, - 0.07393292326939442, - 0.13030764035808642, - 0.19129701060164672, - 0.2543341290967355, - 0.3175811621635068, + 0.07393292326939421, + 0.13030764035808612, + 0.19129701060164642, + 0.25433412909673525, + 0.31758116216350674, 0.4026541320331456, 0.48218797452122786, 0.6521504742648584, @@ -172785,142 +172810,156 @@ 1.574452962017438, 1.6302032820068921, 1.699775833713371, - 1.7864896576834712, - 1.9586523370282236, - 2.4512462572241493, - 2.8487125233931803, - 3.152577605956883, - 3.49813686000041, - 3.799491991276696, - 4.0129333582326545, - 4.261069672588076, - 4.508782490915334, - 4.665233173573884, - 4.794028952794107, - 5.0908072523310155, - 5.511079162081494, - 5.881043380833102, - 6.276010890260888, - 6.941180087028049, - 8.069983814518556, - 8.224908394159424, - 8.287689014788588, - 8.450691234985818, - 8.678697577146218, - 9.062046075634383, - 9.869384378825663, - 10.142526748141307, - 10.358532343736591, - 10.648613886469125, - 10.913760236100885, - 11.23420635082828, - 11.604983209360727, - 11.940484796152388, - 12.283757654826628, - 12.634131731738284, - 12.970948452444844, - 13.632421717626428, - 14.335474681743095, - 15.02905103392271, - 15.566645207864978, - 15.993689005925626, - 16.36168826834166, - 16.711404017317342, - 17.07033238396756, - 17.3635539166441, - 17.58328241686005, - 17.851933154206044, - 18.13509934844297, - 18.534001239696135, - 18.770402372854846, - 19.149644587869858, - 19.557537701894066, - 20.75712759664651, - 21.275381135890758 + 1.7864910547859871, + 1.9586122809529414, + 1.9586969582241804, + 2.438604435031672, + 2.6568268436455478, + 2.8295144896393363, + 3.1349465672163146, + 3.4818393999950668, + 3.784591569981072, + 3.9989383180691274, + 4.000055129512058, + 4.248193979175899, + 4.495902795638452, + 4.652343934114151, + 4.781128422302586, + 5.077906721839494, + 5.4981786315899726, + 5.868149197477248, + 6.263121270918276, + 6.9282089835848515, + 6.92843173129033, + 8.051413862218615, + 8.220179268198253, + 8.269970678418613, + 8.434495762660116, + 8.438851004680934, + 8.664735804371428, + 9.048084637306403, + 9.855422940497682, + 10.128565309813327, + 10.344570905408611, + 10.634652448141145, + 10.899798797772904, + 11.2202449125003, + 11.591021771032747, + 11.926523357824408, + 12.269796216498648, + 12.620170293410304, + 12.956987014116864, + 13.618460279298448, + 14.321513243415115, + 15.01508959559473, + 15.552683769536998, + 15.979728328122006, + 16.347727947114514, + 16.69744278199585, + 17.056368375937915, + 17.34958664608664, + 17.569313026486796, + 17.87240859052036, + 18.152511148164887, + 18.548869357213245, + 18.789958743920497, + 19.017191770652257, + 19.256724668767244, + 19.540400031768158, + 20.646577804910258, + 21.164831344154507 ], + "total_traveltime": 21.164831344154507, "fuel": [ 0.0, - 3.8208752370041044, - 6.608762772739139, - 10.047351752448208, - 13.447212854508884, - 16.753872458850406, - 20.622771212970193, - 24.361926998919696, - 31.972022157225314, - 41.645939235727624, - 50.62819838533909, - 54.36313843207471, - 58.212008052453804, - 61.62302278597048, - 64.37570491417637, - 66.51568705907013, - 70.60140798628827, - 73.34045227241666, - 76.53635429901537, - 79.94868568070919, - 83.8282929599393, - 91.58299442388575, - 113.51806010890517, - 129.87937329295028, - 142.01473783568431, - 155.65245415388696, - 167.57793682816083, - 176.1407223458399, - 186.05561025043764, - 195.9992598916133, - 202.56943551126434, - 208.13044056754222, - 220.63365242654748, - 239.9403305053694, - 255.4213759369236, - 271.52837946237184, - 299.2280051105783, - 344.0693094069822, - 350.4513755357184, - 353.07261386924876, - 360.20946938676684, - 370.16629186984636, - 387.8488877789055, - 420.3653876052723, - 431.9095583331738, - 440.6109961682041, - 451.92793259330347, - 462.31639637129797, - 474.7751943049504, - 489.1640912826464, - 502.1700700769257, - 515.4359872125737, - 528.937083699044, - 541.9098727402519, - 567.4652513051491, - 594.5801405618411, - 621.33553550766, - 642.0941662797218, - 658.5795796187496, - 672.8240720445897, - 686.3728135909422, - 700.2801024773859, - 711.6950805897372, - 720.3206724471211, - 730.7854793980248, - 741.8016657919522, - 757.5485317422618, - 767.5146882956103, - 784.8948744959936, - 802.1284457977971, - 850.441423642775, - 870.7073251337313 + 3.8208752370040937, + 6.608762772739123, + 10.047351752448192, + 13.447212854508871, + 16.7538724588504, + 20.622771212970186, + 24.36192699891969, + 31.972022157225307, + 41.64593923572762, + 50.62819838533908, + 54.363138432074706, + 58.2120080524538, + 61.62302278597047, + 64.37570491417635, + 66.51568705907012, + 70.60140798628825, + 73.34045227241664, + 76.53635429901536, + 79.94868568070918, + 83.82835546680201, + 91.58118976058255, + 91.58471266101157, + 113.18770820196534, + 122.22446756208728, + 129.33298695004038, + 141.53093208137747, + 155.2212789347667, + 167.20204641822062, + 175.8011537818308, + 175.84531158244752, + 185.76030079143862, + 195.70378979038023, + 202.27356460029102, + 207.83408214459266, + 220.33729400359792, + 239.64397208241985, + 255.12528310802514, + 271.23247275657377, + 298.9287051642432, + 298.9375110015232, + 343.54755456005034, + 350.4997888904699, + 352.57869718800134, + 359.78222947006685, + 359.9651495292693, + 369.8293262483625, + 387.5119375843447, + 420.0284374107115, + 431.57260813861296, + 440.2740459736433, + 451.59098239874265, + 461.97944617673716, + 474.4382441103896, + 488.82714108808557, + 501.8331198823649, + 515.0990370180128, + 528.6001335044832, + 541.5729225456911, + 567.1283011105883, + 594.2431903672802, + 620.9985853130992, + 641.757216085161, + 658.2426587831409, + 672.4871650113208, + 686.035871143689, + 699.9430525968481, + 711.3579037005065, + 719.9834123430783, + 731.7327631745227, + 742.6297630538448, + 758.276215785823, + 768.558588934416, + 778.972388240272, + 788.7616460136111, + 800.1514701805977, + 844.9140314982602, + 865.1799329892165 ], + "total_fuel": 865.1799329892165, "distance": [ 0.0, - 35548.417127253204, - 71217.74935922053, - 106779.85475659303, - 142245.91923001295, - 177570.80041200353, - 212739.16366233368, - 247958.12414793737, + 35548.417127253124, + 71217.74935922041, + 106779.85475659292, + 142245.91923001286, + 177570.8004120035, + 212739.16366233365, + 247958.12414793734, 318101.4478612055, 387840.83110440755, 457492.45895268954, @@ -172933,58 +172972,64 @@ 718747.1605311863, 755683.3591241665, 791589.6056891339, - 827915.8530143227, - 901629.5059872281, - 1056484.2818239904, - 1127591.7642076623, - 1162322.4630935157, - 1197230.9557551048, - 1232770.7071355467, - 1268016.020658582, - 1304327.978224377, - 1339951.4276818999, - 1375269.932702688, - 1410644.8843568726, - 1481304.321615411, - 1621038.7160034697, - 1695659.348839519, - 1772219.226956016, - 1931362.6819457621, - 2094774.5178314135, - 2124791.080385974, - 2137762.8788632797, - 2182477.96357836, - 2252095.0195455234, - 2391327.922963002, - 2537016.592426839, - 2611568.8083025487, - 2660779.1066973032, - 2699168.0418505715, - 2738630.074476959, - 2776630.271450353, - 2816541.3933542916, - 2855453.978498813, - 2892180.313580509, - 2927050.869993731, - 2961906.157599596, - 2996714.282599596, - 3033020.939847765, - 3070353.764428767, - 3106833.6231316933, - 3143056.5832400303, - 3179243.6013846137, - 3214773.5509224297, - 3249744.9165594126, - 3284596.44307436, - 3319495.9282951113, - 3354313.4408058655, - 3389206.4356217026, - 3458913.0966178006, - 3532143.1712605925, - 3692962.6247500135, - 3830494.3643834903, - 4138789.039463505, - 4236792.698988314 + 827916.4651291246, + 901612.2694609027, + 901636.7052960861, + 1050477.8876635428, + 1092493.5416997068, + 1123671.6580166374, + 1158662.8367045154, + 1193372.223695355, + 1228545.1134060943, + 1263303.0666305923, + 1263438.030935899, + 1299751.6015567128, + 1335372.7948636385, + 1370686.93706515, + 1406056.6175511223, + 1476716.0548096607, + 1616450.4491977193, + 1691072.390245637, + 1767633.336720264, + 1926757.5488587029, + 1926786.1506460623, + 2089457.0627081287, + 2122150.378915293, + 2132438.2258489686, + 2177570.383013038, + 2178532.1628976474, + 2247501.3907172396, + 2386734.2888562204, + 2532422.958320057, + 2606975.174195767, + 2656185.4725905214, + 2694574.4077437897, + 2734036.4403701774, + 2772036.637343571, + 2811947.7592475098, + 2850860.3443920314, + 2887586.679473727, + 2922457.235886949, + 2957312.523492814, + 2992120.648492814, + 3028427.305740983, + 3065760.130321985, + 3102239.9890249115, + 3138463.2827402544, + 3174650.712103873, + 3210180.9754026616, + 3245152.4932273994, + 3280004.1114323926, + 3314903.7519632475, + 3349711.8769632475, + 3384545.1609567245, + 3454476.163848234, + 3529983.6991267465, + 3627987.358651555, + 3696871.0306524616, + 3765753.2506031017, + 4049921.4909258974, + 4147925.150450706 ], "speed": [ 0.0, @@ -173009,12 +173054,15 @@ 19.88462153733052, 15.805138001043636, 16.08769432686657, + 10.848486587481556, 13.906104477851148, + 9.229459111173353, 9.144025337019194, 6.932475480174472, 6.235080197738762, 6.799641387495505, 8.468405238855489, + 6.673931735578874, 7.710354048457035, 7.8757687518867385, 11.138046776059136, @@ -173024,10 +173072,12 @@ 10.296475240713034, 9.634672711845788, 11.069999813090215, + 6.516436094272829, 7.065915173962069, 9.542410582153442, 10.345100114248881, 13.143580747912337, + 10.648021570758411, 13.870267882464008, 16.705141037017974, 8.982019431675226, @@ -173051,12 +173101,13 @@ 5.205133467432327, 6.012173227385556, 6.824651315837293, - 5.8365833012770665, + 4.753174389768182, 5.678470803258012, 7.447944390533117, 12.48598205707684, 16.43758749051255, - 12.62323764738259, + 10.412878375176748, + 8.824764629732353, 9.328338892462494, 6.753981314257646 ] diff --git a/tests/regression_tests/example_routes/smoothed/time/gaussian_random_field.json b/tests/regression_tests/example_routes/smoothed/time/gaussian_random_field.json index 4ab376a2..8182682f 100644 --- a/tests/regression_tests/example_routes/smoothed/time/gaussian_random_field.json +++ b/tests/regression_tests/example_routes/smoothed/time/gaussian_random_field.json @@ -172465,6 +172465,7 @@ } }, "paths": { + "type": "FeatureCollection", "features": [ { "type": "Feature", @@ -172476,19 +172477,19 @@ 1.5630000000000002 ], [ - -9.000608309699073, + -9.000608309699077, 1.25 ], [ - -8.930607153848905, + -8.93060715384891, 0.9375 ], [ - -8.86516530590895, + -8.865165305908956, 0.625 ], [ - -8.804079594757901, + -8.804079594757905, 0.3125 ], [ @@ -172496,19 +172497,19 @@ 0.0 ], [ - -8.732175979890911, + -8.732175979890913, -0.3125 ], [ - -8.71370002838571, + -8.713700028385711, -0.625 ], [ - -8.689331336714373, + -8.689331336714375, -1.25 ], [ - -8.687972552857598, + -8.6879725528576, -1.875 ], [ @@ -172516,23 +172517,23 @@ -2.5 ], [ - -8.754547282097814, + -8.753212870242852, -2.8125 ], [ - -8.756130268437568, + -8.753299139933716, -3.125 ], [ - -8.754446412501075, + -8.75, -3.4375 ], [ - -8.752597428815632, + -8.744668668237402, -3.75 ], [ - -8.75, + -8.743580171769782, -4.0625 ], [ @@ -172540,36 +172541,40 @@ -4.375 ], [ - -8.756795228352358, + -8.75666556977333, -5.0 ], [ -8.75, - -5.464663005778953 + -5.448514031420901 ], [ - -8.618517700791092, + -8.605414766744675, -5.625 ], [ -8.125, - -6.2259713269597015 + -6.210884617007168 ], [ - -8.098555414131066, + -8.082324748674994, -6.25 ], [ -7.5, - -6.690198062009926 + -6.682771539512768 ], [ -6.25, + -7.499997333973274 + ], + [ + -6.249993357755756, -7.5 ], [ -5.0, - -7.512895859983088 + -7.512895820314271 ], [ -3.75, @@ -172608,19 +172613,11 @@ -1.25 ], [ - 3.75, - -0.9375 - ], - [ - 3.75, - -0.6859997447021589 - ], - [ - 3.6856558426861015, + 3.4375, -0.625 ], [ - 3.4375, + 3.3326921480935074, -0.3125 ], [ @@ -172629,23 +172626,23 @@ ], [ 2.8125, - 0.3118237913771793 + 0.312483289460257 ], [ - 2.8114122934211174, + 2.812473176785845, 0.3125 ], [ 2.5, - 0.44574144396455706 + 0.44601141122805077 ], [ - 1.9461882793196819, + 1.94627957977763, 0.625 ], [ 1.875, - 0.6908344317739449 + 0.6908992639504633 ], [ 1.5625, @@ -172700,52 +172697,56 @@ 3.75 ], [ - 0.09024660942150525, + 0.09025746046760824, 4.0625 ], [ - 0.17935018335884367, + 0.17937457791839595, 4.375 ], [ - 0.24354519523339596, + 0.24358368355470716, 4.6875 ], [ - 0.2739649693430166, + 0.2740176675876224, 5.0 ], [ - 0.2896440923855486, + 0.28971335408061855, 5.3125 ], [ - 0.31241136923555773, + 0.3125, 5.625 ], [ - 0.3051137867095309, + 0.3125, 5.9375 ], [ - 0.28314755660648205, + 0.3005452794979835, 6.25 ], [ - 0.3152201293849721, + 0.36043570687841237, 6.875 ], [ - 0.5207973436194493, + 0.625, 7.5 ], [ 1.25, - 8.75 + 8.125 + ], + [ + 1.875, + 8.133457054902602 ], [ 2.5, - 8.75 + 8.125 ], [ 5.0, @@ -172762,222 +172763,224 @@ "to": "B", "traveltime": [ 0.0, - 0.07393292326939442, - 0.13030764035808642, - 0.19129701060164672, - 0.2543341290967355, - 0.3175811621635068, - 0.4014343340406933, - 0.47959155023032407, - 0.6473854054841901, - 0.8827104339591534, - 1.0987308777067286, - 1.1603538416605497, - 1.2161320341836366, - 1.268146935111509, - 1.3204648271941086, - 1.37262235586454, - 1.424578875347388, - 1.5468874096056366, - 1.6235798592307509, - 1.6690225420401932, - 1.8412572687351991, - 1.8507557551800997, - 2.0676550821640576, - 2.583391264481767, - 3.0354169584416058, - 3.4803062886276166, - 3.7098117441199148, - 3.899466754827285, - 4.5155754189575745, - 6.1206350454340255, - 7.153371256313909, - 7.245091718050656, - 7.473599385987818, - 7.700216018034419, - 7.804320249020112, - 7.885842730096128, - 7.921084484098426, - 8.096377394633043, - 8.217723546347825, - 8.341009804451284, - 8.341441749912729, - 8.446883906930475, - 8.658901629031067, - 8.702848286019437, - 8.894810199331255, - 9.184891742063789, - 9.450038091695548, - 9.770484206422944, - 10.14126106495539, - 10.476762651747052, - 10.820035510421292, - 11.170409587332948, - 11.507226308039508, - 12.168699573221092, - 12.871752537337759, - 13.565328889517374, - 14.102923063459642, - 14.52996686152029, - 14.897966123936325, - 15.247681872912008, - 15.606610239562224, - 15.899831772238766, - 16.119560272454716, - 16.38821100980071, - 16.671377204037636, - 17.0702790952908, - 17.306680228449512, - 17.685922443464523, - 18.093815557488732, - 19.293405452241174, - 19.811658991485423 + 0.07393292326939421, + 0.13030764035808612, + 0.19129701060164642, + 0.25433412909673525, + 0.31758116216350674, + 0.4014343340406932, + 0.47959155023032396, + 0.6473854054841899, + 0.8827104339591532, + 1.0987308777067282, + 1.1603460399150274, + 1.2161210538022338, + 1.2681383171197727, + 1.3203080106475362, + 1.372197985851288, + 1.4293724596428317, + 1.5516799924990137, + 1.625707193952371, + 1.6757071929838427, + 1.8435128529211564, + 1.8588976017467584, + 2.0705681787454124, + 2.5873797938657415, + 2.5873841277427165, + 3.0394074201816403, + 3.4842967509874994, + 3.7138022064797975, + 3.9034572171871678, + 4.519565881317457, + 6.124625507793908, + 7.157361718673791, + 7.249082180410538, + 7.4775898483477, + 7.7042064803943004, + 7.997591355944245, + 8.141037547454655, + 8.24593259946018, + 8.36935974527438, + 8.369370404612008, + 8.47514422159548, + 8.687091648597432, + 8.731087983038838, + 8.923027835481449, + 9.213109378213982, + 9.478255727845742, + 9.798701842573138, + 10.169478701105584, + 10.504980287897245, + 10.848253146571485, + 11.198627223483141, + 11.535443944189701, + 12.196917209371286, + 12.899970173487953, + 13.593546525667568, + 14.131140699609835, + 14.558185258194843, + 14.92618487718735, + 15.275899712068684, + 15.634825306010747, + 15.928043576159471, + 16.147769956559628, + 16.450865520593194, + 16.73096807823772, + 17.127326287286078, + 17.36841567399333, + 17.59564870072509, + 17.835181598840077, + 18.11885696184099, + 19.22503473498309, + 19.74328827422734 ], + "total_traveltime": 19.74328827422734, "fuel": [ 0.0, - 3.8208752370041044, - 6.608762772739139, - 10.047351752448208, - 13.447212854508884, - 16.753872458850406, - 20.567297953478864, - 24.24173386637915, - 31.75472765846259, - 41.39299456611219, - 50.46001708032185, - 53.643797738764796, - 56.743751980428875, - 59.55960299363654, - 61.563555853849, - 63.49985928102969, - 66.39395386128449, - 72.8747654388239, - 77.35151222735169, - 79.61251805549517, - 88.14718029992275, - 88.58065385657831, - 98.58260593277477, - 121.5481898985301, - 141.90214534234286, - 161.87042888373145, - 172.20293137878517, - 181.1598907797658, - 213.13653753831807, - 279.9759988551215, - 321.9344486726518, - 325.9990667981093, - 338.5599350767945, - 350.935169669374, - 355.59880308074173, - 359.2701943713795, - 360.74017613705104, - 367.9456640581476, - 373.56133807010804, - 379.27022676273333, - 379.28877084418406, - 383.8955146611666, - 392.70670045903597, - 394.4940948323024, - 402.2269716162255, - 413.54390804132487, - 423.93237181931937, - 436.3911697529718, - 450.7800667306678, - 463.7860455249471, - 477.05196266059505, - 490.5530591470655, - 503.52584818827336, - 529.0812267531705, - 556.1961160098625, - 582.9515109556814, - 603.7101417277432, - 620.195555066771, - 634.4400474926111, - 647.9887890389637, - 661.8960779254073, - 673.3110560377587, - 681.9366478951425, - 692.4014548460462, - 703.4176412399737, - 719.1645071902833, - 729.1306637436318, - 746.510849944015, - 763.7444212458186, - 812.0573990907965, - 832.3233005817527 + 3.8208752370040937, + 6.608762772739123, + 10.047351752448192, + 13.447212854508871, + 16.7538724588504, + 20.567297953478853, + 24.241733866379143, + 31.75472765846258, + 41.392994566112186, + 50.46001708032183, + 53.64339465775567, + 56.74317224210379, + 59.55915114438202, + 62.278503969346744, + 64.39895522247387, + 67.52140672138317, + 74.00216523722786, + 78.32333424395489, + 80.81108985669867, + 89.12628074618944, + 89.82838016280401, + 99.5892171212238, + 122.60268980057896, + 122.60286820041946, + 142.95671550779144, + 162.9249990770011, + 173.25750157205482, + 182.21446097303544, + 214.19110773158772, + 281.03056904839116, + 322.9890188659215, + 327.053636991379, + 339.61450527006417, + 351.98973986264366, + 364.22722433501457, + 370.2549760275659, + 375.1093237691837, + 380.82473640268563, + 380.825194024406, + 385.4464279897282, + 394.2546924130603, + 396.04410726310743, + 403.77609536041354, + 415.0930317855129, + 425.4814955635074, + 437.9402934971598, + 452.3291904748558, + 465.3351692691351, + 478.6010864047831, + 492.1021828912535, + 505.0749719324614, + 530.6303504973586, + 557.7452397540505, + 584.5006346998695, + 605.2592654719313, + 621.7447081699112, + 635.9892143980911, + 649.5379205304592, + 663.4451019836184, + 674.8599530872768, + 683.4854617298486, + 695.234812561293, + 706.1318124406151, + 721.7782651725933, + 732.0606383211863, + 742.4744376270423, + 752.2636954003814, + 763.653519567368, + 808.4160808850305, + 828.6819823759868 ], + "total_fuel": 828.6819823759868, "distance": [ 0.0, - 35548.417127253204, - 71217.74935922053, - 106779.85475659303, - 142245.91923001295, - 177570.80041200353, - 212435.4324481138, - 247304.26821333595, - 316973.3458978342, - 386589.76014848397, - 456547.2448070948, - 491359.0434534945, - 526167.6134414403, - 560976.2416612469, - 595784.9730369253, - 630594.293845633, - 665402.418845633, - 735022.7546192148, - 786785.1938429156, - 809833.9626994852, - 896264.3916216227, - 900230.2055966473, - 982639.5617773789, - 1147674.1466684549, - 1285642.4160719174, - 1423606.5941879246, - 1492589.6554480486, - 1561573.579268281, - 1837495.162800766, - 2229509.800900001, - 2410160.7367572067, - 2437727.19532965, - 2562642.9401933677, - 2701876.5563683845, - 2736684.6813683845, - 2764698.28880499, - 2774570.70591349, - 2819007.7736390247, - 2868219.169314898, - 2917377.684646829, - 2917520.282580904, - 2955229.809575464, - 3020031.639314345, - 3030828.2862440557, - 3075155.4403897612, - 3113544.3755430295, - 3153006.408169417, - 3191006.605142811, - 3230917.7270467496, - 3269830.312191271, - 3306556.647272967, - 3341427.203686189, - 3376282.491292054, - 3411090.616292054, - 3447397.273540223, - 3484730.098121225, - 3521209.9568241513, - 3557432.9169324883, - 3593619.9350770717, - 3629149.8846148876, - 3664121.2502518706, - 3698972.776766818, - 3733872.2619875693, - 3768689.7744983234, - 3803582.7693141606, - 3873289.4303102586, - 3946519.5049530505, - 4107338.958442472, - 4244870.698075949, - 4553165.373155965, - 4651169.032680773 + 35548.417127253124, + 71217.74935922041, + 106779.85475659292, + 142245.91923001286, + 177570.8004120035, + 212435.43244811374, + 247304.2682133359, + 316973.34589783417, + 386589.7601484839, + 456547.24480709474, + 491357.20377362677, + 526165.3300952667, + 560975.3867985753, + 595788.5528295866, + 630596.8878369879, + 665412.3117747972, + 735032.4931203987, + 784996.1453805172, + 810356.8425273881, + 894567.5365304933, + 900993.0452204219, + 981467.6623423311, + 1146957.4043207723, + 1146958.1952777791, + 1284925.7315795515, + 1422889.9096621508, + 1491872.9709222747, + 1560856.8947425073, + 1836778.4782749922, + 2228793.116374227, + 2409444.052231433, + 2437010.510803876, + 2561926.255667594, + 2701159.8718426106, + 2778980.423404086, + 2815691.669710828, + 2857478.5943927094, + 2906689.039319415, + 2906692.557893858, + 2944522.49030495, + 3009305.3886156115, + 3020114.399652775, + 3064437.077783912, + 3102826.01293718, + 3142288.045563568, + 3180288.2425369616, + 3220199.3644409003, + 3259111.949585422, + 3295838.2846671175, + 3330708.8410803396, + 3365564.1286862046, + 3400372.2536862046, + 3436678.9109343737, + 3474011.7355153756, + 3510491.594218302, + 3546714.887933645, + 3582902.3172972635, + 3618432.580596052, + 3653404.09842079, + 3688255.716625783, + 3723155.357156638, + 3757963.482156638, + 3792796.766150115, + 3862727.7690416244, + 3938235.304320137, + 4036238.9638449457, + 4105122.635845852, + 4174004.855796492, + 4458173.096119287, + 4556176.755644096 ], "speed": [ 0.0, @@ -172996,7 +172999,7 @@ 26.5, 26.5, 26.5, - 26.5, + 23.96174153939164, 22.74075669182206, 26.5, 19.858198190159612, @@ -173004,6 +173007,7 @@ 16.08769432686657, 15.838393503754265, 13.906104477851148, + 9.144025337019194, 14.736820577974102, 14.752502592771433, 14.5656173541534, @@ -173014,10 +173018,8 @@ 13.870267882464008, 23.455569489317682, 26.5, - 14.986090946724833, - 14.960156164009755, 11.939192662655543, - 10.77411182955342, + 11.707761862307212, 17.32303460214528, 17.395871622308427, 13.464394149791643, @@ -173043,12 +173045,13 @@ 5.205133467432327, 6.012173227385556, 6.824651315837293, - 5.8365833012770665, + 4.753174389768182, 5.678470803258012, 7.447944390533117, 12.48598205707684, 16.43758749051255, - 12.62323764738259, + 10.412878375176748, + 8.824764629732353, 9.328338892462494, 6.753981314257646 ]