Drop foaf:primaryTopic from routes and trains, and fix link against routes.

7 files changed, 13 insertions, 30 deletions

diff --git a/data/rail/routes/de/ICE10.ttl b/data/rail/routes/de/ICE10.ttl
index 0e1d904..be5a332 100644
--- a/data/rail/routes/de/ICE10.ttl
+++ b/data/rail/routes/de/ICE10.ttl
@@ -8,9 +8,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
-<> foaf:primaryTopic :route .
-
-:route a rail:Route ;
+<> a rail:Route ;
 	foaf:name "Berlin to Hamm Junction"@en ;
 	foaf:page <https://en.wikipedia.org/wiki/List_of_Intercity-Express_lines#10_.E2.80.93_12> ;
 	rail:elr "ICE10"@zxx ;
diff --git a/data/rail/routes/de/ICE10a.ttl b/data/rail/routes/de/ICE10a.ttl
index c4201cf..29485be 100644
--- a/data/rail/routes/de/ICE10a.ttl
+++ b/data/rail/routes/de/ICE10a.ttl
@@ -9,9 +9,7 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix void: <http://rdfs.org/ns/void#> .
 
-<> foaf:primaryTopic :route .
-
-:route a rail:Route ;
+<> a rail:Route ;
 	foaf:name "Berlin To Cologne Line"@en ;
 	foaf:page <https://en.wikipedia.org/wiki/List_of_Intercity-Express_lines#10_.E2.80.93_12> ;
 	rail:elr "ICE10a"@zxx ;
diff --git a/data/rail/routes/de/ICE10b.ttl b/data/rail/routes/de/ICE10b.ttl
index 4e4bc3c..18da143 100644
--- a/data/rail/routes/de/ICE10b.ttl
+++ b/data/rail/routes/de/ICE10b.ttl
@@ -8,9 +8,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
-<> foaf:primaryTopic :route .
-
-:route a rail:Route ;
+<> a rail:Route ;
 	foaf:name "Berlin To Bonn Line"@en ;
 	foaf:page <https://en.wikipedia.org/wiki/List_of_Intercity-Express_lines#10_.E2.80.93_12> ;
 	rail:elr "ICE10b"@zxx ;
diff --git a/data/rail/routes/dk/TIB5.ttl b/data/rail/routes/dk/TIB5.ttl
index 58afaf8..b1841c5 100644
--- a/data/rail/routes/dk/TIB5.ttl
+++ b/data/rail/routes/dk/TIB5.ttl
@@ -8,9 +8,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
-<> foaf:primaryTopic :route .
-
-:route a rail:Route ;
+<> a rail:Route ;
 	foaf:name "Nordvestbanen"@en ;
 	foaf:page <https://en.wikipedia.org/wiki/List_of_railway_lines_in_Denmark#Banedanmark_lines> ;
 	rail:elr "Strækning5"@zxx ;
diff --git a/data/rail/trains/de/ICE542.ttl b/data/rail/trains/de/ICE542.ttl
index 2f58bac..10c98d7 100644
--- a/data/rail/trains/de/ICE542.ttl
+++ b/data/rail/trains/de/ICE542.ttl
@@ -4,16 +4,14 @@
 #FIXME: add "rail:Train rdfs:subClassOf transit:Schedule"
 @prefix rail: <http://ontologi.es/rail/vocab#> .
 @prefix rail-de: <http://data.jones.dk/org/db#> .
-@prefix rail-de-ice10a: <http://data.jones.dk/rail/routes/de/ICE10a#> .
+@prefix rail-de-route: <http://data.jones.dk/rail/routes/de/> .
 @prefix tio: <http://purl.org/tio/ns#> .
 @prefix transit: <http://vocab.org/transit/terms/> .
 
-<> foaf:primaryTopic :service .
-
-:service a rail:Train ;
+<> a rail:Train ;
 	foaf:name "Berlin To Bonn Service"@en ;
 	rail:elr "ICE542"@zxx ;
-	rail:follows_route rail-de-ice10a:route ;
+	rail:follows_route rail-de-route:ICE10a ;
 	rail:follows_schedule :schedule ;
 	rail:has_stop :stop-berlin-ost,
 		:stop-berlin ,
diff --git a/data/rail/trains/de/ICE552.ttl b/data/rail/trains/de/ICE552.ttl
index bb0f5a3..7bca674 100644
--- a/data/rail/trains/de/ICE552.ttl
+++ b/data/rail/trains/de/ICE552.ttl
@@ -4,16 +4,14 @@
 #FIXME: add "rail:Train rdfs:subClassOf transit:Schedule"
 @prefix rail: <http://ontologi.es/rail/vocab#> .
 @prefix rail-de: <http://data.jones.dk/org/db#> .
-@prefix rail-de-ice10b: <http://data.jones.dk/rail/routes/de/ICE10b#> .
+@prefix rail-de-route: <http://data.jones.dk/rail/routes/de/> .
 @prefix tio: <http://purl.org/tio/ns#> .
 @prefix transit: <http://vocab.org/transit/terms/> .
 
-<> foaf:primaryTopic :service .
-
-:service a rail:Train ;
+<> a rail:Train ;
 	foaf:name "Berlin To Bonn Service"@en ;
 	rail:elr "ICE552"@zxx ;
-	rail:follows_route rail-de-ice10b:route ;
+	rail:follows_route rail-de-route:ICE10b ;
 	rail:follows_schedule :schedule ;
 	rail:has_stop :stop-berlin-ost,
 		:stop-berlin ,
diff --git a/data/rail/trains/dk/Togbus56061.ttl b/data/rail/trains/dk/Togbus56061.ttl
index 291b40b..91b93f4 100644
--- a/data/rail/trains/dk/Togbus56061.ttl
+++ b/data/rail/trains/dk/Togbus56061.ttl
@@ -5,24 +5,19 @@
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rail: <http://ontologi.es/rail/vocab#> .
 @prefix rail-dk: <http://data.jones.dk/org/dsb#> .
+@prefix rail-dk-route: <http://data.jones.dk/rail/routes/dk/> .
 @prefix tio: <http://purl.org/tio/ns#> .
 @prefix transit: <http://vocab.org/transit/terms/> .
 
-<> foaf:primaryTopic :service .
-
-:service a rail:Train ;
+<> a rail:Train ;
 	foaf:name "Roskilde To Kalundborg Service"@en ;
 	rail:elr "Togbus56061"@zxx ;
-	rail:follows_route :route-tib5 ;
+	rail:follows_route rail-dk-route:TIB5 ;
 	rail:follows_schedule :schedule ;
 	rail:has_stop :stop-hvalsø,
 		:stop-holbæk ;
 	tio:operatedBy rail-dk:org .
 
-:route-tib5 a rail:Route ;
-	foaf:name "Nordvestbanen"@en ;
-	owl:sameAs <http://data.jones.dk/rail/routes/dk/TIB5#route> .
-
 :schedule a rail:TrainSchedule .
 
 :stop-hvalsø a rail:TrainStop ;