diff --git a/datacheckfps.csv b/datacheckfps.csv
index 1b03e015bd4..f15e7b06bd4 100644
--- a/datacheckfps.csv
+++ b/datacheckfps.csv
@@ -2864,7 +2864,7 @@ eng.a0669;A670_S;A670_N;B6175;SHARP_ANGLE;140.48
 eng.a0680;B6527_S;M66;A682;SHARP_ANGLE;152.18
 eng.a0686;+X11;+X12;+X13;SHARP_ANGLE;161.96
 eng.a1036;A1036_W;;;LABEL_SELFREF;NO_ABBREV
-eng.a1134;A1307_N;A1307_W;;DUPLICATE_COORDS;(52.21397,0.1107)
+eng.a1134;A1307_N;A1307_W;;DUPLICATE_COORDS;(52.213964,0.110604)
 eng.a1290;WasRd;A19_N;A19/A1231;SHARP_ANGLE;149.35
 eng.a1305;A139/A177_E;A139/A177_W;;DUPLICATE_COORDS;(54.571266,-1.311665)
 eng.a3078;A3078_W;A3078_N;;DUPLICATE_COORDS;(50.167085,-5.01586)
diff --git a/hwy_data/ENG/gbna/eng.a0428.wpt b/hwy_data/ENG/gbna/eng.a0428.wpt
index 434e81fc826..f22ed130bc8 100644
--- a/hwy_data/ENG/gbna/eng.a0428.wpt
+++ b/hwy_data/ENG/gbna/eng.a0428.wpt
@@ -47,7 +47,7 @@ B1043 http://www.openstreetmap.org/?lat=52.209290&lon=-0.267406
 B1428_E http://www.openstreetmap.org/?lat=52.224480&lon=-0.230809
 B1040_S http://www.openstreetmap.org/?lat=52.221977&lon=-0.147578
 B1040_N http://www.openstreetmap.org/?lat=52.227826&lon=-0.136986
-A1198 http://www.openstreetmap.org/?lat=52.228969&lon=-0.103410
+A1198 http://www.openstreetmap.org/?lat=52.229810&lon=-0.103920
 CamRd http://www.openstreetmap.org/?lat=52.224832&lon=-0.072265
 ScoRd http://www.openstreetmap.org/?lat=52.220235&lon=0.000316
 A1303 http://www.openstreetmap.org/?lat=52.217126&lon=0.035362
diff --git a/hwy_data/ENG/gbna/eng.a1134.wpt b/hwy_data/ENG/gbna/eng.a1134.wpt
index 7ac70588856..2c67ae0c45c 100644
--- a/hwy_data/ENG/gbna/eng.a1134.wpt
+++ b/hwy_data/ENG/gbna/eng.a1134.wpt
@@ -14,7 +14,7 @@ A1309_S http://www.openstreetmap.org/?lat=52.180685&lon=0.116231
 BroAve http://www.openstreetmap.org/?lat=52.191664&lon=0.124036
 A603_E http://www.openstreetmap.org/?lat=52.197523&lon=0.122175
 A603_W http://www.openstreetmap.org/?lat=52.198329&lon=0.112739
-A1303_WesE +A1303_S http://www.openstreetmap.org/?lat=52.210069&lon=0.111784
+A1303_WesE http://www.openstreetmap.org/?lat=52.210069&lon=0.111784
 A1303_WesW +A1303_N http://www.openstreetmap.org/?lat=52.210542&lon=0.110405
 CasSt http://www.openstreetmap.org/?lat=52.213689&lon=0.111277
 A1307_W http://www.openstreetmap.org/?lat=52.213964&lon=0.110604
diff --git a/hwy_data/ENG/gbna/eng.a1198.wpt b/hwy_data/ENG/gbna/eng.a1198.wpt
index a965564202e..693b2f589a6 100644
--- a/hwy_data/ENG/gbna/eng.a1198.wpt
+++ b/hwy_data/ENG/gbna/eng.a1198.wpt
@@ -4,7 +4,7 @@ B1046 http://www.openstreetmap.org/?lat=52.178889&lon=-0.080466
 RoyRd http://www.openstreetmap.org/?lat=52.200900&lon=-0.090380
 SchLn http://www.openstreetmap.org/?lat=52.215127&lon=-0.086775
 ErmSt_S http://www.openstreetmap.org/?lat=52.218802&lon=-0.097193
-A428 http://www.openstreetmap.org/?lat=52.228969&lon=-0.103410
+A428 http://www.openstreetmap.org/?lat=52.229810&lon=-0.103920
 ErmSt_N http://www.openstreetmap.org/?lat=52.240993&lon=-0.112352
 B1040_W http://www.openstreetmap.org/?lat=52.244304&lon=-0.128896
 B1040_E http://www.openstreetmap.org/?lat=52.256732&lon=-0.123682
diff --git a/hwy_data/ENG/gbna/eng.a1303.wpt b/hwy_data/ENG/gbna/eng.a1303.wpt
index bf6242d4c11..bb0ed768097 100644
--- a/hwy_data/ENG/gbna/eng.a1303.wpt
+++ b/hwy_data/ENG/gbna/eng.a1303.wpt
@@ -2,7 +2,7 @@ A428 http://www.openstreetmap.org/?lat=52.217126&lon=0.035362
 CamRd http://www.openstreetmap.org/?lat=52.214694&lon=0.066562
 M11 http://www.openstreetmap.org/?lat=52.214339&lon=0.078106
 MadPR http://www.openstreetmap.org/?lat=52.213474&lon=0.082827
-A1134_WesN +A1134_N http://www.openstreetmap.org/?lat=52.210542&lon=0.110405
+A1134_WesN http://www.openstreetmap.org/?lat=52.210542&lon=0.110405
 A1134_WesS +A1134_S http://www.openstreetmap.org/?lat=52.210069&lon=0.111784
 CasSt http://www.openstreetmap.org/?lat=52.210759&lon=0.115067
 A1134_Mit http://www.openstreetmap.org/?lat=52.214273&lon=0.124841
diff --git a/hwy_data/ENG/gbna/eng.a1307.wpt b/hwy_data/ENG/gbna/eng.a1307.wpt
index e018b69bd3b..61fbed2aed9 100644
--- a/hwy_data/ENG/gbna/eng.a1307.wpt
+++ b/hwy_data/ENG/gbna/eng.a1307.wpt
@@ -20,18 +20,18 @@ DryDraRd http://www.openstreetmap.org/?lat=52.249290&lon=0.045125
 OakRd http://www.openstreetmap.org/?lat=52.245861&lon=0.039439
 A14(31) http://www.openstreetmap.org/?lat=52.230625&lon=0.070810
 GirRd http://www.openstreetmap.org/?lat=52.225729&lon=0.087075
-A1134_E http://www.openstreetmap.org/?lat=52.213964&lon=0.110604
+A1134_N +A1134_E http://www.openstreetmap.org/?lat=52.213964&lon=0.110604
 CasSt http://www.openstreetmap.org/?lat=52.213689&lon=0.111277
 A1303_W http://www.openstreetmap.org/?lat=52.210542&lon=0.110405
 A1303_E http://www.openstreetmap.org/?lat=52.210069&lon=0.111784
 A603_W http://www.openstreetmap.org/?lat=52.198329&lon=0.112739
-A1309 http://www.openstreetmap.org/?lat=52.197523&lon=0.122175
+A1134_S http://www.openstreetmap.org/?lat=52.197523&lon=0.122175
 TruSt_N http://www.openstreetmap.org/?lat=52.198018&lon=0.122051
 A603_E http://www.openstreetmap.org/?lat=52.199319&lon=0.127346
 StaRd http://www.openstreetmap.org/?lat=52.195064&lon=0.131278
 BroAve http://www.openstreetmap.org/?lat=52.192374&lon=0.133724
 CheHinRd http://www.openstreetmap.org/?lat=52.189329&lon=0.135934
-A1134 http://www.openstreetmap.org/?lat=52.178721&lon=0.142651
+A1134_E +A1134 http://www.openstreetmap.org/?lat=52.178794&lon=0.142651
 FenRd http://www.openstreetmap.org/?lat=52.176504&lon=0.145118
 BabPR http://www.openstreetmap.org/?lat=52.167213&lon=0.157671
 HinWay http://www.openstreetmap.org/?lat=52.165752&lon=0.160782
diff --git a/hwy_data/ENG/gbna/eng.a6177.wpt b/hwy_data/ENG/gbna/eng.a6177.wpt
index 3ba4d2483ff..87c5adf5602 100644
--- a/hwy_data/ENG/gbna/eng.a6177.wpt
+++ b/hwy_data/ENG/gbna/eng.a6177.wpt
@@ -6,7 +6,7 @@ AllSaiRd http://www.openstreetmap.org/?lat=53.786607&lon=-1.774764
 A647_N http://www.openstreetmap.org/?lat=53.785574&lon=-1.776738
 A647_S http://www.openstreetmap.org/?lat=53.782220&lon=-1.782891
 A641 http://www.openstreetmap.org/?lat=53.771975&lon=-1.761889
-M606 +A6036 http://www.openstreetmap.org/?lat=53.768481&lon=-1.749251
+M606 http://www.openstreetmap.org/?lat=53.768481&lon=-1.749251
 A650_S http://www.openstreetmap.org/?lat=53.775855&lon=-1.727343
 A647_E http://www.openstreetmap.org/?lat=53.793097&lon=-1.719189
 B6381 http://www.openstreetmap.org/?lat=53.798446&lon=-1.720347
diff --git a/hwy_data/ENG/gbnm/eng.m606.wpt b/hwy_data/ENG/gbnm/eng.m606.wpt
index 082f757ad23..b8677b77ebe 100644
--- a/hwy_data/ENG/gbnm/eng.m606.wpt
+++ b/hwy_data/ENG/gbnm/eng.m606.wpt
@@ -1,3 +1,3 @@
 1 http://www.openstreetmap.org/?lat=53.736642&lon=-1.726356
 2 http://www.openstreetmap.org/?lat=53.755752&lon=-1.742063
-3 A6036 A6177 http://www.openstreetmap.org/?lat=53.768481&lon=-1.749251
+3 A6177 http://www.openstreetmap.org/?lat=53.768481&lon=-1.749251
diff --git a/hwy_data/ENG/gbrrr/eng.andrr.wpt b/hwy_data/ENG/gbrrr/eng.andrr.wpt
index e995e005122..12843aa4ff5 100644
--- a/hwy_data/ENG/gbrrr/eng.andrr.wpt
+++ b/hwy_data/ENG/gbrrr/eng.andrr.wpt
@@ -1,4 +1,4 @@
-A303/A342 +A303/A324 +A303_W http://www.openstreetmap.org/?lat=51.210365&lon=-1.517315
+A303/A342 +A303_W http://www.openstreetmap.org/?lat=51.210365&lon=-1.517315
 EastPor http://www.openstreetmap.org/?lat=51.217207&lon=-1.509590
 NewRd http://www.openstreetmap.org/?lat=51.217959&lon=-1.492317
 A3057 http://www.openstreetmap.org/?lat=51.212845&lon=-1.485031
diff --git a/hwy_data/ENG/gbrrr/eng.bourr.wpt b/hwy_data/ENG/gbrrr/eng.bourr.wpt
index 59b2124ac99..a8f8fb05700 100644
--- a/hwy_data/ENG/gbrrr/eng.bourr.wpt
+++ b/hwy_data/ENG/gbrrr/eng.bourr.wpt
@@ -6,5 +6,5 @@ MeyRd http://www.openstreetmap.org/?lat=50.720098&lon=-1.865970
 B3066_E http://www.openstreetmap.org/?lat=50.719813&lon=-1.870090
 WesRd http://www.openstreetmap.org/?lat=50.717929&lon=-1.872680
 WestCliRd_W http://www.openstreetmap.org/?lat=50.716624&lon=-1.887449
-A35/A338 +A35/A338_W http://www.openstreetmap.org/?lat=50.722624&lon=-1.889469
+A35/A338 http://www.openstreetmap.org/?lat=50.722624&lon=-1.889469
 A347_W http://www.openstreetmap.org/?lat=50.723574&lon=-1.877401
diff --git a/hwy_data/ENG/gbrrr/eng.brarr.wpt b/hwy_data/ENG/gbrrr/eng.brarr.wpt
index 8d32ab1862d..de1a0699fcf 100644
--- a/hwy_data/ENG/gbrrr/eng.brarr.wpt
+++ b/hwy_data/ENG/gbrrr/eng.brarr.wpt
@@ -12,4 +12,4 @@ A658 http://www.openstreetmap.org/?lat=53.808355&lon=-1.730776
 B6381 http://www.openstreetmap.org/?lat=53.798446&lon=-1.720347
 A647_E http://www.openstreetmap.org/?lat=53.793097&lon=-1.719189
 A650_S http://www.openstreetmap.org/?lat=53.775855&lon=-1.727343
-M606_E +A6036 http://www.openstreetmap.org/?lat=53.768481&lon=-1.749251
+M606_E http://www.openstreetmap.org/?lat=53.768481&lon=-1.749251
diff --git a/hwy_data/ENG/gbrrr/eng.cheir.wpt b/hwy_data/ENG/gbrrr/eng.cheir.wpt
index 36d696a866f..e4a9a45ae47 100644
--- a/hwy_data/ENG/gbrrr/eng.cheir.wpt
+++ b/hwy_data/ENG/gbrrr/eng.cheir.wpt
@@ -1,7 +1,7 @@
 A435_E http://www.openstreetmap.org/?lat=51.901379&lon=-2.072838
 A4019 http://www.openstreetmap.org/?lat=51.899530&lon=-2.069343
 A435_S http://www.openstreetmap.org/?lat=51.897992&lon=-2.069496
-A46_S +A46 http://www.openstreetmap.org/?lat=51.896483&lon=-2.074347
+A46_S http://www.openstreetmap.org/?lat=51.896483&lon=-2.074347
 A4015 http://www.openstreetmap.org/?lat=51.897900&lon=-2.078520
 NorPla http://www.openstreetmap.org/?lat=51.901896&lon=-2.074104
 A435_W http://www.openstreetmap.org/?lat=51.901379&lon=-2.072838
diff --git a/hwy_data/ESP-CL/espa/espcl.a011ara.wpt b/hwy_data/ESP-CL/espa/espcl.a011ara.wpt
index a275fae0b74..59e27be3ec5 100644
--- a/hwy_data/ESP-CL/espa/espcl.a011ara.wpt
+++ b/hwy_data/ESP-CL/espa/espcl.a011ara.wpt
@@ -1,4 +1,4 @@
-N-122 +N122 http://www.openstreetmap.org/?lat=41.638330&lon=-3.805261
+N-122 http://www.openstreetmap.org/?lat=41.638330&lon=-3.805261
 BU-V-2031 +ToN122 http://www.openstreetmap.org/?lat=41.636711&lon=-3.781786
 113 http://www.openstreetmap.org/?lat=41.638346&lon=-3.702135
 113a http://www.openstreetmap.org/?lat=41.641281&lon=-3.691857
diff --git a/hwy_data/ESP-CL/espa/espcl.a011val.wpt b/hwy_data/ESP-CL/espa/espcl.a011val.wpt
index b3191a42ea6..ec6bd0bf51c 100644
--- a/hwy_data/ESP-CL/espa/espcl.a011val.wpt
+++ b/hwy_data/ESP-CL/espa/espcl.a011val.wpt
@@ -1,4 +1,4 @@
-VP-3001 +VP3001 http://www.openstreetmap.org/?lat=41.640102&lon=-4.264090
+VP-3001 http://www.openstreetmap.org/?lat=41.640102&lon=-4.264090
 +X896299 http://www.openstreetmap.org/?lat=41.669570&lon=-4.323013
 VA-104 http://www.openstreetmap.org/?lat=41.658373&lon=-4.358439
 +X945439 http://www.openstreetmap.org/?lat=41.653259&lon=-4.406472
diff --git a/hwy_data/ESP-CL/espa/espcl.a601.wpt b/hwy_data/ESP-CL/espa/espcl.a601.wpt
index 61ab236337d..7879378b824 100644
--- a/hwy_data/ESP-CL/espa/espcl.a601.wpt
+++ b/hwy_data/ESP-CL/espa/espcl.a601.wpt
@@ -1,4 +1,4 @@
-VA-30 +VA30 http://www.openstreetmap.org/?lat=41.612635&lon=-4.712942
+VA-30 http://www.openstreetmap.org/?lat=41.612635&lon=-4.712942
 5 +4 http://www.openstreetmap.org/?lat=41.607036&lon=-4.706998
 6 http://www.openstreetmap.org/?lat=41.599623&lon=-4.699016
 8 http://www.openstreetmap.org/?lat=41.589738&lon=-4.688501
diff --git a/hwy_data/ESP-CL/espcl/espcl.cl600.wpt b/hwy_data/ESP-CL/espcl/espcl.cl600.wpt
index f080c83a576..5189cdad9a5 100644
--- a/hwy_data/ESP-CL/espcl/espcl.cl600.wpt
+++ b/hwy_data/ESP-CL/espcl/espcl.cl600.wpt
@@ -1,12 +1,12 @@
-A-62 +A62 http://www.openstreetmap.org/?lat=41.597617&lon=-4.821368
+A-62 http://www.openstreetmap.org/?lat=41.597617&lon=-4.821368
 CamVieSim http://www.openstreetmap.org/?lat=41.588020&lon=-4.818063
 +X933689 http://www.openstreetmap.org/?lat=41.569224&lon=-4.803858
-CL-610_N +CL610_N http://www.openstreetmap.org/?lat=41.561968&lon=-4.786692
-CL-610_S +CL610_S http://www.openstreetmap.org/?lat=41.548761&lon=-4.787582
+CL-610_N http://www.openstreetmap.org/?lat=41.561968&lon=-4.786692
+CL-610_S http://www.openstreetmap.org/?lat=41.548761&lon=-4.787582
 +X778530 http://www.openstreetmap.org/?lat=41.534041&lon=-4.756587
 CarBoe http://www.openstreetmap.org/?lat=41.532226&lon=-4.728498
-N-601 +N601 http://www.openstreetmap.org/?lat=41.536531&lon=-4.703924
-A-601 +A601 http://www.openstreetmap.org/?lat=41.548062&lon=-4.662280
-VA-200 +VA200 http://www.openstreetmap.org/?lat=41.567908&lon=-4.594173
-VP-2302 +VP2302 http://www.openstreetmap.org/?lat=41.581039&lon=-4.576449
-A-11 +A11 http://www.openstreetmap.org/?lat=41.587074&lon=-4.555035
+N-601 http://www.openstreetmap.org/?lat=41.536531&lon=-4.703924
+A-601 http://www.openstreetmap.org/?lat=41.548062&lon=-4.662280
+VA-200 http://www.openstreetmap.org/?lat=41.567908&lon=-4.594173
+VP-2302 http://www.openstreetmap.org/?lat=41.581039&lon=-4.576449
+A-11 http://www.openstreetmap.org/?lat=41.587074&lon=-4.555035
diff --git a/hwy_data/ESP-CL/espcl/espcl.cl626.wpt b/hwy_data/ESP-CL/espcl/espcl.cl626.wpt
index 04dc72d6b8d..bb5c221f4d2 100644
--- a/hwy_data/ESP-CL/espcl/espcl.cl626.wpt
+++ b/hwy_data/ESP-CL/espcl/espcl.cl626.wpt
@@ -1,7 +1,7 @@
 AS/CL http://www.openstreetmap.org/?lat=42.954805&lon=-6.437924
 +X880131 http://www.openstreetmap.org/?lat=42.955292&lon=-6.410694
 LE-497 http://www.openstreetmap.org/?lat=42.952037&lon=-6.372022
-CL-631 +CL631 http://www.openstreetmap.org/?lat=42.945554&lon=-6.348381
+CL-631 http://www.openstreetmap.org/?lat=42.945554&lon=-6.348381
 LE-493_W http://www.openstreetmap.org/?lat=42.932854&lon=-6.290606
 +X784663 http://www.openstreetmap.org/?lat=42.951617&lon=-6.230922
 LE-495 http://www.openstreetmap.org/?lat=42.951805&lon=-6.190238
diff --git a/hwy_data/ESP-CL/espn/espcl.n001.wpt b/hwy_data/ESP-CL/espn/espcl.n001.wpt
index ee92df62b0d..a8beb1e9a2a 100644
--- a/hwy_data/ESP-CL/espn/espcl.n001.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n001.wpt
@@ -31,5 +31,5 @@ BU-525 http://www.openstreetmap.org/?lat=42.658238&lon=-3.079702
 AP-1(4A) +AP1(4A) http://www.openstreetmap.org/?lat=42.661252&lon=-3.045235
 BU-730 http://www.openstreetmap.org/?lat=42.670552&lon=-2.990197
 CalGloFue http://www.openstreetmap.org/?lat=42.681225&lon=-2.976662
-BU-535 +BU535 http://www.openstreetmap.org/?lat=42.690973&lon=-2.946364
+BU-535 http://www.openstreetmap.org/?lat=42.690973&lon=-2.946364
 CL/PV +NC/PV http://www.openstreetmap.org/?lat=42.701046&lon=-2.921977
diff --git a/hwy_data/ESP-CL/espn/espcl.n006.wpt b/hwy_data/ESP-CL/espn/espcl.n006.wpt
index e774fd0b24b..45300698930 100644
--- a/hwy_data/ESP-CL/espn/espcl.n006.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n006.wpt
@@ -1,4 +1,4 @@
-A-6(259) +A6(259) http://www.openstreetmap.org/?lat=41.989880&lon=-5.637188
+A-6(259) http://www.openstreetmap.org/?lat=41.989880&lon=-5.637188
 N-525 http://www.openstreetmap.org/?lat=41.996454&lon=-5.657578
 CalCanBer http://www.openstreetmap.org/?lat=41.998085&lon=-5.661086
 N-630_E http://www.openstreetmap.org/?lat=42.003300&lon=-5.673859
diff --git a/hwy_data/ESP-CL/espn/espcl.n110.wpt b/hwy_data/ESP-CL/espn/espcl.n110.wpt
index 0dda0a39473..19d81d22124 100644
--- a/hwy_data/ESP-CL/espn/espcl.n110.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n110.wpt
@@ -11,17 +11,17 @@ AV-P-637 http://www.openstreetmap.org/?lat=40.537636&lon=-5.160473
 AV-P-634 http://www.openstreetmap.org/?lat=40.569477&lon=-5.057745
 AV-P-502 http://www.openstreetmap.org/?lat=40.600957&lon=-4.901281
 N-502 http://www.openstreetmap.org/?lat=40.630842&lon=-4.770560
-AV-20(9) +AV20(9) http://www.openstreetmap.org/?lat=40.648215&lon=-4.726911
+AV-20(9) http://www.openstreetmap.org/?lat=40.648215&lon=-4.726911
 N-403_W http://www.openstreetmap.org/?lat=40.652111&lon=-4.711402
 N-501 +N501 http://www.openstreetmap.org/?lat=40.657304&lon=-4.709326
 CL-505 http://www.openstreetmap.org/?lat=40.656986&lon=-4.688330
 N-403_E http://www.openstreetmap.org/?lat=40.659818&lon=-4.679339
 AV-20(2) +2(AV20) http://www.openstreetmap.org/?lat=40.671329&lon=-4.650822
-AV-20(1) +1(AV20) http://www.openstreetmap.org/?lat=40.678327&lon=-4.633870
+AV-20(1) http://www.openstreetmap.org/?lat=40.678327&lon=-4.633870
 AV-P-202 http://www.openstreetmap.org/?lat=40.689038&lon=-4.600074
 AV-P-302 http://www.openstreetmap.org/?lat=40.719071&lon=-4.533674
 AV-501 http://www.openstreetmap.org/?lat=40.741722&lon=-4.471339
-AP-51(82) +AP51(82) http://www.openstreetmap.org/?lat=40.773278&lon=-4.425795
+AP-51(82) http://www.openstreetmap.org/?lat=40.773278&lon=-4.425795
 AP-6 +AP6 http://www.openstreetmap.org/?lat=40.775017&lon=-4.424357
 N-VI +NVI http://www.openstreetmap.org/?lat=40.783373&lon=-4.420715
 SG-722 http://www.openstreetmap.org/?lat=40.808827&lon=-4.310385
diff --git a/hwy_data/ESP-CL/espn/espcl.n111.wpt b/hwy_data/ESP-CL/espn/espcl.n111.wpt
index 5d89f53724a..7a5a464a6fc 100644
--- a/hwy_data/ESP-CL/espn/espcl.n111.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n111.wpt
@@ -5,7 +5,7 @@ SO-820 http://www.openstreetmap.org/?lat=41.911041&lon=-2.464360
 SO-P-6012 http://www.openstreetmap.org/?lat=41.886109&lon=-2.470797
 N-111a_GarN +N111a_GarN http://www.openstreetmap.org/?lat=41.829849&lon=-2.447505
 N-111a_GarS +N111a_GarS http://www.openstreetmap.org/?lat=41.808197&lon=-2.456780
-SO-20_N +SO20_N +14(SO20) +N111 http://www.openstreetmap.org/?lat=41.783041&lon=-2.475143
+SO-20_N +14(SO20) +N111 http://www.openstreetmap.org/?lat=41.783041&lon=-2.475143
 N-122/234_E +N122/N234 http://www.openstreetmap.org/?lat=41.766959&lon=-2.464660
 N-122/234_W http://www.openstreetmap.org/?lat=41.766607&lon=-2.479048
 CalAlm http://www.openstreetmap.org/?lat=41.756787&lon=-2.472718
@@ -26,7 +26,7 @@ A-15(36) http://www.openstreetmap.org/?lat=41.446780&lon=-2.507114
 SO-P-3032 http://www.openstreetmap.org/?lat=41.432950&lon=-2.498655
 A-15(32) http://www.openstreetmap.org/?lat=41.419624&lon=-2.489133
 A-15(28) http://www.openstreetmap.org/?lat=41.383715&lon=-2.464790
-A-15(23) +A15(23) http://www.openstreetmap.org/?lat=41.348198&lon=-2.479241
+A-15(23) http://www.openstreetmap.org/?lat=41.348198&lon=-2.479241
 A-15(13) http://www.openstreetmap.org/?lat=41.260880&lon=-2.474751
 A-15(9) http://www.openstreetmap.org/?lat=41.219006&lon=-2.470840
 +X06 http://www.openstreetmap.org/?lat=41.193289&lon=-2.457386
diff --git a/hwy_data/ESP-CL/espn/espcl.n120.wpt b/hwy_data/ESP-CL/espn/espcl.n120.wpt
index 9fcda95088e..3717ac43681 100644
--- a/hwy_data/ESP-CL/espn/espcl.n120.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n120.wpt
@@ -1,6 +1,6 @@
 AP-71(34) http://www.openstreetmap.org/?lat=42.439547&lon=-6.012611
 N-120a_Dom +N120a_Dom http://www.openstreetmap.org/?lat=42.449947&lon=-5.999152
-LE-6417 +LE6417 http://www.openstreetmap.org/?lat=42.446990&lon=-5.943517
+LE-6417 http://www.openstreetmap.org/?lat=42.446990&lon=-5.943517
 LE-6434 http://www.openstreetmap.org/?lat=42.451973&lon=-5.920306
 LE-420 http://www.openstreetmap.org/?lat=42.458381&lon=-5.884461
 CL-621 http://www.openstreetmap.org/?lat=42.462437&lon=-5.869891
@@ -23,9 +23,9 @@ CL-624 http://www.openstreetmap.org/?lat=42.546224&lon=-5.460178
 LE-213 http://www.openstreetmap.org/?lat=42.543267&lon=-5.450554
 A-60(119) http://www.openstreetmap.org/?lat=42.521380&lon=-5.433211
 N-625 http://www.openstreetmap.org/?lat=42.500793&lon=-5.410938
-A-231(21) +A231(21) http://www.openstreetmap.org/?lat=42.444710&lon=-5.379224
+A-231(21) http://www.openstreetmap.org/?lat=42.444710&lon=-5.379224
 A-60(104) http://www.openstreetmap.org/?lat=42.417754&lon=-5.360084
-LE-6620 +LE6620 http://www.openstreetmap.org/?lat=42.404432&lon=-5.354515
+LE-6620 http://www.openstreetmap.org/?lat=42.404432&lon=-5.354515
 LE-521 http://www.openstreetmap.org/?lat=42.359440&lon=-5.329307
 N-601_S http://www.openstreetmap.org/?lat=42.327189&lon=-5.309706
 CalNue http://www.openstreetmap.org/?lat=42.324571&lon=-5.289241
diff --git a/hwy_data/ESP-CL/espn/espcl.n122.wpt b/hwy_data/ESP-CL/espn/espcl.n122.wpt
index a6ea3650d6f..b17e6e93eff 100644
--- a/hwy_data/ESP-CL/espn/espcl.n122.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n122.wpt
@@ -16,7 +16,7 @@ BU-131 http://www.openstreetmap.org/?lat=41.611187&lon=-3.966274
 BU-122 http://www.openstreetmap.org/?lat=41.626851&lon=-3.877948
 +A-11_2 http://www.openstreetmap.org/?lat=41.630464&lon=-3.855144
 BU-121 http://www.openstreetmap.org/?lat=41.632268&lon=-3.840237
-A-11_Cas +A11_Cas http://www.openstreetmap.org/?lat=41.638330&lon=-3.805261
+A-11_Cas http://www.openstreetmap.org/?lat=41.638330&lon=-3.805261
 BU-V-2031 http://www.openstreetmap.org/?lat=41.648433&lon=-3.782054
 BU-120 http://www.openstreetmap.org/?lat=41.662381&lon=-3.745576
 A-1 +A1 http://www.openstreetmap.org/?lat=41.664545&lon=-3.728528
@@ -24,7 +24,7 @@ N-I http://www.openstreetmap.org/?lat=41.664172&lon=-3.700450
 N-1a +AveCas http://www.openstreetmap.org/?lat=41.662020&lon=-3.691621
 AveOrfAra http://www.openstreetmap.org/?lat=41.661695&lon=-3.686551
 +X10 http://www.openstreetmap.org/?lat=41.653463&lon=-3.682539
-A-11(119) +A11(119) http://www.openstreetmap.org/?lat=41.641041&lon=-3.617163
+A-11(119) http://www.openstreetmap.org/?lat=41.641041&lon=-3.617163
 BU-930 http://www.openstreetmap.org/?lat=41.633335&lon=-3.575728
 +X11 http://www.openstreetmap.org/?lat=41.627625&lon=-3.552114
 N-122a_Vid http://www.openstreetmap.org/?lat=41.633479&lon=-3.495991
@@ -69,5 +69,5 @@ SO-380 http://www.openstreetmap.org/?lat=41.841312&lon=-2.042700
 A-15(106) +A15(106) http://www.openstreetmap.org/?lat=41.853932&lon=-1.942863
 CL-101 http://www.openstreetmap.org/?lat=41.849173&lon=-1.939291
 SO-382 http://www.openstreetmap.org/?lat=41.854083&lon=-1.926346
-A-15(101) +A15(101) http://www.openstreetmap.org/?lat=41.877358&lon=-1.892266
+A-15(101) http://www.openstreetmap.org/?lat=41.877358&lon=-1.892266
 CL/AR http://www.openstreetmap.org/?lat=41.894994&lon=-1.844287
diff --git a/hwy_data/ESP-CL/espn/espcl.n122val.wpt b/hwy_data/ESP-CL/espn/espcl.n122val.wpt
index 88acf5db38d..90c05bc2bd4 100644
--- a/hwy_data/ESP-CL/espn/espcl.n122val.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n122val.wpt
@@ -1,4 +1,4 @@
 PlaCir http://www.openstreetmap.org/?lat=41.647274&lon=-4.717158
 PasJuanCarI http://www.openstreetmap.org/?lat=41.642315&lon=-4.712598
 VA-20 http://www.openstreetmap.org/?lat=41.632493&lon=-4.704165
-VA-30 +VA30 http://www.openstreetmap.org/?lat=41.620912&lon=-4.694359
+VA-30 http://www.openstreetmap.org/?lat=41.620912&lon=-4.694359
diff --git a/hwy_data/ESP-CL/espn/espcl.n122zam.wpt b/hwy_data/ESP-CL/espn/espcl.n122zam.wpt
index ecbb03af652..f872426ebe8 100644
--- a/hwy_data/ESP-CL/espn/espcl.n122zam.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n122zam.wpt
@@ -16,11 +16,11 @@ ElCam http://www.openstreetmap.org/?lat=41.541735&lon=-5.863609
 A-11(466) +A11(466) http://www.openstreetmap.org/?lat=41.523423&lon=-5.798807
 CalTra http://www.openstreetmap.org/?lat=41.500474&lon=-5.756702
 RonFer http://www.openstreetmap.org/?lat=41.505107&lon=-5.749068
-ZA-11/20 +N630_N http://www.openstreetmap.org/?lat=41.519398&lon=-5.755103
+ZA-11/20 http://www.openstreetmap.org/?lat=41.519398&lon=-5.755103
 CL-612 http://www.openstreetmap.org/?lat=41.515997&lon=-5.746327
 ZA-12/20 http://www.openstreetmap.org/?lat=41.510618&lon=-5.736043
 ZA-12_E http://www.openstreetmap.org/?lat=41.523279&lon=-5.717547
-A-66 +A66 http://www.openstreetmap.org/?lat=41.526837&lon=-5.698621
+A-66 http://www.openstreetmap.org/?lat=41.526837&lon=-5.698621
 ZA-711 http://www.openstreetmap.org/?lat=41.527977&lon=-5.611600
 ZA-P-2307 http://www.openstreetmap.org/?lat=41.529182&lon=-5.562521
 ZA-P-2102 http://www.openstreetmap.org/?lat=41.508674&lon=-5.519793
diff --git a/hwy_data/ESP-CL/espn/espcl.n403.wpt b/hwy_data/ESP-CL/espn/espcl.n403.wpt
index 1fa4256108b..0b0b0715ff9 100644
--- a/hwy_data/ESP-CL/espn/espcl.n403.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n403.wpt
@@ -8,7 +8,7 @@ AV-P-203 http://www.openstreetmap.org/?lat=40.750139&lon=-4.662527
 +X02 http://www.openstreetmap.org/?lat=40.738140&lon=-4.674532
 +X03 http://www.openstreetmap.org/?lat=40.698567&lon=-4.671775
 AV-20 http://www.openstreetmap.org/?lat=40.677058&lon=-4.685583
-N-110_E +N110_E http://www.openstreetmap.org/?lat=40.659818&lon=-4.679339
+N-110_E http://www.openstreetmap.org/?lat=40.659818&lon=-4.679339
 CL-505 http://www.openstreetmap.org/?lat=40.656986&lon=-4.688330
 N-501 +N501 http://www.openstreetmap.org/?lat=40.657304&lon=-4.709326
 N-110_W http://www.openstreetmap.org/?lat=40.652111&lon=-4.711402
diff --git a/hwy_data/ESP-CL/espn/espcl.n525.wpt b/hwy_data/ESP-CL/espn/espcl.n525.wpt
index 169e95e7eef..db54bfb29ae 100644
--- a/hwy_data/ESP-CL/espn/espcl.n525.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n525.wpt
@@ -15,7 +15,7 @@ A-52(75) http://www.openstreetmap.org/?lat=42.053435&lon=-6.556220
 ZA-125 http://www.openstreetmap.org/?lat=42.058864&lon=-6.521608
 ZA-P-2642 http://www.openstreetmap.org/?lat=42.023673&lon=-6.339890
 A-52(54) http://www.openstreetmap.org/?lat=42.018549&lon=-6.309586
-N-631 +N631 http://www.openstreetmap.org/?lat=42.011025&lon=-6.263790
+N-631 http://www.openstreetmap.org/?lat=42.011025&lon=-6.263790
 ZA-111 http://www.openstreetmap.org/?lat=42.005627&lon=-6.221265
 ZA-105 http://www.openstreetmap.org/?lat=41.993352&lon=-6.033328
 ZA-110 http://www.openstreetmap.org/?lat=41.999719&lon=-6.017145
@@ -24,4 +24,4 @@ ZA-P-2553 http://www.openstreetmap.org/?lat=42.007101&lon=-5.895818
 ZA-V-2527 http://www.openstreetmap.org/?lat=42.005336&lon=-5.846582
 ZA-P-1512 http://www.openstreetmap.org/?lat=42.000835&lon=-5.710787
 ViaCan http://www.openstreetmap.org/?lat=41.992531&lon=-5.679534
-N-VI +NVI http://www.openstreetmap.org/?lat=41.996454&lon=-5.657578
+N-VI http://www.openstreetmap.org/?lat=41.996454&lon=-5.657578
diff --git a/hwy_data/ESP-CL/espn/espcl.n601.wpt b/hwy_data/ESP-CL/espn/espcl.n601.wpt
index 77526da772a..b0f5ee2ebcc 100644
--- a/hwy_data/ESP-CL/espn/espcl.n601.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n601.wpt
@@ -15,7 +15,7 @@ LE-932 http://www.openstreetmap.org/?lat=42.250698&lon=-5.268245
 CL-621 http://www.openstreetmap.org/?lat=42.175593&lon=-5.269934
 +X01 http://www.openstreetmap.org/?lat=42.136749&lon=-5.256717
 N-610_W http://www.openstreetmap.org/?lat=42.099842&lon=-5.215126
-N-610_E +N610_E http://www.openstreetmap.org/?lat=42.089091&lon=-5.204435
+N-610_E http://www.openstreetmap.org/?lat=42.089091&lon=-5.204435
 VP-4506 http://www.openstreetmap.org/?lat=42.034249&lon=-5.147781
 CamMon http://www.openstreetmap.org/?lat=41.965294&lon=-5.112790
 VA-905 http://www.openstreetmap.org/?lat=41.909236&lon=-5.068248
@@ -25,7 +25,7 @@ VA-515 http://www.openstreetmap.org/?lat=41.876519&lon=-5.039109
 CL-612_E http://www.openstreetmap.org/?lat=41.867780&lon=-5.028246
 +X02 http://www.openstreetmap.org/?lat=41.824861&lon=-4.999798
 VA-510 http://www.openstreetmap.org/?lat=41.786461&lon=-4.943182
-A-60(14) +A60(14) http://www.openstreetmap.org/?lat=41.749864&lon=-4.889731
+A-60(14) http://www.openstreetmap.org/?lat=41.749864&lon=-4.889731
 Vil http://www.openstreetmap.org/?lat=41.714406&lon=-4.851064
 +X03 http://www.openstreetmap.org/?lat=41.722555&lon=-4.833233
 ToA-60 http://www.openstreetmap.org/?lat=41.719071&lon=-4.830116
diff --git a/hwy_data/ESP-CL/espn/espcl.n610.wpt b/hwy_data/ESP-CL/espn/espcl.n610.wpt
index bcf37c9342d..450fe882399 100644
--- a/hwy_data/ESP-CL/espn/espcl.n610.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n610.wpt
@@ -5,7 +5,7 @@ ZA-512_S http://www.openstreetmap.org/?lat=41.987599&lon=-5.412520
 ZA-512_N http://www.openstreetmap.org/?lat=41.987511&lon=-5.409420
 VP-5505 http://www.openstreetmap.org/?lat=42.040409&lon=-5.310500
 N-601_N http://www.openstreetmap.org/?lat=42.099842&lon=-5.215126
-N-601_S +N601_S http://www.openstreetmap.org/?lat=42.089091&lon=-5.204435
+N-601_S http://www.openstreetmap.org/?lat=42.089091&lon=-5.204435
 VP-4507 http://www.openstreetmap.org/?lat=42.081749&lon=-5.126812
 +X01 http://www.openstreetmap.org/?lat=42.082363&lon=-5.089438
 VA-905_S http://www.openstreetmap.org/?lat=42.096033&lon=-5.037902
diff --git a/hwy_data/ESP-CL/espn/espcl.n620.wpt b/hwy_data/ESP-CL/espn/espcl.n620.wpt
index 294d653258b..03f9db15c4e 100644
--- a/hwy_data/ESP-CL/espn/espcl.n620.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n620.wpt
@@ -26,11 +26,11 @@ A-62(252) http://www.openstreetmap.org/?lat=40.936048&lon=-5.789323
 DSA-301 http://www.openstreetmap.org/?lat=40.947204&lon=-5.736462
 A-62(244A) http://www.openstreetmap.org/?lat=40.956875&lon=-5.718319
 CL-517 http://www.openstreetmap.org/?lat=40.958107&lon=-5.717032
-A-62(244) +A62(244) http://www.openstreetmap.org/?lat=40.956324&lon=-5.708749
+A-62(244) http://www.openstreetmap.org/?lat=40.956324&lon=-5.708749
 A-66 http://www.openstreetmap.org/?lat=40.955660&lon=-5.708170
 CalAldQui http://www.openstreetmap.org/?lat=40.954882&lon=-5.691266
 CL-512 http://www.openstreetmap.org/?lat=40.955047&lon=-5.676177
-N-630_S +N630_S http://www.openstreetmap.org/?lat=40.957912&lon=-5.675366
+N-630_S http://www.openstreetmap.org/?lat=40.957912&lon=-5.675366
 CalSanGre http://www.openstreetmap.org/?lat=40.960384&lon=-5.673162
 AveVil http://www.openstreetmap.org/?lat=40.967889&lon=-5.667986
 AveMir http://www.openstreetmap.org/?lat=40.970048&lon=-5.663420
diff --git a/hwy_data/ESP-CL/espn/espcl.n625.wpt b/hwy_data/ESP-CL/espn/espcl.n625.wpt
index 4fe453afe29..3516b83b4ae 100644
--- a/hwy_data/ESP-CL/espn/espcl.n625.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n625.wpt
@@ -24,7 +24,7 @@ LE-3707 http://www.openstreetmap.org/?lat=42.931444&lon=-5.111914
 LE-3706 http://www.openstreetmap.org/?lat=42.871935&lon=-5.161052
 +X25 http://www.openstreetmap.org/?lat=42.860343&lon=-5.133667
 CL-626_W http://www.openstreetmap.org/?lat=42.832906&lon=-5.126908
-LE-4701 +LE4701 http://www.openstreetmap.org/?lat=42.826486&lon=-5.121807
+LE-4701 http://www.openstreetmap.org/?lat=42.826486&lon=-5.121807
 CL-626_CisN http://www.openstreetmap.org/?lat=42.813309&lon=-5.131087
 LE-4606 http://www.openstreetmap.org/?lat=42.808279&lon=-5.130100
 SC-LE-31 http://www.openstreetmap.org/?lat=42.800526&lon=-5.125315
diff --git a/hwy_data/ESP-CL/espn/espcl.n631.wpt b/hwy_data/ESP-CL/espn/espcl.n631.wpt
index 7415dae2306..7feaef4e377 100644
--- a/hwy_data/ESP-CL/espn/espcl.n631.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.n631.wpt
@@ -1,4 +1,4 @@
-N-525 +N525 http://www.openstreetmap.org/?lat=42.011025&lon=-6.263790
+N-525 http://www.openstreetmap.org/?lat=42.011025&lon=-6.263790
 A-52 http://www.openstreetmap.org/?lat=42.005970&lon=-6.255212
 ZA-912 http://www.openstreetmap.org/?lat=41.975676&lon=-6.231367
 ZA-P-2639 http://www.openstreetmap.org/?lat=41.950757&lon=-6.200489
@@ -10,4 +10,4 @@ ZA-123 http://www.openstreetmap.org/?lat=41.821399&lon=-5.950706
 ZA-P-2431 http://www.openstreetmap.org/?lat=41.735438&lon=-5.827593
 Enc http://www.openstreetmap.org/?lat=41.709653&lon=-5.807948
 +X02 http://www.openstreetmap.org/?lat=41.701227&lon=-5.818923
-N-630 +N630 http://www.openstreetmap.org/?lat=41.689370&lon=-5.807658
+N-630 http://www.openstreetmap.org/?lat=41.689370&lon=-5.807658
diff --git a/hwy_data/ESP-CL/espn/espcl.sa020.wpt b/hwy_data/ESP-CL/espn/espcl.sa020.wpt
index c14144c4b8c..ea35c125c38 100644
--- a/hwy_data/ESP-CL/espn/espcl.sa020.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.sa020.wpt
@@ -1,3 +1,3 @@
-A-66 +A66 http://www.openstreetmap.org/?lat=40.940311&lon=-5.682378
+A-66 http://www.openstreetmap.org/?lat=40.940311&lon=-5.682378
 N-630 http://www.openstreetmap.org/?lat=40.941195&lon=-5.668902
-A-50 +A50 http://www.openstreetmap.org/?lat=40.943829&lon=-5.640149
+A-50 http://www.openstreetmap.org/?lat=40.943829&lon=-5.640149
diff --git a/hwy_data/ESP-CL/espn/espcl.va020.wpt b/hwy_data/ESP-CL/espn/espcl.va020.wpt
index 48018c280fd..9dc2c13e731 100644
--- a/hwy_data/ESP-CL/espn/espcl.va020.wpt
+++ b/hwy_data/ESP-CL/espn/espcl.va020.wpt
@@ -1,8 +1,8 @@
-VA-30 +VA30 http://www.openstreetmap.org/?lat=41.612635&lon=-4.712942
+VA-30 http://www.openstreetmap.org/?lat=41.612635&lon=-4.712942
 ToN-601 http://www.openstreetmap.org/?lat=41.620768&lon=-4.715903
 N-122 http://www.openstreetmap.org/?lat=41.632493&lon=-4.704165
 VA-140 http://www.openstreetmap.org/?lat=41.659255&lon=-4.693995
 PasJuanCar http://www.openstreetmap.org/?lat=41.664465&lon=-4.700947
 VA-113 http://www.openstreetmap.org/?lat=41.669642&lon=-4.706805
 N-620 http://www.openstreetmap.org/?lat=41.678169&lon=-4.721847
-A-62 +A62 http://www.openstreetmap.org/?lat=41.684355&lon=-4.730258
+A-62 http://www.openstreetmap.org/?lat=41.684355&lon=-4.730258
diff --git a/hwy_data/ESP-CM/espa/espcm.ap041.wpt b/hwy_data/ESP-CM/espa/espcm.ap041.wpt
index 1b444814efc..dde0ab9ddab 100644
--- a/hwy_data/ESP-CM/espa/espcm.ap041.wpt
+++ b/hwy_data/ESP-CM/espa/espcm.ap041.wpt
@@ -11,4 +11,4 @@ MD/CM http://www.openstreetmap.org/?lat=40.190791&lon=-3.902013
 +X8 http://www.openstreetmap.org/?lat=39.978074&lon=-3.864226
 44 http://www.openstreetmap.org/?lat=39.957912&lon=-3.869977
 +X9 http://www.openstreetmap.org/?lat=39.927609&lon=-3.899846
-A-40 +A-4 +A40/TO22 http://www.openstreetmap.org/?lat=39.919973&lon=-3.935809
+A-40 +A40/TO22 http://www.openstreetmap.org/?lat=39.919973&lon=-3.935809
diff --git a/hwy_data/ESP-CM/espcm/espcm.cm310.wpt b/hwy_data/ESP-CM/espcm/espcm.cm310.wpt
index 0d90a4afa29..cdd02070f37 100644
--- a/hwy_data/ESP-CM/espcm/espcm.cm310.wpt
+++ b/hwy_data/ESP-CM/espcm/espcm.cm310.wpt
@@ -39,5 +39,5 @@ N-301a_E http://www.openstreetmap.org/?lat=39.586599&lon=-3.039087
 N-301 http://www.openstreetmap.org/?lat=39.573579&lon=-3.047440
 CM-3130 http://www.openstreetmap.org/?lat=39.523475&lon=-3.083081
 +X467416 http://www.openstreetmap.org/?lat=39.487052&lon=-3.119560
-CM-3105 +CM3105 http://www.openstreetmap.org/?lat=39.444810&lon=-3.139300
+CM-3105 http://www.openstreetmap.org/?lat=39.444810&lon=-3.139300
 CM-3166 http://www.openstreetmap.org/?lat=39.399944&lon=-3.206055
diff --git a/hwy_data/ESP-CM/espn/espcm.n301.wpt b/hwy_data/ESP-CM/espn/espcm.n301.wpt
index 71c8ef2ca3d..08d08737ce8 100644
--- a/hwy_data/ESP-CM/espn/espcm.n301.wpt
+++ b/hwy_data/ESP-CM/espn/espcm.n301.wpt
@@ -1,4 +1,4 @@
-A-31 +A-31(69) http://www.openstreetmap.org/?lat=39.032220&lon=-1.897630
+A-31 http://www.openstreetmap.org/?lat=39.032220&lon=-1.897630
 A-32 http://www.openstreetmap.org/?lat=39.011548&lon=-1.875143
 AveMan_N http://www.openstreetmap.org/?lat=39.006975&lon=-1.869548
 AveMenPid http://www.openstreetmap.org/?lat=39.003361&lon=-1.865804
diff --git a/hwy_data/ESP-CM/espn/espcm.n322.wpt b/hwy_data/ESP-CM/espn/espcm.n322.wpt
index e5f9cb28136..5e777ca4bbe 100644
--- a/hwy_data/ESP-CM/espn/espcm.n322.wpt
+++ b/hwy_data/ESP-CM/espn/espcm.n322.wpt
@@ -21,7 +21,7 @@ AB-5028 http://www.openstreetmap.org/?lat=38.800432&lon=-2.339943
 CM-313 http://www.openstreetmap.org/?lat=38.848825&lon=-2.228219
 +X10 http://www.openstreetmap.org/?lat=38.882436&lon=-2.188517
 CM-3135 http://www.openstreetmap.org/?lat=38.881174&lon=-2.143654
-AB-503 +AB503 http://www.openstreetmap.org/?lat=38.924820&lon=-2.034396
+AB-503 http://www.openstreetmap.org/?lat=38.924820&lon=-2.034396
 A-32 +A32 http://www.openstreetmap.org/?lat=38.964106&lon=-1.934538
 347 http://www.openstreetmap.org/?lat=38.967851&lon=-1.928573
 +X954391 http://www.openstreetmap.org/?lat=38.995173&lon=-1.916814
diff --git a/hwy_data/ESP-CM/espn/espcm.n400.wpt b/hwy_data/ESP-CM/espn/espcm.n400.wpt
index dd1c9138d9b..7551d90201f 100644
--- a/hwy_data/ESP-CM/espn/espcm.n400.wpt
+++ b/hwy_data/ESP-CM/espn/espcm.n400.wpt
@@ -7,8 +7,8 @@ N-301 http://www.openstreetmap.org/?lat=39.955852&lon=-3.503335
 A-40(188) http://www.openstreetmap.org/?lat=39.962673&lon=-3.480005
 TO-2558 http://www.openstreetmap.org/?lat=39.977362&lon=-3.439086
 A-40(193) http://www.openstreetmap.org/?lat=39.970765&lon=-3.413717
-A-40(194) +A40(194) http://www.openstreetmap.org/?lat=39.973104&lon=-3.391230
-CM-322 +CM322 http://www.openstreetmap.org/?lat=39.979484&lon=-3.377057
+A-40(194) http://www.openstreetmap.org/?lat=39.973104&lon=-3.391230
+CM-322 http://www.openstreetmap.org/?lat=39.979484&lon=-3.377057
 CM-3001 http://www.openstreetmap.org/?lat=39.978391&lon=-3.368152
 A-40(197) http://www.openstreetmap.org/?lat=39.967944&lon=-3.358469
 A-40(202) http://www.openstreetmap.org/?lat=39.957234&lon=-3.303538
@@ -18,7 +18,7 @@ TO-2581 http://www.openstreetmap.org/?lat=39.976100&lon=-3.182049
 A-40(215) http://www.openstreetmap.org/?lat=39.976298&lon=-3.163805
 A-40(219) http://www.openstreetmap.org/?lat=39.984071&lon=-3.112628
 A-40(223) http://www.openstreetmap.org/?lat=39.996557&lon=-3.062556
-A-3 +A3 http://www.openstreetmap.org/?lat=40.005002&lon=-3.027313
+A-3 http://www.openstreetmap.org/?lat=40.005002&lon=-3.027313
 N-III_N http://www.openstreetmap.org/?lat=40.007422&lon=-3.019266
 CM-200_S http://www.openstreetmap.org/?lat=40.003194&lon=-3.005340
 N-III_S +NIII_S http://www.openstreetmap.org/?lat=39.996968&lon=-2.987643
diff --git a/hwy_data/ESP-CM/espn/espcm.n430.wpt b/hwy_data/ESP-CM/espn/espcm.n430.wpt
index e949973d1a9..9c6fb46e952 100644
--- a/hwy_data/ESP-CM/espn/espcm.n430.wpt
+++ b/hwy_data/ESP-CM/espn/espcm.n430.wpt
@@ -44,9 +44,9 @@ A-43(48) http://www.openstreetmap.org/?lat=39.018350&lon=-3.407864
 ToA-4 http://www.openstreetmap.org/?lat=39.008250&lon=-3.389030
 A-4 http://www.openstreetmap.org/?lat=39.014449&lon=-3.374305
 CM-3107 http://www.openstreetmap.org/?lat=39.009831&lon=-3.369455
-N-430a_MemW +N430a_MemW http://www.openstreetmap.org/?lat=39.000201&lon=-3.360346
+N-430a_MemW http://www.openstreetmap.org/?lat=39.000201&lon=-3.360346
 N-310_N http://www.openstreetmap.org/?lat=39.013890&lon=-3.336856
-N-430a_MemE +N430a_MemE http://www.openstreetmap.org/?lat=38.968648&lon=-3.319116
+N-430a_MemE http://www.openstreetmap.org/?lat=38.968648&lon=-3.319116
 N-430a_Sol +Sol_W http://www.openstreetmap.org/?lat=38.946856&lon=-3.259195
 CM-3127 +CM3127 http://www.openstreetmap.org/?lat=38.932640&lon=-3.233698
 +X02 http://www.openstreetmap.org/?lat=38.936488&lon=-3.220239
diff --git a/hwy_data/ESP-CM/espn/espcm.n430a.wpt b/hwy_data/ESP-CM/espn/espcm.n430a.wpt
index 7732ca52bad..e3ddfc2c103 100644
--- a/hwy_data/ESP-CM/espn/espcm.n430a.wpt
+++ b/hwy_data/ESP-CM/espn/espcm.n430a.wpt
@@ -1,5 +1,5 @@
-N-430_W +N430_W http://www.openstreetmap.org/?lat=39.036028&lon=-2.501917
-CM-3133 +CM3133 http://www.openstreetmap.org/?lat=39.038090&lon=-2.492743
-CM-3119 +CM3119 http://www.openstreetmap.org/?lat=39.046140&lon=-2.482658
-CM-316 +CM316 http://www.openstreetmap.org/?lat=39.042786&lon=-2.467954
-N-430_E +N430_E http://www.openstreetmap.org/?lat=39.029723&lon=-2.457370
+N-430_W http://www.openstreetmap.org/?lat=39.036028&lon=-2.501917
+CM-3133 http://www.openstreetmap.org/?lat=39.038090&lon=-2.492743
+CM-3119 http://www.openstreetmap.org/?lat=39.046140&lon=-2.482658
+CM-316 http://www.openstreetmap.org/?lat=39.042786&lon=-2.467954
+N-430_E http://www.openstreetmap.org/?lat=39.029723&lon=-2.457370
diff --git a/hwy_data/ESP-CT/espct/espct.c013b.wpt b/hwy_data/ESP-CT/espa/espct.c013b.wpt
similarity index 100%
rename from hwy_data/ESP-CT/espct/espct.c013b.wpt
rename to hwy_data/ESP-CT/espa/espct.c013b.wpt
diff --git a/hwy_data/ESP-CT/espa/espct.c013lle.wpt b/hwy_data/ESP-CT/espa/espct.c013lle.wpt
new file mode 100644
index 00000000000..3255ccc57aa
--- /dev/null
+++ b/hwy_data/ESP-CT/espa/espct.c013lle.wpt
@@ -0,0 +1,5 @@
+1A http://www.openstreetmap.org/?lat=41.581617&lon=0.624032
+1B http://www.openstreetmap.org/?lat=41.587066&lon=0.630362
+3 http://www.openstreetmap.org/?lat=41.594263&lon=0.645661
+5 http://www.openstreetmap.org/?lat=41.601805&lon=0.664673
+N-240 http://www.openstreetmap.org/?lat=41.606570&lon=0.673192
diff --git a/hwy_data/ESP-CT/espa/espct.c013vil.wpt b/hwy_data/ESP-CT/espa/espct.c013vil.wpt
new file mode 100644
index 00000000000..6a2857869fb
--- /dev/null
+++ b/hwy_data/ESP-CT/espa/espct.c013vil.wpt
@@ -0,0 +1,4 @@
+C13z_S http://www.openstreetmap.org/?lat=41.676758&lon=0.716343
+17 http://www.openstreetmap.org/?lat=41.690476&lon=0.735912
+Bel http://www.openstreetmap.org/?lat=41.706033&lon=0.757713
+C13z_N http://www.openstreetmap.org/?lat=41.708952&lon=0.753760
\ No newline at end of file
diff --git a/hwy_data/ESP-CT/espa/espct.c015pob.wpt b/hwy_data/ESP-CT/espa/espct.c015pob.wpt
new file mode 100644
index 00000000000..41201aacc2a
--- /dev/null
+++ b/hwy_data/ESP-CT/espa/espct.c015pob.wpt
@@ -0,0 +1,2 @@
+39 http://www.openstreetmap.org/?lat=41.541992&lon=1.691551
+44 http://www.openstreetmap.org/?lat=41.579602&lon=1.668892
diff --git a/hwy_data/ESP-CT/espa/espct.c015vil.wpt b/hwy_data/ESP-CT/espa/espct.c015vil.wpt
new file mode 100644
index 00000000000..099785d6612
--- /dev/null
+++ b/hwy_data/ESP-CT/espa/espct.c015vil.wpt
@@ -0,0 +1,10 @@
+C-31 http://www.openstreetmap.org/?lat=41.236673&lon=1.733801
+1 http://www.openstreetmap.org/?lat=41.241078&lon=1.729252
+1a http://www.openstreetmap.org/?lat=41.243966&lon=1.723287
+1b http://www.openstreetmap.org/?lat=41.246708&lon=1.720047
+2 http://www.openstreetmap.org/?lat=41.252871&lon=1.718159
+3 http://www.openstreetmap.org/?lat=41.256839&lon=1.730820
+7 http://www.openstreetmap.org/?lat=41.290972&lon=1.725122
+BV-2443 http://www.openstreetmap.org/?lat=41.315885&lon=1.724440
+11 http://www.openstreetmap.org/?lat=41.321574&lon=1.725540
+13 http://www.openstreetmap.org/?lat=41.330630&lon=1.712816
diff --git a/hwy_data/ESP-CT/espct/espct.c016.wpt b/hwy_data/ESP-CT/espa/espct.c016.wpt
similarity index 69%
rename from hwy_data/ESP-CT/espct/espct.c016.wpt
rename to hwy_data/ESP-CT/espa/espct.c016.wpt
index bcdf22e6b41..40cc19e4b63 100644
--- a/hwy_data/ESP-CT/espct/espct.c016.wpt
+++ b/hwy_data/ESP-CT/espa/espct.c016.wpt
@@ -49,23 +49,4 @@ B-40 http://www.openstreetmap.org/?lat=41.555433&lon=1.977046
 90 http://www.openstreetmap.org/?lat=42.047062&lon=1.876237
 92 http://www.openstreetmap.org/?lat=42.067423&lon=1.874800
 95 http://www.openstreetmap.org/?lat=42.090149&lon=1.854983
-C-26_W +C26_W http://www.openstreetmap.org/?lat=42.095380&lon=1.854018
-C-149b +C149b http://www.openstreetmap.org/?lat=42.109613&lon=1.858889
-C-26_E http://www.openstreetmap.org/?lat=42.116402&lon=1.855896
-C-1411z_S http://www.openstreetmap.org/?lat=42.130662&lon=1.864189
-C-1411z_N +C1411z_N http://www.openstreetmap.org/?lat=42.142357&lon=1.864972
-CarBae http://www.openstreetmap.org/?lat=42.146116&lon=1.863245
-+X8 http://www.openstreetmap.org/?lat=42.165439&lon=1.855059
-+X8A http://www.openstreetmap.org/?lat=42.195969&lon=1.870852
-B-400 http://www.openstreetmap.org/?lat=42.217673&lon=1.869274
-C-1411a_S +C1411a_S http://www.openstreetmap.org/?lat=42.227906&lon=1.876436
-B-402 http://www.openstreetmap.org/?lat=42.230615&lon=1.882664
-C-1411a_N +C1411a_N http://www.openstreetmap.org/?lat=42.237001&lon=1.875937
-Baga http://www.openstreetmap.org/?lat=42.252426&lon=1.867333
-+X10 http://www.openstreetmap.org/?lat=42.262034&lon=1.852934
-+X11 http://www.openstreetmap.org/?lat=42.286389&lon=1.851046
-+X12 http://www.openstreetmap.org/?lat=42.294675&lon=1.863192
-CarUrus http://www.openstreetmap.org/?lat=42.344922&lon=1.833043
-C-162 +C162 http://www.openstreetmap.org/?lat=42.348792&lon=1.831305
-+X705235 http://www.openstreetmap.org/?lat=42.349791&lon=1.815534
-N-260R +N260 http://www.openstreetmap.org/?lat=42.362952&lon=1.814075
+C-26 +C-26_W +C26_W http://www.openstreetmap.org/?lat=42.095380&lon=1.854018
diff --git a/hwy_data/ESP-CT/espa/espct.c017vic.wpt b/hwy_data/ESP-CT/espa/espct.c017vic.wpt
new file mode 100644
index 00000000000..2f788874e52
--- /dev/null
+++ b/hwy_data/ESP-CT/espa/espct.c017vic.wpt
@@ -0,0 +1,32 @@
+44 http://www.openstreetmap.org/?lat=41.795752&lon=2.234837
+45 http://www.openstreetmap.org/?lat=41.802543&lon=2.229538
+46 http://www.openstreetmap.org/?lat=41.807741&lon=2.225654
+47 http://www.openstreetmap.org/?lat=41.826643&lon=2.234451
+49 http://www.openstreetmap.org/?lat=41.839977&lon=2.232950
+50 http://www.openstreetmap.org/?lat=41.847027&lon=2.233121
+51 http://www.openstreetmap.org/?lat=41.853532&lon=2.237349
+52 http://www.openstreetmap.org/?lat=41.868858&lon=2.233958
+54 http://www.openstreetmap.org/?lat=41.881336&lon=2.240524
+55 http://www.openstreetmap.org/?lat=41.894411&lon=2.245395
+56 http://www.openstreetmap.org/?lat=41.903627&lon=2.247884
+57 http://www.openstreetmap.org/?lat=41.909751&lon=2.249236
+60 http://www.openstreetmap.org/?lat=41.927346&lon=2.230911
+C-25_W +C25_W http://www.openstreetmap.org/?lat=41.940978&lon=2.231169
+62 http://www.openstreetmap.org/?lat=41.951926&lon=2.236791
+C-25_E +C25_E http://www.openstreetmap.org/?lat=41.957224&lon=2.245631
+64 http://www.openstreetmap.org/?lat=41.962362&lon=2.248421
+65 http://www.openstreetmap.org/?lat=41.974647&lon=2.243743
+67 http://www.openstreetmap.org/?lat=41.987758&lon=2.242413
+68 http://www.openstreetmap.org/?lat=41.998475&lon=2.249751
+69 http://www.openstreetmap.org/?lat=42.000915&lon=2.252133
+72 http://www.openstreetmap.org/?lat=42.020669&lon=2.244687
+75 http://www.openstreetmap.org/?lat=42.047922&lon=2.233443
+76 http://www.openstreetmap.org/?lat=42.056144&lon=2.237949
+77 http://www.openstreetmap.org/?lat=42.078986&lon=2.232092
+79 http://www.openstreetmap.org/?lat=42.082936&lon=2.228744
+81 http://www.openstreetmap.org/?lat=42.096280&lon=2.222157
+82 http://www.openstreetmap.org/?lat=42.097745&lon=2.211385
+85 http://www.openstreetmap.org/?lat=42.119227&lon=2.200484
+87 http://www.openstreetmap.org/?lat=42.135555&lon=2.205023
+89 http://www.openstreetmap.org/?lat=42.152738&lon=2.200999
+91 http://www.openstreetmap.org/?lat=42.169033&lon=2.195785
diff --git a/hwy_data/ESP-CT/espct/espct.c025.wpt b/hwy_data/ESP-CT/espa/espct.c025.wpt
similarity index 93%
rename from hwy_data/ESP-CT/espct/espct.c025.wpt
rename to hwy_data/ESP-CT/espa/espct.c025.wpt
index 9ec8b1c67a6..5e7c30e8ff5 100644
--- a/hwy_data/ESP-CT/espct/espct.c025.wpt
+++ b/hwy_data/ESP-CT/espa/espct.c025.wpt
@@ -55,7 +55,4 @@ C-17_N http://www.openstreetmap.org/?lat=41.957224&lon=2.245631
 225 http://www.openstreetmap.org/?lat=41.890234&lon=2.656245
 228 http://www.openstreetmap.org/?lat=41.878381&lon=2.695770
 234 http://www.openstreetmap.org/?lat=41.874035&lon=2.760015
-702(A2) http://www.openstreetmap.org/?lat=41.868027&lon=2.777374
-705(A2) http://www.openstreetmap.org/?lat=41.890681&lon=2.783489
-PasCam http://www.openstreetmap.org/?lat=41.896543&lon=2.832134
-C-65 http://www.openstreetmap.org/?lat=41.893365&lon=2.859535
+A-2(702) +702(A2) http://www.openstreetmap.org/?lat=41.868027&lon=2.777374
diff --git a/hwy_data/ESP-CT/espct/espct.c032.wpt b/hwy_data/ESP-CT/espa/espct.c032.wpt
similarity index 100%
rename from hwy_data/ESP-CT/espct/espct.c032.wpt
rename to hwy_data/ESP-CT/espa/espct.c032.wpt
diff --git a/hwy_data/ESP-CT/espct/espct.c032mat.wpt b/hwy_data/ESP-CT/espa/espct.c032mat.wpt
similarity index 100%
rename from hwy_data/ESP-CT/espct/espct.c032mat.wpt
rename to hwy_data/ESP-CT/espa/espct.c032mat.wpt
diff --git a/hwy_data/ESP-CT/espa/espct.ll011.wpt b/hwy_data/ESP-CT/espa/espct.ll011.wpt
index 6068523a6fe..eb571f9d436 100644
--- a/hwy_data/ESP-CT/espa/espct.ll011.wpt
+++ b/hwy_data/ESP-CT/espa/espct.ll011.wpt
@@ -1,9 +1,10 @@
 A-2 +A2 http://www.openstreetmap.org/?lat=41.631675&lon=0.751576
 N-II_E http://www.openstreetmap.org/?lat=41.628836&lon=0.747628
 LV-2003 +LV2003 http://www.openstreetmap.org/?lat=41.625917&lon=0.720076
-C-13 +C13 http://www.openstreetmap.org/?lat=41.623623&lon=0.699391
-N-240_E +N240_E http://www.openstreetmap.org/?lat=41.618137&lon=0.664823
-N-240_W http://www.openstreetmap.org/?lat=41.614127&lon=0.651605
+C-13B +C13 +C-13 http://www.openstreetmap.org/?lat=41.623623&lon=0.699391
+CarD http://www.openstreetmap.org/?lat=41.620215&lon=0.679843
+N-240 +N240_E +N-240_E http://www.openstreetmap.org/?lat=41.618137&lon=0.664823
+N-240a +N-240_W http://www.openstreetmap.org/?lat=41.614127&lon=0.651605
 AviGar http://www.openstreetmap.org/?lat=41.608576&lon=0.634847
 LL-12 +LL12 http://www.openstreetmap.org/?lat=41.603795&lon=0.624547
 N-II_W +NII_W http://www.openstreetmap.org/?lat=41.608351&lon=0.617273
diff --git a/hwy_data/ESP-CT/espct/espct.c013.wpt b/hwy_data/ESP-CT/espct/espct.c013.wpt
index acc1e36acbf..5e49fdf84e9 100644
--- a/hwy_data/ESP-CT/espct/espct.c013.wpt
+++ b/hwy_data/ESP-CT/espct/espct.c013.wpt
@@ -1,16 +1,4 @@
-1A http://www.openstreetmap.org/?lat=41.581617&lon=0.624032
-1B http://www.openstreetmap.org/?lat=41.587066&lon=0.630362
-3 http://www.openstreetmap.org/?lat=41.594263&lon=0.645661
-5 http://www.openstreetmap.org/?lat=41.602848&lon=0.669158
-N-240a +N240a http://www.openstreetmap.org/?lat=41.606570&lon=0.673192
-CarD http://www.openstreetmap.org/?lat=41.611079&lon=0.673556
-LL-11 +LL11 http://www.openstreetmap.org/?lat=41.618137&lon=0.664823
-AviInd http://www.openstreetmap.org/?lat=41.630296&lon=0.664072
-A-2 +A2 http://www.openstreetmap.org/?lat=41.641201&lon=0.676067
-VilBar_S http://www.openstreetmap.org/?lat=41.676758&lon=0.716343
-VilBar_E http://www.openstreetmap.org/?lat=41.690476&lon=0.735912
-Bel http://www.openstreetmap.org/?lat=41.706033&lon=0.757713
-VilBar_N http://www.openstreetmap.org/?lat=41.708952&lon=0.753760
+C13z +VilBar_N http://www.openstreetmap.org/?lat=41.708952&lon=0.753760
 CamiTer http://www.openstreetmap.org/?lat=41.749992&lon=0.804191
 C-26/53 http://www.openstreetmap.org/?lat=41.782993&lon=0.825562
 C-148a http://www.openstreetmap.org/?lat=41.786465&lon=0.827901
diff --git a/hwy_data/ESP-CT/espct/espct.c013alc.wpt b/hwy_data/ESP-CT/espct/espct.c013alc.wpt
new file mode 100644
index 00000000000..05b8305818f
--- /dev/null
+++ b/hwy_data/ESP-CT/espct/espct.c013alc.wpt
@@ -0,0 +1,4 @@
+LL-11 http://www.openstreetmap.org/?lat=41.618137&lon=0.664823
+AviInd http://www.openstreetmap.org/?lat=41.630296&lon=0.664072
+A-2 http://www.openstreetmap.org/?lat=41.641201&lon=0.676067
+C13z http://www.openstreetmap.org/?lat=41.676758&lon=0.716343
diff --git a/hwy_data/ESP-CT/espct/espct.c015.wpt b/hwy_data/ESP-CT/espct/espct.c015.wpt
index 0edf2e2bbcb..1ccde794d06 100644
--- a/hwy_data/ESP-CT/espct/espct.c015.wpt
+++ b/hwy_data/ESP-CT/espct/espct.c015.wpt
@@ -1,12 +1,3 @@
-C-31 +C31 http://www.openstreetmap.org/?lat=41.236673&lon=1.733801
-1 http://www.openstreetmap.org/?lat=41.241078&lon=1.729252
-1a http://www.openstreetmap.org/?lat=41.243966&lon=1.723287
-1b http://www.openstreetmap.org/?lat=41.246708&lon=1.720047
-2 http://www.openstreetmap.org/?lat=41.252871&lon=1.718159
-3 http://www.openstreetmap.org/?lat=41.256839&lon=1.730820
-7 http://www.openstreetmap.org/?lat=41.290972&lon=1.725122
-BV-2443 http://www.openstreetmap.org/?lat=41.315885&lon=1.724440
-11 http://www.openstreetmap.org/?lat=41.321574&lon=1.725540
 13 http://www.openstreetmap.org/?lat=41.330630&lon=1.712816
 N-340 http://www.openstreetmap.org/?lat=41.350558&lon=1.722439
 C-243a http://www.openstreetmap.org/?lat=41.366213&lon=1.716700
@@ -23,4 +14,3 @@ BV-2304 http://www.openstreetmap.org/?lat=41.478441&lon=1.695285
 ValAno http://www.openstreetmap.org/?lat=41.513301&lon=1.699061
 B-224 http://www.openstreetmap.org/?lat=41.521142&lon=1.693836
 LaPobCla http://www.openstreetmap.org/?lat=41.541992&lon=1.691551
-N-IIa +NIIa http://www.openstreetmap.org/?lat=41.579602&lon=1.668892
diff --git a/hwy_data/ESP-CT/espct/espct.c016ber.wpt b/hwy_data/ESP-CT/espct/espct.c016ber.wpt
new file mode 100644
index 00000000000..2948d1af359
--- /dev/null
+++ b/hwy_data/ESP-CT/espct/espct.c016ber.wpt
@@ -0,0 +1,20 @@
+C-26_W +C26_W split http://www.openstreetmap.org/?lat=42.095380&lon=1.854018
+C-149b +C149b http://www.openstreetmap.org/?lat=42.109613&lon=1.858889
+C-26_E http://www.openstreetmap.org/?lat=42.116402&lon=1.855896
+C-1411z_S http://www.openstreetmap.org/?lat=42.130662&lon=1.864189
+C-1411z_N +C1411z_N http://www.openstreetmap.org/?lat=42.142357&lon=1.864972
+CarBae http://www.openstreetmap.org/?lat=42.146116&lon=1.863245
++X8 http://www.openstreetmap.org/?lat=42.165439&lon=1.855059
++X8A http://www.openstreetmap.org/?lat=42.195969&lon=1.870852
+B-400 http://www.openstreetmap.org/?lat=42.217673&lon=1.869274
+C-1411a_S +C1411a_S http://www.openstreetmap.org/?lat=42.227906&lon=1.876436
+B-402 http://www.openstreetmap.org/?lat=42.230615&lon=1.882664
+C-1411a_N +C1411a_N http://www.openstreetmap.org/?lat=42.237001&lon=1.875937
+Baga http://www.openstreetmap.org/?lat=42.252426&lon=1.867333
++X10 http://www.openstreetmap.org/?lat=42.262034&lon=1.852934
++X11 http://www.openstreetmap.org/?lat=42.286389&lon=1.851046
++X12 http://www.openstreetmap.org/?lat=42.294675&lon=1.863192
+CarUrus http://www.openstreetmap.org/?lat=42.344922&lon=1.833043
+C-162 +C162 http://www.openstreetmap.org/?lat=42.348792&lon=1.831305
++X705235 http://www.openstreetmap.org/?lat=42.349791&lon=1.815534
+N-260R +N260 http://www.openstreetmap.org/?lat=42.362952&lon=1.814075
diff --git a/hwy_data/ESP-CT/espct/espct.c017.wpt b/hwy_data/ESP-CT/espct/espct.c017.wpt
index d3c98259f88..5e07d2eb16e 100644
--- a/hwy_data/ESP-CT/espct/espct.c017.wpt
+++ b/hwy_data/ESP-CT/espct/espct.c017.wpt
@@ -37,36 +37,3 @@ N-152z_AigS +CarRib_S http://www.openstreetmap.org/?lat=41.764238&lon=2.251639
 +X893355 http://www.openstreetmap.org/?lat=41.772808&lon=2.245095
 N-152z_AigN http://www.openstreetmap.org/?lat=41.782225&lon=2.244902
 44 http://www.openstreetmap.org/?lat=41.795752&lon=2.234837
-45 http://www.openstreetmap.org/?lat=41.802543&lon=2.229538
-46 http://www.openstreetmap.org/?lat=41.807741&lon=2.225654
-47 http://www.openstreetmap.org/?lat=41.826643&lon=2.234451
-49 http://www.openstreetmap.org/?lat=41.839977&lon=2.232950
-50 http://www.openstreetmap.org/?lat=41.847027&lon=2.233121
-51 http://www.openstreetmap.org/?lat=41.853532&lon=2.237349
-52 http://www.openstreetmap.org/?lat=41.868858&lon=2.233958
-54 http://www.openstreetmap.org/?lat=41.881336&lon=2.240524
-55 http://www.openstreetmap.org/?lat=41.894411&lon=2.245395
-56 http://www.openstreetmap.org/?lat=41.903627&lon=2.247884
-57 http://www.openstreetmap.org/?lat=41.909751&lon=2.249236
-60 http://www.openstreetmap.org/?lat=41.927346&lon=2.230911
-C-25_W +C25_W http://www.openstreetmap.org/?lat=41.940978&lon=2.231169
-62 http://www.openstreetmap.org/?lat=41.951926&lon=2.236791
-C-25_E +C25_E http://www.openstreetmap.org/?lat=41.957224&lon=2.245631
-64 http://www.openstreetmap.org/?lat=41.962362&lon=2.248421
-65 http://www.openstreetmap.org/?lat=41.974647&lon=2.243743
-67 http://www.openstreetmap.org/?lat=41.987758&lon=2.242413
-68 http://www.openstreetmap.org/?lat=41.998475&lon=2.249751
-69 http://www.openstreetmap.org/?lat=42.000915&lon=2.252133
-72 http://www.openstreetmap.org/?lat=42.020669&lon=2.244687
-75 http://www.openstreetmap.org/?lat=42.047922&lon=2.233443
-76 http://www.openstreetmap.org/?lat=42.056144&lon=2.237949
-77 http://www.openstreetmap.org/?lat=42.078986&lon=2.232092
-79 http://www.openstreetmap.org/?lat=42.082936&lon=2.228744
-81 http://www.openstreetmap.org/?lat=42.096280&lon=2.222157
-82 http://www.openstreetmap.org/?lat=42.097745&lon=2.211385
-85 http://www.openstreetmap.org/?lat=42.119227&lon=2.200484
-87 http://www.openstreetmap.org/?lat=42.135555&lon=2.205023
-89 http://www.openstreetmap.org/?lat=42.152738&lon=2.200999
-91 http://www.openstreetmap.org/?lat=42.169033&lon=2.195785
-C-26 http://www.openstreetmap.org/?lat=42.178162&lon=2.194219
-N-260 http://www.openstreetmap.org/?lat=42.189963&lon=2.194331
diff --git a/hwy_data/ESP-CT/espct/espct.c017rip.wpt b/hwy_data/ESP-CT/espct/espct.c017rip.wpt
new file mode 100644
index 00000000000..0b943c25e81
--- /dev/null
+++ b/hwy_data/ESP-CT/espct/espct.c017rip.wpt
@@ -0,0 +1,3 @@
+91 http://www.openstreetmap.org/?lat=42.169033&lon=2.195785
+C-26 http://www.openstreetmap.org/?lat=42.178162&lon=2.194219
+N-260 http://www.openstreetmap.org/?lat=42.189963&lon=2.194331
diff --git a/hwy_data/ESP-CT/espct/espct.c025riu.wpt b/hwy_data/ESP-CT/espct/espct.c025riu.wpt
new file mode 100644
index 00000000000..2e45f715987
--- /dev/null
+++ b/hwy_data/ESP-CT/espct/espct.c025riu.wpt
@@ -0,0 +1,3 @@
+A-2 http://www.openstreetmap.org/?lat=41.890681&lon=2.783489
+PasCam http://www.openstreetmap.org/?lat=41.896543&lon=2.832134
+C-65 http://www.openstreetmap.org/?lat=41.893365&lon=2.859535
diff --git a/hwy_data/ESP-CT/espct/espct.c025z.wpt b/hwy_data/ESP-CT/espct/espct.c025z.wpt
new file mode 100644
index 00000000000..f6fc70bd3a2
--- /dev/null
+++ b/hwy_data/ESP-CT/espct/espct.c025z.wpt
@@ -0,0 +1,3 @@
+C-25 http://www.openstreetmap.org/?lat=41.874035&lon=2.760015
++X419361 http://www.openstreetmap.org/?lat=41.890825&lon=2.773404
+AP-7 http://www.openstreetmap.org/?lat=41.893029&lon=2.779391
diff --git a/hwy_data/ESP-CT/espn/espct.n240.wpt b/hwy_data/ESP-CT/espn/espct.n240.wpt
index bbda3141d8f..5bd31bf0059 100644
--- a/hwy_data/ESP-CT/espn/espct.n240.wpt
+++ b/hwy_data/ESP-CT/espn/espct.n240.wpt
@@ -12,8 +12,10 @@ N-230_E +N230_E http://www.openstreetmap.org/?lat=41.621638&lon=0.617900
 N-II_W http://www.openstreetmap.org/?lat=41.608351&lon=0.617273
 LL-12 http://www.openstreetmap.org/?lat=41.603795&lon=0.624547
 AviGar http://www.openstreetmap.org/?lat=41.608576&lon=0.634847
-LL-11_E +LL11_E http://www.openstreetmap.org/?lat=41.614127&lon=0.651605
-C-13 http://www.openstreetmap.org/?lat=41.606570&lon=0.673192
+N-240a_LleW +LL11_E http://www.openstreetmap.org/?lat=41.614127&lon=0.651605
+LL-11_E http://www.openstreetmap.org/?lat=41.618137&lon=0.664823
+CarD http://www.openstreetmap.org/?lat=41.611079&lon=0.673556
+N-240a_LleE http://www.openstreetmap.org/?lat=41.606570&lon=0.673192
 C-13b http://www.openstreetmap.org/?lat=41.605848&lon=0.678856
 LV-7022 http://www.openstreetmap.org/?lat=41.572258&lon=0.770229
 LV-2001 http://www.openstreetmap.org/?lat=41.552302&lon=0.817006
diff --git a/hwy_data/ESP-CT/espn/espct.n240alle.wpt b/hwy_data/ESP-CT/espn/espct.n240alle.wpt
new file mode 100644
index 00000000000..fda892da5c5
--- /dev/null
+++ b/hwy_data/ESP-CT/espn/espct.n240alle.wpt
@@ -0,0 +1,3 @@
+N-240_W http://www.openstreetmap.org/?lat=41.614127&lon=0.651605
+CarA http://www.openstreetmap.org/?lat=41.608841&lon=0.668943
+N-240_E http://www.openstreetmap.org/?lat=41.606570&lon=0.673192
diff --git a/hwy_data/ESP-GA/espsf/espga.po010vig.wpt b/hwy_data/ESP-GA/espa/espga.po010vig.wpt
similarity index 100%
rename from hwy_data/ESP-GA/espsf/espga.po010vig.wpt
rename to hwy_data/ESP-GA/espa/espga.po010vig.wpt
diff --git a/hwy_data/ESP-GA/espa/espga.sc020.wpt b/hwy_data/ESP-GA/espa/espga.sc020.wpt
deleted file mode 100644
index 77318cb6a99..00000000000
--- a/hwy_data/ESP-GA/espa/espga.sc020.wpt
+++ /dev/null
@@ -1,16 +0,0 @@
-N-550_N +N550_N http://www.openstreetmap.org/?lat=42.908412&lon=-8.510370
-1 http://www.openstreetmap.org/?lat=42.902282&lon=-8.511529
-A-54 http://www.openstreetmap.org/?lat=42.898729&lon=-8.509963
-AP-9 +AP9 http://www.openstreetmap.org/?lat=42.889737&lon=-8.509104
-N-634 http://www.openstreetmap.org/?lat=42.886507&lon=-8.510671
-RuaEst http://www.openstreetmap.org/?lat=42.882435&lon=-8.512226
-RuaRoma http://www.openstreetmap.org/?lat=42.878889&lon=-8.526700
-AveLugo http://www.openstreetmap.org/?lat=42.877969&lon=-8.533437
-RuaClaCam http://www.openstreetmap.org/?lat=42.873055&lon=-8.539381
-SC-12 http://www.openstreetmap.org/?lat=42.869666&lon=-8.548404
-SC-11 http://www.openstreetmap.org/?lat=42.867236&lon=-8.552738
-RuaSanFre http://www.openstreetmap.org/?lat=42.863871&lon=-8.555667
-AveFigVal http://www.openstreetmap.org/?lat=42.863670&lon=-8.567528
-RuaPozaAmi http://www.openstreetmap.org/?lat=42.857768&lon=-8.571643
-AG-56 +AG56 http://www.openstreetmap.org/?lat=42.852923&lon=-8.571911
-N-550_S +N550_S http://www.openstreetmap.org/?lat=42.849234&lon=-8.573563
diff --git a/hwy_data/ESP-GA/espga/espga.ac543.wpt b/hwy_data/ESP-GA/espga/espga.ac543.wpt
index 9da7d990d56..dc5edc7becb 100644
--- a/hwy_data/ESP-GA/espga/espga.ac543.wpt
+++ b/hwy_data/ESP-GA/espga/espga.ac543.wpt
@@ -1,3 +1,5 @@
+SC-20 http://www.openstreetmap.org/?lat=42.863670&lon=-8.567528
+RuaCan http://www.openstreetmap.org/?lat=42.866839&lon=-8.571299
 AC-548 http://www.openstreetmap.org/?lat=42.869292&lon=-8.576192
 RuaXun http://www.openstreetmap.org/?lat=42.873016&lon=-8.584732
 AC-453 http://www.openstreetmap.org/?lat=42.874793&lon=-8.619847
diff --git a/hwy_data/ESP-GA/espa/espga.lu012.wpt b/hwy_data/ESP-GA/espn/espga.lu012.wpt
similarity index 100%
rename from hwy_data/ESP-GA/espa/espga.lu012.wpt
rename to hwy_data/ESP-GA/espn/espga.lu012.wpt
diff --git a/hwy_data/ESP-GA/espn/espga.sc020.wpt b/hwy_data/ESP-GA/espn/espga.sc020.wpt
new file mode 100644
index 00000000000..de2696ac8c9
--- /dev/null
+++ b/hwy_data/ESP-GA/espn/espga.sc020.wpt
@@ -0,0 +1,17 @@
+N-550_N +N550_N http://www.openstreetmap.org/?lat=42.908412&lon=-8.510370
+0 http://www.openstreetmap.org/?lat=42.902282&lon=-8.511529
+1 +A-54 http://www.openstreetmap.org/?lat=42.898729&lon=-8.509963
+2A +AP9 +AP-9 http://www.openstreetmap.org/?lat=42.889737&lon=-8.509104
+2B http://www.openstreetmap.org/?lat=42.886507&lon=-8.510671
+3 http://www.openstreetmap.org/?lat=42.882435&lon=-8.512226
+4 http://www.openstreetmap.org/?lat=42.878889&lon=-8.526700
+5 http://www.openstreetmap.org/?lat=42.877969&lon=-8.533437
+RuaClaCam http://www.openstreetmap.org/?lat=42.873055&lon=-8.539381
+AveLugo_W http://www.openstreetmap.org/?lat=42.872102&lon=-8.543115
+RuaHor http://www.openstreetmap.org/?lat=42.869666&lon=-8.548404
+7B http://www.openstreetmap.org/?lat=42.867236&lon=-8.552738
+7A http://www.openstreetmap.org/?lat=42.863871&lon=-8.555667
+AG-543 +AveFigVal http://www.openstreetmap.org/?lat=42.863670&lon=-8.567528
+RuaPozaAmi http://www.openstreetmap.org/?lat=42.857768&lon=-8.571643
+9 +AG56 http://www.openstreetmap.org/?lat=42.852923&lon=-8.571911
+N-550_S +N550_S http://www.openstreetmap.org/?lat=42.849234&lon=-8.573563
diff --git a/hwy_data/_systems/espa.csv b/hwy_data/_systems/espa.csv
index e3c09e8acea..b12b4a0b060 100644
--- a/hwy_data/_systems/espa.csv
+++ b/hwy_data/_systems/espa.csv
@@ -210,6 +210,16 @@ espa;ESP-CT;B-40;;;Terrassa;espct.b040;B40
 espa;ESP-CT;B-40;;Roc;La Roca de Valles;espct.b040roc;B40Roc
 espa;ESP-CL;BU-11;;;;espcl.bu011;BU11
 espa;ESP-CL;BU-30;;;;espcl.bu030;BU30
+espa;ESP-CT;C-13;;Lle;Lleida;espct.c013lle;C13x
+espa;ESP-CT;C-13;;Vil;Vilanova de la Barca;espct.c013vil;
+espa;ESP-CT;C-13B;;;;espct.c013b;C13B
+espa;ESP-CT;C-15;;Vil;Vilanova i la Geltru;espct.c015vil;
+espa;ESP-CT;C-15;;Pob;La Pobla de Claramunt;espct.c015pob;
+espa;ESP-CT;C-16;;;Manresa;espct.c016;C16
+espa;ESP-CT;C-17;;Vic;Vic;espct.c017vic;
+espa;ESP-CT;C-25;;;;espct.c025;C25
+espa;ESP-CT;C-32;;;Vilanova i la Geltru;espct.c032;C32
+espa;ESP-CT;C-32;;Mat;Matero;espct.c032mat;C32Mat
 espa;ESP-AN;CA-31;;;;espan.ca031;CA31
 espa;ESP-AN;CA-32;;;;espan.ca032;CA32
 espa;ESP-AN;CA-33;;;;espan.ca033;CA33
@@ -247,7 +257,6 @@ espa;ESP-CL;LE-30;;;;espcl.le030;LE30
 espa;ESP-CT;LL-11;;;;espct.ll011;LL11
 espa;ESP-CT;LL-12;;;;espct.ll012;LL12
 espa;ESP-RI;LO-20;;;;espri.lo020;LO20
-espa;ESP-GA;LU-12;;;;espga.lu012;
 espa;ESP-GA;LU-021;;;;espga.lu021;
 espa;ESP-MD;M-11;;;;espmd.m011;M11
 espa;ESP-MD;M-12;;;;espmd.m012;M12
@@ -280,6 +289,7 @@ espa;ESP-NC;PA-32;;;;espnc.pa032;PA32
 espa;ESP-NC;PA-33;;;;espnc.pa033;
 espa;ESP-NC;PA-34;;;;espnc.pa034;PA34
 espa;ESP-NC;PA-35;;;;espnc.pa035;
+espa;ESP-GA;PO-010;;;;espga.po010vig;
 espa;ESP-GA;PO-10;;;;espga.po010;PO10
 espa;ESP-GA;PO-11;;;;espga.po011;PO11
 espa;ESP-CM;PT-10;;;;espcm.pt010;PT10
@@ -287,7 +297,6 @@ espa;ESP-CB;S-10;;;;espcb.s010;S10
 espa;ESP-CB;S-20;;;;espcb.s020;S20
 espa;ESP-CB;S-30;;;;espcb.s030;S30
 espa;ESP-GA;SC-11;;;;espga.sc011;SC11
-espa;ESP-GA;SC-20;;;;espga.sc020;SC20
 espa;ESP-GA;SC-21;;;;espga.sc021;SC21
 espa;ESP-AN;SE-30;;;;espan.se030;SE30
 espa;ESP-AN;SE-40;;;Alcala de Guadaira;espan.se040;SE40
diff --git a/hwy_data/_systems/espa_con.csv b/hwy_data/_systems/espa_con.csv
index 9b1e7cee539..e26e014ac04 100644
--- a/hwy_data/_systems/espa_con.csv
+++ b/hwy_data/_systems/espa_con.csv
@@ -154,6 +154,16 @@ espa;B-40;;Terrassa;espct.b040
 espa;B-40;;La Roca de Valles;espct.b040roc
 espa;BU-11;;;espcl.bu011
 espa;BU-30;;;espcl.bu030
+espa;C-13;;Lleida;espct.c013lle
+espa;C-13;;Vilanova de la Barca;espct.c013vil
+espa;C-13B;;;espct.c013b
+espa;C-15;;Vilanova i la Geltru;espct.c015vil
+espa;C-15;;La Pobla de Claramunt;espct.c015pob
+espa;C-16;;Manresa;espct.c016
+espa;C-17;;Vic;espct.c017vic
+espa;C-25;;;espct.c025
+espa;C-32;;Vilanova i la Geltru;espct.c032
+espa;C-32;;Matero;espct.c032mat
 espa;CA-31;;;espan.ca031
 espa;CA-32;;;espan.ca032
 espa;CA-33;;;espan.ca033
@@ -191,7 +201,6 @@ espa;LE-30;;;espcl.le030
 espa;LL-11;;;espct.ll011
 espa;LL-12;;;espct.ll012
 espa;LO-20;;;espri.lo020
-espa;LU-12;;;espga.lu012
 espa;LU-021;;;espga.lu021
 espa;M-11;;;espmd.m011
 espa;M-12;;;espmd.m012
@@ -224,6 +233,7 @@ espa;PA-32;;;espnc.pa032
 espa;PA-33;;;espnc.pa033
 espa;PA-34;;;espnc.pa034
 espa;PA-35;;;espnc.pa035
+espa;PO-010;;;espga.po010vig
 espa;PO-10;;;espga.po010
 espa;PO-11;;;espga.po011
 espa;PT-10;;;espcm.pt010
@@ -231,7 +241,6 @@ espa;S-10;;;espcb.s010
 espa;S-20;;;espcb.s020
 espa;S-30;;;espcb.s030
 espa;SC-11;;;espga.sc011
-espa;SC-20;;;espga.sc020
 espa;SC-21;;;espga.sc021
 espa;SE-30;;;espan.se030
 espa;SE-40;;Alcala de Guadaira;espan.se040
diff --git a/hwy_data/_systems/espct.csv b/hwy_data/_systems/espct.csv
index b758558ea73..2c9add91f81 100644
--- a/hwy_data/_systems/espct.csv
+++ b/hwy_data/_systems/espct.csv
@@ -3,16 +3,18 @@ espct;ESP-CT;C-12;;;Amposta;espct.c012;C12
 espct;ESP-CT;C-12;;Bal;Balaguer;espct.c012bal;C12Bal
 espct;ESP-CT;C-12B;;;;espct.c012b;
 espct;ESP-CT;C-12F;;;;espct.c012f;
-espct;ESP-CT;C-13;;;;espct.c013;C13x,C13
-espct;ESP-CT;C-13b;;;;espct.c013b;C13B
+espct;ESP-CT;C-13;;Alc;Alcotge;espct.c013alc;
+espct;ESP-CT;C-13;;;Tremp;espct.c013;C13
 espct;ESP-CT;C-14;;;;espct.c014;C14x,C14
-espct;ESP-CT;C-15;;;;espct.c015;C15
+espct;ESP-CT;C-15;;;Vallbona d'Anoia;espct.c015;C15
 espct;ESP-CT;C-15B;;;;espct.c015b;
-espct;ESP-CT;C-16;;;;espct.c016;C16
+espct;ESP-CT;C-16;;Ber;Berga;espct.c016ber;
 espct;ESP-CT;C-16C;;;;espct.c016c;
-espct;ESP-CT;C-17;;;;espct.c017;C17
-espct;ESP-CT;C-25;;;;espct.c025;C25
+espct;ESP-CT;C-17;;;Granollers;espct.c017;C17
+espct;ESP-CT;C-17;;Rip;Ripoli;espct.c017rip;
+espct;ESP-CT;C-25;;Riu;Riudellots de la Selva;espct.c025riu;
 espct;ESP-CT;C-25D;;;;espct.c025d;
+espct;ESP-CT;C-25z;;;;espct.c025z;
 espct;ESP-CT;C-26;;;Balaguer;espct.c026;C26
 espct;ESP-CT;C-26;;Fig;Figueres;espct.c026fig;C26Fig
 espct;ESP-CT;C-28;;;;espct.c028;C28
@@ -25,8 +27,6 @@ espct;ESP-CT;C-31C;;;;espct.c031c;C31C
 espct;ESP-CT;C-31D;;;;espct.c031d;C31D
 espct;ESP-CT;C-31E;;;;espct.c031e;
 espct;ESP-CT;C-31F;;;;espct.c031f;C31F
-espct;ESP-CT;C-32;;;Vilanova i la Geltru;espct.c032;C32
-espct;ESP-CT;C-32;;Mat;Matero;espct.c032mat;C32Mat
 espct;ESP-CT;C-32B;;;;espct.c032b;C32B
 espct;ESP-CT;C-33;;;;espct.c033;C33
 espct;ESP-CT;C-35;;;Sant Celoni;espct.c035;C35
diff --git a/hwy_data/_systems/espct_con.csv b/hwy_data/_systems/espct_con.csv
index 94ad6d36f4b..7e0cf99077a 100644
--- a/hwy_data/_systems/espct_con.csv
+++ b/hwy_data/_systems/espct_con.csv
@@ -3,16 +3,18 @@ espct;C-12;;Amposta;espct.c012
 espct;C-12;;Balaguer;espct.c012bal
 espct;C-12B;;;espct.c012b
 espct;C-12F;;;espct.c012f
-espct;C-13;;;espct.c013
-espct;C-13b;;;espct.c013b
+espct;C-13;;Alcoletge;espct.c013alc
+espct;C-13;;Tremp;espct.c013
 espct;C-14;;;espct.c014
-espct;C-15;;;espct.c015
+espct;C-15;;Vallbona d'Anoia;espct.c015
 espct;C-15B;;;espct.c015b
-espct;C-16;;;espct.c016
+espct;C-16;;Berga;espct.c016ber
 espct;C-16C;;;espct.c016c
-espct;C-17;;;espct.c017
-espct;C-25;;;espct.c025
+espct;C-17;;Granollers;espct.c017
+espct;C-17;;Ripoli;espct.c017rip
+espct;C-25;;Riudellots de la Selva;espct.c025riu
 espct;C-25D;;;espct.c025d
+espct;C-25z;;;espct.c025z
 espct;C-26;;Balaguer;espct.c026
 espct;C-26;;Figueres;espct.c026fig
 espct;C-28;;;espct.c028
@@ -25,8 +27,6 @@ espct;C-31C;;;espct.c031c
 espct;C-31D;;;espct.c031d
 espct;C-31E;;;espct.c031e
 espct;C-31F;;;espct.c031f
-espct;C-32;;Vilanova i la Geltru;espct.c032
-espct;C-32;;Matero;espct.c032mat
 espct;C-32B;;;espct.c032b
 espct;C-33;;;espct.c033
 espct;C-35;;Sant Celoni;espct.c035
diff --git a/hwy_data/_systems/espn.csv b/hwy_data/_systems/espn.csv
index 217c75e49bd..d56660011d5 100644
--- a/hwy_data/_systems/espn.csv
+++ b/hwy_data/_systems/espn.csv
@@ -43,7 +43,7 @@ espn;ESP-AR;N-2R;;Bub;Bubierca;espar.n002rbub;
 espn;ESP-AR;N-2R;;Ate;Ateca;espar.n002rate;
 espn;ESP-AR;N-2R;;Ter;Terrer;espar.n002rter;
 espn;ESP-MD;N-III;;;Arganda del Rey;espmd.n003;
-espn;ESP-CM;N-III;;Tar;Tarancón;espcm.n003tar;NIIITar
+espn;ESP-CM;N-III;;Tar;Tarancón;espcm.n003tar;
 espn;ESP-CM;N-III;;Mon;Montalbo;espcm.n003mon;
 espn;ESP-CM;N-III;;Vil;Villares del Saz;espcm.n003vil;
 espn;ESP-CM;N-III;;;Minglanilla;espcm.n003;NIII
@@ -211,6 +211,7 @@ espn;ESP-AR;N-240;;;Barbastro;espar.n240;N240
 espn;ESP-CT;N-240;;;;espct.n240;N240
 espn;ESP-NC;N-240a;;;Pamplona;espnc.n240a;
 espn;ESP-AR;N-240a;;;Huesca;espar.n240a;
+espn;ESP-CT;N-240a;;Lle;Lleida;espct.n240alle;
 espn;ESP-CT;N-240a;;Alm;Almacelles;espct.n240aalm;
 espn;ESP-CT;N-240a;;Vin;Vinaixa;espct.n240avin;
 espn;ESP-CT;N-240a;;;Valls;espct.n240a;
@@ -556,6 +557,7 @@ espn;ESP-GA;FE-15;;;;espga.fe015;
 espn;ESP-AS;GJ-10;;;;espas.gj010;
 espn;ESP-AN;GR-16;;Var;El Varadero;espan.gr016var;
 espn;ESP-GA;LU-11;;;;espga.lu011;
+espn;ESP-GA;LU-12;;;;espga.lu012;
 espn;ESP-ML;ML-101;;;;espml.ml101;
 espn;ESP-ML;ML-204;;;;espml.ml204;
 espn;ESP-ML;ML-300;;;;espml.ml300;
@@ -567,6 +569,7 @@ espn;ESP-GA;PO-12;;;;espga.po012;
 espn;ESP-CL;SA-11;;;;espcl.sa011;
 espn;ESP-CL;SA-20;;;;espcl.sa020;
 espn;ESP-GA;SC-11;;San;Santiago de Compostela;espga.sc011san;SC11San
+espn;ESP-GA;SC-20;;;;espga.sc020;SC20
 espn;ESP-GA;SC-30;;;;espga.sc030;
 espn;ESP-AN;SE-20;;;;espan.se020;
 espn;ESP-AN;SE-31;;;;espan.se031;
diff --git a/hwy_data/_systems/espn_con.csv b/hwy_data/_systems/espn_con.csv
index 67fffca9085..6ac62d6731e 100644
--- a/hwy_data/_systems/espn_con.csv
+++ b/hwy_data/_systems/espn_con.csv
@@ -176,6 +176,7 @@ espn;N-240;;Jaca;espar.n240jac
 espn;N-240;;Lleida;espar.n240,espct.n240
 espn;N-240a;;Pamplona;espnc.n240a
 espn;N-240a;;Huesca;espar.n240a
+espn;N-240a;;Lleida;espct.n240alle
 espn;N-240a;;Almacelles;espct.n240aalm
 espn;N-240a;;Vinaixa;espct.n240avin
 espn;N-240a;;Valls;espct.n240a
@@ -467,6 +468,7 @@ espn;FE-15;;;espga.fe015
 espn;GJ-10;;;espas.gj010
 espn;GR-16;;El Varadero;espan.gr016var
 espn;LU-11;;;espga.lu011
+espn;LU-12;;;espga.lu012
 espn;ML-101;;;espml.ml101
 espn;ML-204;;;espml.ml204
 espn;ML-300;;;espml.ml300
@@ -478,6 +480,7 @@ espn;PO-12;;;espga.po012
 espn;SA-11;;;espcl.sa011
 espn;SA-20;;;espcl.sa020
 espn;SC-11;;Santiago de Compostela;espga.sc011san
+espn;SC-20;;;espga.sc020
 espn;SC-30;;;espga.sc030
 espn;SE-20;;;espan.se020
 espn;SE-31;;;espan.se031
diff --git a/hwy_data/_systems/espsf.csv b/hwy_data/_systems/espsf.csv
index 981a524683e..348dff947ed 100644
--- a/hwy_data/_systems/espsf.csv
+++ b/hwy_data/_systems/espsf.csv
@@ -16,5 +16,4 @@ espsf;ESP-AN;A-8009;;;Acceso Norte a Sevilla;espan.a8009;
 espsf;ESP-AN;A-8058;;;Carretera de Sevilla a La Pueblo del Rio;espan.a8058;
 espsf;ESP-AS;AI-82;;;Acceso al Aeropuerto de Asturias;espas.ai082;
 espsf;ESP-GA;ConPor;;;Conexión O Porriño;espga.conpor;
-espsf;ESP-GA;PO-010;;;Acceso Balaidos;espga.po010vig;
 espsf;ESP-GA;V-1.4;;;Rolda do Real Clube Deportivo da Coruna;espga.v0014;V1.4
diff --git a/hwy_data/_systems/espsf_con.csv b/hwy_data/_systems/espsf_con.csv
index 0abf3f20f2a..f0254081b0d 100644
--- a/hwy_data/_systems/espsf_con.csv
+++ b/hwy_data/_systems/espsf_con.csv
@@ -16,5 +16,4 @@ espsf;A-8009;;Acceso Norte a Sevilla;espan.a8009
 espsf;A-8058;;Carretera de Sevilla a La Pueblo del Rio;espan.a8058
 espsf;AI-82;;Acceso al Aeropuerto de Asturias;espas.ai082
 espsf;ConPor;;Conexión O Porriño;espga.conpor
-espsf;PO-010;;Acceso Balaidos;espga.po010vig
 espsf;V-1.4;;Rolda do Real Clube Deportivo da Coruna;espga.v0014
diff --git a/updates.csv b/updates.csv
index 65fa22374f5..e6027e758d9 100644
--- a/updates.csv
+++ b/updates.csv
@@ -7124,6 +7124,23 @@ date;region;route;root;description
 2019-09-05;(Spain) Castilla-La Mancha;CM45;espcm.cm045;Route extended at west end from CM4111 to A41, and at east end from exit 26 to CM412
 2018-11-04;(Spain) Castille-le-Mancha;N344;espcm.n344;Route truncated at north end from A35 to A31
 2017-10-11;(Spain) Castille-le-Mancha;TO21;espcm.to021;Route extended at east end from southern junction with N403 to A42
+2026-10-17;(Spain) Catalonia;N-240;espct.n240;Route removed from N240a and relocated onto Variant Sud de Lleida between N-240a_LleW and N-240a_LleE
+2026-10-17;(Spain) Catalonia;N-240 (Lleida);espct.n240alle;Route added
+2026-10-17;(Spain) Catalonia;C-13 (Lleida);espct.c013lle;Route added
+2026-10-17;(Spain) Catalonia;C-13 (Alcoletge);espct.c013alc;Route added
+2026-10-17;(Spain) Catalonia;C-13 (Vilanova de la Barca);espct.c013vil;Route added
+2026-10-17;(Spain) Catalonia;C-13 (Tremp);espct.c013;Route truncated at southern end from exit 1A to C13z
+2026-10-17;(Spain) Catalonia;C-15 (Vilanova i la Geltru);espct.c015vil;Route added
+2026-10-17;(Spain) Catalonia;C-15 (Vallbona d'Anoia);espct.c015;Route truncated at south end from C-31 to exit 13 and route truncated at north end from N-IIa to La Pobla de Claramunt
+2026-10-17;(Spain) Catalonia;C-15 (La Pobla de Claramunt);espct.c015pob;Route added
+2026-10-17;(Spain) Catalonia;C-16 (Manresa);espct.c016;Route truncated at north end from N-260R to C-26
+2026-10-17;(Spain) Catalonia;C-16 (Berga);espct.c016ber;Route added
+2026-10-17;(Spain) Catalonia;C-17 (Granollers);espct.c017;Route truncated at north end from N-260 to exit 44
+2026-10-17;(Spain) Catalonia;C-17 (Vic);espct.c017vic;Route added
+2026-10-17;(Spain) Catalonia;C-17 (Ripoli);espct.c017rip;Route added
+2026-10-17;(Spain) Catalonia;C-25;espct.c025;Route truncated at east end from C-65 to A-2 exit 702
+2026-10-17;(Spain) Catalonia;C-25 (Riudellots de la Selva);espct.c025riu;Route added
+2026-10-17;(Spain) Catalonia;C-25z;espct.c025z;Route added
 2026-10-06;(Spain) Catalonia;B40 (Terrassa);espct.b040;Route extended at east end from 'B40_U' to Avinguda del Valles
 2026-10-06;(Spain) Catalonia;C58;espct.c058;Route removed from BP1213 and relocated onto C16 outer carriageways between C16 exit 23 and B245
 2026-09-26;(Spain) Catalonia;E22;espct.e022;Route added
@@ -7217,6 +7234,7 @@ date;region;route;root;description
 2022-01-15;(Spain) Extremadura;EXC1;espex.exc001;Route added
 2022-01-15;(Spain) Extremadura;BA20;espex.ba020;Route extended at west end from N523 to A5 exit 407
 2019-08-31;(Spain) Extremadura;N523;espex.n523;New Route
+2026-10-17;(Spain) Galicia;AC-543;espga.ac543;Route extended at east end from AC-548 to SC-20
 2026-09-29;(Spain) Galicia;N525 (Lalín);espga.n525lal;Route added
 2026-09-29;(Spain) Galicia;N640 (Lalín);espga.n640lal;Route added
 2026-09-29;(Spain) Galicia;AC250;espga.ac250;Route added