Merge pull request #133 from TravelMapping/master

sync FOTZ, 2017-07-25

README.md

@@ -22,12 +22,14 @@ Several CSV files at the top level are used to describe some project-wide inform
 
 The `chm_final` directory contains an archive of the version of the project's data that was imported from the Clinched Highway Mapping project as a starting point for Travel Mapping.  It remains for historical interest only and is not used by Travel Mapping.
 
+The `boundaries` directory contains descriptions of shorelines and borders that can be used to render certain types of maps.  Travel Mapping does not currently use these.
+
+The `graphs` directory contains CSV files that guide the creation of some of the graphs generated for use by the [METAL project](http://courses.teresco.org/metal/).
+
 The `hwy_data` directory contains all of the information about which routes are in each system and the points that make up each route.
 
 Most directories within `hwy_data` are names of countries or regions.  Each country or region's directory will have one or more subdirectories, one for each highway system that includes at least one route in that country or region.  Within those directories are WPT files that list the waypoints of a route.  Each line in a WPT file has two parts: one or more labels (only the first of which will be considered primary) and an OpenStreetMap-style URL that includes the latitude and longitude of the point.
 
-There are also two special directories inside `hwy_data`.  
-
-* The `_boundaries` directory contains descriptions of shorelines and borders that can be used to render certain types of maps.  Travel Mapping does not currently use these.
+There is also a special directory inside `hwy_data`.  
 
 * The `_systems` directory contains two CSV files for each highway system listed in the top-level `systems.csv` file.  For a hypothetical system called "usaza", the file `usaza.csv` would contain a list of highways within the system, and the file `usaza_con.csv` would contain a list of "connected" routes.  For example, I-90 is made up of WPT files in the usai system under regions `WA`, `ID`, `MT`, `SD`, `MN`, `WI`, `IL`, `IN`, `OH`, `PA`, `NY`, and `MA`, so its entry in `usai_con.csv` describes which files make up the entire route and in which order they come.

hwy_data/_systems/b_country.csv → boundaries/b_country.csv

@@ -1,4 +1,4 @@
-System;Region;Route;#Waypoints;MidCoords(Lat,Lon);Description;Fileroot
+systemName;region;route;numWaypoints;midCoords;description;fileroot
 b_country;B;B0;37;(66.35,20.07);NOR/SWE;b.000
 b_country;B;B1;11;(67.30,23.24);SWE/FIN;b.001
 b_country;B;B2;24;(64.51,29.85);FIN/RUS;b.002

hwy_data/_systems/b_subdiv.csv → boundaries/b_subdiv.csv

@@ -1,4 +1,4 @@
-System;Region;Route;#Waypoints;MidCoords(Lat,Lon);Description;Fileroot
+systemName;region;route;numWaypoints;midCoords;description;fileroot
 b_subdiv;B;B481;53;(45.79,-121.35);USA-WA/OR;b.481
 b_subdiv;B;B482;82;(34.11,-114.57);USA-AZ/CA,NV;b.482
 b_subdiv;B;B484;65;(45.04,-116.90);USA-ID/WA,OR;b.484

hwy_data/_systems/b_water.csv → boundaries/b_water.csv

@@ -1,4 +1,4 @@
-System;Region;Route;#Waypoints;MidCoords(Lat,Lon);Description;Fileroot
+systemName;region;route;numWaypoints;midCoords;description;fileroot
 b_water;B;B131;3;(22.35,114.15);hong kong;b.131
 b_water;B;B182;97;(-77.33,-134.51);ATA/SOU;b.182
 b_water;B;B183;97;(-69.76,-77.22);ATA/SOU;b.183

hwy_data/_systems/boundaries.csv → boundaries/boundaries.csv

@@ -1,4 +1,4 @@
-System;Region;Route;#Waypoints;MidCoords(Lat,Lon);Description;Fileroot
+systemName;region;route;numWaypoints;midCoords;description;fileroot
 boundaries;C;B0;37;(66.35,20.07);NOR/SWE;b.000
 boundaries;C;B1;11;(67.30,23.24);SWE/FIN;b.001
 boundaries;C;B2;24;(64.51,29.85);FIN/RUS;b.002

countries.csv

@@ -1,5 +1,6 @@
 code;name
 AFG;Afghanistan
+AFR;Africa
 AGO;Angola
 ALB;Albania
 AND;Andorra
@@ -129,6 +130,7 @@ MRT;Mauritania
 MUS;Mauritius
 MWI;Malawi
 MYS;Malaysia
+NA;North America
 NAM;Namibia
 NER;Niger
 NGA;Nigeria
@@ -138,6 +140,7 @@ NOR;Norway
 NPL;Nepal
 NRU;Nauru
 NZL;New Zealand
+OCE;Oceania
 OMN;Oman
 PAK;Pakistan
 PAN;Panama
@@ -155,6 +158,7 @@ RKS;Kosovo
 ROU;Romania
 RUS;Russia
 RWA;Rwanda
+SA;South America
 SAU;Saudi Arabia
 SDN;Sudan
 SEN;Senegal

graphs/areagraphs.csv

@@ -0,0 +1,15 @@
+description;place;lat;lng;radius
+Siena College;siena;42.719450;-73.752063;25
+Siena College;siena;42.719450;-73.752063;50
+New York City;nyc;40.752459;-73.985367;20
+Boston;boston;42.362096;-71.057510;20
+Washington, D.C.;dc;38.899851;-77.03578;20
+Naples, FL;naples;26.141878;-81.794586;25
+Albuquerque, NM;albuquerque;35.104181;-106.627121;50
+Wolf Creek Pass, CO;wolfcreek;37.474586;-106.792603;50
+Seattle;seattle;47.594588;-122.335167;25
+Montreal;montreal;45.522646;-73.546343;25
+Innsbruck;innsbruck;47.266985;11.393638;25
+London;london;51.507323;-0.127672;25
+Copenhagen;copenhagen;55.683488;12.572136;25
+University at Buffalo;ubuffalo;43.002811;-78.787251;50

graphs/multiregion.csv

@@ -0,0 +1,4 @@
+description;title;regionlist
+New England;USA-newengland;MA,ME,CT,RI,VT,NH
+Canadian Maritimes;CAN-maritimes;NS,PE,NB,NL
+British Isles;british-isles;ENG,NIR,SCT,WLS,IMN,JEY,GGY

graphs/multisystem.csv

@@ -0,0 +1,3 @@
+description;title;systemlist
+United States National Routes;USA-national;usai,usaus,usaif,usaib,usausb,usansf,usasf
+Europen Freeway Routes;EUR-freeways;alba,auta,bela,bgra,biha,chea,cypa,czed,deua,espa,fraa,gbnam,gbnm,grca,hrva,hunm,irlm,itaa,luxa,niram,nirm,nlda,pola,prta,rksr,roua,srba,svkd,svna,turo,auts,belb,eursf,luxb,pols,svkr,svnh

hwy_data/AB/canab/ab.ab001.wpt

@@ -5,7 +5,7 @@ AB93_N http://www.openstreetmap.org/?lat=51.441175&lon=-116.200488
 AB1A_W +AB1ABan_W http://www.openstreetmap.org/?lat=51.426160&lon=-116.173596
 +X01 http://www.openstreetmap.org/?lat=51.404989&lon=-116.160121
 +X212994 http://www.openstreetmap.org/?lat=51.289205&lon=-115.997558
-AB93_S +AB93_E http://www.openstreetmap.org/?lat=51.264493&lon=-115.932455
+AB93_S http://www.openstreetmap.org/?lat=51.264493&lon=-115.932455
 RedCre http://www.openstreetmap.org/?lat=51.221131&lon=-115.805022
 BouLake http://www.openstreetmap.org/?lat=51.168803&lon=-115.729498
 Sun http://www.openstreetmap.org/?lat=51.157062&lon=-115.687881
@@ -42,14 +42,14 @@ RidRd http://www.openstreetmap.org/?lat=51.091583&lon=-114.560537
 ValRidBlvd http://www.openstreetmap.org/?lat=51.088510&lon=-114.248800
 177 http://www.openstreetmap.org/?lat=51.088483&lon=-114.230819
 BftRd http://www.openstreetmap.org/?lat=51.083469&lon=-114.209232
-SarTrl +SrcTrl http://www.openstreetmap.org/?lat=51.080261&lon=-114.189148
+SarTrl http://www.openstreetmap.org/?lat=51.080261&lon=-114.189148
 HomeRd http://www.openstreetmap.org/?lat=51.072792&lon=-114.164472
 BnsRd http://www.openstreetmap.org/?lat=51.066077&lon=-114.151940
 ShaTrl http://www.openstreetmap.org/?lat=51.065996&lon=-114.147820
 CamDr http://www.openstreetmap.org/?lat=51.066384&lon=-114.140654
 29St http://www.openstreetmap.org/?lat=51.068531&lon=-114.129238
 UniDr http://www.openstreetmap.org/?lat=51.067668&lon=-114.122543
-CroTrl +AB1ACal_W http://www.openstreetmap.org/?lat=51.067048&lon=-114.118037
+CroTrl http://www.openstreetmap.org/?lat=51.067048&lon=-114.118037
 AB1A_Cal http://www.openstreetmap.org/?lat=51.066984&lon=-114.112405
 14St +AB1ACal_E http://www.openstreetmap.org/?lat=51.066900&lon=-114.094691
 CenSt http://www.openstreetmap.org/?lat=51.066964&lon=-114.062526

hwy_data/AB/canab/ab.ab002.wpt

@@ -240,7 +240,7 @@ TwpRd774A http://www.openstreetmap.org/?lat=55.701460&lon=-116.872612
 6St http://www.openstreetmap.org/?lat=55.711519&lon=-116.889532
 CenSt http://www.openstreetmap.org/?lat=55.711524&lon=-116.904395
 3St http://www.openstreetmap.org/?lat=55.723194&lon=-117.105456
-AB49_E http://www.openstreetmap.org/?lat=55.723223&lon=-117.130854
+AB49_E http://www.openstreetmap.org/?lat=55.723225&lon=-117.131312
 TwpRd790 http://www.openstreetmap.org/?lat=55.810581&lon=-117.132257
 TwpRd800 http://www.openstreetmap.org/?lat=55.897952&lon=-117.133060
 99Ave http://www.openstreetmap.org/?lat=56.036096&lon=-117.133078

hwy_data/AB/canab/ab.ab003.wpt

@@ -27,7 +27,7 @@ AB811 http://www.openstreetmap.org/?lat=49.725540&lon=-113.397548
 AB2_S http://www.openstreetmap.org/?lat=49.717544&lon=-113.386652
 RgeRd252 http://www.openstreetmap.org/?lat=49.757524&lon=-113.303128
 +x34 http://www.openstreetmap.org/?lat=49.784907&lon=-113.264580
-AB3AMon http://www.openstreetmap.org/?lat=49.783948&lon=-113.137722
+AB3A http://www.openstreetmap.org/?lat=49.783983&lon=-113.137835
 AB23 http://www.openstreetmap.org/?lat=49.790283&lon=-113.065764
 +X36 http://www.openstreetmap.org/?lat=49.785254&lon=-112.997131
 AB509 http://www.openstreetmap.org/?lat=49.757587&lon=-112.958916

hwy_data/AB/canab/ab.ab003a.wpt

@@ -1,4 +1,4 @@
-AB3_W http://www.openstreetmap.org/?lat=49.783837&lon=-113.137869
+AB3_W http://www.openstreetmap.org/?lat=49.783983&lon=-113.137835
 KippSt http://www.openstreetmap.org/?lat=49.802826&lon=-113.105738
 AB23_N http://www.openstreetmap.org/?lat=49.801500&lon=-113.077234
 AB3_E http://www.openstreetmap.org/?lat=49.790283&lon=-113.065764

hwy_data/AB/canab/ab.ab021.wpt

@@ -4,7 +4,7 @@ AB564_E http://www.openstreetmap.org/?lat=51.183324&lon=-113.261466
 TwpRd263 http://www.openstreetmap.org/?lat=51.226981&lon=-113.260647
 TwpRd270 http://www.openstreetmap.org/?lat=51.270587&lon=-113.260447
 +X231259 http://www.openstreetmap.org/?lat=51.323091&lon=-113.240128
-AB9 http://www.openstreetmap.org/?lat=51.386848&lon=-113.239889
+AB9 http://www.openstreetmap.org/?lat=51.386962&lon=-113.239878
 +X230772 http://www.openstreetmap.org/?lat=51.499990&lon=-113.235862
 AB575 http://www.openstreetmap.org/?lat=51.508554&lon=-113.239437
 TwpRd302 http://www.openstreetmap.org/?lat=51.561497&lon=-113.239758

hwy_data/AB/canab/ab.ab023.wpt

@@ -13,7 +13,7 @@ RaiAve http://www.openstreetmap.org/?lat=50.328333&lon=-113.233132
 AB534 http://www.openstreetmap.org/?lat=50.397627&lon=-113.249582
 CenSt http://www.openstreetmap.org/?lat=50.406577&lon=-113.255479
 TwpRd180 http://www.openstreetmap.org/?lat=50.484707&lon=-113.255441
-AB24 http://www.openstreetmap.org/?lat=50.571371&lon=-113.257135
+AB24 http://www.openstreetmap.org/?lat=50.572030&lon=-113.257513
 RgeRd255 http://www.openstreetmap.org/?lat=50.572085&lon=-113.444155
 AB804 http://www.openstreetmap.org/?lat=50.572070&lon=-113.506732
 AB799 http://www.openstreetmap.org/?lat=50.572059&lon=-113.628724

hwy_data/AB/canab/ab.ab049.wpt

@@ -11,7 +11,7 @@ AB725 http://www.openstreetmap.org/?lat=55.839807&lon=-119.201090
 RgeRd81 http://www.openstreetmap.org/?lat=55.781344&lon=-119.112145
 AB727 http://www.openstreetmap.org/?lat=55.781187&lon=-118.931374
 AB731 http://www.openstreetmap.org/?lat=55.781265&lon=-118.853663
-AB2_W http://www.openstreetmap.org/?lat=55.756427&lon=-118.698947
+AB2_W http://www.openstreetmap.org/?lat=55.756377&lon=-118.698515
 RgeRd44 http://www.openstreetmap.org/?lat=55.752149&lon=-118.569563
 RgeRd41 http://www.openstreetmap.org/?lat=55.730368&lon=-118.492110
 AB733 http://www.openstreetmap.org/?lat=55.730232&lon=-118.388564

hwy_data/AB/canab/ab.ab052.wpt

@@ -2,4 +2,4 @@ AB5 http://www.openstreetmap.org/?lat=49.465003&lon=-112.785511
 AB844 http://www.openstreetmap.org/?lat=49.465241&lon=-112.695867
 AB845 http://www.openstreetmap.org/?lat=49.465482&lon=-112.662248
 AB846 http://www.openstreetmap.org/?lat=49.464991&lon=-112.516619
-AB4 http://www.openstreetmap.org/?lat=49.464494&lon=-112.451280
+AB4 http://www.openstreetmap.org/?lat=49.464546&lon=-112.451135

hwy_data/AB/cantch/ab.tchmai.wpt

@@ -5,7 +5,7 @@ AB93_N http://www.openstreetmap.org/?lat=51.441175&lon=-116.200488
 AB1A_W +AB1ABan_W http://www.openstreetmap.org/?lat=51.426160&lon=-116.173596
 +X01 http://www.openstreetmap.org/?lat=51.404989&lon=-116.160121
 +X212994 http://www.openstreetmap.org/?lat=51.289205&lon=-115.997558
-AB93_S +AB93_E http://www.openstreetmap.org/?lat=51.264493&lon=-115.932455
+AB93_S http://www.openstreetmap.org/?lat=51.264493&lon=-115.932455
 RedCre http://www.openstreetmap.org/?lat=51.221131&lon=-115.805022
 BouLake http://www.openstreetmap.org/?lat=51.168803&lon=-115.729498
 Sun http://www.openstreetmap.org/?lat=51.157062&lon=-115.687881
@@ -42,14 +42,14 @@ RidRd http://www.openstreetmap.org/?lat=51.091583&lon=-114.560537
 ValRidBlvd http://www.openstreetmap.org/?lat=51.088510&lon=-114.248800
 177 http://www.openstreetmap.org/?lat=51.088483&lon=-114.230819
 BftRd http://www.openstreetmap.org/?lat=51.083469&lon=-114.209232
-SarTrl +SrcTrl http://www.openstreetmap.org/?lat=51.080261&lon=-114.189148
+SarTrl http://www.openstreetmap.org/?lat=51.080261&lon=-114.189148
 HomeRd http://www.openstreetmap.org/?lat=51.072792&lon=-114.164472
 BnsRd http://www.openstreetmap.org/?lat=51.066077&lon=-114.151940
 ShaTrl http://www.openstreetmap.org/?lat=51.065996&lon=-114.147820
 CamDr http://www.openstreetmap.org/?lat=51.066384&lon=-114.140654
 29St http://www.openstreetmap.org/?lat=51.068531&lon=-114.129238
 UniDr http://www.openstreetmap.org/?lat=51.067668&lon=-114.122543
-CroTrl +AB1ACal_W http://www.openstreetmap.org/?lat=51.067048&lon=-114.118037
+CroTrl http://www.openstreetmap.org/?lat=51.067048&lon=-114.118037
 AB1A_Cal http://www.openstreetmap.org/?lat=51.066984&lon=-114.112405
 14St +AB1ACal_E http://www.openstreetmap.org/?lat=51.066900&lon=-114.094691
 CenSt http://www.openstreetmap.org/?lat=51.066964&lon=-114.062526

hwy_data/AK/usanp/ak.parkrd.wpt

@@ -0,0 +1,58 @@
+AK3 http://www.openstreetmap.org/?lat=63.728522&lon=-148.886408
+InfoCen http://www.openstreetmap.org/?lat=63.736895&lon=-148.900924
+VisCen http://www.openstreetmap.org/?lat=63.733539&lon=-148.915687
++X924932 http://www.openstreetmap.org/?lat=63.726881&lon=-148.923218
+DogSleMus http://www.openstreetmap.org/?lat=63.721728&lon=-148.965436
++X379605 http://www.openstreetmap.org/?lat=63.715063&lon=-149.037910
++X346699 http://www.openstreetmap.org/?lat=63.716089&lon=-149.076405
++X332744 http://www.openstreetmap.org/?lat=63.709893&lon=-149.124770
++X927381 http://www.openstreetmap.org/?lat=63.711984&lon=-149.221244
+SavRvrCamp http://www.openstreetmap.org/?lat=63.717790&lon=-149.256284
++X521476 http://www.openstreetmap.org/?lat=63.726891&lon=-149.280982
+SavRvrTrl http://www.openstreetmap.org/?lat=63.738452&lon=-149.291968
++X574084 http://www.openstreetmap.org/?lat=63.729731&lon=-149.322524
++X210260 http://www.openstreetmap.org/?lat=63.730414&lon=-149.368701
++X786116 http://www.openstreetmap.org/?lat=63.724753&lon=-149.369431
++X579096 http://www.openstreetmap.org/?lat=63.716602&lon=-149.391489
++X139342 http://www.openstreetmap.org/?lat=63.719566&lon=-149.409642
++X315729 http://www.openstreetmap.org/?lat=63.728116&lon=-149.411359
++X915691 http://www.openstreetmap.org/?lat=63.721961&lon=-149.428225
++X351620 http://www.openstreetmap.org/?lat=63.728800&lon=-149.454017
+SanRivCamp http://www.openstreetmap.org/?lat=63.723404&lon=-149.471269
++X445412 http://www.openstreetmap.org/?lat=63.708543&lon=-149.494572
++X541313 http://www.openstreetmap.org/?lat=63.715975&lon=-149.536586
++X413393 http://www.openstreetmap.org/?lat=63.688920&lon=-149.573879
+TekRivCamp http://www.openstreetmap.org/?lat=63.669910&lon=-149.577227
++X643201 http://www.openstreetmap.org/?lat=63.645878&lon=-149.562292
++X233722 http://www.openstreetmap.org/?lat=63.640334&lon=-149.580231
+IglCrkCamp http://www.openstreetmap.org/?lat=63.609048&lon=-149.584887
++X732080 http://www.openstreetmap.org/?lat=63.553942&lon=-149.658294
++X348051 http://www.openstreetmap.org/?lat=63.552987&lon=-149.730263
++X254209 http://www.openstreetmap.org/?lat=63.560058&lon=-149.793091
++X130243 http://www.openstreetmap.org/?lat=63.538323&lon=-149.805708
++X621503 http://www.openstreetmap.org/?lat=63.525087&lon=-149.911881
++X695853 http://www.openstreetmap.org/?lat=63.511261&lon=-149.977005
+TokRivSta http://www.openstreetmap.org/?lat=63.519050&lon=-150.044940
++X963326 http://www.openstreetmap.org/?lat=63.505575&lon=-150.055518
++X341240 http://www.openstreetmap.org/?lat=63.492851&lon=-150.097404
++X372822 http://www.openstreetmap.org/?lat=63.494460&lon=-150.111094
++X289036 http://www.openstreetmap.org/?lat=63.485955&lon=-150.123839
++X623855 http://www.openstreetmap.org/?lat=63.470911&lon=-150.161648
++X169868 http://www.openstreetmap.org/?lat=63.463914&lon=-150.201387
++X756168 http://www.openstreetmap.org/?lat=63.467749&lon=-150.214434
++X636766 http://www.openstreetmap.org/?lat=63.455419&lon=-150.230784
+EieVisCen http://www.openstreetmap.org/?lat=63.431518&lon=-150.309609
++X948247 http://www.openstreetmap.org/?lat=63.426368&lon=-150.375323
++X737300 http://www.openstreetmap.org/?lat=63.430457&lon=-150.381181
++X729499 http://www.openstreetmap.org/?lat=63.426426&lon=-150.432723
++X835061 http://www.openstreetmap.org/?lat=63.437664&lon=-150.498726
+RanCabTrl http://www.openstreetmap.org/?lat=63.438815&lon=-150.570931
++X258796 http://www.openstreetmap.org/?lat=63.445023&lon=-150.727015
++X660935 http://www.openstreetmap.org/?lat=63.453530&lon=-150.828123
+WonLakeCamp http://www.openstreetmap.org/?lat=63.465515&lon=-150.840526
++X487502 http://www.openstreetmap.org/?lat=63.476451&lon=-150.849044
++X862987 http://www.openstreetmap.org/?lat=63.493262&lon=-150.876060
++X792786 http://www.openstreetmap.org/?lat=63.498970&lon=-150.895436
+NorFaceLog http://www.openstreetmap.org/?lat=63.514735&lon=-150.906465
+Kan http://www.openstreetmap.org/?lat=63.525584&lon=-150.959616
+End http://www.openstreetmap.org/?lat=63.541928&lon=-150.996029

hwy_data/AL/usai/al.i010.wpt

@@ -15,5 +15,6 @@ MS/AL +0 http://www.openstreetmap.org/?lat=30.474421&lon=-88.400200
 35 http://www.openstreetmap.org/?lat=30.655634&lon=-87.911525
 38 http://www.openstreetmap.org/?lat=30.663054&lon=-87.851744
 44 http://www.openstreetmap.org/?lat=30.651684&lon=-87.759733
+49 http://www.openstreetmap.org/?lat=30.63693&lon=-87.67463
 53 http://www.openstreetmap.org/?lat=30.628754&lon=-87.615023
 AL/FL +999 http://www.openstreetmap.org/?lat=30.573420&lon=-87.410919