Updated station generation script, station list

diff --git a/application/resources/stations/downloaddata.sh b/application/resources/stations/downloaddata.sh
index 65b9763..cfa5c0f 100644 (file)
--- a/application/resources/stations/downloaddata.sh
+++ b/application/resources/stations/downloaddata.sh
@@ -1,10 +1,11 @@
 #! /bin/sh
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=6.7,44,10,46]" -o nordovest.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=10,44,14,46]" -o nordest.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=7.5,43.5,8.5,44]" -o liguria.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=10,42,15,44]" -o centronord.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=12,40,17,42]" -o centrosud.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=12.3,38,17.3,40]" -o sud.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=12,36.5,16.5,38]" -o sicilia.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=17.3,39.5,19,41]" -o puglia.osm &
-curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=8,38.7,10,41.3]" -o sardegna.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=8,46,14,47]" -o nord.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=6.7,44,10,46]" -o nordovest.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=10,44,14,46]" -o nordest.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=7.5,43.5,8.5,44]" -o liguria.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=10,42,15,44]" -o centronord.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=12,40,17,42]" -o centrosud.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=12.3,38,17.3,40]" -o sud.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=12,36.5,16.5,38]" -o sicilia.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=17.3,39.5,19,41]" -o puglia.osm &
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station|halt][bbox=8,38.7,10,41.3]" -o sardegna.osm

diff --git a/application/resources/stations/generatelist.xq b/application/resources/stations/generatelist.xq
index 99bdeff..719c9d8 100644 (file)
--- a/application/resources/stations/generatelist.xq
+++ b/application/resources/stations/generatelist.xq
@@ -1,6 +1,7 @@
 <stations>
 {
-for $doc in ('nordovest.osm',
+for $doc in ('nord.osm',
+             'nordovest.osm',
              'nordest.osm',
              'liguria.osm',
              'centronord.osm', 

diff --git a/application/resources/stations/generateunclassifiedlist.xq b/application/resources/stations/generateunclassifiedlist.xq
index 7034121..cee75ae 100644 (file)
--- a/application/resources/stations/generateunclassifiedlist.xq
+++ b/application/resources/stations/generateunclassifiedlist.xq
@@ -1,6 +1,7 @@
 <stations>
 {
-for $doc in ('nordovest.osm', 
+for $doc in ('nord.osm',
+             'nordovest.osm', 
              'nordest.osm',
             'liguria.osm',
              'centronord.osm', 

diff --git a/application/resources/stations/stations.qpl b/application/resources/stations/stations.qpl
index b6059b6..f4a29bb 100644 (file)
--- a/application/resources/stations/stations.qpl
+++ b/application/resources/stations/stations.qpl
@@ -1,5 +1,45 @@
 <stations>
     <station>
+        <pos>46.0150464,9.2863808</pos>
+        <name>Varenna Esino</name>
+    </station>
+    <station>
+        <pos>46.1670575,9.872934</pos>
+        <name>Sondrio</name>
+    </station>
+    <station>
+        <pos>46.0394838,9.3027464</pos>
+        <name>Bellano-Tartavalle Terme</name>
+    </station>
+    <station>
+        <pos>46.0776922,9.3060296</pos>
+        <name>Dervio</name>
+    </station>
+    <station>
+        <pos>46.1027069,9.3191032</pos>
+        <name>Dorio</name>
+    </station>
+    <station>
+        <pos>46.1247216,9.3507195</pos>
+        <name>Piona</name>
+    </station>
+    <station>
+        <pos>46.1380192,9.3752244</pos>
+        <name>Colico</name>
+    </station>
+    <station>
+        <pos>46.0128268,13.1097586</pos>
+        <name>Basiliano</name>
+    </station>
+    <station>
+        <pos>46.0558379,13.241962</pos>
+        <name>Udine</name>
+    </station>
+    <station>
+        <pos>46.1591846,13.2349088</pos>
+        <name>Tricesimo-San Pelagio</name>
+    </station>
+    <station>
         <pos>45.4844717,9.1875734</pos>
         <name>Milano Porta Garibaldi</name>
     </station>
@@ -1396,6 +1436,30 @@
         <name>Pistoia</name>
     </station>
     <station>
+        <pos>42.1025372,13.8763035</pos>
+        <name>Pratola Peligna</name>
+    </station>
+    <station>
+        <pos>42.1724083,13.8260984</pos>
+        <name>Popoli-Vittorito</name>
+    </station>
+    <station>
+        <pos>42.2543472,13.9515503</pos>
+        <name>Piano d'Orta-Bolognano</name>
+    </station>
+    <station>
+        <pos>42.2673191,13.9985009</pos>
+        <name>Scafa-San Valentino-Caramanico</name>
+    </station>
+    <station>
+        <pos>42.2869596,14.0194697</pos>
+        <name>Alanno</name>
+    </station>
+    <station>
+        <pos>42.3056658,14.0608579</pos>
+        <name>Manoppello</name>
+    </station>
+    <station>
         <pos>42.3568765,14.138094</pos>
         <name>Chieti</name>
     </station>
@@ -1404,6 +1468,10 @@
         <name>Riccione</name>
     </station>
     <station>
+        <pos>42.0608113,13.9072084</pos>
+        <name>Sulmona</name>
+    </station>
+    <station>
         <pos>43.8811902,10.7713842</pos>
         <name>Montecatini Centro</name>
     </station>
@@ -1416,6 +1484,14 @@
         <name>Montale Agliana</name>
     </station>
     <station>
+        <pos>42.3049207,14.4404745</pos>
+        <name>San Vito-Lanciano</name>
+    </station>
+    <station>
+        <pos>42.1686483,14.6956548</pos>
+        <name>Porto di Vasto</name>
+    </station>
+    <station>
         <pos>43.8341544,10.5707132</pos>
         <name>Tassignano-Capannori</name>
     </station>
@@ -1432,6 +1508,10 @@
         <name>Massarosa Bozzano</name>
     </station>
     <station>
+        <pos>42.4212545,14.2879084</pos>
+        <name>Francavilla al Mare</name>
+    </station>
+    <station>
         <pos>43.7767141,11.2477468</pos>
         <name>Firenze S.M.N.</name>
     </station>
@@ -1440,6 +1520,14 @@
         <name>Follonica</name>
     </station>
     <station>
+        <pos>42.4443322,14.2070413</pos>
+        <name>Pescara San Marco</name>
+    </station>
+    <station>
+        <pos>42.226587,13.9045929</pos>
+        <name>Tocco da Casauria</name>
+    </station>
+    <station>
         <pos>43.8792551,10.7807</pos>
         <name>Montecatini Terme-Monsummano</name>
     </station>
@@ -1448,10 +1536,22 @@
         <name>Migliarino Pisano</name>
     </station>
     <station>
+        <pos>42.6605021,13.71582</pos>
+        <name>Teramo</name>
+    </station>
+    <station>
+        <pos>42.0382929,13.9214664</pos>
+        <name>Sulmona - Introdacqua</name>
+    </station>
+    <station>
         <pos>42.3510045,13.3849121</pos>
         <name>L'Aquila</name>
     </station>
     <station>
+        <pos>42.0798896,14.7393824</pos>
+        <name>Vasto S.Salvo</name>
+    </station>
+    <station>
         <pos>42.7672917,11.1065103</pos>
         <name>Grosseto</name>
     </station>
@@ -1472,6 +1572,18 @@
         <name>Pineto-Atri</name>
     </station>
     <station>
+        <pos>42.2440739,13.9375368</pos>
+        <name>Torre dei Passeri</name>
+    </station>
+    <station>
+        <pos>42.7103293,13.9085391</pos>
+        <name>Mosciano Sant'Angelo</name>
+    </station>
+    <station>
+        <pos>42.0006497,14.992693</pos>
+        <name>Termoli</name>
+    </station>
+    <station>
         <pos>42.6392689,11.1344053</pos>
         <name>Albarese</name>
     </station>
@@ -1480,6 +1592,14 @@
         <name>Falconara Marittima</name>
     </station>
     <station>
+        <pos>42.1936954,14.6329939</pos>
+        <name>Casalbordino</name>
+    </station>
+    <station>
+        <pos>42.2368098,14.5227428</pos>
+        <name>Fossaceisa</name>
+    </station>
+    <station>
         <pos>41.9008151,12.5023317</pos>
         <name>Roma Termini</name>
     </station>
@@ -1528,6 +1648,10 @@
         <name>Bari Centrale</name>
     </station>
     <station>
+        <pos>41.9573852,15.0424164</pos>
+        <name>Campomarino</name>
+    </station>
+    <station>
         <pos>41.3466115,15.9959686</pos>
         <name>Candida</name>
     </station>