Whole journey together.

1 files changed, 24 insertions, 69 deletions

diff --git a/data/2015/peru.ttl b/data/2015/peru.ttl
index 26f956e..d442ef8 100644
--- a/data/2015/peru.ttl
+++ b/data/2015/peru.ttl
@@ -103,11 +103,9 @@
 		:sleep-0713 ,
 		:sleep-0714 ,
 		:sleep-0715 ,
-		:ride-paris-orø ,
-		:sleep-0716 ,
-		:ride-paris-orø ,
-		:ride-paris-gütersloh ,
 		:ride-paris-brussels ,
+		:sleep-0716 ,
+		:ride-paris-brussels-alt ,
 		:meeting-greens ,
 		:ride-brussels-gütersloh ,
 		:sleep-0717 ,
@@ -618,73 +616,49 @@
 		tl:start "2015-07-15T00:00:00+02:00"^^xsd:dateTime ;
 		tl:end "2015-07-15T09:00:00+02:00"^^xsd:dateTime ] .
 
-:ride-paris-orø a event:Event ;
-	rdfs:label "Flight+train+ferry Paris→Orø"@en ;
-	dcterms:subject :journey-siri ;
+:ride-paris-brussels a event:Event ;
+	rdfs:label "Train Paris→Brussels"@en ;
+	dcterms:subject :journey-both ;
 	event:time [ a tl:Interval ;
-		tl:onTimeLine </timeline/travel> ;
-		tl:start "2015-07-15T11:00:00+02:00"^^xsd:dateTime ;
-		tl:end "2015-07-15T18:00:00+02:00"^^xsd:dateTime
+		tl:start "2015-07-15T16:45:00+02:00"^^xsd:dateTime ;
+		tl:end "2015-07-15T19:45:00+02:00"^^xsd:dateTime ;
+		tl:onTimeLine </timeline/travel>
 	] .
 
-:offer-paris-copenhagen a gr:Offering ;
-#	gr:includes :ticket-paris-copenhagen ;
+:offer-paris-brussels a gr:Offering ;
+	gr:includes :ticket-paris-brussels ;
 	gr:hasBusinessFunction gr:Sell ;
-	grx:hasPrice "1440.00"^^unit:Danish_Krone .
-
-:flight-paris-copehagen a tio:Flight ;
-	tio:flightNo "EZY3827" ;
-	tio:operatedBy :org-easyjet ;
-	tio:from [ a tio:Stop ;
-		tio:at :airport-paris ;
-		tio:departs "2015-07-15T10:55:00+02:00"^^xsd:dateTime ] ;
-	tio:to [ a tio:Stop ;
-		tio:at :airport-copenhagen ;
-		tio:arrives "2015-07-15T12:50:00+02:00"^^xsd:dateTime ] .
+	grx:hasPrice "48.80"^^unit:Euro .
 
 :sleep-0716 a event:Event ;
 	rdfs:label "Sleep in Paris"@en ;
-	dcterms:subject :journey-jonas ;
+	dcterms:subject :journey-both ;
 	event:based_near dbpedia:Paris ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2015-07-16T00:00:00+02:00"^^xsd:dateTime ;
 		tl:end "2015-07-16T09:00:00+02:00"^^xsd:dateTime ] .
 
-:ride-paris-gütersloh a event:Event ;
-	rdfs:label "Train Paris→Gütersloh"@en ;
-	dcterms:subject :journey-siri ;
-	event:time [ a tl:Interval ;
-		tl:start "2015-07-16T09:10:00+02:00"^^xsd:dateTime ;
-		tl:end "2015-07-16T17:03:00:+02:00"^^xsd:dateTime ;
-		tl:onTimeLine </timeline/travel>
-	] .
-
-:offer-paris-gütersloh a gr:Offering ;
-	gr:includes :ticket-paris-gütersloh ;
-	gr:hasBusinessFunction gr:Sell ;
-	grx:hasPrice "66.65"^^unit:Euro .
-
-:ride-paris-brussels a event:Event ;
-	rdfs:label "Train Paris→Brussels"@en ;
-	dcterms:subject :journey-jonas ;
+:ride-paris-brussels-alt a event:Event ;
+	rdfs:label "Train Paris→Brussels (alternative ride)"@en ;
+	dcterms:subject :journey-both ;
 	event:time [ a tl:Interval ;
-		tl:start "2015-07-16T08:01:00+02:00"^^xsd:dateTime ;
-		tl:end "2015-07-16T09:23:00+02:00"^^xsd:dateTime ;
+		tl:start "2015-07-16T06:01:00+02:00"^^xsd:dateTime ;
+		tl:end "2015-07-16T07:23:00+02:00"^^xsd:dateTime ;
 		tl:onTimeLine </timeline/travel>
 	] .
 
-:offer-paris-brussels a gr:Offering ;
+:offer-paris-brussels-alt a gr:Offering ;
 	gr:includes :ticket-paris-brussels ;
 	gr:hasBusinessFunction gr:Sell ;
-	grx:hasPrice "71"^^unit:Euro .
+	grx:hasPrice "40"^^unit:Euro .
 
 :meeting-greens a event:Event ;
 	rdfs:label "DebianParl workshop IV" ;
-	dcterms:subject :journey-jonas ;
+	dcterms:subject :journey-both ;
 	prog:organiser :org-greens ;
 	prog:attendee :person-jonas ;
-#	event:place :place-jochen-office ;
+	event:place :place-jochen-office ;
 	event:based_near dbpedia:Bruxelles ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/floss> ;
@@ -692,28 +666,9 @@
 		tl:end "2015-07-16T12:00:00+02:00"^^xsd:dateTime
 	] .
 
-:ride-paris-orø a event:Event ;
-	rdfs:label "Train+ferry Paris→Orø"@en ;
-	dcterms:subject :journey-siri ;
-	event:time [ a tl:Interval ;
-		tl:start "2015-07-16T06:01:00+02:00"^^xsd:dateTime ;
-		tl:end "2015-07-16T23:20:00+02:00"^^xsd:dateTime ;
-		tl:onTimeLine </timeline/travel> ] .
-
-:offer-paris-köln a gr:Offering ;
-	gr:includes :ticket-paris-köln ;
-	gr:hasBusinessFunction gr:Sell ;
-	grx:hasPrice "46"^^unit:Euro .
-
-:offer-köln-holbæk a gr:Offering ;
-	gr:includes :ticket-köln-holbæk ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:eligibleCustomerTypes :members-bahncard25 ;
-	grx:hasPrice "81.75"^^unit:Euro .
-
 :ride-brussels-gütersloh a event:Event ;
 	rdfs:label "train Brussels→Gütersloh"@en ;
-	dcterms:subject :journey-jonas ;
+	dcterms:subject :journey-both ;
 	event:time [ a tl:Interval ;
 		tl:start "2015-07-16T18:34:00+02:00"^^xsd:dateTime ;
 		tl:end "2015-07-16T23:54:00+02:00"^^xsd:dateTime ;
@@ -727,7 +682,7 @@
 
 :sleep-0717 a event:Event ;
 	rdfs:label "Sleep in Gütersloh"@en ;
-	dcterms:subject :journey-jonas ;
+	dcterms:subject :journey-both ;
 	event:based_near dbpedia:Gütersloh ;
 	event:time [ a tl:Interval ;
 		tl:start "2015-07-17T00:00:00+02:00"^^xsd:dateTime ;
@@ -736,7 +691,7 @@
 
 :ride-gütersloh-orø a event:Event ;
 	rdfs:label "Train+ferry Gütersloh→Orø"@en ;
-	dcterms:subject :journey-jonas ;
+	dcterms:subject :journey-both ;
 	event:time [ a tl:Interval ;
 		tl:start "2015-07-17T09:55:00+02:00"^^xsd:dateTime ;
 		tl:end "2015-07-17T20:30:00+02:00"^^xsd:dateTime ;