diff --git a/airports.csv b/airports.csv
index b67967f87..19b1aa30e 100644
--- a/airports.csv
+++ b/airports.csv
@@ -22106,6 +22106,24 @@
 534599,"DE-0812","heliport","Christophsbad Heliport",48.70053,9.64216,1093,"EU","DE","DE-BW","Göppingen","no",,,,,,
 534861,"DE-0813","heliport","Sulingen Auxiliary Helicopter Base",52.651472,8.886417,118,"EU","DE","DE-NI","Maasen","no",,,,,,"ALP Sulingen, Außenlandeplatz Sulingen, ETHB, HB01"
 535301,"DE-0814","small_airport","Ottmarsbocholt Airfield",51.82325,7.51512,200,"EU","DE","DE-NW","Lüdinghausen","no",,,,,,"Flugplatz Ottmarsbocholt, MFC Ottmarsbocholt"
+563502,"DE-0815","heliport","Autobahn Police Wiesbaden Heliport",50.09831,8.34958,692,"EU","DE","DE-HE","Wiesbaden","no",,,,,,
+563517,"DE-0816","heliport","Idstein Volunteer Fire Department Heliport",50.21697,8.25538,1047,"EU","DE","DE-HE","Idstein","no",,,,,,
+563520,"DE-0817","heliport","Catholic Hospital Koblenz-Montabaur Heliport",50.43125,7.83303,840,"EU","DE","DE-RP","Montabaur","no",,,,,,
+563521,"DE-0818","heliport","Autobahn Police Heiligenroth Heliport",50.44692,7.84539,873,"EU","DE","DE-RP","Heiligenroth","no",,,,,,
+563523,"DE-0819","heliport","Kalkberg Heliport",50.94758,6.99728,243,"EU","DE","DE-NW","Köln","no",,,,,,
+563525,"DE-0820","closed","Congress Center East Kölnmesse Heliport",50.94327,6.98101,,"EU","DE","DE-RP","Köln","no",,,,,,
+563529,"DE-0821","closed","Siegburg Volunteer Fire Department Helipad",50.79913,7.21431,210,"EU","DE","DE-NW","Siegburg","no",,,,,,
+563539,"DE-0822","heliport","Former Bad Homburg Hospital Helipad",50.2229,8.60879,587,"EU","DE","DE-HE","Bad Homburg","no",,,,,,
+563541,"DE-0823","heliport","Ransbach-Baumbach Volunteer Fire Department Heliport",50.46293,7.73081,1005,"EU","DE","DE-RP","Ransbach-Baumbach","no",,,,,,
+563542,"DE-0824","heliport","DRK Kamillus Hospital Asbach Heliport",50.66839,7.42471,886,"EU","DE","DE-NW","Asbach","no",,,,,,
+563546,"DE-0825","heliport","Neurath Power Station Heliport",51.03358,6.61428,312,"EU","DE","DE-NW","Grevenbroich","no",,,,,,
+563547,"DE-0826","heliport","Garzweiler Opencast Mine Heliport",51.06548,6.54156,207,"EU","DE","DE-NW","Grevenbroich","no",,,,,,
+563549,"DE-0827","heliport","Ayrshire Barracks South Heliport",51.16992,6.39323,269,"EU","DE","DE-NW","Mönchengladbach","no",,,,,,
+563551,"DE-0828","heliport","Grimma Hospital Heliport",51.2373,12.71939,472,"EU","DE","DE-SN","Grimma","no",,,,,,
+563552,"DE-0829","heliport","Autobahn Police South Hesse Heliport",49.86663,8.62122,420,"EU","DE","DE-HE","Darmstadt","no",,,,,,
+563553,"DE-0830","heliport","Dobeln Hospital Heliport",51.117054,13.129225,577,"EU","DE","DE-SN","Dobeln","no",,,,,,
+563564,"DE-0831","closed","Mittweida District Hospital Helipad",50.98086,12.98357,961,"EU","DE","DE-SN","Mittweida","no",,,,,,
+563566,"DE-0832","heliport","Carl von Basedow Saalekreis Hospital Querfurt Heliport",51.37063,11.60606,673,"EU","DE","DE-ST","Querfurt","no",,,,,,
 17115,"DE00","small_airport","Doyle's Airport",39.02069854736328,-75.57710266113281,51,"NA","US","US-DE","Felton","no","DE00",,"DE00",,,
 17116,"DE01","closed","Eagle Run Heliport",39.661201,-75.682999,75,"NA","US","US-DE","Christiana","no",,,,,,"DE01"
 17117,"DE02","heliport","Delaware State Police Heliport",39.20009994506836,-75.53299713134766,50,"NA","US","US-DE","Dover","no","DE02",,"DE02",,,
@@ -24545,7 +24563,7 @@
 321624,"ES-0210","small_airport","Palma del Rio 2 UL",37.668501,-5.262086,449,"EU","ES","ES-AN","Palma del Rio","no",,,,,,
 321633,"ES-0211","small_airport","Campo de Vuelo de Oteo",43.0168667,-3.3120333,2307,"EU","ES","ES-CL","Oteo","no",,,,,,
 321660,"ES-0212","small_airport","Hacienda de Orán",37.2000414,-5.8808531,72,"EU","ES","ES-AN","Utrero","no",,,,,,
-321661,"ES-0213","small_airport","Campo de Vuelo de Astorga",42.50323,-6.026578,,"EU","ES","ES-CL","Astorga","no","LEAT",,,"http://campodevueloastorga.es/",,
+321661,"ES-0213","small_airport","Campo de Vuelo de Astorga",42.503996,-6.026695,3123,"EU","ES","ES-CL","Astorga","no","LEAT",,,"https://www.astorgadigital.com/aerodromo-de-astorga-realidad-aficionados-volar/",,
 321689,"ES-0214","small_airport","Campo de Vuelo de Caspe",41.2287652,-0.085876,656,"EU","ES","ES-AR","Caspe","no",,,,,,
 321702,"ES-0215","small_airport","Alhama de Granada Airfield",36.996999,-4.103608,3215,"EU","ES","ES-AN","Alhama de Granada","no",,,,,,
 321703,"ES-0216","small_airport","Aeròdrom de Cervera",41.687597,1.250494,,"EU","ES","ES-CT","Cervera","no",,,,,,
@@ -24684,6 +24702,7 @@
 550107,"ES-0349","heliport","Vall d'Hebron University Hospital Helipad",41.427012,2.140117,700,"EU","ES","ES-CT","Barcelona","no","LEDH",,,,,
 550448,"ES-0350","heliport","Igualada Hospital Helipad",41.588386,1.620875,1190,"EU","ES","ES-CT","Igualada","no","LEHI",,,,,
 563306,"ES-0351","heliport","El Cabril Heliport",38.075984,-5.414768,1356,"EU","ES","ES-AN","El Cabril","no",,,,,,
+563571,"ES-0352","heliport","Cal Majoral Hotel Heliport",42.053448,1.74234,2836,"EU","ES","ES-CT","Berga","no",,,,"https://www.calmajoral.com/",,
 2643,"ESCF","medium_airport","Malmen Air Base",58.402302,15.5257,308,"EU","SE","SE-E","Linköping","no","ESCF",,,,"https://en.wikipedia.org/wiki/Malmen_Airbase",
 2644,"ESCK","closed","Bråvalla Air Base",58.610901,16.1036,,"EU","SE","SE-E",,"no",,,,,,
 2645,"ESCM","small_airport","Ärna Air Base",59.897301,17.5886,68,"EU","SE","SE-C","Uppsala","no","ESCM",,,,"https://en.wikipedia.org/wiki/%C3%84rna",
@@ -29560,11 +29579,11 @@
 514271,"GR-0073","heliport","Grevena General Hospital Heliport",40.08887,21.43984,1757,"EU","GR","GR-C","Grevena","no",,,,,,
 514573,"GR-0074","heliport","Camp Balanik Heliport",40.11134,22.515702,78,"EU","GR","GR-B","Litochoro","no",,,,,,
 514576,"GR-0075","heliport","Eagles Heliport",40.354626,23.953945,164,"EU","GR","GR-B","Skala","no",,,,,,
-514698,"GR-0076","heliport","Mount Athos Health Center Heliport",40.259868,24.245818,1204,"EU","GR","GR-B","Karyes","no",,,,,,
-514699,"GR-0077","heliport","Agiou Pavlou Harbor Heliport",40.15866,24.28249,7,"EU","GR","GR-B","Agio Oros","no",,,,,,
-514700,"GR-0078","heliport","Mikra Agia Anna Heliport",40.13055,24.29693,1195,"EU","GR","GR-B","Agio Oros","no",,,,,,
-514701,"GR-0079","heliport","Agia Anna Heliport",40.14109,24.29676,1010,"EU","GR","GR-B","Agio Oros","no",,,,,,
-514703,"GR-0080","heliport","Megisti Lavra Heliport",40.17149,24.38132,525,"EU","GR","GR-B","Agio Oros","no",,,,,,
+514698,"GR-0076","heliport","Mount Athos Health Center Heliport",40.259891,24.245823,1204,"EU","GR","GR-AO","Agio Oros (Mount Athos)","no",,,,,,
+514699,"GR-0077","heliport","Agiou Pavlou Harbor Heliport",40.15866,24.28249,7,"EU","GR","GR-AO","Agio Oros (Mount Athos)","no",,,,,,
+514700,"GR-0078","heliport","Mikra Agia Anna Heliport",40.130587,24.297042,1195,"EU","GR","GR-AO","Agio Oros (Mount Athos)","no",,,,,,
+514701,"GR-0079","heliport","Agia Anna Heliport",40.14109,24.29676,1010,"EU","GR","GR-AO","Agio Oros (Mount Athos)","no",,,,,,
+514703,"GR-0080","heliport","Megisti Lavra Monastery Heliport",40.17149,24.38132,525,"EU","GR","GR-AO","Agio Oros (Mount Athos)","no",,,,,,"Great Lavra"
 514806,"GR-0081","heliport","Krystallopigi Border Crossing Heliport",40.62212,21.05763,3476,"EU","GR","GR-C","Prespes","no",,,,,,
 514967,"GR-0082","closed","Palama Airfield",39.46353,22.0589,302,"EU","GR","GR-E","Palamas","no",,,,,,
 514968,"GR-0083","heliport","Ellinopyrgos Heliport",39.403352,21.73966,1690,"EU","GR","GR-E","Mouzaki","no",,,,,,
@@ -29576,6 +29595,7 @@
 534325,"GR-0089","small_airport","Skotina Airfield",39.96895,22.66324,7,"EU","GR","GR-B","Dion-Olympos","no",,,,,,
 539321,"GR-0090","heliport","Megalopoli Airfield",37.43286,22.10709,1358,"EU","GR","GR-G","Megalopoli","no",,,,,,
 556416,"GR-0091","heliport","Afidnai Heliport",38.19895,23.85187,,"EU","GR","GR-I",,"no",,,,,,
+563556,"GR-0092","heliport","Vatopedi Monastery Heliport",40.317449,24.214972,56,"EU","GR","GR-AO","Agio Oros (Mount Athos)","no",,,,,,
 311387,"GRC","small_airport","Grand Cess Airport",4.571,-8.2076,28,"AF","LR","LR-GK","Grand Cess","no",,"GRC",,,,
 319725,"GRH","closed","Garuahi Airport",-10.225149,150.487667,50,"OC","PG","PG-MBA","Garuahi","no",,,,,,"Taupota Mission, GRH"
 342429,"GS-0001","heliport","Grytviken Emergency Helipad",-54.2824,-36.5095,27,"AN","GS","GS-U-A","Grytviken","no",,,,,,
@@ -34018,7 +34038,7 @@
 339727,"JP-1087","heliport","Hanno Geriatric Center Helipad",35.86488,139.33462,,"AS","JP","JP-11","Hanno","no",,,,,,
 339728,"JP-1088","closed","Yabuki Airfield",37.20638,140.34377,,"AS","JP","JP-07","Yabuki","no",,,,,,
 339729,"JP-1089","closed","Sakitama Airfield",36.95865,140.01437,,"AS","JP","JP-09","Nasushiobara","no",,,,,,
-339730,"JP-1090","heliport","Kanma Memorial Hospital",36.97132,140.04882,,"AS","JP","JP-09","Nasushiobara","no",,,,,,
+339730,"JP-1090","heliport","Kanma Memorial Hospital Heliport",36.971247,140.048776,,"AS","JP","JP-09","Nasushiobara","no",,,,,,
 339731,"JP-1091","heliport","Japan Red Cross Nasu Hospital",36.88194,140.03765,,"AS","JP","JP-09","Otawara","no",,,,,,
 339732,"JP-1092","heliport","Otera Heliport",35.6767,137.27713,,"AS","JP","JP-21","Shirakawa","no",,,,,,
 339733,"JP-1093","heliport","Kurokawa Nakanodaira Heliport",35.59625,137.32637,,"AS","JP","JP-21","Shirakawa","no",,,,,,
@@ -36334,12 +36354,12 @@
 540868,"JP-3403","heliport","Bifuka Heliport",44.49652,142.336,236,"AS","JP","JP-01","Bifuka","no",,,,,,
 540874,"JP-3404","heliport","Nayoro Heliport",44.384997,142.455905,299,"AS","JP","JP-01","Nayoro","no",,,,,,
 540891,"JP-3405","heliport","Sanuki Municipal Hospital Heliport",34.26773,134.20376,92,"AS","JP","JP-37","Sanuki","no",,,,,,
-542340,"JP-3406","heliport","Arca West Helipad",35.697212,139.809568,,"AS","JP","JP-13","Tokyo","no",,,,,,
-542341,"JP-3407","heliport","Arca West Helipad",35.6972,139.81,,"AS","JP","JP-13","Tokyo","no",,,,,,
-542342,"JP-3408","heliport","Tobu Hotel Levant",35.697094,139.81073,,"AS","JP","JP-13","Tokyo","no",,,,,,
-542343,"JP-3409","heliport","Arca Central Helipad",35.69731,139.811397,,"AS","JP","JP-13","Tokyo","no",,,,,,
-542344,"JP-3410","heliport","Arca Kit Helipad",35.697423,139.812108,,"AS","JP","JP-13","Tokyo","no",,,,,,
-542347,"JP-3411","heliport","Arca East Helipad",35.697462,139.814404,,"AS","JP","JP-13","Tokyo","no",,,,,,
+542340,"JP-3406","heliport","Arca West Helipad",35.697212,139.809568,,"AS","JP","JP-13","Sumida, Tokyo","no",,,,,,
+542341,"JP-3407","heliport","MLIT Motomiya District Disaster Prevention Station Heliport",37.51251,140.40441,689,"AS","JP","JP-07","Motomiya","no",,,,,,
+542342,"JP-3408","heliport","Tobu Hotel Levant Tokyo Heliport",35.697094,139.81073,,"AS","JP","JP-13","Sumida, Tokyo","no",,,,,,
+542343,"JP-3409","heliport","Arca Central Helipad",35.69731,139.811397,,"AS","JP","JP-13","Sumida, Tokyo","no",,,,,,
+542344,"JP-3410","heliport","Arca Kit Helipad",35.697423,139.812108,,"AS","JP","JP-13","Sumida, Tokyo","no",,,,,,
+542347,"JP-3411","heliport","Arca East Helipad",35.697462,139.814404,,"AS","JP","JP-13","Sumida","no",,,,,,
 542348,"JP-3412","heliport","Sumida City Hall Helipad",35.710698,139.80128,,"AS","JP","JP-13","Tokyo","no",,,,,,
 542350,"JP-3413","heliport","Toyosu On Helipad",35.659541,139.791493,,"AS","JP","JP-13","Tokyo","no",,,,,,
 547277,"JP-3414","heliport","Maebashi Red Cross Hospital Helipad",36.359202,139.096423,327,"AS","JP","JP-10","Maebashi","no",,,,,,
@@ -36390,6 +36410,13 @@
 563212,"JP-3459","heliport","Namikura Heliport",37.313574,141.006101,154,"AS","JP","JP-07","Naraha","no",,,,,,
 563213,"JP-3460","heliport","Aizu Medical Center Heliport",37.55352,139.90767,617,"AS","JP","JP-07","Aizuwakamatsu","no",,,,,,
 563215,"JP-3461","heliport","Okawa Dam Heliport",37.34539,139.91257,1316,"AS","JP","JP-07","Aizuwakamatsu","no",,,,,,
+563496,"JP-3462","heliport","Dokkyo Medical University Nikko Medical Center Heliport",36.70849,139.7306,1079,"AS","JP","JP-09","Nikko","no",,,,,,
+563530,"JP-3463","heliport","Honjo Fire Station Heliport",35.70393,139.81558,,"AS","JP","JP-13","Sumida","no",,,,,,
+563531,"JP-3464","heliport","Olinas Tower Heliport",35.70085,139.81535,,"AS","JP","JP-13","Sumida, Tokyo","no",,,,,,
+563533,"JP-3465","heliport","Brillia Tower Tokyo Heliport",35.700579,139.816169,,"AS","JP","JP-13","Sumida, Tokyo","no",,,,,,
+563537,"JP-3466","heliport","APA Hotel & Resort Ryogoku Station Tower Heliport",35.69749,139.79436,,"AS","JP","JP-13","Sumida, Tokyo","no",,,,,,
+563561,"JP-3467","heliport","Nasu Fire Department Helipad",37.0156,140.12551,1086,"AS","JP","JP-09","Nasu","no",,,,,,
+563563,"JP-3468","heliport","Osozawa Bridge Heliport",36.92487,139.9969,912,"AS","JP","JP-09","Nasushiobara","no",,,,,,
 313333,"JPB","closed","Pan Am Building Heliport",40.7533,-73.9765,870,"NA","US","US-NY","New York","no",,,,,,"JPB"
 18255,"JPN","heliport","Pentagon Army Heliport",38.874908,-77.056682,40,"NA","US","US-VA","Washington DC","no","KJPN","JPN","JPN",,"https://en.wikipedia.org/wiki/Pentagon_Army_Heliport","Arlington"
 18256,"JRA","heliport","West 30th Street Heliport",40.755107,-74.006896,7,"NA","US","US-NY","New York","yes","KJRA","JRA","JRA",,"https://en.wikipedia.org/wiki/West_30th_Street_Heliport",
@@ -42418,7 +42445,7 @@
 43293,"LERA","heliport","R.A.C.C. Heliport",41.38330078125,2.108330011367798,300,"EU","ES","ES-CT","Barcelona","no","LERA",,,,,
 550459,"LERB","heliport","Rabanal del Camino Firefighting Heliport",42.480863,-6.272399,3665,"EU","ES","ES-CL","León","no","LERB",,,,,
 43294,"LERE","small_airport","Aeródromo Requena El Rebollar",39.474701,-1.03444,2340,"EU","ES","ES-VC","Requena","no","LERE",,,"http://www.flyrequena.com/index.htm","https://es.wikipedia.org/wiki/Aer%C3%B3dromo_de_Requena",
-43238,"LERG","heliport","Berga Heliport",42.10559844970703,1.8533300161361694,2300,"EU","ES","ES-CT","Berga","no","LERG",,,,,
+43238,"LERG","heliport","Berga Heliport",42.104811,1.85812,2326,"AF","ES","ES-CT","Berga","no","LERG",,,,,
 4027,"LERI","medium_airport","Alcantarilla Air Base",37.951099,-1.23032,250,"EU","ES","ES-MC","Alcantarilla","no","LERI",,,,"https://es.wikipedia.org/wiki/Base_A%C3%A9rea_de_Alcantarilla",
 46583,"LERL","medium_airport","Ciudad Real International Airport",38.856479,-3.969944,,"EU","ES","ES-CM","Ciudad Real","no","LERL","CQM",,"http://www.aeropuertocentralcr.com/","https://en.wikipedia.org/wiki/Ciudad_Real_International_Airport","Ciudad Real Central Airport"
 4029,"LERM","small_airport","Robledillo De Mohernando Airfield",40.865299,-3.24778,3097,"EU","ES","ES-CM","Robledillo De Mohernando","no","LERM",,,,"https://es.wikipedia.org/wiki/Aer%C3%B3dromo_de_Robledillo_de_Mohernando",
@@ -49661,7 +49688,7 @@
 43700,"NL-0005","heliport","Rivierenland Hospital Heliport",51.889702,5.413764,16,"EU","NL","NL-GE","Tiel","no",,,,,,"EH0022, Ziekenhuis Rivierenland Heliport"
 43701,"NL-0006","heliport","Universitair Medisch Centrum Heliport",53.22173309326172,6.576056003570557,80,"EU","NL","NL-GR","Groningen","no",,,,,,"EH0010"
 43702,"NL-0007","heliport","Maastricht University Medical Center Heliport",50.834389,5.712478,165,"EU","NL","NL-LI","Maastricht","no",,,,,,"EH0015, Maastricht Universitair Medisch Centrum Heliport"
-43703,"NL-0008","closed","Vie Curi Medical Center for Noord-Limburg Heliport",51.358334,6.1525,58,"EU","NL","NL-LI","Venlo","no",,,,,,"EH0026"
+43703,"NL-0008","heliport","Vie Curi Medical Center for Noord-Limburg Heliport",51.359428,6.155541,66,"EU","NL","NL-LI","Venlo","no",,,,,,"EH0026"
 43704,"NL-0009","heliport","Maxima Medisch Centrum Heliport",51.404998779296875,5.419722080230713,62,"EU","NL","NL-NB","Veldhoven","no",,,,,,"EH0025"
 43705,"NL-0010","heliport","St. Elisabeth Hospital Heliport",51.538882,5.104576,49,"EU","NL","NL-NB","Tilburg","no",,,,,,"EH0023, Helihaven St. Elisabeth Ziekenhuis"
 43706,"NL-0011","heliport","Red Cross Hospital Heliport",52.479128,4.651482,68,"EU","NL","NL-NH","Beverwijk","no",,,,,,"EH0002, Rode Kruis Ziekenhuis"
diff --git a/regions.csv b/regions.csv
index 03118559d..453a34caf 100644
--- a/regions.csv
+++ b/regions.csv
@@ -1161,6 +1161,7 @@
 303905,"GQ-U-A","U-A","(unassigned)","AF","GQ",,"Airports in (unassigned)"
 303906,"GQ-WN","WN","Wele-Nzas Province","AF","GQ","https://en.wikipedia.org/wiki/Wele-Nzas","Airports in Wele-Nzas Province"
 353665,"GR-A","A","Eastern Macedonia and Thrace","EU","GR","https://en.wikipedia.org/wiki/Eastern_Macedonia_and_Thrace","Airports in Eastern Macedonia and Thrace"
+563555,"GR-AO","AO","Agio Oros (Mount Athos)","EU","GR","https://en.wikipedia.org/wiki/Monastic_community_of_Mount_Athos","Holy Mountain, Monastic Community of Mount Athos"
 430179,"GR-B","B","Central Macedonia","EU","GR","https://en.wikipedia.org/wiki/Central_Macedonia","Κεντρική Μακεδονία"
 430176,"GR-C","C","Western Macedonia","EU","GR","https://en.wikipedia.org/wiki/Western_Macedonia","Δυτική Μακεδονία"
 430178,"GR-D","D","Epirus","EU","GR","https://en.wikipedia.org/wiki/Epirus_(region)","Ήπειρος"
diff --git a/runways.csv b/runways.csv
index 2bdb32762..91c8d488d 100644
--- a/runways.csv
+++ b/runways.csv
@@ -12256,6 +12256,7 @@
 525634,44048,"BGAR",130,130,"GVL",0,0,"H1",,,,,,,,,,,
 236104,113,"BGBW",6004,148,"CON",1,0,"06",61.1544,-45.436901,11,41,,"24",61.166698,-45.415001,112,221,
 258191,30839,"BGCO",3281,98,"GVL",1,0,"18",70.74547576904297,-22.653499603271484,45,157,,"36",70.73716735839844,-22.643028259277344,9,337,
+563403,44051,"BGDH",2132,82,"GRAVEL",0,0,"10",,,,,,"28",,,,,
 525670,44059,"BGGD",197,197,"ASP",0,0,"H1",,,,,,,,,,,
 504924,114,"BGGH",7217,147,"ASPH",1,0,"04",64.189438,-51.679195,275,,,"22",64.197067,-51.673355,275,,
 236103,114,"BGGH",3117,98,"ASP",1,1,"05",64.189003,-51.6796,271,19,,"23",64.197098,-51.673401,281,199,
@@ -13937,7 +13938,7 @@
 354930,354929,"CN-0351",,,,0,0,"05",,,,,,"23",,,,,
 354996,354995,"CN-0353",10499,,,1,0,"15",,,,,,"33",,,,,
 355953,355952,"CN-0359",9186,,,0,0,"Unknown",,,,,,"Unknown",,,,,
-348433,32048,"CN-NTG",11155,,"concrete",1,0,"18",,,,,,"36",,,,,
+348433,32048,"CN-NTG",11155,148,"CONC",1,0,"18",32.089458,120.979538,16,,,"36",32.058807,120.980576,16,,
 267287,16821,"CN01",50,50,"CONC",1,0,"H1",,,,,,,,,,225,
 264308,45313,"CN02",54,54,"CONC",1,0,"H1",,,,,,,,,,299,
 264237,45308,"CN06",80,80,"ASPH",0,0,"H1",,,,,,,,,,,
@@ -14839,7 +14840,7 @@
 350259,1903,"CYSH",1500,85,"grass",0,0,"15",44.946609,-75.938431,410,137,,"33",44.943451,-75.934288,407,317,
 234582,1904,"CYSJ",7000,200,"ASP",1,0,"05",45.3025016784668,-65.89420318603516,296,30,,"23",45.31919860839844,-65.88059997558594,304,210,
 234583,1904,"CYSJ",5100,200,"ASP",1,0,"14",45.32939910888672,-65.9000015258789,357,121.2,,"32",45.322200775146484,-65.88310241699219,314,301.2,
-259660,1905,"CYSK",3800,,"UNK",0,0,"09",,,100,,,"27",,,104,,
+259660,1905,"CYSK",3800,100,"GRAVEL",0,0,"09",56.535126,-79.258995,100,,,"27",56.538681,-79.241264,104,,
 234901,1906,"CYSL",4000,100,"ASP",1,0,"18",47.16230010986328,-67.8395004272461,775,156.2,,"36",47.15230178833008,-67.83309936523438,788,336.2,
 234875,1907,"CYSM",1800,100,"COM",1,0,"03",60.02170181274414,-111.96099853515625,671,41,,"21",60.02539825439453,-111.95500183105469,667,221,
 234876,1907,"CYSM",6000,100,"ASP",1,0,"12",60.02750015258789,-111.9729995727539,666,131,,"30",60.016700744628906,-111.947998046875,671,311,
@@ -18716,7 +18717,7 @@
 267605,17650,"HI56",30,30,"TURF",0,0,"H1",,,,,,,,,,200,
 267606,17651,"HI57",60,60,"ASPH",0,0,"H1",,,,,,,,,,330,
 267607,17652,"HI58",125,125,"ASPH",0,0,"H1",,,,,,,,,,218,
-354926,300863,"HIA",9186,,"CON",1,0,"04",,,,,,"22",,,,,
+354926,300863,"HIA",9186,148,"CON",1,0,"04",33.782108,119.117538,34,,,"22",33.802601,119.135185,34,,
 238961,3247,"HJJJ",10171,148,"ASP",1,0,"13",4.87902,31.592899,1503,130,,"31",4.865,31.6094,1505,310,
 327762,28481,"HKAM",3284,,"ASP",0,0,"08",,,,,,"26",,,,,
 237276,3205,"HKEL",11480,147,"ASP",1,0,"08",0.4009140133857727,35.22129821777344,6838,79,,"26",0.40710800886154175,35.25210189819336,6838,259,
@@ -26290,6 +26291,8 @@
 253516,21565,"LA98",5000,75,"WATER",0,0,"07W",,,,,,"25W",,,,,
 267865,21566,"LA99",50,50,"CONC",0,0,"H1",,,,,,,,,,,
 314649,41316,"LAC",4480,,,0,0,"06",,,,,,"24",,,,,
+563423,312665,"LAD",13123,197,"ASPH",0,0,"06L",,,,,,"24R",,,,,
+563424,312665,"LAD",12470,197,"ASPH",0,0,"06R",,,,,,"24L",,,,,
 232870,3969,"LAGJ",9186,197,"CON",1,0,"16",41.90650177001953,19.59119987487793,19,153,,"34",41.88410186767578,19.606000900268555,23,333,
 232871,3969,"LAGJ",7223,78,"CON",0,1,"17",41.89609909057617,19.588899612426758,,169,,"35",41.8765983581543,19.593900680541992,,349,
 232873,3970,"LAKO",7475,275,"GRS",0,0,"01",40.63560104370117,20.73889923095703,,11,,"19",40.65570068359375,20.744300842285156,,191,
@@ -40706,7 +40709,7 @@
 350226,42923,"URMG",8210,148,"ASPHALT",0,0,"08",43.38750076293945,45.68439865112305,,87,,"26",43.38880157470703,45.715301513671875,,267,
 238532,6513,"URML",8661,138,"CON",1,0,"14",42.826900482177734,47.643798828125,-2,148.7,,"32",42.806800842285156,47.66080093383789,12,328.7,
 238533,6513,"URML",8688,230,"GRS",0,0,"14R",42.82640075683594,47.64289855957031,,147.8,,"32L",42.80630111694336,47.66019821166992,,327.8,
-238566,6514,"URMM",12795,197,"CON",1,0,"12",44.23440170288086,43.06129837036133,1043,122.2,,"30",44.2156982421875,43.102500915527344,1046,302.2,
+238566,6514,"URMM",12795,197,"CON",1,0,"11",44.234402,43.061298,1043,122,,"29",44.215698,43.102501,1046,302,
 238567,6515,"URMN",7218,138,"ASP",1,0,"06",43.50830078125,43.6244010925293,1462,63.4,,"24",43.51750183105469,43.64870071411133,1378,243.4,
 238568,6516,"URMO",9843,148,"CON",1,0,"09",43.207801818847656,44.588600158691406,1634,102,,"27",43.20240020751953,44.624698638916016,1673,282,
 351019,43689,"URMS",9842,151,"ASPHALT",0,0,"09",43.324902,44.993698,,96,,"27",43.322201,45.030602,,276,
@@ -46272,7 +46275,7 @@
 348626,32723,"ZHYC",10499,,,1,0,"14",,,,,,"32",,,,,
 235157,27201,"ZJHK",11811,148,"CON",1,0,"09",19.934799,110.442001,75,90,,"27",19.9349,110.475998,66,270,
 354889,27201,"ZJHK",11811,197,"CON",1,0,"10",19.953711,110.448341,49,,,"28",19.953814,110.482735,49,,
-327679,323220,"ZJQH",10499,148,"CON",1,0,"15",,,,,,"33",,,,,
+327679,323220,"ZJQH",10499,148,"CON",1,0,"15",19.153999,110.445221,46,,,"33",19.128916,110.460335,46,,
 235165,27202,"ZJSY",11155,148,"CON",1,0,"08",18.300800323486328,109.39600372314453,62,82.2,,"26",18.30500030517578,109.4280014038086,89,262.2,
 257439,32745,"ZJYX",8858,171,"CON",0,0,"05",16.825899,112.336998,,45,,"23",16.8412,112.352997,,225,
 237282,27203,"ZKPY",12475,197,"CON",1,1,"01",39.227699279785156,125.6760025024414,89,0.7,,"19",39.26190185546875,125.6760025024414,102,180.7,
@@ -46286,14 +46289,14 @@
 327746,300741,"ZLGY",9186,148,,0,0,"18",,,,,,"36",,,,,
 355009,319417,"ZLHX",11811,,,0,0,"15",,,,,,"33",,,,,
 348964,31659,"ZLHZ",8202,,,0,0,"07",,,,,,"25",,,,,
-348403,298989,"ZLIC",10499,,"Concrete",1,0,"03",,,,,,"21",,,,,
+348403,298989,"ZLIC",11811,148,"CONC",1,0,"03",38.307076,106.382065,3718,,,"21",38.335304,106.402336,3718,,
 348501,300515,"ZLJN",9186,,"Concrete",1,0,"09",,,,,,"27",,,,,
 311467,31699,"ZLJQ",9843,131,"paved",0,0,"14",,,5112,,,"32",,,5112,,
 235191,27204,"ZLLL",11811,148,"ASP",1,0,"18",36.531502,103.619003,6388,177,,"36",36.499001,103.621002,6329,357,
 327546,327544,"ZLLN",9186,148,"CON",1,0,"08",,,,,,"26",,,,,
 349657,31685,"ZLQY",8530,157,,1,0,"14",,,,,,"32",,,,,
 327744,312986,"ZLXH",10499,,,1,0,"10",,,,,,"28",,,,,
-350533,32709,"ZLXN",12467,,"ASP",1,0,"11",,,,,,"29",,,,,
+350533,32709,"ZLXN",12467,148,"ASP",1,0,"11",36.535915,102.01947,7128,,,"29",36.524731,102.059608,7128,,
 235201,27205,"ZLXY",9843,148,"CON",1,0,"05L",34.438201904296875,108.73899841308594,1565,49,,"23R",34.45600128173828,108.76399993896484,1569,229,
 333739,27205,"ZLXY",12467,197,"CON",1,0,"05R",,,,,,"23L",,,,,
 355161,32563,"ZLYL",9186,,"ASP",0,0,"16",,,,,,"34",,,,,
@@ -46326,7 +46329,7 @@
 348924,30916,"ZPDQ",11647,,"Asphalt",1,0,"16",,,,,,"34",,,,,
 235168,27213,"ZPJH",7218,148,"CON",1,0,"16",21.983299255371094,100.75599670410156,1808,160,,"34",21.964599609375,100.76300048828125,1814,340,
 327688,327448,"ZPJM",8530,148,,0,0,"12",,,,,,"30",,,,,
-348923,31828,"ZPLJ",9843,,"Asphalt",1,0,"02",,,,,,"20",,,,,
+348923,31828,"ZPLJ",9843,148,"ASPH",1,0,"02",26.664122,100.240334,7329,,,"20",26.69002,100.249168,7329,,
 318108,31862,"ZPLX",7218,,"Concrete",1,0,"05",,,,,,"23",,,,,
 235195,27214,"ZPPP",13123,148,"CON",1,0,"03",25.102249145507812,102.9170150756836,6891,39.3,,"21",25.130481719970703,102.94158935546875,6884,219.3,
 314904,27214,"ZPPP",14764,197,"ASP",1,0,"04",25.08968734741211,102.93074798583984,6885,39,,"22",25.121488571166992,102.95840454101562,6879,219,1644
@@ -46359,7 +46362,7 @@
 235163,27223,"ZSPD",12467,197,"CON",1,0,"16R",31.159000396728516,121.81199645996094,12,162,,"34L",31.126399993896484,121.8239974975586,12,342,
 235164,27223,"ZSPD",13123,197,"CON",1,0,"17L",31.161300659179688,121.78600311279297,10,162,,"35R",31.12700080871582,121.79900360107422,10,342,
 314962,27223,"ZSPD",11154,197,"CON",1,0,"17R",31.15483283996582,121.78316497802734,12,162,,"35L",31.12566566467285,121.7941665649414,12,342,
-348496,31705,"ZSQZ",8530,164,"Concrete",1,0,"03",,,,34,,"21",,,,214,
+348496,31705,"ZSQZ",8530,164,"CONC",1,0,"03",24.787058,118.582703,18,34,,"21",24.807306,118.595734,18,214,
 348513,323218,"ZSRZ",8530,,,1,0,"13",,,,,,"31",,,,,
 235181,27225,"ZSSS",11154,148,"ASP",1,0,"18L",31.213199615478516,121.33499908447266,7,176,,"36R",31.1825008392334,121.33699798583984,9,356,
 314966,27225,"ZSSS",10826,197,"CON",1,0,"18R",31.21,121.332,10,176,,"36L",31.186,121.333,10,356,
@@ -46367,15 +46370,15 @@
 354875,348698,"ZSWA",9186,,,1,0,"06",,,,,,"24",,,,,
 348245,32646,"ZSWF",8530,,"Concrete",1,0,"17",,,,,,"35",,,,,
 235174,27226,"ZSWH",8530,148,"CON",1,0,"02",37.17599868774414,122.2239990234375,112,18.5,,"20",37.198299407958984,122.23400115966797,144,198.5,
-345351,32684,"ZSWX",10499,164,"asphalt",1,0,"03",,,15,20,,"21",,,17,200,
-348493,32683,"ZSWY",7874,,"cement",1,0,"03",,,,,,"21",,,,,
+345351,32684,"ZSWX",10499,164,"ASPH",1,0,"03",31.483835,120.424736,15,20,,"21",31.510912,120.436386,17,200,
+348493,32683,"ZSWY",7874,,"CEM",1,0,"03",,,,,,"21",,,,,
 327567,32672,"ZSWZ",10499,148,"CON",1,0,"03",27.895767,120.844498,,,,"21",27.921217,120.859871,,,
-313456,32713,"ZSXZ",11548,147,"concrete",1,0,"09",,,115,90,,"27",,,115,270,
+313456,32713,"ZSXZ",11548,148,"CONC",1,0,"09",34.058144,117.538055,115,90,,"27",34.060555,117.574783,115,270,
 318130,317774,"ZSYA",10499,148,"CON",1,0,"17",32.58095932006836,119.71491241455078,16,,,"35",32.5528564453125,119.72267150878906,16,,
 348559,315853,"ZSYC",7874,,,1,0,"06",,,,,,"24",,,,,
 348434,35316,"ZSYN",9186,,,1,0,"04",,,,,,"22",,,,,
 235161,27227,"ZSYT",8530,148,"CON",1,0,"04",37.39099884033203,121.36100006103516,52,38,,"22",37.40959930419922,121.37899780273438,52,218,
-348429,32726,"ZSYW",9843,,"concrete",1,0,"02",,,,,,"20",,,,,
+348429,32726,"ZSYW",9843,148,"CONC",1,0,"02",29.329828,120.026711,256,,,"20",29.35553,120.036392,256,,
 348427,31624,"ZSZS",7546,,,1,0,"18",,,,,,"36",,,,,
 355947,300545,"ZUAL",14764,,"ASP",0,0,"15",,,,,,"33",,,,,
 354887,300785,"ZUAS",9186,,,0,0,"08",,,,,,"26",,,,,