[PATCH 6 of 9] issue1579: Added macro to load interpolated official lines

Wald Commits scm-commit at wald.intevation.org
Mon Dec 2 10:14:55 CET 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1385974128 -3600
# Node ID 00db0071388fa863bffc997fb07ace851777c87b
# Parent  22b9d2dfb4d2d57ebd4b20f9f2ea2c1947c9bf44
issue1579: Added macro to load interpolated official lines.
Call this macro for discharge curves.

diff -r 22b9d2dfb4d2 -r 00db0071388f artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Nov 29 12:18:16 2013 +0100
+++ b/artifacts/doc/conf/meta-data.xml	Mon Dec 02 09:48:48 2013 +0100
@@ -1196,7 +1196,28 @@
                 <dc:for-each>
                   <column name="{$wst_column_name}"
                           ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwqkms" target_out="{$out}"
+                          factory="staticwqkms"
+                          target_out="{$out}"
+                          info="{$info} [km {$deffrom} - {$defto}]"/>
+                </dc:for-each>
+              </official>
+            </dc:group>
+          </officiallines>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="basedata_3_officials_wq">
+      <dc:filter expr="$kind=3">
+        <dc:if test="dc:has-result()">
+          <officiallines>
+            <dc:group expr="$wst_description">
+              <official name="{dc:group-key()}">
+                <dc:for-each>
+                  <column name="{$wst_column_name}"
+                          ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}"
+                          factory="wqinterpol"
+                          target_out="{$out}"
                           info="{$info} [km {$deffrom} - {$defto}]"/>
                 </dc:for-each>
               </official>
@@ -1248,6 +1269,7 @@
         <dc:call-macro name="discharge_table_gauge"/>
         <dc:call-macro name="historical_discharge_curve"/>
         <dc:call-macro name="basedata_0_wq"/>
+        <dc:call-macro name="basedata_3_officials_wq"/>
         <dc:call-macro name="basedata_2_fixations_wqkms"/>
         <dc:call-macro name="basedata_4_heightmarks-points"/>
     </dc:macro>


More information about the Dive4elements-commits mailing list