[PATCH] issue1435: Group minfo-stuff in dc, include waterlevels from csv

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1380196614 -7200
# Node ID 200ae084909aaba5584e9a429c9ea307ca4b0b28
# Parent  46ba37c22d9f9310131fe91d4952ea2f8e5b1bf2
issue1435: Group minfo-stuff in dc, include waterlevels from csv.

diff -r 46ba37c22d9f -r 200ae084909a artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Sep 26 13:02:02 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Sep 26 13:56:54 2013 +0200
@@ -1209,6 +1209,12 @@
       <dc:call-macro name="basedata_3_officials"/>
       <dc:call-macro name="basedata_5_flood-protections"/>
       <dc:call-macro name="annotations_per_type"/>
+      <dc:call-macro name="basedata_6_delta_w"/>
+      <dc:call-macro name="basedata_7_waterlevels"/>
+      <minfo>
+          <dc:call-macro name="minfo-heights"/>
+          <dc:call-macro name="sounding-width"/>
+      </minfo>
     </dc:macro>
 
     <dc:macro name="basedata_5_flood-protections">
@@ -1305,6 +1311,27 @@
       </dc:filter>
     </dc:macro>
 
+
+    <dc:macro name="basedata_7_waterlevels">
+      <dc:filter expr="$kind=7">
+        <dc:if test="dc:has-result()">
+          <wlevel>
+            <dc:group expr="$wst_description">
+              <relativepoint name="{dc:group-key()}">
+                <dc:for-each>
+                  <column name="{$wst_column_name}"
+                          ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
+                          factory="staticwqkms" target_out="{$out}"
+                          info="{$info} [km {$deffrom} - {$defto}]"/>
+                </dc:for-each>
+              </relativepoint>
+            </dc:group>
+          </wlevel>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+
     <dc:macro name="basedata_6_delta_w">
       <dc:filter expr="$kind=6">
         <dc:if test="dc:has-result()">