Use ontologies rail-de rail-dk, and fix label habour as such (not station).

1 files changed, 22 insertions, 20 deletions

diff --git a/data/2014/bruxelles-07.ttl b/data/2014/bruxelles-07.ttl
index 6c5a922..143337e 100644
--- a/data/2014/bruxelles-07.ttl
+++ b/data/2014/bruxelles-07.ttl
@@ -17,6 +17,8 @@
 @prefix pcx:      <http://data.jones.dk/hacks/pcx#> .
 @prefix prog:     <http://purl.org/prog/> .
 @prefix rail:     <http://ontologi.es/rail/vocab#> .
+@prefix rail-de:  <http://data.jones.dk/rail/de#> .
+@prefix rail-dk:  <http://data.jones.dk/rail/dk#> .
 #FIXME: create railx - rail extension defining Trainbus
 #TODO: get railx adopted into rail
 @prefix railx:    <http://data.jones.dk/hacks/railx#> .
@@ -120,7 +122,7 @@
 		travelx:occur_at [ travelx:platform_at :harbour-orø ]
 	], [ a travelx:VehicleStop ;
 		transit:arrivalTime "16:50" ;
-		travelx:occur_at [ travelx:platform_at :station-holbæk ]
+		travelx:occur_at [ travelx:platform_at :harbour-holbæk ]
 	] .
 
 :offer-dsb-holbæk-roskilde a gr:Offering ;
@@ -142,10 +144,10 @@
 	tio:operatedBy :org-dsb ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "17:18" ;
-		rail:occur_at [ rail:platform_at :station-holbæk ]
+		rail:occur_at [ rail:platform_at rail-dk:station-holbæk ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "17:43" ;
-		rail:occur_at [ rail:platform_at :station-hvalsø ]
+		rail:occur_at [ rail:platform_at rail-dk:station-hvalsø ]
 	] .
 
 :train-hvalsø-roskilde a rail:Train ;
@@ -153,10 +155,10 @@
 	tio:operatedBy :org-dsb ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "17:49" ;
-		rail:occur_at [ rail:platform_at :station-hvalsø ]
+		rail:occur_at [ rail:platform_at rail-dk:station-hvalsø ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "18:02" ;
-		rail:occur_at [ rail:platform_at :station-højetåstrup ]
+		rail:occur_at [ rail:platform_at rail-dk:station-høje-taastrup ]
 	] .
 
 :offer-db-roskilde-gütersloh a gr:Offering ;
@@ -182,10 +184,10 @@
 	tio:operatedBy :org-db ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "19:11" ;
-		rail:occur_at [ rail:platform_at :station-roskilde ]
+		rail:occur_at [ rail:platform_at rail-dk:station-roskilde ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "03:55" ;
-		rail:occur_at [ rail:platform_at :station-bielefeld ]
+		rail:occur_at [ rail:platform_at rail-de:station-bielefeld ]
 	] .
 
 :sleep-0705 a event:Event ;
@@ -203,10 +205,10 @@
 	tio:operatedBy :org-db ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "04:56" ;
-		rail:occur_at [ rail:platform_at :station-bielefeld ]
+		rail:occur_at [ rail:platform_at rail-de:station-bielefeld ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "05:04" ;
-		rail:occur_at [ rail:platform_at :station-gütersloh ]
+		rail:occur_at [ rail:platform_at rail-de:station-gütersloh ]
 	] .
 
 :sleep-0706 a event:Event ;
@@ -280,10 +282,10 @@
 	tio:operatedBy :org-db ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "08:52" ;
-		rail:occur_at [ rail:platform_at :station-gütersloh ]
+		rail:occur_at [ rail:platform_at rail-de:station-gütersloh ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "11:15" ;
-		rail:occur_at [ rail:platform_at :station-cologne ]
+		rail:occur_at [ rail:platform_at rail-de:station-cologne ]
 	] .
 
 :train-cologne-brussels a rail:Train ;
@@ -291,7 +293,7 @@
 	tio:operatedBy :org-db ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "11:43" ;
-		rail:occur_at [ rail:platform_at :station-cologne ]
+		rail:occur_at [ rail:platform_at rail-de:station-cologne ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "13:35" ;
 		rail:occur_at [ rail:platform_at :station-brussels ]
@@ -578,7 +580,7 @@
 		travelx:occur_at [ travelx:platform_at :busstop-odense ]
 	], [ a travelx:VehicleStop ;
 		transit:arrivalTime "15:10" ;
-		travelx:occur_at [ travelx:platform_at :station-odense ]
+		travelx:occur_at [ travelx:platform_at rail-dk:station-odense ]
 	] .
 
 :train-odense-roskilde
@@ -586,10 +588,10 @@
 	tio:operatedBy :org-dsb ;
 	rail:has_stop [ a rail:TrainStop ;
 #		transit:departureTime "08:09" ;
-		rail:occur_at [ rail:platform_at :station-odense ]
+		rail:occur_at [ rail:platform_at rail-dk:station-odense ]
 	], [ a rail:TrainStop ;
 #		transit:arrivalTime "16:55" ;
-		rail:occur_at [ rail:platform_at :station-roskilde ]
+		rail:occur_at [ rail:platform_at rail-dk:station-roskilde ]
 	] .
 
 :train-roskilde-hvalsø a rail:Train ;
@@ -597,10 +599,10 @@
 	tio:operatedBy :org-dsb ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "17:03" ;
-		rail:occur_at [ rail:platform_at :station-roskilde ]
+		rail:occur_at [ rail:platform_at rail-dk:station-roskilde ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "17:18" ;
-		rail:occur_at [ rail:platform_at :station-hvalsø ]
+		rail:occur_at [ rail:platform_at rail-dk:station-hvalsø ]
 	] .
 
 :trainbus-hvalsø-holbæk a railx:TrainBus ;
@@ -608,10 +610,10 @@
 	tio:operatedBy :org-dsb ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "17:25" ;
-		rail:occur_at [ rail:platform_at :station-hvalsø ]
+		rail:occur_at [ rail:platform_at rail-dk:station-hvalsø ]
 	], [ a rail:TrainStop ;
 		transit:arrivalTime "17:50" ;
-		rail:occur_at [ rail:platform_at :station-holbæk ]
+		rail:occur_at [ rail:platform_at rail-dk:station-holbæk ]
 	] .
 
 :ferry-holbæk-orø a travel:Ferry ;
@@ -622,7 +624,7 @@
 		travelx:occur_at [ travelx:platform_at :harbour-holbæk ]
 	], [ a travelx:VehicleStop ;
 		transit:arrivalTime "18:35" ;
-		travelx:occur_at [ travelx:platform_at :station-orø ]
+		travelx:occur_at [ travelx:platform_at :harbour-orø ]
 	] .
 
 :coverage-jonas a pc:Contract ;