Replace travelx: with tio: terms, and drop unused ontologies.

1 files changed, 28 insertions, 40 deletions

diff --git a/data/2011/cambridge.ttl b/data/2011/cambridge.ttl
index 50a2153..873f698 100644
--- a/data/2011/cambridge.ttl
+++ b/data/2011/cambridge.ttl
@@ -4,35 +4,19 @@
 @prefix dcterms:  <http://purl.org/dc/terms/> .
 @prefix event:    <http://purl.org/NET/c4dm/event.owl#>.
 @prefix foaf:     <http://xmlns.com/foaf/0.1/> .
-@prefix geo:      <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix gr:       <http://purl.org/goodrelations/v1#> .
 #FIXME: create grx - gr extension allowing unit for non-range price
 #TODO: get grx adopted into gr
 @prefix grx:      <http://data.jones.dk/hacks/grx#> .
 @prefix org:      <http://www.w3.org/ns/org#> .
 @prefix owl:      <http://www.w3.org/2002/07/owl#> .
-@prefix payment:  <http://reference.data.gov.uk/def/payment#> .
-@prefix pc:       <http://purl.org/procurement/public-contracts#> .
-#FIXME: create pcx - pc extension allowing unit-based exact price
-@prefix pcx:      <http://data.jones.dk/hacks/pcx#> .
 @prefix prog:     <http://purl.org/prog/> .
 @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 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#> .
-@prefix spacerel: <http://data.ordnancesurvey.co.uk/ontology/spatialrelations/> .
 @prefix tio:      <http://purl.org/tio/ns#> .
 @prefix tl:       <http://purl.org/NET/c4dm/timeline.owl#> .
 @prefix unit:     <http://qudt.org/vocab/unit#> .
-@prefix transit:  <http://vocab.org/transit/terms/> .
-@prefix travel:   <http://www.co-ode.org/roberts/travel.owl#> .
-#@prefix travel:   <http://www.cs.man.ac.uk/~stevensr/ontology/c23.owl#> .
-#FIXME: create travelx - travel extension bridging transit and tio with vehicle
-#TODO: get travelx adopted into travel or create e.g. vehicle
-@prefix travelx:  <http://data.jones.dk/hacks/travelx#> .
 @prefix xsd:      <http://www.w3.org/2001/XMLSchema#> .
 
 <> foaf:primaryTopic :trip .
@@ -99,23 +83,25 @@
 		tio:accessTo :flight-copenhagen-london
 	] .
 
-:flight-copenhagen-london a travelx:aeroplane ;
+:flight-copenhagen-london a tio:Flight ;
 	tio:flightNo "EZY3468" ;
 	tio:operatedBy :org-easyjet ;
-	travelx:has_stop [ a travelx:VehicleStop ;
-		transit:departureTime "19:45" ;
-		travelx:occur_at [ travelx:gate_at :airport-copenhagen ]
-	], [ a travelx:VehicleStop ;
-		transit:arrivalTime "22:35" ;
-		travelx:occur_at [ travelx:gate_at :airport-london-stanstead ]
+	tio:from [ a tio:Stop ;
+		tio:at :airport-copenhagen ;
+		tio:departs "2011-02-19T21:45:00+01:00"^^xsd:dateTime
+	] ;
+	tio:to [ a tio:Stop ;
+		tio:at :airport-london-stanstead ;
+		tio:arrives "2011-02-19T22:35:00+00:00"^^xsd:dateTime
 	] .
 
-:car-london-cambridge a travelx:Car ;
+:car-london-cambridge a tio:TransportationService ;
 	rdfs:label "Private car"@en ;
-	travelx:has_stop [ a travelx:VehicleStop ;
-		travelx:occur_at [ travelx:parking_lot_at :airport-london-stanstead ]
-	], [ a travelx:VehicleStop ;
-		travelx:occur_at [ travelx:garage_at :accomodation-cambridge ]
+	tio:from [ a tio:Stop ;
+		tio:at :airport-london-stanstead
+	] ;
+	tio:to [ a tio:Stop ;
+		tio:at :accomodation-cambridge
 	] .
 
 :sleep-0220 a event:Event ;
@@ -281,12 +267,13 @@
 		tl:end "2011-02-28T16:25:00+01:00"^^xsd:dateTime
 	] .
 
-:car-cambridge-london a travelx:Car ;
+:car-cambridge-london a tio:TransportationService ;
 	rdfs:label "Private car"@en ;
-	travelx:has_stop [ a travelx:VehicleStop ;
-		travelx:occur_at [ travelx:garage_at :accomodation-cambridge ]
-	], [ a travelx:VehicleStop ;
-		travelx:occur_at [ travelx:parking_lot_at :airport-london-stanstead ]
+	tio:from [ a tio:Stop ;
+		tio:at :accomodation-cambridge
+	] ;
+	tio:to [ a tio:Stop ;
+		tio:at :airport-london-stanstead
 	] .
 
 :ticket-london-copenhagen-siri a tio:Ticket ;
@@ -301,15 +288,16 @@
 		tio:accessTo :flight-london-copenhagen
 	] .
 
-:flight-london-copenhagen a travelx:aeroplane ;
+:flight-london-copenhagen a tio:Flight ;
 	tio:flightNo "EZY3465" ;
 	tio:operatedBy :org-easyjet ;
-	travelx:has_stop [ a travelx:VehicleStop ;
-		transit:departureTime "13:40" ;
-		travelx:occur_at [ travelx:gate_at :airport-london-stanstead ]
-	], [ a travelx:VehicleStop ;
-		transit:arrivalTime "16:25" ;
-		travelx:occur_at [ travelx:gate_at :airport-copenhagen ]
+	tio:from [ a tio:Stop ;
+		tio:at :airport-london-stanstead ;
+		tio:departs "2011-02-28T13:40:00+00:00"^^xsd:dateTime
+	] ;
+	tio:to [ a tio:Stop ;
+		tio:at :airport-copenhagen ;
+		tio:arrives "2011-02-28T16:25:00+01:00"^^xsd:dateTime
 	] .
 
 </timeline/floss> a tl:Timeline ;