From 034ea7f79dd95e35d81e92c9d55ad0cc744d743d Mon Sep 17 00:00:00 2001
From: Luciano Montanaro <mikelima@cirulla.net>
Date: Fri, 24 Jun 2011 02:17:46 +0200
Subject: [PATCH] Added "halts" in addition to stations

- Modified scripts to separately download data about halts (minor
  stations)
- Regenerated station list
---
 application/resources/stations/downloaddata.sh |   31 +++++---
 application/resources/stations/generatelist.xq |   33 +++++---
 application/resources/stations/stations.qpl    |  100 +++++++++++++++++++++---
 3 files changed, 134 insertions(+), 30 deletions(-)

diff --git a/application/resources/stations/downloaddata.sh b/application/resources/stations/downloaddata.sh
index 894692f..3622ad6 100755
--- a/application/resources/stations/downloaddata.sh
+++ b/application/resources/stations/downloaddata.sh
@@ -1,11 +1,22 @@
 #! /bin/sh
-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
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=station][bbox=8,46,14,47]" -o nord.osm
+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=halt][bbox=8,46,14,47]" -o h-nord.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=6.7,44,10,46]" -o h-nordovest.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=10,44,14,46]" -o h-nordest.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=7.5,43.5,8.5,44]" -o h-liguria.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=10,42,15,44]" -o h-centronord.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=12,40,17,42]" -o h-centrosud.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=12.3,38,17.3,40]" -o h-sud.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=12,36.5,16.5,38]" -o h-sicilia.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=17.3,39.5,19,41]" -o h-puglia.osm
+curl --location --globoff "http://jxapi.openstreetmap.org/xapi/api/0.6/node[railway=halt][bbox=8,38.7,10,41.3]" -o h-sardegna.osm
diff --git a/application/resources/stations/generatelist.xq b/application/resources/stations/generatelist.xq
index 719c9d8..68126df 100644
--- a/application/resources/stations/generatelist.xq
+++ b/application/resources/stations/generatelist.xq
@@ -1,17 +1,30 @@
 <stations>
 {
-for $doc in ('nord.osm',
-             'nordovest.osm',
-             'nordest.osm',
-             'liguria.osm',
-             'centronord.osm', 
-	     'centrosud.osm', 
-	     'sud.osm', 
-	     'sicilia.osm', 
-	     'puglia.osm', 
-	     'sardegna.osm')
+for $doc in (
+	'nord.osm',
+	'nordovest.osm',
+	'nordest.osm',
+	'liguria.osm',
+	'centronord.osm', 
+	'centrosud.osm', 
+	'sud.osm', 
+	'sicilia.osm', 
+	'puglia.osm', 
+	'sardegna.osm',
+	'h-nord.osm',
+	'h-nordovest.osm',
+	'h-nordest.osm',
+	'h-liguria.osm',
+	'h-centronord.osm', 
+	'h-centrosud.osm', 
+	'h-sud.osm', 
+	'h-sicilia.osm', 
+	'h-puglia.osm', 
+	'h-sardegna.osm')
 for $node in doc($doc)//node
 where $node/tag[@k='name'] and (
+fn:not(fn:exists($node//tag[@k='disused'])) or fn:contains($node//tag[@k='disused']/@v, 'no') 
+) and (
 $node/tag[@k='operator'] and (
 fn:contains($node//tag[@k='operator']/@v, 'RFI') or 
 fn:contains($node//tag[@k='operator']/@v, 'Centostazioni') or 
diff --git a/application/resources/stations/stations.qpl b/application/resources/stations/stations.qpl
index f4a29bb..4f330c6 100644
--- a/application/resources/stations/stations.qpl
+++ b/application/resources/stations/stations.qpl
@@ -1340,14 +1340,6 @@
         <name>Senigallia</name>
     </station>
     <station>
-        <pos>43.610086,13.4557096</pos>
-        <name>Ancona Torrette</name>
-    </station>
-    <station>
-        <pos>43.6167313,13.430454</pos>
-        <name>Palombina</name>
-    </station>
-    <station>
         <pos>43.6512706,13.3465974</pos>
         <name>Montemarciano</name>
     </station>
@@ -1356,7 +1348,15 @@
         <name>Marzocca</name>
     </station>
     <station>
-        <pos>43.8372051,10.5061017</pos>
+        <pos>43.3090115,13.7257203</pos>
+        <name>Civitanova Marche-Montegranaro</name>
+    </station>
+    <station>
+        <pos>43.5747668,13.5234209</pos>
+        <name>Varano</name>
+    </station>
+    <station>
+        <pos>43.8371478,10.5061393</pos>
         <name>Lucca</name>
     </station>
     <station>
@@ -1524,6 +1524,14 @@
         <name>Pescara San Marco</name>
     </station>
     <station>
+        <pos>43.2816309,13.4776649</pos>
+        <name>Piediripa - Corridonia</name>
+    </station>
+    <station>
+        <pos>43.2930393,13.4552447</pos>
+        <name>Macerata</name>
+    </station>
+    <station>
         <pos>42.226587,13.9045929</pos>
         <name>Tocco da Casauria</name>
     </station>
@@ -1680,6 +1688,10 @@
         <name>Napoli Centrale</name>
     </station>
     <station>
+        <pos>38.1845417,15.5616609</pos>
+        <name>Messina Centrale</name>
+    </station>
+    <station>
         <pos>38.1876129,15.5637552</pos>
         <name>Messina Marittima</name>
     </station>
@@ -1788,7 +1800,7 @@
         <name>Olbia</name>
     </station>
     <station>
-        <pos>39.215934,9.1081114</pos>
+        <pos>39.2159562,9.1080056</pos>
         <name>Cagliari</name>
     </station>
     <station>
@@ -1843,4 +1855,72 @@
         <pos>40.5749011,8.3221206</pos>
         <name>Alghero-Sant'Agostino</name>
     </station>
+    <station>
+        <pos>44.1090501,8.2422996</pos>
+        <name>Borghetto S S</name>
+    </station>
+    <station>
+        <pos>44.1183256,9.8640868</pos>
+        <name>Cà dei Boschetti</name>
+    </station>
+    <station>
+        <pos>44.1090501,8.2422996</pos>
+        <name>Borghetto S S</name>
+    </station>
+    <station>
+        <pos>44.1183256,9.8640868</pos>
+        <name>Cà dei Boschetti</name>
+    </station>
+    <station>
+        <pos>45.8723294,13.4837315</pos>
+        <name>Sagrado</name>
+    </station>
+    <station>
+        <pos>45.9330617,13.2877533</pos>
+        <name>Santa Maria la Longa</name>
+    </station>
+    <station>
+        <pos>45.953641,13.2749904</pos>
+        <name>Santo Stefano Udinese</name>
+    </station>
+    <station>
+        <pos>45.8872739,13.3047602</pos>
+        <name>Sevegliano</name>
+    </station>
+    <station>
+        <pos>45.2574788,10.3884251</pos>
+        <name>Remedello Sotto</name>
+    </station>
+    <station>
+        <pos>44.5509122,11.1968423</pos>
+        <name>Anzola</name>
+    </station>
+    <station>
+        <pos>44.0745317,10.0161998</pos>
+        <name>Luni</name>
+    </station>
+    <station>
+        <pos>43.870533,7.5529913</pos>
+        <name>Airole</name>
+    </station>
+    <station>
+        <pos>43.610086,13.4557096</pos>
+        <name>Ancona Torrette</name>
+    </station>
+    <station>
+        <pos>43.6168579,13.4300751</pos>
+        <name>Palombina</name>
+    </station>
+    <station>
+        <pos>43.2893152,13.6469827</pos>
+        <name>Montecosaro Scalo</name>
+    </station>
+    <station>
+        <pos>43.6072738,13.3574688</pos>
+        <name>Castelferretti</name>
+    </station>
+    <station>
+        <pos>43.6263443,13.3815002</pos>
+        <name>Falconara Stadio</name>
+    </station>
 </stations>
-- 
1.7.9.5