Markkos1992 · Markkos1992 · Dec 13, 2019 · Nov 23, 2019 · Nov 27, 2019 · Nov 28, 2019
diff --git a/datacheckfps.csv b/datacheckfps.csv
@@ -7347,7 +7347,7 @@ or.us197;+X03;+X04;BakRd;SHARP_ANGLE;164.44
 or.us395;+X89;NF3920;CanCrkRd;SHARP_ANGLE;162.66
 or.us395;OldRitRd;+x174;CR20;SHARP_ANGLE;141.08
 pa.pa026;HarValRd;GriCampLn;+X5;SHARP_ANGLE;138.59
-pa.pa045;+X2;UniFurRd;EdenHillRd;SHARP_ANGLE;161.30
+pa.pa045;+X2;UniFurRd;EdenHillRd;SHARP_ANGLE;161.18
 pa.pa056;SumDr;MouRd_A;DunHolRd;SHARP_ANGLE;148.21
 pa.pa066altvan;PA56/66;;;LABEL_SELFREF;
 pa.pa074;+X1;+X1A;+X2;SHARP_ANGLE;139.52
@@ -7378,8 +7378,7 @@ pa.pa415eha;PA415_S;;;LABEL_SELFREF;
 pa.pa420alttrkpro;PA420AltTrk_Rid;;;LABEL_SELFREF;
 pa.pa420alttrkrid;PA420AltTrk_Pro;;;LABEL_SELFREF;
 pa.pa428;KnaRd;PA27_E;PA27_W;SHARP_ANGLE;138.74
-pa.pa445;+X1;+X2;OldPikeRd;SHARP_ANGLE;137.53
-pa.pa445;+X2;OldPikeRd;BateDr;SHARP_ANGLE;136.64
+pa.pa445;GinGapRd;+X1A;+X1B;SHARP_ANGLE;136.95
 pa.pa554;+X1;SkyDr;+X2;SHARP_ANGLE;138.20
 pa.pa554;SprCreRd;+X1;SkyDr;SHARP_ANGLE;143.03
 pa.pa568;PA10_N;PA10_S;SetRd;SHARP_ANGLE;145.16
@@ -7723,6 +7722,8 @@ rus.a392;Pyt;UliCha;;VISIBLE_DISTANCE;10.69
 rus.ah006uss;Raz_W;A370_S;+X661658;SHARP_ANGLE;143.07
 rus.ah006vla;AH6;;;LABEL_SELFREF;
 rus.ah008;+X435944;Bab_S;Bab_E;SHARP_ANGLE;136.36
+rus.ah008;MosSho;M10/M11_Vos;+X971796;SHARP_ANGLE;159.29
+rus.e105;MosSho;M10/M11_Vos;+X971796;SHARP_ANGLE;159.29
 rus.e119;+X435944;Bab_S;Bab_E;SHARP_ANGLE;136.36
 rus.e30;14(MKAD);10(MKAD);UliSmi;SHARP_ANGLE;137.37
 rus.e97;+X128520;+X806958;+X887091;SHARP_ANGLE;164.62
@@ -7744,6 +7745,10 @@ rus.m005ore;M5;;;LABEL_SELFREF;
 rus.m007per;M7;;;LABEL_SELFREF;
 rus.m011;M11_U1;;;LABEL_SELFREF;
 rus.m011;M11_U2;;;LABEL_SELFREF;
+rus.m011;M11_U3;;;LABEL_SELFREF;
+rus.m011;M11_U4;;;LABEL_SELFREF;
+rus.m011;M11_U5;;;LABEL_SELFREF;
+rus.m011;M11_U6;;;LABEL_SELFREF;
 rus.m011mos;M11_U0;;;LABEL_SELFREF;
 rus.mkad;1;M7;;DUPLICATE_COORDS;(55.776983,37.842751)
 rus.simsho;SimSho;;;LABEL_SELFREF;

diff --git a/graphs/multiregion.csv b/graphs/multiregion.csv
@@ -1,5 +1,7 @@
 description;title;regionlist
-New England;USA-newengland;MA,ME,CT,RI,VT,NH
-Canadian Maritimes;CAN-maritimes;NS,PE,NB,NL
 British Isles;british-isles;ENG,NIR,SCT,WLS,IMN,JEY,GGY
+Canadian Maritimes;CAN-maritimes;NS,PE,NB,NL
+Metropolitan France;met-france;FRA-ARA,FRA-BFC,FRA-BRE,FRA-COR,FRA-CVL,FRA-GES,FRA-HDF,FRA-IDF,FRA-NAQ,FRA-NOR,FRA-OCC,FRA-PAC,FRA-PDL
+Island of Ireland;ireland-island;IRL,NIR
+New England;USA-newengland;MA,ME,CT,RI,VT,NH
 West Indies;west-indies;ABW,AIA,ATG,BES,BHS,BLM,BRB,CUB,CUW,CYM,DMA,DOM,GLP,GRD,HTI,JAM,KNA,LCA,MAF,MTQ,PR,SXM,TCA,TTO,VCT,VGB,VI
diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a001cof.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a001cof.wpt
@@ -36,9 +36,9 @@ SolIslWay_N http://www.openstreetmap.org/?lat=-29.983747&lon=153.140337
 +x739 http://www.openstreetmap.org/?lat=-30.026523&lon=153.184175
 SolIslWay_Arr http://www.openstreetmap.org/?lat=-30.060997&lon=153.183489
 +x741 http://www.openstreetmap.org/?lat=-30.105744&lon=153.168683
-SolIslWay_Woo http://www.openstreetmap.org/?lat=-30.130708&lon=153.193552
+SolIslWay_Woo http://www.openstreetmap.org/?lat=-30.132657&lon=153.194175
 SolIslWay_Eme http://www.openstreetmap.org/?lat=-30.158932&lon=153.190441
-EmeBea http://www.openstreetmap.org/?lat=-30.166538&lon=153.179047
+EmeBea http://www.openstreetmap.org/?lat=-30.167020&lon=153.178682
 TikiRd http://www.openstreetmap.org/?lat=-30.184494&lon=153.153877
 MooBeaRd http://www.openstreetmap.org/?lat=-30.203653&lon=153.148760
 GauRd http://www.openstreetmap.org/?lat=-30.227906&lon=153.147032

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a003.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a003.wpt
@@ -19,7 +19,7 @@ M4 http://www.openstreetmap.org/?lat=-33.856972&lon=151.070573
 MarRd http://www.openstreetmap.org/?lat=-33.861404&lon=151.067559
 ArtSt http://www.openstreetmap.org/?lat=-33.867895&lon=151.064308
 A22 http://www.openstreetmap.org/?lat=-33.885932&lon=151.068921
-JunoPar http://www.openstreetmap.org/?lat=-33.907804&lon=151.064372
+JunoPde http://www.openstreetmap.org/?lat=-33.907804&lon=151.064372
 PunRd http://www.openstreetmap.org/?lat=-33.917491&lon=151.065102
 A34 http://www.openstreetmap.org/?lat=-33.929492&lon=151.072354
 M5 http://www.openstreetmap.org/?lat=-33.943164&lon=151.077075

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a004.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a004.wpt
@@ -11,5 +11,5 @@ PerSt http://www.openstreetmap.org/?lat=-33.874896&lon=151.155224
 TimDr http://www.openstreetmap.org/?lat=-33.870932&lon=151.141920
 M4_E http://www.openstreetmap.org/?lat=-33.874767&lon=151.135118
 FreSt http://www.openstreetmap.org/?lat=-33.876949&lon=151.129721
-GreNorRd http://www.openstreetmap.org/?lat=-33.873778&lon=151.127179
+GtNorRd http://www.openstreetmap.org/?lat=-33.873778&lon=151.127179
 M4_W http://www.openstreetmap.org/?lat=-33.866972&lon=151.095164
diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a022.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a022.wpt
@@ -1,10 +1,12 @@
 RegSt http://www.openstreetmap.org/?lat=-33.884006&lon=151.202222
+WatSt http://www.openstreetmap.org/?lat=-33.884316&lon=151.198611
 A36 http://www.openstreetmap.org/?lat=-33.884463&lon=151.194792
 JohSt http://www.openstreetmap.org/?lat=-33.887936&lon=151.167712
 BroSt http://www.openstreetmap.org/?lat=-33.889789&lon=151.145332
 ParRd_W http://www.openstreetmap.org/?lat=-33.886137&lon=151.138873
 MilSt http://www.openstreetmap.org/?lat=-33.888542&lon=151.117523
-LivRd http://www.openstreetmap.org/?lat=-33.887669&lon=151.091473
+CorPde http://www.openstreetmap.org/?lat=-33.887669&lon=151.091473
+HomRd http://www.openstreetmap.org/?lat=-33.891837&lon=151.083405
 A3 http://www.openstreetmap.org/?lat=-33.885932&lon=151.068921
 A6 http://www.openstreetmap.org/?lat=-33.906023&lon=151.040254
 HecSt http://www.openstreetmap.org/?lat=-33.904705&lon=151.002488

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a025.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a025.wpt
@@ -2,7 +2,7 @@ M31 http://www.openstreetmap.org/?lat=-34.828283&lon=148.957314
 YassVlyWay http://www.openstreetmap.org/?lat=-34.867183&lon=148.967743
 +X560981 http://www.openstreetmap.org/?lat=-34.914898&lon=148.982248
 HilDr http://www.openstreetmap.org/?lat=-34.961618&lon=149.030142
-McIntCir http://www.openstreetmap.org/?lat=-34.994531&lon=149.023705
+McICir http://www.openstreetmap.org/?lat=-34.994531&lon=149.023705
 +X611717 http://www.openstreetmap.org/?lat=-35.025674&lon=149.016666
 NanRd http://www.openstreetmap.org/?lat=-35.123226&lon=149.045463
 NSW/ACT http://www.openstreetmap.org/?lat=-35.159644&lon=149.061577
diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a032.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a032.wpt
@@ -12,14 +12,14 @@ QueRd http://www.openstreetmap.org/?lat=-33.718352&lon=150.443752
 TabRd http://www.openstreetmap.org/?lat=-33.724670&lon=150.384614
 StaSt_WF http://www.openstreetmap.org/?lat=-33.710552&lon=150.375624
 ScoAve http://www.openstreetmap.org/?lat=-33.709195&lon=150.352664
-LauMall http://www.openstreetmap.org/?lat=-33.710766&lon=150.331528
+LeuMall http://www.openstreetmap.org/?lat=-33.710766&lon=150.331528
 BatRd http://www.openstreetmap.org/?lat=-33.707393&lon=150.300651
 +X598894 http://www.openstreetmap.org/?lat=-33.694120&lon=150.289793
 RaiPar http://www.openstreetmap.org/?lat=-33.672301&lon=150.280180
 GovLeapRd http://www.openstreetmap.org/?lat=-33.635560&lon=150.284836
 StaSt_MV http://www.openstreetmap.org/?lat=-33.590707&lon=150.254753
 +X792056 http://www.openstreetmap.org/?lat=-33.581769&lon=150.223789
-JenCavRd http://www.openstreetmap.org/?lat=-33.542396&lon=150.167012
+T1_E http://www.openstreetmap.org/?lat=-33.542396&lon=150.167012
 +X410417 http://www.openstreetmap.org/?lat=-33.514796&lon=150.143108
 +X183633 http://www.openstreetmap.org/?lat=-33.517372&lon=150.125084
 MagHolRd http://www.openstreetmap.org/?lat=-33.506316&lon=150.124483
@@ -31,8 +31,8 @@ BonRd http://www.openstreetmap.org/?lat=-33.454700&lon=149.974365
 +X217954 http://www.openstreetmap.org/?lat=-33.433125&lon=149.908962
 +X298723 http://www.openstreetmap.org/?lat=-33.451818&lon=149.774122
 +X234044 http://www.openstreetmap.org/?lat=-33.431692&lon=149.737816
-LitSt http://www.openstreetmap.org/?lat=-33.419416&lon=149.614928
-GilSt http://www.openstreetmap.org/?lat=-33.418735&lon=149.604156
+T1_W http://www.openstreetmap.org/?lat=-33.419416&lon=149.614928
+T3 http://www.openstreetmap.org/?lat=-33.418735&lon=149.604156
 BenSt http://www.openstreetmap.org/?lat=-33.417643&lon=149.585145
 DurSt_N http://www.openstreetmap.org/?lat=-33.411266&lon=149.578729
 A41 http://www.openstreetmap.org/?lat=-33.420374&lon=149.565210
@@ -44,6 +44,7 @@ MilRd http://www.openstreetmap.org/?lat=-33.375212&lon=149.189401
 NorDisRd_E http://www.openstreetmap.org/?lat=-33.313351&lon=149.141893
 PeiSt http://www.openstreetmap.org/?lat=-33.284136&lon=149.103699
 CorDr http://www.openstreetmap.org/?lat=-33.281624&lon=149.086576
+T5_S http://www.openstreetmap.org/?lat=-33.274673&lon=149.086876
 NorDisRd_W http://www.openstreetmap.org/?lat=-33.260885&lon=149.076362
 +X467728 http://www.openstreetmap.org/?lat=-33.209932&lon=149.031944
 +X416060 http://www.openstreetmap.org/?lat=-33.162882&lon=149.011002
@@ -59,7 +60,7 @@ CasSt http://www.openstreetmap.org/?lat=-33.084350&lon=148.862000
 +X548347 http://www.openstreetmap.org/?lat=-32.829043&lon=148.904915
 DriRd http://www.openstreetmap.org/?lat=-32.674458&lon=148.950748
 +X559497 http://www.openstreetmap.org/?lat=-32.662320&lon=148.940964
-BurWay http://www.openstreetmap.org/?lat=-32.594625&lon=148.951650
+T5_N http://www.openstreetmap.org/?lat=-32.594625&lon=148.951650
 GooRd http://www.openstreetmap.org/?lat=-32.539994&lon=148.942208
 +X963962 http://www.openstreetmap.org/?lat=-32.481601&lon=148.909378
 +X353671 http://www.openstreetmap.org/?lat=-32.431701&lon=148.870239
@@ -76,18 +77,18 @@ TanRd http://www.openstreetmap.org/?lat=-32.253495&lon=148.315301
 DanSt_S http://www.openstreetmap.org/?lat=-32.232851&lon=148.239448
 WarRd http://www.openstreetmap.org/?lat=-32.225735&lon=148.238611
 McNamLn http://www.openstreetmap.org/?lat=-32.220916&lon=148.222003
-DanSt http://www.openstreetmap.org/?lat=-32.032055&lon=147.984037
+DanSt http://www.openstreetmap.org/?lat=-32.031818&lon=147.983887
 CatBogRd http://www.openstreetmap.org/?lat=-31.920732&lon=147.837524
 OxlHwy http://www.openstreetmap.org/?lat=-31.838373&lon=147.718735
 BudRd http://www.openstreetmap.org/?lat=-31.692991&lon=147.443347
 OldWarRd http://www.openstreetmap.org/?lat=-31.567110&lon=147.206283
 B71 http://www.openstreetmap.org/?lat=-31.554146&lon=147.179461
 +X945311 http://www.openstreetmap.org/?lat=-31.580912&lon=147.064190
 +X425154 http://www.openstreetmap.org/?lat=-31.549959&lon=146.865149
-WhiWay http://www.openstreetmap.org/?lat=-31.546393&lon=146.726618
+YouSt http://www.openstreetmap.org/?lat=-31.546466&lon=146.726446
 +X372938 http://www.openstreetmap.org/?lat=-31.559924&lon=146.518135
 +X778255 http://www.openstreetmap.org/?lat=-31.527519&lon=146.340895
-CanRd http://www.openstreetmap.org/?lat=-31.530812&lon=146.284804
+RosRd http://www.openstreetmap.org/?lat=-31.530812&lon=146.284804
 +X430683 http://www.openstreetmap.org/?lat=-31.522288&lon=146.054649
 B87_S http://www.openstreetmap.org/?lat=-31.499074&lon=145.845780
 B87_N http://www.openstreetmap.org/?lat=-31.498159&lon=145.841146
@@ -98,7 +99,7 @@ IvaRd http://www.openstreetmap.org/?lat=-31.509758&lon=145.738964
 +X817353 http://www.openstreetmap.org/?lat=-31.574733&lon=145.164070
 +X196533 http://www.openstreetmap.org/?lat=-31.582009&lon=145.115747
 +X918122 http://www.openstreetmap.org/?lat=-31.574550&lon=145.049229
-NSW10 http://www.openstreetmap.org/?lat=-31.598313&lon=144.973440
+BelRd http://www.openstreetmap.org/?lat=-31.598313&lon=144.973440
 +X547164 http://www.openstreetmap.org/?lat=-31.578206&lon=144.804354
 +X316513 http://www.openstreetmap.org/?lat=-31.551221&lon=144.768476
 +X915395 http://www.openstreetmap.org/?lat=-31.564751&lon=144.683590

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a039.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a039.wpt
@@ -1,4 +1,5 @@
 QLD/NSW http://www.openstreetmap.org/?lat=-28.556594&lon=150.319405
+GunWay http://www.openstreetmap.org/?lat=-28.562003&lon=150.317645
 MerSt http://www.openstreetmap.org/?lat=-28.605359&lon=150.360346
 +X557572 http://www.openstreetmap.org/?lat=-28.663065&lon=150.324554
 +X433369 http://www.openstreetmap.org/?lat=-28.705306&lon=150.280352
@@ -34,7 +35,7 @@ B51 http://www.openstreetmap.org/?lat=-30.347972&lon=149.759960
 +X511874 http://www.openstreetmap.org/?lat=-31.156482&lon=149.369774
 B56 http://www.openstreetmap.org/?lat=-31.245599&lon=149.313276
 WhiSt http://www.openstreetmap.org/?lat=-31.268115&lon=149.276390
-DalSt http://www.openstreetmap.org/?lat=-31.273471&lon=149.277291
+T1_N http://www.openstreetmap.org/?lat=-31.273471&lon=149.277291
 WarWay http://www.openstreetmap.org/?lat=-31.325212&lon=149.307804
 +X192929 http://www.openstreetmap.org/?lat=-31.361589&lon=149.286776
 MenRd http://www.openstreetmap.org/?lat=-31.388282&lon=149.253945
@@ -45,12 +46,12 @@ MenRd http://www.openstreetmap.org/?lat=-31.388282&lon=149.253945
 Gow http://www.openstreetmap.org/?lat=-31.426210&lon=149.081125
 +X390566 http://www.openstreetmap.org/?lat=-31.453927&lon=149.001131
 +X725489 http://www.openstreetmap.org/?lat=-31.466520&lon=148.986454
-TooRd http://www.openstreetmap.org/?lat=-31.469485&lon=148.920021
+T1_S http://www.openstreetmap.org/?lat=-31.469485&lon=148.920021
 +X831688 http://www.openstreetmap.org/?lat=-31.507691&lon=148.837023
 +X926567 http://www.openstreetmap.org/?lat=-31.556048&lon=148.812733
 +X448669 http://www.openstreetmap.org/?lat=-31.567457&lon=148.787498
 +X652144 http://www.openstreetmap.org/?lat=-31.627843&lon=148.736687
-JugRd http://www.openstreetmap.org/?lat=-31.670787&lon=148.715701
+JugLn http://www.openstreetmap.org/?lat=-31.670787&lon=148.715701
 CooRd http://www.openstreetmap.org/?lat=-31.697921&lon=148.679910
 B55_E http://www.openstreetmap.org/?lat=-31.712014&lon=148.676434
 B55_W http://www.openstreetmap.org/?lat=-31.712744&lon=148.666220
@@ -82,12 +83,12 @@ GreSt http://www.openstreetmap.org/?lat=-33.140776&lon=148.171899
 +X696378 http://www.openstreetmap.org/?lat=-33.347845&lon=148.031931
 UniSt http://www.openstreetmap.org/?lat=-33.379996&lon=148.012061
 CampSt http://www.openstreetmap.org/?lat=-33.386823&lon=148.009143
-WirRd http://www.openstreetmap.org/?lat=-33.403143&lon=147.983737
+WirRd http://www.openstreetmap.org/?lat=-33.403519&lon=147.983265
 LacVlyWay http://www.openstreetmap.org/?lat=-33.411419&lon=147.952452
 +X583938 http://www.openstreetmap.org/?lat=-33.437816&lon=147.912369
 +X261304 http://www.openstreetmap.org/?lat=-33.465172&lon=147.893314
 +X744572 http://www.openstreetmap.org/?lat=-33.484538&lon=147.801733
-MntTalRd http://www.openstreetmap.org/?lat=-33.502773&lon=147.763925
+MtTalRd http://www.openstreetmap.org/?lat=-33.502773&lon=147.763925
 +X321140 http://www.openstreetmap.org/?lat=-33.580589&lon=147.634106
 BewRd http://www.openstreetmap.org/?lat=-33.657031&lon=147.571363
 +X421286 http://www.openstreetmap.org/?lat=-33.681247&lon=147.529392

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a040.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a040.wpt
@@ -10,7 +10,7 @@ ChaRd http://www.openstreetmap.org/?lat=-33.807421&lon=151.086881
 MarRd http://www.openstreetmap.org/?lat=-33.807117&lon=151.070702
 A6 http://www.openstreetmap.org/?lat=-33.813803&lon=151.052527
 JamRuseDr_S http://www.openstreetmap.org/?lat=-33.809199&lon=151.023570
-KisPntRd http://www.openstreetmap.org/?lat=-33.804069&lon=151.024525
+KisPtRd http://www.openstreetmap.org/?lat=-33.804069&lon=151.024525
 A28_N http://www.openstreetmap.org/?lat=-33.795572&lon=151.013646
 WinRd http://www.openstreetmap.org/?lat=-33.791685&lon=150.997853
 A28_S http://www.openstreetmap.org/?lat=-33.794431&lon=150.983434

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a041.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a041.wpt
@@ -7,28 +7,29 @@ BatRd http://www.openstreetmap.org/?lat=-33.500662&lon=149.395866
 ChuSt http://www.openstreetmap.org/?lat=-33.530645&lon=149.255705
 +X722904 http://www.openstreetmap.org/?lat=-33.588633&lon=149.190044
 BraRd http://www.openstreetmap.org/?lat=-33.601207&lon=149.154232
-MntMacRd http://www.openstreetmap.org/?lat=-33.617800&lon=149.137988
+MtMacRd http://www.openstreetmap.org/?lat=-33.617800&lon=149.137988
 SilSt http://www.openstreetmap.org/?lat=-33.650262&lon=149.073400
 RusSt http://www.openstreetmap.org/?lat=-33.672265&lon=149.043531
 +X889414 http://www.openstreetmap.org/?lat=-33.673569&lon=148.960104
 PurDr http://www.openstreetmap.org/?lat=-33.716737&lon=148.862343
 +X484300 http://www.openstreetmap.org/?lat=-33.711311&lon=148.845434
 +X132974 http://www.openstreetmap.org/?lat=-33.731317&lon=148.806639
-PorMntRd http://www.openstreetmap.org/?lat=-33.815301&lon=148.748789
+PorMtRd http://www.openstreetmap.org/?lat=-33.815301&lon=148.748789
 B81_N http://www.openstreetmap.org/?lat=-33.833982&lon=148.686261
 B81_S http://www.openstreetmap.org/?lat=-33.834695&lon=148.681176
 B64 http://www.openstreetmap.org/?lat=-33.834695&lon=148.679738
 +X215134 http://www.openstreetmap.org/?lat=-33.917936&lon=148.604507
 KooRd http://www.openstreetmap.org/?lat=-34.033955&lon=148.556893
 +X741732 http://www.openstreetmap.org/?lat=-34.105302&lon=148.502970
-+X578187 http://www.openstreetmap.org/?lat=-34.130599&lon=148.499451
-+X417313 http://www.openstreetmap.org/?lat=-34.173216&lon=148.457050
++X429064 http://www.openstreetmap.org/?lat=-34.126336&lon=148.500910
+FisLn http://www.openstreetmap.org/?lat=-34.166212&lon=148.468981
+BenMurRd http://www.openstreetmap.org/?lat=-34.168529&lon=148.456707
 +X280464 http://www.openstreetmap.org/?lat=-34.223194&lon=148.439283
 9MGapRd http://www.openstreetmap.org/?lat=-34.243275&lon=148.420401
 +X157517 http://www.openstreetmap.org/?lat=-34.294913&lon=148.343067
 SceRd http://www.openstreetmap.org/?lat=-34.298813&lon=148.307276
 LovSt http://www.openstreetmap.org/?lat=-34.312736&lon=148.300796
-RipSt http://www.openstreetmap.org/?lat=-34.315660&lon=148.293564
+BooSt_W http://www.openstreetmap.org/?lat=-34.312948&lon=148.295517
 RhoRd http://www.openstreetmap.org/?lat=-34.378101&lon=148.259425
 +X480638 http://www.openstreetmap.org/?lat=-34.405582&lon=148.257666
 WomRd http://www.openstreetmap.org/?lat=-34.422930&lon=148.243461
@@ -40,7 +41,9 @@ OldGunRd http://www.openstreetmap.org/?lat=-34.558880&lon=148.133211
 +X587011 http://www.openstreetmap.org/?lat=-34.571055&lon=148.096733
 ShaLn http://www.openstreetmap.org/?lat=-34.626322&lon=148.056436
 ParSt http://www.openstreetmap.org/?lat=-34.632484&lon=148.035450
-HurSt http://www.openstreetmap.org/?lat=-34.644383&lon=148.024292
+TemSt http://www.openstreetmap.org/?lat=-34.635768&lon=148.034720
+GunRd http://www.openstreetmap.org/?lat=-34.643456&lon=148.027253
+MacSt_W http://www.openstreetmap.org/?lat=-34.642697&lon=148.025966
 BackBraRd http://www.openstreetmap.org/?lat=-34.651938&lon=148.012619
 DirRd http://www.openstreetmap.org/?lat=-34.654409&lon=147.990217
 +X954353 http://www.openstreetmap.org/?lat=-34.693533&lon=147.953138

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a043.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a043.wpt
@@ -1,13 +1,13 @@
 M15 http://www.openstreetmap.org/?lat=-32.668335&lon=151.361904
-NewEndHwy_W http://www.openstreetmap.org/?lat=-32.663096&lon=151.368642
+NewEngHwy_W http://www.openstreetmap.org/?lat=-32.663096&lon=151.368642
 NelSt http://www.openstreetmap.org/?lat=-32.682279&lon=151.393318
 AllRd http://www.openstreetmap.org/?lat=-32.708679&lon=151.426020
 CanRd http://www.openstreetmap.org/?lat=-32.699073&lon=151.454945
 AnaRd http://www.openstreetmap.org/?lat=-32.708029&lon=151.510649
 WolRd http://www.openstreetmap.org/?lat=-32.719692&lon=151.527987
 HighSt http://www.openstreetmap.org/?lat=-32.725469&lon=151.543651
-MaiRd http://www.openstreetmap.org/?lat=-32.739250&lon=151.551654
-PitRd http://www.openstreetmap.org/?lat=-32.746632&lon=151.581438
+CesRd http://www.openstreetmap.org/?lat=-32.739250&lon=151.551654
+MelSt http://www.openstreetmap.org/?lat=-32.746632&lon=151.581438
 WeaDr http://www.openstreetmap.org/?lat=-32.794760&lon=151.635704
 A1_S http://www.openstreetmap.org/?lat=-32.809676&lon=151.647935
 AndDr http://www.openstreetmap.org/?lat=-32.811913&lon=151.665788
@@ -19,7 +19,7 @@ B63_S http://www.openstreetmap.org/?lat=-32.890849&lon=151.740718
 EliSt http://www.openstreetmap.org/?lat=-32.907244&lon=151.759944
 A15 http://www.openstreetmap.org/?lat=-32.926734&lon=151.758099
 GleRd http://www.openstreetmap.org/?lat=-32.937882&lon=151.748614
-B63 http://www.openstreetmap.org/?lat=-32.951478&lon=151.714239
+B63_Ada http://www.openstreetmap.org/?lat=-32.951478&lon=151.714239
 B57 http://www.openstreetmap.org/?lat=-32.961308&lon=151.696944
 A37_S http://www.openstreetmap.org/?lat=-32.992053&lon=151.688790
 WomAve http://www.openstreetmap.org/?lat=-33.021420&lon=151.666689

diff --git a/hwy_data/AUS-NSW/ausa/ausnsw.a044.wpt b/hwy_data/AUS-NSW/ausa/ausnsw.a044.wpt
@@ -13,7 +13,7 @@ ResRd http://www.openstreetmap.org/?lat=-33.798069&lon=150.896959
 M7 http://www.openstreetmap.org/?lat=-33.789331&lon=150.856490
 CarAve http://www.openstreetmap.org/?lat=-33.779272&lon=150.814390
 MamRd http://www.openstreetmap.org/?lat=-33.770104&lon=150.773406
-GipSt http://www.openstreetmap.org/?lat=-33.767607&lon=150.754437
+GipSt http://www.openstreetmap.org/?lat=-33.767411&lon=150.754309
 A9 http://www.openstreetmap.org/?lat=-33.756850&lon=150.712080
 MulRd http://www.openstreetmap.org/?lat=-33.750695&lon=150.687575
 OldBatRd http://www.openstreetmap.org/?lat=-33.746949&lon=150.672512