# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1321458832 0
# Node ID efff4305dc05fb27c3196d6fab360200e21a03f9
# Parent  6b7557ffe2f86eb4213af957015d1271fd719f22
Extended DC conf to offer w/q kind of data (currently used in computed discharge curve diagr. only).

flys-artifacts/trunk@3276 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 6b7557ffe2f8 -r efff4305dc05 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Nov 16 15:49:35 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Nov 16 15:53:52 2011 +0000
@@ -1,3 +1,8 @@
+2011-11-16  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	* doc/conf/meta-data.xml: Added and use *_wq macros for interpolated
+	  w/q data (currently used in computed discharge curve only).
+
 2011-11-16  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java:
diff -r 6b7557ffe2f8 -r efff4305dc05 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed Nov 16 15:49:35 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Wed Nov 16 15:53:52 2011 +0000
@@ -44,6 +44,40 @@
               </dc:context>
             </basedata>
         </dc:macro>
+        <dc:macro name="basedata_0_wq">
+            <dc:comment comment=" BASEDATA ---------------------------"/>
+            <basedata>
+              <dc:context>
+                <dc:statement>
+                  SELECT id          AS prot_id,
+                         description AS prot_description
+                  FROM wsts WHERE kind = 0 AND river_id = ${river_id}
+                </dc:statement>
+                <dc:elements>
+                  <basedata>
+                    <dc:attribute name="name" value="${prot_description}"/>
+                    <dc:context>
+                      <dc:statement>
+                        SELECT id       AS prot_column_id,
+                               name     AS prot_column_name,
+                               position AS prot_rel_pos
+                        FROM wst_columns WHERE wst_id = ${prot_id}
+                        ORDER by position
+                      </dc:statement>
+                      <dc:elements>
+                        <column>
+                          <dc:attribute name="name" value="${prot_column_name}"/>
+                          <dc:attribute name="ids" value="base_data-wstv-${prot_rel_pos}-${prot_id}"/>
+                          <dc:attribute name="factory" value="wqinterpol"/>
+                        </column>
+                      </dc:elements>
+                    </dc:context>
+                  </basedata>
+                </dc:elements>
+              </dc:context>
+            </basedata>
+        </dc:macro>
+
         <dc:macro name="basedata_1_additionals">
             <dc:comment comment=".ZUS -------------------------------"/>
             <addtionals>
@@ -195,6 +229,38 @@
             </dc:context>
           </heightmarks>
         </dc:macro>
+        <dc:macro name="basedata_4_heightmarks-wq">
+          <heightmarks>
+            <dc:context>
+              <dc:statement>
+                SELECT id          AS prot_id,
+                       description AS prot_description
+                FROM wsts WHERE kind = 4 AND river_id = ${river_id}
+              </dc:statement>
+              <dc:elements>
+                <heightmark>
+                  <dc:attribute name="name" value="${prot_description}"/>
+                  <dc:context>
+                    <dc:statement>
+                      SELECT id       AS prot_column_id,
+                             name     AS prot_column_name,
+                             position AS prot_rel_pos
+                      FROM wst_columns WHERE wst_id = ${prot_id}
+                      ORDER by position
+                    </dc:statement>
+                    <dc:elements>
+                      <column>
+                        <dc:attribute name="name" value="${prot_column_name}"/>
+                        <dc:attribute name="ids" value="heightmarks_annotations-wstv-${prot_rel_pos}-${prot_id}"/>
+                        <dc:attribute name="factory" value="wqinterpol"/>
+                      </column>
+                    </dc:elements>
+                  </dc:context>
+                </heightmark>
+              </dc:elements>
+            </dc:context>
+          </heightmarks>
+        </dc:macro>
 
         <dc:macro name="basedata_5_flood-protections">
           <flood-protections>
@@ -280,8 +346,8 @@
                  <dc:call-macro name="basedata_4_heightmarks-points"/>
               </dc:if>
               <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
-                 <dc:call-macro name="basedata_0"/>
-                 <dc:call-macro name="basedata_4_heightmarks-points"/>
+                 <dc:call-macro name="basedata_0_wq"/>
+                 <dc:call-macro name="basedata_4_heightmarks-wq"/>
               </dc:if>
               <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))">
                  <dc:call-macro name="basedata_0"/>