From 1c27d164ce6ddb8d5ef8e032ea83c0cf83ccfd7c Mon Sep 17 00:00:00 2001
From: "niehues.mark@gmail.com" <niehues.mark@gmail.com>
Date: Mon, 4 May 2020 17:12:29 +0200
Subject: [PATCH] minor
---
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 | 13 +-
5 files changed, 403 insertions(+), 410 deletions(-)
diff --git a/evaluation/results/example/queries/astar.csv b/evaluation/results/example/queries/astar.csv
index 53aa94a..969a12d 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
-317839015,2608597414,0.0029104290006216615,134.20641775784284,2827,5691,4
-600866936,574459683,0.00043411300066509284,42.73345795958952,2827,5691,4
-1828400048,318014988,0.007824992000678321,608.8154151891008,2827,5691,4
-1821291294,1253890891,0.003377693999937037,146.42601273567817,2827,5691,4
-306636860,574546129,0.017317222998826765,480.5650193392354,2827,5691,4
-1828269031,1293287346,0.00013950399988971185,None,2827,5691,4
-7246644043,1785834373,0.009470737000810914,666.9803259731362,2827,5691,4
-317767414,4903549431,0.0017464470001868904,114.46003909259218,2827,5691,4
-7286135580,1768859058,0.011583373001485597,395.84248183992185,2827,5691,4
-4955445805,408478816,0.011424405998695875,567.4848259231705,2827,5691,4
-1574635374,674511693,0.021547543999986374,550.0748943362573,2827,5691,4
-574588784,408478820,0.0053697870007454185,264.35687307965287,2827,5691,4
-2608393065,1672267530,0.02534151399959228,None,2827,5691,4
-475912313,316681910,0.004388879000543966,942.1180230345709,2827,5691,4
-408478785,408478782,0.00015359399912995286,34.41546978302828,2827,5691,4
-6819437344,7030617904,0.019174284001564956,481.9151236333546,2827,5691,4
-5576939246,426930264,0.009820298000704497,404.8320487549189,2827,5691,4
-3462099368,6448461993,0.003160067999488092,336.8403336906005,2827,5691,4
-2611491719,7322098539,0.005497967000337667,127.20440767277066,2827,5691,4
-317766814,3211622700,0.00994299800004228,257.39751855926295,2827,5691,4
-3211622691,317841016,0.0034796480013028486,228.31392020003418,2827,5691,4
-1672267793,2639898842,0.000162070000442327,None,2827,5691,4
-687139205,473666781,0.027668359000017517,798.4822164089193,2827,5691,4
-317944964,7074500840,0.02371494600083679,595.4046228774345,2827,5691,4
-6001542006,6448462033,0.004156434999458725,239.60236102067614,2827,5691,4
-2621386740,3307706689,0.015254337999067502,602.6995574419633,2827,5691,4
-1368670343,1988057398,0.0005992970000079367,None,2827,5691,4
-318015014,1827520766,0.0009820260002015857,133.73064158397338,2827,5691,4
-418009256,1828418234,0.0032158549984160345,372.47673656312475,2827,5691,4
-7286135545,1505992832,0.008901938001145027,333.42180486451286,2827,5691,4
-574588773,2628942175,0.013364581000132603,467.7994039103217,2827,5691,4
-7286135582,574457822,0.011937180999666452,417.91642968790643,2827,5691,4
-574465017,306639015,0.02464433299974189,647.0098682163824,2827,5691,4
-3211622686,469733511,0.01584500900025887,438.215885183934,2827,5691,4
-3299068955,292484330,0.02607109299970034,None,2827,5691,4
-6389441585,2621462848,0.012052291000145487,345.8873681392482,2827,5691,4
-6448462005,574465004,0.01198793200092041,365.66170716426467,2827,5691,4
-563191209,2598868374,0.008100971999738249,459.08935453166885,2827,5691,4
-474997349,574475518,0.004600943000696134,302.900774775551,2827,5691,4
-5023014978,1828254500,0.01187936099995568,613.4664202293044,2827,5691,4
-1975596505,574727042,0.0005899029983993387,None,2827,5691,4
-748845497,7321975008,0.010433752000608365,391.74819594588735,2827,5691,4
-2608428534,1672334330,0.025211374999344116,None,2827,5691,4
-408478758,7207579521,0.0025278209996031364,411.93141465296424,2827,5691,4
-4955446060,6448462007,0.0029238320003059926,262.0362444929049,2827,5691,4
-3522260318,306636859,0.0034901730014098575,159.09788624831754,2827,5691,4
-317944963,7115183097,0.0016544549998798175,67.58201327566792,2827,5691,4
-1672334393,7140339574,0.00017444699915358797,None,2827,5691,4
-1505052639,321209231,0.0012738770001305966,110.67991376476547,2827,5691,4
-6603016875,574466058,0.01655158500034304,801.7275688850564,2827,5691,4
-360747888,1362941669,0.004519658999925014,390.19244662333114,2827,5691,4
-665115010,7140339575,0.008815920999040827,230.1918558703617,2827,5691,4
-2600543766,2608678959,0.008440437000899692,357.32480845699075,2827,5691,4
-2608429635,473666764,0.020331685000201105,508.8591038499049,2827,5691,4
-306636859,1828254502,0.00989703099912731,314.00106339887475,2827,5691,4
-360747406,574470577,0.0005679890000465093,None,2827,5691,4
-317838699,600858466,0.00703630099997099,243.3738181224468,2827,5691,4
-7286135500,549931423,0.009580997999364627,347.69665268511926,2827,5691,4
-1827499344,563194931,0.01688800500051002,486.4783004817786,2827,5691,4
-7321902568,2701786783,0.013925896000728244,413.4167974494645,2827,5691,4
-1672267673,2608428514,0.00010038700020231772,None,2827,5691,4
-2617662111,418009261,0.021948257999611087,542.7127650614764,2827,5691,4
-316681913,549920915,0.004847648999202647,209.40704035959422,2827,5691,4
-3111465600,306636854,0.006741399998645647,284.8839743555975,2827,5691,4
-1362941681,1828418208,0.0004823789986403426,38.08279832815822,2827,5691,4
-687135582,1929118326,0.011647650999293546,422.5319993114704,2827,5691,4
-4016874588,45217432,0.0031295749995479127,162.7814542661217,2827,5691,4
-1672267848,1362941670,0.0034593969994602958,197.42807498913555,2827,5691,4
-2608597329,2608597414,0.00019262900059402455,24.250914290851785,2827,5691,4
-473666779,4016874420,0.013054766999630374,662.0691548354674,2827,5691,4
-292484326,5609334125,0.007277725000676583,246.8784762493996,2827,5691,4
-1828277191,408478761,0.019910580000214395,511.74173668766315,2827,5691,4
-549931436,317839832,0.006890299999213312,290.01162457737996,2827,5691,4
-574459687,358407314,0.00029880199872422963,26.4283022332109,2827,5691,4
-1827268628,4016873481,0.00464572899909399,342.2073375224712,2827,5691,4
-1505057722,360757808,0.004789683000126388,310.3364405891029,2827,5691,4
-1956302545,1829747762,0.01344533399969805,983.4639697397456,2827,5691,4
-408478744,1827520758,0.00937184999929741,907.8637028422908,2827,5691,4
-1505052444,7286240207,0.02007288200002222,583.6255399147286,2827,5691,4
-3123285393,4016874420,0.004918950000501354,110.1168946479104,2827,5691,4
-1756155427,474997347,0.009915163000187022,366.0420378552742,2827,5691,4
-1821186334,793260945,0.005998712000291562,624.7792861275356,2827,5691,4
-7321902573,408478786,0.01817210800072644,457.6392812766023,2827,5691,4
-2616315927,2632841183,0.00829988299847173,350.1883124819374,2827,5691,4
-1253880620,1672267779,0.0026185889983025845,252.99978531798945,2827,5691,4
-418009800,1929118187,0.023934550999911153,751.0177733056021,2827,5691,4
-6417387131,2608393065,0.007754965999993146,338.9348445433285,2827,5691,4
-2608501857,360747431,0.0030530200001521735,254.55517532312925,2827,5691,4
-2604685993,1929118225,0.020593543998984387,549.0222840409713,2827,5691,4
-1609256705,4226442917,0.0006582569985766895,129.99971083575585,2827,5691,4
-440870188,1821291310,0.02006210400031705,623.262611050659,2827,5691,4
-6448462031,574546129,0.01869943699966825,489.9704653435302,2827,5691,4
-1830468180,426930261,0.016743643000154407,584.737718785695,2827,5691,4
-574546136,1960033968,0.018022440999629907,606.7570010182741,2827,5691,4
-288947635,318014980,0.004075388000273961,188.5411256908574,2827,5691,4
-2634485437,426930258,0.01378776999990805,468.55534135619905,2827,5691,4
-2385218592,1293287346,0.0010928949996014126,205.6821289013954,2827,5691,4
-292724874,6448462002,0.0028984540003875736,199.39809308575832,2827,5691,4
-2700898238,1867147170,0.022008742000252823,619.2286054124086,2827,5691,4
-2598987665,2608394482,0.011225992000618135,356.5664036847147,2827,5691,4
+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
diff --git a/evaluation/results/example/queries/charge.csv b/evaluation/results/example/queries/charge.csv
index a7e5621..c37735b 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
-317839015,2608597414,0.013800273000015295,None,2828,5691,4
-600866936,574459683,0.008327915998961544,42.73345795958952,2827,5691,4
-1828400048,318014988,0.006055695999748423,None,2828,5691,4
-1821291294,1253890891,0.01068626100095571,None,2827,5691,4
-306636860,574546129,0.01083790700067766,None,2828,5691,4
-1828269031,1293287346,0.030692228001498734,None,2827,5691,4
-7246644043,1785834373,0.0069127890001254855,None,2828,5691,4
-317767414,4903549431,0.0109441490003519,None,2827,5691,4
-7286135580,1768859058,0.019827193000310217,None,2828,5691,4
-4955445805,408478816,0.0059461769997142255,None,2827,5691,4
-1574635374,674511693,0.031631046998882084,None,2828,5691,4
-574588784,408478820,0.013579983000454376,None,2827,5691,4
-2608393065,1672267530,0.006907415001478512,None,2828,5691,4
-475912313,316681910,0.004960342001140816,None,2827,5691,4
-408478785,408478782,0.0051280590014357585,34.41546978302828,2828,5691,4
-6819437344,7030617904,0.021456803999171825,None,2827,5691,4
-5576939246,426930264,0.04242208399955416,None,2828,5691,4
-3462099368,6448461993,0.006827936000263435,None,2827,5691,4
-2611491719,7322098539,0.0610797850004019,None,2828,5691,4
-317766814,3211622700,0.06635948899929645,None,2827,5691,4
-3211622691,317841016,0.015540974000032293,None,2828,5691,4
-1672267793,2639898842,0.0315303129991662,None,2827,5691,4
-687139205,473666781,0.006756841001333669,None,2828,5691,4
-317944964,7074500840,0.013029228000959847,None,2827,5691,4
-6001542006,6448462033,0.007106941000529332,None,2828,5691,4
-2621386740,3307706689,0.007041523000225425,None,2827,5691,4
-1368670343,1988057398,0.004322482000134187,None,2828,5691,4
-318015014,1827520766,0.03566312499970081,None,2827,5691,4
-418009256,1828418234,0.007337261000429862,None,2828,5691,4
-7286135545,1505992832,0.011847763998957817,None,2827,5691,4
-574588773,2628942175,0.01443385099992156,None,2828,5691,4
-7286135582,574457822,0.01826303499910864,None,2827,5691,4
-574465017,306639015,0.05099492199951783,None,2828,5691,4
-3211622686,469733511,0.010153594999792404,None,2827,5691,4
-3299068955,292484330,0.005310430000463384,None,2828,5691,4
-6389441585,2621462848,0.012045089999446645,None,2827,5691,4
-6448462005,574465004,0.07179857299888681,None,2828,5691,4
-563191209,2598868374,0.006334955000056652,None,2827,5691,4
-474997349,574475518,0.03308497500074736,None,2828,5691,4
-5023014978,1828254500,0.0061611740002263105,None,2827,5691,4
-1975596505,574727042,0.004348459000539151,None,2828,5691,4
-748845497,7321975008,0.005460414000481251,None,2827,5691,4
-2608428534,1672334330,0.05488417299966386,None,2828,5691,4
-408478758,7207579521,0.03068466299919237,None,2827,5691,4
-4955446060,6448462007,0.006024951000654255,None,2828,5691,4
-3522260318,306636859,0.005862525000338792,None,2827,5691,4
-317944963,7115183097,0.016315798999130493,None,2828,5691,4
-1672334393,7140339574,0.004457586999706109,None,2827,5691,4
-1505052639,321209231,0.00826678500015987,None,2828,5691,4
-6603016875,574466058,0.032388867999543436,None,2827,5691,4
-360747888,1362941669,0.0044271019996813266,None,2828,5691,4
-665115010,7140339575,0.058596459999535,None,2827,5691,4
-2600543766,2608678959,0.012245870999322506,None,2828,5691,4
-2608429635,473666764,0.012951803999385447,None,2827,5691,4
-306636859,1828254502,0.036064444999283296,None,2828,5691,4
-360747406,574470577,0.0043477789986354765,None,2827,5691,4
-317838699,600858466,0.013017728999329847,None,2828,5691,4
-7286135500,549931423,0.010359599998992053,None,2827,5691,4
-1827499344,563194931,0.008308139998916886,None,2828,5691,4
-7321902568,2701786783,0.06091081100021256,None,2827,5691,4
-1672267673,2608428514,0.030501867999191745,None,2828,5691,4
-2617662111,418009261,0.009338640998976189,None,2827,5691,4
-316681913,549920915,0.011770611999963876,None,2828,5691,4
-3111465600,306636854,0.016085985000245273,None,2827,5691,4
-1362941681,1828418208,0.008232885000325041,38.08279832815822,2828,5691,4
-687135582,1929118326,0.03459181700054614,None,2827,5691,4
-4016874588,45217432,0.06238213899996481,None,2828,5691,4
-1672267848,1362941670,0.01009042599980603,None,2827,5691,4
-2608597329,2608597414,0.0056037140002445085,24.250914290851785,2828,5691,4
-473666779,4016874420,0.008009826000488829,None,2827,5691,4
-292484326,5609334125,0.04146211400075117,None,2828,5691,4
-1828277191,408478761,0.009702532999654068,None,2827,5691,4
-549931436,317839832,0.012786319999577245,None,2828,5691,4
-574459687,358407314,0.006585152999832644,26.4283022332109,2827,5691,4
-1827268628,4016873481,0.005216947000008076,None,2828,5691,4
-1505057722,360757808,0.006531336999614723,None,2827,5691,4
-1956302545,1829747762,0.03223330800028634,None,2828,5691,4
-408478744,1827520758,0.004412433001562022,None,2827,5691,4
-1505052444,7286240207,0.005023095998694771,None,2828,5691,4
-3123285393,4016874420,0.04451340300147422,110.1168946479104,2827,5691,4
-1756155427,474997347,0.013192834001529263,None,2828,5691,4
-1821186334,793260945,0.03359696799998346,None,2827,5691,4
-7321902573,408478786,0.06091273899983207,None,2828,5691,4
-2616315927,2632841183,0.017812361000324017,None,2827,5691,4
-1253880620,1672267779,0.005767987000581343,None,2828,5691,4
-418009800,1929118187,0.006906126000103541,None,2827,5691,4
-6417387131,2608393065,0.013187538999773096,None,2828,5691,4
-2608501857,360747431,0.03234585800055356,None,2827,5691,4
-2604685993,1929118225,0.010358940999140032,None,2828,5691,4
-1609256705,4226442917,0.005768687999079702,None,2827,5691,4
-440870188,1821291310,0.007508905000577215,None,2828,5691,4
-6448462031,574546129,0.013000194001506316,None,2827,5691,4
-1830468180,426930261,0.03292253899962816,None,2828,5691,4
-574546136,1960033968,0.015110457999981008,None,2827,5691,4
-288947635,318014980,0.012099874000341515,None,2828,5691,4
-2634485437,426930258,0.005317040000591078,None,2827,5691,4
-2385218592,1293287346,0.00833478999993531,None,2828,5691,4
-292724874,6448462002,0.00899214099990786,None,2827,5691,4
-2700898238,1867147170,0.03415657900040969,None,2828,5691,4
-2598987665,2608394482,0.022381692000635667,None,2827,5691,4
+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
diff --git a/evaluation/results/example/queries/classic.csv b/evaluation/results/example/queries/classic.csv
index 6c105d2..2fcbd2a 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
-317839015,2608597414,0.0009618260010029189,134.20641775784284,2827,5691,4,0
-600866936,574459683,0.0001631340001040371,42.73345795958952,2827,5691,4,0
-1828400048,318014988,0.002689340999495471,608.8154151891008,2827,5691,4,0
-1821291294,1253890891,0.0014391839995369082,146.42601273567817,2827,5691,4,0
-306636860,574546129,0.005149478998646373,480.5650193392354,2827,5691,4,0
-1828269031,1293287346,3.966399890487082e-05,None,2827,5691,4,0
-7246644043,1785834373,0.0034015040000667796,666.9803259731362,2827,5691,4,0
-317767414,4903549431,0.0007047369999781949,114.46003909259218,2827,5691,4,0
-7286135580,1768859058,0.0038604249984928174,395.84248183992185,2827,5691,4,0
-4955445805,408478816,0.004975365000063903,567.4848259231705,2827,5691,4,0
-1574635374,674511693,0.005638265000015963,550.0748943362573,2827,5691,4,0
-574588784,408478820,0.0017026829991664272,264.35687307965287,2827,5691,4,0
-2608393065,1672267530,0.0066899590001412435,None,2827,5691,4,0
-475912313,316681910,0.002296397999089095,942.1180230345709,2827,5691,4,0
-408478785,408478782,3.515999924275093e-05,34.41546978302828,2827,5691,4,0
-6819437344,7030617904,0.005114505998790264,481.9151236333546,2827,5691,4,0
-5576939246,426930264,0.0032196729989664163,404.8320487549189,2827,5691,4,0
-3462099368,6448461993,0.0011556589997780975,336.8403336906005,2827,5691,4,0
-2611491719,7322098539,0.002025166000748868,127.20440767277066,2827,5691,4,0
-317766814,3211622700,0.002924200000052224,257.39751855926295,2827,5691,4,0
-3211622691,317841016,0.0020106070005567744,228.31392020003418,2827,5691,4,0
-1672267793,2639898842,4.00139997509541e-05,None,2827,5691,4,0
-687139205,473666781,0.005756730999564752,798.4822164089193,2827,5691,4,0
-317944964,7074500840,0.005764767000073334,595.4046228774345,2827,5691,4,0
-6001542006,6448462033,0.0026581789988995297,239.60236102067614,2827,5691,4,0
-2621386740,3307706689,0.004682353999669431,602.6995574419633,2827,5691,4,0
-1368670343,1988057398,0.00010174499948334415,None,2827,5691,4,0
-318015014,1827520766,0.00032931600071606226,133.73064158397338,2827,5691,4,0
-418009256,1828418234,0.0008581830006733071,372.47673656312475,2827,5691,4,0
-7286135545,1505992832,0.002671407000889303,333.42180486451286,2827,5691,4,0
-574588773,2628942175,0.004406083999128896,467.7994039103217,2827,5691,4,0
-7286135582,574457822,0.0035218540015193867,417.91642968790643,2827,5691,4,0
-574465017,306639015,0.005421254998509539,647.0098682163824,2827,5691,4,0
-3211622686,469733511,0.00482898500013107,438.215885183934,2827,5691,4,0
-3299068955,292484330,0.005828039998959866,None,2827,5691,4,0
-6389441585,2621462848,0.0035719669995160075,345.8873681392482,2827,5691,4,0
-6448462005,574465004,0.0037263630001689307,365.66170716426467,2827,5691,4,0
-563191209,2598868374,0.00414032499975292,459.08935453166885,2827,5691,4,0
-474997349,574475518,0.0017738960013957694,302.900774775551,2827,5691,4,0
-5023014978,1828254500,0.002982750000228407,613.4664202293044,2827,5691,4,0
-1975596505,574727042,0.00010751300033007283,None,2827,5691,4,0
-748845497,7321975008,0.0036298689992690925,391.74819594588735,2827,5691,4,0
-2608428534,1672334330,0.005719853999835323,None,2827,5691,4,0
-408478758,7207579521,0.0011213690013391897,411.93141465296424,2827,5691,4,0
-4955446060,6448462007,0.0010247830014122883,262.0362444929049,2827,5691,4,0
-3522260318,306636859,0.0016703650017007021,159.09788624831754,2827,5691,4,0
-317944963,7115183097,0.00045177299944043625,67.58201327566792,2827,5691,4,0
-1672334393,7140339574,3.7248000808176585e-05,None,2827,5691,4,0
-1505052639,321209231,0.0003251670004829066,110.67991376476547,2827,5691,4,0
-6603016875,574466058,0.0042789700000867015,801.7275688850564,2827,5691,4,0
-360747888,1362941669,0.00214783199953672,390.19244662333114,2827,5691,4,0
-665115010,7140339575,0.002468380000209436,230.1918558703617,2827,5691,4,0
-2600543766,2608678959,0.0026851429993257625,357.32480845699075,2827,5691,4,0
-2608429635,473666764,0.005058562001067912,508.8591038499049,2827,5691,4,0
-306636859,1828254502,0.0029110860014043283,314.00106339887475,2827,5691,4,0
-360747406,574470577,9.675000001152512e-05,None,2827,5691,4,0
-317838699,600858466,0.0019972089994553244,243.3738181224468,2827,5691,4,0
-7286135500,549931423,0.00242345999868121,347.69665268511926,2827,5691,4,0
-1827499344,563194931,0.004748850000396487,486.4783004817786,2827,5691,4,0
-7321902568,2701786783,0.004153976000452531,413.4167974494645,2827,5691,4,0
-1672267673,2608428514,3.134299913654104e-05,None,2827,5691,4,0
-2617662111,418009261,0.005612105000182055,542.7127650614764,2827,5691,4,0
-316681913,549920915,0.002585989999715821,209.40704035959422,2827,5691,4,0
-3111465600,306636854,0.0022153000008984236,284.8839743555975,2827,5691,4,0
-1362941681,1828418208,0.00014938200001779478,38.08279832815822,2827,5691,4,0
-687135582,1929118326,0.0037253930004226277,422.5319993114704,2827,5691,4,0
-4016874588,45217432,0.0027105959998152684,162.7814542661217,2827,5691,4,0
-1672267848,1362941670,0.0027536680008779513,197.42807498913555,2827,5691,4,0
-2608597329,2608597414,7.563600047433283e-05,24.250914290851785,2827,5691,4,0
-473666779,4016874420,0.004047926999191986,662.0691548354674,2827,5691,4,0
-292484326,5609334125,0.003304578998722718,246.8784762493996,2827,5691,4,0
-1828277191,408478761,0.005397925999204745,511.74173668766315,2827,5691,4,0
-549931436,317839832,0.002778755999315763,290.01162457737996,2827,5691,4,0
-574459687,358407314,8.618600077170413e-05,26.4283022332109,2827,5691,4,0
-1827268628,4016873481,0.0012722129995381692,342.2073375224712,2827,5691,4,0
-1505057722,360757808,0.0019327890004205983,310.3364405891029,2827,5691,4,0
-1956302545,1829747762,0.003493967999020242,983.4639697397456,2827,5691,4,0
-408478744,1827520758,0.002363265999520081,907.8637028422908,2827,5691,4,0
-1505052444,7286240207,0.004468482999072876,583.6255399147286,2827,5691,4,0
-3123285393,4016874420,0.001338246998784598,110.1168946479104,2827,5691,4,0
-1756155427,474997347,0.0023422689992003143,366.0420378552742,2827,5691,4,0
-1821186334,793260945,0.00170308999986446,624.7792861275356,2827,5691,4,0
-7321902573,408478786,0.004678018000049633,457.6392812766023,2827,5691,4,0
-2616315927,2632841183,0.0028574200005095918,350.1883124819374,2827,5691,4,0
-1253880620,1672267779,0.0006585709998034872,252.99978531798945,2827,5691,4,0
-418009800,1929118187,0.005643030001010629,751.0177733056021,2827,5691,4,0
-6417387131,2608393065,0.0019914919994334923,338.9348445433285,2827,5691,4,0
-2608501857,360747431,0.001970856999832904,254.55517532312925,2827,5691,4,0
-2604685993,1929118225,0.00582785100050387,549.0222840409713,2827,5691,4,0
-1609256705,4226442917,0.00021061499865027145,129.99971083575585,2827,5691,4,0
-440870188,1821291310,0.005217203000938753,623.262611050659,2827,5691,4,0
-6448462031,574546129,0.004983156000889721,489.9704653435302,2827,5691,4,0
-1830468180,426930261,0.004752380000354606,584.737718785695,2827,5691,4,0
-574546136,1960033968,0.0052270859996497165,606.7570010182741,2827,5691,4,0
-288947635,318014980,0.001687931999185821,188.5411256908574,2827,5691,4,0
-2634485437,426930258,0.0038379119996534428,468.55534135619905,2827,5691,4,0
-2385218592,1293287346,0.0003270209999755025,205.6821289013954,2827,5691,4,0
-292724874,6448462002,0.0016745599987189053,199.39809308575832,2827,5691,4,0
-2700898238,1867147170,0.005693700000847457,619.2286054124086,2827,5691,4,0
-2598987665,2608394482,0.003963834000387578,356.5664036847147,2827,5691,4,0
+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
diff --git a/evaluation/results/example/queries/gasstation.csv b/evaluation/results/example/queries/gasstation.csv
index a145c27..01f1c55 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
-317839015,2608597414,0.014744856000106665,134.20641775784284,2827,5691,3,0.01360871699944255,0.00018580899995868094
-600866936,574459683,0.013445653003145708,42.73345795958952,2827,5691,3,0.01312823400076013,0.00012962000073457602
-1828400048,318014988,0.04508312200050568,12597.210765371754,2827,5691,3,0.013359325999772409,0.0001293499990424607
-1821291294,1253890891,0.015102212000783766,146.42601273567817,2827,5691,3,0.013108363998981076,0.00012954300109413452
-306636860,574546129,0.021913780999966548,480.5650193392354,2827,5691,3,0.014186061000145855,0.00016740600040066056
-1828269031,1293287346,0.013517352997951093,None,2827,5691,3,0.01333533599972725,0.00013080499957141
-7246644043,1785834373,0.04697897699952591,16215.671754130091,2827,5691,3,0.013071960000161198,0.00013017499986744951
-317767414,4903549431,0.01463343500290648,114.46003909259218,2827,5691,3,0.01367291500173451,0.0001311960004386492
-7286135580,1768859058,0.021128653997948277,395.84248183992185,2827,5691,3,0.01332887599892274,0.00015218999942590017
-4955445805,408478816,0.02038410500063037,567.4848259231705,2827,5691,3,0.014007543000843725,0.00013225700058683287
-1574635374,674511693,0.022711544999765465,550.0748943362573,2827,5691,3,0.013221170998804155,0.00013156100067135412
-574588784,408478820,0.015860685998632107,264.35687307965287,2827,5691,3,0.013269631999719422,0.0001433849993190961
-2608393065,1672267530,0.02120067899886635,None,2827,5691,3,0.012982984999325708,0.00012978899940208066
-475912313,316681910,0.03661696699964523,None,2827,5691,3,0.013272662999952445,0.00013025699990976136
-408478785,408478782,0.01335668800129497,34.41546978302828,2827,5691,3,0.013155561000530724,0.00013067400141153485
-6819437344,7030617904,0.020616521000192733,481.9151236333546,2827,5691,3,0.01325901500058535,0.00012987399895791896
-5576939246,426930264,0.01813270700040448,404.8320487549189,2827,5691,3,0.013295957000082126,0.00012982299995201174
-3462099368,6448461993,0.01492688800135511,336.8403336906005,2827,5691,3,0.013297892000991851,0.00013158399997337256
-2611491719,7322098539,0.015226998999423813,127.20440767277066,2827,5691,3,0.013001630999497138,0.00013032100105192512
-317766814,3211622700,0.017560330998094287,257.39751855926295,2827,5691,3,0.013642739999340847,0.00012993800010008272
-3211622691,317841016,0.01605682700210309,228.31392020003418,2827,5691,3,0.013104208001095685,0.00012974600031157024
-1672267793,2639898842,0.013576304998423439,None,2827,5691,3,0.013391410999247455,0.0001317349997407291
-687139205,473666781,0.05873310200149717,21284.78951469599,2827,5691,3,0.013105932001053588,0.00012953799887327477
-317944964,7074500840,0.09021241399932478,595.4046228774345,2827,5691,3,0.08123479099958786,0.00013472099999489728
-6001542006,6448462033,0.017114640000727377,239.60236102067614,2827,5691,3,0.013359926000703126,0.00013122900054440834
-2621386740,3307706689,0.06057792800129391,13757.751317810707,2827,5691,3,0.013323855000635376,0.00013254700024845079
-1368670343,1988057398,0.014174374999129213,None,2827,5691,3,0.013893127999835997,0.00013867599955119658
-318015014,1827520766,0.014037809001820278,133.73064158397338,2827,5691,3,0.013369598000281258,0.00013271900024847127
-418009256,1828418234,0.014920352001354331,372.47673656312475,2827,5691,3,0.013473558999976376,0.00013305900029081386
-7286135545,1505992832,0.01740010799949232,333.42180486451286,2827,5691,3,0.013229247999333893,0.00014976000056776684
-574588773,2628942175,0.019585927999287378,467.7994039103217,2827,5691,3,0.013428812999336515,0.0001361089998681564
-7286135582,574457822,0.019233685001381673,417.91642968790643,2827,5691,3,0.013392927001405042,0.0001359289999527391
-574465017,306639015,0.0597478650015546,11948.126563447147,2827,5691,3,0.013375279000683804,0.0001372440001432551
-3211622686,469733511,0.021443912000904675,438.215885183934,2827,5691,3,0.013558950000515324,0.00013508700067177415
-3299068955,292484330,0.02268162700056564,None,2827,5691,3,0.013668857000084245,0.00013551600022765342
-6389441585,2621462848,0.019520357998771942,345.8873681392482,2827,5691,3,0.014143837999654352,0.0001378009983454831
-6448462005,574465004,0.01950055200177303,365.66170716426467,2827,5691,3,0.013424208000287763,0.00013228100033302326
-563191209,2598868374,0.018871600999773364,459.08935453166885,2827,5691,3,0.01336402200104203,0.00013308099914866034
-474997349,574475518,0.01654568300182291,302.900774775551,2827,5691,3,0.013606008000351721,0.00014219400145520922
-5023014978,1828254500,0.04786720499942021,10707.018987925252,2827,5691,3,0.01381025699993188,0.00015112400069483556
-1975596505,574727042,0.013651896000737906,None,2827,5691,3,0.013381559001572896,0.00013056900024821516
-748845497,7321975008,0.018897404999734135,391.74819594588735,2827,5691,3,0.013289439999425667,0.00014768499931960832
-2608428534,1672334330,0.021730714997829637,None,2827,5691,3,0.013319596999281202,0.00013040299927524757
-408478758,7207579521,0.014967889997933526,411.93141465296424,2827,5691,3,0.013712717998714652,0.00013140599912730977
-4955446060,6448462007,0.015847341001062887,262.0362444929049,2827,5691,3,0.014349682000101893,0.0001306829999521142
-3522260318,306636859,0.01651672200023313,159.09788624831754,2827,5691,3,0.01415445800012094,0.0001315930003329413
-317944963,7115183097,0.014076691999434843,67.58201327566792,2827,5691,3,0.013358292999328114,0.00014350499986903742
-1672334393,7140339574,0.013464496998494724,None,2827,5691,3,0.013281780000397703,0.00013003399908484425
-1505052639,321209231,0.014089561000218964,110.67991376476547,2827,5691,3,0.013498858999810182,0.00013198099986766465
-6603016875,574466058,0.0556388879995211,17672.681488188096,2827,5691,3,0.013310446998730185,0.00013132400090398733
-360747888,1362941669,0.042388309999296325,390.19244662333114,2827,5691,3,0.03872365200004424,0.00013338899952941574
-665115010,7140339575,0.01687236499856226,230.1918558703617,2827,5691,3,0.013209437000114121,0.00013066399878880475
-2600543766,2608678959,0.01726994300042861,357.32480845699075,2827,5691,3,0.013283836999107734,0.0001558620006107958
-2608429635,473666764,0.021558593998634024,508.8591038499049,2827,5691,3,0.013297732999490108,0.0001312000003963476
-306636859,1828254502,0.017562312001246028,314.00106339887475,2827,5691,3,0.013473315999362967,0.00013170600141165778
-360747406,574470577,0.013888342999052838,None,2827,5691,3,0.013619646000734065,0.00013231999946583528
-317838699,600858466,0.016350759002307313,243.3738181224468,2827,5691,3,0.013412896001682384,0.00013206599942350294
-7286135500,549931423,0.017679720998785342,347.69665268511926,2827,5691,3,0.013455006999720354,0.00013131599916960113
-1827499344,563194931,0.020994309001252986,486.4783004817786,2827,5691,3,0.01335946500148566,0.0001309159997617826
-7321902568,2701786783,0.019514910001817043,413.4167974494645,2827,5691,3,0.013455555001200992,0.00013304500134836417
-1672267673,2608428514,0.013608981000288622,None,2827,5691,3,0.013438216999929864,0.0001318280010309536
-2617662111,418009261,0.021618426000713953,542.7127650614764,2827,5691,3,0.01330174199938483,0.00013181200120016
-316681913,549920915,0.01702238799953193,209.40704035959422,2827,5691,3,0.013606597998659709,0.00013064500126347411
-3111465600,306636854,0.016745760001867893,284.8839743555975,2827,5691,3,0.013415475999863702,0.0001328510006715078
-1362941681,1828418208,0.013417924003078952,38.08279832815822,2827,5691,3,0.013075033000859548,0.00013135700100974645
-687135582,1929118326,0.019515803000103915,422.5319993114704,2827,5691,3,0.013696173000425915,0.00013115399997332133
-4016874588,45217432,0.01602308900146454,162.7814542661217,2827,5691,3,0.013247868000689778,0.0001318220001849113
-1672267848,1362941670,0.01622420799867541,197.42807498913555,2827,5691,3,0.01338234799914062,0.0001311369996983558
-2608597329,2608597414,0.01330244800010405,24.250914290851785,2827,5691,3,0.013061052999546519,0.00015016500037745573
-473666779,4016874420,0.04831702699993912,9987.30777893103,2827,5691,3,0.01414532099988719,0.00013084300007903948
-292484326,5609334125,0.018099939001331222,246.8784762493996,2827,5691,3,0.01332767399981094,0.00013139000111550558
-1828277191,408478761,0.021816641001350945,511.74173668766315,2827,5691,3,0.013699850000193692,0.0001314210003329208
-549931436,317839832,0.0174974050023593,290.01162457737996,2827,5691,3,0.013432845000352245,0.00013076600043859798
-574459687,358407314,0.013416028998108231,26.4283022332109,2827,5691,3,0.013164205998691614,0.0001307200000155717
-1827268628,4016873481,0.015134676998059149,342.2073375224712,2827,5691,3,0.013234934998763492,0.00014741599989065435
-1505057722,360757808,0.016729213000871823,310.3364405891029,2827,5691,3,0.013792359000944998,0.00013292899893713184
-1956302545,1829747762,0.04730788099732308,None,2827,5691,3,0.013086324999676435,0.0001307379989157198
-408478744,1827520758,0.061721502997897915,None,2827,5691,3,0.013642284999150434,0.00013610399946628604
-1505052444,7286240207,0.020997281000745716,583.6255399147286,2827,5691,3,0.013311545000760816,0.00013124699944455642
-3123285393,4016874420,0.015367218000392313,110.1168946479104,2827,5691,3,0.013354204998904606,0.0001328470007138094
-1756155427,474997347,0.01668404600059148,366.0420378552742,2827,5691,3,0.013197324000429944,0.0001299779996770667
-1821186334,793260945,0.037566377002804074,9984.519106700938,2827,5691,3,0.013066467001408455,0.00013091900109429844
-7321902573,408478786,0.020922699999573524,457.6392812766023,2827,5691,3,0.013170170999728725,0.00013120900075591635
-2616315927,2632841183,0.018248206997668603,350.1883124819374,2827,5691,3,0.013384428999415832,0.00013132299864082597
-1253880620,1672267779,0.014399445999515592,252.99978531798945,2827,5691,3,0.013287362000482972,0.0001333069994871039
-418009800,1929118187,0.060067320002417546,32322.769678588895,2827,5691,3,0.013104875000863103,0.00013295400094648357
-6417387131,2608393065,0.016502829001183272,338.9348445433285,2827,5691,3,0.013328734999959124,0.00013170500096748583
-2608501857,360747431,0.015844211000512587,254.55517532312925,2827,5691,3,0.013066278999758651,0.0001306810008827597
-2604685993,1929118225,0.022591688999455073,549.0222840409713,2827,5691,3,0.014158453999698395,0.0001323020005656872
-1609256705,4226442917,0.014106370999797946,129.99971083575585,2827,5691,3,0.01368060200002219,0.00013204599963501096
-440870188,1821291310,0.05365529599839647,6773.4203800254845,2827,5691,3,0.013636416999361245,0.00014434999866352882
-6448462031,574546129,0.021721081997384317,489.9704653435302,2827,5691,3,0.013431795998258167,0.00013301800026965793
-1830468180,426930261,0.020933702997353976,584.737718785695,2827,5691,3,0.013944933998573106,0.00015768399862281512
-574546136,1960033968,0.06379088700123248,14417.01211043156,2827,5691,3,0.01344966099895828,0.00013384700105234515
-288947635,318014980,0.01575918699745671,188.5411256908574,2827,5691,3,0.013497629999619676,0.00013075799870421179
-2634485437,426930258,0.0199080150014197,468.55534135619905,2827,5691,3,0.013521945000320557,0.00013154299995221663
-2385218592,1293287346,0.014118840999799431,205.6821289013954,2827,5691,3,0.013440292999803205,0.00013218100139056332
-292724874,6448462002,0.01648463899982744,199.39809308575832,2827,5691,3,0.013632131000122172,0.00013203299931774382
-2700898238,1867147170,0.053762276000270504,6620.8462700027985,2827,5691,3,0.013260215999252978,0.00013100800060783513
-2598987665,2608394482,0.044826775998444646,356.5664036847147,2827,5691,3,0.03919520499948703,0.00013194999883126002
+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
diff --git a/evrouting/osm/imports.py b/evrouting/osm/imports.py
index 992834d..d7c2684 100644
--- a/evrouting/osm/imports.py
+++ b/evrouting/osm/imports.py
@@ -15,6 +15,7 @@ import copy
import xml.sax
import logging
import itertools
+from collections import namedtuple
import networkx as nx
import rtree
@@ -153,15 +154,7 @@ def read_osm(osm_xml_data, profile=car) -> OSMGraph:
return G
-class Node(object):
- def __init__(self, id, lon, lat):
- self.id = id
- self.lon = lon
- self.lat = lat
- self.tags = {}
-
- def __str__(self):
- return "Node (id : %s) lon : %s, lat : %s " % (self.id, self.lon, self.lat)
+Node = namedtuple('Node', ['id', 'lon', 'lat', 'tags'])
class Way(object):
@@ -232,7 +225,7 @@ class OSM(object):
@classmethod
def startElement(self, name, attrs):
if name == 'node':
- self.currElem = Node(attrs['id'], float(attrs['lon']), float(attrs['lat']))
+ self.currElem = Node(attrs['id'], float(attrs['lon']), float(attrs['lat']), tags={})
elif name == 'way':
self.currElem = Way(attrs['id'])
elif name == 'tag':
--
GitLab