diff --git a/routing-input/locations.csv b/routing-input/locations.csv
index 644fc70..8de8c47 100644
--- a/routing-input/locations.csv
+++ b/routing-input/locations.csv
@@ -1,623 +1,659 @@
 Afkorting,X,Y
 ht,51.69048,5.29362
-hto,51.700554,5.318333
-hde,52.40917,5.893611
+hto,51.700553894043,5.3183331489563
+hde,52.4091682,5.893611
 ahbf,50.7678,6.091499
-are,50.770176,6.1164665
-asch,50.76987,6.07383
+are,50.7701764828895,6.11646652221679
+asch,50.769871144942,6.07383012771606
 aw,50.78036,6.070715
-atn,51.921326,6.578627
+atn,51.9213265245505,6.57862722873687
 ac,52.2785,4.977
-eahs,52.079796,7.0163584
+eahs,52.079796120944,7.01635837554931
 aime,45.55438,6.64869
-aixtgv,43.52282,5.4453135
-akm,53.04639,5.8436112
+aixtgv,43.5228190773429,5.44531345367431
+akm,53.0463905334473,5.84361124038696
 albert,45.67302,6.38306
 aless,44.90927,8.60649
-amr,52.63778,4.7397223
-amrn,52.64389,4.764167
-aml,52.358055,6.6538887
-amri,52.341946,6.6666665
-almb,52.394165,5.2780557
+amr,52.6377792358398,4.73972225189209
+amrn,52.6438903808594,4.76416683197022
+aml,52.3580551147461,6.65388870239258
+amri,52.3419456481934,6.66666650772095
+almb,52.3941650390625,5.2780556678772
 alm,52.37503,5.21764
-almm,52.3675,5.1902776
-almo,52.40333,5.3005557
-almp,52.376667,5.2447224
-ampo,52.342777,5.151944
-apn,52.124443,4.657778
+almm,52.3675003051758,5.19027757644653
+almo,52.4033317565918,5.30055570602417
+almp,52.3766670227051,5.24472236633301
+ampo,52.342778,5.151944
+apn,52.1244430541992,4.65777778625488
 eabg,52.05223,7.481202
-amf,52.15389,5.3705554
-amfs,52.174824,5.4038887
-avat,52.19278,5.433889
-asa,52.34667,4.917778
-asb,52.31222,4.946944
-asd,52.378887,4.9002776
+amf,52.1538887023926,5.37055540084839
+amfs,52.1748221374512,5.40388870239258
+avat,52.1927795410156,5.43388891220093
+asa,52.3466682434082,4.91777801513672
+asb,52.3122215270996,4.94694423675537
+asd,52.3788871765137,4.90027761459351
 ashd,52.29844,4.95972
-asdl,52.357777,4.833889
-asdm,52.360554,4.9311113
-rai,52.337223,4.890278
+asdl,52.3577766418457,4.83388900756836
+asdm,52.3605537414551,4.93111133575439
+rai,52.3372230529785,4.89027786254883
 assp,52.35526,4.94651
-ass,52.38889,4.8377776
-asdz,52.33889,4.8716664
-ana,52.86722,4.811111
-berch,51.20018,4.4327703
+ass,52.3888893127441,4.83777761459351
+vmw,52.330134,4.92975
+asdz,52.3388900756836,4.871666431427
+ana,52.8672218322754,4.81111097335815
+berch,51.2001783,4.4327702
 atw,51.2161,4.42122
-atwlb,51.244938,4.425154
-andd,51.261684,4.4274316
+atwlb,51.2449375,4.4251543
+andd,51.261686,4.4274315
 fnzd,51.19785,4.39027
-apd,52.209167,5.970278
-apdm,52.205276,6.0005555
-apdo,52.21528,6.0044446
-apg,53.325813,6.8619576
-akl,51.871944,4.992778
-arn,51.501667,3.6691666
-ah,51.985,5.8991666
-ahpr,51.988056,5.9438887
-ahp,51.98528,5.9194446
-ahz,51.955,5.8519444
-asn,52.991665,6.570833
-ma,48.36543,10.885477
+apd,52.2091674804687,5.97027778625488
+apdm,52.2052764892578,6.00055551528931
+apdo,52.2152786254883,6.00444459915161
+apg,53.3258135,6.8619577
+akl,51.8719444274902,4.99277782440186
+arn,51.5016670227051,3.66916656494141
+ah,51.9850006103516,5.89916658401489
+ahpr,51.9880561828613,5.94388866424561
+ahp,51.985279083252,5.91944456100464
+ahz,51.9550018310547,5.85194444656372
+ashfd,51.14371,0.87612
+asn,52.9916648864746,6.57083320617676
+ma,48.3654307143927,10.88547706604
 avtgv,43.92194,4.78604
-brn,52.208332,5.2808332
-bh,52.309685,7.158537
+brn,52.2083320617676,5.28083324432373
+bh,52.309685595156,7.15853691101074
 nsch,53.1844,7.19937
-oeynh,52.20546,8.796932
+oeynh,52.205461,8.796932
 badsch,50.91851,14.14
 badenz,47.47638,8.30772
-rbb,48.79008,8.190468
-bf,53.360897,6.518558
-brd,51.85472,4.5533333
-bnc,52.14,5.5902777
-bnn,52.16139,5.5980554
+rbb,48.790082,8.190468
+bf,53.3608969,6.5185581
+brd,51.8547210693359,4.5533332824707
+bnc,52.1399993896484,5.59027767181396
+bnn,52.1613883972168,5.59805536270142
+bnz,52.128853,5.60246
 baselb,47.56815,7.6073
 basels,47.5474,7.58956
-bdm,53.306885,6.593054
-bk,50.9475,5.786667
-bsd,51.899445,5.1944447
-bl,52.85472,6.521111
-bgn,51.49389,4.296111
-gsb,52.548634,13.390427
+bdm,53.3068857,6.593054
+bk,50.9474983215332,5.78666687011719
+bsd,51.8994445800781,5.19444465637207
+bl,52.8547210693359,6.52111101150513
+llb,51.150833,4.088332
+bgn,51.4938888549805,4.29611110687256
 berhbl,52.52503,13.36946
-bhf,52.510498,13.434699
-bersud,52.475,13.364721
+berhbt,52.525555,13.369444
+bhf,52.5104989,13.4346995
+bpaf,52.47611,13.365
 berfl,52.3915,13.513
-bspd,52.534317,13.198947
-bet,51.51,5.389167
-bv,52.478333,4.6566668
-bielef,52.029263,8.532722
-bhv,52.13,5.203889
+bspd,52.5343152,13.1989467
+bet,51.5099983215332,5.38916683197022
+fbr,51.208056,4.259444
+bv,52.4783325195313,4.65666675567627
+bielef,52.029261,8.532722
+bhv,52.1300010681152,5.20388889312744
+fie,50.868333,5.509167
 bischo,47.41748,13.21991
-br,51.3725,6.155
-bll,52.404167,4.6275
+br,51.372501373291,6.15500020980835
+bll,52.404167175293,4.62750005722046
 bluden,47.15473,9.81456
-bdg,52.08139,4.746111
+bdg,52.0813903808594,4.7461109161377
 kboi,51.274323,6.274591
-bonn,50.732014,7.097125
+bonn,50.7320141646745,7.09712505340576
 fmb,51.09063,4.36057
 ebok,51.66988,7.45664
-bn,52.29889,6.7480555
-bsk,52.077778,4.6469445
+bn,52.2988891601562,6.74805545806885
+bsk,52.0777778625488,4.64694452285767
 bourg,45.61918,6.77167
 bhdv,51.832222,4.878056
-bkf,52.69611,5.2527776
-bkg,52.695,5.2377777
-bmr,51.644524,5.939033
+bkf,52.6961097717285,5.25277757644653
+bkg,52.6949996948242,5.23777770996094
+bmr,51.6445217676531,5.93903303146362
 btl,51.58433,5.31912
 brauns,52.25224,10.53971
-bd,51.595554,4.78
-bdpb,51.606388,4.7208333
-bremen,53.08348,8.813834
-bressx,50.64383,5.611254
+bd,51.5955543518066,4.78000020980835
+bdpb,51.606388092041,4.72083330154419
+bressx,50.643829,5.6112542
 bkl,52.17149,4.9906
-kbry,51.294617,6.241174
-fr,51.19767,3.217851
-bmn,52.09111,6.1469445
-brusl,50.89575,4.48113
-brusc,50.845467,4.3571134
-brusn,50.860527,4.3617873
-brusz,50.83501,4.3345957
-bp,53.256454,6.1446495
-bde,50.896946,5.7366667
-bnk,52.063057,5.1944447
-bsmz,52.265835,5.1630554
+kbry,51.294615,6.241174
+bmn,52.0911102294922,6.14694452285767
+fbnl,50.896389,4.481943
+brusc,50.8454658,4.3571135
+brusn,50.8605262,4.3617873
+brusz,50.8350108,4.3345957
+bp,53.2564547,6.1446496
+bde,50.8969459533691,5.73666667938232
+bnk,52.0630569458008,5.19444465637207
+bsmz,52.2658348083496,5.16305541992188
 ebeo,51.598015,7.757296
-buende,52.202076,8.573876
-cps,51.954166,4.5841665
-cas,52.545834,4.6586113
+buende,52.202075,8.573876
+cps,51.9541664123535,4.58416652679443
+cas,52.5458335876465,4.65861129760742
 chamb,45.57127,5.91953
-cvm,50.87611,6.0597224
+cvm,50.8761100769043,6.05972242355347
 chur,46.853333,9.528333
 ecmf,51.939,7.1642
-co,52.663612,6.7355556
+co,52.6636123657227,6.73555564880371
 como,45.80936,9.07325
-ck,51.72668,5.874295
-cl,51.946667,5.2269444
-da,52.44077,6.5759945
-dln,52.694168,6.7580557
-dl,52.498333,6.258611
-dvnk,52.14722,4.456389
+ck,51.7266825879048,5.87429523468017
+cl,51.9466667175293,5.22694444656372
+da,52.4407702,6.5759947
+dln,52.6941680908203,6.75805568695068
+dl,52.4983329772949,6.25861120223999
+dvnk,52.1472206115723,4.4563889503479
+dwe,53.24817,6.03463
 decin,50.77342,14.20125
-dei,53.188812,5.728157
-ddn,52.26,6.716111
-dt,52.006668,4.356389
-dtz,51.990833,4.3647223
-dz,53.333664,6.92408
-dzw,53.332085,6.906909
-dld,52.140278,5.242778
-gvc,52.080276,4.325
-gv,52.06972,4.3225
-laa,52.07861,4.3427777
-gvm,52.090557,4.3694444
-gvmw,52.05389,4.308611
-ypb,52.05528,4.3922224
-hdr,52.955276,4.7611113
-hdrz,52.9325,4.764167
-dn,51.455833,5.788889
-dv,52.2575,6.1605554
-dvc,52.25028,6.2144446
-did,51.933502,6.1324105
-dmn,52.345833,4.9655557
-dmnz,52.330276,4.9558334
-dr,52.045,6.1030555
-dtc,51.958595,6.2962146
-dtch,51.95914,6.259852
+dei,53.1888115,5.7281572
+ddn,52.2599983215332,6.7161111831665
+dt,52.0066680908203,4.35638904571533
+dtz,51.9908332824707,4.36472225189209
+dz,53.3336625,6.9240797
+dzw,53.3320834,6.9069092
+dld,52.1402778625488,5.24277782440186
+gvc,52.0802764892578,4.32499980926514
+gv,52.0697212219238,4.32250022888184
+laa,52.0786094665527,4.34277772903442
+gvm,52.0905570983887,4.36944437026978
+gvmw,52.0538902282715,4.3086109161377
+ypb,52.0552787780762,4.39222240447998
+hdr,52.9552764892578,4.76111125946045
+hdrz,52.9324989318848,4.76416683197022
+dn,51.4558334350586,5.78888893127441
+dv,52.2574996948242,6.16055536270142
+dvc,52.2502784729004,6.21444463729858
+did,51.933502,6.1324106
+dmn,52.345832824707,4.9655556678772
+dmnz,52.3302764892578,4.95583343505859
+gdp,50.910278,5.419722
+dr,52.0449981689453,6.10305547714233
+dtc,51.9585962,6.2962148
+dtch,51.9591413,6.2598521
 domod,46.11529,8.29624
-ddr,51.80722,4.6683335
-ddrs,51.801945,4.7166667
-ddzd,51.79,4.671389
+ddr,51.8072204589844,4.66833353042603
+ddrs,51.801944732666,4.71666669845581
+ddzd,51.7900009155273,4.67138910293579
 edd,51.56754,7.52855
-edo,51.517895,7.45929
-edkd,51.547077,7.510099
+edo,51.517896,7.45929
+edkd,51.547076,7.510099
 dresd,51.04056,13.73203
 dresdn,51.06581,13.741
-db,52.065277,5.258611
-drh,52.4425,4.6380553
-drp,53.177807,5.6347413
+db,52.0652770996094,5.25861120223999
+drh,52.4425010681152,4.63805532455444
+drp,53.1778086,5.6347411
 dron,52.5344,5.72089
-duisb,51.42978,6.7759037
-dvn,51.943333,6.0147223
-dvd,52.323334,4.936389
-kdul,51.25715,6.33793
+fdp,51.091389,4.493056
+duisb,51.4297785713316,6.77590370178222
+dvn,51.9433326721191,6.01472234725952
+dvd,52.3233337402344,4.93638896942139
+kdul,51.257149,6.33793
 edulh,51.827927,7.295756
 kdr,50.8094,6.48203
 dussel,51.220146,6.793137
-ec,51.100555,5.878889
-edc,52.04361,5.6683335
-ed,52.02778,5.6730556
+ebbs,51.44297,0.32095
+ec,51.1005554199219,5.87888908386231
+edc,52.0436096191406,5.66833353042603
+ed,52.0277786254883,5.67305564880371
 wtm,50.82317,5.92479
-edn,50.771946,5.71
-edf,50.78556,6.154367
-ehv,51.443333,5.481389
-ehb,51.45111,5.4558334
-lkr,51.28161,4.4341226
-est,51.916943,5.855
-emn,52.79,6.8994446
-emnz,52.748867,6.8747807
-em,51.834282,6.255718
-ekz,52.699165,5.286389
-eenp,51.304893,7.343285
-es,52.2225,6.89
-ese,52.22139,6.9511113
-esd,52.2375,6.838889
+edn,50.7719459533691,5.71000003814697
+edf,50.785561,6.154367
+ehb,51.4511108398438,5.45583343505859
+ehv,51.4433326721191,5.48138904571533
+ehs,51.4511108398438,5.45583343505859
+lkr,51.2816099,4.4341227
+est,51.9169425964355,5.85500001907349
+emn,52.7900009155273,6.89944458007812
+emnz,52.7488663746914,6.87478065490722
+em,51.834283,6.255718
+ekz,52.6991653442383,5.28638887405396
+eenp,51.304892,7.343285
+es,52.2224998474121,6.8899998664856
+ese,52.2213897705078,6.95111131668091
+esd,52.2374992370605,6.83888912200928
+esk,52.2374992370605,6.83888912200928
 eepe,52.18346,7.03009
-eml,52.301666,5.6147223
-esch,50.813534,6.251937
-escht,50.81476,6.263203
-eschn,50.812828,6.293846
-eweis,50.82437,6.320676
-eschw,50.81771,6.251721
+eml,52.3016662597656,5.61472225189209
+esch,50.813532,6.251937
+escht,50.814759,6.263203
+eschn,50.812827,6.293846
+eweis,50.824371,6.320676
+eschw,50.817712,6.251721
 esn,51.46261,4.45129
-etn,51.575,4.6358333
-egh,50.890556,6.045
-eghm,50.89605,6.0602474
+etn,51.5750007629395,4.63583326339722
+egh,50.8905563354492,6.04500007629395
+eghm,50.8960498196442,6.0602474212646396
+fwd,53.2351834,5.9886615
 fieber,47.49111,12.528
-fn,53.18245,5.5483093
-fffm,50.10712,8.663834
+fn,53.1824488,5.5483094
+fffm,50.1071222,8.6638338
 franko,52.336163,14.546509
-fnaf,50.05317,8.570237
+fnaf,50.0531710299286,8.570237159729
 rf,47.99789,7.84134
 gdr,51.93074,6.3486
 gdk,52.47625,6.56674
-geisl,48.619476,9.84184
-gdm,51.88278,5.271111
-gp,51.419724,5.5505557
-gln,50.966946,5.8430557
-lut,50.975555,5.8247223
-fgsp,51.036175,3.710847
-gz,51.58361,4.926111
-gbr,52.218613,6.9744444
-gs,51.498055,3.8905556
-go,52.230278,6.5844445
-gr,51.83389,4.9683332
-gd,52.0175,4.7044444
-gdg,52.015,4.7408333
-gbg,52.609165,6.675833
-gk,53.25574,6.3097787
+geisl,48.6194774237368,9.84184026718139
+gdm,51.88301,5.27127
+gp,51.4197235107422,5.55055570602417
+gln,50.9669456481934,5.84305572509766
+lut,50.9755554199219,5.82472229003906
+gz,51.583610534668,4.92611122131348
+gbr,52.2186126708984,6.97444438934326
+lgl,50.750277,5.535278
+gs,51.4980545043945,3.89055562019348
+go,52.2302780151367,6.58444452285767
+gr,51.8338890075684,4.96833324432373
+gd,52.0175018310547,4.70444440841675
+gdg,52.0149993896484,4.7408332824707
+gbg,52.6091651916504,6.67583322525024
+gk,53.2557403255735,6.30977869033813
 g,52.21521,7.022109
-gn,53.210556,6.564722
-gerp,53.20489,6.58519
-gnn,53.23015,6.5563173
-gw,53.08889,5.8225
-wij,50.833057,5.898056
-tgo,48.70019,9.651685
-mgzb,48.460224,10.278707
-hlm,52.38778,4.6383333
-hlms,52.38278,4.6730556
+gn,53.2105560302734,6.56472206115723
+gerp,53.20480027,6.5854178
+gnn,53.2301469,6.5563172
+gw,53.0888900756836,5.82250022888184
+wij,50.833056,5.898056
+tgo,48.700191,9.651685
+mgzb,48.460226,10.278707
+hlm,52.3877792358398,4.63833332061768
+hlms,52.3827781677246,4.67305564880371
 hagen,51.362747,7.460249
-hwzb,52.384724,4.751667
-hamh,53.55264,10.00671
+hwzb,52.385935,4.747165
+hamh,53.5526394,10.0067103
 hamm,51.678078,7.807821
-hann,52.37704,9.741676
-hdb,52.572777,6.628611
-hd,52.3375,5.6197224
+hann,52.3770401,9.7416759
+hdb,52.5727767944336,6.62861108779907
+hd,52.3375015258789,5.61972236633301
 hbzm,51.82944,4.81556
-gnd,51.830555,4.8358335
-hrn,53.17611,6.6172223
-hlg,53.17042,5.4251933
-hlgh,53.174915,5.4112887
-hk,52.495277,4.6869445
-had,52.359165,4.6066666
-hr,52.961388,5.9141665
-hry,52.935276,5.9438887
-hwd,52.669724,4.8227777
-hrl,50.890835,5.975
-hrlk,50.890167,5.9933424
+gnd,51.8305549621582,4.83583354949951
+hrn,53.1761093139648,6.61722230911255
+hlg,53.1704205,5.4251932
+hlgh,53.174917,5.4112885
+fhs,50.930555,5.3275
+hk,52.4952774047852,4.68694448471069
+had,52.3591651916504,4.60666656494141
+hr,52.9613876342773,5.91416645050049
+hry,52.9352760314941,5.94388866424561
+hwd,52.6697235107422,4.82277774810791
+hrl,50.8908348083496,5.97499990463257
+hrlk,50.8901689328708,5.99334239959716
 hrlw,50.896667,5.952222
-hze,51.385,5.5694447
-mid,51.364826,4.4604306
-hlo,52.599445,4.7005553
-hno,52.427223,6.2211113
-hm,51.475555,5.6619444
-hmh,51.468056,5.6313887
-hmbv,51.462223,5.607222
-hmbh,51.470276,5.7033334
+hze,51.3849983215332,5.56944465637207
+mid,51.364828,4.4604308
+hlo,52.5994453430176,4.70055532455444
+hno,52.4272232055664,6.22111129760742
+hm,51.4755554199219,5.66194438934326
+hmh,51.46794,5.63085
+hmbv,51.4622230529785,5.60722208023071
+hmbh,51.47068,5.70177
 lkm,51.13624,4.33828
-hmn,51.922215,5.6737256
-hgl,52.261665,6.793889
-hglg,52.261665,6.773611
-hglo,52.26889,6.8194447
-hz,50.870914,6.094486
-hil,52.3025,4.5655556
-hvs,52.225834,5.1819444
-hvsm,52.238056,5.1738887
-hvsp,52.21611,5.187222
-hnp,52.94649,5.423063
+hmn,51.9222129,5.6737254
+hgl,52.2616653442383,6.79388904571533
+hglg,52.261667,6.773611
+hglo,52.2688903808594,6.81944465637207
+lhs,50.66076,5.62231
+hz,50.870916,6.094486
+hil,52.3025016784668,4.56555557250977
+hvs,52.2258338928223,5.18194437026978
+hvsm,52.2380561828613,5.17388868331909
+hvsp,52.2161102294922,5.18722200393677
+hnp,52.9464903,5.423063
 foe,51.18285,4.34831
-hld,51.975277,4.128889
-hlds,51.981667,4.1197224
-hb,50.905556,5.9305553
+hld,51.9752769470215,4.1288890838623
+hlds,51.9816665649414,4.11972236633301
+hb,50.9055557250977,5.93055534362793
 hvl,52.16652,5.45718
-hor,52.177776,5.179167
-hon,52.28389,6.4202776
-holt,51.998676,7.1223164
-ehzw,51.50477,7.619647
-hfd,52.293335,4.7005553
-hgv,52.73389,6.473611
-hgz,53.159817,6.770754
-hks,52.690556,5.183889
-hn,52.644722,5.0555553
-hnk,52.65361,5.0855556
+hor,52.1777763366699,5.17916679382324
+hon,52.2838897705078,6.42027759552002
+ehzw,51.504767,7.619647
+hfd,52.2933349609375,4.70055532455444
+hgv,52.7338905334473,6.47361087799072
+hgz,53.1598181316756,6.77075386047363
+hks,52.6905555725098,5.18388891220093
+hn,52.6447219848633,5.05555534362793
+hnk,52.6536102294922,5.08555555343628
 hopf,47.45525,12.14921
-hrt,51.426388,6.042222
-htn,52.035,5.1675
-htnc,52.01724,5.179281
-sgl,50.873333,5.797222
-mho,51.15361,4.465278
-hdg,53.218777,5.934543
-ijt,53.01466,5.6160803
+hrt,51.4263877868652,6.04222202301025
+htn,52.03402,5.16821
+htnc,52.01701,5.17949
+sgl,50.8733329772949,5.79722213745117
+mho,51.153611,4.465278
+hdg,53.2187783,5.934543
+ijt,53.0146614,5.6160801
 innsb,47.26328,11.401
 jenbac,47.38844,11.77841
-kn,51.327183,6.203225
-fkth,51.391,4.4668202
-kpn,52.559723,5.9216666
+kn,51.327184,6.203225
+fkth,51.3909989,4.4668202
+kpn,52.5597229003906,5.92166662216186
 kpnz,52.5331,5.91309
-bzl,51.480835,3.9561112
+bzl,51.4808349609375,3.95611119270325
 lkp,51.31362,4.43262
-karlsr,48.99362,8.400743
-krd,50.861668,6.0575
+karlsr,48.9936223,8.400743
+krd,50.8616676330566,6.05749988555908
 krw,50.85355,6.02578
-ktr,51.931385,5.5833464
+ktr,51.9313869,5.5833465
 gkt,51.37867,4.46722
 kirchb,47.44921,12.30953
 kitzb,47.45411,12.39104
-kbk,52.178055,6.083611
-kmr,50.86639,5.8905554
-kko,50.351086,7.588649
-kohl,50.83173,6.074485
+kbk,52.1780548095703,6.08361101150513
+kmr,50.8663902282715,5.8905553817749
+kko,50.351085,7.588649
+kohl,50.831728,6.074485
 konin,52.23702,18.22069
-fki,51.13389,4.476667
-kbw,52.45861,4.8055553
-kzd,52.469166,4.805
-kmw,52.90282,5.4106913
-kbd,51.433334,4.1169443
-kma,52.49454,4.761243
-kw,53.161736,6.7220883
-krg,51.465,4.0372224
+fki,51.133889,4.476667
+kbw,52.458610534668,4.80555534362793
+kzd,52.469165802002,4.80499982833862
+kmw,52.9028197,5.4106913
+kbd,51.4333343505859,4.11694431304932
+kma,52.49511,4.75417
+kw,53.1617362,6.7220882
+krg,51.4650001525879,4.03722238540649
 kufst,47.5831,12.16568
 kutno,52.22694,19.34859
-koln,50.943214,6.9589214
-kkd,50.940872,6.975001
-zlw,51.691113,4.6630554
+koln,50.9432158,6.9589214
+kkd,50.940874,6.975001
+zlw,51.6911125183105,4.66305541992188
 land,47.14824,10.57839
-lg,50.89639,6.0191665
+lg,50.8963890075684,6.01916646957398
 landq,46.96722,9.5538
 landry,45.57414,6.73378
-lang,50.817524,6.355194
+lang,50.817525,6.355194
 leer,53.23165,7.465283
-ldm,51.894722,5.0913887
-lw,53.195835,5.792222
+ldm,51.8947219848633,5.09138870239258
+lw,53.1958351135254,5.79222202301025
 adh,53.19889,5.81639
-lwc,53.20218,5.8422966
+lwc,53.2021808,5.8422968
 elgd,52.034924,7.088538
-ledn,52.16611,4.4816666
-ldl,52.146946,4.4925
-lls,52.50778,5.472778
+ledn,52.1661109924316,4.48166656494141
+ldl,52.1469459533691,4.49249982833862
+lls,52.5077781677246,5.47277784347534
 elet,51.8925,7.187
 leuven,50.88136,4.71568
 ltv,52.01188,6.59641
-lillee,50.639442,3.074722
-flb,50.3825,8.096112
+lsl,50.69822,5.56848
+lillee,50.639444,3.074722
+flb,50.382498,8.096112
 livor,43.56446,10.33529
 luik,50.62436,5.56648
-lc,52.166668,6.4263887
-lp,53.334713,6.7472625
-ltn,52.085278,5.6244445
+luikj,50.64051,5.56197
+luikp,50.64648,5.57072
+lc,52.1666679382324,6.42638874053955
+flk,51.107777,3.9875
+londs,51.53239,0.12716
+lp,53.3347145,6.7472625
+ltn,52.085277557373,5.62444448471069
 eldh,51.76184,7.43165
 elue,51.61713,7.52949
-mz,51.30376,5.630343
-mrn,52.064167,5.37
-mas,52.135277,5.0336113
-mss,51.91611,4.254722
-msw,51.925835,4.236111
-mt,50.850277,5.7055554
+mz,51.3037623603504,5.63034296035766
+mrn,52.0641670227051,5.36999988555908
+mas,52.1352767944336,5.03361129760742
+mss,51.9161109924316,4.25472211837769
+msw,51.9258346557617,4.23611116409302
+mt,50.8502769470215,5.70555543899536
 mtn,50.87087,5.71774
-mtr,50.83861,5.717222
-magdeb,52.13035,11.62689
-mannhe,49.479355,8.468921
-mg,53.12964,5.7131996
-mrb,52.509445,6.575278
+mtr,50.8386116027832,5.71722221374512
+fmz,50.001117,8.25872
+mannhe,49.479354,8.468921
+mg,53.1296368,5.7131996
+mrb,52.5094451904297,6.57527780532837
 marne,48.86826,2.78218
 mars,43.30381,5.38195
-mth,53.160725,6.7402987
+mth,53.1607232,6.7402989
 mech,51.01786,4.48306
 lnk,51.03,4.49
-mes,50.88288,5.7509995
-mp,52.690834,6.1975
-emte,52.162445,7.254423
-mdb,51.49472,3.6172223
-minden,52.29014,8.934728
-kmb,50.444836,7.825333
-mmlh,51.756943,5.872778
+mes,50.882879392551,5.75099945068359
+lm,51.210556,4.286667
+mp,52.6908340454102,6.19750022888184
+emte,52.162444,7.254423
+mdb,51.4947204589844,3.61722230911255
+bltm,50.69301,5.59983
+minden,52.290138,8.934728
+kmb,50.444834,7.825333
+mmlh,51.77158,5.88145
 gmd,51.1825,4.447222
-gmog,51.171112,4.455833
+gmog,51.171111,4.455833
 mout,45.48664,6.53105
 mcgb,51.196583,6.446111
-munchh,48.1402,11.558347
-munst,51.95689,7.635895
-enhf,51.984985,7.63861
+munchh,48.1402033359505,11.558346748352
+munst,51.956892,7.635895
+enhf,51.984987,7.63861
 enbe,52.022327,7.562668
-ndb,52.280277,5.1569443
+ndb,52.2802772521973,5.15694427490234
 neuss,51.20444,6.68468
 lni,51.11154,4.33845
-na,52.718613,6.848611
-nvp,52.25889,4.6455555
-nwk,51.96528,4.6169443
-nkk,52.22222,5.493889
-nm,51.843613,5.8522224
-nmd,51.824165,5.7955556
-nmh,51.826946,5.8675
-nml,51.8642,5.8595
+na,52.7186126708984,6.84861087799072
+nvp,52.2588882446289,4.64555549621582
+nwk,51.9652786254883,4.61694431304932
+fnu,51.185556,4.185832
+nkk,52.2222213745117,5.49388885498047
+nm,51.8436126708984,5.85222244262695
+nmd,51.8241653442383,5.79555559158325
+nmgo,51.8273,5.822722
+nmh,51.8269462585449,5.86749982833862
+nml,51.861811,5.859686
 nvd,52.36555,6.471111
+ndkp,51.3573,4.63273
 enow,52.077618,7.461706
-ns,52.370834,5.785278
-nh,50.919445,5.892778
-nurnb,49.44496,11.082609
-obd,52.678055,4.9072223
+ns,52.3708343505859,5.78527784347534
+nh,50.9194450378418,5.89277791976929
+nurnb,49.4449634,11.0826087
+obd,52.6780548095703,4.90722227096558
 oberh,51.47512,6.852038
-eop,52.201702,7.182643
+eop,52.201703,7.182643
 ro,48.476475,7.946723
-ot,51.582222,5.1941667
-odz,52.30639,6.9347224
-ost,52.33472,6.1130557
-omn,52.509445,6.4158335
-olv,52.583332,4.686667
-fsd,51.22817,2.9258
-otb,51.995,5.84
-op,51.926163,5.6371145
-osnh,52.27285,8.061781
-o,51.765556,5.5322223
-ow,51.758057,5.5055556
-odb,51.587776,4.5333333
-ovn,52.39111,4.606111
+ot,51.5822219848633,5.19416666030884
+odz,52.3063888549805,6.93472242355347
+ost,52.3347206115723,6.11305570602417
+omn,52.5094451904297,6.41583347320557
+otb,51.9949989318848,5.84000015258789
+op,51.9261615,5.6371145
+osnh,52.272851,8.061781
+o,51.7655563354492,5.53222227096558
+ow,51.758056640625,5.50555562973022
+odb,51.587776184082,4.53333330154419
+ovn,52.3911094665527,4.6061110496521
 paris,48.87977,2.35575
 tp,48.71308,9.41081
 pozn,52.40199,16.91087
 praha,50.08306,14.435
 prahol,50.1102,14.44
 eprn,51.58833,7.53933
-pmr,52.503056,4.953611
-pmo,52.51139,4.9683332
-pmw,52.49659,4.9356294
-pt,52.265,5.575278
+pmr,52.5030555725098,4.95361089706421
+pmo,52.5113906860352,4.96833324432373
+pmw,52.4965906325416,4.93562936782836
+pt,52.2649993896484,5.57527780532837
 frp,51.07716,4.28273
-rat,52.391666,6.2775
-rvs,51.794167,5.6358333
-rv,51.28322,6.0789585
-rh,52.01,6.0305557
-rheine,52.2763,7.434255
-rhn,51.95861,5.5783334
-rsn,52.31222,6.520278
-rsw,52.039722,4.3191667
-rb,51.42278,4.161111
-rm,51.193054,5.994167
-rd,53.419212,6.760617
-rsd,51.54028,4.4583335
-ehw,51.999466,7.121501
-rs,51.71472,5.3680553
-rta,51.951946,4.5536113
-rtb,51.920277,4.4888887
-rtd,51.925,4.4688888
-rlb,51.88,4.5313888
-rtn,51.942223,4.4816666
-rtst,51.89389,4.519722
-rtz,51.904446,4.5102777
+rat,52.3916664123535,6.27750015258789
+lrw,52.599444,12.354721
+rvs,51.7941665649414,5.63583326339722
+rv,51.2832191665301,6.07895851135253
+rh,52.0099983215332,6.03055572509766
+rheine,52.276299,7.434255
+rhn,51.958610534668,5.57833337783814
+rsn,52.3122215270996,6.52027797698975
+rsw,52.039722442627,4.31916666030884
+rb,51.422779083252,4.16111087799072
+rm,51.1930541992188,5.9941668510437
+rd,53.4192128,6.7606167
+rsd,51.5402793884277,4.45833349227905
+ehw,51.9994672604096,7.1215009689331
+rs,51.7147216796875,5.36805534362793
+rta,51.9519462585449,4.55361127853394
+rtb,51.9202766418457,4.48888874053955
+rtd,51.9249992370605,4.46888875961304
+rlb,51.8800010681152,4.53138875961304
+rtn,51.9422225952148,4.48166656494141
+rtst,51.8938903808594,4.51972198486328
+rtz,51.9044456481934,4.51027774810791
 fsv,51.08115,4.32551
-rl,52.08109,6.4492655
+rl,52.0810888,6.4492656
 rzepin,52.35022,14.81507
 saalf,47.42684,12.82942
-sptn,52.433887,4.6325
-sptz,52.419724,4.6313887
-spm,53.158916,6.7955647
-ssh,52.21528,4.517222
+sptn,52.4338874816895,4.63250017166138
+sptz,52.4197235107422,4.63138866424561
+spm,53.1589183,6.7955648
+ssh,52.215278,4.517222
 swd,53.29113,6.5404
-sgn,52.784443,4.805278
-sda,53.165535,6.9777775
+sgn,52.7844429016113,4.80527782440186
+sda,53.1655362,6.9777775
 schll,51.12555,4.34023
-sdm,51.921246,4.4089937
-nwl,51.922222,4.382222
-sog,50.856388,5.8722224
-sn,50.939167,5.8744445
-shl,52.309444,4.7619443
+sdm,51.9212438128032,4.4089937210083
+nwl,51.9222221374512,4.38222217559814
+sog,50.856388092041,5.87222242355347
+sn,50.9391670227051,5.87444448471069
+shl,52.3094444274902,4.76194429397583
 schwar,47.31853,13.15446
-kswe,51.290527,7.289681
-esrt,51.44228,7.55896
-esem,51.707886,7.453396
+kswe,51.290526,7.289681
+esrt,51.442281,7.55896
+esem,51.707885,7.453396
 eseb,51.692947,7.454829
-ksb,50.79394,7.2030015
-spv,50.831474,5.979738
+ksb,50.7939411,7.2030017
+spv,50.8314750744184,5.97973823547363
+lsw,51.143333,4.068889
 fwa,51.07,4.496111
-std,51.001667,5.858611
-sdt,51.829723,4.778333
-sdtb,51.829723,4.743333
-sk,53.032867,5.6523967
-sknd,53.04093,5.663181
-st,52.173332,5.31
-stz,52.16528,5.303056
-sd,52.183613,5.3
-sbk,50.943054,5.8516665
+fsn,51.171944,4.144167
+std,51.0016670227051,5.85861110687256
+sdt,51.8297233581543,4.77833318710327
+sdtb,51.829722,4.743333
+sk,53.0328688,5.6523969
+sknd,53.0409319,5.6631808
+st,52.1733322143555,5.30999994277954
+stz,52.1652793884277,5.30305576324463
+sd,52.1836128234863,5.30000019073486
+sbk,50.9430541992188,5.85166645050049
 sph,50.85355,6.02578
 maria,51.29126,4.43495
 stjohp,47.34811,13.19486
 stjoh,47.51962,12.43079
-stv,52.886555,5.360021
-stm,53.32621,6.6875553
-swk,52.79151,6.114556
-egrk,52.12344,7.376031
-ebgo,52.11879,7.397581
-ebft,52.147385,7.32934
+stv,52.8865535,5.3600212
+stm,53.3262092,6.6875551
+swk,52.7915109924316,6.11455576324463
+ebgo,52.118791,7.397581
+ebft,52.147384,7.32934
+egrk,52.123439,7.376031
 ls,52.594723,11.854412
-stola,50.76394,6.230287
+stola,50.763938,6.230287
 stolgb,0.0,0.0
-stolb,50.794918,6.218432
-stolmb,50.77359,6.223898
-stolr,50.768772,6.229604
+stolb,50.794917,6.218432
+stolmb,50.773589,6.223898
+stolr,50.768774,6.229604
 stolsm,50.784904,6.219012
 ts,48.784084,9.181635
-srn,51.06139,5.8630557
+srn,51.0613899230957,5.86305570602417
 sm,51.23582,6.03228
 wta,53.26928,14.34793
 tg,51.33894,6.14253
-tbg,51.922455,6.3642464
-tl,51.889446,5.422222
-tpsw,51.87389,5.3922224
-tb,51.560555,5.083611
-tbr,51.573612,4.9944444
-tbu,51.565,5.051111
-twl,52.237778,6.098611
-utg,52.521667,4.701667
-uhz,53.409958,6.6748867
-uhm,53.414585,6.7202973
-tu,48.399014,9.982165
-eun,51.53858,7.695306
-ust,53.401474,6.6093774
+tbg,51.9224549,6.3642466
+tl,51.8894462585449,5.42222213745117
+tpsw,51.8738899230957,5.39222240447998
+tb,51.5605545043945,5.08361101150513
+tbr,51.5736122131348,4.99444437026978
+tbu,51.564998626709,5.05111122131348
+ftg,50.784167,5.473056
+twl,52.2377777099609,6.09861087799072
+utg,52.5216674804687,4.70166683197022
+uhz,53.4099568,6.6748869
+uhm,53.4145845,6.7202975
+tu,48.399015,9.982165
+eun,51.5385828,7.6953056
+ust,53.4014742,6.6093776
 usti,50.65956,14.04473
-ut,52.08889,5.1102777
+ut,52.0888900756836,5.11027765274048
 utlr,52.09896,5.06523
-utl,52.065556,5.1441665
-utm,52.087776,5.1313887
-uto,52.11,5.124722
-utt,52.100555,5.0416665
-utzl,52.103054,5.09
+utl,52.0655555725098,5.14416646957397
+utm,52.087776184082,5.13138866424561
+uto,52.1100006103516,5.12472200393677
+utt,52.1005554199219,5.04166650772095
+utzl,52.103055,5.09
 valtgv,44.9278,4.89321
-vk,50.86972,5.832222
-vsv,51.937256,6.458839
+vk,50.8697204589844,5.83222198486328
+vsv,51.937257,6.458839
 vdm,53.10324,6.88475
-vndc,52.02,5.548611
-vndw,52.028057,5.5313888
-klp,52.045834,5.573889
-vwd,53.235184,5.9886613
-vp,51.99472,5.980278
-vl,51.36361,6.1727777
-vry,51.52657,6.014178
+vndc,52.0200004577637,5.54861116409302
+vndw,52.0280570983887,5.53138875961304
+klp,52.0458335876465,5.57388877868652
+vwd,53.2351834,5.9886615
+vp,51.9947204589844,5.98027801513672
+vl,51.3636093139648,6.17277765274048
+vry,51.526568099007,6.01417779922485
 vlb,51.59193,5.99714
 viers,51.25516,6.40388
 fvs,50.73781,5.69232
-vdg,51.903057,4.3441668
-vdo,51.91028,4.3616667
-vdw,51.904167,4.3130555
-vtn,52.103054,5.0108333
-vs,51.445835,3.5952778
-vss,51.46472,3.5952778
-vdl,50.887222,5.930278
-vb,52.066666,4.3594446
-vh,52.224445,4.4844446
-vst,52.12528,4.4325
-vem,52.1575,6.143611
-vd,52.107193,6.3170457
+vdg,51.9030570983887,4.34416675567627
+vdo,51.9102783203125,4.36166667938232
+vdw,51.904167175293,4.31305551528931
+vtn,52.1030540466309,5.01083326339722
+vs,51.4458351135254,3.59527778625488
+vss,51.4647216796875,3.59527778625488
+vdl,50.8872222900391,5.93027782440186
+vb,52.0666656494141,4.3594446182251
+vh,52.2244453430176,4.4844446182251
+vst,52.1252784729004,4.43249988555908
+vem,52.1575012207031,6.14361095428467
+vd,52.1071949,6.3170457
 vz,52.40203,6.60041
-vhp,52.45719,6.569668
-vg,51.655556,5.2919445
-wad,52.044167,4.649722
-wadn,52.055,4.6483335
-wfm,53.390842,6.5671363
+vhp,52.4571921,6.5696679
+vg,51.6555557250977,5.29194450378418
+wad,52.0441665649414,4.6497220993042
+wadn,52.0550003051758,4.64833354949951
+wfm,53.3908431,6.5671364
 warszc,52.22886,21.00323
 warsaw,52.25155,21.05233
 wr,53.16311,7.3442
-wt,51.24861,5.703611
-wp,52.31278,5.0430555
-wl,51.957806,6.213844
+wt,51.2486114501953,5.70361089706421
+wp,52.3127784729004,5.04305553436279
+wl,51.9578065,6.213844
 wtv,51.96286,5.9695
-wz,52.454166,6.0025
+wz,52.4541664123535,6.00250005722046
 wienw,48.19687,16.33727
-wdn,52.36139,6.5916667
-wc,51.81167,5.7308335
-wh,52.390278,6.1405554
-gwd,51.427708,4.463396
-ws,53.139236,7.035101
-wsm,53.3301,6.5202904
-ww,51.96773,6.715518
+wdn,52.3613891601562,6.59166669845581
+wc,51.8116683959961,5.73083353042603
+wh,52.3902778625488,6.1405553817749
+gwd,51.4277061,4.4633962
+ws,53.1392377,7.035101
+wsm,53.3300994,6.5202905
+ww,51.9677307,6.7155181
 www,51.97453,6.70417
-wd,52.085,4.893611
-wf,52.005554,5.793611
-hwob,52.429493,10.788195
-wv,52.880833,6.003611
-wk,52.972485,5.4564285
-wm,52.489166,4.792222
+wd,52.0849990844727,4.89361095428467
+wf,52.0055541992188,5.7936110496521
+hwob,52.429492,10.788195
+wv,52.8808326721191,6.00361108779907
+wk,52.9724864,5.4564285
+wm,52.4891662597656,4.79222202301025
 kwba,51.267082,7.195929
 wupph,51.25433,7.14939
-kwo,51.273838,7.221483
+kwo,51.273839,7.221483
 wuppv,51.23351,7.07237
 worgl,47.49178,12.06059
 wurzb,49.80179,9.9358
-zd,52.43889,4.813611
-zdk,52.456665,4.8202777
-zbm,51.808887,5.2633333
-zvt,52.37528,4.532778
+zd,52.4388885498047,4.81361103057861
+zdk,52.4566650390625,4.82027769088745
+zbm,51.8088874816895,5.26333332061768
+zvt,52.3752784729004,4.53277778625488
 zell,47.32053,12.79658
-za,51.920055,5.722841
-zv,51.923054,6.071944
+za,51.920056,5.7228408
+zv,51.9230537414551,6.07194423675537
 zvb,51.64042,4.60904
-ztm,52.0475,4.4772224
-ztmo,52.04639,4.492778
-zb,53.15961,6.867914
-zh,53.24863,6.406236
-zp,52.14528,6.1941667
+ztm,52.0475006103516,4.47722244262695
+ztmo,52.0463905334473,4.49277782440186
+zb,53.1596122800056,6.8679141998291
+zh,53.2486292,6.4062361
+zp,52.1452789306641,6.19416666030884
 zww,53.24817,6.03463
-zwd,51.815,4.641667
-zl,52.504723,6.091944
+zwd,51.814998626709,4.64166688919067
+lzd,51.214167,4.33
+zl,52.5047225952148,6.09194421768188
 zue,47.37819,8.5392
 oetz,47.23848,10.85911
+gsb,52.548634,13.390427
+bersud,52.475,13.364721
+bremen,53.08348,8.813834
+fr,51.19767,3.217851
+brusl,50.89575,4.48113
+fgsp,51.036175,3.710847
+holt,51.998676,7.1223164
+magdeb,52.13035,11.62689
+olv,52.583332,4.686667
+fsd,51.22817,2.9258
 custom-additions-start-here,0,0
+nvdw,52.36555,6.471111
 mtn,50.87087,5.72
 dvd_hoog,52.323646,4.936393
 dvd_laag,52.323334,4.936389
diff --git a/routing-input/pairs.csv b/routing-input/pairs.csv
index 18130f9..80d0281 100644
--- a/routing-input/pairs.csv
+++ b/routing-input/pairs.csv
@@ -66,6 +66,7 @@ Bdg,Apn
 Bdm,Stm
 Bdpb,Zlw
 Bet,Ehb
+Bet,Ehs
 Bf,Wfm
 Bgn,Rb
 Bhdv,Gnd
@@ -81,8 +82,10 @@ Bmn,Zp
 Bmr,Vlb
 Bn,Hgl
 Bnc,Ltn
+Bnz,Ltn
 Bnk,Db
 Bnn,Bnc
+Bnc,Bnz
 Bp,Gk
 Brd,Rlb
 Brn,Amf
@@ -135,12 +138,14 @@ Ed,Wf
 Edn,Mtr
 Egh,Cvm
 Ehb,Ehv
+Ehs,Ehv
 Ehv,Hmbv
 Ehv,Gp
 Eml,Hd
 Emnz,Emn
 Es,Ese
 Esd,Es
+Esk,Es
 Ese,Gbr
 Est,Za
 Est,Nml
@@ -181,10 +186,12 @@ Hd,Ns
 Hdb,Gbg
 Hde,Wz
 Hdg,Vwd
+Hdg,Fwd
 Hdrz,Hdr
 Hdrz,Ana
 Hfd,Nvp
 Hgl,Esd
+Hgl,Esk
 Hgl,Hglo
 Hglg,Hgl
 Hglo,Odz
@@ -285,7 +292,8 @@ Na,Emnz
 Ndb,Bsmz
 Nh,Hb
 Nkk,Pt
-Nm,Nmd
+Nm,Nmgo
+Nmgo,Nmd
 Nm,Nmh
 Nmh,Mmlh
 Nml,Nm
@@ -311,6 +319,8 @@ Pt,Eml
 Rai,Asdz
 Asb,Rai
 Rat,Nvd
+Rat,Nvdw
+Nvdw,Nvd
 Rb,Kbd
 Rh,Dr
 Rl,Ltv
@@ -404,6 +414,9 @@ Vst,Gvm
 Vsv,Tbg
 Vtn,Wd
 Vwd,Zww
+Vwd,Dwe
+Fwd,Zww
+Fwd,Dwe
 Wad,Wadn
 Wadn,Bsk
 Wc,Nmd
@@ -451,3 +464,4 @@ Zv,Did
 Zvb,Odb
 Zwd,Brd
 Zww,Bp
+Dwe,Bp