Extend trip another 2 weeks to include LibreGraphicsMeeting in Leipzig.

1 files changed, 230 insertions, 17 deletions

diff --git a/data/2014/europe.ttl b/data/2014/europe.ttl
index 79ab496..db38c73 100644
--- a/data/2014/europe.ttl
+++ b/data/2014/europe.ttl
@@ -63,11 +63,16 @@
 		:sleep-3-14, :sleep-3-15, :sleep-3-16, :sleep-3-17,
 		:sleep-3-18, :sleep-3-19, :sleep-3-20, :sleep-3-21,
 		:sleep-3-22, :sleep-3-23, :sleep-3-24, :sleep-3-25,
-		:sleep-3-26, :sleep-3-27,
+		:sleep-3-26, :sleep-3-27, :sleep-3-28, :sleep-3-29,
+		:sleep-3-30, :sleep-3-31, :sleep-4-1, :sleep-4-2,
+		:sleep-4-3, :sleep-4-4, :sleep-4-5, :sleep-4-6,
+		:sleep-4-7,
 		:stay-brusselsEpfsug, :stay-brusselsAtome, :stay-brusselsGear,
 		:stay-parisGear, :stay-barcelonaGear,
 		:stay-barcelonaDay1, :stay-barcelonaDay2,
-		:stay-parisGearReturn, :stay-brusselsGreens .
+		:stay-parisGearReturn, :stay-brusselsGreens,
+		:stay-lgmDay1, :stay-lgmDay2, :stay-lgmDay3, :stay-lgmDay4,
+		:stay-lgmDayBefore, :stay-lgmDayAfter .
 
 :ride-holbækBrussels a event:Event ;
 	rdfs:label "2 x train Holbæk→Brussels (Debian + EPFSUG)"@en ;
@@ -359,7 +364,117 @@
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-27T00:00:00+01:00"^^xsd:dateTime ;
-		tl:end "2014-03-27T05:30:00+01:00"^^xsd:dateTime
+		tl:end "2014-03-27T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-3-28 a event:Event ;
+	rdfs:label "Sleep in Brussels"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Brussels ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-03-28T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-28T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-3-29 a event:Event ;
+	rdfs:label "Sleep in Brussels"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Brussels ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-03-29T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-29T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-3-30 a event:Event ;
+	rdfs:label "Sleep in Brussels"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Brussels ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-03-30T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-30T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-3-31 a event:Event ;
+	rdfs:label "Sleep in Brussels"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Brussels ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-03-31T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-31T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-4-1 a event:Event ;
+	rdfs:label "Sleep in Brussels"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Brussels ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-01T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-01T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-4-2 a event:Event ;
+	rdfs:label "Sleep in Leipzig?"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-02T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-02T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-4-3 a event:Event ;
+	rdfs:label "Sleep in Leipzig?"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-03T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-03T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-4-4 a event:Event ;
+	rdfs:label "Sleep in Leipzig?"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-04T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-04T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-4-5 a event:Event ;
+	rdfs:label "Sleep in Leipzig?"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-05T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-05T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-4-6 a event:Event ;
+	rdfs:label "Sleep in Leipzig?"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-06T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-06T09:00:00+01:00"^^xsd:dateTime
+	] .
+
+:sleep-4-7 a event:Event ;
+	rdfs:label "Sleep in Leipzig?"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-07T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-07T09:00:00+01:00"^^xsd:dateTime
 	] .
 
 :stay-brusselsEpfsug a event:Event ;
@@ -452,6 +567,46 @@
 		tl:end "2014-03-26T16:00:00+01:00"^^xsd:dateTime
 	] .
 
+:stay-lgmDay1 a event:Event ;
+	rdfs:label "Siri and Jonas attend LibreGraphicsMeeting"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-02T09:30:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-02T22:00:00+01:00"^^xsd:dateTime
+	] .
+
+:stay-lgmDay2 a event:Event ;
+	rdfs:label "Siri and Jonas attend LibreGraphicsMeeting"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-03T09:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-03T23:00:00+01:00"^^xsd:dateTime
+	] .
+
+:stay-lgmDay3 a event:Event ;
+	rdfs:label "Siri and Jonas attend LibreGraphicsMeeting"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-04T09:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-04T20:00:00+01:00"^^xsd:dateTime
+	] .
+
+:stay-lgmDay4 a event:Event ;
+	rdfs:label "Siri and Jonas attend LibreGraphicsMeeting"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:based_near dbpedia:Leipzig ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-04-05T09:30:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-04-05T19:00:00+01:00"^^xsd:dateTime
+	] .
+
 </timeline/floss> a tl:Timeline ;
 	rdfs:title "FLOSS events jointly involving Siri and Jonas"@en ;
 	event:agent :person-jonas, :person-siri .
@@ -470,6 +625,9 @@
 		:train-parisBrussels, :train-brusselsCologne,
 		:train-cologneRoskilde, :train-roskildeHolbæk,
 		:taxi-parisTowardsBarcelona, :taxi-barcelonaToVenue ;
+	rdfs:comment """Actual price covers different items than originally agreed:
+Excludes Holbæk <-> Cologne: Covered by Greens/EFA
+Excludes Cologne <-> Paris: Covered by EPFSUG and FOSDEM"""@en ;
 	pc:estimatedPrice :price-debianJonasEstimate ;
 	pc:agreedPrice :price-debianJonasEstimate ;
 #	pc:actualPrice :price-debianJonas ;
@@ -489,6 +647,10 @@
 	pc:item :train-holbækRoskilde, :train-roskildeCologne,
 		:train-cologneBrussels, :train-brusselsCologne,
 		:train-cologneRoskilde, :train-roskildeHolbæk ;
+	rdfs:comment """Actual price covers different items than originally agreed:
+Replaced Cologne -> Holbæk with Leipzig -> Hobro: return trip postponed and merged with other trips due to laptop install issues.
+Excludes Cologne -> Brussels: Lacks explicit receipt due to use of Interrail.
+Excludes Brussels -> Cologne: Lacks explicit receipt due to use of Interrail (and replaced by alternate route via Paris)."""@en ;
 	pc:estimatedPrice :price-greensEstimate ;
 	pc:agreedPrice :price-greensEstimate ;
 	pc:subsidy :subsidy-greens .
@@ -497,6 +659,9 @@
 	pc:item :train-holbækRoskilde, :train-roskildeCologne,
 		:train-cologneBrussels, :train-brusselsCologne,
 		:train-cologneRoskilde, :train-roskildeHolbæk ;
+	rdfs:comment """Actual price covers different items than originally agreed:
+Excludes Holbæk <-> Cologne: Covered by Greens/EFA
+Includes Paris -> Brussels: Needed coverage for Interrail ticket sharing to work out"""@en ;
 	pc:estimatedPrice :price-epfsugEstimate ;
 	pc:agreedPrice :price-epfsugEstimate ;
 	pc:subsidy :subsidy-epfsug .
@@ -543,7 +708,7 @@
 	payment:totalNetAmount "??"^^xsd:decimal .
 
 :subsidy-debianSiri a payment:Payment ;
-	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri"@en ;
+	rdfs:label "Debian sponsorship Holbæk -> Barcelona -> Brussels for Siri"@en ;
 	payment:payer :org-debian ;
 	payment:payee :person-siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -562,16 +727,13 @@
 		payment:payment :offer-sncfParisBrusselsSeat ;
 		payment:netAmount "30"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbæk ;
-		payment:netAmount "79.25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
 		payment:payment :offer-dbInterrail10 ;
 		payment:netAmount "339"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "610.50"^^xsd:decimal .
+	payment:totalNetAmount "531.25"^^xsd:decimal .
 
 :subsidy-greens a payment:Payment ;
-	rdfs:label "Greens/EFA sponsorship Holbæk <-> Cologne for Jonas"@en ;
+	rdfs:label "Greens/EFA sponsorship Holbæk -> Cologne and Berlin -> Hobro for Jonas"@en ;
 	payment:payer :org-greens ;
 	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
@@ -641,6 +803,13 @@
 		tio:accessTo :train-roskildeHolbæk
 	] .
 
+:ticket-dsbÅrhusHobro a tio:TicketPlaceholder ;
+	rdfs:label "Train ticket from Århus to Hobro"@en ;
+	tio:scope [ a tio:scopeOfAccess ;
+		tio:eligibleServiceLevel tio:Economy ;
+		tio:accessTo :train-århusHobro
+	] .
+
 :ticket-dbRoskildeCologne a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Roskilde to Cologne"@en ;
 	tio:scope [ a tio:scopeOfAccess ;
@@ -665,6 +834,14 @@
 		tio:accessTo :train-brusselsCologne
 	] .
 
+:ticket-dbBerlinÅrhus a tio:TicketPlaceholder ;
+	rdfs:label "Train ticket from Berlin to Århus"@en ;
+	tio:scope [ a tio:scopeOfAccess ;
+		tio:eligibleServiceLevel tio:Economy ;
+		tio:eligibleAudience :members-bahncard25 ;
+		tio:accessTo :train-berlinÅrhus
+	] .
+
 :ticket-dbInterrail10 a tio:TicketPlaceholder ;
 	rdfs:label "InterRail 10 days within 22 days"@en ;
 	tio:scope [ a tio:scopeOfAccess ;
@@ -804,6 +981,21 @@
 	tio:from :station-roskilde ;
 	tio:to :station-holbæk .
 
+:train-berlinÅrhus a rail:Train ;
+	tio:operatedBy :org-db ;
+	tio:from :station-berlin ;
+	tio:to :station-århus .
+
+:train-århusHobro a rail:Train ;
+	tio:operatedBy :org-dsb ;
+	tio:from :station-århus ;
+	tio:to :station-hobro .
+
+:train-roskildeHolbæk a rail:Train ;
+	tio:operatedBy :org-dsb ;
+	tio:from :station-roskilde ;
+	tio:to :station-holbæk .
+
 :taxi-parisFromBrussels a tio:Taxi ;
 	tio:from :station-parisNord ;
 	tio:to :place-irill .
@@ -857,15 +1049,13 @@
 :offer-dbCologneHolbæk a gr:Offering ;
 	gr:name "Cologne-Holbæk"@en ;
 	gr:description "Train ticket from Cologne to Holbæk"@en ;
-	rdfs:comment "Price includes couchette reservation (€15.50)"@en ;
+	rdfs:comment "Price includes couchette reservation (€20)"@en ;
 	gr:includes :ticket-dbCologneRoskilde, :ticket-dsbRoskildeHolbæk ;
 	gr:hasBusinessFunction gr:Sell ;
+	gr:eligibleCustomerTypes :members-bahncard25 ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "79"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "99"^^xsd:float
+		gr:hasCurrencyValue "79.25"^^xsd:float
 	] .
 
 :offer-dbCologneBrusselsPlain a gr:Offering ;
@@ -888,6 +1078,17 @@
 		gr:hasCurrencyValue "53"^^xsd:float
 	] .
 
+:offer-dbBerlinHobro a gr:Offering ;
+	gr:name "Berlin-Hobro"@en ;
+	gr:description "Train ticket from Berlin to Hobro"@en ;
+	gr:includes :ticket-dbBerlinÅrhus, :ticket-dsbÅrhusHobro ;
+	gr:hasBusinessFunction gr:Sell ;
+	gr:eligibleCustomerTypes :members-bahncard25 ;
+	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
+		gr:hasCurrency "EUR"@en ;
+		gr:hasCurrencyValue "??"^^xsd:float
+	] .
+
 :offer-sncfBrusselsParisPlain a gr:Offering ;
 	gr:name "Brussels-Paris plain"@en ;
 	gr:description "Non-discount train ticket from Brussels to Paris"@en ;
@@ -911,7 +1112,7 @@
 :offer-sncfParisBrusselsPlain a gr:Offering ;
 	gr:name "Paris-Brussels plain"@en ;
 	gr:description "Non-discount train ticket from Paris to Brussels"@en ;
-	gr:includes :ticket-thalysBrusselsParis ;
+	gr:includes :ticket-thalysParisBrussels ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1023,9 +1224,9 @@ Paris -> Brussels: 99"""@en ;
 	gr:name "Plain tickets matching interrail rides sponsored by EPFSUG"@en ;
 	gr:description """Non-discount ticket expenses for equivalent rides as actual interrail rides sponsored by EPFSUG.
 Cologne <-> Brussels: 106"""@en ;
-	gr:includes :ticket-dbCologneBrussels, ticket-thalysParisBrussels ;
+	gr:includes :ticket-dbCologneBrussels, :ticket-thalysParisBrussels ;
 	rdfs:seeAlso :offer-dbCologneBrusselsPlain,
-		offer-sncfParisBrusselsPlain ;
+		:offer-sncfParisBrusselsPlain ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1152,6 +1353,10 @@ Brussels -> Paris: 99"""@en ;
 	rdfs:label "Barcelona Sants" ;
 	rail:serves dbpedia:Barcelona .
 
+:station-berlin a rail:Station ;
+	rdfs:label "Berlin Hbf" ;
+	rail:serves dbpedia:Berlin .
+
 :station-brussels a rail:Station ;
 	rdfs:label "Bruxelles-Midi" ;
 	rail:serves dbpedia:Brussels .
@@ -1160,6 +1365,10 @@ Brussels -> Paris: 99"""@en ;
 	rdfs:label "Köln Hbf" ;
 	rail:serves dbpedia:Cologne .
 
+:station-hobro a rail:Station ;
+	rdfs:label "Hobro station" ;
+	rail:serves dbpedia:Hobro .
+
 :station-holbæk a rail:Station ;
 	rdfs:label "Holbæk station" ;
 	rail:serves dbpedia:Holbæk .
@@ -1176,6 +1385,10 @@ Brussels -> Paris: 99"""@en ;
 	rdfs:label "Roskilde station" ;
 	rail:serves dbpedia:Roskilde .
 
+:station-århus a rail:Station ;
+	rdfs:label "Århus Banegård" ;
+	rail:serves dbpedia:Århus .
+
 :place-irill a geo:SpatialThing ;
 	rdfs:label "IRILL office"@en ;
 #	foaf:based_near dbpedia:Place_d'Italie ;