Merge pull request #4298 from michihdeu/master

GES/HDF/IDF/NOR
TravelMapping · Nov 8, 2020 · f1a32b0 · f1a32b0
2 parents f50132b + 5e0133b
commit f1a32b0
Show file tree

Hide file tree

Showing 24 changed files with 52 additions and 27 deletions.
diff --git a/hwy_data/FRA-GES/frahdfd02/frages.d096602.wpt b/hwy_data/FRA-GES/frahdfd02/frages.d096602.wpt
@@ -0,0 +1,2 @@
+HDF/GES http://www.openstreetmap.org/?lat=49.621757&lon=4.026017
+GES/HDF http://www.openstreetmap.org/?lat=49.606217&lon=4.040879
diff --git a/hwy_data/FRA-HDF/frahdfd02/frahdf.d096602.wpt b/hwy_data/FRA-HDF/frahdfd02/frahdf.d096602.wpt
@@ -14,15 +14,4 @@ D593_E http://www.openstreetmap.org/?lat=49.679205&lon=4.012515
 D593_W http://www.openstreetmap.org/?lat=49.671034&lon=4.013631
 D18 http://www.openstreetmap.org/?lat=49.629783&lon=4.022208
 D186 http://www.openstreetmap.org/?lat=49.624459&lon=4.023432
-D120 http://www.openstreetmap.org/?lat=49.596081&lon=4.050382
-D30 http://www.openstreetmap.org/?lat=49.583322&lon=4.056310
-D60/D601 http://www.openstreetmap.org/?lat=49.567908&lon=4.054164
-D89 http://www.openstreetmap.org/?lat=49.529791&lon=4.045168
-D24 http://www.openstreetmap.org/?lat=49.498239&lon=4.040576
-D1540 http://www.openstreetmap.org/?lat=49.490868&lon=4.041126
-D523 http://www.openstreetmap.org/?lat=49.441531&lon=4.037095
-D52_N http://www.openstreetmap.org/?lat=49.433396&lon=4.031049
-D925_W http://www.openstreetmap.org/?lat=49.432831&lon=4.030834
-D925_E http://www.openstreetmap.org/?lat=49.428543&lon=4.043725
-D52_S http://www.openstreetmap.org/?lat=49.425169&lon=4.043323
-HDF/GES http://www.openstreetmap.org/?lat=49.389552&lon=4.039128
+HDF/GES http://www.openstreetmap.org/?lat=49.621757&lon=4.026017
diff --git a/hwy_data/FRA-HDF/frahdfd02/frahdf.d096602neu.wpt b/hwy_data/FRA-HDF/frahdfd02/frahdf.d096602neu.wpt
@@ -0,0 +1,13 @@
+GES/HDF http://www.openstreetmap.org/?lat=49.606217&lon=4.040879
+D120 http://www.openstreetmap.org/?lat=49.596081&lon=4.050382
+D30 http://www.openstreetmap.org/?lat=49.583322&lon=4.056310
+D60/D601 http://www.openstreetmap.org/?lat=49.567908&lon=4.054164
+D89 http://www.openstreetmap.org/?lat=49.529791&lon=4.045168
+D24 http://www.openstreetmap.org/?lat=49.498239&lon=4.040576
+D1540 http://www.openstreetmap.org/?lat=49.490868&lon=4.041126
+D523 http://www.openstreetmap.org/?lat=49.441531&lon=4.037095
+D52_N http://www.openstreetmap.org/?lat=49.433396&lon=4.031049
+D925_W http://www.openstreetmap.org/?lat=49.432831&lon=4.030834
+D925_E http://www.openstreetmap.org/?lat=49.428543&lon=4.043725
+D52_S http://www.openstreetmap.org/?lat=49.425169&lon=4.043323
+HDF/GES http://www.openstreetmap.org/?lat=49.392304&lon=4.039444
diff --git a/hwy_data/FRA-HDF/frahdfd60/frahdf.d0105e60.wpt b/hwy_data/FRA-HDF/frahdfd60/frahdf.d0105e60.wpt
@@ -0,0 +1,2 @@
+D105 http://www.openstreetmap.org/?lat=49.210690&lon=2.053655
+D121 http://www.openstreetmap.org/?lat=49.207881&lon=2.051219
diff --git a/hwy_data/FRA-HDF/frahdfd60/frahdf.d100160cha.wpt b/hwy_data/FRA-HDF/frahdfd60/frahdf.d100160cha.wpt
@@ -1,2 +1,3 @@
 IDF/HDF http://www.openstreetmap.org/?lat=49.153410&lon=2.246125
+D49 http://www.openstreetmap.org/?lat=49.160898&lon=2.236823
 HDF/IDF http://www.openstreetmap.org/?lat=49.164841&lon=2.231735
diff --git a/hwy_data/FRA-HDF/frahdfd60/fraidf.d010560.wpt b/hwy_data/FRA-HDF/frahdfd60/fraidf.d010560.wpt
@@ -0,0 +1,7 @@
+IDF/HDF http://www.openstreetmap.org/?lat=49.203614&lon=2.090980
+D927_S http://www.openstreetmap.org/?lat=49.202645&lon=2.120345
+D927_N http://www.openstreetmap.org/?lat=49.203006&lon=2.121029
+D609 http://www.openstreetmap.org/?lat=49.206362&lon=2.148567
+RueMen http://www.openstreetmap.org/?lat=49.189110&lon=2.194380
+D1001 http://www.openstreetmap.org/?lat=49.173327&lon=2.231145
+D924 http://www.openstreetmap.org/?lat=49.170955&lon=2.242396
diff --git a/hwy_data/FRA-HDF/frahdfd60/fraidf.d010560fle.wpt b/hwy_data/FRA-HDF/frahdfd60/fraidf.d010560fle.wpt
@@ -0,0 +1,9 @@
+D923 http://www.openstreetmap.org/?lat=49.246285&lon=1.949118
+D3 http://www.openstreetmap.org/?lat=49.242150&lon=1.967221
+D619 http://www.openstreetmap.org/?lat=49.229288&lon=2.028324
+D507 http://www.openstreetmap.org/?lat=49.226598&lon=2.033992
+D105E http://www.openstreetmap.org/?lat=49.210690&lon=2.053655
+D5 http://www.openstreetmap.org/?lat=49.210585&lon=2.053958
+D121_W http://www.openstreetmap.org/?lat=49.208139&lon=2.056393
+D121_E http://www.openstreetmap.org/?lat=49.207650&lon=2.057139
+HDF/IDF http://www.openstreetmap.org/?lat=49.204370&lon=2.072106
diff --git a/hwy_data/FRA-HDF/frahdfd80/frahdf.d092580fri.wpt b/hwy_data/FRA-HDF/frahdfd80/frahdf.d092580fri.wpt
@@ -1,4 +1,4 @@
-NOR/HDF http://www.openstreetmap.org/?lat=50.062689&lon=1.458092
+NOR/HDF http://www.openstreetmap.org/?lat=50.062735&lon=1.459149
 D19A http://www.openstreetmap.org/?lat=50.065013&lon=1.497389
 D19/D1925 http://www.openstreetmap.org/?lat=50.066575&lon=1.511908
 D2 http://www.openstreetmap.org/?lat=50.073365&lon=1.542088

diff --git a/hwy_data/FRA-HDF/frahdfd80/frahdf.d094080.wpt b/hwy_data/FRA-HDF/frahdfd80/frahdf.d094080.wpt
@@ -21,4 +21,4 @@ D102 http://www.openstreetmap.org/?lat=50.138847&lon=1.519474
 D463 http://www.openstreetmap.org/?lat=50.123430&lon=1.487068
 D19 http://www.openstreetmap.org/?lat=50.094766&lon=1.463311
 D940E http://www.openstreetmap.org/?lat=50.078503&lon=1.436784
-HDF/NOR http://www.openstreetmap.org/?lat=50.070257&lon=1.431634
+HDF/NOR http://www.openstreetmap.org/?lat=50.071819&lon=1.432697
diff --git a/hwy_data/FRA-HDF/franord76/frahdf.d000876.wpt b/hwy_data/FRA-HDF/franord76/frahdf.d000876.wpt
@@ -0,0 +1,2 @@
+NOR/HDF http://www.openstreetmap.org/?lat=49.580673&lon=1.705488
+HDF/NOR http://www.openstreetmap.org/?lat=49.577082&lon=1.705896
diff --git a/...data/FRA-IDF/fraidfd95/fraidf.d010595.wpt → ...data/FRA-IDF/frahdfd60/fraidf.d010560.wpt b/...data/FRA-IDF/fraidfd95/fraidf.d010595.wpt → ...data/FRA-IDF/frahdfd60/fraidf.d010560.wpt
diff --git a/...a/FRA-IDF/fraidfd95/fraidf.d030195ron.wpt → ...a/FRA-IDF/frahdfd60/fraidf.d100160ron.wpt b/...a/FRA-IDF/fraidfd95/fraidf.d030195ron.wpt → ...a/FRA-IDF/frahdfd60/fraidf.d100160ron.wpt
diff --git a/hwy_data/FRA-IDF/fraidfd95/fraidf.d031695.wpt b/hwy_data/FRA-IDF/fraidfd95/fraidf.d031695.wpt
@@ -11,4 +11,4 @@ N104 http://www.openstreetmap.org/?lat=49.066380&lon=2.404150
 D922_W http://www.openstreetmap.org/?lat=49.097064&lon=2.419216
 D922_E http://www.openstreetmap.org/?lat=49.110955&lon=2.429829
 D922Z http://www.openstreetmap.org/?lat=49.119192&lon=2.427378
-IDF/HDF http://www.openstreetmap.org/?lat=49.135213&lon=2.436065
+IDF/HDF http://www.openstreetmap.org/?lat=49.135490&lon=2.436205
diff --git a/hwy_data/FRA-IDF/fraidfd95/fraidf.d092495.wpt b/hwy_data/FRA-IDF/fraidfd95/fraidf.d092495.wpt
@@ -3,4 +3,3 @@ D924Z_W http://www.openstreetmap.org/?lat=49.164925&lon=2.294694
 D924Z_S http://www.openstreetmap.org/?lat=49.158969&lon=2.315186
 D924Z_E http://www.openstreetmap.org/?lat=49.161379&lon=2.341408
 D603 http://www.openstreetmap.org/?lat=49.162116&lon=2.344446
-IDF/HDF http://www.openstreetmap.org/?lat=49.162375&lon=2.345951
diff --git a/hwy_data/FRA-NOR/franord76/franor.d000876.wpt b/hwy_data/FRA-NOR/franord76/franor.d000876.wpt
@@ -1,4 +1,4 @@
-HDF/NOR http://www.openstreetmap.org/?lat=49.693001&lon=1.723614
+HDF/NOR http://www.openstreetmap.org/?lat=49.694314&lon=1.724735
 D236_E http://www.openstreetmap.org/?lat=49.680682&lon=1.723185
 D236_W http://www.openstreetmap.org/?lat=49.676638&lon=1.712376
 D82 http://www.openstreetmap.org/?lat=49.669199&lon=1.707639

diff --git a/hwy_data/FRA-NOR/franord76/franor.d092576eu.wpt b/hwy_data/FRA-NOR/franord76/franor.d092576eu.wpt
@@ -2,4 +2,4 @@ HDF/NOR http://www.openstreetmap.org/?lat=50.061168&lon=1.411690
 D940 http://www.openstreetmap.org/?lat=50.060386&lon=1.420943
 D925C http://www.openstreetmap.org/?lat=50.062162&lon=1.424889
 +X12 http://www.openstreetmap.org/?lat=50.067070&lon=1.448369
-NOR/HDF http://www.openstreetmap.org/?lat=50.062689&lon=1.458092
+NOR/HDF http://www.openstreetmap.org/?lat=50.062735&lon=1.459149
diff --git a/hwy_data/FRA-NOR/franord76/franor.d094076eu.wpt b/hwy_data/FRA-NOR/franord76/franor.d094076eu.wpt
@@ -1,3 +1,3 @@
-HDF/NOR http://www.openstreetmap.org/?lat=50.070257&lon=1.431634
+HDF/NOR http://www.openstreetmap.org/?lat=50.071819&lon=1.432697
 D925 http://www.openstreetmap.org/?lat=50.060386&lon=1.420943
 D1015 http://www.openstreetmap.org/?lat=50.057178&lon=1.421356
diff --git a/hwy_data/_systems/frahdfd02.csv b/hwy_data/_systems/frahdfd02.csv
@@ -554,7 +554,9 @@ frahdfd02;FRA-HDF;D960;-02;;;frahdf.d096002;
 frahdfd02;FRA-HDF;D963;-02;;;frahdf.d096302;
 frahdfd02;FRA-HDF;D964;-02;;;frahdf.d096402;
 frahdfd02;FRA-HDF;D965;-02;;;frahdf.d096502;
-frahdfd02;FRA-HDF;D966;-02;;;frahdf.d096602;
+frahdfd02;FRA-HDF;D966;-02;;Montcornet;frahdf.d096602;
+frahdfd02;FRA-GES;D966;-02;;;frages.d096602;
+frahdfd02;FRA-HDF;D966;-02;Neu;Neufchâtel-sur-Aisne;frahdf.d096602neu;
 frahdfd02;FRA-HDF;D967;-02;Cre;Crécy-sur-Serre;frahdf.d096702cre;
 frahdfd02;FRA-HDF;D967;-02;Bou;Bourg-et-Comin;frahdf.d096702bou;
 frahdfd02;FRA-HDF;D967;-02;;Fère-en-Tardenois;frahdf.d096702;

diff --git a/hwy_data/_systems/frahdfd02_con.csv b/hwy_data/_systems/frahdfd02_con.csv
@@ -548,7 +548,7 @@ frahdfd02;D960;-02;;frahdf.d096002
 frahdfd02;D963;-02;;frahdf.d096302
 frahdfd02;D964;-02;;frahdf.d096402
 frahdfd02;D965;-02;;frahdf.d096502
-frahdfd02;D966;-02;;frahdf.d096602
+frahdfd02;D966;-02;;frahdf.d096602,frages.d096602,frahdf.d096602neu
 frahdfd02;D967;-02;Crécy-sur-Serre;frahdf.d096702cre
 frahdfd02;D967;-02;Bourg-et-Comin;frahdf.d096702bou
 frahdfd02;D967;-02;Fère-en-Tardenois;frahdf.d096702

diff --git a/hwy_data/_systems/fraidfd95.csv b/hwy_data/_systems/fraidfd95.csv
@@ -57,7 +57,6 @@ fraidfd95;FRA-IDF;D86A;-95;;;fraidf.d0086a95;
 fraidfd95;FRA-IDF;D88;-95;;;fraidf.d008895;
 fraidfd95;FRA-IDF;D92;-95;;;fraidf.d009295;
 fraidfd95;FRA-IDF;D100;-95;;;fraidf.d010095;
-fraidfd95;FRA-IDF;D105;-95;;;fraidf.d010595;
 fraidfd95;FRA-IDF;D106;-95;;;fraidf.d010695;
 fraidfd95;FRA-IDF;D109;-95;;;fraidf.d010995;
 fraidfd95;FRA-IDF;D109P;-95;;;fraidf.d0109p95;
@@ -108,7 +107,6 @@ fraidfd95;FRA-IDF;D208;-95;;;fraidf.d020895;
 fraidfd95;FRA-IDF;D209;-95;;;fraidf.d020995;
 fraidfd95;FRA-IDF;D301;-95;;Domont;fraidf.d030195;
 fraidfd95;FRA-IDF;D301;-95;Per;Persan;fraidf.d030195per;
-fraidfd95;FRA-IDF;D301;-95;Ron;Ronquerolles;fraidf.d030195ron;
 fraidfd95;FRA-IDF;D308;-95;;;fraidf.d030895;
 fraidfd95;FRA-IDF;D311;-95;;Argenteuil;fraidf.d031195;
 fraidfd95;FRA-IDF;D311;-95;Mon;Montmagny;fraidf.d031195mon;

diff --git a/hwy_data/_systems/fraidfd95_con.csv b/hwy_data/_systems/fraidfd95_con.csv
@@ -57,7 +57,6 @@ fraidfd95;D86A;-95;;fraidf.d0086a95
 fraidfd95;D88;-95;;fraidf.d008895
 fraidfd95;D92;-95;;fraidf.d009295
 fraidfd95;D100;-95;;fraidf.d010095
-fraidfd95;D105;-95;;fraidf.d010595
 fraidfd95;D106;-95;;fraidf.d010695
 fraidfd95;D109;-95;;fraidf.d010995
 fraidfd95;D109P;-95;;fraidf.d0109p95
@@ -108,7 +107,6 @@ fraidfd95;D208;-95;;fraidf.d020895
 fraidfd95;D209;-95;;fraidf.d020995
 fraidfd95;D301;-95;Domont;fraidf.d030195
 fraidfd95;D301;-95;Persan;fraidf.d030195per
-fraidfd95;D301;-95;Ronquerolles;fraidf.d030195ron
 fraidfd95;D308;-95;;fraidf.d030895
 fraidfd95;D311;-95;Argenteuil;fraidf.d031195
 fraidfd95;D311;-95;Montmagny;fraidf.d031195mon

diff --git a/hwy_data/_systems/franord76.csv b/hwy_data/_systems/franord76.csv
@@ -24,6 +24,7 @@ franord76;FRA-NOR;D7A;-76;;;franor.d0007a76;
 franord76;FRA-NOR;D7B;-76;;;franor.d0007b76;
 franord76;FRA-NOR;D8;-76;Aum;Aumale;franor.d000876aum;
 franord76;FRA-NOR;D8;-76;;Grumesnil;franor.d000876;
+franord76;FRA-HDF;D8;-76;;;frahdf.d000876;
 franord76;FRA-NOR;D8;-76;Gan;Gancourt-Saint-Étienne;franor.d000876gan;
 franord76;FRA-NOR;D8A;-76;;;franor.d0008a76;
 franord76;FRA-NOR;D9;-76;;;franor.d000976;

diff --git a/hwy_data/_systems/franord76_con.csv b/hwy_data/_systems/franord76_con.csv
@@ -23,8 +23,7 @@ franord76;D7;-76;Elbeuf;franor.d000776elb
 franord76;D7A;-76;;franor.d0007a76
 franord76;D7B;-76;;franor.d0007b76
 franord76;D8;-76;Aumale;franor.d000876aum
-franord76;D8;-76;Grumesnil;franor.d000876
-franord76;D8;-76;Gancourt-Saint-Étienne;franor.d000876gan
+franord76;D8;-76;;franor.d000876,frahdf.d000876,franor.d000876gan
 franord76;D8A;-76;;franor.d0008a76
 franord76;D9;-76;;franor.d000976
 franord76;D9A;-76;;franor.d0009a76

diff --git a/updates.csv b/updates.csv
@@ -508,6 +508,9 @@
 2020-10-18;(France) Grand-Est;Rocade Nord de Reims;frages.rnr;New Route
 2019-12-29;(France) Grand-Est;Voie Sacrée;frages.nvs;Route extended at south end from N135 to D935
 2019-11-08;(France) Grand-Est;N19;frages.n019;Re-entered route (swapped with BFC file to be in correct regions)
+2020-11-08;(France) Île-de-France;D301-95 (Ronquerolles);;Route removed (D1001-60)
+2020-11-08;(France) Île-de-France;D105-95;;Route removed (D105-60)
+2020-11-08;(France) Île-de-France;D924-95;fraidf.d092495;Route truncated at east end from the border to Hauts-de-France to D603
 2020-06-07;(France) Île-de-France;N1;fraidf.d030195;Route removed (D301-95 now)
 2019-11-15;(France) Île-de-France;N1;fraidf.n001;Route truncated at north end from A16/N184 to D78 (replaced by new A16 route)
 2019-11-15;(France) Île-de-France;A16;fraidf.a016;Route extended at south end from N184 to N104