[PATCH] Classify and sort iteration over non-recommendations
Wald Commits
scm-commit at wald.intevation.org
Fri Sep 19 16:08:03 CEST 2014
# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1411135679 -7200
# Node ID b70f0a3510c7cebb0ec9904e06a1503709189112
# Parent de42523b2e27771e79059a653d4a9be159a24cc0
Classify and sort iteration over non-recommendations.
diff -r de42523b2e27 -r b70f0a3510c7 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Fri Sep 19 15:45:54 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml Fri Sep 19 16:07:59 2014 +0200
@@ -118,19 +118,37 @@
<dc:iterate var="out" container="artifact-outs">
<dc:message>Non Rec out iteration for: {$out}</dc:message>
<dc:choose>
+ <dc:comment> Inline datacage panels </dc:comment>
<dc:when test="$out = 'minfo_diff_panel'">
<dc:call-macro name="minfo-heights-diff"/>
</dc:when>
- <dc:when test="$out = 'cross_section'">
+ <dc:when test="$out = 'floodmap_dem_panel'">
+ <dc:call-macro name="flood-map-dem"/>
+ </dc:when>
+ <dc:when test="$out = 'floodmap_hws_panel'">
+ <hws>
+ <dc:call-macro name="flood-map-hws-lines"/>
+ <dc:call-macro name="flood-map-hws-points"/>
+ </hws>
+ </dc:when>
+ <dc:when test="$out = 'winfo_diff_twin_panel'">
+ <dc:if test="$current-state-id != 'state.winfo.uesk.wsp'">
+ <dc:call-macro name="basedata_0"/>
+ <dc:call-macro name="basedata_1_additionals"/>
+ <dc:call-macro name="basedata_2_fixations"/>
+ <dc:call-macro name="basedata_4_heightmarks-points"/>
+ <dc:call-macro name="basedata_5_flood-protections"/>
+ </dc:if>
+ </dc:when>
+ <dc:when test="$out = 'waterlevels_panel'">
<dc:call-macro name="basedata_0"/>
<dc:call-macro name="basedata_1_additionals"/>
<dc:call-macro name="basedata_2_fixations"/>
<dc:call-macro name="basedata_3_officials"/>
<dc:call-macro name="basedata_4_heightmarks-points"/>
- <dc:call-macro name="cross_sections"/>
<dc:call-macro name="basedata_5_flood-protections"/>
- <dc:call-macro name="hyks"/>
</dc:when>
+ <dc:comment> Longitudinal sections </dc:comment>
<dc:when test="$out = 'longitudinal_section'">
<dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
@@ -140,45 +158,9 @@
<dc:when test="$out = 'discharge_longitudinal_section'">
<dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
- <dc:when test="$out = 'historical_discharge_wq'">
- <dc:call-macro name="discharge-curve-prototype"/>
- <dc:call-macro name="basedata_5_flood-protections"/>
- <dc:call-macro name="basedata_0"/>
- <dc:call-macro name="basedata_1_additionals"/>
- <dc:call-macro name="basedata_4_heightmarks-points"/>
- <computed_discharge_curve>
- <dc:call-macro name="mainvalues"/>
- </computed_discharge_curve>
- </dc:when>
- <dc:when test="$out = 'discharge_curve'">
- <dc:call-macro name="discharge-prototype"/>
- <computed_discharge_curve>
- <dc:call-macro name="mainvalues"/>
- </computed_discharge_curve>
- </dc:when>
- <dc:when test="$out = 'duration_curve'">
- <dc:call-macro name="mainvalues"/>
- <dc:call-macro name="basedata_2_fixations_relative_point"/>
- <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
- <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
- </dc:when>
- <dc:when test="$out = 'reference_curve'">
- <dc:call-macro name="mainvalues"/>
- <dc:call-macro name="annotations"/>
- <dc:call-macro name="basedata_1_additionals-relative_point"/>
- <dc:call-macro name="basedata_2_fixations_relative_point"/>
- <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
- <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
- </dc:when>
- <dc:when test="$out = 'fix_wq_curve'">
- <dc:call-macro name="discharge-prototype"/>
- </dc:when>
<dc:when test="$out = 'fix_longitudinal_section_curve'">
<dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
- <dc:when test="$out = 'map'">
- <dc:call-macro name="flood-map-complete"/>
- </dc:when>
<dc:when test="$out = 'flow_velocity'">
<dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
@@ -197,17 +179,25 @@
<dc:when test="$out = 'bed_difference_year'">
<dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
- <dc:when test="$out = 'floodmap_dem_panel'">
- <dc:call-macro name="flood-map-dem"/>
+ <dc:comment> Discharge curves </dc:comment>
+ <dc:when test="$out = 'historical_discharge_wq'">
+ <dc:call-macro name="discharge-curve-prototype"/>
+ <dc:call-macro name="basedata_5_flood-protections"/>
+ <dc:call-macro name="basedata_0"/>
+ <dc:call-macro name="basedata_1_additionals"/>
+ <dc:call-macro name="basedata_4_heightmarks-points"/>
+ <computed_discharge_curve>
+ <dc:call-macro name="mainvalues"/>
+ </computed_discharge_curve>
</dc:when>
- <dc:when test="$out = 'floodmap'">
- <dc:call-macro name="flood-map-complete"/>
+ <dc:when test="$out = 'discharge_curve'">
+ <dc:call-macro name="discharge-prototype"/>
+ <computed_discharge_curve>
+ <dc:call-macro name="mainvalues"/>
+ </computed_discharge_curve>
</dc:when>
- <dc:when test="$out = 'floodmap_hws_panel'">
- <hws>
- <dc:call-macro name="flood-map-hws-lines"/>
- <dc:call-macro name="flood-map-hws-points"/>
- </hws>
+ <dc:when test="$out = 'fix_wq_curve'">
+ <dc:call-macro name="discharge-prototype"/>
</dc:when>
<dc:when test="$out = 'computed_discharge_curve'">
<dc:call-macro name="discharge-curve-prototype"/>
@@ -218,26 +208,43 @@
<dc:call-macro name="mainvalues"/>
</computed_discharge_curve>
</dc:when>
- <dc:when test="$out = 'winfo_diff_twin_panel'">
- <dc:if test="$current-state-id != 'state.winfo.uesk.wsp'">
- <dc:call-macro name="basedata_0"/>
- <dc:call-macro name="basedata_1_additionals"/>
- <dc:call-macro name="basedata_2_fixations"/>
- <dc:call-macro name="basedata_4_heightmarks-points"/>
- <dc:call-macro name="basedata_5_flood-protections"/>
- </dc:if>
+ <dc:when test="starts-with($out, 'sq_relation') or
+ $out = 'sq_overview'">
+ <dc:call-macro name="sqrelations"/>
</dc:when>
- <dc:when test="$out = 'waterlevels_panel'">
+ <dc:comment> Cross sections </dc:comment>
+ <dc:when test="$out = 'cross_section'">
<dc:call-macro name="basedata_0"/>
<dc:call-macro name="basedata_1_additionals"/>
<dc:call-macro name="basedata_2_fixations"/>
<dc:call-macro name="basedata_3_officials"/>
<dc:call-macro name="basedata_4_heightmarks-points"/>
+ <dc:call-macro name="cross_sections"/>
<dc:call-macro name="basedata_5_flood-protections"/>
+ <dc:call-macro name="hyks"/>
</dc:when>
- <dc:when test="starts-with($out, 'sq_relation') or
- $out = 'sq_overview'">
- <dc:call-macro name="sqrelations"/>
+ <dc:comment> Duration curve </dc:comment>
+ <dc:when test="$out = 'duration_curve'">
+ <dc:call-macro name="mainvalues"/>
+ <dc:call-macro name="basedata_2_fixations_relative_point"/>
+ <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+ <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+ </dc:when>
+ <dc:comment> Reference curve </dc:comment>
+ <dc:when test="$out = 'reference_curve'">
+ <dc:call-macro name="mainvalues"/>
+ <dc:call-macro name="annotations"/>
+ <dc:call-macro name="basedata_1_additionals-relative_point"/>
+ <dc:call-macro name="basedata_2_fixations_relative_point"/>
+ <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+ <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+ </dc:when>
+ <dc:comment> Maps </dc:comment>
+ <dc:when test="$out = 'map'">
+ <dc:call-macro name="flood-map-complete"/>
+ </dc:when>
+ <dc:when test="$out = 'floodmap'">
+ <dc:call-macro name="flood-map-complete"/>
</dc:when>
</dc:choose>
</dc:iterate>
More information about the Dive4Elements-commits
mailing list