From f7d0b8398f0f5f6e85e795de29774fa8b323c55d Mon Sep 17 00:00:00 2001
From: Just van den Broecke <just@justobjects.nl>
Date: Mon, 8 Sep 2014 19:24:34 +0200
Subject: [PATCH] issue #7 - refinement: Jinja2 construct + RIVM globals to
 expand pollutants from codelist values - PM2.5 added

---
 src/aq-report/input/globals-rivm.json |  2 +-
 src/aq-report/output/dataflow-B.xml   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/aq-report/input/globals-rivm.json b/src/aq-report/input/globals-rivm.json
index 3ad502c..5ceea2d 100644
--- a/src/aq-report/input/globals-rivm.json
+++ b/src/aq-report/input/globals-rivm.json
@@ -61,7 +61,7 @@
                 "protection_target": "http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"
             },
             "PM2.5-H": {
-                "pollutant_code": "http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?",
+                "pollutant_code": "http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001",
                 "protection_target": "http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"
             },
             "SO2-H": {
diff --git a/src/aq-report/output/dataflow-B.xml b/src/aq-report/output/dataflow-B.xml
index 87ea05c..5a05ed7 100644
--- a/src/aq-report/output/dataflow-B.xml
+++ b/src/aq-report/output/dataflow-B.xml
@@ -204,7 +204,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -336,7 +336,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -464,7 +464,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -588,7 +588,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -712,7 +712,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -836,7 +836,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -960,7 +960,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -1080,7 +1080,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
@@ -1200,7 +1200,7 @@
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>
-                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/WELKE_CODE_MOET_DIT_ZIJN?"/>
+                   <aqd:pollutantCode xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/pollutant/6001"/>
                    <aqd:protectionTarget xlink:href="http://dd.eionet.europa.eu/vocabulary/aq/protectiontarget/H"/>
                 </aqd:Pollutant>
                 <aqd:Pollutant>