[PATCH] Classify and sort iteration over recommendations

Wald Commits scm-commit at wald.intevation.org
Fri Sep 19 15:45:57 CEST 2014


# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1411134354 -7200
# Node ID de42523b2e27771e79059a653d4a9be159a24cc0
# Parent  5dfb3ff98bc610db6b76d9ada1fe2ec3e7842553
Classify and sort iteration over recommendations.

diff -r 5dfb3ff98bc6 -r de42523b2e27 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Sep 19 15:31:03 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Sep 19 15:45:54 2014 +0200
@@ -37,6 +37,7 @@
               <dc:iterate var="out" container="artifact-outs">
                 <dc:message>Rec out iteration for: {$out}</dc:message>
                 <dc:choose>
+                  <dc:comment> Longitudinal sections </dc:comment>
                   <dc:when test="$out = 'w_differences'">
                     <dc:call-macro name="annotations"/>
                   </dc:when>
@@ -44,33 +45,6 @@
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="officiallines_user"/>
                   </dc:when>
-                  <dc:when test="$out = 'historical_discharge_wq'">
-                    <dc:call-macro name="mainvalues"/>
-                  </dc:when>
-                  <dc:when test="$out = 'cross_section'">
-                    <dc:call-macro name="cross_sections"/>
-                    <dc:call-macro name="hyks"/>
-                    <dc:call-macro name="officiallines_user"/>
-                  </dc:when>
-                  <dc:when test="$out = 'discharge_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="basedata_3_officials_wq"/>
-                  </dc:when>
-                  <dc:when test="$out = 'computed_discharge_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="basedata_3_officials_wq"/>
-                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
-                  </dc:when>
-                  <dc:when test="$out = 'duration_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                  </dc:when>
-                  <dc:when test="$out = 'reference_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_wq_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="qsectors"/>
-                  </dc:when>
                   <dc:when test="$out = 'longitudinal_section'">
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="officiallines_user"/>
@@ -89,9 +63,6 @@
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="basedata_6_delta_w"/>
                   </dc:when>
-                  <dc:when test="$out = 'floodmap'">
-                    <dc:call-macro name="flood-map-recommended"/>
-                  </dc:when>
                   <dc:when test="$out = 'sedimentload_ls'">
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="sedimentload_off_epochs"/>
@@ -102,6 +73,41 @@
                   <dc:when test="$out = 'flow_velocity'">
                     <dc:call-macro name="annotations"/>
                   </dc:when>
+                  <dc:comment> Discharge curves </dc:comment>
+                  <dc:when test="$out = 'historical_discharge_wq'">
+                    <dc:call-macro name="mainvalues"/>
+                  </dc:when>
+                  <dc:when test="$out = 'discharge_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="basedata_3_officials_wq"/>
+                  </dc:when>
+                  <dc:when test="$out = 'computed_discharge_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="basedata_3_officials_wq"/>
+                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
+                  </dc:when>
+                  <dc:when test="$out = 'fix_wq_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="qsectors"/>
+                  </dc:when>
+                  <dc:comment> Cross sections </dc:comment>
+                  <dc:when test="$out = 'cross_section'">
+                    <dc:call-macro name="cross_sections"/>
+                    <dc:call-macro name="hyks"/>
+                    <dc:call-macro name="officiallines_user"/>
+                  </dc:when>
+                  <dc:comment> Duration curve </dc:comment>
+                  <dc:when test="$out = 'duration_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                  </dc:when>
+                  <dc:comment> Reference curve </dc:comment>
+                  <dc:when test="$out = 'reference_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                  </dc:when>
+                  <dc:comment> Maps </dc:comment>
+                  <dc:when test="$out = 'floodmap'">
+                    <dc:call-macro name="flood-map-recommended"/>
+                  </dc:when>
                 </dc:choose>
               </dc:iterate>
             </dc:when>


More information about the Dive4Elements-commits mailing list