Use rail/dk/train/Togbus56061 and rail/de/train/ICE552.

2 files changed, 26 insertions, 32 deletions

diff --git a/data/2014/bruxelles-05-2.ttl b/data/2014/bruxelles-05-2.ttl
index ff0f986..4c8cef5 100644
--- a/data/2014/bruxelles-05-2.ttl
+++ b/data/2014/bruxelles-05-2.ttl
@@ -1,6 +1,7 @@
 @base             <http://data.jones.dk/2014/bruxelles-05-2> .
 @prefix :         <#> .
 @prefix dbpedia:  <http://dbpedia.org/resource/> .
+@prefix dc: <http://purl.org/dc/terms/> .
 @prefix dcterms:  <http://purl.org/dc/terms/> .
 @prefix event:    <http://purl.org/NET/c4dm/event.owl#>.
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
@@ -20,6 +21,10 @@
 #FIXME: create railx - rail extension defining Trainbus
 #TODO: get railx adopted into rail
 @prefix railx:    <http://data.jones.dk/hacks/railx#> .
+@prefix rail-de: <http://data.jones.dk/rail/de#> .
+@prefix rail-de-train: <http://data.jones.dk/rail/de/train/> .
+@prefix rail-dk: <http://data.jones.dk/rail/dk#> .
+@prefix rail-dk-train: <http://data.jones.dk/rail/dk/train/> .
 @prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix skos:     <http://www.w3.org/2004/02/skos/core#> .
 @prefix service:  <http://purl.org/ontology/service#> .
@@ -290,20 +295,12 @@
 	] .
 
 :train-hannover-bielefeld a rail:Train ;
-	rdfs:label "ICE 542"@en,
-		"ICE 552"@en ;
-	tio:operatedBy :org-db ;
-	rail:has_stop [ a rail:TrainStop ;
-		transit:departureTime "20:31" ;
-		rail:occur_at [ rail:platform_at :station-hannover ]
-	], [ a rail:TrainStop ;
-		transit:arrivalTime "21:20" ;
-		rail:occur_at [ rail:platform_at :station-bielefeld ]
-	] .
+	tio:from rail-de:station-hannover ;
+	tio:to rail-de:station-bielefeld ;
+	dc:isPartOf rail-de-train:ICE552 .
 
 :train-bielefeld-gutersloh a rail:Train ;
-	rdfs:label "RE 10638"@en,
-		"ICE 552"@en ;
+	rdfs:label "RE 10638"@en ;
 	tio:operatedBy :org-db ;
 	rail:has_stop [ a rail:TrainStop ;
 		transit:departureTime "21:58" ;
@@ -533,15 +530,9 @@
 	] .
 
 :trainbus-hvalsø-holbæk a railx:TrainBus ;
-	rdfs:label "Bus56061"@en ;
-	tio:operatedBy :org-dsb ;
-	rail:has_stop [ a rail:TrainStop ;
-		transit:departureTime "21:13" ;
-		rail:occur_at [ rail:platform_at :station-hvalsø ]
-	], [ a rail:TrainStop ;
-		transit:arrivalTime "21:38" ;
-		rail:occur_at [ rail:platform_at :station-holbæk ]
-	] .
+	tio:from rail-dk:station-hvalsø ;
+	tio:to rail-dk:station-holbæk ;
+	dc:isPartOf rail-dk-train:Togbus56061 .
 
 :ferry-holbæk-orø a travel:Ferry ;
 	rdfs:label "Orøfærgen"@en ;
diff --git a/data/2014/europe-08.ttl b/data/2014/europe-08.ttl
index 0954713..4cba4e8 100644
--- a/data/2014/europe-08.ttl
+++ b/data/2014/europe-08.ttl
@@ -1,6 +1,7 @@
 @base             <http://data.jones.dk/2014/europe-08> .
 @prefix :         <#> .
 @prefix dbpedia:  <http://dbpedia.org/resource/> .
+@prefix dc: <http://purl.org/dc/terms/> .
 @prefix dcterms:  <http://purl.org/dc/terms/> .
 @prefix event:    <http://purl.org/NET/c4dm/event.owl#>.
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
@@ -19,8 +20,11 @@
 @prefix rail:     <http://ontologi.es/rail/vocab#> .
 #FIXME: create railx - rail extension defining Trainbus
 #TODO: get railx adopted into rail
-@prefix railx:    <http://data.jones.dk/hacks/railx#> .
+@prefix rail-de: <http://data.jones.dk/rail/de#> .
 @prefix rail-de-train: <http://data.jones.dk/rail/de/train/> .
+@prefix rail-dk: <http://data.jones.dk/rail/dk#> .
+@prefix rail-dk-train: <http://data.jones.dk/rail/dk/train/> .
+@prefix railx:    <http://data.jones.dk/hacks/railx#> .
 @prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix skos:     <http://www.w3.org/2004/02/skos/core#> .
 @prefix service:  <http://purl.org/ontology/service#> .
@@ -96,7 +100,7 @@
 		tio:accessTo :train-århus-fredericia,
 			:train-fredericia-hamburg,
 			:train-hamburg-hannover,
-			rail-de-train:ICE552,
+			:train-hannover-bielefeld,
 			:train-bielefeld-gutersloh
 	] .
 
@@ -133,6 +137,11 @@
 		rail:occur_at [ rail:platform_at :station-hannover ]
 	] .
 
+:train-hannover-bielefeld a rail:Train ;
+	tio:from rail-de:station-hannover ;
+	tio:to rail-de:station-bielefeld ;
+	dc:isPartOf rail-de-train:ICE552 .
+
 :train-bielefeld-gutersloh a rail:Train ;
 	rdfs:label "RE 10638"@en ;
 	tio:operatedBy :org-db ;
@@ -515,15 +524,9 @@
 	] .
 
 :trainbus-hvalsø-holbæk a railx:TrainBus ;
-	rdfs:label "Togbus 56061"@en ;
-	tio:operatedBy :org-dsb ;
-	rail:has_stop [ a rail:TrainStop ;
-		transit:departureTime "21:13" ;
-		rail:occur_at [ rail:platform_at :station-hvalsø ]
-	], [ a rail:TrainStop ;
-		transit:arrivalTime "21:38" ;
-		rail:occur_at [ rail:platform_at :station-holbæk ]
-	] .
+	tio:from rail-dk:station-hvalsø ;
+	tio:to rail-dk:station-holbæk ;
+	dc:isPartOf rail-dk-train:Togbus56061 .
 
 :ferry-holbæk-orø a travel:Ferry ;
 	rdfs:label "Orøfærgen"@en ;