Fix update Greens/EFA subsidy. Fix provider of return ride. Add taxi rides.

1 files changed, 83 insertions, 8 deletions

diff --git a/data/2014/europe.ttl b/data/2014/europe.ttl
index db38c73..8735273 100644
--- a/data/2014/europe.ttl
+++ b/data/2014/europe.ttl
@@ -6,6 +6,9 @@
 @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#> .
@@ -30,7 +33,7 @@
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/floss> ;
 		tl:start "2014-03-04T00:00:00+01:00"^^xsd:dateTime ;
-		tl:end "2014-03-27T23:59:59+01:00"^^xsd:dateTime
+		tl:end "2014-04-09T23:59:59+01:00"^^xsd:dateTime
 	] .
 
 :conference-minidebconf a event:Event ;
@@ -57,6 +60,7 @@
 		:ride-brusselsParis, :ride-parisBarcelona,
 		:ride-holbækBarcelona, :ride-holbækBarcelona_2,
 		:ride-barcelonaParis, :ride-parisBrussels,
+		:ride-brusselsFromMauricio, :ride-brusselsFromMauricio,
 		:ride-brusselsHolbæk,
 		:sleep-3-5, :sleep-3-6, :sleep-3-7, :sleep-3-8, :sleep-3-9,
 		:sleep-3-10, :sleep-3-11, :sleep-3-12, :sleep-3-13,
@@ -92,6 +96,24 @@
 		tl:end "2014-03-05T10:00:00+01:00"^^xsd:dateTime
 	] .
 
+:ride-brusselsToMauricio a event:Event ;
+	rdfs:label "taxi EP→Mauricio (Greens)"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-03-14T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-14T00:00:00+01:00"^^xsd:dateTime
+	] .
+
+:ride-brusselsFromMauricio a event:Event ;
+	rdfs:label "taxi Mauricio→EP (Greens)"@en ;
+	dcterms:subject :concept-attendanceAll ;
+	event:time [ a tl:Interval ;
+		tl:onTimeLine </timeline/travel> ;
+		tl:start "2014-03-26T00:00:00+01:00"^^xsd:dateTime ;
+		tl:end "2014-03-26T00:00:00+01:00"^^xsd:dateTime
+	] .
+
 :ride-brusselsParis a event:Event ;
 	rdfs:label "2 x train Brussels→Paris (Debian + FOSDEM)"@en ;
 	dcterms:subject :concept-attendanceAll ;
@@ -743,10 +765,24 @@ Includes Paris -> Brussels: Needed coverage for Interrail ticket sharing to work
 		payment:payment :offer-dbHolbækCologne ;
 		payment:netAmount "79.25"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbCologneHolbæk ;
-		payment:netAmount "79.25"^^xsd:decimal
+		payment:payment :offer-taxiBrusselsToMauricio ;
+		payment:netAmount "20"^^xsd:decimal
+	], [ a payment:ExpenditureLine ;
+		payment:payment :offer-sncbBrussels10 ;
+		payment:netAmount "14"^^xsd:decimal
+	], [ a payment:ExpenditureLine ;
+		payment:payment :offer-sncbBrussels10 ;
+		payment:netAmount "14"^^xsd:decimal
+	], [ a payment:ExpenditureLine ;
+		payment:payment :offer-taxiBrusselsFromMauricio ;
+		payment:netAmount "21.20"^^xsd:decimal
+	], [ a payment:ExpenditureLine ;
+		grx:hasPrice "379"^^unit:DanishKrone ;
+		grx:currencyConversion <http://www.currency2currency.org/DKK/EUR/20140406> ;
+		payment:payment :offer-dsbBerlinHobro ;
+		payment:netAmount "50.77"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "184.50"^^xsd:decimal .
+	payment:totalNetAmount "224.22"^^xsd:decimal .
 
 :subsidy-epfsug a payment:Payment ;
 	rdfs:label "EPFSUG sponsorship Cologne -> Brussels and Paris -> Brussels for Jonas"@en ;
@@ -996,6 +1032,14 @@ Includes Paris -> Brussels: Needed coverage for Interrail ticket sharing to work
 	tio:from :station-roskilde ;
 	tio:to :station-holbæk .
 
+:taxi-brusselsToMauricio a tio:Taxi ;
+	tio:from :place-ep ;
+	tio:to :place-mauricio .
+
+:taxi-brusselsFromMauricio a tio:Taxi ;
+	tio:from :place-mauricio ;
+	tio:to :place-ep .
+
 :taxi-parisFromBrussels a tio:Taxi ;
 	tio:from :station-parisNord ;
 	tio:to :place-irill .
@@ -1078,15 +1122,14 @@ Includes Paris -> Brussels: Needed coverage for Interrail ticket sharing to work
 		gr:hasCurrencyValue "53"^^xsd:float
 	] .
 
-:offer-dbBerlinHobro a gr:Offering ;
+:offer-dsbBerlinHobro 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
+		gr:hasCurrency "DKK"@en ;
+		gr:hasCurrencyValue "379"^^xsd:float
 	] .
 
 :offer-sncfBrusselsParisPlain a gr:Offering ;
@@ -1149,6 +1192,30 @@ Includes Paris -> Brussels: Needed coverage for Interrail ticket sharing to work
 		gr:hasCurrencyValue "176.10"^^xsd:float
 	] .
 
+:offer-taxiBrusselsToMauricio a gr:Offering ;
+	gr:Name "EP -> Mauricio"@en ;
+	gr:description "Taxi ride in Brussels from European Parliament to home of Mauricio"@en ;
+	gr:includes [ a tio:TicketPlaceholder ;
+		tio:accessTo :taxi-brusselsToMauricio
+	] ;
+	gr:hasBusinessFunction gr:Sell ;
+	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
+		gr:hasCurrency "EUR"@en ;
+		gr:hasCurrencyValue "20"^^xsd:float
+	] .
+
+:offer-taxiBrusselsFromMauricio a gr:Offering ;
+	gr:Name "Mauricio -> EP"@en ;
+	gr:description "Taxi ride in Brussels from home of Mauricion to European Parliament"@en ;
+	gr:includes [ a tio:TicketPlaceholder ;
+		tio:accessTo :taxi-brusselsFromMauricio
+	] ;
+	gr:hasBusinessFunction gr:Sell ;
+	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
+		gr:hasCurrency "EUR"@en ;
+		gr:hasCurrencyValue "21.20"^^xsd:float
+	] .
+
 :offer-taxiParisFromBrussels a gr:Offering ;
 	gr:Name "Gare du Nord -> Place d'Italie"@en ;
 	gr:description "Taxi ride in Paris from Gare du Nord to Place d'Italie"@en ;
@@ -1389,6 +1456,14 @@ Brussels -> Paris: 99"""@en ;
 	rdfs:label "Århus Banegård" ;
 	rail:serves dbpedia:Århus .
 
+:place-ep a geo:SpatialThing ;
+	rdfs:label "European Parliament"@en ;
+	spacerel:within dbpedia:Brussels .
+
+:place-mauricio a geo:SpatialThing ;
+	rdfs:label "Mauricio's home"@en ;
+	spacerel:within dbpedia:Brussels .
+
 :place-irill a geo:SpatialThing ;
 	rdfs:label "IRILL office"@en ;
 #	foaf:based_near dbpedia:Place_d'Italie ;