Include only tickets within approved budget for Debian subsidies.

1 files changed, 6 insertions, 25 deletions

diff --git a/data/2014/europe.ttl b/data/2014/europe.ttl
index 77f4269..a77e799 100644
--- a/data/2014/europe.ttl
+++ b/data/2014/europe.ttl
@@ -642,13 +642,11 @@
 		:coverage-epfsug, :coverage-fosdem .
 
 :coverage-debianJonas a pc:Contract ;
-	pc:item :train-holbækRoskilde, :train-roskildeCologne,
-		:train-cologneBrussels, :train-brusselsParis,
+	pc:item :train-cologneBrussels, :train-brusselsParis,
 		:train-parisBarcelona, :train-barcelonaPerpignan,
 		:train-perpignanParis,
 		:train-parisLille, :train-brusselsCologne,
-		:train-cologneRoskilde, :train-roskildeHolbæk,
-		:taxi-parisTowardsBarcelona, :taxi-barcelonaToVenue ;
+		: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 ;
@@ -658,12 +656,10 @@ Excludes Cologne <-> Paris: Covered by EPFSUG and FOSDEM"""@en ;
 	pc:subsidy :subsidy-debianJonas .
 
 :coverage-debianSiri a pc:Contract ;
-	pc:item :train-holbækRoskilde, :train-roskildeCologne,
-		:train-cologneBrussels, :train-brusselsParis,
+	pc:item :train-cologneBrussels, :train-brusselsParis,
 		:train-parisBarcelona, :train-barcelonaPerpignan,
 		:train-perpignanParis,
-		:train-parisLille, :train-brusselsCologne,
-		:train-cologneRoskilde, :train-roskildeHolbæk ;
+		:train-parisLille, :train-brusselsCologne ;
 	pc:estimatedPrice :price-debianSiriEstimate ;
 	pc:agreedPrice :price-debianSiriEstimate ;
 	pc:subsidy :subsidy-debianSiri .
@@ -712,34 +708,19 @@ Includes Paris -> Brussels: Needed coverage for Interrail ticket sharing to work
 	payment:payer :org-debian ;
 	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-taxiParisTowardsBarcelona ;
-		payment:netAmount "12"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-sncfParisBarcelonaSeat ;
-		payment:netAmount "26.50"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
 		payment:payment :offer-taxiBarcelonaToVenue ;
 		payment:netAmount "13.35"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-sncfPerpignanParisSeat ;
-		payment:netAmount "25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
 		payment:payment :share-debianJonas ;
 		payment:netAmount "233.09"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "309.94"^^xsd:decimal .
+	payment:totalNetAmount "246.44"^^xsd:decimal .
 
 :subsidy-debianSiri a payment:Payment ;
 	rdfs:label "Debian sponsorship Holbæk -> Barcelona -> Brussels for Siri"@en ;
 	payment:payer :org-debian ;
 	payment:payee :person-siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offer-dbHolbækCologne ;
-		payment:netAmount "79.25"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
-		payment:payment :offer-sncfBrusselsParisSeat ;
-		payment:netAmount "30"^^xsd:decimal
-	], [ a payment:ExpenditureLine ;
 		payment:payment :offer-sncfParisBarcelonaSeat ;
 		payment:netAmount "26.50"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
@@ -752,7 +733,7 @@ Includes Paris -> Brussels: Needed coverage for Interrail ticket sharing to work
 		payment:payment :offer-dbInterrail10 ;
 		payment:netAmount "339"^^xsd:decimal
 	] ;
-	payment:totalNetAmount "505.75"^^xsd:decimal .
+	payment:totalNetAmount "396.50"^^xsd:decimal .
 
 :subsidy-greens a payment:Payment ;
 	rdfs:label "Greens/EFA sponsorship Holbæk -> Cologne and Berlin -> Hobro for Jonas"@en ;