Mercurial > dive4elements > river
diff artifacts/doc/conf/meta-data.xml @ 9127:dbb26bc81843
Testing
| author | gernotbelger |
|---|---|
| date | Wed, 06 Jun 2018 13:05:57 +0200 |
| parents | 623b51bf03d7 |
| children | 7879c2ca8bd3 |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Wed Jun 06 09:22:49 2018 +0200 +++ b/artifacts/doc/conf/meta-data.xml Wed Jun 06 13:05:57 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,99 +39,99 @@ <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:choose> </dc:iterate> @@ -145,157 +145,157 @@ <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="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_3_officials" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="cross_sections" /> + <dc:call-macro name="basedata_5_flood-protections" /> + <dc:call-macro name="hyks" /> </dc:when> <dc:comment> 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:choose> </dc:iterate> @@ -318,7 +318,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> @@ -331,112 +331,112 @@ <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: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="waterlevels"/> + <dc:call-macro name="waterlevels" /> </dc:when> <dc:comment> Duration curve </dc:comment> <dc:when test="$out = 'duration_curve'"> - <dc:call-macro name="duration-curve"/> + <dc: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_q"/> + <dc:call-macro name="longitudinal-section-fix-vollmer_q" /> <!-- TODO: 'Frühere Berechnungen//Bezugswasserstände' --> </dc:when> </dc:choose> @@ -458,12 +458,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> @@ -481,12 +481,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> @@ -504,12 +504,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> @@ -525,14 +525,14 @@ <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> @@ -549,12 +549,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> @@ -566,7 +566,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> @@ -579,12 +579,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> @@ -599,13 +599,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_q"> <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $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> @@ -616,12 +616,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="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:element> </dc:for-each> </waterlevels> @@ -643,12 +643,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> @@ -671,12 +671,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> @@ -687,7 +687,8 @@ </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 @@ -702,22 +703,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> @@ -735,12 +736,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> @@ -756,12 +757,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> @@ -777,12 +778,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> @@ -804,20 +805,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> @@ -827,9 +828,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> @@ -838,20 +839,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> @@ -868,20 +869,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> @@ -898,12 +899,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> @@ -919,12 +920,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> @@ -943,12 +944,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> @@ -966,12 +967,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> @@ -990,12 +991,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> @@ -1014,12 +1015,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> @@ -1046,12 +1047,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> @@ -1069,12 +1070,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> @@ -1088,12 +1089,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 --> @@ -1102,17 +1103,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)) @@ -1121,7 +1122,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> @@ -1132,7 +1133,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> @@ -1146,7 +1147,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> @@ -1158,15 +1159,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> @@ -1220,7 +1221,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> @@ -1239,7 +1240,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> @@ -1256,7 +1257,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> @@ -1267,13 +1268,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> @@ -1285,7 +1286,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1296,7 +1297,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> @@ -1307,7 +1308,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1318,7 +1319,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}]"/> + <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> @@ -1329,7 +1330,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1340,19 +1341,19 @@ <dc:macro name="basedata_1_additionals-sinfo-without-q"> <dc:call-macro name="basedata_1_additionals-sinfo-without-q_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> <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> @@ -1364,7 +1365,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> @@ -1375,19 +1376,19 @@ <dc:macro name="basedata_2_fixations"> <dc:call-macro name="fixings-macro"> - <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="fixations-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_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> @@ -1399,7 +1400,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> @@ -1410,13 +1411,13 @@ <dc:macro name="basedata_3_officials"> <dc:call-macro name="basedata_3_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> <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> @@ -1428,7 +1429,7 @@ <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')"> <heightmark name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </heightmark> </dc:group> @@ -1439,19 +1440,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> @@ -1463,7 +1464,7 @@ <dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')"> <flood_protection name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </flood_protection> </dc:group> @@ -1474,19 +1475,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> @@ -1500,7 +1501,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{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> @@ -1511,7 +1512,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{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> @@ -1530,7 +1531,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </relativepoint> </dc:group> @@ -1541,13 +1542,13 @@ <dc:macro name="basedata_7_waterlevels"> <dc:call-macro name="basedata_7_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> <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> @@ -1556,84 +1557,84 @@ <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_collisions> - <dc:call-macro name="sinfo_collisions"/> + <dc:call-macro name="sinfo_collisions" /> </sinfo_collisions> <sinfo_predefined_channel> - <dc:call-macro name="sinfo_predefined_channel"/> + <dc:call-macro name="sinfo_predefined_channel" /> </sinfo_predefined_channel> <sinfo_infrastructure> - <dc:call-macro name="sinfo_infrastructure"/> + <dc:call-macro name="sinfo_infrastructure" /> </sinfo_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> @@ -1641,24 +1642,24 @@ <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_flowdepths" /> + <dc:call-macro name="sinfo_flowdepths_minmax" /> + <dc:call-macro name="sinfo_flow_depth_development" /> + <dc:call-macro name="sinfo_tkh" /> <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:macro> <!-- porosities --> @@ -1680,13 +1681,14 @@ FROM porosity p JOIN depths d ON p.depth_id = d.id JOIN time_intervals t ON p.time_interval_id=t.id - WHERE p.river_id = ${river_id} + WHERE p.river_id = + ${river_id} ORDER BY depth_lower, depth_upper </dc:statement> <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> @@ -1708,11 +1710,12 @@ JOIN sediment_density_values sdv on sdv.sediment_density_id = sd.id WHERE sd.river_id = ${river_id} GROUP BY sd.id, sd.description, d.upper, d.lower - ORDER BY year, depth_lower, depth_upper + ORDER BY + year, depth_lower, depth_upper </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> @@ -1721,11 +1724,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"> @@ -1734,24 +1737,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> @@ -1764,41 +1767,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> @@ -1822,7 +1825,8 @@ ' mm<BR>Einheit: t/a' AS info FROM sediment_load sl JOIN sediment_load_kinds slk ON slk.id = sl.kind - JOIN sediment_load_values slv + JOIN + sediment_load_values slv ON sl.id = slv.sediment_load_id JOIN measurement_station ms ON ms.id = @@ -1833,7 +1837,8 @@ LEFT JOIN time_intervals sq ON sl.sq_time_interval_id = sq.id JOIN grain_fraction gf ON gf.id = sl.grain_fraction_id WHERE r.id = ${river_id} - AND CASE WHEN r.km_up = 1 AND ra.b IS NOT NULL + AND CASE + WHEN r.km_up = 1 AND ra.b IS NOT NULL THEN ra.b ELSE ra.a END BETWEEN ${fromkm} AND ${tokm} ORDER BY sqstart DESC, sqstop DESC, fraction, startyear DESC, endyear DESC @@ -1865,27 +1870,28 @@ JOIN units u ON sl.unit_id = u.id WHERE r.id = ${river_id} AND slv.station BETWEEN ${fromkm} AND ${tokm} - ORDER BY sqstart DESC, sqstop DESC, + ORDER BY sqstart + DESC, sqstop DESC, fraction, startyear DESC, endyear DESC </dc:statement> </dc:macro> <!-- 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> @@ -1901,22 +1907,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> @@ -1943,7 +1949,8 @@ b2.year AS b2year FROM sta b1 JOIN sta b2 - ON b1.station = b2.station + ON + b1.station = b2.station AND b1.id <> b2.id AND (b1.year > b2.year OR b1.year IS NULL)) SELECT @@ -1954,8 +1961,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> @@ -1964,7 +1971,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> @@ -1972,7 +1979,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> @@ -1983,11 +1990,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> @@ -1997,8 +2004,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> @@ -2006,13 +2013,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> @@ -2021,7 +2028,7 @@ <dc:macro name="bed-heights-factory_MW"> <dc:for-each> <dc:if test="$bedh_height_count > 0"> - <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" /> </dc:if> </dc:for-each> </dc:macro> @@ -2029,14 +2036,14 @@ <dc:macro name="bed-heights-single"> <single> <dc:context> - <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()}"> - <dc:call-macro name="bed-heights-factory_MW_TW_KL"/> - </heights> - </dc:group> - </dc:if> + <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()}"> + <dc:call-macro name="bed-heights-factory_MW_TW_KL" /> + </heights> + </dc:group> + </dc:if> </dc:context> </single> </dc:macro> @@ -2045,16 +2052,16 @@ <dc:macro name="bed-heights-single-MW"> <single> <dc:context> - <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()}"> - <dc:call-macro name="bed-heights-factory_MW"/> - </heights> - </dc:group> - </dc:if> - </dc:filter> + <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()}"> + <dc:call-macro name="bed-heights-factory_MW" /> + </heights> + </dc:group> + </dc:if> + </dc:filter> </dc:context> </single> </dc:macro> @@ -2063,16 +2070,16 @@ <dc:macro name="bed-heights-single-KL_TW"> <single> <dc:context> - <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()}"> - <dc:call-macro name="bed-heights-factory_MW"/> - </heights> - </dc:group> - </dc:if> - </dc:filter> + <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()}"> + <dc:call-macro name="bed-heights-factory_MW" /> + </heights> + </dc:group> + </dc:if> + </dc:filter> </dc:context> </single> </dc:macro> @@ -2080,9 +2087,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> @@ -2090,16 +2097,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> @@ -2107,9 +2114,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> @@ -2133,7 +2140,8 @@ JOIN bed_height_type bht ON bht.id = bhs.type_id JOIN location_system ls ON ls.id = location_system_id JOIN elevation_model cur_em ON cur_em.id = cur_elevation_model_id - LEFT JOIN elevation_model old_em + LEFT JOIN + 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 @@ -2141,7 +2149,8 @@ WHERE (station BETWEEN (${fromkm}-0.0001) AND (${tokm}+0.0001)) GROUP BY bed_height_id ) bhv ON bhs.id = bhv.bed_height_id - WHERE bhs.river_id = ${river_id} + WHERE bhs.river_id = + ${river_id} </dc:statement> </dc:macro> @@ -2165,7 +2174,7 @@ <dc:for-each> <measurement_value name="{$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> @@ -2192,7 +2201,7 @@ AND station BETWEEN ${fromkm} AND ${tokm} </dc:statement> <dc:for-each> - <measurement_value name="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}"/> + <measurement_value name="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}" /> </dc:for-each> </dc:context> </flow_velocity_measurement> @@ -2220,7 +2229,7 @@ WHERE morphologic_width_id = ${width_id} </dc:statement> <dc:for-each> - <morphologic-width name="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}"/> + <morphologic-width name="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}" /> </dc:for-each> </dc:context> </dc:for-each> @@ -2243,7 +2252,8 @@ JOIN time_intervals ti ON ti.id = sq.time_interval_id JOIN sq_relation_value sqv ON sqv.sq_relation_id = sq.id JOIN measurement_station ms ON sqv.measurement_station_id = ms.id - JOIN ranges ra ON ms.range_id = ra.id + JOIN ranges ra ON ms.range_id = + ra.id JOIN rivers r ON r.id = ra.river_id WHERE r.id = ${river_id} ORDER BY start_time, stop_time @@ -2260,8 +2270,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> @@ -2275,36 +2285,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"> @@ -2324,12 +2334,13 @@ AS info FROM dem d JOIN ranges r ON d.range_id = r.id - LEFT JOIN time_intervals t ON d.time_interval_id = t.id + LEFT JOIN time_intervals t ON d.time_interval_id + = t.id WHERE d.river_id = ${river_id} 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> @@ -2339,14 +2350,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> @@ -2354,7 +2365,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> @@ -2362,7 +2373,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> @@ -2371,7 +2382,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> @@ -2379,7 +2390,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> @@ -2397,7 +2408,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> @@ -2415,7 +2426,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> @@ -2432,7 +2443,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> @@ -2444,7 +2455,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> @@ -2463,7 +2474,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> @@ -2485,7 +2496,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> @@ -2503,7 +2514,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> @@ -2519,7 +2530,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> @@ -2549,7 +2560,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> @@ -2563,7 +2574,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> @@ -2587,7 +2598,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> @@ -2602,7 +2613,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> @@ -2631,7 +2642,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> @@ -2658,14 +2669,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> @@ -2683,14 +2694,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> @@ -2698,7 +2709,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> @@ -2706,7 +2717,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> @@ -2737,7 +2748,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> @@ -2754,7 +2765,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> @@ -2781,7 +2792,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> @@ -2797,7 +2808,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> @@ -2812,14 +2823,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> @@ -2827,7 +2838,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> @@ -2835,7 +2846,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> @@ -2866,7 +2877,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> @@ -2883,7 +2894,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> @@ -2910,7 +2921,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> @@ -2926,7 +2937,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> @@ -2944,7 +2955,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> @@ -2953,10 +2964,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> @@ -2975,13 +2986,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> @@ -2996,7 +3007,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> @@ -3010,7 +3021,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> @@ -3030,14 +3041,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> @@ -3062,13 +3073,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> @@ -3086,7 +3097,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> @@ -3098,14 +3109,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> @@ -3116,14 +3127,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 @@ -3131,25 +3142,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> @@ -3178,7 +3189,7 @@ 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> @@ -3201,7 +3212,8 @@ CAST(COALESCE(ma.ld_to, '') AS VARCHAR(255)) AS ld_t, o.name AS out_name, o.id AS out_id, - f.name AS facet_name, + f.name AS + facet_name, f.num AS facet_num, f.description AS facet_description, f.id AS fid @@ -3215,7 +3227,8 @@ AND ma.gid <> CAST(${artifact-id} AS uuid) AND f.name NOT LIKE '%empty.facet%' AND EXISTS ( - SELECT id + SELECT + id FROM artifact_data ad WHERE ad.artifact_id = ma.id AND k = 'river' @@ -3223,7 +3236,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> @@ -3236,7 +3249,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> @@ -3244,25 +3257,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> <dc:macro name="sinfo_flowdepths"> @@ -3276,12 +3289,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> @@ -3301,12 +3314,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> @@ -3317,7 +3330,8 @@ </dc:macro> <dc:macro name="sinfo_flow_depth_development"> - <dc:filter expr="$a_state = 'state.sinfo.flow_depth_development' and + <dc:filter + expr="$a_state = 'state.sinfo.flow_depth_development' and ( $facet_name = 'sinfo_facet_flow_depth_development' or $facet_name = 'sinfo_facet_flow_depth_development.filtered' or $facet_name = 'sinfo_facet_flow_depth_development_per_year' or $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered' or $facet_name = 'sinfo_facet_flow_depth_current' or $facet_name = 'sinfo_facet_flow_depth_current.filtered' or @@ -3330,12 +3344,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> @@ -3345,58 +3359,9 @@ </dc:filter> </dc:macro> -<!-- - <dc:macro name="sinfo_waterlevel_difference"> - <dc:filter expr="$facet_name = 'sinfo_facet_waterlevel_difference.filtered'"> - <dc:if test="dc:has-result()"> - <sinfo_waterlevel_differences> - <dc:call-macro name="collection-group"> - <sinfo_waterlevel_difference 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:element> - </dc:for-each> - </sinfo_waterlevel_difference> - </dc:call-macro> - </sinfo_waterlevel_differences> - </dc:if> - </dc:filter> - </dc:macro> - --> - -<!-- - <dc:macro name="sinfo_bedheight_difference"> - <dc:filter expr="$facet_name = 'sinfo_facet_bedheight_difference.filtered'"> - <dc:if test="dc:has-result()"> - <sinfo_bedheight_differences> - <dc:call-macro name="collection-group"> - <sinfo_bedheight_difference 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:element> - </dc:for-each> - </sinfo_bedheight_difference> - </dc:call-macro> - </sinfo_bedheight_differences> - </dc:if> - </dc:filter> - </dc:macro> - --> - <dc:macro name="sinfo_tkh"> - <dc:filter expr="$a_state = 'state.sinfo.transport_bodies_heights' and + <dc:filter + expr="$a_state = 'state.sinfo.transport_bodies_heights' and ( $facet_name = 'sinfo_facet_tkh' or $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or $facet_name = 'sinfo_facet_velocity' or $facet_name = 'sinfo_facet_velocity.filtered' or @@ -3408,12 +3373,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> @@ -3433,13 +3398,14 @@ || MIN(s.year_from) || ' - ' || MIN(s.year_to) || '<br />' AS info FROM channel s INNER JOIN channel_values v ON s.id=v.channel_id WHERE (s.river_id=${river_id}) - AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) + AND (v.station BETWEEN + ${fromkm}-0.0001 AND ${tokm}+0.0001) GROUP BY s.id ORDER BY MIN(s.year_to) DESC; </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <channelseries name="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}"/> + <channelseries name="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3448,15 +3414,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> @@ -3470,7 +3436,8 @@ || MIN(s.sounding_info) || '<br />' || MIN(s.evaluation_by) AS info FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id - INNER JOIN tkh_values v ON sc.id=v.tkh_column_id + INNER JOIN tkh_values + 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) @@ -3481,7 +3448,7 @@ <dc:group expr="$tkh_name"> <tkhx name="{dc:group-key()}"> <dc:for-each> - <tkhcolumn name="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}"/> + <tkhcolumn name="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}" /> </dc:for-each> </tkhx> </dc:group> @@ -3492,15 +3459,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> @@ -3512,7 +3479,8 @@ || MIN(s.kmrange_info) || ']<br />' || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '<br />' || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '<br />' - || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info + || MIN(s.old_glw) || ' - ' || + 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}) AND (lower(s.groupname)=${depthevol_groupname}) @@ -3521,14 +3489,14 @@ ORDER BY s.id </dc:statement> <dc:for-each> - <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/> + <depth_evol name="{$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"> @@ -3540,7 +3508,8 @@ || MIN(s.kmrange_info) || ']<br />' || MIN(s.sounding_info) || '<br />' || MIN(s.evaluation_by) AS info - FROM flow_depth_column sc INNER JOIN flow_depth s ON sc.flow_depth_id=s.id + FROM flow_depth_column sc 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}) AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) @@ -3551,7 +3520,7 @@ <dc:group expr="$flowdepth_name"> <sinfo_predefined_flowdepth> <dc:for-each> - <flowdepthcolumn name="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/> + <flowdepthcolumn name="{$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> @@ -3569,7 +3538,8 @@ || MIN(s.kmrange_info) || '<br />' || MIN(s.year) || '<br />' AS info FROM infrastructure s INNER JOIN infrastructure_values v ON s.id=v.infrastructure_id - INNER JOIN annotation_types x ON s.annotation_type_id=x.id + INNER JOIN annotation_types x ON + 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 @@ -3577,7 +3547,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <infrastructureseries name="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}"/> + <infrastructureseries name="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3593,17 +3563,18 @@ || MIN(s.year) || '<br />' AS info FROM collision s INNER JOIN collision_values v ON s.id=v.collision_id WHERE (s.river_id=${river_id}) - AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) + AND (v.station BETWEEN ${fromkm}-0.0001 AND + ${tokm}+0.0001) GROUP BY s.id ORDER BY MIN(s.year) ASC; </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <collisionseries name="{$seriesname}" ids="collisionx-{$id}-{$year}-{${$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}"/> + <collisionseries name="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> </dc:macro> - + </datacage> </dc:template> \ No newline at end of file