From eb54d0ce9b27ac31a68481d8e634a6811d2735e1 Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Mon, 4 May 2020 18:27:11 +0200
Subject: [PATCH] maybe
---
evaluation/results/example/queries/astar.csv | 200 +++++++++---------
evaluation/results/example/queries/charge.csv | 200 +++++++++---------
.../results/example/queries/classic.csv | 200 +++++++++---------
.../results/example/queries/gasstation.csv | 200 +++++++++---------
evrouting/osm/imports.py | 84 +++-----
tests/osm/test_import.py | 6 +-
6 files changed, 435 insertions(+), 455 deletions(-)
diff --git a/evaluation/results/example/queries/astar.csv b/evaluation/results/example/queries/astar.csv
index 969a12d..df2ed36 100644
--- a/evaluation/results/example/queries/astar.csv
+++ b/evaluation/results/example/queries/astar.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-1821186334,318014972,0.009013287999550812,682.90564704396,2827,5691,4
-408478746,1672267842,0.039315930000157095,None,2827,5691,4
-1937172853,79952484,0.031822977998672286,786.6179050434032,2827,5691,4
-1785922734,318260761,0.0071495520023745485,213.61231120184425,2827,5691,4
-7031881624,1827520767,0.010406817000330193,232.23080542731907,2827,5691,4
-7182110438,2614897344,0.021435972001199843,762.4569507297746,2827,5691,4
-549941568,473666789,0.011378758998034755,367.30286385255664,2827,5691,4
-1821291310,1927633975,0.015422149001096841,483.32085861853614,2827,5691,4
-600852672,1505992710,0.004126572999666678,80.58952932130123,2827,5691,4
-2616470682,318266811,0.003249917001085123,161.72009222922705,2827,5691,4
-563194922,2705157131,0.012855336997745326,486.85276511016406,2827,5691,4
-1505992712,318015042,0.008642828001029557,268.735406653272,2827,5691,4
-17689722,574482765,0.000609202998020919,None,2827,5691,4
-2598986198,1497215371,0.005810604001453612,258.5401416329196,2827,5691,4
-4955445788,7321975009,0.011849408998386934,571.8333303950812,2827,5691,4
-6001541671,1672267530,0.028775151000445476,None,2827,5691,4
-1867147174,306636858,0.007110463000572054,277.5834399656516,2827,5691,4
-2598986733,1672267718,0.006283087997871917,284.7055079044655,2827,5691,4
-1927634134,549941215,0.004337117999966722,202.06918208581084,2827,5691,4
-2629995072,90713484,0.0012297359971853439,163.7101122102256,2827,5691,4
-7031746254,2625314423,0.0004365659988252446,144.37752834530082,2827,5691,4
-1975596490,6001596194,0.003661143000499578,253.5123778142738,2827,5691,4
-318014975,2608501646,0.0032993109998642467,191.1099775371624,2827,5691,4
-360747548,1672267683,0.0005365819997678045,None,2827,5691,4
-1672267862,318014988,0.0012251260013727006,63.91940116848195,2827,5691,4
-1828263531,5576939244,0.0037542560021393,163.53527527323305,2827,5691,4
-34053456,2598868374,0.01415694400202483,592.1548586770164,2827,5691,4
-2639898818,600852666,0.00824750399988261,337.8205509411729,2827,5691,4
-306639024,549922865,0.0016627880031592213,270.93187625952095,2827,5691,4
-317839012,2639932985,0.023175549998995848,504.3949391890449,2827,5691,4
-2632841208,7286181358,0.003936696997698164,81.01710204309393,2827,5691,4
-748845461,405229456,0.0007478830011677928,358.41598563017754,2827,5691,4
-2611187962,574546129,0.022219071001018165,471.6832017509712,2827,5691,4
-549941211,2600724193,0.000601269999606302,46.33927253230455,2827,5691,4
-6802168300,4016874207,0.002466150002874201,169.09237073950956,2827,5691,4
-292485409,2635713649,0.007294271999853663,262.72949086266624,2827,5691,4
-1672267605,2608429637,8.989900015876628e-05,None,2827,5691,4
-563194934,360747410,0.02611194500059355,None,2827,5691,4
-549941214,360747848,0.02607477600031416,None,2827,5691,4
-6802168302,4304042853,0.003406978001294192,356.40647167872237,2827,5691,4
-4016874408,7286240211,0.005232859999523498,161.14629454415766,2827,5691,4
-563188710,317431299,0.004409905999636976,468.860408058949,2827,5691,4
-1830470690,6802168299,0.010397491001640446,487.9500777035472,2827,5691,4
-1254599516,2600455712,0.013194899001973681,382.51220871988073,2827,5691,4
-1785922734,5155045514,0.0006321250002656598,142.02029172834392,2827,5691,4
-317431299,7247195347,0.016834182999446057,369.0146250816516,2827,5691,4
-5609333812,2608500903,0.00032147900128620677,54.099869442309334,2827,5691,4
-2335713745,317838182,0.01197221999973408,411.3239404320054,2827,5691,4
-288943149,2600543671,0.020370669997646473,600.764353807019,2827,5691,4
-321209229,2604992692,0.009962830001313705,379.36974793985036,2827,5691,4
-2722759194,4226591286,0.00404397799866274,265.52092107390405,2827,5691,4
-2705157132,2696567095,0.010638484000082826,523.5322870970765,2827,5691,4
-493144386,2618898510,0.008818124999379506,466.05721506064765,2827,5691,4
-7042580410,671235257,0.033804087001044536,1024.0268403957596,2827,5691,4
-318014986,2616470683,0.014425197001401102,276.2296288794581,2827,5691,4
-2608501333,563180637,0.025051197000721004,683.7427888360708,2827,5691,4
-639603168,475912312,0.026181530996836955,1442.058995372899,2827,5691,4
-574457846,674511697,0.022603813999012345,565.7910804809934,2827,5691,4
-360747717,7115183091,0.004977905999112409,837.7316772713085,2827,5691,4
-2632841176,408478826,0.022434680999140255,570.8393609489324,2827,5691,4
-600858468,317431290,0.006033170000591781,193.78188154299647,2827,5691,4
-2598983042,7202546048,0.008498781000525923,310.0451863511219,2827,5691,4
-5095519274,549928580,0.005982285998470616,420.73297342075847,2827,5691,4
-574465021,2734185679,0.0030824019995634444,140.62630433678459,2827,5691,4
-7286181368,7202546040,0.023599398002261296,618.3893222876427,2827,5691,4
-2385218593,469733535,0.017678110001725145,624.8342345753116,2827,5691,4
-574546136,473666795,0.005264945997623727,232.57788814365236,2827,5691,4
-7031881625,360747521,0.025243537998903776,None,2827,5691,4
-5023014978,288943150,0.0009423460032849107,227.00679236099052,2827,5691,4
-1929118150,7321975019,0.013749825000559213,632.6887712163308,2827,5691,4
-317767577,306636853,0.0018654040031833574,133.8710009101637,2827,5691,4
-318650171,1672267546,0.0006955930002732202,56.279435308522785,2827,5691,4
-2632841173,1672334376,0.024952800002211006,763.8129998126299,2827,5691,4
-7259816940,1362941663,0.015158064001298044,442.14658352030256,2827,5691,4
-2385218590,549944090,0.001794538002286572,213.88661755576825,2827,5691,4
-2605041420,7346826317,0.01744004300053348,558.6118204003669,2827,5691,4
-2611606215,292724874,0.025695369000459323,None,2827,5691,4
-1979730409,247326139,0.0025152870002784766,233.553448434989,2827,5691,4
-473666797,7158827512,0.0021763570002804045,219.3407087788422,2827,5691,4
-1672267605,7286181359,6.98670010024216e-05,None,2827,5691,4
-317838183,1828418230,0.0035256599985586945,238.56646945636825,2827,5691,4
-508824045,317840526,0.0018803169987222645,72.71264762977331,2827,5691,4
-4016874619,1768859066,0.012881090999144362,448.35307739556197,2827,5691,4
-2701813225,1967932401,0.02022287799991318,796.4078048036179,2827,5691,4
-7115183088,574475518,0.012897051001345972,364.66302679022834,2827,5691,4
-2621360530,1934189125,0.009414460000698455,457.1320548385416,2827,5691,4
-549931434,321209222,0.009149299999990035,332.26392813297844,2827,5691,4
-79952506,408478814,0.01716833199679968,416.0688143392705,2827,5691,4
-7140363786,1929118248,0.0209651910008688,772.1552468131904,2827,5691,4
-6389430281,2600543396,0.019859392999933334,513.8508255621755,2827,5691,4
-469720334,1821291268,0.010276427001372213,565.5787316373059,2827,5691,4
-1818901127,1505992703,0.0013889590009057429,153.0598922353832,2827,5691,4
-574505827,4955446085,0.0239840419999382,789.0477590510294,2827,5691,4
-1618977288,318260718,0.01609785899927374,534.7253425088979,2827,5691,4
-430534354,687130896,0.00029352199999266304,55.45510331473584,2827,5691,4
-316681906,408478820,0.008313784001074964,263.7608041022508,2827,5691,4
-6047068260,1672267904,0.025491393000265816,None,2827,5691,4
-306639025,7321902560,0.004597874998580664,321.949563838824,2827,5691,4
-7286181352,6943345432,0.010741505997430068,424.4782376534168,2827,5691,4
-5112831264,2608429635,0.013019704001635546,660.17140165994,2827,5691,4
+418009821,3211622686,0.006104560998210218,299.53940761745315,2827,5691,4
+687135582,1929118274,0.014193412000167882,309.984257120316,2827,5691,4
+440870156,7030625397,0.0061211930005811155,266.8755777965704,2827,5691,4
+764105827,360757816,0.022421349000069313,363.03519416670315,2827,5691,4
+2604687836,7172883306,0.00964734899753239,235.90323152184388,2827,5691,4
+1937178498,2600722212,0.014495750001515262,826.6488628265173,2827,5691,4
+7140363811,1362941670,0.002194104999944102,112.06217872199922,2827,5691,4
+408478842,549920911,0.024493662000168115,619.5302552884552,2827,5691,4
+2618923396,7321870100,0.020439506999537116,344.33164889729017,2827,5691,4
+2598983042,2600543396,0.003676929001812823,154.51239134256772,2827,5691,4
+6389441585,292992947,0.0046343940011865925,153.9857116374839,2827,5691,4
+2635713649,508823988,0.0011040609970223159,53.38509628553214,2827,5691,4
+418009801,574465015,0.019862241002556402,527.1319006025898,2827,5691,4
+3123285425,418009262,0.019179090999386972,423.7599548271774,2827,5691,4
+1672334378,6604102084,0.0005345360004866961,None,2827,5691,4
+7322098545,3462099369,0.012186392999865348,288.4592989060882,2827,5691,4
+7321870120,687135582,0.01937217000158853,419.35494759758376,2827,5691,4
+1362941693,7030617904,0.01267877300051623,237.46407404483605,2827,5691,4
+2621386732,574449258,0.009933132998412475,417.7439980535539,2827,5691,4
+2608786278,2696560492,0.02037083599861944,517.8714975683342,2827,5691,4
+408478834,563194906,0.0016063030016084667,258.9848957044358,2827,5691,4
+4321209901,7140363801,0.03440023399889469,566.2186955636021,2827,5691,4
+2360479290,2621360525,0.007676676999835763,367.192459628314,2827,5691,4
+6603016876,1656016522,0.012310263002291322,792.3742000871882,2827,5691,4
+7031746250,7030623427,0.03028190500117489,703.1864446314731,2827,5691,4
+318260941,7245276256,0.0011035440002160612,48.451769744859156,2827,5691,4
+318266812,574465010,0.002685529998416314,177.57906338443627,2827,5691,4
+2734185688,318266811,0.005424671999207931,251.8290305630775,2827,5691,4
+370935760,360747915,0.006330265998258255,252.2380450378266,2827,5691,4
+1505992709,1253890916,0.0131219399991096,250.9143336993809,2827,5691,4
+574482750,318015069,0.00726907799980836,206.1122097057147,2827,5691,4
+360747548,469718545,0.000575995996769052,None,2827,5691,4
+7286240207,748845418,0.015126278001844184,466.32838207409696,2827,5691,4
+7257113601,2621360552,0.006748152001819108,280.2626114105422,2827,5691,4
+600855077,426930266,0.01148781899973983,341.5483793234692,2827,5691,4
+318014995,3111465597,0.0015463759991689585,114.39171887865092,2827,5691,4
+2360384211,318261951,0.029054182003164897,645.4157811529808,2827,5691,4
+7031746252,600855671,0.014197254000464454,523.4061339411232,2827,5691,4
+360747557,318261953,0.0004935129982186481,None,2827,5691,4
+2600543577,2696567095,0.0024848339999152813,110.10425255510617,2827,5691,4
+247326136,7286181354,0.0009874740026134532,None,2827,5691,4
+2608679794,574588781,0.018018837999989046,398.6061493763712,2827,5691,4
+671239369,574505822,0.021361379000154557,504.481438611962,2827,5691,4
+549920910,2611494644,0.0023182099976111203,107.9361662137449,2827,5691,4
+4321209901,318014996,0.008295280000311323,232.0745739049763,2827,5691,4
+574567080,2598986957,0.0010548459977144375,69.05491249038947,2827,5691,4
+5023014977,1828269031,0.013065744999039453,591.3147075714494,2827,5691,4
+405229450,317839975,0.013558738002757309,389.3299727634748,2827,5691,4
+1672267605,288944219,8.001700189197436e-05,None,2827,5691,4
+7247195349,360747893,0.03431698900021729,None,2827,5691,4
+7257113603,306636853,0.015006112000264693,437.05718284325974,2827,5691,4
+6604102084,360747507,0.004187366001133341,225.63308448102424,2827,5691,4
+2619060548,5023014976,0.025399616002687253,684.1927186887414,2827,5691,4
+3152652408,418009809,0.012287208999623545,356.9359172377983,2827,5691,4
+2612700813,1828418194,0.019697299001563806,404.9649358227012,2827,5691,4
+600855068,1829747761,0.01874661100009689,321.4304820539351,2827,5691,4
+34053441,549931423,0.015394361998914974,330.7515498416791,2827,5691,4
+1827499342,2608786068,0.004230339000059757,157.0355576542001,2827,5691,4
+7042579827,7165728796,0.01010862399925827,439.48176347319736,2827,5691,4
+600852672,294919193,0.00636463099726825,194.60045978800466,2827,5691,4
+2604684732,2608394376,0.003939808000723133,225.67874677578376,2827,5691,4
+2729892258,3111465599,0.021413187998405192,636.1250774293167,2827,5691,4
+7286240209,317839014,0.008988310997665394,215.53051978929957,2827,5691,4
+2554184498,318261955,0.010288174002198502,368.4077854834947,2827,5691,4
+360747527,4903537220,0.004058121001435211,308.9247309449616,2827,5691,4
+665115010,2598982037,0.018486098997527733,375.10086789924367,2827,5691,4
+549914986,2604688050,0.01721384700067574,406.62789799724936,2827,5691,4
+7321902560,7202546043,0.02634392600157298,647.8841126042021,2827,5691,4
+2952146882,7247195349,0.00973741699999664,284.15726187079684,2827,5691,4
+7042580419,2608678794,0.016572495002037613,698.3454072097257,2827,5691,4
+7286240203,4016874623,0.003301780998299364,165.24731610205183,2827,5691,4
+1672334354,600861115,0.023482880998926703,770.4024309119364,2827,5691,4
+2614920443,3111465611,0.005223342999670422,177.8696047315475,2827,5691,4
+360747578,574485682,0.0003176179998263251,None,2827,5691,4
+2734185688,4903549431,0.010346074999688426,439.4930627514446,2827,5691,4
+2631500008,1830470676,0.013691763000679202,357.51214838441797,2827,5691,4
+1867147170,1828269031,0.009278511999582406,436.3097512530265,2827,5691,4
+5113940072,321209222,0.0005723329995817039,84.32254165537744,2827,5691,4
+318260732,317839537,0.0014463949992205016,69.7984740636073,2827,5691,4
+1574635372,288943146,0.0005371530023694504,None,2827,5691,4
+5609333814,3177732288,0.007666186000278685,368.10345899843935,2827,5691,4
+294919195,2639898838,0.0027401549996284302,140.21450329712175,2827,5691,4
+7042580417,435112933,0.005415321000327822,535.8777439426531,2827,5691,4
+1672340374,6448461991,0.006781173000490526,286.2837684453694,2827,5691,4
+508823963,1929118187,0.03158039900154108,625.7948384834564,2827,5691,4
+1368670342,574449298,0.011055918002966791,289.11487947498966,2827,5691,4
+1828400048,1362941672,0.004677607998019084,490.31985636850595,2827,5691,4
+4016874408,288944220,0.009151702000963269,235.07185286856708,2827,5691,4
+1672267709,473666786,0.017260035001527285,408.9790017628481,2827,5691,4
+7286181353,4475742630,0.009001542999612866,335.2071411763051,2827,5691,4
+549928583,1820309648,0.008944230001361575,287.5714344469538,2827,5691,4
+2701813226,4955446072,0.001467952002712991,270.90837236452404,2827,5691,4
+408478826,7286240207,0.020211972001561662,654.9357242070321,2827,5691,4
+473666774,292484328,0.031528712999715935,None,2827,5691,4
+7165728799,7115183091,0.001273580997803947,88.19239151226196,2827,5691,4
+2635713654,4955446028,0.005855952000274556,125.05689399557589,2827,5691,4
+5113940036,1293287346,0.006259828998736339,399.1991755729142,2827,5691,4
+1672267690,7286135545,0.0001547169995319564,None,2827,5691,4
+574457817,1672334393,0.029624519000208238,821.5688985611807,2827,5691,4
+3111465608,410486365,0.01118067700008396,389.0809006977434,2827,5691,4
diff --git a/evaluation/results/example/queries/charge.csv b/evaluation/results/example/queries/charge.csv
index c37735b..0870937 100644
--- a/evaluation/results/example/queries/charge.csv
+++ b/evaluation/results/example/queries/charge.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations
-1821186334,318014972,0.006156524999823887,None,2828,5691,4
-408478746,1672267842,0.004719599000964081,None,2827,5691,4
-1937172853,79952484,0.05043672499959939,None,2828,5691,4
-1785922734,318260761,0.004823081999347778,None,2827,5691,4
-7031881624,1827520767,0.012629574001039146,None,2828,5691,4
-7182110438,2614897344,0.006381406001310097,None,2827,5691,4
-549941568,473666789,0.010971015002724016,None,2828,5691,4
-1821291310,1927633975,0.019147020997479558,None,2827,5691,4
-600852672,1505992710,0.05354009999791742,None,2828,5691,4
-2616470682,318266811,0.03264074999970035,None,2827,5691,4
-563194922,2705157131,0.009692558000097051,None,2828,5691,4
-1505992712,318015042,0.005388030000176514,None,2827,5691,4
-17689722,574482765,0.0042948289992637,None,2828,5691,4
-2598986198,1497215371,0.027612234000116587,None,2827,5691,4
-4955445788,7321975009,0.005401427999458974,None,2828,5691,4
-6001541671,1672267530,0.009084206998522859,None,2827,5691,4
-1867147174,306636858,0.01565918699998292,None,2828,5691,4
-2598986733,1672267718,0.008851291000610217,None,2827,5691,4
-1927634134,549941215,0.023182118002296193,None,2828,5691,4
-2629995072,90713484,0.005188117997022346,None,2827,5691,4
-7031746254,2625314423,0.007008176999079296,144.37752834530082,2828,5691,4
-1975596490,6001596194,0.005653166997944936,None,2827,5691,4
-318014975,2608501646,0.010785042999486905,None,2828,5691,4
-360747548,1672267683,0.00548917500054813,None,2827,5691,4
-1672267862,318014988,0.025857173997792415,None,2828,5691,4
-1828263531,5576939244,0.006186818001879146,None,2827,5691,4
-34053456,2598868374,0.005915582001762232,None,2828,5691,4
-2639898818,600852666,0.012002301999018528,None,2827,5691,4
-306639024,549922865,0.005517190002137795,None,2828,5691,4
-317839012,2639932985,0.07127216499793576,None,2827,5691,4
-2632841208,7286181358,0.07404081599815981,None,2828,5691,4
-748845461,405229456,0.005994314000417944,None,2827,5691,4
-2611187962,574546129,0.06333103100041626,None,2828,5691,4
-549941211,2600724193,0.008018451000680216,46.33927253230455,2827,5691,4
-6802168300,4016874207,0.006927399997948669,None,2828,5691,4
-292485409,2635713649,0.025982438997743884,None,2827,5691,4
-1672267605,2608429637,0.004307457998947939,None,2828,5691,4
-563194934,360747410,0.01941562299907673,None,2827,5691,4
-549941214,360747848,0.012432504001480993,None,2828,5691,4
-6802168302,4304042853,0.007483957000658847,None,2827,5691,4
-4016874408,7286240211,0.082648005001829,None,2828,5691,4
-563188710,317431299,0.005516860997886397,None,2827,5691,4
-1830470690,6802168299,0.006088990998250665,None,2828,5691,4
-1254599516,2600455712,0.010782777000713395,None,2827,5691,4
-1785922734,5155045514,0.004628057002264541,None,2828,5691,4
-317431299,7247195347,0.051633564002258936,None,2827,5691,4
-5609333812,2608500903,0.02172067900028196,54.099869442309334,2828,5691,4
-2335713745,317838182,0.006709757002681727,None,2827,5691,4
-288943149,2600543671,0.006234839998796815,None,2828,5691,4
-321209229,2604992692,0.009527054000500357,None,2827,5691,4
-2722759194,4226591286,0.006574513001396554,None,2828,5691,4
-2705157132,2696567095,0.019949956000345992,None,2827,5691,4
-493144386,2618898510,0.004825096999411471,None,2828,5691,4
-7042580410,671235257,0.004285065002477495,None,2827,5691,4
-318014986,2616470683,0.014303541000117548,None,2828,5691,4
-2608501333,563180637,0.05242659699797514,None,2827,5691,4
-639603168,475912312,0.004379546997370198,None,2828,5691,4
-574457846,674511697,0.03213931600112119,None,2827,5691,4
-360747717,7115183091,0.005245648997515673,None,2828,5691,4
-2632841176,408478826,0.05060195499754627,None,2827,5691,4
-600858468,317431290,0.006709490997309331,None,2828,5691,4
-2598983042,7202546048,0.021532519996981137,None,2827,5691,4
-5095519274,549928580,0.029430922997562448,None,2828,5691,4
-574465021,2734185679,0.024040889002208132,None,2827,5691,4
-7286181368,7202546040,0.018420881999190897,None,2828,5691,4
-2385218593,469733535,0.007373232998361345,None,2827,5691,4
-574546136,473666795,0.014425705001485767,None,2828,5691,4
-7031881625,360747521,0.02701543700095499,None,2827,5691,4
-5023014978,288943150,0.005534732001251541,None,2828,5691,4
-1929118150,7321975019,0.007627216997207142,None,2827,5691,4
-317767577,306636853,0.011067003997595748,None,2828,5691,4
-318650171,1672267546,0.011674108001898276,None,2827,5691,4
-2632841173,1672334376,0.04632530699745985,None,2828,5691,4
-7259816940,1362941663,0.02978556499874685,None,2827,5691,4
-2385218590,549944090,0.008026720999623649,None,2828,5691,4
-2605041420,7346826317,0.005347903002984822,None,2827,5691,4
-2611606215,292724874,0.012724084997898899,None,2828,5691,4
-1979730409,247326139,0.006277774002228398,None,2827,5691,4
-473666797,7158827512,0.025513099997624522,None,2828,5691,4
-1672267605,7286181359,0.0043993210019834805,None,2827,5691,4
-317838183,1828418230,0.004731601999083068,None,2828,5691,4
-508824045,317840526,0.01493516200207523,None,2827,5691,4
-4016874619,1768859066,0.05181735999940429,None,2828,5691,4
-2701813225,1967932401,0.0070209950026765,None,2827,5691,4
-7115183088,574475518,0.07550831100161304,None,2828,5691,4
-2621360530,1934189125,0.005459757001517573,None,2827,5691,4
-549931434,321209222,0.012306248001550557,None,2828,5691,4
-79952506,408478814,0.021874865997233428,None,2827,5691,4
-7140363786,1929118248,0.00514109899813775,None,2828,5691,4
-6389430281,2600543396,0.029427056000713492,None,2827,5691,4
-469720334,1821291268,0.005114577998028835,None,2828,5691,4
-1818901127,1505992703,0.004665485001169145,None,2827,5691,4
-574505827,4955446085,0.011122354997496586,None,2828,5691,4
-1618977288,318260718,0.007497147002140991,None,2827,5691,4
-430534354,687130896,0.006106297001679195,55.45510331473584,2828,5691,4
-316681906,408478820,0.024869416000001365,None,2827,5691,4
-6047068260,1672267904,0.021804899999551708,None,2828,5691,4
-306639025,7321902560,0.011913924998225411,None,2827,5691,4
-7286181352,6943345432,0.033787812000809936,None,2828,5691,4
-5112831264,2608429635,0.008725067000341369,None,2827,5691,4
+418009821,3211622686,0.007394672000373248,None,2828,5691,4
+687135582,1929118274,0.02638536900121835,None,2827,5691,4
+440870156,7030625397,0.008711466998647666,None,2828,5691,4
+764105827,360757816,0.07090238299861085,None,2827,5691,4
+2604687836,7172883306,0.010646309998264769,None,2828,5691,4
+1937178498,2600722212,0.005245233998721233,None,2827,5691,4
+7140363811,1362941670,0.0079917379989638,None,2828,5691,4
+408478842,549920911,0.02801381099925493,None,2827,5691,4
+2618923396,7321870100,0.02814459699948202,None,2828,5691,4
+2598983042,2600543396,0.05364455999733764,None,2827,5691,4
+6389441585,292992947,0.0213540760014439,None,2828,5691,4
+2635713649,508823988,0.0789974750005058,None,2827,5691,4
+418009801,574465015,0.038303894998534815,None,2828,5691,4
+3123285425,418009262,0.008229285998822888,None,2827,5691,4
+1672334378,6604102084,0.007330639000429073,None,2828,5691,4
+7322098545,3462099369,0.011317095999402227,None,2827,5691,4
+7321870120,687135582,0.016365256000426598,None,2828,5691,4
+1362941693,7030617904,0.026688974001444876,None,2827,5691,4
+2621386732,574449258,0.021823441002197796,None,2828,5691,4
+2608786278,2696560492,0.013737029999902006,None,2827,5691,4
+408478834,563194906,0.005817397999635432,None,2828,5691,4
+4321209901,7140363801,0.015954991002217866,None,2827,5691,4
+2360479290,2621360525,0.00667577700005495,None,2828,5691,4
+6603016876,1656016522,0.02237141499790596,None,2827,5691,4
+7031746250,7030623427,0.00909577299898956,None,2828,5691,4
+318260941,7245276256,0.026469780998013448,10154.740275174707,2827,5691,4
+318266812,574465010,0.010114702999999281,None,2828,5691,4
+2734185688,318266811,0.009515976998955011,None,2827,5691,4
+370935760,360747915,0.01755944999968051,None,2828,5691,4
+1505992709,1253890916,0.03252277499996126,None,2827,5691,4
+574482750,318015069,0.009561489001498558,None,2828,5691,4
+360747548,469718545,0.008863475999532966,None,2827,5691,4
+7286240207,748845418,0.024607080998976016,None,2828,5691,4
+7257113601,2621360552,0.009745751001901226,None,2827,5691,4
+600855077,426930266,0.03113081300034537,None,2828,5691,4
+318014995,3111465597,0.013242360997537617,None,2827,5691,4
+2360384211,318261951,0.008451453999441583,None,2828,5691,4
+7031746252,600855671,0.008894483999029035,None,2827,5691,4
+360747557,318261953,0.006288471002335427,None,2828,5691,4
+2600543577,2696567095,0.014977671002270654,None,2827,5691,4
+247326136,7286181354,0.02317222099736682,None,2828,5691,4
+2608679794,574588781,0.05112541799826431,None,2827,5691,4
+671239369,574505822,0.07076092500210507,None,2828,5691,4
+549920910,2611494644,0.017119661999458913,None,2827,5691,4
+4321209901,318014996,0.015176381999481237,None,2828,5691,4
+574567080,2598986957,0.031472970000322675,None,2827,5691,4
+5023014977,1828269031,0.006394316002115374,None,2828,5691,4
+405229450,317839975,0.013067836000118405,None,2827,5691,4
+1672267605,288944219,0.005070572002296103,None,2828,5691,4
+7247195349,360747893,0.00799208199896384,None,2827,5691,4
+7257113603,306636853,0.011083639998105355,None,2828,5691,4
+6604102084,360747507,0.039834104001784,None,2827,5691,4
+2619060548,5023014976,0.013280855000630254,None,2828,5691,4
+3152652408,418009809,0.06443841100190184,None,2827,5691,4
+2612700813,1828418194,0.017056405999028357,None,2828,5691,4
+600855068,1829747761,0.015810199998668395,None,2827,5691,4
+34053441,549931423,0.022269271001277957,None,2828,5691,4
+1827499342,2608786068,0.012049578999722144,None,2827,5691,4
+7042579827,7165728796,0.006933294000191381,None,2828,5691,4
+600852672,294919193,0.05663213200023165,None,2827,5691,4
+2604684732,2608394376,0.012743196002702462,None,2828,5691,4
+2729892258,3111465599,0.023083280000719242,None,2827,5691,4
+7286240209,317839014,0.015098163003131049,None,2828,5691,4
+2554184498,318261955,0.01033000300230924,None,2827,5691,4
+360747527,4903537220,0.006485281999630388,None,2828,5691,4
+665115010,2598982037,0.10026579600162222,None,2827,5691,4
+549914986,2604688050,0.014653941001597559,None,2828,5691,4
+7321902560,7202546043,0.07977296600074624,None,2827,5691,4
+2952146882,7247195349,0.013828422001097351,None,2828,5691,4
+7042580419,2608678794,0.005124851999426028,None,2827,5691,4
+7286240203,4016874623,0.01710126800026046,None,2828,5691,4
+1672334354,600861115,0.006956539997190703,None,2827,5691,4
+2614920443,3111465611,0.03844647200094187,None,2828,5691,4
+360747578,574485682,0.00569783299943083,None,2827,5691,4
+2734185688,4903549431,0.009836854002060136,None,2828,5691,4
+2631500008,1830470676,0.07079098200119915,None,2827,5691,4
+1867147170,1828269031,0.024032836998230778,None,2828,5691,4
+5113940072,321209222,0.00842946199918515,None,2827,5691,4
+318260732,317839537,0.028799880998121807,None,2828,5691,4
+1574635372,288943146,0.005358062997402158,None,2827,5691,4
+5609333814,3177732288,0.016075297000497812,None,2828,5691,4
+294919195,2639898838,0.009441927999432664,None,2827,5691,4
+7042580417,435112933,0.0049728350022633094,None,2828,5691,4
+1672340374,6448461991,0.02116352400116739,None,2827,5691,4
+508823963,1929118187,0.011777966999943601,None,2828,5691,4
+1368670342,574449298,0.006581884001207072,None,2827,5691,4
+1828400048,1362941672,0.006938153001101455,None,2828,5691,4
+4016874408,288944220,0.07267897600104334,None,2827,5691,4
+1672267709,473666786,0.006804332999308826,None,2828,5691,4
+7286181353,4475742630,0.03176952099966002,None,2827,5691,4
+549928583,1820309648,0.014391001997864805,None,2828,5691,4
+2701813226,4955446072,0.008205933998397086,None,2827,5691,4
+408478826,7286240207,0.007648313003301155,None,2828,5691,4
+473666774,292484328,0.009424661002412904,None,2827,5691,4
+7165728799,7115183091,0.032611395999992965,None,2828,5691,4
+2635713654,4955446028,0.06316470999809098,None,2827,5691,4
+5113940036,1293287346,0.005928680999204516,None,2828,5691,4
+1672267690,7286135545,0.0049598719997447915,None,2827,5691,4
+574457817,1672334393,0.02312618300129543,None,2828,5691,4
+3111465608,410486365,0.031250187999830814,None,2827,5691,4
diff --git a/evaluation/results/example/queries/classic.csv b/evaluation/results/example/queries/classic.csv
index 2fcbd2a..e07a54f 100644
--- a/evaluation/results/example/queries/classic.csv
+++ b/evaluation/results/example/queries/classic.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,dijkstra_rank
-1821186334,318014972,0.002661193000676576,682.90564704396,2827,5691,4,0
-408478746,1672267842,0.007103207000909606,None,2827,5691,4,0
-1937172853,79952484,0.005520685997908004,786.6179050434032,2827,5691,4,0
-1785922734,318260761,0.001330620998487575,213.61231120184425,2827,5691,4,0
-7031881624,1827520767,0.002053444000921445,232.23080542731907,2827,5691,4,0
-7182110438,2614897344,0.004425677001563599,762.4569507297746,2827,5691,4,0
-549941568,473666789,0.006416308999178,367.30286385255664,2827,5691,4,0
-1821291310,1927633975,0.004670496000471758,483.32085861853614,2827,5691,4,0
-600852672,1505992710,0.0010336009981983807,80.58952932130123,2827,5691,4,0
-2616470682,318266811,0.0011567140027182177,161.72009222922705,2827,5691,4,0
-563194922,2705157131,0.003962733000662411,486.85276511016406,2827,5691,4,0
-1505992712,318015042,0.0021047159971203655,268.735406653272,2827,5691,4,0
-17689722,574482765,0.00010051800200017169,None,2827,5691,4,0
-2598986198,1497215371,0.001736397000058787,258.5401416329196,2827,5691,4,0
-4955445788,7321975009,0.00302896599896485,571.8333303950812,2827,5691,4,0
-6001541671,1672267530,0.0058540179998090025,None,2827,5691,4,0
-1867147174,306636858,0.001724575999105582,277.5834399656516,2827,5691,4,0
-2598986733,1672267718,0.001530032001028303,284.7055079044655,2827,5691,4,0
-1927634134,549941215,0.0011386849982955027,202.06918208581084,2827,5691,4,0
-2629995072,90713484,0.0002662900005816482,163.7101122102256,2827,5691,4,0
-7031746254,2625314423,9.963100092136301e-05,144.37752834530082,2827,5691,4,0
-1975596490,6001596194,0.0011424409967730753,253.5123778142738,2827,5691,4,0
-318014975,2608501646,0.0015049219982756767,191.1099775371624,2827,5691,4,0
-360747548,1672267683,9.259899889002554e-05,None,2827,5691,4,0
-1672267862,318014988,0.00024742800087551586,63.91940116848195,2827,5691,4,0
-1828263531,5576939244,0.0015332900002249517,163.53527527323305,2827,5691,4,0
-34053456,2598868374,0.004361309998785146,592.1548586770164,2827,5691,4,0
-2639898818,600852666,0.0026391680003143847,337.8205509411729,2827,5691,4,0
-306639024,549922865,0.0004594790007104166,270.93187625952095,2827,5691,4,0
-317839012,2639932985,0.005058998998720199,504.3949391890449,2827,5691,4,0
-2632841208,7286181358,0.0009222280023095664,81.01710204309393,2827,5691,4,0
-748845461,405229456,0.00017831399964052252,358.41598563017754,2827,5691,4,0
-2611187962,574546129,0.004922413998428965,471.6832017509712,2827,5691,4,0
-549941211,2600724193,0.00012095500278519467,46.33927253230455,2827,5691,4,0
-6802168300,4016874207,0.000473915999464225,169.09237073950956,2827,5691,4,0
-292485409,2635713649,0.0029309050005394965,262.72949086266624,2827,5691,4,0
-1672267605,2608429637,2.5021003239089623e-05,None,2827,5691,4,0
-563194934,360747410,0.005582014000538038,None,2827,5691,4,0
-549941214,360747848,0.006068656999559607,None,2827,5691,4,0
-6802168302,4304042853,0.0023223169991979375,356.40647167872237,2827,5691,4,0
-4016874408,7286240211,0.001421781002136413,161.14629454415766,2827,5691,4,0
-563188710,317431299,0.001875265999842668,468.860408058949,2827,5691,4,0
-1830470690,6802168299,0.002577506998932222,487.9500777035472,2827,5691,4,0
-1254599516,2600455712,0.0035946649986726698,382.51220871988073,2827,5691,4,0
-1785922734,5155045514,0.0001361539980280213,142.02029172834392,2827,5691,4,0
-317431299,7247195347,0.004115538002224639,369.0146250816516,2827,5691,4,0
-5609333812,2608500903,7.190099859144539e-05,54.099869442309334,2827,5691,4,0
-2335713745,317838182,0.003231886999856215,411.3239404320054,2827,5691,4,0
-288943149,2600543671,0.0048604299990984146,600.764353807019,2827,5691,4,0
-321209229,2604992692,0.002259996999782743,379.36974793985036,2827,5691,4,0
-2722759194,4226591286,0.0010478910007805098,265.52092107390405,2827,5691,4,0
-2705157132,2696567095,0.004506555000261869,523.5322870970765,2827,5691,4,0
-493144386,2618898510,0.002310331998160109,466.05721506064765,2827,5691,4,0
-7042580410,671235257,0.005477382001117803,1024.0268403957596,2827,5691,4,0
-318014986,2616470683,0.0029488379987014923,276.2296288794581,2827,5691,4,0
-2608501333,563180637,0.004666038999857847,683.7427888360708,2827,5691,4,0
-639603168,475912312,0.005386187000112841,1442.058995372899,2827,5691,4,0
-574457846,674511697,0.005233933999988949,565.7910804809934,2827,5691,4,0
-360747717,7115183091,0.0030296619988803286,837.7316772713085,2827,5691,4,0
-2632841176,408478826,0.0058108890007133596,570.8393609489324,2827,5691,4,0
-600858468,317431290,0.0015289580005628522,193.78188154299647,2827,5691,4,0
-2598983042,7202546048,0.0023681140010012314,310.0451863511219,2827,5691,4,0
-5095519274,549928580,0.0023530120015493594,420.73297342075847,2827,5691,4,0
-574465021,2734185679,0.0013952839981357101,140.62630433678459,2827,5691,4,0
-7286181368,7202546040,0.0060401699993235525,618.3893222876427,2827,5691,4,0
-2385218593,469733535,0.004844442999456078,624.8342345753116,2827,5691,4,0
-574546136,473666795,0.0013333790011529345,232.57788814365236,2827,5691,4,0
-7031881625,360747521,0.005707038999389624,None,2827,5691,4,0
-5023014978,288943150,0.00021835300140082836,227.00679236099052,2827,5691,4,0
-1929118150,7321975019,0.0046021819980524015,632.6887712163308,2827,5691,4,0
-317767577,306636853,0.0011912789996131323,133.8710009101637,2827,5691,4,0
-318650171,1672267546,0.00027286800104775466,56.279435308522785,2827,5691,4,0
-2632841173,1672334376,0.005285346000164282,763.8129998126299,2827,5691,4,0
-7259816940,1362941663,0.003766318997804774,442.14658352030256,2827,5691,4,0
-2385218590,549944090,0.0007788600014464464,213.88661755576825,2827,5691,4,0
-2605041420,7346826317,0.004545697000139626,558.6118204003669,2827,5691,4,0
-2611606215,292724874,0.005474218996823765,None,2827,5691,4,0
-1979730409,247326139,0.0006342180022329558,233.553448434989,2827,5691,4,0
-473666797,7158827512,0.0005653939988405909,219.3407087788422,2827,5691,4,0
-1672267605,7286181359,2.0746996597154066e-05,None,2827,5691,4,0
-317838183,1828418230,0.0009333880007034168,238.56646945636825,2827,5691,4,0
-508824045,317840526,0.00043875499977730215,72.71264762977331,2827,5691,4,0
-4016874619,1768859066,0.004560929999570362,448.35307739556197,2827,5691,4,0
-2701813225,1967932401,0.005104807001771405,796.4078048036179,2827,5691,4,0
-7115183088,574475518,0.0037435469967022073,364.66302679022834,2827,5691,4,0
-2621360530,1934189125,0.003952518000005512,457.1320548385416,2827,5691,4,0
-549931434,321209222,0.003593939996790141,332.26392813297844,2827,5691,4,0
-79952506,408478814,0.004447151000931626,416.0688143392705,2827,5691,4,0
-7140363786,1929118248,0.005097655001009116,772.1552468131904,2827,5691,4,0
-6389430281,2600543396,0.0049044709994632285,513.8508255621755,2827,5691,4,0
-469720334,1821291268,0.0022676299995509908,565.5787316373059,2827,5691,4,0
-1818901127,1505992703,0.00043393300074967556,153.0598922353832,2827,5691,4,0
-574505827,4955446085,0.009278263998567127,789.0477590510294,2827,5691,4,0
-1618977288,318260718,0.008121291000861675,534.7253425088979,2827,5691,4,0
-430534354,687130896,0.0001283169985981658,55.45510331473584,2827,5691,4,0
-316681906,408478820,0.0048303509975085035,263.7608041022508,2827,5691,4,0
-6047068260,1672267904,0.00589865199799533,None,2827,5691,4,0
-306639025,7321902560,0.001258783999219304,321.949563838824,2827,5691,4,0
-7286181352,6943345432,0.0027537519999896176,424.4782376534168,2827,5691,4,0
-5112831264,2608429635,0.0034914110001409426,660.17140165994,2827,5691,4,0
+418009821,3211622686,0.0013996090019645635,299.53940761745315,2827,5691,4,0
+687135582,1929118274,0.0027741980011342093,309.984257120316,2827,5691,4,0
+440870156,7030625397,0.0013487069991242606,266.8755777965704,2827,5691,4,0
+764105827,360757816,0.004459169002075214,363.03519416670315,2827,5691,4,0
+2604687836,7172883306,0.0016282090000458993,235.90323152184388,2827,5691,4,0
+1937178498,2600722212,0.0022592390014324337,826.6488628265173,2827,5691,4,0
+7140363811,1362941670,0.0006039979998604394,112.06217872199922,2827,5691,4,0
+408478842,549920911,0.0038798409987066407,619.5302552884552,2827,5691,4,0
+2618923396,7321870100,0.004853054000705015,344.33164889729017,2827,5691,4,0
+2598983042,2600543396,0.0021739570001955144,154.51239134256772,2827,5691,4,0
+6389441585,292992947,0.0020658209978137165,153.9857116374839,2827,5691,4,0
+2635713649,508823988,0.000592380001762649,53.38509628553214,2827,5691,4,0
+418009801,574465015,0.006562303002283443,527.1319006025898,2827,5691,4,0
+3123285425,418009262,0.005901103999349289,423.7599548271774,2827,5691,4,0
+1672334378,6604102084,5.61460001335945e-05,None,2827,5691,4,0
+7322098545,3462099369,0.002584097001090413,288.4592989060882,2827,5691,4,0
+7321870120,687135582,0.004516453001997434,419.35494759758376,2827,5691,4,0
+1362941693,7030617904,0.0023954780008352827,237.46407404483605,2827,5691,4,0
+2621386732,574449258,0.0034764320007525384,417.7439980535539,2827,5691,4,0
+2608786278,2696560492,0.005055075002019294,517.8714975683342,2827,5691,4,0
+408478834,563194906,0.000448023001808906,258.9848957044358,2827,5691,4,0
+4321209901,7140363801,0.005401580998295685,566.2186955636021,2827,5691,4,0
+2360479290,2621360525,0.002046346002316568,367.192459628314,2827,5691,4,0
+6603016876,1656016522,0.0037472309995791875,792.3742000871882,2827,5691,4,0
+7031746250,7030623427,0.005528460998903029,703.1864446314731,2827,5691,4,0
+318260941,7245276256,0.0003430129982007202,48.451769744859156,2827,5691,4,0
+318266812,574465010,0.0011769879965868313,177.57906338443627,2827,5691,4,0
+2734185688,318266811,0.001332489999185782,251.8290305630775,2827,5691,4,0
+370935760,360747915,0.002013821998843923,252.2380450378266,2827,5691,4,0
+1505992709,1253890916,0.002365492000535596,250.9143336993809,2827,5691,4,0
+574482750,318015069,0.0013935230017523281,206.1122097057147,2827,5691,4,0
+360747548,469718545,8.829500075080432e-05,None,2827,5691,4,0
+7286240207,748845418,0.0038438489973486867,466.32838207409696,2827,5691,4,0
+7257113601,2621360552,0.001232238002558006,280.2626114105422,2827,5691,4,0
+600855077,426930266,0.0034775059975800104,341.5483793234692,2827,5691,4,0
+318014995,3111465597,0.00023414699899149127,114.39171887865092,2827,5691,4,0
+2360384211,318261951,0.005682368002453586,645.4157811529808,2827,5691,4,0
+7031746252,600855671,0.003615891997469589,523.4061339411232,2827,5691,4,0
+360747557,318261953,8.017400250537321e-05,None,2827,5691,4,0
+2600543577,2696567095,0.0005319150004652329,110.10425255510617,2827,5691,4,0
+247326136,7286181354,0.00012853699809056707,None,2827,5691,4,0
+2608679794,574588781,0.0050784160011971835,398.6061493763712,2827,5691,4,0
+671239369,574505822,0.005494400000316091,504.481438611962,2827,5691,4,0
+549920910,2611494644,0.0010300610010745004,107.9361662137449,2827,5691,4,0
+4321209901,318014996,0.0019231379992561415,232.0745739049763,2827,5691,4,0
+574567080,2598986957,0.0004245489981258288,69.05491249038947,2827,5691,4,0
+5023014977,1828269031,0.005051388001447776,591.3147075714494,2827,5691,4,0
+405229450,317839975,0.005466245998832164,389.3299727634748,2827,5691,4,0
+1672267605,288944219,6.430299981730059e-05,None,2827,5691,4,0
+7247195349,360747893,0.01183563700033119,None,2827,5691,4,0
+7257113603,306636853,0.004348680999100907,437.05718284325974,2827,5691,4,0
+6604102084,360747507,0.003575891998480074,225.63308448102424,2827,5691,4,0
+2619060548,5023014976,0.007065489000524394,684.1927186887414,2827,5691,4,0
+3152652408,418009809,0.0049040140002034605,356.9359172377983,2827,5691,4,0
+2612700813,1828418194,0.00457955099773244,404.9649358227012,2827,5691,4,0
+600855068,1829747761,0.0036690670021926053,321.4304820539351,2827,5691,4,0
+34053441,549931423,0.0038769790007791016,330.7515498416791,2827,5691,4,0
+1827499342,2608786068,0.0013501140019798186,157.0355576542001,2827,5691,4,0
+7042579827,7165728796,0.002706269999180222,439.48176347319736,2827,5691,4,0
+600852672,294919193,0.002174623998143943,194.60045978800466,2827,5691,4,0
+2604684732,2608394376,0.001572477998706745,225.67874677578376,2827,5691,4,0
+2729892258,3111465599,0.004529039997578366,636.1250774293167,2827,5691,4,0
+7286240209,317839014,0.001606638998055132,215.53051978929957,2827,5691,4,0
+2554184498,318261955,0.002612239000882255,368.4077854834947,2827,5691,4,0
+360747527,4903537220,0.002028591999987839,308.9247309449616,2827,5691,4,0
+665115010,2598982037,0.004761821001011413,375.10086789924367,2827,5691,4,0
+549914986,2604688050,0.005148952001036378,406.62789799724936,2827,5691,4,0
+7321902560,7202546043,0.005814127998746699,647.8841126042021,2827,5691,4,0
+2952146882,7247195349,0.00411353399977088,284.15726187079684,2827,5691,4,0
+7042580419,2608678794,0.003958449000492692,698.3454072097257,2827,5691,4,0
+7286240203,4016874623,0.00090085400006501,165.24731610205183,2827,5691,4,0
+1672334354,600861115,0.005391890001192223,770.4024309119364,2827,5691,4,0
+2614920443,3111465611,0.0014134039993223269,177.8696047315475,2827,5691,4,0
+360747578,574485682,7.005400038906373e-05,None,2827,5691,4,0
+2734185688,4903549431,0.002963183000247227,439.4930627514446,2827,5691,4,0
+2631500008,1830470676,0.003986423998867394,357.51214838441797,2827,5691,4,0
+1867147170,1828269031,0.0026679650000005495,436.3097512530265,2827,5691,4,0
+5113940072,321209222,0.00030585299828089774,84.32254165537744,2827,5691,4,0
+318260732,317839537,0.0005251059992588125,69.7984740636073,2827,5691,4,0
+1574635372,288943146,9.370200132252648e-05,None,2827,5691,4,0
+5609333814,3177732288,0.002770126000541495,368.10345899843935,2827,5691,4,0
+294919195,2639898838,0.0006389840018528048,140.21450329712175,2827,5691,4,0
+7042580417,435112933,0.0016580880001129117,535.8777439426531,2827,5691,4,0
+1672340374,6448461991,0.0018710289987211581,286.2837684453694,2827,5691,4,0
+508823963,1929118187,0.005727465002564713,625.7948384834564,2827,5691,4,0
+1368670342,574449298,0.004086169999936828,289.11487947498966,2827,5691,4,0
+1828400048,1362941672,0.0011229840019950643,490.31985636850595,2827,5691,4,0
+4016874408,288944220,0.0020364219999464694,235.07185286856708,2827,5691,4,0
+1672267709,473666786,0.004738738000014564,408.9790017628481,2827,5691,4,0
+7286181353,4475742630,0.002411451998341363,335.2071411763051,2827,5691,4,0
+549928583,1820309648,0.0037011620006524026,287.5714344469538,2827,5691,4,0
+2701813226,4955446072,0.0003865350008709356,270.90837236452404,2827,5691,4,0
+408478826,7286240207,0.005303846999595407,654.9357242070321,2827,5691,4,0
+473666774,292484328,0.00626982600078918,None,2827,5691,4,0
+7165728799,7115183091,0.00038769900129409507,88.19239151226196,2827,5691,4,0
+2635713654,4955446028,0.0020243799990566913,125.05689399557589,2827,5691,4,0
+5113940036,1293287346,0.003832612001133384,399.1991755729142,2827,5691,4,0
+1672267690,7286135545,4.598400118993595e-05,None,2827,5691,4,0
+574457817,1672334393,0.011462941998615861,821.5688985611807,2827,5691,4,0
+3111465608,410486365,0.0036238719985703938,389.0809006977434,2827,5691,4,0
diff --git a/evaluation/results/example/queries/gasstation.csv b/evaluation/results/example/queries/gasstation.csv
index 01f1c55..ee68a1e 100644
--- a/evaluation/results/example/queries/gasstation.csv
+++ b/evaluation/results/example/queries/gasstation.csv
@@ -1,101 +1,101 @@
start_node,target_node,query_time,trip_time,nodes,edges,charging_stations,time_contracted_graph,time_state_graph
-1821186334,318014972,0.09286383599828696,14798.438633506601,2827,5691,3,0.03661512100006803,0.00014049699893803336
-408478746,1672267842,0.05572432099870639,None,2827,5691,3,0.03138366299754125,0.00012788400272256695
-1937172853,79952484,0.12493123499734793,24975.69469711043,2827,5691,3,0.03085850999923423,0.00012883199815405533
-1785922734,318260761,0.034998106999410084,213.61231120184425,2827,5691,3,0.03132482699948014,0.00012914299804833718
-7031881624,1827520767,0.036754480002855416,232.23080542731907,2827,5691,3,0.03119225699992967,0.00012884800162282772
-7182110438,2614897344,0.12110511100036092,21386.732966031832,2827,5691,3,0.030904854000255,0.00012744400009978563
-549941568,473666789,0.045636470000317786,367.30286385255664,2827,5691,3,0.035478540001349756,0.00012978299855603836
-1821291310,1927633975,0.0456308889988577,483.32085861853614,2827,5691,3,0.03217210499860812,0.00012745200001518242
-600852672,1505992710,0.034998426999663934,80.58952932130123,2827,5691,3,0.031737648001580965,0.0001276260009035468
-2616470682,318266811,0.03582066799936001,161.72009222922705,2827,5691,3,0.032790542998554884,0.00013012099952902645
-563194922,2705157131,0.04246045800027787,486.85276511016406,2827,5691,3,0.03132610600005137,0.00012991499897907488
-1505992712,318015042,0.03927149300216115,268.735406653272,2827,5691,3,0.03190074200028903,0.00013007000234210864
-17689722,574482765,0.03171090199975879,None,2827,5691,3,0.031065901999681955,0.0001277170013054274
-2598986198,1497215371,0.03637812600209145,258.5401416329196,2827,5691,3,0.031112848002521787,0.00012788799722329713
-4955445788,7321975009,0.04193517599924235,571.8333303950812,2827,5691,3,0.031369819000246935,0.00012842099749832414
-6001541671,1672267530,0.055115058003138984,None,2827,5691,3,0.030848621001496213,0.00012778300151694566
-1867147174,306636858,0.03790170100182877,277.5834399656516,2827,5691,3,0.0316289490001509,0.0002400800003670156
-2598986733,1672267718,0.036613468000723515,284.7055079044655,2827,5691,3,0.031143713000346906,0.00012829700062866323
-1927634134,549941215,0.03507031100525637,202.06918208581084,2827,5691,3,0.03119883300314541,0.00012928800060763024
-2629995072,90713484,0.0325624830002198,163.7101122102256,2827,5691,3,0.031367786999908276,0.00012894999963464215
-7031746254,2625314423,0.03157407499747933,144.37752834530082,2827,5691,3,0.031061387999216095,0.00012760599929606542
-1975596490,6001596194,0.03452152900354122,253.5123778142738,2827,5691,3,0.03104667600200628,0.00012826500096707605
-318014975,2608501646,0.034071942001901334,191.1099775371624,2827,5691,3,0.031329110999649856,0.00013016800221521407
-360747548,1672267683,0.0316036400035955,None,2827,5691,3,0.031020065001939656,0.00012768099986715242
-1672267862,318014988,0.03246759999819915,63.91940116848195,2827,5691,3,0.03122907299984945,0.0001281869990634732
-1828263531,5576939244,0.03573703100119019,163.53527527323305,2827,5691,3,0.03246441399824107,0.00012911200246890076
-34053456,2598868374,0.042950039001880214,592.1548586770164,2827,5691,3,0.03102847400077735,0.00012842900105169974
-2639898818,600852666,0.03832774100010283,337.8205509411729,2827,5691,3,0.03129326599810156,0.0001550980014144443
-306639024,549922865,0.03313115399942035,270.93187625952095,2827,5691,3,0.031518268999207066,0.0001283550009247847
-317839012,2639932985,0.04979722899952321,504.3949391890449,2827,5691,3,0.030869373000314226,0.00012836499809054658
-2632841208,7286181358,0.034769661997415824,81.01710204309393,2827,5691,3,0.031659140997362556,0.0001292790002480615
-748845461,405229456,0.031931505000102334,358.41598563017754,2827,5691,3,0.031111044001590926,0.00013164700067136437
-2611187962,574546129,0.0496671110013267,471.6832017509712,2827,5691,3,0.03144793799947365,0.0001282480006921105
-549941211,2600724193,0.03216384999905131,46.33927253230455,2827,5691,3,0.03152790499734692,0.00012963400149601512
-6802168300,4016874207,0.034141222004109295,169.09237073950956,2827,5691,3,0.03277307300231769,0.0001338480033155065
-292485409,2635713649,0.0395968209959392,262.72949086266624,2827,5691,3,0.03276619299867889,0.00013312199735082686
-1672267605,2608429637,0.03247909100173274,None,2827,5691,3,0.03226188299959176,0.00013060100172879174
-563194934,360747410,0.05789762800122844,None,2827,5691,3,0.03236837700023898,0.0001321480012848042
-549941214,360747848,0.058413374001247576,None,2827,5691,3,0.03322623600251973,0.00013050599955022335
-6802168302,4304042853,0.03749542999867117,356.40647167872237,2827,5691,3,0.033492488000774756,0.00014608299898100086
-4016874408,7286240211,0.03946086900032242,161.14629454415766,2827,5691,3,0.03414764099943568,0.00013041300189797767
-563188710,317431299,0.037305515998014016,468.860408058949,2827,5691,3,0.032762454997282475,0.00012857699766755104
-1830470690,6802168299,0.04253925400189473,487.9500777035472,2827,5691,3,0.03228197900170926,0.00012878599955001846
-1254599516,2600455712,0.045264643002155935,382.51220871988073,2827,5691,3,0.032183530001930194,0.00012986100045964122
-1785922734,5155045514,0.03449969699795474,142.02029172834392,2827,5691,3,0.03387431199735147,0.00012785600119968876
-317431299,7247195347,0.04876488999798312,369.0146250816516,2827,5691,3,0.03297472899794229,0.00012976500147487968
-5609333812,2608500903,0.03325391000180389,54.099869442309334,2827,5691,3,0.032806780000100844,0.00013041499914834276
-2335713745,317838182,0.04487626700210967,411.3239404320054,2827,5691,3,0.03294548800113262,0.00013018399840802886
-288943149,2600543671,0.12992270099857706,7995.646075429076,2827,5691,3,0.03126138500010711,0.000129951997223543
-321209229,2604992692,0.04163874099685927,379.36974793985036,2827,5691,3,0.0317760920006549,0.000129643998661777
-2722759194,4226591286,0.07141398800013121,265.52092107390405,2827,5691,3,0.06335803199908696,0.00025075700250454247
-2705157132,2696567095,0.07404846200006432,523.5322870970765,2827,5691,3,0.06159410399777698,0.00013508900156011805
-493144386,2618898510,0.06016012199688703,466.05721506064765,2827,5691,3,0.046984140997665236,0.00017414499961887486
-7042580410,671235257,0.16068101099517662,None,2827,5691,3,0.042620733998774085,0.0001487869994889479
-318014986,2616470683,0.07784445899596903,276.2296288794581,2827,5691,3,0.06440510999891558,0.00021601699700113386
-2608501333,563180637,0.14241481800127076,12983.603023266154,2827,5691,3,0.05040712000118219,0.00014335699961520731
-639603168,475912312,0.22696816800089437,None,2827,5691,3,0.05417781700089108,0.00026154000079259276
-574457846,674511697,0.08105989300020155,565.7910804809934,2827,5691,3,0.05093181699703564,0.0001637620007386431
-360747717,7115183091,0.10086419599974761,None,2827,5691,3,0.047289800000726245,0.00020691800091299228
-2632841176,408478826,0.06757870400542743,570.8393609489324,2827,5691,3,0.03495438300160458,0.0001314470027864445
-600858468,317431290,0.04478794100214145,193.78188154299647,2827,5691,3,0.03821505300220451,0.00013143600153853185
-2598983042,7202546048,0.08162688099764637,310.0451863511219,2827,5691,3,0.06239687199922628,0.00025611800083424896
-5095519274,549928580,0.08206140200491063,420.73297342075847,2827,5691,3,0.06942932700258098,0.00024846300220815465
-574465021,2734185679,0.07199538400527672,140.62630433678459,2827,5691,3,0.06525832800252829,0.0002547740004956722
-7286181368,7202546040,0.275736847997905,6446.146723208053,2827,5691,3,0.06853971199961961,0.0002554179991420824
-2385218593,469733535,0.225825479003106,9989.06983723947,2827,5691,3,0.06739502300115419,0.00017226899944944307
-574546136,473666795,0.07490527299887617,232.57788814365236,2827,5691,3,0.0640057060008985,0.00024135299827321433
-7031881625,360747521,0.11678069199842867,None,2827,5691,3,0.06609621899769991,0.0002464770004735328
-5023014978,288943150,0.05560639000395895,227.00679236099052,2827,5691,3,0.05429272300170851,0.000154310000652913
-1929118150,7321975019,0.18709594000029028,8760.96435749069,2827,5691,3,0.04438274299900513,0.00031410900191986
-317767577,306636853,0.06829918599760276,133.8710009101637,2827,5691,3,0.0637123699998483,0.00024382499759667553
-318650171,1672267546,0.05018901000221376,56.279435308522785,2827,5691,3,0.049189438999746926,0.00014229600128601305
-2632841173,1672334376,0.08324347199959448,None,2827,5691,3,0.037110249999386724,0.00017200499860337004
-7259816940,1362941663,0.049208491000172216,442.14658352030256,2827,5691,3,0.034103251000487944,0.0002557829975557979
-2385218590,549944090,0.045245744000567356,213.88661755576825,2827,5691,3,0.04228833399974974,0.00031159900026977994
-2605041420,7346826317,0.06662130099721253,558.6118204003669,2827,5691,3,0.041985612999269506,0.00016062400027294643
-2611606215,292724874,0.08798470200053998,None,2827,5691,3,0.056624739001563285,0.0001650869999139104
-1979730409,247326139,0.043090406001283554,233.553448434989,2827,5691,3,0.03991498200048227,0.00015061899830470793
-473666797,7158827512,0.042426552005053964,219.3407087788422,2827,5691,3,0.04002087800108711,0.00014896200082148425
-1672267605,7286181359,0.03360174099725555,None,2827,5691,3,0.03338262099714484,0.00013327600026968867
-317838183,1828418230,0.036271103999752086,238.56646945636825,2827,5691,3,0.032592101000773255,0.00013203300113673322
-508824045,317840526,0.03555942100501852,72.71264762977331,2827,5691,3,0.03333627699976205,0.0001477130026614759
-4016874619,1768859066,0.04452579200005857,448.35307739556197,2827,5691,3,0.03132202399865491,0.00012441400031093508
-2701813225,1967932401,0.14073027099948376,24198.480971601904,2827,5691,3,0.03344457300045178,0.0001328190010099206
-7115183088,574475518,0.06766974799757008,364.66302679022834,2827,5691,3,0.044242883999686455,0.0001674209997872822
-2621360530,1934189125,0.06740149799588835,457.1320548385416,2827,5691,3,0.053293382999981986,0.00016728499758755788
-549931434,321209222,0.05488775200137752,332.26392813297844,2827,5691,3,0.04409319999831496,0.00015635900126653723
-79952506,408478814,0.05079939899951569,416.0688143392705,2827,5691,3,0.03410522900230717,0.00016976799815893173
-7140363786,1929118248,0.11302662299931399,20305.76204300758,2827,5691,3,0.032936325998889515,0.00013469400073518045
-6389430281,2600543396,0.052309244998468785,513.8508255621755,2827,5691,3,0.03299101999800769,0.00013268199836602435
-469720334,1821291268,0.041733187001227634,565.5787316373059,2827,5691,3,0.03181575100097689,0.00013141900126356632
-1818901127,1505992703,0.037917449000815395,153.0598922353832,2827,5691,3,0.03625364699837519,0.00014688500232296064
-574505827,4955446085,0.19028333899768768,21704.769192886808,2827,5691,3,0.04496548099996289,0.0001507519991719164
-1618977288,318260718,0.05024368099839194,534.7253425088979,2827,5691,3,0.03472307999982149,0.00013463099821819924
-430534354,687130896,0.03382231200157548,55.45510331473584,2827,5691,3,0.03335621299993363,0.00018118799926014617
-316681906,408478820,0.04172474000006332,263.7608041022508,2827,5691,3,0.033012604999385076,0.00013442999988910742
-6047068260,1672267904,0.0572161620038969,None,2827,5691,3,0.03169286300180829,0.00012802600031136535
-306639025,7321902560,0.03887488700274844,321.949563838824,2827,5691,3,0.03386627399959252,0.00013334400136955082
-7286181352,6943345432,0.041968091998569435,424.4782376534168,2827,5691,3,0.0315054130005592,0.00012995299766771495
-5112831264,2608429635,0.11539771899697371,9830.139311394147,2827,5691,3,0.03329555399977835,0.0001319799994234927
+418009821,3211622686,0.03971134799940046,299.53940761745315,2827,5691,3,0.03543409100166173,0.00014352400103234686
+687135582,1929118274,0.041116019994660746,309.984257120316,2827,5691,3,0.03201537799759535,0.0001761109997460153
+440870156,7030625397,0.03368405099899974,266.8755777965704,2827,5691,3,0.030198579999705544,0.00012722099927486852
+764105827,360757816,0.04117771200253628,363.03519416670315,2827,5691,3,0.030557096000848105,0.00012690999938058667
+2604687836,7172883306,0.034263761997863185,235.90323152184388,2827,5691,3,0.030122082000161754,0.00012745999993057922
+1937178498,2600722212,0.10552876600559102,None,2827,5691,3,0.02993848600090132,0.00012885600153822452
+7140363811,1362941670,0.03193934299633838,112.06217872199922,2827,5691,3,0.03002292199744261,0.00012902899834443815
+408478842,549920911,0.1268590639992908,13626.801256834533,2827,5691,3,0.030330719997436972,0.000127658000565134
+2618923396,7321870100,0.042453293997823494,344.33164889729017,2827,5691,3,0.030177893000654876,0.00013027100067120045
+2598983042,2600543396,0.033794486000260804,154.51239134256772,2827,5691,3,0.03039327599981334,0.00013012499766773544
+6389441585,292992947,0.034547242994449334,153.9857116374839,2827,5691,3,0.0303600049992383,0.00012920699737151153
+2635713649,508823988,0.031323860996053554,53.38509628553214,2827,5691,3,0.03014250599881052,0.00012904499817523174
+418009801,574465015,0.04715528799715685,527.1319006025898,2827,5691,3,0.03058647499710787,0.0001282580014958512
+3123285425,418009262,0.053072014001372736,423.7599548271774,2827,5691,3,0.03457275400069193,0.0001291330008825753
+1672334378,6604102084,0.03086878300382523,None,2827,5691,3,0.03051345600033528,0.00012976500147487968
+7322098545,3462099369,0.03927982700042776,288.4592989060882,2827,5691,3,0.03069151999807218,0.00012953999976161867
+7321870120,687135582,0.043919865995121654,419.35494759758376,2827,5691,3,0.03035032899788348,0.00012984799832338467
+1362941693,7030617904,0.03898940699946252,237.46407404483605,2827,5691,3,0.0306953710023663,0.00013015699732932262
+2621386732,574449258,0.038652525003271876,417.7439980535539,2827,5691,3,0.030533116001606686,0.00016304500240948983
+2608786278,2696560492,0.048895170002651867,517.8714975683342,2827,5691,3,0.029893356000684435,0.00012798700117855333
+408478834,563194906,0.032431245999759994,258.9848957044358,2827,5691,3,0.030688322000059998,0.0001280369979212992
+4321209901,7140363801,0.0517607069996302,566.2186955636021,2827,5691,3,0.03043133100072737,0.000129722997371573
+2360479290,2621360525,0.03767592900112504,367.192459628314,2827,5691,3,0.030590771999413846,0.00012922800306114368
+6603016876,1656016522,0.1393106670002453,63388.12730872199,2827,5691,3,0.02991905200178735,0.000128541996673448
+7031746250,7030623427,0.14252788899830193,16478.057415527015,2827,5691,3,0.0314953119996062,0.00017667999782133847
+318260941,7245276256,0.03268953400402097,48.451769744859156,2827,5691,3,0.031695514000603,0.00012923800022690557
+318266812,574465010,0.03427428099894314,177.57906338443627,2827,5691,3,0.03181013599896687,0.0001294089997827541
+2734185688,318266811,0.03555490099824965,251.8290305630775,2827,5691,3,0.0317217179981526,0.00012947499999427237
+370935760,360747915,0.03692800300268573,252.2380450378266,2827,5691,3,0.03126133600017056,0.00012888100172858685
+1505992709,1253890916,0.03951858800428454,250.9143336993809,2827,5691,3,0.03122752200215473,0.00012940799933858216
+574482750,318015069,0.049795288003224414,206.1122097057147,2827,5691,3,0.041745798000192735,0.00024079600188997574
+360747548,469718545,0.05493151799964835,None,2827,5691,3,0.05426115999944159,0.0001487890003772918
+7286240207,748845418,0.06227585000306135,466.32838207409696,2827,5691,3,0.04613684400101192,0.00016804800179670565
+7257113601,2621360552,0.05430245300158276,280.2626114105422,2827,5691,3,0.0450281379999069,0.00025583200113032945
+600855077,426930266,0.0580085190013051,341.5483793234692,2827,5691,3,0.04271793299994897,0.00019419900127104484
+318014995,3111465597,0.034548407998954644,114.39171887865092,2827,5691,3,0.03354159599984996,0.0001751849995343946
+2360384211,318261951,0.21338124900285038,18108.386529444633,2827,5691,3,0.056711338002060074,0.00024542800019844435
+7031746252,600855671,0.04721380299815792,523.4061339411232,2827,5691,3,0.0336909409998043,0.0001297409980907105
+360747557,318261953,0.03293291199952364,None,2827,5691,3,0.03238073799730046,0.0001303690005443059
+2600543577,2696567095,0.054278717005217914,110.10425255510617,2827,5691,3,0.05024605900325696,0.00023517300360254012
+247326136,7286181354,0.06719713499842328,None,2827,5691,3,0.06443728800149984,0.0005071029991086107
+2608679794,574588781,0.09806302999641048,398.6061493763712,2827,5691,3,0.06396640199818648,0.0002476330009812955
+671239369,574505822,0.1034236570012581,504.481438611962,2827,5691,3,0.06487951300005079,0.0002373610004724469
+549920910,2611494644,0.06265640199853806,107.9361662137449,2827,5691,3,0.05593216399938683,0.0002369780013395939
+4321209901,318014996,0.08037789100126247,232.0745739049763,2827,5691,3,0.06426401800126769,0.0002536940010031685
+574567080,2598986957,0.06852550999974483,69.05491249038947,2827,5691,3,0.06604722900010529,0.0002452400003676303
+5023014977,1828269031,0.08623060599711607,591.3147075714494,2827,5691,3,0.06425736199889798,0.0002456229995004833
+405229450,317839975,0.08107302700227592,389.3299727634748,2827,5691,3,0.056484812001144746,0.00017385899991495535
+1672267605,288944219,0.06525450799745158,None,2827,5691,3,0.06483682899852283,0.0002586779992270749
+7247195349,360747893,0.11555830600264017,None,2827,5691,3,0.06192747000022791,0.00023622099979547784
+7257113603,306636853,0.06893787400258589,437.05718284325974,2827,5691,3,0.0512184140025056,0.00024490699797752313
+6604102084,360747507,0.07068060799429077,225.63308448102424,2827,5691,3,0.06306631199913681,0.00024151699835783802
+2619060548,5023014976,0.27588241399644176,14905.031566997151,2827,5691,3,0.06539607099693967,0.0002431680004519876
+3152652408,418009809,0.08421416099736234,356.9359172377983,2827,5691,3,0.05875403599929996,0.00026059399897349067
+2612700813,1828418194,0.09153270300157601,404.9649358227012,2827,5691,3,0.0668452169993543,0.000146112000948051
+600855068,1829747761,0.0831541859988647,321.4304820539351,2827,5691,3,0.06304372500017053,0.0002633260010043159
+34053441,549931423,0.078997396001796,330.7515498416791,2827,5691,3,0.058843540002271766,0.00028104900047765113
+1827499342,2608786068,0.051722095002332935,157.0355576542001,2827,5691,3,0.04800729600174236,0.00012919700020574965
+7042579827,7165728796,0.04289498599609942,439.48176347319736,2827,5691,3,0.03334624899798655,0.00013077399853500538
+600852672,294919193,0.039091904003726086,194.60045978800466,2827,5691,3,0.03274778600098216,0.00013169500016374514
+2604684732,2608394376,0.036897674999636365,225.67874677578376,2827,5691,3,0.03257580900026369,0.00013031599883106537
+2729892258,3111465599,0.1259958699993149,10924.156913602961,2827,5691,3,0.031968893999874126,0.00013139799921191297
+7286240209,317839014,0.03704047900100704,215.53051978929957,2827,5691,3,0.031313393999880645,0.00020388200209708884
+2554184498,318261955,0.04189028299879283,368.4077854834947,2827,5691,3,0.03239856700020027,0.00013131899686413817
+360747527,4903537220,0.036187873000017134,308.9247309449616,2827,5691,3,0.03173364599933848,0.00014875700071570463
+665115010,2598982037,0.04786528799741063,375.10086789924367,2827,5691,3,0.03247344099872862,0.00013092699737171642
+549914986,2604688050,0.0441895649964863,406.62789799724936,2827,5691,3,0.030538882998371264,0.00015087199790286832
+7321902560,7202546043,0.12691027599794324,8888.851630334015,2827,5691,3,0.030383063000044785,0.00014053099948796444
+2952146882,7247195349,0.04152610000164714,284.15726187079684,2827,5691,3,0.03266827300103614,0.00013098799900035374
+7042580419,2608678794,0.125522930004081,17665.126921975858,2827,5691,3,0.03342519000216271,0.00020709900127258152
+7286240203,4016874623,0.03501324500030023,165.24731610205183,2827,5691,3,0.031799454998690635,0.00012828300168621354
+1672334354,600861115,0.12522544000239577,34396.85983706267,2827,5691,3,0.03160597600071924,0.0001298140014114324
+2614920443,3111465611,0.036266422997869086,177.8696047315475,2827,5691,3,0.03174623299855739,0.00013387799845077097
+360747578,574485682,0.032085814000311075,None,2827,5691,3,0.03164120200017351,0.00013079400014248677
+2734185688,4903549431,0.04110447099810699,439.4930627514446,2827,5691,3,0.03219362999880104,0.00013081200086162426
+2631500008,1830470676,0.042929980998451356,357.51214838441797,2827,5691,3,0.03164305799873546,0.00012770999819622375
+1867147170,1828269031,0.03888364200247452,436.3097512530265,2827,5691,3,0.030405182998947566,0.00014394800018635578
+5113940072,321209222,0.030624800998339197,84.32254165537744,2827,5691,3,0.029911415997048607,0.00017876600031740963
+318260732,317839537,0.03183336800066172,69.7984740636073,2827,5691,3,0.030362279001565184,0.0001288800012844149
+1574635372,288943146,0.03123647400207119,None,2827,5691,3,0.030576758999814047,0.00012900500223622657
+5609333814,3177732288,0.037533951002842514,368.10345899843935,2827,5691,3,0.030525723999744514,0.00012815200170734897
+294919195,2639898838,0.03238734000478871,140.21450329712175,2827,5691,3,0.030055762003030395,0.00012867300029029138
+7042580417,435112933,0.036290686002757866,535.8777439426531,2827,5691,3,0.030611039001087192,0.0001282459998037666
+1672340374,6448461991,0.03323312599604833,286.2837684453694,2827,5691,3,0.02977259699764545,0.00014738100071554072
+508823963,1929118187,0.11812962000476546,21952.033894682114,2827,5691,3,0.029792550001729978,0.00012881400107289664
+1368670342,574449298,0.03879026299910038,289.11487947498966,2827,5691,3,0.03022124099879875,0.00012749099914799444
+1828400048,1362941672,0.034693206998781534,490.31985636850595,2827,5691,3,0.03039602799981367,0.0001429699987056665
+4016874408,288944220,0.037696138002502266,235.07185286856708,2827,5691,3,0.030579717000364326,0.00013163800031179562
+1672267709,473666786,0.07486753199918894,408.9790017628481,2827,5691,3,0.042540804999589454,0.00027316200066707097
+7286181353,4475742630,0.06981694099886226,335.2071411763051,2827,5691,3,0.05873935999989044,0.00014918300075805746
+549928583,1820309648,0.07036046000212082,287.5714344469538,2827,5691,3,0.05260475500108441,0.0002508870020392351
+2701813226,4955446072,0.058013172001665225,270.90837236452404,2827,5691,3,0.056110079000063706,0.0001506570006313268
+408478826,7286240207,0.187681405001058,9578.044926539376,2827,5691,3,0.05362652199983131,0.00024811700131976977
+473666774,292484328,0.06092164599976968,None,2827,5691,3,0.033805741997639416,0.00013096200200379826
+7165728799,7115183091,0.032751205002568895,88.19239151226196,2827,5691,3,0.03158794200135162,0.00013012700219405815
+2635713654,4955446028,0.0416352200008987,125.05689399557589,2827,5691,3,0.032492967999132816,0.00016993600002024323
+5113940036,1293287346,0.06488795000041137,399.1991755729142,2827,5691,3,0.057694219998666085,0.00015039600111776963
+1672267690,7286135545,0.04971095400105696,None,2827,5691,3,0.04919218600116437,0.0002804340001603123
+574457817,1672334393,0.11931271399953403,None,2827,5691,3,0.0517024289983965,0.00014572399959433824
+3111465608,410486365,0.04364582599737332,389.0809006977434,2827,5691,3,0.03290406599990092,0.00014593299783882685
diff --git a/evrouting/osm/imports.py b/evrouting/osm/imports.py
index d7c2684..dc631f1 100644
--- a/evrouting/osm/imports.py
+++ b/evrouting/osm/imports.py
@@ -11,11 +11,10 @@ Added :
- distance computation to estimate length of each ways (useful to compute the shortest path)
"""
-import copy
import xml.sax
import logging
import itertools
-from collections import namedtuple
+from collections import namedtuple, defaultdict
import networkx as nx
import rtree
@@ -155,45 +154,31 @@ def read_osm(osm_xml_data, profile=car) -> OSMGraph:
Node = namedtuple('Node', ['id', 'lon', 'lat', 'tags'])
+Way = namedtuple('Way', ['id', 'nds', 'tags'])
-class Way(object):
- def __init__(self, id):
- self.id = id
- self.nds = []
- self.tags = {}
-
- @staticmethod
- def slice_array(waypoints, node_pass_count):
- slices = []
- start_last_slice = 0
- for i in range(1, len(waypoints) - 1):
- if node_pass_count[waypoints[i]] > 1:
- slices.append(waypoints[start_last_slice: i + 1])
- start_last_slice = i
- slices.append(waypoints[start_last_slice:])
- return slices
-
- def split(self, node_pass_count):
- """
- Slice way at every crossing i.e. when a waypoint is passend by
- multiple ways.
- """
+def slice_array(waypoints, node_pass_count):
+ slices = []
+ start_last_slice = 0
+ for i in range(1, len(waypoints) - 1):
+ if node_pass_count[waypoints[i]] > 1:
+ slices.append(waypoints[start_last_slice: i + 1])
+ start_last_slice = i
+ slices.append(waypoints[start_last_slice:])
+ return slices
- # slice the node-array using this nifty recursive function
- slices = Way.slice_array(self.nds, node_pass_count)
- # create a way object for each node-array slice
- ret = []
- i = 0
- for slice in slices:
- littleway = copy.copy(self)
- littleway.id += "-%d" % i
- littleway.nds = slice
- ret.append(littleway)
- i += 1
+def split(way, node_pass_count):
+ """
+ Slice way at every crossing i.e. when a waypoint is passend by
+ multiple ways.
+ """
- return ret
+ # slice the node-array using this nifty recursive function
+ slices = slice_array(way.nds, node_pass_count)
+
+ # create a way object for each node-array slice
+ return [Way(id=way.id + "-%d" % i, nds=s, tags=way.tags) for i, s in enumerate(slices)]
class OSM(object):
@@ -227,7 +212,7 @@ class OSM(object):
if name == 'node':
self.currElem = Node(attrs['id'], float(attrs['lon']), float(attrs['lat']), tags={})
elif name == 'way':
- self.currElem = Way(attrs['id'])
+ self.currElem = Way(attrs['id'], [], {})
elif name == 'tag':
self.currElem.tags[attrs['k']] = attrs['v']
elif name == 'nd':
@@ -237,7 +222,7 @@ class OSM(object):
def endElement(self, name):
if name == 'node':
nodes[self.currElem.id] = self.currElem
- elif name == 'way':
+ elif name == 'way' and len(self.currElem.nds) > 1:
ways[self.currElem.id] = self.currElem
@classmethod
@@ -247,21 +232,16 @@ class OSM(object):
xml.sax.parse(osm_xml_data, OSMHandler)
self.nodes = nodes
- self.ways = ways
# count times each node is used
- node_histogram = dict.fromkeys(self.nodes.keys(), 0)
- for way in self.ways.values():
- if len(way.nds) < 2: # if a way has only one node, delete it out of the osm collection
- del self.ways[way.id]
- else:
- for node in way.nds:
- node_histogram[node] += 1
+ node_histogram = defaultdict(lambda: 0)
+ for way in ways.values():
+ for node in way.nds:
+ node_histogram[node] += 1
# use that histogram to split all ways, replacing the member set of ways
- new_ways = {}
- for id, way in self.ways.items():
- split_ways = way.split(node_histogram)
- for split_way in split_ways:
- new_ways[split_way.id] = split_way
- self.ways = new_ways
+ self.ways = {
+ way.id: way for split_ways in [
+ split(w, node_histogram) for w in ways.values()
+ ] for way in split_ways
+ }
diff --git a/tests/osm/test_import.py b/tests/osm/test_import.py
index 0ffc31c..4770847 100644
--- a/tests/osm/test_import.py
+++ b/tests/osm/test_import.py
@@ -1,4 +1,4 @@
-from evrouting.osm.imports import Way
+from evrouting.osm.imports import slice_array
def test_slice():
@@ -9,7 +9,7 @@ def test_slice():
node_pass_count[6] = 2
node_pass_count[9] = 2
- slices = Way.slice_array(way, node_pass_count)
+ slices = slice_array(way, node_pass_count)
assert slices == [[0, 1, 2, 3, 4], [4, 5, 6], [6, 7, 8, 9]]
@@ -17,6 +17,6 @@ def test_slice():
def test_slice_short():
way = [0, 1]
node_pass_count = {w: 1 for w in way}
- slices = Way.slice_array(way, node_pass_count)
+ slices = slice_array(way, node_pass_count)
assert slices == [[0, 1]]
--
GitLab