Massive tidying, dropping obsolete parts and adding more details.

1 files changed, 73 insertions, 590 deletions

diff --git a/data/2014/europe.ttl b/data/2014/europe.ttl
index b16f7da..662bea0 100644
--- a/data/2014/europe.ttl
+++ b/data/2014/europe.ttl
@@ -13,7 +13,6 @@
 @prefix rail:     <http://ontologi.es/rail/vocab#> .
 @prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix skos:     <http://www.w3.org/2004/02/skos/core#> .
-@prefix sj:       <http://data.jones.dk/siri+jonas#> .
 @prefix service:  <http://purl.org/ontology/service#> .
 @prefix spacerel: <http://data.ordnancesurvey.co.uk/ontology/spatialrelations/> .
 @prefix tio:      <http://purl.org/tio/ns#> .
@@ -97,8 +96,8 @@
 	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
-		tl:start "2014-03-10T09:37:00+01:00"^^xsd:dateTime ;
-		tl:end "2014-03-10T10:59:00+01:00"^^xsd:dateTime
+		tl:start "2014-03-10T11:13:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-10T12:35:00+01:00"^^xsd:dateTime
 	] .
 
 :ride-parisBarcelona a event:Event ;
@@ -394,8 +393,8 @@
 	event:based_near dbpedia:Brussels ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
-		tl:start "2014-03-10T09:00:00+01:00"^^xsd:dateTime ;
-		tl:end "2014-03-10T09:30:00+01:00"^^xsd:dateTime
+		tl:start "2014-03-09T15:45:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-09T16:00:00+01:00"^^xsd:dateTime
 	] .
 
 :stay-parisGear a event:Event ;
@@ -471,38 +470,16 @@
 	payment:payer :org-debian ;
 	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-sncfParisBarcelonaReturn ;
-		payment:netAmount "179.20"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "179.20"^^xsd:decimal .
-
-:subsidy-debianJonasSplitTickets
-	rdfs:label "Debian sponsorship Paris <-> Barcelona for Jonas"@en ;
-	rdfs:comment "depends on FOSDEM, Greens/EFA and EPFSUG sponsorships, and on Siri sponsored via same route"@en ;
-	payment:payer :org-debian ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
 		payment:payment :offer-sncfParisBarcelona ;
-		payment:netAmount "109.00"^^xsd:decimal
-#		payment:netAmount "125.70"^^xsd:decimal
+		payment:netAmount "176.10"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
 		payment:payment :offer-sncfBarcelonaParis ;
-		payment:netAmount "97.90"^^xsd:decimal
-#		payment:netAmount "125.70"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "196.90"^^xsd:decimal .
-#	payment:totalNetAmount "251.40"^^xsd:decimal .
-
-:subsidy-debianJonasSoloEvent
-	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Jonas"@en ;
-	rdfs:comment "depends on Siri sponsored via same route"@en ;
-	payment:payer :org-debian ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbInterrail5 ;
-		payment:netAmount "239.00"^^xsd:decimal
+		payment:netAmount "176.10"^^xsd:decimal
+	], [ a payment:ExpenditureLine ;
+		rdfs:comment "calculated discount, based on actual Interrail ticket price and list prices of actual rides: 352.20/???"@en ;
+#		payment:netAmount "-??"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "239.00"^^xsd:decimal .
+	payment:totalNetAmount "352.20"^^xsd:decimal .
 
 :subsidy-debianSiri
 	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri"@en ;
@@ -515,17 +492,6 @@
 	] ;
 	payment:totalNetAmount "339.00"^^xsd:decimal .
 
-:subsidy-debianSiriSoloEvent
-	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri"@en ;
-	rdfs:comment "independent from other sponsorships, but disqualifies Jonas"@en ;
-	payment:payer :org-debian ;
-	payment:payee :person-siri ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbInterrail5 ;
-		payment:netAmount "239.00"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "239.00"^^xsd:decimal .
-
 :subsidy-greens
 	rdfs:label "Greens/EFA sponsorship Paris -> Brussels -> Holbæk for Jonas"@en ;
 	rdfs:comment "depends on Debian, FOSDEM and EPFSUG sponsorships"@en ;
@@ -533,274 +499,35 @@
 	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
 		payment:payment :offer-sncfParisBrussels ;
-		payment:netAmount "40.00"^^xsd:decimal
-#		payment:netAmount "81.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBahncard25Probe ;
-		payment:netAmount "25.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologneBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbækBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "142.45"^^xsd:decimal .
-#	payment:totalNetAmount "214.40"^^xsd:decimal .
-
-:subsidy-greensNoBahncard
-	rdfs:label "Greens/EFA sponsorship Paris -> Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on Debian, FOSDEM and EPFSUG sponsorships"@en ;
-	payment:payer :org-greens ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-sncfParisBrussels ;
-		payment:netAmount "40.00"^^xsd:decimal
-#		payment:netAmount "81.00"^^xsd:decimal
+		payment:netAmount "99.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
 		payment:payment :offer-dbBrusselsCologne ;
-		payment:netAmount "19.00"^^xsd:decimal
-#		payment:netAmount "39.00"^^xsd:decimal
+		payment:netAmount "53.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
 		payment:payment :offer-dbCologneHolbæk ;
-		payment:netAmount "79.00"^^xsd:decimal
-#		payment:netAmount "99.00"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "117.45"^^xsd:decimal .
-#	payment:totalNetAmount "189.40"^^xsd:decimal .
-
-:subsidy-greensNoDebconf
-	rdfs:label "Greens/EFA sponsorship Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on EPFSUG sponsorship"@en ;
-	payment:payer :org-greens ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBahncard25Probe ;
-		payment:netAmount "25.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologneBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
+		payment:netAmount "154.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbækBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
+		rdfs:comment "calculated discount, based on actual Interrail ticket price and list prices of actual rides: 306/???"@en ;
+#		payment:netAmount "-??"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "102.45"^^xsd:decimal .
-#	payment:totalNetAmount "133.40"^^xsd:decimal .
-
-:subsidy-greensNoDebconfEpfsugBahncard
-	rdfs:label "Greens/EFA sponsorship Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on EPFSUG sponsorship incl. Bahncard 25"@en ;
-	payment:payer :org-greens ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologneBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbækBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "77.45"^^xsd:decimal .
-#	payment:totalNetAmount "108.40"^^xsd:decimal .
-
-:subsidy-greensSoloEvent
-	rdfs:label "Greens/EFA sponsorship Holbæk <-> Brussels for Jonas"@en ;
-	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :org-greens ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBahncard25Probe ;
-		payment:netAmount "25.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbHolbækCologneBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneBrusselsBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologneBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbækBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "179.90"^^xsd:decimal .
-#	payment:totalNetAmount "241.80"^^xsd:decimal .
-
-:subsidy-greensSoloEventNoBahncard
-	rdfs:label "Greens/EFA sponsorship Holbæk <-> Brussels for Jonas"@en ;
-	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :org-greens ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbHolbækCologne ;
-		payment:netAmount "79.00"^^xsd:decimal
-#		payment:netAmount "99.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneBrussels ;
-		payment:netAmount "19.00"^^xsd:decimal
-#		payment:netAmount "39.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologne ;
-		payment:netAmount "19.00"^^xsd:decimal
-#		payment:netAmount "39.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbæk ;
-		payment:netAmount "79.00"^^xsd:decimal
-#		payment:netAmount "99.00"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "196"^^xsd:decimal .
-#	payment:totalNetAmount "276"^^xsd:decimal .
-
-:subsidy-greensSoloEventComboticket
-	rdfs:label "Greens/EFA sponsorship Holbæk <-> Brussels for Jonas"@en ;
-	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :org-greens ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dsbHolbækBrusselsReturn ;
-		payment:netAmount "274"^^xsd:decimal
-#		payment:netAmount "339"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "274"^^xsd:decimal .
-#	payment:totalNetAmount "339"^^xsd:decimal .
+	payment:totalNetAmount "306"^^xsd:decimal .
 
 :subsidy-epfsug
-	rdfs:label "EPFSUG sponsorship Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on Greens/EFA sponsorships incl. Bahncard"@en ;
-	payment:payer :org-epfsug ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbHolbækCologneBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneBrusselsBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "77.45"^^xsd:decimal .
-#	payment:totalNetAmount "108.40"^^xsd:decimal .
-
-:subsidy-epfsugBahncard
-	rdfs:label "EPFSUG sponsorship Brussels -> Holbæk for Jonas"@en ;
-	rdfs:comment "depends on Greens/EFA sponsorships excl. Bahncard25"@en ;
-	payment:payer :org-epfsug ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBahncard25Probe ;
-		payment:netAmount "25.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbHolbækCologneBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneBrusselsBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "102.45"^^xsd:decimal .
-#	payment:totalNetAmount "133.40"^^xsd:decimal .
-
-:subsidy-epfsugNoGoogle
-	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
-	rdfs:comment "depends on Greens/EFA sponsorship incl. Bahncard"@en ;
-	payment:payer :org-epfsug ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbHolbækCologneBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneBrusselsBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologneBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbækBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "154.90"^^xsd:decimal .
-#	payment:totalNetAmount "216.80"^^xsd:decimal .
-
-:subsidy-epfsugSoloEvent
-	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
-	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :org-epfsug ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBahncard25Probe ;
-		payment:netAmount "25.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbHolbækCologneBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneBrusselsBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologneBahncard25 ;
-		payment:netAmount "14.20"^^xsd:decimal
-#		payment:netAmount "29.15"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbækBahncard25 ;
-		payment:netAmount "63.25"^^xsd:decimal
-#		payment:netAmount "79.25"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "179.90"^^xsd:decimal .
-#	payment:totalNetAmount "241.80"^^xsd:decimal .
-
-:subsidy-epfsugSoloEventNoBahncard
-	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
-	rdfs:comment "independent from other sponsorships"@en ;
+	rdfs:label "EPFSUG sponsorship Holbæk -> Brussels for Jonas"@en ;
+	rdfs:comment "depends on Greens/EFA sponsorship"@en ;
 	payment:payer :org-epfsug ;
 	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
 		payment:payment :offer-dbHolbækCologne ;
-		payment:netAmount "79.00"^^xsd:decimal
-#		payment:netAmount "99.00"^^xsd:decimal
+		payment:netAmount "154.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
 		payment:payment :offer-dbCologneBrussels ;
-		payment:netAmount "19.00"^^xsd:decimal
-#		payment:netAmount "39.00"^^xsd:decimal
+		payment:netAmount "53.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbBrusselsCologne ;
-		payment:netAmount "19.00"^^xsd:decimal
-#		payment:netAmount "39.00"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbæk ;
-		payment:netAmount "79.00"^^xsd:decimal
-#		payment:netAmount "99.00"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "196"^^xsd:decimal .
-#	payment:totalNetAmount "276"^^xsd:decimal .
-
-:subsidy-epfsugSoloEventComboticket
-	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
-	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :org-epfsug ;
-	payment:payee :person-jonas ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dsbHolbækBrusselsReturn ;
-		payment:netAmount "274"^^xsd:decimal
-#		payment:netAmount "339"^^xsd:decimal
+		rdfs:comment "calculated discount, based on actual Interrail ticket price and list prices of actual rides: 207/???"@en ;
+#		payment:netAmount "-??"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "274"^^xsd:decimal .
-#	payment:totalNetAmount "339"^^xsd:decimal .
+	payment:totalNetAmount "207"^^xsd:decimal .
 
 :subsidy-fosdem
 	rdfs:label "FOSDEM sponsorship Brussels -> Paris for Jonas"@en ;
@@ -809,31 +536,12 @@
 	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
 		payment:payment :offer-sncfBrusselsParis ;
-		payment:netAmount "50.00"^^xsd:decimal
-#		payment:netAmount "81.00"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "50.00"^^xsd:decimal .
-#	payment:totalNetAmount "81.00"^^xsd:decimal .
-
-:subsidy-google
-	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :org-google ;
-	payment:payee :person-siri ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbInterrail10In20 ;
-		payment:netAmount "339.00"^^xsd:decimal
-	] ;
-	payment:totalNetAmount "339.00"^^xsd:decimal .
-
-:subsidy-google
-	rdfs:comment "independent from other sponsorships, but disqualifies Jonas"@en ;
-	payment:payer :org-google ;
-	payment:payee :person-siri ;
-	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbInterrail5In10 ;
-		payment:netAmount "239.00"^^xsd:decimal
+		payment:netAmount "99.00"^^xsd:decimal
+	], [ a payment:ExpenditureLine ;
+		rdfs:comment "calculated discount, based on actual Interrail ticket price and list prices of actual rides: 99/???"@en ;
+#		payment:netAmount "-??"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "239.00"^^xsd:decimal .
+	payment:totalNetAmount "99.00"^^xsd:decimal .
 
 :ticket-dsbHolbækRoskilde a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Holbæk to Roskilde"@en ;
@@ -851,16 +559,6 @@
 		]
 	] .
 
-:ticket-dsbRoskildePadborg a tio:TicketPlaceholder ;
-	rdfs:label "Train ticket from Roskilde to Padborg"@en ;
-	tio:scope [ a tio:scopeOfAccess ;
-		tio:accessTo [ a rail:Train ;
-			tio:operatedBy :org-dsb ;
-			tio:from :station-roskilde ;
-			tio:to :station-padborg
-		]
-	] .
-
 :ticket-dsbPadborgRoskilde a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Padborg to Roskilde"@en ;
 	tio:scope [ a tio:scopeOfAccess ;
@@ -871,22 +569,6 @@
 		]
 	] .
 
-:ticket-dsbInterrail10 a tio:TicketPlaceholder ;
-	rdfs:label "InterRail 10 days within 22 days"@en .
-
-:ticket-dsbInterrail5 a tio:TicketPlaceholder ;
-	rdfs:label "InterRail 5 days within 10 days"@en .
-
-:ticket-dbRoskildePadborg a tio:TicketPlaceholder ;
-	rdfs:label "Train ticket from Roskilde to Padborg"@en ;
-	tio:scope [ a tio:scopeOfAccess ;
-		tio:accessTo [ a rail:Train ;
-			tio:operatedBy :org-db ;
-			tio:from :station-roskilde ;
-			tio:to :station-padborg
-		]
-	] .
-
 :ticket-dbPadborgRoskilde a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Padborg to Roskilde"@en ;
 	tio:scope [ a tio:scopeOfAccess ;
@@ -919,22 +601,6 @@
 		tio:accessTo :train-cologneBrussels
 	] .
 
-:ticket-dbInterrail10 a tio:TicketPlaceholder ;
-	rdfs:label "InterRail 10 days within 22 days"@en .
-
-:ticket-dbInterrail5 a tio:TicketPlaceholder ;
-	rdfs:label "InterRail 5 days within 10 days"@en .
-
-:ticket-thalysCologneBrussels a tio:TicketPlaceholder ;
-	rdfs:label "Train ticket from Cologne to Brussels"@en ;
-	tio:scope [ a tio:scopeOfAccess ;
-		tio:accessTo [ a rail:Train ;
-			tio:operatedBy :org-thalys ;
-			tio:from :station-cologne ;
-			tio:to :station-brussels ;
-		]
-	] .
-
 :ticket-dbBrusselsCologne a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Brussels to Cologne"@en ;
 	tio:scope [ a tio:scopeOfAccess ;
@@ -945,15 +611,8 @@
 		]
 	] .
 
-:ticket-thalysBrusselsCologne a tio:TicketPlaceholder ;
-	rdfs:label "Train ticket from Brussels to Cologne"@en ;
-	tio:scope [ a tio:scopeOfAccess ;
-		tio:accessTo [ a rail:Train ;
-			tio:operatedBy :org-thalys ;
-			tio:from :station-brussels ;
-			tio:to :station-cologne ;
-		]
-	] .
+:ticket-dbInterrail10 a tio:TicketPlaceholder ;
+	rdfs:label "InterRail 10 days within 22 days"@en .
 
 :ticket-thalysBrusselsParis a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Brussels to Paris"@en ;
@@ -975,6 +634,16 @@
 		]
 	] .
 
+:ticket-renfeParisBarcelona a tio:TicketPlaceholder ;
+	rdfs:label "Train ticket from Paris to Barcelona"@en ;
+	tio:scope [ a tio:scopeOfAccess ;
+		tio:accessTo [ a rail:Train ;
+			tio:operatedBy :org-renfe ;
+			tio:from :station-barcelona ;
+			tio:to :station-paris ;
+		]
+	] .
+
 :ticket-renfeBarcelonaParis a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Barcelona to Paris"@en ;
 	tio:scope [ a tio:scopeOfAccess ;
@@ -1027,19 +696,32 @@
 		rail:occur_at [ rail:platform_at :station-brussels ]
 	] .
 
-:offer-dsbHolbækPadborg a gr:Offering ;
-	gr:name "Holbæk-Padborg"@en ;
-	gr:description "Train ticket from Holbæk to Padborg"@en ;
-	gr:includes :ticket-dsbHolbækRoskilde, :ticket-dsbRoskildePadborg ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK215 is approx. €29"@en ;
-		gr:hasCurrency "DKK"@en ;
-		gr:hasCurrencyValue "215"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK384 is approx. €52"@en ;
-		gr:hasCurrency "DKK"@en ;
-		gr:hasCurrencyValue "384"^^xsd:float
+:train-brusselsParis a rail:Train ;
+	rdfs:label "THA 9328"@en ;
+	rdfs:comment "Train THA 9328 departing from Brussels 11:13 and arriving in Paris 12:35"@en ;
+	tio:operatedBy :org-db ;
+	rail:has_stop [ a rail:TrainStop ;
+		rdfs:label "Brussels departure 11:13"@en ;
+		transit:departureTime "11:13" ;
+		rail:occur_at [ rail:platform_at :station-brussels ]
+	], [ a rail:TrainStop ;
+		rdfs:label "Paris arrival 12:35"@en ;
+		transit:arrivalTime "12:35" ;
+		rail:occur_at [ rail:platform_at :station-paris ]
+	] .
+
+:train-parisBarcelona a rail:Train ;
+	rdfs:label "Nº 9711"@en ;
+	rdfs:comment "Train Nº 9711 departing from Paris 7:15 and arriving in Barcelona 13:40"@en ;
+	tio:operatedBy :org-renfe ;
+	rail:has_stop [ a rail:TrainStop ;
+		rdfs:label "Paris departure 7:15"@en ;
+		transit:departureTime "7:15" ;
+		rail:occur_at [ rail:platform_at :station-paris ]
+	], [ a rail:TrainStop ;
+		rdfs:label "Barcelona arrival 13:40"@en ;
+		transit:arrivalTime "13:40" ;
+		rail:occur_at [ rail:platform_at :station-barcelona ]
 	] .
 
 :offer-dsbPadborgHolbæk a gr:Offering ;
@@ -1057,60 +739,6 @@
 		gr:hasCurrencyValue "384"^^xsd:float
 	] .
 
-:offer-dsbHolbækBrusselsReturn a gr:Offering ;
-	gr:name "Holbæk-Brussels-Holbæk"@en ;
-	gr:description "Train ticket from Holbæk to Brussels and return"@en ;
-	rdfs:comment "Price includes couchette reservation (2*DKK152)"@en ;
-	gr:includes :ticket-dsbHolbækRoskilde, :ticket-dsbRoskildeHolbæk,
-		:ticket-dbRoskildeCologne, :ticket-dbCologneRoskilde,
-		:ticket-thalysCologneBrussels, :ticket-thalysBrusselsCologne ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK2038 is approx. €274"@en ;
-		gr:hasCurrency "DKK"@en ;
-		gr:hasCurrencyValue "2038"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK2524 is approx. €339"@en ;
-		gr:hasCurrency "DKK"@en ;
-		gr:hasCurrencyValue "2524"^^xsd:float
-	] .
-
-:offer-dsbInterrail10 a gr:Offering ;
-	gr:name "InterRail"@en ;
-	gr:description "InterRail 10 days within 22 days"@en ;
-	rdfs:comment "for spring discount, first ride must begin no later than May 16th"@en ;
-	gr:includes :ticket-dbInterrail10 ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:availabilityEnds "2014-05-16T23:59:59Z"^^xsd:dateTime ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK2580 is approx. €346"@en ;
-		gr:hasCurrency "DKK"@en ;
-		gr:hasCurrencyValue "2580"^^xsd:float ;
-		gr:validThrough "2014-03-31T23:59:59Z"^^xsd:dateTime
-	], [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK3035 is approx. €407"@en ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "3035"^^xsd:float
-	] .
-
-:offer-dsbInterrail5 a gr:Offering ;
-	gr:name "InterRail"@en ;
-	gr:description "InterRail 5 days within 10 days"@en ;
-	rdfs:comment "for spring discount, first ride must begin no later than May 16th"@en ;
-	gr:includes :ticket-dbInterrail5 ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:availabilityEnds "2014-05-16T23:59:59Z"^^xsd:dateTime ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK1820 is approx. €244"@en ;
-		gr:hasCurrency "DKK"@en ;
-		gr:hasCurrencyValue "1820"^^xsd:float ;
-		gr:validThrough "2014-03-31T23:59:59Z"^^xsd:dateTime
-	], [ a gr:UnitPriceSpecification ;
-		rdfs:comment "DKK2140 is approx. €287"@en ;
-		gr:hasCurrency "DKK"@en ;
-		gr:hasCurrencyValue "2140"^^xsd:float
-	] .
-
 :offer-dbBahncard25Probe a gr:Offering ;
 	gr:name "Probe-BahnCard 25"@en ;
 	gr:description "BahnCard 25 valid for 4 months"@en ;
@@ -1125,20 +753,6 @@
 		gr:hasCurrencyValue "25"^^xsd:float
 	] .
 
-:offer-dbBahncard25 a gr:Offering ;
-	gr:name "BahnCard25"@en ;
-	gr:description "BahnCard 25 valid for 1 year"@en ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:advanceBookingRequirement [
-		a gr:QuantitativeValueInteger;
-		gr:hasValueInteger "12"^^xsd:int;
-		gr:hasUnitOfMeasurement "MON"^^xsd:string
-	] ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "62"^^xsd:float
-	] .
-
 :offer-dbInterrail10 a gr:Offering ;
 	gr:name "InterRail"@en ;
 	gr:description "InterRail 10 days within 22 days"@en ;
@@ -1155,22 +769,6 @@
 		gr:hasCurrencyValue "399"^^xsd:float
 	] .
 
-:offer-dbInterrail5 a gr:Offering ;
-	gr:name "InterRail"@en ;
-	gr:description "InterRail 5 days within 10 days"@en ;
-	rdfs:comment "for spring discount, first ride must begin no later than May 16th"@en ;
-	gr:includes :ticket-dbInterrail5 ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:availabilityEnds "2014-05-16T23:59:59Z"^^xsd:dateTime ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "239"^^xsd:float ;
-		gr:validThrough "2014-03-31T23:59:59Z"^^xsd:dateTime
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "281"^^xsd:float
-	] .
-
 :offer-dbHolbækCologne a gr:Offering ;
 	gr:name "Holbæk-Cologne"@en ;
 	gr:description "Train ticket from Holbæk to Cologne"@en ;
@@ -1199,35 +797,6 @@
 		gr:hasCurrencyValue "99"^^xsd:float
 	] .
 
-:offer-dbHolbækCologneBahncard25 a gr:Offering ;
-	gr:name "Holbæk-Cologne"@en ;
-	gr:description "Train ticket from Holbæk to Cologne incl. Bahncard25 discount"@en ;
-	rdfs:comment "Price includes couchette reservation (€15.50)"@en ;
-	gr:includes :ticket-dsbHolbækRoskilde, :ticket-dbRoskildeCologne ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "63.25"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "79.25"^^xsd:float
-	] .
-
-:offer-dbCologneHolbækBahncard25 a gr:Offering ;
-	gr:name "Cologne-Holbæk"@en ;
-	gr:description "Train ticket from Cologne to Holbæk incl. Bahncard25 discount"@en ;
-	rdfs:comment "Price includes couchette reservation (€15.50)"@en ;
-	gr:includes :ticket-dbCologneRoskilde, :ticket-dsbRoskildeHolbæk ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:eligibleCustomerTypes :membership-bahncard25 ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "63.25"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "79.25"^^xsd:float
-	] .
-
 :offer-dbCologneBrussels a gr:Offering ;
 	gr:name "Cologne-Brussels"@en ;
 	gr:description "Train ticket from Cologne to Brussels"@en ;
@@ -1254,54 +823,7 @@
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "19"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "29"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "34"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "39"^^xsd:float
-	] .
-
-:offer-dbCologneBrusselsBahncard25 a gr:Offering ;
-	gr:name "Cologne-Brussels"@en ;
-	gr:description "Train ticket from Cologne to Brussels incl. Bahncard25 discount"@en ;
-	gr:includes :ticket-dbCologneBrussels ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "14.20"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "21.65"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "25.45"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "29.15"^^xsd:float
-	] .
-
-:offer-dbBrusselsCologneBahncard25 a gr:Offering ;
-	gr:name "Brussels-Cologne"@en ;
-	gr:description "Train ticket from Brussels to Cologne incl. Bahncard25 discount"@en ;
-	gr:includes :ticket-dbBrusselsCologne ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "14.20"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "21.65"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "25.45"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "29.15"^^xsd:float
+		gr:hasCurrencyValue "53"^^xsd:float
 	] .
 
 :offer-sncfBrusselsParis a gr:Offering ;
@@ -1311,13 +833,7 @@
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "50"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "58"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "81"^^xsd:float
+		gr:hasCurrencyValue "99"^^xsd:float
 	] .
 
 :offer-sncfParisBrussels a gr:Offering ;
@@ -1327,26 +843,7 @@
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "40"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "50"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "58"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "81"^^xsd:float
-	] .
-
-:offer-sncfParisBarcelonaReturn a gr:Offering ;
-	gr:name "Paris-Barcelona-Paris"@en ;
-	gr:description "Train ticket from Paris to Barcelona and return"@en ;
-	gr:includes :ticket-renfeParisBarcelona, :ticket-renfeBarcelonaParis ;
-	gr:hasBusinessFunction gr:Sell ;
-	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "179.20"^^xsd:float
+		gr:hasCurrencyValue "99"^^xsd:float
 	] .
 
 :offer-sncfParisBarcelona a gr:Offering ;
@@ -1356,13 +853,7 @@
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "109"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "117.40"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "125.70"^^xsd:float
+		gr:hasCurrencyValue "176.10"^^xsd:float
 	] .
 
 :offer-sncfBarcelonaParis a gr:Offering ;
@@ -1372,13 +863,7 @@
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "97.90"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "117.40"^^xsd:float
-	], [ a gr:UnitPriceSpecification ;
-		gr:hasCurrency "EUR"@en ;
-		gr:hasCurrencyValue "125.70"^^xsd:float
+		gr:hasCurrencyValue "176.10"^^xsd:float
 	] .
 
 :membership-bahncard25 a gr:BusinessEntityType;
@@ -1450,8 +935,7 @@
 	foaf:Homepage <http://sirireiter.dk/> .
 
 :station-barcelona a rail:Station ;
-	rdfs:label "Some train station in Barcelona" ;
-	rdfs:comment "any station, but same one across routes" ;
+	rdfs:label "Barcelona Sants" ;
 	rail:serves dbpedia:Barcelona .
 
 :station-brussels a rail:Station ;
@@ -1471,6 +955,5 @@
 	rail:serves dbpedia:Roskilde .
 
 :station-paris a rail:Station ;
-	rdfs:label "Some train station in Paris" ;
-	rdfs:comment "any station, but same one across routes" ;
+	rdfs:label "Paris Gare du Nord" ;
 	rail:serves dbpedia:Paris .