[PATCH] Formatting
Wald Commits
scm-commit at wald.intevation.org
Mon Oct 1 14:19:35 CEST 2018
# HG changeset patch
# User gernotbelger
# Date 1538396382 -7200
# Node ID 4efaa2622c43766b4c319e7033cad85eafb79244
# Parent ee6508687e3f6d8bac6cf29ba2b83430c53fc73b
Formatting
diff -r ee6508687e3f -r 4efaa2622c43 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Mon Oct 01 13:03:42 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml Mon Oct 01 14:19:42 2018 +0200
@@ -2,9 +2,9 @@
<dc:template xmlns:dc="http://www.intevation.org/2011/Datacage">
<datacage>
- <dc:call-macro name="load-user" />
+ <dc:call-macro name="load-user"/>
- <dc:call-macro name="load-system" />
+ <dc:call-macro name="load-system"/>
<dc:macro name="load-system">
<dc:context connection="system">
@@ -14,14 +14,14 @@
WHERE lower(name) LIKE lower(${river})
</dc:statement>
<dc:for-each>
- <dc:call-macro name="generate-system-content" />
+ <dc:call-macro name="generate-system-content"/>
</dc:for-each>
</dc:context>
</dc:macro>
<dc:macro name="load-user">
<old_calculations>
- <dc:call-macro name="generate-user-content" />
+ <dc:call-macro name="generate-user-content"/>
</old_calculations>
</dc:macro>
@@ -39,121 +39,121 @@
<dc:choose>
<dc:comment> Longitudinal sections </dc:comment>
<dc:when test="$out = 'w_differences'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'discharge_longitudinal_section'">
- <dc:call-macro name="annotations" />
- <dc:call-macro name="officiallines_user" />
+ <dc:call-macro name="annotations"/>
+ <dc:call-macro name="officiallines_user"/>
</dc:when>
<dc:when test="$out = 'longitudinal_section'">
- <dc:call-macro name="annotations" />
- <dc:call-macro name="officiallines_user" />
+ <dc:call-macro name="annotations"/>
+ <dc:call-macro name="officiallines_user"/>
</dc:when>
<dc:when test="$out = 'fix_longitudinal_section_curve'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'bedheight_middle'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'bed_difference_year'">
- <dc:call-macro name="annotations" />
- <dc:call-macro name="basedata_6_delta_w" />
- <dc:call-macro name="sounding-width-recommendations" />
+ <dc:call-macro name="annotations"/>
+ <dc:call-macro name="basedata_6_delta_w"/>
+ <dc:call-macro name="sounding-width-recommendations"/>
</dc:when>
<dc:when test="$out = 'bed_difference_height_year'">
- <dc:call-macro name="annotations" />
- <dc:call-macro name="basedata_6_delta_w" />
+ <dc:call-macro name="annotations"/>
+ <dc:call-macro name="basedata_6_delta_w"/>
</dc:when>
<dc:when test="$out = 'sedimentload_ls'">
- <dc:call-macro name="annotations" />
- <dc:call-macro name="sedimentload_off_epochs" />
+ <dc:call-macro name="annotations"/>
+ <dc:call-macro name="sedimentload_off_epochs"/>
</dc:when>
<dc:when test="$out = 'bed_longitudinal_section'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'flow_velocity'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:comment> Discharge curves </dc:comment>
<dc:when test="$out = 'historical_discharge_wq'">
- <dc:call-macro name="hist_discharge_rec" />
- <dc:call-macro name="mainvalues" />
+ <dc:call-macro name="hist_discharge_rec"/>
+ <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: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_wq" />
+ <dc:call-macro name="mainvalues"/>
+ <dc:call-macro name="basedata_3_officials_wq"/>
+ <dc:call-macro name="basedata_2_fixations_wq"/>
</dc:when>
<dc:when test="$out = 'fix_wq_curve'">
- <dc:call-macro name="mainvalues" />
- <dc:call-macro name="qsectors" />
+ <dc:call-macro name="mainvalues"/>
+ <dc:call-macro name="qsectors"/>
</dc:when>
<dc:when test="$out = 'fix_derivate_curve'">
- <dc:call-macro name="qmainvalues" />
+ <dc:call-macro name="qmainvalues"/>
</dc:when>
<dc:when test="starts-with($out, 'sq_') and
not($out = 'sq_relation_export')">
- <dc:call-macro name="qmainvalues" />
+ <dc:call-macro name="qmainvalues"/>
</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: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:call-macro name="mainvalues"/>
</dc:when>
<dc:comment> Reference curve </dc:comment>
<dc:when test="$out = 'reference_curve'">
- <dc:call-macro name="mainvalues" />
+ <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:call-macro name="flood-map-recommended"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_minmax'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_development'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_development_peryear'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'sinfo_tkk'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'sinfo_collision'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'sinfo_flood_duration'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'sinfo_flood_height'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<!--TODO sinfo_floodduration_curve: mainvalues wie in winfo-duration_curve unterstuetzen -->
<!--dc:when test="$out = 'sinfo_floodduration_curve'">
<dc:call-macro name="mainvalues" />
</dc:when -->
<dc:when test="$out = 'uinfo_salix_line'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'bundu_wspl_longitudinal_section'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
<dc:when test="$out = 'bundu_depth_longitudinal_section'">
- <dc:call-macro name="annotations" />
+ <dc:call-macro name="annotations"/>
</dc:when>
</dc:choose>
</dc:iterate>
@@ -167,167 +167,167 @@
<dc:choose>
<dc:comment> Inline datacage panels </dc:comment>
<dc:when test="$out = 'minfo_diff_panel'">
- <dc:call-macro name="minfo-heights-diff" />
+ <dc:call-macro name="minfo-heights-diff"/>
</dc:when>
<dc:when test="$out = 'floodmap_dem_panel'">
- <dc:call-macro name="flood-map-dem" />
+ <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" />
+ <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: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="basedata_5_flood-protections" />
+ <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="basedata_5_flood-protections"/>
</dc:when>
<dc:comment> Longitudinal sections </dc:comment>
<dc:when test="$out = 'longitudinal_section'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'w_differences'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'discharge_longitudinal_section'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'fix_longitudinal_section_curve'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'flow_velocity'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'bed_longitudinal_section'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sedimentload_ls'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'bedheight_middle'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'bed_difference_height_year'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'bed_difference_year'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:comment> Discharge curves </dc:comment>
<dc:when test="$out = 'historical_discharge_wq'">
- <dc:call-macro name="discharge-curve-prototype" />
+ <dc:call-macro name="discharge-curve-prototype"/>
</dc:when>
<dc:when test="$out = 'discharge_curve'">
- <dc:call-macro name="discharge-curve-prototype" />
+ <dc:call-macro name="discharge-curve-prototype"/>
</dc:when>
<dc:when test="$out = 'fix_wq_curve'">
- <dc:call-macro name="discharge-curve-prototype" />
+ <dc:call-macro name="discharge-curve-prototype"/>
</dc:when>
<dc:when test="$out = 'fix_derivate_curve'">
- <dc:call-macro name="discharge-curve-prototype" />
+ <dc:call-macro name="discharge-curve-prototype"/>
</dc:when>
<dc:when test="$out = 'computed_discharge_curve'">
- <dc:call-macro name="discharge-curve-prototype" />
+ <dc:call-macro name="discharge-curve-prototype"/>
</dc:when>
<dc:when test="starts-with($out, 'sq_relation') or
$out = 'sq_overview'">
- <dc:call-macro name="discharge-curve-prototype" />
+ <dc:call-macro name="discharge-curve-prototype"/>
</dc:when>
<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:call-macro name="predefined_vegetation_zones" />
+ <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:call-macro name="predefined_vegetation_zones"/>
</dc:when>
<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: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: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:call-macro name="flood-map-complete"/>
</dc:when>
<dc:when test="$out = 'floodmap'">
- <dc:call-macro name="flood-map-complete" />
+ <dc:call-macro name="flood-map-complete"/>
</dc:when>
<dc:comment> S-INFO </dc:comment>
<dc:when test="$out = 'sinfo_flowdepth_minfo_heights'">
- <dc:call-macro name="bed-heights-single-MW" />
+ <dc:call-macro name="bed-heights-single-MW"/>
</dc:when>
<dc:when test="$out = 'sinfo_flowdepthminmax_heights'">
- <dc:call-macro name="bed-heights-single-KL_TW" />
+ <dc:call-macro name="bed-heights-single-KL_TW"/>
</dc:when>
<dc:when test="$out = 'sinfo_flowdepth_waterlevels'">
<minfo>
<fixanalysis>
- <dc:call-macro name="basedata_7_waterlevels" />
+ <dc:call-macro name="basedata_7_waterlevels"/>
</fixanalysis>
</minfo>
- <dc:call-macro name="basedata_3_officials" />
- <dc:call-macro name="basedata_2_fixations" />
+ <dc:call-macro name="basedata_3_officials"/>
+ <dc:call-macro name="basedata_2_fixations"/>
<sinfo>
<sinfo_additional_ls>
- <dc:call-macro name="basedata_1_additionals-sinfo-with-q" />
- <dc:call-macro name="basedata_1_additionals-sinfo-without-q" />
+ <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/>
+ <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/>
</sinfo_additional_ls>
</sinfo>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_minmax'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_development'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_development_peryear'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_tkk'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_collision'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flood_duration'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flood_height'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<!--TODO sinfo_floodduration_curve: mainvalues wie in winfo-duration_curve unterstuetzen -->
<!--dc:when test="$out = 'sinfo_floodduration_curve'">
@@ -338,18 +338,18 @@
</dc:when -->
<dc:when test="$out = 'uinfo_salix_line'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'">
- <dc:call-macro name="predefined_vegetation_zones" />
+ <dc:call-macro name="predefined_vegetation_zones"/>
</dc:when>
<dc:when test="$out = 'bundu_wspl_longitudinal_section'">
- <dc:call-macro name="longitudinal-section-prototype" />
+ <dc:call-macro name="longitudinal-section-prototype"/>
</dc:when>
<dc:when test="$out = 'bundu_depth_longitudinal_section'">
- <dc:call-macro name="longitudinal-section-prototype" />
- </dc:when>
- </dc:choose>
+ <dc:call-macro name="longitudinal-section-prototype"/>
+ </dc:when>
+ </dc:choose>
</dc:iterate>
</dc:otherwise>
</dc:choose>
@@ -370,7 +370,7 @@
<dc:iterate var="out" container="artifact-outs">
<dc:choose>
<dc:when test="$out = 'longitudinal_section'">
- <dc:call-macro name="officiallines_user" />
+ <dc:call-macro name="officiallines_user"/>
</dc:when>
</dc:choose>
</dc:iterate>
@@ -383,135 +383,135 @@
<dc:choose>
<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" />
+ <dc:call-macro name="differences-fix"/>
+ <dc:call-macro name="differences"/>
<dc:comment comment="Candidate for:">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:comment>
</dc:when>
<dc:when test="$out = 'waterlevels_panel'">
- <dc:call-macro name="waterlevels-user" />
+ <dc:call-macro name="waterlevels-user"/>
<dc:comment comment="Candidate for:">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:comment>
</dc:when>
<dc:when test="$out = 'floodmap_hws_panel'">
- <dc:call-macro name="floodmap-hws-user" />
+ <dc:call-macro name="floodmap-hws-user"/>
</dc:when>
<dc:comment> Longitudinal sections </dc:comment>
<dc:when test="$out = 'longitudinal_section'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <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:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'w_differences'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <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:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'bedheight_middle'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'flow_velocity'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'bed_longitudinal_section'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sedimentload_ls'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'bed_difference_year'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'bed_difference_height_year'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_minmax'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_development'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flow_depth_development_peryear'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_tkk'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_collision'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flood_duration'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'sinfo_flood_height'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'uinfo_salix_line'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'">
- <dc:call-macro name="vegetationzones" />
+ <dc:call-macro name="vegetationzones"/>
</dc:when>
<dc:when test="$out = 'bundu_wspl_longitudinal_section'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
<dc:when test="$out = 'bundu_depth_longitudinal_section'">
- <dc:call-macro name="longitudinal-section-user-prototype" />
+ <dc:call-macro name="longitudinal-section-user-prototype"/>
</dc:when>
-
<dc:comment> Discharge curves </dc:comment>
<dc:when test="$out = 'computed_discharge_curve'">
- <dc:call-macro name="discharge-curve-user-prototype" />
+ <dc:call-macro name="discharge-curve-user-prototype"/>
</dc:when>
<dc:when test="$out = 'fix_derivate_curve'">
- <dc:call-macro name="discharge-curve-user-prototype" />
+ <dc:call-macro name="discharge-curve-user-prototype"/>
</dc:when>
<dc:when test="$out = 'fix_wq_curve'">
- <dc:call-macro name="discharge-curve-user-prototype" />
+ <dc:call-macro name="discharge-curve-user-prototype"/>
</dc:when>
<dc:when test="$out = 'historical_discharge_wq'">
- <dc:call-macro name="discharge-curve-user-prototype" />
+ <dc:call-macro name="discharge-curve-user-prototype"/>
</dc:when>
<dc:when test="starts-with($out, 'sq_relation') or $out = 'sq_overview'">
- <dc:call-macro name="discharge-curve-user-prototype" />
+ <dc:call-macro name="discharge-curve-user-prototype"/>
</dc:when>
<dc:comment> Time series </dc:comment>
<dc:when test="$out = 'fix_deltawt_curve'">
- <dc:call-macro name="delta-wt" />
+ <dc:call-macro name="delta-wt"/>
</dc:when>
<dc:when test="$out = 'historical_discharge'">
- <dc:call-macro name="historical-discharge-user" />
+ <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="cross_section_user_content" />
- </dc:when>
+ <dc:call-macro name="cross_section_user_content"/>
+ </dc:when>
<dc:comment> Duration curve </dc:comment>
<dc:when test="$out = 'duration_curve'">
- <dc:call-macro name="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:call-macro name="reference-curves"/>
</dc:when>
<dc:comment> Maps </dc:comment>
<dc:when test="$out = 'floodmap'">
- <dc:call-macro name="flood-map" />
+ <dc:call-macro name="flood-map"/>
</dc:when>
<dc:when test="$out = 'map'">
- <dc:call-macro name="flood-map" />
+ <dc:call-macro name="flood-map"/>
</dc:when>
<dc:when test="$out = 'sinfo_flowdepth_waterlevels'">
- <dc:call-macro name="longitudinal-section-fix-vollmer_w" />
+ <dc:call-macro name="longitudinal-section-fix-vollmer_w"/>
</dc:when>
</dc:choose>
</dc:iterate>
@@ -532,12 +532,12 @@
<discharges description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="out" value="historical_discharge" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="out" value="historical_discharge"/>
</dc:element>
</dc:for-each>
</discharges>
@@ -555,12 +555,12 @@
<differences description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</differences>
@@ -578,12 +578,12 @@
<ref_curve description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="out" value="reference_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="out" value="reference_curve"/>
</dc:element>
</dc:for-each>
</ref_curve>
@@ -599,24 +599,24 @@
<dc:if test="dc:has-result()">
<floodmap>
<dc:for-each>
- <dc:variable name="combined_desc" expr="concat($facet_description, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)" />
+ <dc:variable name="combined_desc" expr="concat($facet_description, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"/>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${combined_desc}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_id}" />
- <dc:attribute name="ids" value="${a_id}" />
- <dc:attribute name="out" value="floodmap" />
+ <dc:attribute name="description" value="${combined_desc}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_id}"/>
+ <dc:attribute name="ids" value="${a_id}"/>
+ <dc:attribute name="out" value="floodmap"/>
</dc:element>
</dc:for-each>
</floodmap>
</dc:if>
</dc:filter>
</dc:macro>
-
+
<dc:macro name="cross_section_user_content">
- <dc:call-macro name="waterlevels" />
- <dc:call-macro name="vegetationzones" />
+ <dc:call-macro name="waterlevels"/>
+ <dc:call-macro name="vegetationzones"/>
</dc:macro>
<dc:macro name="waterlevels">
@@ -628,12 +628,12 @@
<longitudinal_section_columns description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="cross_section" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="cross_section"/>
</dc:element>
</dc:for-each>
</longitudinal_section_columns>
@@ -647,7 +647,7 @@
<dc:macro name="collection-group">
<dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
- <dc:macro-body />
+ <dc:macro-body/>
</dc:group>
</dc:macro>
@@ -660,12 +660,12 @@
<longitudinal_section_columns description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="longitudinal_section" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="longitudinal_section"/>
</dc:element>
</dc:for-each>
</longitudinal_section_columns>
@@ -680,13 +680,13 @@
($facet_name = 'longitudinal_section.w' or
$facet_name = 'longitudinal_section.q')
">
- <dc:call-macro name="longitudinal-section-fix-vollmer_macro" />
+ <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/>
</dc:filter>
</dc:macro>
<dc:macro name="longitudinal-section-fix-vollmer_w">
<dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $facet_name = 'longitudinal_section.w'">
- <dc:call-macro name="longitudinal-section-fix-vollmer_macro" />
+ <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/>
</dc:filter>
</dc:macro>
@@ -697,15 +697,15 @@
<waterlevels description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="fixanalysis" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="longitudinal_section" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="fixanalysis"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="longitudinal_section"/>
- <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)" />
- <dc:attribute name="year" value="${fixAnalysisYear}" />
+ <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)"/>
+ <dc:attribute name="year" value="${fixAnalysisYear}"/>
</dc:element>
</dc:for-each>
</waterlevels>
@@ -727,12 +727,12 @@
<waterlevels description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="fixanalysis" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="fix_longitudinal_section_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="fixanalysis"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
</dc:element>
</dc:for-each>
</waterlevels>
@@ -755,12 +755,12 @@
<waterlevels description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="fixanalysis" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="fix_deltawt_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="fixanalysis"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="fix_deltawt_curve"/>
</dc:element>
</dc:for-each>
</waterlevels>
@@ -771,8 +771,7 @@
</dc:macro>
<dc:macro name="fix-wq-curve">
- <dc:filter
- expr="($out_name = 'fix_wq_curve' and
+ <dc:filter expr="($out_name = 'fix_wq_curve' and
(starts-with($facet_name, 'fix_analysis_events_wq') or
starts-with($facet_name, 'fix_reference_events_wq') or
starts-with($facet_name, 'fix_sector_average_wq') or
@@ -787,22 +786,22 @@
<dc:choose>
<dc:when test="$out_name = 'fix_wq_curve'">
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="fixanalysis" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="fix_wq_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="fixanalysis"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="fix_wq_curve"/>
</dc:element>
</dc:when>
<dc:when test="$out_name = 'fix_derivate_curve'">
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="fixanalysis" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="fix_derivate_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="fixanalysis"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="fix_derivate_curve"/>
</dc:element>
</dc:when>
</dc:choose>
@@ -820,12 +819,12 @@
<computed_discharge_curves>
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="factory" value="fixanalysis" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="ids" value="${a_gid}" />
- <dc:attribute name="out" value="computed_discharge_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="factory" value="fixanalysis"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="ids" value="${a_gid}"/>
+ <dc:attribute name="out" value="computed_discharge_curve"/>
</dc:element>
</dc:for-each>
</computed_discharge_curves>
@@ -841,12 +840,12 @@
<projects description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="ids" value="${a_gid}" />
- <dc:attribute name="out" value="computed_discharge_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="ids" value="${a_gid}"/>
+ <dc:attribute name="out" value="computed_discharge_curve"/>
</dc:element>
</dc:for-each>
</projects>
@@ -862,12 +861,12 @@
<computed_discharge_curves>
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_id}" />
- <dc:attribute name="ids" value="${a_id}" />
- <dc:attribute name="out" value="duration_curve" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_id}"/>
+ <dc:attribute name="ids" value="${a_id}"/>
+ <dc:attribute name="out" value="duration_curve"/>
</dc:element>
</dc:for-each>
</computed_discharge_curves>
@@ -889,20 +888,20 @@
<dc:choose>
<dc:when test="$ld_m = 'location'">
<dc:variable name="combined_desc" expr="concat($facet_description,
- ' an KM ', $deffrom)" />
+ ' an KM ', $deffrom)"/>
</dc:when>
<dc:otherwise>
<dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ',
- $deffrom, ' bis KM ', $defto)" />
+ $deffrom, ' bis KM ', $defto)"/>
</dc:otherwise>
</dc:choose>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${combined_desc}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="longitudinal_section" />
+ <dc:attribute name="description" value="${combined_desc}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="longitudinal_section"/>
</dc:element>
</dc:for-each>
</waterlevels>
@@ -912,9 +911,9 @@
</dc:filter>
</dc:macro>
- <dc:comment comment="For building differences." />
+ <dc:comment comment="For building differences."/>
<dc:macro name="differences-fix">
- <dc:comment comment="Vollmer curves need own factory" />
+ <dc:comment comment="Vollmer curves need own factory"/>
<dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $facet_name = 'longitudinal_section.w'">
<dc:if test="dc:has-result()">
<vollmer_waterlevels>
@@ -923,20 +922,20 @@
<dc:for-each>
<dc:choose>
<dc:when test="$ld_m = 'location'">
- <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)" />
+ <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)"/>
</dc:when>
<dc:otherwise>
<dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ',
- $deffrom, ' bis KM ', $defto)" />
+ $deffrom, ' bis KM ', $defto)"/>
</dc:otherwise>
</dc:choose>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${combined_desc}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="fixanalysis" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="longitudinal_section" />
+ <dc:attribute name="description" value="${combined_desc}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="fixanalysis"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="longitudinal_section"/>
</dc:element>
</dc:for-each>
</waterlevels>
@@ -953,20 +952,20 @@
<dc:for-each>
<dc:choose>
<dc:when test="$ld_m = 'location'">
- <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)" />
+ <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)"/>
</dc:when>
<dc:otherwise>
<dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ',
- $deffrom, ' bis KM ', $defto)" />
+ $deffrom, ' bis KM ', $defto)"/>
</dc:otherwise>
</dc:choose>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${combined_desc}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="longitudinal_section" />
+ <dc:attribute name="description" value="${combined_desc}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="longitudinal_section"/>
</dc:element>
</dc:for-each>
</waterlevels>
@@ -983,12 +982,12 @@
<own-hws>
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="floodmap" />
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="floodmap"/>
</dc:element>
</dc:for-each>
</own-hws>
@@ -1004,12 +1003,12 @@
<quality-bed description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="minfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="bed_longitudinal_section" />
+ <dc:attribute name="factory" value="minfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="bed_longitudinal_section"/>
</dc:element>
</dc:for-each>
</quality-bed>
@@ -1028,12 +1027,12 @@
<flow description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="minfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="flow_velocity" />
+ <dc:attribute name="factory" value="minfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="flow_velocity"/>
</dc:element>
</dc:for-each>
</flow>
@@ -1051,12 +1050,12 @@
<load description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="minfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="minfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</load>
@@ -1075,12 +1074,12 @@
<middle_bedheight description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="minfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="minfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</middle_bedheight>
@@ -1099,12 +1098,12 @@
<difference description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="minfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="minfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</difference>
@@ -1131,12 +1130,12 @@
<sqrel description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="minfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="minfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</sqrel>
@@ -1154,12 +1153,12 @@
<discharge description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="winfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}-${facet_name}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="discharge_longitudinal_section" />
+ <dc:attribute name="factory" value="winfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="discharge_longitudinal_section"/>
</dc:element>
</dc:for-each>
</discharge>
@@ -1173,12 +1172,12 @@
<!-- Macros to load system data -->
<dc:macro name="qmainvalues">
- <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}" />
+ <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}"/>
</dc:macro>
<dc:macro name="mainvalues">
- <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}" />
- <dc:call-macro name="qmainvalues" />
+ <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}"/>
+ <dc:call-macro name="qmainvalues"/>
</dc:macro>
<!-- discharge curves -->
@@ -1187,17 +1186,17 @@
<dc:variable name="validity" expr="concat(
dc:date-format('dd.MM.yyyy', $start_time),
' - ',
- dc:date-format('dd.MM.yyyy', $stop_time))" />
+ dc:date-format('dd.MM.yyyy', $stop_time))"/>
<histdis name="{concat($bfg_id, ' ', $validity)}" description="{concat($bfg_id, ' ', $validity)}" factory="gaugedischarge" target_out="{$out}" ids="{$gauge_name};{$dt_id};{concat($bfg_id, ' ',
- $gauge_name, ' ', $validity)}" />
+ $gauge_name, ' ', $validity)}"/>
</dc:for-each>
</dc:macro>
<dc:macro name="hist_discharge_rec">
<dc:variable name="start" type="number" expr="dc:date-format('yyyyMMdd',
- number(substring-before($year_range, ';')))" />
+ number(substring-before($year_range, ';')))"/>
<dc:variable name="stop" type="number" expr="dc:date-format('yyyyMMdd',
- number(substring-after($year_range, ';')))" />
+ number(substring-after($year_range, ';')))"/>
<dc:call-macro name="discharge_curve_choose_context">
<dc:filter expr="$kind = 1 and
number(dc:date-format('yyyyMMdd', $start_time))
@@ -1206,7 +1205,7 @@
dc:date-format('yyyyMMdd', $stop_time),
'99999999'))
> $start">
- <dc:call-macro name="hist_discharge_factory" />
+ <dc:call-macro name="hist_discharge_factory"/>
</dc:filter>
</dc:call-macro>
</dc:macro>
@@ -1217,7 +1216,7 @@
<dc:group expr="$gauge_name">
<gauge name="{dc:group-key()}">
<dc:for-each>
- <current_gauge factory="gaugedischarge" target_out="{$out}" ids="{$gauge_name}" />
+ <current_gauge factory="gaugedischarge" target_out="{$out}" ids="{$gauge_name}"/>
</dc:for-each>
</gauge>
</dc:group>
@@ -1231,7 +1230,7 @@
<historical_discharge_curves>
<dc:group expr="$gauge_name">
<gauge name="{dc:group-key()}">
- <dc:call-macro name="hist_discharge_factory" />
+ <dc:call-macro name="hist_discharge_factory"/>
</gauge>
</dc:group>
</historical_discharge_curves>
@@ -1243,15 +1242,15 @@
<dc:choose>
<dc:when test="$fromkm > -99999 and $tokm < 99999">
<dc:context>
- <dc:call-macro name="discharge_curves_km" />
- <dc:macro-body />
+ <dc:call-macro name="discharge_curves_km"/>
+ <dc:macro-body/>
</dc:context>
</dc:when>
<dc:otherwise>
- <dc:variable name="refgauge" type="number" expr="dc:get('reference_gauge')" />
+ <dc:variable name="refgauge" type="number" expr="dc:get('reference_gauge')"/>
<dc:context>
- <dc:call-macro name="discharge_curves_refgauge" />
- <dc:macro-body />
+ <dc:call-macro name="discharge_curves_refgauge"/>
+ <dc:macro-body/>
</dc:context>
</dc:otherwise>
</dc:choose>
@@ -1305,7 +1304,7 @@
AND csl.km BETWEEN ${fromkm} AND ${tokm}
</dc:statement>
<dc:for-each>
- <cross_section name="{$prot_description}" ids="{$prot_id}" factory="crosssections" target_out="{$out}" />
+ <cross_section name="{$prot_description}" ids="{$prot_id}" factory="crosssections" target_out="{$out}"/>
</dc:for-each>
</dc:context>
</cross_sections>
@@ -1324,7 +1323,7 @@
AND he.km BETWEEN ${fromkm} AND ${tokm}
</dc:statement>
<dc:for-each>
- <hyk name="{$hyk_description}" ids="{$hyk_id}" factory="hyk" target_out="{$out}" />
+ <hyk name="{$hyk_description}" ids="{$hyk_id}" factory="hyk" target_out="{$out}"/>
</dc:for-each>
</dc:context>
</hyks>
@@ -1336,7 +1335,7 @@
<vegetation_zones>
<dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)"/>
- <defaultVegetationZone factory="predefined_vegetation_zonesf" target_out="{$out}" ids="{$vegzonedata}"/>
+ <defaultVegetationZone factory="predefined_vegetation_zonesf" target_out="{$out}" ids="{$vegzonedata}"/>
</vegetation_zones>
</uinfo>
</dc:macro>
@@ -1351,7 +1350,7 @@
<dc:group expr="$wst_description">
<basedata name="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</basedata>
</dc:group>
@@ -1362,13 +1361,13 @@
<dc:macro name="basedata_0">
<dc:call-macro name="basedata_0_macro">
- <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_0_wq">
<dc:call-macro name="basedata_0_macro">
- <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
@@ -1380,7 +1379,7 @@
<dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
<additional name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</additional>
</dc:group>
@@ -1391,7 +1390,7 @@
<dc:macro name="basedata_1_additionals">
<dc:call-macro name="basedata_1_additionals_macro">
- <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
@@ -1402,7 +1401,7 @@
<dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
<additional name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</additional>
</dc:group>
@@ -1413,7 +1412,7 @@
<dc:macro name="basedata_1_additionals-sinfo-with-q">
<dc:call-macro name="basedata_1_additionals-sinfo-with-q_macro">
- <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" />
+ <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/>
</dc:call-macro>
</dc:macro>
@@ -1424,7 +1423,7 @@
<dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
<additional name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</additional>
</dc:group>
@@ -1435,20 +1434,20 @@
<dc:macro name="basedata_1_additionals-sinfo-without-q">
<dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro">
- <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" />
- <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" />
+ <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/>
+ <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_1_additionals_wq">
<dc:call-macro name="basedata_1_additionals_macro">
- <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_1_additionals-relative_point">
<dc:call-macro name="basedata_1_additionals_macro">
- <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
@@ -1460,7 +1459,7 @@
<dc:group expr="dc:replace($wst_description, 'Fixierungen/', '')">
<fixation name="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</fixation>
</dc:group>
@@ -1471,20 +1470,20 @@
<dc:macro name="basedata_2_fixations">
<dc:call-macro name="fixings-macro">
- <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" />
- <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" />
+ <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/>
+ <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_2_fixations_wq">
<dc:call-macro name="fixings-macro">
- <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_2_fixations_relative_point">
<dc:call-macro name="fixings-macro">
- <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
@@ -1496,7 +1495,7 @@
<dc:group expr="$wst_description">
<official name="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</official>
</dc:group>
@@ -1507,14 +1506,14 @@
<dc:macro name="basedata_3_officials">
<dc:call-macro name="basedata_3_macro">
- <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" />
- <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" />
+ <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/>
+ <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_3_officials_wq">
<dc:call-macro name="basedata_3_macro">
- <column name="{$wst_column_name}" ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <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:call-macro>
</dc:macro>
@@ -1526,7 +1525,7 @@
<dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')">
<heightmark name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</heightmark>
</dc:group>
@@ -1537,19 +1536,19 @@
<dc:macro name="basedata_4_heightmarks-points">
<dc:call-macro name="basedata_4_macro">
- <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_4_heightmarks-points_wq">
<dc:call-macro name="basedata_4_macro">
- <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_4_heightmarks-points-relative_points">
<dc:call-macro name="basedata_4_macro">
- <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
@@ -1561,7 +1560,7 @@
<dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')">
<flood_protection name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</flood_protection>
</dc:group>
@@ -1572,19 +1571,19 @@
<dc:macro name="basedata_5_flood-protections">
<dc:call-macro name="basedata_5_macro">
- <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_5_flood-protections_wq">
<dc:call-macro name="basedata_5_macro">
- <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_5_flood-protections_relative_points">
<dc:call-macro name="basedata_5_macro">
- <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
@@ -1598,7 +1597,7 @@
<dc:group expr="dc:replace($wst_description, 'CSV/', '')">
<relativepoint name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <column name="{$wst_column_name}" ids="delta_w-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="delta_w-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:for-each>
</relativepoint>
</dc:group>
@@ -1609,7 +1608,7 @@
<dc:group expr="dc:replace($wst_description, 'CSV/', '')">
<relativepoint name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <column name="{$wst_column_name}" ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:for-each>
</relativepoint>
</dc:group>
@@ -1628,7 +1627,7 @@
<dc:group expr="dc:replace($wst_description, 'CSV/', '')">
<relativepoint name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</relativepoint>
</dc:group>
@@ -1639,14 +1638,14 @@
<dc:macro name="basedata_7_waterlevels">
<dc:call-macro name="basedata_7_macro">
- <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" />
- <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" />
+ <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/>
+ <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/>
</dc:call-macro>
</dc:macro>
<dc:macro name="basedata_7_waterlevels_wq">
<dc:call-macro name="basedata_7_macro">
- <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" />
+ <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/>
</dc:call-macro>
</dc:macro>
@@ -1655,118 +1654,118 @@
<dc:macro name="discharge-curve-prototype">
<computed_discharge_curve>
- <dc:call-macro name="discharge_table_gauge" />
- <dc:call-macro name="mainvalues" />
+ <dc:call-macro name="discharge_table_gauge"/>
+ <dc:call-macro name="mainvalues"/>
</computed_discharge_curve>
- <dc:call-macro name="historical_discharge_curve" />
- <dc:call-macro name="basedata_0_wq" />
- <dc:call-macro name="basedata_1_additionals_wq" />
- <dc:call-macro name="basedata_2_fixations_wq" />
- <dc:call-macro name="basedata_3_officials_wq" />
- <dc:call-macro name="basedata_4_heightmarks-points_wq" />
- <dc:call-macro name="basedata_5_flood-protections_wq" />
+ <dc:call-macro name="historical_discharge_curve"/>
+ <dc:call-macro name="basedata_0_wq"/>
+ <dc:call-macro name="basedata_1_additionals_wq"/>
+ <dc:call-macro name="basedata_2_fixations_wq"/>
+ <dc:call-macro name="basedata_3_officials_wq"/>
+ <dc:call-macro name="basedata_4_heightmarks-points_wq"/>
+ <dc:call-macro name="basedata_5_flood-protections_wq"/>
<minfo>
- <dc:call-macro name="sqrelations" />
- <dc:call-macro name="basedata_7_waterlevels_wq" />
+ <dc:call-macro name="sqrelations"/>
+ <dc:call-macro name="basedata_7_waterlevels_wq"/>
</minfo>
</dc:macro>
<dc:macro name="discharge-curve-user-prototype">
- <dc:call-macro name="waterlevels-user" />
- <dc:call-macro name="computed-discharge-curve" />
+ <dc:call-macro name="waterlevels-user"/>
+ <dc:call-macro name="computed-discharge-curve"/>
<!-- TODO: macro for discharge longitudinal section -->
- <dc:call-macro name="fix-wq-curve" />
+ <dc:call-macro name="fix-wq-curve"/>
<!-- TODO: own macro for Vollmer-curve (extract from fix-wq-curve and waterlevels-user) -->
- <dc:call-macro name="extreme-wq-curve" />
+ <dc:call-macro name="extreme-wq-curve"/>
<minfo>
- <dc:call-macro name="sqrelations_user" />
+ <dc:call-macro name="sqrelations_user"/>
</minfo>
</dc:macro>
<dc:macro name="longitudinal-section-prototype">
- <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="basedata_5_flood-protections" />
- <dc:call-macro name="annotations_per_type" />
+ <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="basedata_5_flood-protections"/>
+ <dc:call-macro name="annotations_per_type"/>
<minfo>
<fixanalysis>
- <dc:call-macro name="basedata_6_delta_w" />
- <dc:call-macro name="basedata_7_waterlevels" />
+ <dc:call-macro name="basedata_6_delta_w"/>
+ <dc:call-macro name="basedata_7_waterlevels"/>
</fixanalysis>
- <dc:call-macro name="sedimentloads" />
- <dc:call-macro name="densities" />
- <dc:call-macro name="minfo-heights" />
- <dc:call-macro name="sounding-width" />
- <dc:call-macro name="morph_width" />
- <dc:call-macro name="porosities" />
+ <dc:call-macro name="sedimentloads"/>
+ <dc:call-macro name="densities"/>
+ <dc:call-macro name="minfo-heights"/>
+ <dc:call-macro name="sounding-width"/>
+ <dc:call-macro name="morph_width"/>
+ <dc:call-macro name="porosities"/>
<flow_velocities>
- <dc:call-macro name="flow_velocity_measurements" />
- <dc:call-macro name="flow_velocity_models" />
+ <dc:call-macro name="flow_velocity_measurements"/>
+ <dc:call-macro name="flow_velocity_models"/>
</flow_velocities>
</minfo>
<sinfo>
<sinfo_predefined_flowdepths>
- <dc:call-macro name="sinfo_predefined_flowdepth-m" />
+ <dc:call-macro name="sinfo_predefined_flowdepth-m"/>
</sinfo_predefined_flowdepths>
<sinfo_predefined_collision>
- <dc:call-macro name="sinfo_predefined_collision" />
+ <dc:call-macro name="sinfo_predefined_collision"/>
</sinfo_predefined_collision>
<sinfo_predefined_channel>
- <dc:call-macro name="sinfo_predefined_channel" />
+ <dc:call-macro name="sinfo_predefined_channel"/>
</sinfo_predefined_channel>
<sinfo_predefined_infrastructure>
- <dc:call-macro name="sinfo_predefined_infrastructure" />
+ <dc:call-macro name="sinfo_predefined_infrastructure"/>
</sinfo_predefined_infrastructure>
<sinfo_predefined_tkh>
- <dc:call-macro name="sinfo_predefined_tkh-berechnung" />
- <dc:call-macro name="sinfo_predefined_tkh-messung" />
+ <dc:call-macro name="sinfo_predefined_tkh-berechnung"/>
+ <dc:call-macro name="sinfo_predefined_tkh-messung"/>
</sinfo_predefined_tkh>
<sinfo_predefined_depthevol>
- <dc:call-macro name="sinfo_predefined_depthevol-aktuell" />
- <dc:call-macro name="sinfo_predefined_depthevol-etappe" />
+ <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/>
+ <dc:call-macro name="sinfo_predefined_depthevol-etappe"/>
</sinfo_predefined_depthevol>
</sinfo>
-
+
</dc:macro>
<dc:macro name="longitudinal-section-user-prototype">
<dc:comment> SINFO </dc:comment>
- <dc:call-macro name="sinfo_flowdepths" />
- <dc:call-macro name="sinfo_flowdepths_minmax" />
- <dc:call-macro name="sinfo_flow_depth_development" />
- <dc:call-macro name="sinfo_tkh" />
- <dc:call-macro name="sinfo_collision" />
- <dc:call-macro name="sinfo_flood_duration" />
+ <dc:call-macro name="sinfo_flowdepths"/>
+ <dc:call-macro name="sinfo_flowdepths_minmax"/>
+ <dc:call-macro name="sinfo_flow_depth_development"/>
+ <dc:call-macro name="sinfo_tkh"/>
+ <dc:call-macro name="sinfo_collision"/>
+ <dc:call-macro name="sinfo_flood_duration"/>
<dc:comment> WINFO/DIFF/FIX </dc:comment>
- <dc:call-macro name="longitudinal" />
- <dc:call-macro name="differences" />
- <dc:call-macro name="waterlevels-discharge" />
- <dc:call-macro name="longitudinal-section-fix" />
- <dc:call-macro name="longitudinal-section-fix-vollmer" />
+ <dc:call-macro name="longitudinal"/>
+ <dc:call-macro name="differences"/>
+ <dc:call-macro name="waterlevels-discharge"/>
+ <dc:call-macro name="longitudinal-section-fix"/>
+ <dc:call-macro name="longitudinal-section-fix-vollmer"/>
<dc:comment> MINFO </dc:comment>
- <dc:call-macro name="middle_bedheights" />
- <dc:call-macro name="bedheight_differences" />
- <dc:call-macro name="bedquality" />
- <dc:call-macro name="flow-velocity" />
- <dc:call-macro name="sediment-load" />
+ <dc:call-macro name="middle_bedheights"/>
+ <dc:call-macro name="bedheight_differences"/>
+ <dc:call-macro name="bedquality"/>
+ <dc:call-macro name="flow-velocity"/>
+ <dc:call-macro name="sediment-load"/>
<dc:comment> UINFO </dc:comment>
- <dc:call-macro name="uinfo_salix_line" />
+ <dc:call-macro name="uinfo_salix_line"/>
<dc:comment> BUNDU </dc:comment>
- <dc:call-macro name="bundu_bezugswst" />
+ <dc:call-macro name="bundu_bezugswst"/>
</dc:macro>
<!-- porosities -->
@@ -1795,7 +1794,7 @@
<dc:if test="dc:has-result()">
<dc:for-each>
<porosity description="{$depth_lower}-{$depth_upper} cm" factory="porosity" target_out="{$out}" info="{concat($info, dc:date-format('yyyy', $syear),
- ' - ', dc:date-format('yyyy', $eyear))}" ids="{$pid};{$description}" />
+ ' - ', dc:date-format('yyyy', $eyear))}" ids="{$pid};{$description}"/>
</dc:for-each>
</dc:if>
</dc:context>
@@ -1822,7 +1821,7 @@
</dc:statement>
<dc:if test="dc:has-result()">
<dc:for-each>
- <density description="{$depth_lower}-{$depth_upper} cm" factory="sedimentdensity" target_out="{$out}" info="{$info}" ids="{$sdid}" />
+ <density description="{$depth_lower}-{$depth_upper} cm" factory="sedimentdensity" target_out="{$out}" info="{$info}" ids="{$sdid}"/>
</dc:for-each>
</dc:if>
</dc:context>
@@ -1831,11 +1830,11 @@
<!-- sediment load -->
<dc:macro name="load">
- <year description="{$timespan}" factory="sedimentload" target_out="{$out}" info="{$info}" ids="{$slid};{$fraction};{$timespan};{$kind}" />
+ <year description="{$timespan}" factory="sedimentload" target_out="{$out}" info="{$info}" ids="{$slid};{$fraction};{$timespan};{$kind}"/>
</dc:macro>
<dc:macro name="load_ls">
- <year description="{$timespan}" factory="sedimentload_ls" target_out="{$out}" info="{$info}" ids="{$slid};{$timespan};{$kind}" />
+ <year description="{$timespan}" factory="sedimentload_ls" target_out="{$out}" info="{$info}" ids="{$slid};{$timespan};{$kind}"/>
</dc:macro>
<dc:macro name="loads">
@@ -1844,24 +1843,24 @@
dc:date-format('yyyy', $sqstop))">
<sq_time description="{dc:group-key()}">
<dc:group expr="$fraction">
- <dc:variable name="fraction_name" expr="concat('${', dc:group-key(), '}')" />
+ <dc:variable name="fraction_name" expr="concat('${', dc:group-key(), '}')"/>
<fraction description="{$fraction_name}">
<dc:for-each>
<dc:choose>
<dc:when test="string-length(dc:get('endyear')) = 0">
- <dc:variable name="timespan" type="string" expr="dc:date-format('yyyy', $startyear)" />
+ <dc:variable name="timespan" type="string" expr="dc:date-format('yyyy', $startyear)"/>
</dc:when>
<dc:otherwise>
<dc:variable name="timespan" type="string" expr="concat(dc:date-format('yyyy',
$startyear), '-',
- dc:date-format('yyyy', $endyear))" />
+ dc:date-format('yyyy', $endyear))"/>
</dc:otherwise>
</dc:choose>
<dc:if test="$kind = 'official'">
<dc:variable name="info" type="string" expr="concat('Amtliche Epoche<BR>',
- dc:get('info'))" />
+ dc:get('info'))"/>
</dc:if>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:for-each>
</fraction>
</dc:group>
@@ -1874,41 +1873,41 @@
<years>
<dc:filter expr="string-length(dc:get('endyear')) = 0 and
$kind != 'official'">
- <dc:macro-body />
+ <dc:macro-body/>
</dc:filter>
</years>
<epochs>
<dc:filter expr="string-length(dc:get('endyear')) > 0 and
$kind != 'official'">
- <dc:macro-body />
+ <dc:macro-body/>
</dc:filter>
</epochs>
<off_epochs>
<dc:filter expr="$kind = 'official'">
- <dc:macro-body />
+ <dc:macro-body/>
</dc:filter>
</off_epochs>
</dc:macro>
<dc:macro name="sedimentloads">
<sedimentloads>
- <dc:call-macro name="annotations_sediment_load_ls" />
+ <dc:call-macro name="annotations_sediment_load_ls"/>
<measurement_stations>
<dc:context>
- <dc:call-macro name="sedimentload_stations_statement" />
+ <dc:call-macro name="sedimentload_stations_statement"/>
<dc:call-macro name="sedimentloads-filter">
<dc:call-macro name="loads">
- <dc:call-macro name="load" />
+ <dc:call-macro name="load"/>
</dc:call-macro>
</dc:call-macro>
</dc:context>
</measurement_stations>
<sediment_load_ls>
<dc:context>
- <dc:call-macro name="sedimentload_ls_statement" />
+ <dc:call-macro name="sedimentload_ls_statement"/>
<dc:call-macro name="sedimentloads-filter">
<dc:call-macro name="loads">
- <dc:call-macro name="load_ls" />
+ <dc:call-macro name="load_ls"/>
</dc:call-macro>
</dc:call-macro>
</dc:context>
@@ -1985,20 +1984,20 @@
<!-- annotations -->
<dc:macro name="annotations">
- <annotation factory="annotations" ids="{$river_id}" target_out="{$out}" />
+ <annotation factory="annotations" ids="{$river_id}" target_out="{$out}"/>
</dc:macro>
<dc:macro name="annotations_per_type">
<annotations>
<dc:context>
- <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}" />
+ <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}"/>
<dc:statement>
SELECT id AS anno_id,
name AS anno_description
FROM annotation_types
</dc:statement>
<dc:for-each>
- <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}" />
+ <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}"/>
</dc:for-each>
</dc:context>
</annotations>
@@ -2014,22 +2013,22 @@
WHERE name LIKE 'Quelle %' OR name LIKE 'Senke %'
</dc:statement>
<dc:for-each>
- <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}" />
+ <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}"/>
</dc:for-each>
</dc:context>
</sources_sinks>
</dc:macro>
<dc:macro name="qsectors">
- <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}" />
+ <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}"/>
</dc:macro>
<dc:macro name="flood-map-recommended">
<kilometrage>
- <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}" />
+ <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}"/>
</kilometrage>
<rastermap>
- <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}" />
+ <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}"/>
</rastermap>
</dc:macro>
@@ -2068,8 +2067,8 @@
</dc:statement>
<dc:if test="dc:has-result()">
<bedheights>
- <dc:call-macro name="bed-heights-single-diff" />
- <dc:call-macro name="bed-heights-epoch-diff" />
+ <dc:call-macro name="bed-heights-single-diff"/>
+ <dc:call-macro name="bed-heights-epoch-diff"/>
</bedheights>
</dc:if>
</dc:context>
@@ -2078,7 +2077,7 @@
<dc:macro name="bed-heights-single-diff">
<dc:filter expr="not(contains(dc:lowercase($b1desc), 'epoche'))">
<years>
- <dc:call-macro name="minfo-heights-diff-tree" />
+ <dc:call-macro name="minfo-heights-diff-tree"/>
</years>
</dc:filter>
</dc:macro>
@@ -2086,7 +2085,7 @@
<dc:macro name="bed-heights-epoch-diff">
<dc:filter expr="contains(dc:lowercase($b1desc), 'epoche')">
<epochs>
- <dc:call-macro name="minfo-heights-diff-tree" />
+ <dc:call-macro name="minfo-heights-diff-tree"/>
</epochs>
</dc:filter>
</dc:macro>
@@ -2097,11 +2096,11 @@
<dc:for-each>
<dc:choose>
<dc:when test="dc:group-key() = $b1year">
- <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}" />
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}"/>
</dc:when>
<dc:when test="dc:group-key() = 'sonstige'">
- <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}" />
- <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b2id}-{$b1desc}#bedheight-single-{$b1id}-{$b2desc}" info="{$b2desc}#{$b1desc}" description="{$b2desc} - {$b1desc}" />
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}"/>
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b2id}-{$b1desc}#bedheight-single-{$b1id}-{$b2desc}" info="{$b2desc}#{$b1desc}" description="{$b2desc} - {$b1desc}"/>
</dc:when>
</dc:choose>
</dc:for-each>
@@ -2111,8 +2110,8 @@
<dc:macro name="minfo-heights">
<bedheights>
- <dc:call-macro name="bed-heights-single" />
- <dc:call-macro name="bed-heights-epoch" />
+ <dc:call-macro name="bed-heights-single"/>
+ <dc:call-macro name="bed-heights-epoch"/>
</bedheights>
</dc:macro>
@@ -2120,13 +2119,13 @@
<dc:macro name="bed-heights-factory_MW_TW_KL">
<dc:for-each>
<dc:if test="$bedh_height_count > 0">
- <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-MW-{$bedh_descr}" info="{$info}" description="MW-{$bedh_descr}" />
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-MW-{$bedh_descr}" info="{$info}" description="MW-{$bedh_descr}"/>
</dc:if>
<dc:if test="$bedh_min_count > 0">
- <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMin-{$bedh_id}-{$bedh_year}-TW-{$bedh_descr}" info="{$info}" description="TW-{$bedh_descr}" />
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMin-{$bedh_id}-{$bedh_year}-TW-{$bedh_descr}" info="{$info}" description="TW-{$bedh_descr}"/>
</dc:if>
<dc:if test="$bedh_max_count > 0">
- <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMax-{$bedh_id}-{$bedh_year}-KL-{$bedh_descr}" info="{$info}" description="KL-{$bedh_descr}" />
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMax-{$bedh_id}-{$bedh_year}-KL-{$bedh_descr}" info="{$info}" description="KL-{$bedh_descr}"/>
</dc:if>
</dc:for-each>
</dc:macro>
@@ -2136,7 +2135,7 @@
<dc:for-each>
<dc:if test="$bedh_height_count > 0">
<!-- REMARK: addition 'yaer' attribute is used by intelligent datacage filter of SINFO -->
- <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" year="{$bedh_year}" />
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" year="{$bedh_year}"/>
</dc:if>
</dc:for-each>
</dc:macro>
@@ -2144,11 +2143,11 @@
<dc:macro name="bed-heights-single">
<single>
<dc:context>
- <dc:call-macro name="bed-heights-statement" />
+ <dc:call-macro name="bed-heights-statement"/>
<dc:if test="dc:has-result()">
<dc:group expr="dc:coalesce($bedh_year, 'sonstige')">
<heights name="{dc:group-key()}" description="{dc:group-key()}">
- <dc:call-macro name="bed-heights-factory_MW_TW_KL" />
+ <dc:call-macro name="bed-heights-factory_MW_TW_KL"/>
</heights>
</dc:group>
</dc:if>
@@ -2160,12 +2159,12 @@
<dc:macro name="bed-heights-single-MW">
<single>
<dc:context>
- <dc:call-macro name="bed-heights-statement" />
+ <dc:call-macro name="bed-heights-statement"/>
<dc:filter expr="$bedh_height_count">
<dc:if test="dc:has-result()">
<dc:group expr="dc:coalesce($bedh_year, 'sonstige')">
<heights name="{dc:group-key()}" description="{dc:group-key()}">
- <dc:call-macro name="bed-heights-factory_MW" />
+ <dc:call-macro name="bed-heights-factory_MW"/>
</heights>
</dc:group>
</dc:if>
@@ -2178,12 +2177,12 @@
<dc:macro name="bed-heights-single-KL_TW">
<single>
<dc:context>
- <dc:call-macro name="bed-heights-statement" />
+ <dc:call-macro name="bed-heights-statement"/>
<dc:filter expr="$bedh_max_count > 0 and $bedh_min_count > 0">
<dc:if test="dc:has-result()">
<dc:group expr="dc:coalesce($bedh_year, 'sonstige')">
<heights name="{dc:group-key()}" description="{dc:group-key()}">
- <dc:call-macro name="bed-heights-factory_MW" />
+ <dc:call-macro name="bed-heights-factory_MW"/>
</heights>
</dc:group>
</dc:if>
@@ -2195,9 +2194,9 @@
<dc:macro name="bed-heights-epoch">
<epoch>
<dc:context>
- <dc:call-macro name="bed-heights-statement" />
+ <dc:call-macro name="bed-heights-statement"/>
<dc:filter expr="contains($bedh_descr, 'Epoche')">
- <dc:call-macro name="bed-heights-factory_MW_TW_KL" />
+ <dc:call-macro name="bed-heights-factory_MW_TW_KL"/>
</dc:filter>
</dc:context>
</epoch>
@@ -2205,16 +2204,16 @@
<dc:macro name="sounding-width-factory">
<dc:for-each>
- <height factory="bedheight" target_out="{$out}" ids="bedheight-soundings-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" />
+ <height factory="bedheight" target_out="{$out}" ids="bedheight-soundings-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}"/>
</dc:for-each>
</dc:macro>
<dc:macro name="sounding-width">
<dc:context>
- <dc:call-macro name="bed-heights-statement" />
+ <dc:call-macro name="bed-heights-statement"/>
<dc:if test="dc:has-result()">
<soundings_width>
- <dc:call-macro name="sounding-width-factory" />
+ <dc:call-macro name="sounding-width-factory"/>
</soundings_width>
</dc:if>
</dc:context>
@@ -2222,9 +2221,9 @@
<dc:macro name="sounding-width-recommendations">
<dc:context>
- <dc:call-macro name="bed-heights-statement" />
+ <dc:call-macro name="bed-heights-statement"/>
<dc:filter expr="dc:contains($diffids, concat(';', $bedh_descr, ']'))">
- <dc:call-macro name="sounding-width-factory" />
+ <dc:call-macro name="sounding-width-factory"/>
</dc:filter>
</dc:context>
</dc:macro>
@@ -2252,7 +2251,8 @@
elevation_model old_em
ON old_em.id = old_elevation_model_id
LEFT JOIN ranges r ON r.id = range_id
- LEFT JOIN (SELECT bed_height_id, COUNT(height) AS height_count, COUNT(min_height) AS min_count, COUNT(max_height) AS max_count
+ LEFT JOIN (SELECT bed_height_id, COUNT(height) AS height_count, COUNT(min_height) AS min_count, COUNT(max_height)
+ AS max_count
FROM bed_height_values
WHERE (station BETWEEN (${fromkm}-0.0001) AND (${tokm}+0.0001))
GROUP BY bed_height_id
@@ -2282,7 +2282,7 @@
<dc:for-each>
<measurement_value name="{$fvmd}" description="{$fvmd}" ids="{$fvmid}" factory="flowvelocitymodel" info="{$lowerQ} - {$upperQ}<BR>
Pegel {$gauge}<BR>
- Q = {$q} m3/s" target_out="{$out}" />
+ Q = {$q} m3/s" target_out="{$out}"/>
</dc:for-each>
</flowvelocitymodel>
</dc:if>
@@ -2309,7 +2309,7 @@
AND station BETWEEN ${fromkm} AND ${tokm}
</dc:statement>
<dc:for-each>
- <measurement_value name="{$description} - {$station} - {$datetime}" description="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}" />
+ <measurement_value name="{$description} - {$station} - {$datetime}" description="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}"/>
</dc:for-each>
</dc:context>
</flow_velocity_measurement>
@@ -2337,7 +2337,7 @@
WHERE morphologic_width_id = ${width_id}
</dc:statement>
<dc:for-each>
- <morphologic-width name="{$from_station} - {$to_station}" description="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}" />
+ <morphologic-width name="{$from_station} - {$to_station}" description="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}"/>
</dc:for-each>
</dc:context>
</dc:for-each>
@@ -2378,8 +2378,8 @@
<dc:variable name="combined_desc" expr="concat(dc:date-format('yyyy',
$start_time), ' bis ',
dc:date-format('yyyy',
- $stop_time))" />
- <sqvalue factory="sqrelationdatacage" target_out="{$out}" ids="{$sqvid};{dc:uppercase($parameter)} - {$station_name}: {$combined_desc}" description="{$combined_desc}" />
+ $stop_time))"/>
+ <sqvalue factory="sqrelationdatacage" target_out="{$out}" ids="{$sqvid};{dc:uppercase($parameter)} - {$station_name}: {$combined_desc}" description="{$combined_desc}"/>
</dc:for-each>
</station>
</dc:group>
@@ -2393,36 +2393,36 @@
<!-- Floodmap part -->
<dc:macro name="flood-map-complete">
- <dc:call-macro name="flood-map-buildings" />
- <dc:call-macro name="flood-map-gaugelocations" />
- <dc:call-macro name="floodmarks" />
+ <dc:call-macro name="flood-map-buildings"/>
+ <dc:call-macro name="flood-map-gaugelocations"/>
+ <dc:call-macro name="floodmarks"/>
<hws>
- <dc:call-macro name="hwslines" />
- <dc:call-macro name="hwspoints" />
+ <dc:call-macro name="hwslines"/>
+ <dc:call-macro name="hwspoints"/>
</hws>
- <dc:call-macro name="flood-map-routing" />
+ <dc:call-macro name="flood-map-routing"/>
<hydrboundaries>
- <dc:call-macro name="flood-map-floodplain" />
- <dc:call-macro name="flood-map-hydr-boundaries" />
+ <dc:call-macro name="flood-map-floodplain"/>
+ <dc:call-macro name="flood-map-hydr-boundaries"/>
</hydrboundaries>
- <dc:call-macro name="flood-map-uesk" />
+ <dc:call-macro name="flood-map-uesk"/>
</dc:macro>
<dc:macro name="flood-map-routing">
<route_data>
- <dc:call-macro name="flood-map-qps" />
- <dc:call-macro name="flood-map-fixpoints" />
- <dc:call-macro name="flood-map-km" />
- <dc:call-macro name="flood-map-riveraxis" />
+ <dc:call-macro name="flood-map-qps"/>
+ <dc:call-macro name="flood-map-fixpoints"/>
+ <dc:call-macro name="flood-map-km"/>
+ <dc:call-macro name="flood-map-riveraxis"/>
</route_data>
</dc:macro>
<dc:macro name="flood-map-hydr-boundaries">
<bfg_model>
- <dc:call-macro name="flood-map-hydr-boundaries-poly" />
- <dc:call-macro name="flood-map-hydr-boundaries-lines" />
+ <dc:call-macro name="flood-map-hydr-boundaries-poly"/>
+ <dc:call-macro name="flood-map-hydr-boundaries-lines"/>
</bfg_model>
- <dc:call-macro name="flood-map-hydr-boundaries-state" />
+ <dc:call-macro name="flood-map-hydr-boundaries-state"/>
</dc:macro>
<dc:macro name="flood-map-dem">
@@ -2448,7 +2448,7 @@
AND NOT((${tokm} < r.a) or (${fromkm} > r.b))
</dc:statement>
<dc:for-each>
- <dem factory="demfactory" target_out="{$out}" ids="{$dem_id}" name="{$name}" info="{$info}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}" />
+ <dem factory="demfactory" target_out="{$out}" ids="{$dem_id}" name="{$name}" info="{$info}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}"/>
</dc:for-each>
</dc:context>
</dems>
@@ -2458,14 +2458,14 @@
<dc:macro name="durchlass_damm_graben">
<dc:macro name="ddg_factory">
<dc:for-each>
- <hws factory="hwsfactory" name="{$hws_name}" target_out="{$out}" />
+ <hws factory="hwsfactory" name="{$hws_name}" target_out="{$out}"/>
</dc:for-each>
</dc:macro>
<dc:filter expr="$hws_kind=1">
<dc:if test="dc:has-result()">
<Durchlass>
- <dc:call-macro name="ddg_factory" />
+ <dc:call-macro name="ddg_factory"/>
</Durchlass>
</dc:if>
</dc:filter>
@@ -2473,7 +2473,7 @@
<dc:filter expr="$hws_kind=2">
<dc:if test="dc:has-result()">
<Damm>
- <dc:call-macro name="ddg_factory" />
+ <dc:call-macro name="ddg_factory"/>
</Damm>
</dc:if>
</dc:filter>
@@ -2481,7 +2481,7 @@
<dc:filter expr="$hws_kind=3">
<dc:if test="dc:has-result()">
<Graben>
- <dc:call-macro name="ddg_factory" />
+ <dc:call-macro name="ddg_factory"/>
</Graben>
</dc:if>
</dc:filter>
@@ -2490,7 +2490,7 @@
<dc:filter expr="$hws_official=1">
<dc:if test="dc:has-result()">
<official>
- <dc:call-macro name="durchlass_damm_graben" />
+ <dc:call-macro name="durchlass_damm_graben"/>
</official>
</dc:if>
</dc:filter>
@@ -2498,7 +2498,7 @@
<dc:filter expr="$hws_official=0">
<dc:if test="dc:has-result()">
<inofficial>
- <dc:call-macro name="durchlass_damm_graben" />
+ <dc:call-macro name="durchlass_damm_graben"/>
</inofficial>
</dc:if>
</dc:filter>
@@ -2516,7 +2516,7 @@
</dc:statement>
<dc:if test="dc:has-result()">
<lines>
- <dc:call-macro name="filter_hws_ddg" />
+ <dc:call-macro name="filter_hws_ddg"/>
</lines>
</dc:if>
</dc:context>
@@ -2534,7 +2534,7 @@
</dc:statement>
<dc:if test="dc:has-result()">
<points>
- <dc:call-macro name="filter_hws_ddg" />
+ <dc:call-macro name="filter_hws_ddg"/>
</points>
</dc:if>
</dc:context>
@@ -2551,7 +2551,7 @@
AND kind = 2
</dc:statement>
<dc:for-each>
- <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}" />
+ <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}"/>
</dc:for-each>
</dc:context>
<dc:context>
@@ -2563,7 +2563,7 @@
AND kind = 2
</dc:statement>
<dc:for-each>
- <line factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}" />
+ <line factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}"/>
</dc:for-each>
</dc:context>
</federal>
@@ -2582,7 +2582,7 @@
<dc:if test="dc:has-result()">
<lines>
<dc:for-each>
- <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};1" name="{$name}" />
+ <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};1" name="{$name}"/>
</dc:for-each>
</lines>
</dc:if>
@@ -2604,7 +2604,7 @@
<dc:if test="dc:has-result()">
<sobek_areas>
<dc:for-each>
- <boundary name="{$sectie}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sectie};1;{$sectie_id};-1" />
+ <boundary name="{$sectie}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sectie};1;{$sectie_id};-1"/>
</dc:for-each>
</sobek_areas>
</dc:if>
@@ -2622,7 +2622,7 @@
<dc:if test="dc:has-result()">
<sobek_flooded>
<dc:for-each>
- <boundary name="{$sobek}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sobek};1;-1;{$sobek_id}" />
+ <boundary name="{$sobek}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sobek};1;-1;{$sobek_id}"/>
</dc:for-each>
</sobek_flooded>
</dc:if>
@@ -2638,7 +2638,7 @@
AND b.sectie is NULL
</dc:statement>
<dc:for-each>
- <boundary name="{$name}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name}" />
+ <boundary name="{$name}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name}"/>
</dc:for-each>
</dc:context>
</areas>
@@ -2668,7 +2668,7 @@
<dc:if test="dc:has-result()">
<bfg>
<dc:for-each>
- <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" />
+ <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/>
</dc:for-each>
</bfg>
</dc:if>
@@ -2682,7 +2682,7 @@
<dc:if test="dc:has-result()">
<federal>
<dc:for-each>
- <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" />
+ <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/>
</dc:for-each>
</federal>
</dc:if>
@@ -2706,7 +2706,7 @@
<dc:if test="dc:has-result()">
<bfg>
<dc:for-each>
- <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" />
+ <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/>
</dc:for-each>
</bfg>
</dc:if>
@@ -2721,7 +2721,7 @@
<dc:if test="dc:has-result()">
<federal>
<dc:for-each>
- <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" />
+ <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/>
</dc:for-each>
</federal>
</dc:if>
@@ -2750,7 +2750,7 @@
${source}
</dc:statement>
<dc:for-each>
- <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" />
+ <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/>
</dc:for-each>
</dc:context>
</year>
@@ -2777,14 +2777,14 @@
<floodplain>
<dc:filter expr="$kind_id=1">
<dc:for-each>
- <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}" />
+ <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}"/>
</dc:for-each>
</dc:filter>
<dc:filter expr="$kind_id != 1">
<dc:if test="dc:has-result()">
<other>
<dc:for-each>
- <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}" />
+ <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}"/>
</dc:for-each>
</other>
</dc:if>
@@ -2802,14 +2802,14 @@
<dc:macro name="hwspoints_by_kind_factory">
<dc:for-each>
- <hws factory="wmshwspointsfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}" />
+ <hws factory="wmshwspointsfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}"/>
</dc:for-each>
</dc:macro>
<dc:filter expr="$hws_kind=1">
<dc:if test="dc:has-result()">
<Durchlass>
- <dc:call-macro name="hwspoints_by_kind_factory" />
+ <dc:call-macro name="hwspoints_by_kind_factory"/>
</Durchlass>
</dc:if>
</dc:filter>
@@ -2817,7 +2817,7 @@
<dc:filter expr="$hws_kind=2">
<dc:if test="dc:has-result()">
<Damm>
- <dc:call-macro name="hwspoints_by_kind_factory" />
+ <dc:call-macro name="hwspoints_by_kind_factory"/>
</Damm>
</dc:if>
</dc:filter>
@@ -2825,7 +2825,7 @@
<dc:filter expr="$hws_kind=3">
<dc:if test="dc:has-result()">
<Graben>
- <dc:call-macro name="hwspoints_by_kind_factory" />
+ <dc:call-macro name="hwspoints_by_kind_factory"/>
</Graben>
</dc:if>
</dc:filter>
@@ -2856,7 +2856,7 @@
AND fed_state_id = ${fed_id} ORDER BY name
</dc:statement>
<fedstate description="{$fed_name}">
- <dc:call-macro name="hwspoints_by_kind" />
+ <dc:call-macro name="hwspoints_by_kind"/>
</fedstate>
</dc:context>
</dc:for-each>
@@ -2873,7 +2873,7 @@
ORDER BY name
</dc:statement>
<hws_fed_unknown>
- <dc:call-macro name="hwspoints_by_kind" />
+ <dc:call-macro name="hwspoints_by_kind"/>
</hws_fed_unknown>
</dc:context>
</official>
@@ -2900,7 +2900,7 @@
AND fed_state_id = ${fed_id} ORDER BY name
</dc:statement>
<fedstate description="{$fed_name}">
- <dc:call-macro name="hwspoints_by_kind" />
+ <dc:call-macro name="hwspoints_by_kind"/>
</fedstate>
</dc:context>
</dc:for-each>
@@ -2916,7 +2916,7 @@
AND fed_state_id IS NULL ORDER BY name
</dc:statement>
<hws_fed_unknown>
- <dc:call-macro name="hwspoints_by_kind" />
+ <dc:call-macro name="hwspoints_by_kind"/>
</hws_fed_unknown>
</dc:context>
</inofficial>
@@ -2931,14 +2931,14 @@
<dc:macro name="hwslines_by_kind_factory">
<dc:for-each>
- <hws factory="wmshwslinesfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}" />
+ <hws factory="wmshwslinesfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}"/>
</dc:for-each>
</dc:macro>
<dc:filter expr="$hws_kind=1">
<dc:if test="dc:has-result()">
<Durchlass>
- <dc:call-macro name="hwslines_by_kind_factory" />
+ <dc:call-macro name="hwslines_by_kind_factory"/>
</Durchlass>
</dc:if>
</dc:filter>
@@ -2946,7 +2946,7 @@
<dc:filter expr="$hws_kind=2">
<dc:if test="dc:has-result()">
<Damm>
- <dc:call-macro name="hwslines_by_kind_factory" />
+ <dc:call-macro name="hwslines_by_kind_factory"/>
</Damm>
</dc:if>
</dc:filter>
@@ -2954,7 +2954,7 @@
<dc:filter expr="$hws_kind=3">
<dc:if test="dc:has-result()">
<Graben>
- <dc:call-macro name="hwslines_by_kind_factory" />
+ <dc:call-macro name="hwslines_by_kind_factory"/>
</Graben>
</dc:if>
</dc:filter>
@@ -2985,7 +2985,7 @@
AND fed_state_id = ${fed_id} ORDER BY name
</dc:statement>
<fedstate description="{$fed_name}">
- <dc:call-macro name="hwslines_by_kind" />
+ <dc:call-macro name="hwslines_by_kind"/>
</fedstate>
</dc:context>
</dc:for-each>
@@ -3002,7 +3002,7 @@
ORDER BY name
</dc:statement>
<hws_fed_unknown>
- <dc:call-macro name="hwslines_by_kind" />
+ <dc:call-macro name="hwslines_by_kind"/>
</hws_fed_unknown>
</dc:context>
</official>
@@ -3029,7 +3029,7 @@
AND fed_state_id = ${fed_id} ORDER BY name
</dc:statement>
<fedstate description="{$fed_name}">
- <dc:call-macro name="hwslines_by_kind" />
+ <dc:call-macro name="hwslines_by_kind"/>
</fedstate>
</dc:context>
</dc:for-each>
@@ -3045,7 +3045,7 @@
AND fed_state_id IS NULL ORDER BY name
</dc:statement>
<hws_fed_unknown>
- <dc:call-macro name="hwslines_by_kind" />
+ <dc:call-macro name="hwslines_by_kind"/>
</hws_fed_unknown>
</dc:context>
</inofficial>
@@ -3063,7 +3063,7 @@
<dc:if test="dc:has-result()">
<floodmarks>
<dc:for-each>
- <floodmark name="{$year}" factory="wmsfloodmarkfactory" target_out="{$out}" ids="{$river_id};{$year};{$year}" />
+ <floodmark name="{$year}" factory="wmsfloodmarkfactory" target_out="{$out}" ids="{$river_id};{$year};{$year}"/>
</dc:for-each>
</floodmarks>
</dc:if>
@@ -3072,10 +3072,10 @@
<dc:macro name="flood-map-gaugelocations">
<gaugelocations>
- <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)" target_out="{$out}" />
- <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)" target_out="{$out}" />
- <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)" target_out="{$out}" />
- <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)" target_out="{$out}" />
+ <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)" target_out="{$out}"/>
+ <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)" target_out="{$out}"/>
+ <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)" target_out="{$out}"/>
+ <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)" target_out="{$out}"/>
</gaugelocations>
</dc:macro>
@@ -3094,13 +3094,13 @@
<axis>
<dc:filter expr="$kind_id=1">
<dc:for-each>
- <actual description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}" factory="riveraxis" target_out="{$out}" />
+ <actual description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}" factory="riveraxis" target_out="{$out}"/>
</dc:for-each>
</dc:filter>
<dc:filter expr="$kind_id!=1">
<other>
<dc:for-each>
- <misc-axis description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}" factory="riveraxis" target_out="{$out}" />
+ <misc-axis description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}" factory="riveraxis" target_out="{$out}"/>
</dc:for-each>
</other>
</dc:filter>
@@ -3115,7 +3115,7 @@
SELECT DISTINCT 1 FROM river_axes_km WHERE river_id = ${river_id}
</dc:statement>
<dc:for-each>
- <kilometrage factory="wmskmfactory" ids="{$river_id}" target_out="{$out}" />
+ <kilometrage factory="wmskmfactory" ids="{$river_id}" target_out="{$out}"/>
</dc:for-each>
</dc:context>
</dc:macro>
@@ -3129,7 +3129,7 @@
GROUP BY name
</dc:statement>
<dc:for-each>
- <fixpoints factory="wmsfixpointsfactory" target_out="{$out}" ids="{$river_id};{$name}" />
+ <fixpoints factory="wmsfixpointsfactory" target_out="{$out}" ids="{$river_id};{$name}"/>
</dc:for-each>
</dc:context>
</dc:macro>
@@ -3149,14 +3149,14 @@
<qps>
<dc:filter expr="$kind_id=1">
<dc:for-each>
- <actual description="{$kind_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$kind_name};{$kind_id}" />
+ <actual description="{$kind_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$kind_name};{$kind_id}"/>
</dc:for-each>
</dc:filter>
<dc:filter expr="$kind_id = 0">
<dc:if test="dc:has-result()">
<other>
<dc:for-each>
- <misc-qps description="{$layer_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$layer_name};{$kind_id}" />
+ <misc-qps description="{$layer_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$layer_name};{$kind_id}"/>
</dc:for-each>
</other>
</dc:if>
@@ -3181,13 +3181,13 @@
<dc:if test="dc:has-result()">
<dc:filter expr="$building_kind_id!=0">
<dc:for-each>
- <buildings description="{$building_kind}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_kind};{$building_kind_id}" />
+ <buildings description="{$building_kind}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_kind};{$building_kind_id}"/>
</dc:for-each>
</dc:filter>
<dc:filter expr="$building_kind_id=0">
<other>
<dc:for-each>
- <buildings description="{$building_name}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_name}" />
+ <buildings description="{$building_name}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_name}"/>
</dc:for-each>
</other>
</dc:filter>
@@ -3205,7 +3205,7 @@
<dc:if test="dc:has-result()">
<jetties>
<dc:for-each>
- <jetty description="{$jetty_kind}" factory="wmsjettiesfactory" target_out="{$out}" ids="{$river_id};{$jetty_kind};{$jetty_kind_id}" />
+ <jetty description="{$jetty_kind}" factory="wmsjettiesfactory" target_out="{$out}" ids="{$river_id};{$jetty_kind};{$jetty_kind_id}"/>
</dc:for-each>
</jetties>
</dc:if>
@@ -3217,14 +3217,14 @@
<dc:if test="dc:contains($parameters, 'official-lines')">
<dc:container-context container="official-lines">
<dc:properties>
- <dc:property name="name" alias="olname" />
- <dc:property name="wstId" alias="wstid" />
- <dc:property name="columnPos" alias="wstcolpos" />
+ <dc:property name="name" alias="olname"/>
+ <dc:property name="wstId" alias="wstid"/>
+ <dc:property name="columnPos" alias="wstcolpos"/>
</dc:properties>
<dc:if test="dc:has-result()">
<officiallines>
<dc:for-each>
- <column name="{$olname}" ids="official-wstv-{$wstcolpos}-{$wstid}" factory="staticwqkms" target_out="{$out}" />
+ <column name="{$olname}" ids="official-wstv-{$wstcolpos}-{$wstid}" factory="staticwqkms" target_out="{$out}"/>
</dc:for-each>
</officiallines>
</dc:if>
@@ -3235,14 +3235,14 @@
<!-- sediment loads -->
<dc:macro name="sedimentload_off_epoch_filter">
<dc:if test="dc:has-result()">
- <dc:variable name="sq_time_id" type="number" expr="number($sq_ti_id)" />
+ <dc:variable name="sq_time_id" type="number" expr="number($sq_ti_id)"/>
<dc:if test="string-length(dc:get('epochs')) > 0">
- <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $epochs))" />
- <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $epochs))" />
+ <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $epochs))"/>
+ <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $epochs))"/>
</dc:if>
<dc:if test="string-length(dc:get('years')) > 0">
- <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $years))" />
- <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $years))" />
+ <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $years))"/>
+ <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $years))"/>
</dc:if>
<dc:filter expr="$kind = 'official' and
$sqid = $sq_time_id and
@@ -3250,25 +3250,25 @@
number(dc:date-format('yyyy', $startyear))
or number($start) >
number(dc:date-format('yyyy', $endyear)))">
- <dc:macro-body />
+ <dc:macro-body/>
</dc:filter>
</dc:if>
</dc:macro>
<dc:macro name="sedimentload_off_epochs">
<dc:context>
- <dc:call-macro name="sedimentload_stations_statement" />
+ <dc:call-macro name="sedimentload_stations_statement"/>
<dc:call-macro name="sedimentload_off_epoch_filter">
<dc:call-macro name="loads">
- <dc:call-macro name="load" />
+ <dc:call-macro name="load"/>
</dc:call-macro>
</dc:call-macro>
</dc:context>
<dc:context>
- <dc:call-macro name="sedimentload_ls_statement" />
+ <dc:call-macro name="sedimentload_ls_statement"/>
<dc:call-macro name="sedimentload_off_epoch_filter">
<dc:call-macro name="loads">
- <dc:call-macro name="load_ls" />
+ <dc:call-macro name="load_ls"/>
</dc:call-macro>
</dc:call-macro>
</dc:context>
@@ -3296,11 +3296,12 @@
JOIN wst_ranges wr ON wc.id =
wr.wst_column_id
LEFT JOIN time_intervals ti ON wc.time_interval_id = ti.id
- WHERE w.river_id = ${river_id} AND
+ WHERE w.river_id = ${river_id}
+ AND
NOT((${tokm} < wr.a) or (${fromkm} > wr.b))
ORDER BY wst_column_position
</dc:statement>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:context>
</dc:macro>
@@ -3348,7 +3349,7 @@
</dc:statement>
<dc:virtual-column name="deffrom" type="number" expr="dc:fromValue($ld_m, $ld_l, $ld_f)">
<dc:virtual-column name="defto" type="number" expr="dc:toValue($ld_m, $ld_l, $ld_t)">
- <dc:macro-body />
+ <dc:macro-body/>
</dc:virtual-column>
</dc:virtual-column>
</dc:context>
@@ -3361,7 +3362,7 @@
</dc:comment>
<dc:filter expr="not($deffrom > $tokm or $defto < $fromkm) or
starts-with($facet_name, 'sq_')">
- <dc:macro-body />
+ <dc:macro-body/>
</dc:filter>
</dc:macro>
@@ -3369,25 +3370,25 @@
<dc:choose>
<dc:when test="dc:coalesce(dc:get('ld_locations'), ' ') != ' '">
<dc:variable name="fromkm" type="number" expr="dc:min-number(dc:find-all('\d*\.?\d*',
- dc:get('ld_locations')))" />
+ dc:get('ld_locations')))"/>
<dc:variable name="tokm" type="number" expr="dc:max-number(dc:find-all('\d*\.?\d*',
- dc:get('ld_locations')))" />
+ dc:get('ld_locations')))"/>
</dc:when>
<dc:otherwise>
<dc:variable name="fromkm" type="number" expr="dc:fromValue(dc:get('ld_mode'),
- dc:get('ld_locations'), dc:get('ld_from'))" />
+ dc:get('ld_locations'), dc:get('ld_from'))"/>
<dc:variable name="tokm" type="number" expr="dc:toValue(dc:get('ld_mode'),
- dc:get('ld_locations'), dc:get('ld_to'))" />
+ dc:get('ld_locations'), dc:get('ld_to'))"/>
<dc:if test="$fromkm > $tokm">
<dc:message>Inverting KM filter.</dc:message>
<dc:variable name="fromkm" type="number" expr="dc:toValue(dc:get('ld_mode'),
- dc:get('ld_locations'), dc:get('ld_to'))" />
+ dc:get('ld_locations'), dc:get('ld_to'))"/>
<dc:variable name="tokm" type="number" expr="dc:fromValue(dc:get('ld_mode'),
- dc:get('ld_locations'), dc:get('ld_from'))" />
+ dc:get('ld_locations'), dc:get('ld_from'))"/>
</dc:if>
</dc:otherwise>
</dc:choose>
- <dc:macro-body />
+ <dc:macro-body/>
</dc:macro>
<!-- S-INFO -->
@@ -3402,12 +3403,12 @@
<sinfo_flow_depth description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="sinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="sinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</sinfo_flow_depth>
@@ -3427,12 +3428,12 @@
<sinfo_flow_depth_minmax description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="sinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="sinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</sinfo_flow_depth_minmax>
@@ -3457,12 +3458,12 @@
<sinfo_flow_depth_development description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="sinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="sinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</sinfo_flow_depth_development>
@@ -3486,12 +3487,12 @@
<sinfo_tkh description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="sinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="sinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</sinfo_tkh>
@@ -3510,12 +3511,12 @@
<sinfo_collision description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="sinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="sinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</sinfo_collision>
@@ -3536,12 +3537,12 @@
<sinfo_flood_duration description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="sinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="sinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</sinfo_flood_duration>
@@ -3569,7 +3570,7 @@
</dc:statement>
<dc:if test="dc:has-result()">
<dc:for-each>
- <channelseries name="{$seriesname}" description="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" />
+ <channelseries name="{$seriesname}" description="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}"/>
</dc:for-each>
</dc:if>
</dc:context>
@@ -3578,15 +3579,15 @@
<!-- tkh imported from CSV-files for S-INFO -->
<dc:macro name="sinfo_predefined_tkh-berechnung">
<predefined_tkh_berechnung>
- <dc:variable name="tkh_groupname" expr="'berechnung'" />
- <dc:call-macro name="sinfo_predefined_tkh" />
+ <dc:variable name="tkh_groupname" expr="'berechnung'"/>
+ <dc:call-macro name="sinfo_predefined_tkh"/>
</predefined_tkh_berechnung>
</dc:macro>
<dc:macro name="sinfo_predefined_tkh-messung">
<predefined_tkh_messung>
- <dc:variable name="tkh_groupname" expr="'messung'" />
- <dc:call-macro name="sinfo_predefined_tkh" />
+ <dc:variable name="tkh_groupname" expr="'messung'"/>
+ <dc:call-macro name="sinfo_predefined_tkh"/>
</predefined_tkh_messung>
</dc:macro>
@@ -3605,7 +3606,8 @@
v ON sc.id=v.tkh_column_id
WHERE (s.river_id=${river_id})
AND (lower(s.groupname)=${tkh_groupname})
- AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
+ AND
+ (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
GROUP BY sc.tkh_id, sc.id
ORDER BY sc.id
</dc:statement>
@@ -3613,7 +3615,7 @@
<dc:group expr="$tkh_name">
<tkhx name="{dc:group-key()}" description="{dc:group-key()}">
<dc:for-each>
- <tkhcolumn name="{$tkh_col_name}" description="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}" />
+ <tkhcolumn name="{$tkh_col_name}" description="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}"/>
</dc:for-each>
</tkhx>
</dc:group>
@@ -3624,15 +3626,15 @@
<!-- depth_evolution imported from CSV-files for S-INFO -->
<dc:macro name="sinfo_predefined_depthevol-aktuell">
<predefined_depthevol_aktuell>
- <dc:variable name="depthevol_groupname" expr="'aktuell'" />
- <dc:call-macro name="sinfo_predefined_depthevol" />
+ <dc:variable name="depthevol_groupname" expr="'aktuell'"/>
+ <dc:call-macro name="sinfo_predefined_depthevol"/>
</predefined_depthevol_aktuell>
</dc:macro>
<dc:macro name="sinfo_predefined_depthevol-etappe">
<predefined_depthevol_etappe>
- <dc:variable name="depthevol_groupname" expr="'etappe'" />
- <dc:call-macro name="sinfo_predefined_depthevol" />
+ <dc:variable name="depthevol_groupname" expr="'etappe'"/>
+ <dc:call-macro name="sinfo_predefined_depthevol"/>
</predefined_depthevol_etappe>
</dc:macro>
@@ -3648,21 +3650,22 @@
MIN(s.curr_glw) AS info
FROM depth_evolution s
INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id
- WHERE (s.river_id=${river_id})
+ WHERE
+ (s.river_id=${river_id})
AND (lower(s.groupname)=${depthevol_groupname})
AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
GROUP BY s.id
ORDER BY s.id
</dc:statement>
<dc:for-each>
- <depth_evol name="{$depthevol_name}" description="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}" />
+ <depth_evol name="{$depthevol_name}" description="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/>
</dc:for-each>
</dc:context>
</dc:macro>
<!-- flow depth imported from CSV-files for S-INFO -->
<dc:macro name="sinfo_predefined_flowdepth-m">
- <dc:call-macro name="sinfo_predefined_flowdepth-m1" />
+ <dc:call-macro name="sinfo_predefined_flowdepth-m1"/>
</dc:macro>
<dc:macro name="sinfo_predefined_flowdepth-m1">
@@ -3678,7 +3681,8 @@
INNER JOIN
flow_depth s ON sc.flow_depth_id=s.id
INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id
- WHERE (s.river_id=${river_id})
+ WHERE
+ (s.river_id=${river_id})
AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
GROUP BY sc.flow_depth_id, sc.id
ORDER BY sc.id
@@ -3687,7 +3691,7 @@
<dc:group expr="$flowdepth_name">
<sinfo_predefined_flowdepth>
<dc:for-each>
- <flowdepthcolumn name="{$flowdepth_col_name}" description="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}" />
+ <flowdepthcolumn name="{$flowdepth_col_name}" description="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/>
</dc:for-each>
</sinfo_predefined_flowdepth>
</dc:group>
@@ -3710,12 +3714,13 @@
s.annotation_type_id=x.id
WHERE (s.river_id=${river_id})
AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001)
- GROUP BY s.id
+ GROUP BY
+ s.id
ORDER BY MIN(s.filename) DESC
</dc:statement>
<dc:if test="dc:has-result()">
<dc:for-each>
- <infrastructureseries name="{$seriesname}" description="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" />
+ <infrastructureseries name="{$seriesname}" description="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}"/>
</dc:for-each>
</dc:if>
</dc:context>
@@ -3739,7 +3744,7 @@
</dc:statement>
<dc:if test="dc:has-result()">
<dc:for-each>
- <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" />
+ <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}"/>
</dc:for-each>
</dc:if>
</dc:context>
@@ -3757,12 +3762,12 @@
<uinfo_salix_line description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="uinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="uinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</uinfo_salix_line>
@@ -3774,22 +3779,22 @@
<!-- Vegetation zones, edited by the user -->
<dc:macro name="vegetationzones">
- <dc:filter expr="$a_state = 'state.uinfo.vegetation_zones' and $facet_name = 'uinfo_facet_vegetation_zones_cross_section'"> <!--'uinfo_facet_vegetation_zones_cross_section'" > and $facet_name = 'csv'"> we misuse the csv-facet -->
+ <dc:filter expr="$a_state = 'state.uinfo.vegetation_zones' and $facet_name = 'uinfo_facet_vegetation_zones_cross_section'">
<dc:if test="dc:has-result()">
<vegetation_zones>
<dc:for-each>
- <dc:variable name="vegzonedata" expr="dc:data_from_artifact($a_gid,'vegzones')" />
- <dc:variable name="label_temp" type="string" expr="concat(dc:get('ld_f'), ' km - ', dc:get('ld_t'), ' km')" />
+ <dc:variable name="vegzonedata" expr="dc:data_from_artifact($a_gid,'vegzones')"/>
+ <dc:variable name="label_temp" type="string" expr="concat(dc:get('ld_f'), ' km - ', dc:get('ld_t'), ' km')"/>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="uinfo" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${label_temp}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
- <dc:attribute name="ids" value="${facet_num}" />
+ <dc:attribute name="factory" value="uinfo"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${label_temp}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
<!-- veg zones string as attribute -->
- <dc:attribute name="data" value="${vegzonedata}" />
+ <dc:attribute name="data" value="${vegzonedata}"/>
</dc:element>
</dc:for-each>
</vegetation_zones>
@@ -3834,20 +3839,20 @@
or $facet_name = 'bundu_facet_depth_10.filtered'
or $facet_name = 'longitudinal_section.area'
or $facet_name = 'longitudinal_section.manualpoints'
- )" >
-
+ )">
+
<dc:if test="dc:has-result()">
<bundu_bezugswsts>
<dc:call-macro name="collection-group">
<bundu_bezugswst description="{dc:group-key()}">
<dc:for-each>
<dc:element name="${facet_name}">
- <dc:attribute name="factory" value="bundu" />
- <dc:attribute name="target_out" value="${out}" />
- <dc:attribute name="description" value="${facet_description}" />
- <dc:attribute name="ids" value="${facet_num}" />
- <dc:attribute name="artifact-id" value="${a_gid}" />
- <dc:attribute name="out" value="${out_name}" />
+ <dc:attribute name="factory" value="bundu"/>
+ <dc:attribute name="target_out" value="${out}"/>
+ <dc:attribute name="description" value="${facet_description}"/>
+ <dc:attribute name="ids" value="${facet_num}"/>
+ <dc:attribute name="artifact-id" value="${a_gid}"/>
+ <dc:attribute name="out" value="${out_name}"/>
</dc:element>
</dc:for-each>
</bundu_bezugswst>
More information about the Dive4Elements-commits
mailing list