[PATCH] Classify and sort iteration over user-data non-recommendations

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


# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1411136951 -7200
# Node ID 2869a2e482e56ade08691ffba839d30b7345cd27
# Parent  b70f0a3510c7cebb0ec9904e06a1503709189112
Classify and sort iteration over user-data non-recommendations.

diff -r b70f0a3510c7 -r 2869a2e482e5 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Sep 19 16:07:59 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Sep 19 16:29:11 2014 +0200
@@ -278,43 +278,7 @@
                 </dc:comment>
                 <dc:iterate var="out" container="artifact-outs">
                   <dc:choose>
-                    <dc:when test="$out = 'longitudinal_section'">
-                      <dc:call-macro name="longitudinal-section-user-prototype"/>
-                    </dc:when>
-                    <dc:when test="$out = 'discharge_longitudinal_section'">
-                      <dc:call-macro name="longitudinal-section-user-prototype"/>
-                    </dc:when>
-                    <dc:when test="$out = 'w_differences'">
-                      <dc:call-macro name="longitudinal-section-user-prototype"/>
-                    </dc:when>
-                    <dc:when test="$out = 'computed_discharge_curve'">
-                      <dc:call-macro name="computed-discharge-curve"/>
-                      <dc:call-macro name="fix-wq-curve"/>
-                      <dc:call-macro name="discharge-curve"/>
-                      <dc:call-macro name="extreme-wq-curve"/>
-                    </dc:when>
-                    <dc:when test="$out = 'fix_deltawt_curve'">
-                      <dc:call-macro name="delta-wt"/>
-                    </dc:when>
-                    <dc:when test="$out = 'reference_curve'">
-                      <dc:call-macro name="reference-curves"/>
-                    </dc:when>
-                    <dc:when test="$out = 'cross_section'">
-                      <dc:call-macro name="waterlevels"/>
-                    </dc:when>
-                    <dc:when test="$out = 'fix_longitudinal_section_curve'">
-                      <dc:call-macro name="longitudinal-section-user-prototype"/>
-                    </dc:when>
-                    <dc:when test="$out = 'fix_derivate_curve'">
-                      <dc:call-macro name="fix-derivate-curve"/>
-                    </dc:when>
-                    <dc:when test="$out = 'fix_wq_curve'">
-                      <dc:call-macro name="fix-wq-curve"/>
-                      <dc:call-macro name="waterlevels-fix"/>
-                    </dc:when>
-                    <dc:when test="$out = 'duration_curve'">
-                      <dc:call-macro name="duration-curve"/>
-                    </dc:when>
+                    <dc:comment> Inline datacage panels </dc:comment>
                     <dc:when test="$out = 'winfo_diff_twin_panel'">
                       <dc:call-macro name="differences-fix"/>
                       <dc:call-macro name="differences"/>
@@ -328,18 +292,25 @@
                         <dc:call-macro name="longitudinal-section-user-prototype"/>
                       </dc:comment>
                     </dc:when>
-                    <dc:when test="$out = 'floodmap'">
-                      <dc:call-macro name="flood-map"/>
+                    <dc:when test="$out = 'floodmap_hws_panel'">
+                      <dc:call-macro name="floodmap-hws-user"/>
                     </dc:when>
-                    <dc:when test="$out = 'map'">
-                      <dc:call-macro name="flood-map"/>
+                    <dc:comment> Longitudinal sections </dc:comment>
+                    <dc:when test="$out = 'longitudinal_section'">
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
+                    </dc:when>
+                    <dc:when test="$out = 'discharge_longitudinal_section'">
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
+                    </dc:when>
+                    <dc:when test="$out = 'w_differences'">
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_longitudinal_section_curve'">
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'bedheight_middle'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
-                    <dc:when test="$out = 'floodmap_hws_panel'">
-                      <dc:call-macro name="floodmap-hws-user"/>
-                    </dc:when>
                     <dc:when test="$out = 'flow_velocity'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
@@ -355,8 +326,19 @@
                     <dc:when test="$out = 'bed_difference_height_year'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
-                    <dc:when test="$out = 'historical_discharge'">
-                      <dc:call-macro name="historical-discharge-user"/>
+                    <dc:comment> Discharge curves </dc:comment>
+                    <dc:when test="$out = 'computed_discharge_curve'">
+                      <dc:call-macro name="computed-discharge-curve"/>
+                      <dc:call-macro name="fix-wq-curve"/>
+                      <dc:call-macro name="discharge-curve"/>
+                      <dc:call-macro name="extreme-wq-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_derivate_curve'">
+                      <dc:call-macro name="fix-derivate-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_wq_curve'">
+                      <dc:call-macro name="fix-wq-curve"/>
+                      <dc:call-macro name="waterlevels-fix"/>
                     </dc:when>
                     <dc:when test="$out = 'historical_discharge_wq'">
                       <dc:call-macro name="historical-discharge-wq-user"/>
@@ -365,6 +347,32 @@
                                  $out = 'sq_overview'">
                       <dc:call-macro name="sqrelations_user"/>
                     </dc:when>
+                    <dc:comment> Time series </dc:comment>
+                    <dc:when test="$out = 'fix_deltawt_curve'">
+                      <dc:call-macro name="delta-wt"/>
+                    </dc:when>
+                    <dc:when test="$out = 'historical_discharge'">
+                      <dc:call-macro name="historical-discharge-user"/>
+                    </dc:when>
+                    <dc:comment> Cross sections </dc:comment>
+                    <dc:when test="$out = 'cross_section'">
+                      <dc:call-macro name="waterlevels"/>
+                    </dc:when>
+                    <dc:comment> Duration curve </dc:comment>
+                    <dc:when test="$out = 'duration_curve'">
+                      <dc:call-macro name="duration-curve"/>
+                    </dc:when>
+                    <dc:comment> Reference curve </dc:comment>
+                    <dc:when test="$out = 'reference_curve'">
+                      <dc:call-macro name="reference-curves"/>
+                    </dc:when>
+                    <dc:comment> Maps </dc:comment>
+                    <dc:when test="$out = 'floodmap'">
+                      <dc:call-macro name="flood-map"/>
+                    </dc:when>
+                    <dc:when test="$out = 'map'">
+                      <dc:call-macro name="flood-map"/>
+                    </dc:when>
                   </dc:choose>
                 </dc:iterate>
               </dc:otherwise>


More information about the Dive4Elements-commits mailing list