diff --git a/src/aq-report/output/dataflow-D.xml b/src/aq-report/output/dataflow-D.xml
index 22bc3c2..c6eeeea 100644
--- a/src/aq-report/output/dataflow-D.xml
+++ b/src/aq-report/output/dataflow-D.xml
@@ -1,4 +1,5 @@
+
+ gml:id="REP-NL_RIVM_20140905_D">
+
+
+
+
+
+
+
+
+ 3.745008
+ 50.88805771
+
+
+ 6.9333334
+ 53.33166504
+
+
+
+
-
+
true
2013 Dataflow D The Netherlands
-
- NL_RIVM_20140903
- NL.RIVM.AQ
-
+
+
+ NL_RIVM_20140905
+ NL.RIVM.AQ
+
@@ -43,19 +63,19 @@
-
-
-
-
-
-
-
- Postbus 1 3720 BA
-
-
-
-
-
+
+
+
+
+
+
+
+ Postbus 1 3720 BA
+
+
+
+
+
Bilthoven
@@ -68,248 +88,135 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- STA-NL00807
- NL.RIVM.AQ
-
+
+
+ STA-NL00807
+ NL.RIVM.AQ
+
Hellendoorn-Luttenbergerweg
-
- 52.38916779 6.40361404
-
+
+
+ 52.38916779 6.40361404
+
false
@@ -332,23 +239,22 @@
7
-
-
-
-
- STA-NL00818
- NL.RIVM.AQ
-
+
+
+ STA-NL00818
+ NL.RIVM.AQ
+
Barsbeek-De Veenen
-
- 52.65500259 6.01806974
-
+
+
+ 52.65500259 6.01806974
+
false
@@ -371,23 +277,22 @@
1
-
-
-
-
- STA-NL00918
- NL.RIVM.AQ
-
+
+
+ STA-NL00918
+ NL.RIVM.AQ
+
Balk-Trophornsterweg
-
- 52.91691589 5.57349157
-
+
+
+ 52.91691589 5.57349157
+
false
@@ -410,23 +315,22 @@
1
-
-
-
-
- STA-NL00934
- NL.RIVM.AQ
-
+
+
+ STA-NL00934
+ NL.RIVM.AQ
+
Kollumerwaard-Hooge Zuidwal
-
- 53.33166504 6.27750874
-
+
+
+ 53.33166504 6.27750874
+
false
@@ -449,23 +353,22 @@
1
-
-
-
-
- STA-NL00131
- NL.RIVM.AQ
-
+
+
+ STA-NL00131
+ NL.RIVM.AQ
+
Vredepeel-Vredeweg
-
- 51.54111099 5.85361385
-
+
+
+ 51.54111099 5.85361385
+
false
@@ -488,23 +391,22 @@
28
-
-
-
-
- STA-NL00133
- NL.RIVM.AQ
-
+
+
+ STA-NL00133
+ NL.RIVM.AQ
+
Wijnandsrade-Opfergeltstraat
-
- 50.9030571 5.882236
-
+
+
+ 50.9030571 5.882236
+
false
@@ -527,23 +429,22 @@
96
-
-
-
-
- STA-NL00230
- NL.RIVM.AQ
-
+
+
+ STA-NL00230
+ NL.RIVM.AQ
+
Biest Houtakker-Biestsestraat
-
- 51.51944351 5.14890242
-
+
+
+ 51.51944351 5.14890242
+
false
@@ -566,23 +467,22 @@
15
-
-
-
-
- STA-NL00235
- NL.RIVM.AQ
-
+
+
+ STA-NL00235
+ NL.RIVM.AQ
+
Huijbergen-Vennekenstraat
-
- 51.43500137 4.36028624
-
+
+
+ 51.43500137 4.36028624
+
false
@@ -605,23 +505,22 @@
18
-
-
-
-
- STA-NL00236
- NL.RIVM.AQ
-
+
+
+ STA-NL00236
+ NL.RIVM.AQ
+
Eindhoven-Genovevalaan
-
- 51.46972275 5.47278357
-
+
+
+ 51.46972275 5.47278357
+
false
@@ -644,23 +543,22 @@
17
-
-
-
-
- STA-NL00237
- NL.RIVM.AQ
-
+
+
+ STA-NL00237
+ NL.RIVM.AQ
+
Eindhoven-Noordbrabantlaan
-
- 51.44528 5.4289
-
+
+
+ 51.44528 5.4289
+
false
@@ -683,23 +581,22 @@
18
-
-
-
-
- STA-NL00301
- NL.RIVM.AQ
-
+
+
+ STA-NL00301
+ NL.RIVM.AQ
+
Zierikzee-Lange Slikweg
-
- 51.63555908 3.91694736
-
+
+
+ 51.63555908 3.91694736
+
false
@@ -722,23 +619,22 @@
-1
-
-
-
-
- STA-NL00318
- NL.RIVM.AQ
-
+
+
+ STA-NL00318
+ NL.RIVM.AQ
+
Philippine-Stelleweg
-
- 51.29527664 3.74945831
-
+
+
+ 51.29527664 3.74945831
+
false
@@ -761,23 +657,22 @@
5
-
-
-
-
- STA-NL00404
- NL.RIVM.AQ
-
+
+
+ STA-NL00404
+ NL.RIVM.AQ
+
Den Haag-Rebecquestraat
-
- 52.07805634 4.28917217
-
+
+
+ 52.07805634 4.28917217
+
false
@@ -800,23 +695,22 @@
2
-
-
-
-
- STA-NL00418
- NL.RIVM.AQ
-
+
+
+ STA-NL00418
+ NL.RIVM.AQ
+
Rotterdam-Schiedamsevest
-
- 51.91500092 4.48028898
-
+
+
+ 51.91500092 4.48028898
+
false
@@ -839,23 +733,22 @@
3
-
-
-
-
- STA-NL00433
- NL.RIVM.AQ
-
+
+
+ STA-NL00433
+ NL.RIVM.AQ
+
Vlaardingen-Floreslaan
-
- 51.91139221 4.32695293
-
+
+
+ 51.91139221 4.32695293
+
false
@@ -878,23 +771,22 @@
-1
-
-
-
-
- STA-NL00437
- NL.RIVM.AQ
-
+
+
+ STA-NL00437
+ NL.RIVM.AQ
+
Westmaas-Groeneweg
-
- 51.78749847 4.45084143
-
+
+
+ 51.78749847 4.45084143
+
false
@@ -917,23 +809,22 @@
-1
-
-
-
-
- STA-NL00518
- NL.RIVM.AQ
-
+
+
+ STA-NL00518
+ NL.RIVM.AQ
+
Amsterdam-Cabeliaustraat
-
- 52.38472366 4.80361414
-
+
+
+ 52.38472366 4.80361414
+
false
@@ -956,23 +847,22 @@
1
-
-
-
-
- STA-NL00107
- NL.RIVM.AQ
-
+
+
+ STA-NL00107
+ NL.RIVM.AQ
+
Posterholt-Vlodropperweg
-
- 51.1202774 6.04306364
-
+
+
+ 51.1202774 6.04306364
+
false
@@ -995,23 +885,22 @@
32
-
-
-
-
- STA-NL00537
- NL.RIVM.AQ
-
+
+
+ STA-NL00537
+ NL.RIVM.AQ
+
Haarlem-Amsterdamsevaart
-
- 52.38166428 4.64806938
-
+
+
+ 52.38166428 4.64806938
+
false
@@ -1034,23 +923,22 @@
1
-
-
-
-
- STA-NL00538
- NL.RIVM.AQ
-
+
+
+ STA-NL00538
+ NL.RIVM.AQ
+
Wieringerwerf-Medemblikkerweg
-
- 52.80472183 5.05084181
-
+
+
+ 52.80472183 5.05084181
+
false
@@ -1073,23 +961,22 @@
-4
-
-
-
-
- STA-NL00627
- NL.RIVM.AQ
-
+
+
+ STA-NL00627
+ NL.RIVM.AQ
+
Bilthoven-Van Leeuwenhoeklaan
-
- 52.120833 5.195567
-
+
+
+ 52.120833 5.195567
+
false
@@ -1112,23 +999,22 @@
3
-
-
-
-
- STA-NL00628
- NL.RIVM.AQ
-
+
+
+ STA-NL00628
+ NL.RIVM.AQ
+
De Bilt-Wilhelminalaan
-
- 52.100833 5.177789
-
+
+
+ 52.100833 5.177789
+
false
@@ -1151,23 +1037,22 @@
2
-
-
-
-
- STA-NL00631
- NL.RIVM.AQ
-
+
+
+ STA-NL00631
+ NL.RIVM.AQ
+
Biddinghuizen-Hoekwantweg
-
- 52.44850159 5.61915016
-
+
+
+ 52.44850159 5.61915016
+
false
@@ -1190,23 +1075,22 @@
-4
-
-
-
-
- STA-NL00633
- NL.RIVM.AQ
-
+
+
+ STA-NL00633
+ NL.RIVM.AQ
+
Zegveld-Oude Meije
-
- 52.138889 4.838336
-
+
+
+ 52.138889 4.838336
+
false
@@ -1229,23 +1113,22 @@
-2
-
-
-
-
- STA-NL00636
- NL.RIVM.AQ
-
+
+
+ STA-NL00636
+ NL.RIVM.AQ
+
Utrecht-de Jongweg
-
- 52.106111 5.125286
-
+
+
+ 52.106111 5.125286
+
false
@@ -1268,23 +1151,22 @@
1
-
-
-
-
- STA-NL00639
- NL.RIVM.AQ
-
+
+
+ STA-NL00639
+ NL.RIVM.AQ
+
Utrecht-Erzeijstraat
-
- 52.068889 5.121114
-
+
+
+ 52.068889 5.121114
+
false
@@ -1307,23 +1189,22 @@
1
-
-
-
-
- STA-NL00722
- NL.RIVM.AQ
-
+
+
+ STA-NL00722
+ NL.RIVM.AQ
+
Eibergen-Lintveldseweg
-
- 52.0925 6.605839
-
+
+
+ 52.0925 6.605839
+
false
@@ -1346,23 +1227,22 @@
19
-
-
-
-
- STA-NL00641
- NL.RIVM.AQ
-
+
+
+ STA-NL00641
+ NL.RIVM.AQ
+
Breukelen-Snelweg
-
- 52.203056 4.988614
-
+
+
+ 52.203056 4.988614
+
false
@@ -1385,23 +1265,22 @@
-1
-
-
-
-
- STA-NL00444
- NL.RIVM.AQ
-
+
+
+ STA-NL00444
+ NL.RIVM.AQ
+
De Zilk-Vogelaarsdreef
-
- 52.29805374 4.51028633
-
+
+
+ 52.29805374 4.51028633
+
false
@@ -1424,23 +1303,22 @@
4
-
-
-
-
- STA-NL00732
- NL.RIVM.AQ
-
+
+
+ STA-NL00732
+ NL.RIVM.AQ
+
Speuld-Garderenseweg
-
- 52.27249908 5.72139168
-
+
+
+ 52.27249908 5.72139168
+
false
@@ -1463,23 +1341,22 @@
24
-
-
-
-
- STA-NL00738
- NL.RIVM.AQ
-
+
+
+ STA-NL00738
+ NL.RIVM.AQ
+
Wekerom-Riemterdijk
-
- 52.11249924 5.70861912
-
+
+
+ 52.11249924 5.70861912
+
false
@@ -1502,23 +1379,22 @@
18
-
-
-
-
- STA-NL00929
- NL.RIVM.AQ
-
+
+
+ STA-NL00929
+ NL.RIVM.AQ
+
Valthermond-Noorderdiep
-
- 52.87666321 6.9333334
-
+
+
+ 52.87666321 6.9333334
+
false
@@ -1541,23 +1417,22 @@
10
-
-
-
-
- STA-NL00445
- NL.RIVM.AQ
-
+
+
+ STA-NL00445
+ NL.RIVM.AQ
+
Den Haag-Veerkade
-
- 52.075 4.316125
-
+
+
+ 52.075 4.316125
+
false
@@ -1580,23 +1455,22 @@
4
-
-
-
-
- STA-NL00741
- NL.RIVM.AQ
-
+
+
+ STA-NL00741
+ NL.RIVM.AQ
+
Nijmegen-Graafseweg
-
- 51.848889 5.858061
-
+
+
+ 51.848889 5.858061
+
false
@@ -1619,23 +1493,22 @@
30
-
-
-
-
- STA-NL00742
- NL.RIVM.AQ
-
+
+
+ STA-NL00742
+ NL.RIVM.AQ
+
Nijmegen-Ruyterstraat
-
- 51.838889 5.858061
-
+
+
+ 51.838889 5.858061
+
false
@@ -1658,23 +1531,22 @@
30
-
-
-
-
- STA-NL00937
- NL.RIVM.AQ
-
+
+
+ STA-NL00937
+ NL.RIVM.AQ
+
Groningen-Europaweg
-
- 53.21805573 6.57889986
-
+
+
+ 53.21805573 6.57889986
+
false
@@ -1697,23 +1569,22 @@
2
-
-
-
-
- STA-NL00136
- NL.RIVM.AQ
-
+
+
+ STA-NL00136
+ NL.RIVM.AQ
+
Heerlen-Looierstraat
-
- 50.88805771 5.97111416
-
+
+
+ 50.88805771 5.97111416
+
false
@@ -1736,23 +1607,22 @@
100
-
-
-
-
- STA-NL00447
- NL.RIVM.AQ
-
+
+
+ STA-NL00447
+ NL.RIVM.AQ
+
Leiden-Willem de Zwijgerlaan
-
- 52.16805649 4.50806093
-
+
+
+ 52.16805649 4.50806093
+
false
@@ -1775,23 +1645,22 @@
1
-
-
-
-
- STA-NL00240
- NL.RIVM.AQ
-
+
+
+ STA-NL00240
+ NL.RIVM.AQ
+
Breda-Tilburgseweg
-
- 51.59360886 4.82500839
-
+
+
+ 51.59360886 4.82500839
+
false
@@ -1814,23 +1683,22 @@
4
-
-
-
-
- STA-NL00241
- NL.RIVM.AQ
-
+
+
+ STA-NL00241
+ NL.RIVM.AQ
+
Breda-Bastenakenstraat
-
- 51.60333252 4.78084707
-
+
+
+ 51.60333252 4.78084707
+
false
@@ -1853,23 +1721,22 @@
1
-
-
-
-
- STA-NL00446
- NL.RIVM.AQ
-
+
+
+ STA-NL00446
+ NL.RIVM.AQ
+
Den Haag-Bleriotlaan
-
- 52.03972244 4.36056376
-
+
+
+ 52.03972244 4.36056376
+
false
@@ -1892,23 +1759,22 @@
-2
-
-
-
-
- STA-NL00448
- NL.RIVM.AQ
-
+
+
+ STA-NL00448
+ NL.RIVM.AQ
+
Rotterdam-Bentinckplein
-
- 51.92694473 4.46167755
-
+
+
+ 51.92694473 4.46167755
+
false
@@ -1931,23 +1797,22 @@
2
-
-
-
-
- STA-NL00938
- NL.RIVM.AQ
-
+
+
+ STA-NL00938
+ NL.RIVM.AQ
+
Groningen-Nijensteinheerd
-
- 53.24694443 6.60889721
-
+
+
+ 53.24694443 6.60889721
+
false
@@ -1970,23 +1835,22 @@
-1
-
-
-
-
- STA-NL00002
- NL.RIVM.AQ
-
+
+
+ STA-NL00002
+ NL.RIVM.AQ
+
Amsterdam-Haarlemmerweg
-
- 52.38500214 4.87611961
-
+
+
+ 52.38500214 4.87611961
+
false
@@ -2009,23 +1873,22 @@
4
-
-
-
-
- STA-NL00003
- NL.RIVM.AQ
-
+
+
+ STA-NL00003
+ NL.RIVM.AQ
+
Amsterdam-Nieuwendammerdijk
-
- 52.38888931 4.94389725
-
+
+
+ 52.38888931 4.94389725
+
false
@@ -2048,23 +1911,22 @@
1
-
-
-
-
- STA-NL00007
- NL.RIVM.AQ
-
+
+
+ STA-NL00007
+ NL.RIVM.AQ
+
Amsterdam-Einsteinweg
-
- 52.38111115 4.84501123
-
+
+
+ 52.38111115 4.84501123
+
false
@@ -2087,23 +1949,22 @@
2
-
-
-
-
- STA-NL00012
- NL.RIVM.AQ
-
+
+
+ STA-NL00012
+ NL.RIVM.AQ
+
Amsterdam-Van Diemenstraat
-
- 52.3900032 4.88805819
-
+
+
+ 52.3900032 4.88805819
+
false
@@ -2126,23 +1987,22 @@
4
-
-
-
-
- STA-NL00014
- NL.RIVM.AQ
-
+
+
+ STA-NL00014
+ NL.RIVM.AQ
+
Amsterdam-Vondelpark
-
- 52.3599968 4.8088975
-
+
+
+ 52.3599968 4.8088975
+
false
@@ -2165,23 +2025,22 @@
2
-
-
-
-
- STA-NL00016
- NL.RIVM.AQ
-
+
+
+ STA-NL00016
+ NL.RIVM.AQ
+
Amsterdam-Westerpark
-
- 52.39305878 4.87000275
-
+
+
+ 52.39305878 4.87000275
+
false
@@ -2204,23 +2063,22 @@
3
-
-
-
-
- STA-NL00017
- NL.RIVM.AQ
-
+
+
+ STA-NL00017
+ NL.RIVM.AQ
+
Amsterdam-Stadhouderskade
-
- 52.35805511 4.9000001
-
+
+
+ 52.35805511 4.9000001
+
false
@@ -2243,23 +2101,22 @@
4
-
-
-
-
- STA-NL00018
- NL.RIVM.AQ
-
+
+
+ STA-NL00018
+ NL.RIVM.AQ
+
Amsterdam-A10zuid
-
- 52.33388901 4.89806938
-
+
+
+ 52.33388901 4.89806938
+
false
@@ -2282,23 +2139,22 @@
10
-
-
-
-
- STA-NL00545
- NL.RIVM.AQ
-
+
+
+ STA-NL00545
+ NL.RIVM.AQ
+
Amsterdam-A10 west
-
- 52.33949661 4.84102249
-
+
+
+ 52.33949661 4.84102249
+
false
@@ -2321,23 +2177,22 @@
1
-
-
-
-
- STA-NL00019
- NL.RIVM.AQ
-
+
+
+ STA-NL00019
+ NL.RIVM.AQ
+
Amsterdam-Oude Schans
-
- 52.3730545 4.90500307
-
+
+
+ 52.3730545 4.90500307
+
false
@@ -2360,23 +2215,22 @@
2
-
-
-
-
- STA-NL00020
- NL.RIVM.AQ
-
+
+
+ STA-NL00020
+ NL.RIVM.AQ
+
Amsterdam-Jan van Galenstraat
-
- 52.3758316 4.86084175
-
+
+
+ 52.3758316 4.86084175
+
false
@@ -2399,23 +2253,22 @@
4
-
-
-
-
- STA-NL00021
- NL.RIVM.AQ
-
+
+
+ STA-NL00021
+ NL.RIVM.AQ
+
Amsterdam-Kantershof (Zuid Oost)
-
- 52.32138824 4.98889446
-
+
+
+ 52.32138824 4.98889446
+
false
@@ -2438,23 +2291,22 @@
-3
-
-
-
-
- STA-NL00022
- NL.RIVM.AQ
-
+
+
+ STA-NL00022
+ NL.RIVM.AQ
+
Amsterdam-Sportpark Ookmeer (Osdorp)
-
- 52.37888718 4.79361963
-
+
+
+ 52.37888718 4.79361963
+
false
@@ -2477,23 +2329,22 @@
-1
-
-
-
-
- STA-NL00701
- NL.RIVM.AQ
-
+
+
+ STA-NL00701
+ NL.RIVM.AQ
+
Zaandam-Wagenschotpad
-
- 52.45000076 4.8166666
-
+
+
+ 52.45000076 4.8166666
+
false
@@ -2516,23 +2367,22 @@
1
-
-
-
-
- STA-NL00246
- NL.RIVM.AQ
-
+
+
+ STA-NL00246
+ NL.RIVM.AQ
+
Fijnaart-Zwingelspaansedijk
-
- 51.65277863 4.51388884
-
+
+
+ 51.65277863 4.51388884
+
false
@@ -2555,23 +2405,22 @@
1
-
-
-
-
- STA-NL00643
- NL.RIVM.AQ
-
+
+
+ STA-NL00643
+ NL.RIVM.AQ
+
Utrecht-Griftpark
-
- 52.10222244 5.12833357
-
+
+
+ 52.10222244 5.12833357
+
false
@@ -2594,23 +2443,22 @@
2
-
-
-
-
- STA-NL00247
- NL.RIVM.AQ
-
+
+
+ STA-NL00247
+ NL.RIVM.AQ
+
Veldhoven-Europalaan
-
- 51.40750122 5.39333344
-
+
+
+ 51.40750122 5.39333344
+
false
@@ -2633,23 +2481,22 @@
22
-
-
-
-
- STA-NL00553
- NL.RIVM.AQ
-
+
+
+ STA-NL00553
+ NL.RIVM.AQ
+
Wijk aan Zee-Burgemeester Rothestraat
-
- 52.493889 4.603333
-
+
+
+ 52.493889 4.603333
+
false
@@ -2672,23 +2519,22 @@
7
-
-
-
-
- STA-NL00485
- NL.RIVM.AQ
-
+
+
+ STA-NL00485
+ NL.RIVM.AQ
+
Hoogvliet-Leemkuil
-
- 51.86610794 4.35527754
-
+
+
+ 51.86610794 4.35527754
+
false
@@ -2711,23 +2557,22 @@
1
-
-
-
-
- STA-NL00494
- NL.RIVM.AQ
-
+
+
+ STA-NL00494
+ NL.RIVM.AQ
+
Schiedam-Alphons Arienstraat
-
- 51.921111 4.401389
-
+
+
+ 51.921111 4.401389
+
false
@@ -2750,23 +2595,22 @@
3
-
-
-
-
- STA-NL00470
- NL.RIVM.AQ
-
+
+
+ STA-NL00470
+ NL.RIVM.AQ
+
Bergambacht-Provincialeweg
-
- 51.92805862 4.77083302
-
+
+
+ 51.92805862 4.77083302
+
false
@@ -2789,23 +2633,22 @@
0
-
-
-
-
- STA-NL00471
- NL.RIVM.AQ
-
+
+
+ STA-NL00471
+ NL.RIVM.AQ
+
Korendijk-Bakkerskeet
-
- 51.76305389 4.27750015
-
+
+
+ 51.76305389 4.27750015
+
false
@@ -2828,23 +2671,22 @@
0
-
-
-
-
- STA-NL00472
- NL.RIVM.AQ
-
+
+
+ STA-NL00472
+ NL.RIVM.AQ
+
Nieuwkoop-Voorweg
-
- 52.16611099 4.85222197
-
+
+
+ 52.16611099 4.85222197
+
false
@@ -2867,23 +2709,22 @@
0
-
-
-
-
- STA-NL00473
- NL.RIVM.AQ
-
+
+
+ STA-NL00473
+ NL.RIVM.AQ
+
Rockanje-Middelweg
-
- 51.89500046 4.07416677
-
+
+
+ 51.89500046 4.07416677
+
false
@@ -2906,23 +2747,22 @@
0
-
-
-
-
- STA-NL00474
- NL.RIVM.AQ
-
+
+
+ STA-NL00474
+ NL.RIVM.AQ
+
Oostvoorne-Strandweg
-
- 51.91694641 4.084167
-
+
+
+ 51.91694641 4.084167
+
false
@@ -2945,23 +2785,22 @@
0
-
-
-
-
- STA-NL00475
- NL.RIVM.AQ
-
+
+
+ STA-NL00475
+ NL.RIVM.AQ
+
Vlaardingen-Deltaweg
-
- 51.9011116 4.34027815
-
+
+
+ 51.9011116 4.34027815
+
false
@@ -2984,23 +2823,22 @@
0
-
-
-
-
- STA-NL00476
- NL.RIVM.AQ
-
+
+
+ STA-NL00476
+ NL.RIVM.AQ
+
Vlaardingen-Trawlerweg
-
- 51.9011116 4.31777763
-
+
+
+ 51.9011116 4.31777763
+
false
@@ -3023,23 +2861,22 @@
0
-
-
-
-
- STA-NL00477
- NL.RIVM.AQ
-
+
+
+ STA-NL00477
+ NL.RIVM.AQ
+
Vlaardingen-Zuidbuurt 34
-
- 51.91111374 4.29638863
-
+
+
+ 51.91111374 4.29638863
+
false
@@ -3062,23 +2899,22 @@
0
-
-
-
-
- STA-NL00478
- NL.RIVM.AQ
-
+
+
+ STA-NL00478
+ NL.RIVM.AQ
+
Vlaardingen-Deltapad G.L.
-
- 51.89889145 4.30472231
-
+
+
+ 51.89889145 4.30472231
+
false
@@ -3101,23 +2937,22 @@
0
-
-
-
-
- STA-NL00479
- NL.RIVM.AQ
-
+
+
+ STA-NL00479
+ NL.RIVM.AQ
+
Hoek v. Holland-Prins Hendrikstraat
-
- 51.97194672 4.14166641
-
+
+
+ 51.97194672 4.14166641
+
false
@@ -3140,23 +2975,22 @@
0
-
-
-
-
- STA-NL00482
- NL.RIVM.AQ
-
+
+
+ STA-NL00482
+ NL.RIVM.AQ
+
Europoort-Markweg
-
- 51.96111298 4.09000015
-
+
+
+ 51.96111298 4.09000015
+
false
@@ -3179,23 +3013,22 @@
0
-
-
-
-
- STA-NL00483
- NL.RIVM.AQ
-
+
+
+ STA-NL00483
+ NL.RIVM.AQ
+
Botlek-Spoortunnel
-
- 51.86999893 4.31972218
-
+
+
+ 51.86999893 4.31972218
+
false
@@ -3218,23 +3051,22 @@
0
-
-
-
-
- STA-NL00484
- NL.RIVM.AQ
-
+
+
+ STA-NL00484
+ NL.RIVM.AQ
+
Botlek-Oude Maasweg
-
- 51.88888931 4.3125
-
+
+
+ 51.88888931 4.3125
+
false
@@ -3257,23 +3089,22 @@
0
-
-
-
-
- STA-NL00486
- NL.RIVM.AQ
-
+
+
+ STA-NL00486
+ NL.RIVM.AQ
+
Pernis-Soetemanweg
-
- 51.88805771 4.38888884
-
+
+
+ 51.88805771 4.38888884
+
false
@@ -3296,23 +3127,22 @@
0
-
-
-
-
- STA-NL00487
- NL.RIVM.AQ
-
+
+
+ STA-NL00487
+ NL.RIVM.AQ
+
Rotterdam Zuid-Pleinweg
-
- 51.89111328 4.48111105
-
+
+
+ 51.89111328 4.48111105
+
false
@@ -3335,23 +3165,22 @@
0
-
-
-
-
- STA-NL00488
- NL.RIVM.AQ
-
+
+
+ STA-NL00488
+ NL.RIVM.AQ
+
Rotterdam Zuid-Zwartewaalstraat
-
- 51.89389038 4.48749971
-
+
+
+ 51.89389038 4.48749971
+
false
@@ -3374,23 +3203,22 @@
0
-
-
-
-
- STA-NL00489
- NL.RIVM.AQ
-
+
+
+ STA-NL00489
+ NL.RIVM.AQ
+
Ridderkerk-Hogeweg
-
- 51.86888885 4.57472229
-
+
+
+ 51.86888885 4.57472229
+
false
@@ -3413,23 +3241,22 @@
0
-
-
-
-
- STA-NL00490
- NL.RIVM.AQ
-
+
+
+ STA-NL00490
+ NL.RIVM.AQ
+
Rotterdam-Maasboulevard
-
- 51.91805649 4.51388884
-
+
+
+ 51.91805649 4.51388884
+
false
@@ -3452,23 +3279,22 @@
0
-
-
-
-
- STA-NL00491
- NL.RIVM.AQ
-
+
+
+ STA-NL00491
+ NL.RIVM.AQ
+
Rotterdam-Oost Sidelinge A13
-
- 51.93805695 4.43111086
-
+
+
+ 51.93805695 4.43111086
+
false
@@ -3491,23 +3317,22 @@
0
-
-
-
-
- STA-NL00492
- NL.RIVM.AQ
-
+
+
+ STA-NL00492
+ NL.RIVM.AQ
+
Rotterdam-Vasteland
-
- 51.91389084 4.48000002
-
+
+
+ 51.91389084 4.48000002
+
false
@@ -3530,23 +3355,22 @@
0
-
-
-
-
- STA-NL00493
- NL.RIVM.AQ
-
+
+
+ STA-NL00493
+ NL.RIVM.AQ
+
Rotterdam Noord -Statenweg
-
- 51.92694473 4.46166658
-
+
+
+ 51.92694473 4.46166658
+
false
@@ -3569,23 +3393,22 @@
0
-
-
-
-
- STA-NL00495
- NL.RIVM.AQ
-
+
+
+ STA-NL00495
+ NL.RIVM.AQ
+
Maassluis-Kwartellaan
-
- 51.9319458 4.22777796
-
+
+
+ 51.9319458 4.22777796
+
false
@@ -3608,23 +3431,22 @@
0
-
-
-
-
- STA-NL00496
- NL.RIVM.AQ
-
+
+
+ STA-NL00496
+ NL.RIVM.AQ
+
Hoek v. Holland-Berghaven
-
- 51.97805786 4.12138891
-
+
+
+ 51.97805786 4.12138891
+
false
@@ -3647,23 +3469,22 @@
0
-
-
-
-
- STA-NL00703
- NL.RIVM.AQ
-
+
+
+ STA-NL00703
+ NL.RIVM.AQ
+
Amsterdam-Spaarnwoude
-
- 52.40000153 4.73000002
-
+
+
+ 52.40000153 4.73000002
+
false
@@ -3686,23 +3507,22 @@
1
-
-
-
-
- STA-NL00442
- NL.RIVM.AQ
-
+
+
+ STA-NL00442
+ NL.RIVM.AQ
+
Dordrecht-Bamendaweg
-
- 51.80065918 4.70821381
-
+
+
+ 51.80065918 4.70821381
+
false
@@ -3725,23 +3545,22 @@
1
-
-
-
-
- STA-NL00821
- NL.RIVM.AQ
-
+
+
+ STA-NL00821
+ NL.RIVM.AQ
+
Enschede-Winkelhorst
-
- 52.23450089 6.91949415
-
+
+
+ 52.23450089 6.91949415
+
false
@@ -3764,23 +3583,22 @@
38
-
-
-
-
- STA-NL00704
- NL.RIVM.AQ
-
+
+
+ STA-NL00704
+ NL.RIVM.AQ
+
Amsterdam-Hoogtij
-
- 52.43000031 4.76999998
-
+
+
+ 52.43000031 4.76999998
+
false
@@ -3803,23 +3621,22 @@
4
-
-
-
-
- STA-NL00312
- NL.RIVM.AQ
-
+
+
+ STA-NL00312
+ NL.RIVM.AQ
+
Axel-Zaaidijk
-
- 51.284534 3.91538056
-
+
+
+ 51.284534 3.91538056
+
false
@@ -3842,23 +3659,22 @@
1
-
-
-
-
- STA-NL00319
- NL.RIVM.AQ
-
+
+
+ STA-NL00319
+ NL.RIVM.AQ
+
Nieuwdorp-Coudorp
-
- 51.464383 3.745008
-
+
+
+ 51.464383 3.745008
+
false
@@ -3881,23 +3697,22 @@
1
-
-
-
-
- STA-NL00546
- NL.RIVM.AQ
-
+
+
+ STA-NL00546
+ NL.RIVM.AQ
+
Zaanstad-Hemkade
-
- 52.420219 4.832064
-
+
+
+ 52.420219 4.832064
+
false
@@ -3920,23 +3735,22 @@
1
-
-
-
-
- STA-NL00551
- NL.RIVM.AQ
-
+
+
+ STA-NL00551
+ NL.RIVM.AQ
+
Ijmuiden-Kanaaldijk
-
- 52.46302 4.601922
-
+
+
+ 52.46302 4.601922
+
false
@@ -3959,23 +3773,22 @@
1
-
-
-
-
- STA-NL00556
- NL.RIVM.AQ
-
+
+
+ STA-NL00556
+ NL.RIVM.AQ
+
De Rijp-Oostdijkje
-
- 52.56359 4.8617
-
+
+
+ 52.56359 4.8617
+
false
@@ -3998,23 +3811,22 @@
1
-
-
-
-
- STA-NL00561
- NL.RIVM.AQ
-
+
+
+ STA-NL00561
+ NL.RIVM.AQ
+
Badhoevedorp-Sloterweg
-
- 52.33356 4.77359
-
+
+
+ 52.33356 4.77359
+
false
@@ -4037,23 +3849,22 @@
1
-
-
-
-
- STA-NL00564
- NL.RIVM.AQ
-
+
+
+ STA-NL00564
+ NL.RIVM.AQ
+
Hoofddorp-Hoofdweg
-
- 52.28743 4.766679
-
+
+
+ 52.28743 4.766679
+
false
@@ -4076,23 +3887,22 @@
1
-
-
-
-
- STA-NL00565
- NL.RIVM.AQ
-
+
+
+ STA-NL00565
+ NL.RIVM.AQ
+
Oude Meer-Aalsmeerderdijk
-
- 52.32745 4.715071
-
+
+
+ 52.32745 4.715071
+
false
@@ -4115,23 +3925,22 @@
1
-
-
-
-
- STA-NL00570
- NL.RIVM.AQ
-
+
+
+ STA-NL00570
+ NL.RIVM.AQ
+
Beverwijk West-Creutzberglaan
-
- 52.4866 4.638642
-
+
+
+ 52.4866 4.638642
+
false
@@ -4154,23 +3963,22 @@
1
-
-
-
-
- STA-NL00572
- NL.RIVM.AQ
-
+
+
+ STA-NL00572
+ NL.RIVM.AQ
+
Velsen-Staalstraat
-
- 52.4744 4.6288
-
+
+
+ 52.4744 4.6288
+
false
@@ -4193,23 +4001,22 @@
1
-
-
-
-
- STA-NL00573
- NL.RIVM.AQ
-
+
+
+ STA-NL00573
+ NL.RIVM.AQ
+
Velsen-Reijndersweg
-
- 52.79 4.729
-
+
+
+ 52.79 4.729
+
false
@@ -4232,23 +4039,22 @@
1
-
-
-
-
- STA-NL00244
- NL.RIVM.AQ
-
+
+
+ STA-NL00244
+ NL.RIVM.AQ
+
De Rips-Klotterpeellaan
-
- 51.5359 5.808593
-
+
+
+ 51.5359 5.808593
+
false
@@ -4271,23 +4077,22 @@
1
-
-
-
-
- STA-NL00245
- NL.RIVM.AQ
-
+
+
+ STA-NL00245
+ NL.RIVM.AQ
+
Moerdijk-Julianastraat
-
- 51.70078 4.623361
-
+
+
+ 51.70078 4.623361
+
false
@@ -4310,23 +4115,22 @@
1
-
-
-
-
- STA-NL00547
- NL.RIVM.AQ
-
+
+
+ STA-NL00547
+ NL.RIVM.AQ
+
Hilversum-J. Gerardtsweg
-
- 52.23508 5.181552
-
+
+
+ 52.23508 5.181552
+
false
@@ -4349,23 +4153,22 @@
1
-
-
-
-
- STA-NL00548
- NL.RIVM.AQ
-
+
+
+ STA-NL00548
+ NL.RIVM.AQ
+
Bussum-Ceintuurbaan
-
- 52.26798 5.17583
-
+
+
+ 52.26798 5.17583
+
false
@@ -4388,23 +4191,22 @@
1
-
-
-
-
- STA-NL00549
- NL.RIVM.AQ
-
+
+
+ STA-NL00549
+ NL.RIVM.AQ
+
Laren-Jagerspad
-
- 52.25736 5.235903
-
+
+
+ 52.25736 5.235903
+
false
@@ -4427,23 +4229,22 @@
1
-
-
-
-
- STA-NL00743
- NL.RIVM.AQ
-
+
+
+ STA-NL00743
+ NL.RIVM.AQ
+
Kootwijkerbroek-Drieenhuizerweg
-
- 52.15407 5.664074
-
+
+
+ 52.15407 5.664074
+
false
@@ -4466,23 +4267,22 @@
1
-
-
-
-
- STA-NL00644
- NL.RIVM.AQ
-
+
+
+ STA-NL00644
+ NL.RIVM.AQ
+
Cabauw-Wielsekade
-
- 51.97464 4.92343
-
+
+
+ 51.97464 4.92343
+
false
@@ -4505,23 +4305,22 @@
1
-
-
-
-
- STA-NL00138
- NL.RIVM.AQ
-
+
+
+ STA-NL00138
+ NL.RIVM.AQ
+
Heerlen-Jamboreepad
-
- 50.900317 5.986853
-
+
+
+ 50.900317 5.986853
+
false
@@ -4544,6 +4343,6 @@
98
-
+
diff --git a/src/aq-report/templates/dataflow-D.jinja2 b/src/aq-report/templates/dataflow-D.jinja2
index 1636758..5a6a8d0 100644
--- a/src/aq-report/templates/dataflow-D.jinja2
+++ b/src/aq-report/templates/dataflow-D.jinja2
@@ -1,4 +1,8 @@
+{# Macros, a very powerful reuse mechanism, e.g. for common elements and structures like INSPIRE id. #}
+{% import 'templates/macros-gml.jinja2' as macros_gml %}
+{% import 'templates/macros-inspire.jinja2' as macros_inspire %}
+
+ gml:id="REP-{{ globs.id_prefix }}_{{ globs.report_date }}_{{ globs.dataflow_D.flow_char }}">
+
+ {{ macros_gml.render_bounded_by(features) }}
+
-
- true
- {{ globs.report_year }} Dataflow D The Netherlands
+
+ {{ globs.dataflow_D.change }}
+ {{ globs.report_year }} {{ globs.dataflow_D.name }} {{ globs.country }}
-
- {{ globs.id_prefix }}_{{ globs.report_date }}
- {{ globs.namespace }}
-
+ {{ macros_inspire.render_inspire_id(globs.namespace, globs.id_prefix + '_' + globs.report_date) }}
@@ -42,20 +46,8 @@
-
-
-
-
-
-
-
-
- {{ globs.reporting_authority.address }}
-
-
-
-
-
+ {{ macros_inspire.render_geographical_name_min(globs.reporting_authority.address) }}
+
{{ globs.reporting_authority.municipality }}
@@ -73,27 +65,19 @@
{% endfor %}
-
-
+
{% for feature in features %}
-
-
-
- {{ feature.properties.local_id }}
- {{ globs.namespace }}
-
+ {{ macros_inspire.render_inspire_id(globs.namespace, feature.properties.local_id) }}
{{ feature.properties.name }}
-
- {{ feature.geometry.coordinates[0] }} {{ feature.geometry.coordinates[1] }}
-
+ {{ macros_gml.render_point2d(globs.srs_name, feature.geometry.coordinates, 'STA_G-' + feature.properties.local_id) }}
false
@@ -111,12 +95,13 @@
{{ feature.properties.natl_station_code }}
{{ feature.properties.municipality }}
{{ feature.properties.local_id }}
-
+
{{ feature.properties.altitude }}
{% endfor %}
+
diff --git a/src/aq-report/templates/globals-rivm.json b/src/aq-report/templates/globals-rivm.json
index 5f86475..961c1fe 100644
--- a/src/aq-report/templates/globals-rivm.json
+++ b/src/aq-report/templates/globals-rivm.json
@@ -2,10 +2,10 @@
"globs": {
"namespace": "NL.RIVM.AQ",
"id_prefix": "NL_RIVM",
+ "country": "The Netherlands",
"report_year": "2013",
- "report_date": "20140903",
+ "report_date": "20140905",
"srs_name": "urn:ogc:def:crs:EPSG:4326",
- "meteo_params": "No meteo measured",
"reporting_authority": {
"individual_name": "Marjolein van der Made",
"organisation": "Rijksinstituut voor Volksgezondheid en Milieu",
@@ -14,6 +14,13 @@
"email": "marjolein.van.der.made@rivm.nl",
"telephone": "+31 30 2749111",
"website": "http://www.rivm.nl"
+ },
+ "dataflow_D": {
+ "flow_char" : "D",
+ "name" : "Dataflow D",
+ "change" : "true",
+ "meteo_params": "No meteo measured"
+
}
}
}
diff --git a/src/aq-report/templates/macros-gml.jinja2 b/src/aq-report/templates/macros-gml.jinja2
new file mode 100644
index 0000000..4a87edb
--- /dev/null
+++ b/src/aq-report/templates/macros-gml.jinja2
@@ -0,0 +1,54 @@
+{# Jinja2 Macros for GML-related elements #}
+
+{# Macro that renders a Point element #}
+{% macro render_point2d(srs_name, coordinates, gml_id) -%}
+
+
+ {{ coordinates[0] }} {{ coordinates[1] }}
+
+{%- endmacro %}
+
+{# Macro that renders a bounding box element from feature list
+ NB Point features only and assuming lat lon in reverse axis ordering! #}
+{% macro render_bounded_by(point_features) -%}
+
+
+ {# first assemble all latitudes and longitudes #}
+ {% set longitudes = [] %}
+ {% set latitudes = [] %}
+
+ {% for feature in point_features %}
+ {% do longitudes.append(feature.geometry.coordinates[1]) %}
+ {% do latitudes.append(feature.geometry.coordinates[0]) %}
+ {% endfor %}
+
+ {# use the maximum and minimum Jinja2 Filters to get max/min from lists #}
+
+
+
+ {{ longitudes|minimum }}
+ {{ latitudes|minimum }}
+
+
+ {{ longitudes|maximum }}
+ {{ latitudes|maximum }}
+
+
+
+{%- endmacro %}
+
+{# Macro that renders a name element #}
+{% macro render_name(name) -%}
+
+
+ {{ name }}
+
+{%- endmacro %}
+
+{# Macro that renders any element with tag and content :-) #}
+{% macro render_element(tag, content) -%}
+
+ <{{tag}}>
+ {{ content }}
+
+{%- endmacro %}
diff --git a/src/aq-report/templates/macros-inspire.jinja2 b/src/aq-report/templates/macros-inspire.jinja2
new file mode 100644
index 0000000..9d31b6d
--- /dev/null
+++ b/src/aq-report/templates/macros-inspire.jinja2
@@ -0,0 +1,30 @@
+{# Jinja2 Macros for INSPIRE-related elements #}
+
+{# Macro that renders an inspireId (base:Identifier) element #}
+{% macro render_inspire_id(namespace, local_id, version_id=None) -%}
+
+
+ {{ local_id }}
+ {{ namespace }}
+ {% if version_id != None %}
+ {{ version }}
+ {% endif %}
+
+{%- endmacro %}
+
+{# Macro that renders a minimal GeographicalName #}
+{% macro render_geographical_name_min(name) -%}
+
+
+
+
+
+
+
+
+ {{ name }}
+
+
+
+
+{%- endmacro %}