Mercurial > dive4elements > river
diff artifacts/doc/conf/meta-data.xml @ 9617:1d4262a68f1f
#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
| author | dnt_bjoernsen <d.tironi@bjoernsen.de> |
|---|---|
| date | Thu, 10 Oct 2019 15:29:02 +0200 |
| parents | b9c87bbff6a4 |
| children | 02ca823ec9c6 |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/meta-data.xml Thu Oct 10 15:29:02 2019 +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,120 +39,120 @@ <dc:choose> <dc:comment> Longitudinal sections </dc:comment> <dc:when test="$out = 'w_differences'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="officiallines_user"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="officiallines_user" /> </dc:when> <dc:when test="$out = 'longitudinal_section'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="officiallines_user"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="officiallines_user" /> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bedheight_middle'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bed_difference_year'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="basedata_6_delta_w"/> - <dc:call-macro name="sounding-width-recommendations"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="basedata_6_delta_w" /> + <dc:call-macro name="sounding-width-recommendations" /> </dc:when> <dc:when test="$out = 'bed_difference_height_year'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="basedata_6_delta_w"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="basedata_6_delta_w" /> </dc:when> <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="sedimentload_off_epochs"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="sedimentload_off_epochs" /> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'flow_velocity'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:comment> Discharge curves </dc:comment> <dc:when test="$out = 'historical_discharge_wq'"> - <dc:call-macro name="hist_discharge_rec"/> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="hist_discharge_rec" /> + <dc:call-macro name="mainvalues" /> </dc:when> <dc:when test="$out = 'discharge_curve'"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="basedata_3_officials_wq"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="basedata_3_officials_wq" /> </dc:when> <dc:when test="$out = 'computed_discharge_curve'"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="basedata_3_officials_wq"/> - <dc:call-macro name="basedata_2_fixations_wq"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="basedata_3_officials_wq" /> + <dc:call-macro name="basedata_2_fixations_wq" /> </dc:when> <dc:when test="$out = 'fix_wq_curve'"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="qsectors"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="qsectors" /> </dc:when> <dc:when test="$out = 'fix_derivate_curve'"> - <dc:call-macro name="qmainvalues"/> + <dc:call-macro name="qmainvalues" /> </dc:when> <dc:when test="starts-with($out, 'sq_') and not($out = 'sq_relation_export')"> - <dc:call-macro name="qmainvalues"/> + <dc:call-macro name="qmainvalues" /> </dc:when> <dc:comment> Cross sections </dc:comment> <dc:when test="$out = 'cross_section'"> - <dc:call-macro name="cross_sections"/> - <dc:call-macro name="hyks"/> - <dc:call-macro name="officiallines_user"/> + <dc:call-macro name="cross_sections" /> + <dc:call-macro name="hyks" /> + <dc:call-macro name="officiallines_user" /> </dc:when> <dc:comment> Duration curve </dc:comment> <dc:when test="$out = 'duration_curve'"> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="mainvalues" /> </dc:when> <dc:comment> Reference curve </dc:comment> <dc:when test="$out = 'reference_curve'"> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="mainvalues" /> </dc:when> <dc:comment> Maps </dc:comment> <dc:when test="$out = 'floodmap'"> - <dc:call-macro name="flood-map-recommended"/> + <dc:call-macro name="flood-map-recommended" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_minmax'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development_peryear'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_tkk'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_collision'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flood_duration'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flood_height'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_floodduration_curve'"> <dc:call-macro name="mainvalues" /> </dc:when> <dc:when test="$out = 'uinfo_salix_line'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bundu_depth_longitudinal_section'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> </dc:choose> </dc:iterate> @@ -166,179 +166,179 @@ <dc:choose> <dc:comment> Inline datacage panels </dc:comment> <dc:when test="$out = 'minfo_diff_panel'"> - <dc:call-macro name="minfo-heights-diff"/> + <dc:call-macro name="minfo-heights-diff" /> </dc:when> <dc:when test="$out = 'floodmap_dem_panel'"> - <dc:call-macro name="flood-map-dem"/> + <dc:call-macro name="flood-map-dem" /> </dc:when> <dc:when test="$out = 'floodmap_hws_panel'"> <hws> - <dc:call-macro name="flood-map-hws-lines"/> - <dc:call-macro name="flood-map-hws-points"/> + <dc:call-macro name="flood-map-hws-lines" /> + <dc:call-macro name="flood-map-hws-points" /> </hws> </dc:when> <dc:when test="$out = 'winfo_diff_twin_panel'"> <dc:if test="$current-state-id != 'state.winfo.uesk.wsp'"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> - <dc:call-macro name="basedata_2_fixations"/> - <dc:call-macro name="basedata_4_heightmarks-points"/> - <dc:call-macro name="basedata_5_flood-protections"/> + <dc:call-macro name="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="basedata_5_flood-protections" /> </dc:if> </dc:when> <dc:when test="$out = 'waterlevels_panel'"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> - <dc:call-macro name="basedata_2_fixations"/> - <dc:call-macro name="basedata_3_officials"/> - <dc:call-macro name="basedata_4_heightmarks-points"/> - <dc:call-macro name="basedata_5_flood-protections"/> + <dc:call-macro name="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_3_officials" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="basedata_5_flood-protections" /> </dc:when> <dc:comment> Longitudinal sections </dc:comment> <dc:when test="$out = 'longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'w_differences'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'flow_velocity'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bedheight_middle'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_height_year'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_year'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:comment> Discharge curves </dc:comment> <dc:when test="$out = 'historical_discharge_wq'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'discharge_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'fix_wq_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'fix_derivate_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'computed_discharge_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="starts-with($out, 'sq_relation') or $out = 'sq_overview'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:comment> Cross sections </dc:comment> <dc:when test="$out = 'cross_section'"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> - <dc:call-macro name="basedata_2_fixations"/> - <dc:call-macro name="basedata_3_officials"/> - <dc:call-macro name="basedata_4_heightmarks-points"/> - <dc:call-macro name="cross_sections"/> - <dc:call-macro name="basedata_5_flood-protections"/> - <dc:call-macro name="hyks"/> - <dc:call-macro name="predefined_vegetation_zones"/> + <dc:call-macro name="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_3_officials" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="cross_sections" /> + <dc:call-macro name="basedata_5_flood-protections" /> + <dc:call-macro name="hyks" /> + <dc:call-macro name="predefined_vegetation_zones" /> </dc:when> <dc:comment> Duration curve </dc:comment> <dc:when test="$out = 'duration_curve'"> - <dc:call-macro name="duration_curve_system"/> + <dc:call-macro name="duration_curve_system" /> </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 module="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 module="sinfo"> <sinfo_additional_ls> - <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> - <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> + <dc:call-macro name="basedata_1_additionals-sinfo-with-q" /> + <dc:call-macro name="basedata_1_additionals-sinfo-without-q" /> </sinfo_additional_ls> </sinfo> </dc:when> <dc:when test="$out = 'sinfo_flow_depth'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_minmax'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development_peryear'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_tkk'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_collision'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flood_duration'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flood_height'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_floodduration_curve'"> <dc:call-macro name="floodduration_curve_system" /> </dc:when> <dc:when test="$out = 'uinfo_salix_line'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'"> - <dc:call-macro name="predefined_vegetation_zones"/> + <dc:call-macro name="predefined_vegetation_zones" /> </dc:when> <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bundu_depth_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> </dc:choose> </dc:iterate> @@ -361,7 +361,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> @@ -374,140 +374,140 @@ <dc:choose> <dc:comment> Inline datacage panels </dc:comment> <dc:when test="$out = 'winfo_diff_twin_panel'"> - <dc:call-macro name="differences-fix"/> - <dc:call-macro name="differences"/> + <dc:call-macro name="differences-fix" /> + <dc:call-macro name="differences" /> <dc:comment comment="Candidate for:"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:comment> </dc:when> <dc:when test="$out = 'waterlevels_panel'"> - <dc:call-macro name="waterlevels-user"/> + <dc:call-macro name="waterlevels-user" /> <dc:comment comment="Candidate for:"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:comment> </dc:when> <dc:when test="$out = 'floodmap_hws_panel'"> - <dc:call-macro name="floodmap-hws-user"/> + <dc:call-macro name="floodmap-hws-user" /> </dc:when> <dc:comment> Longitudinal sections </dc:comment> <dc:when test="$out = 'longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'w_differences'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bedheight_middle'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'flow_velocity'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_year'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_height_year'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_minmax'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development_peryear'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_tkk'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_collision'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flood_duration'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_floodduration_curve'"> - <dc:call-macro name="floodduration-curve-user"/> + <dc:call-macro name="floodduration-curve-user" /> </dc:when> <dc:when test="$out = 'sinfo_flood_height'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flowdepth_waterlevels'"> - <dc:call-macro name="longitudinal-section-fix-vollmer_w"/> + <dc:call-macro name="longitudinal-section-fix-vollmer_w" /> </dc:when> <dc:when test="$out = 'uinfo_salix_line'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'"> - <dc:call-macro name="vegetationzones"/> + <dc:call-macro name="vegetationzones" /> </dc:when> <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bundu_depth_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:comment> Discharge curves </dc:comment> <dc:when test="$out = 'computed_discharge_curve'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="$out = 'fix_derivate_curve'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="$out = 'fix_wq_curve'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="$out = 'historical_discharge_wq'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="starts-with($out, 'sq_relation') or $out = 'sq_overview'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:comment> Time series </dc:comment> <dc:when test="$out = 'fix_deltawt_curve'"> - <dc:call-macro name="delta-wt"/> + <dc:call-macro name="delta-wt" /> </dc:when> <dc:when test="$out = 'historical_discharge'"> - <dc:call-macro name="historical-discharge-user"/> + <dc:call-macro name="historical-discharge-user" /> </dc:when> <dc:comment> Cross sections </dc:comment> <dc:when test="$out = 'cross_section'"> - <dc:call-macro name="cross_section_user_content"/> + <dc:call-macro name="cross_section_user_content" /> </dc:when> <dc:comment> Duration curve </dc:comment> <dc:when test="$out = 'duration_curve'"> - <dc:call-macro name="duration-curve-user"/> + <dc:call-macro name="duration-curve-user" /> </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:choose> </dc:iterate> @@ -528,12 +528,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> @@ -551,12 +551,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> @@ -574,12 +574,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> @@ -595,14 +595,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> @@ -611,9 +611,9 @@ </dc:macro> <dc:macro name="cross_section_user_content"> - <dc:call-macro name="cross_section_user_content_waterlevels"/> - <dc:call-macro name="cross_section_user_content_iota"/> - <dc:call-macro name="vegetationzones"/> + <dc:call-macro name="cross_section_user_content_waterlevels" /> + <dc:call-macro name="cross_section_user_content_iota" /> + <dc:call-macro name="vegetationzones" /> </dc:macro> <dc:macro name="cross_section_user_content_waterlevels"> @@ -625,12 +625,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> @@ -649,12 +649,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="uinfo"/> - <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="uinfo" /> + <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> @@ -666,7 +666,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> @@ -679,12 +679,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> @@ -697,13 +697,13 @@ <dc:macro name="longitudinal-section-fix-vollmer"> <dc:filter expr="($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and ($facet_name = 'longitudinal_section.w' or $facet_name = 'longitudinal_section.q')"> - <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> + <dc:call-macro name="longitudinal-section-fix-vollmer_macro" /> </dc:filter> </dc:macro> <dc:macro name="longitudinal-section-fix-vollmer_w"> <dc:filter expr=" ($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and $facet_name = 'longitudinal_section.w'"> - <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> + <dc:call-macro name="longitudinal-section-fix-vollmer_macro" /> </dc:filter> </dc:macro> @@ -714,19 +714,19 @@ <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="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> <!-- FIXME --> - <dc:attribute name="factory" value="fixanalysis"/> + <dc:attribute name="factory" value="fixanalysis" /> <!-- bundu works due to same implementation - <dc:attribute name="factory" value="bundu"/> - --> - <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="factory" value="bundu"/> + --> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="longitudinal_section" /> - <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)"/> - <dc:attribute name="year" value="${fixAnalysisYear}"/> + <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)" /> + <dc:attribute name="year" value="${fixAnalysisYear}" /> </dc:element> </dc:for-each> </waterlevels> @@ -748,12 +748,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> @@ -776,12 +776,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> @@ -807,22 +807,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> @@ -840,12 +840,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> @@ -861,12 +861,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> @@ -878,12 +878,12 @@ <!-- Unterschreitungsdauern aus WINFO --> <dc:macro name="duration-curve-user"> - <dc:call-macro name="duration-curve-user_winfo-duration-curve"/> + <dc:call-macro name="duration-curve-user_winfo-duration-curve" /> </dc:macro> <!-- Überschrautungsdauern aus SINFO --> <dc:macro name="floodduration-curve-user"> - <dc:call-macro name="duration-curve-user_sinfo-flood-duration"/> + <dc:call-macro name="duration-curve-user_sinfo-flood-duration" /> </dc:macro> <dc:macro name="duration-curve-user_winfo-duration-curve"> @@ -894,12 +894,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_gid}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="out" value="${out_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="${out_name}" /> </dc:element> </dc:for-each> </computed_discharge_curves> @@ -910,20 +910,20 @@ <dc:macro name="duration-curve-user_sinfo-flood-duration"> <!-- Restults of SINFO-Überflutungsdauern-Aue calculation --> <dc:filter expr="$a_state = 'state.sinfo.flood_duration' and $out_name = 'sinfo_floodduration_curve'"> - <!-- FIXME: group by calculation? --> + <!-- FIXME: group by calculation? --> <dc:if test="dc:has-result()"> <sinfo_flood_durations> - + <dc:call-macro name="collection-group"> <sinfo_flood_durations description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="sinfo"/> - <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="${out_name}"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="sinfo" /> + <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="${out_name}" /> </dc:element> </dc:for-each> </sinfo_flood_durations> @@ -946,20 +946,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> @@ -969,9 +969,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' or $a_state = 'state.bundu.vollmer.compute') and $facet_name = 'longitudinal_section.w'"> <dc:if test="dc:has-result()"> <vollmer_waterlevels> @@ -980,21 +980,21 @@ <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}"/> - <!-- FIXME: different factories! --> - <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}" /> + <!-- FIXME: different factories! --> + <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> @@ -1011,20 +1011,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> @@ -1041,12 +1041,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> @@ -1062,12 +1062,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> @@ -1086,12 +1086,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> @@ -1109,12 +1109,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> @@ -1133,12 +1133,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> @@ -1157,12 +1157,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> @@ -1189,12 +1189,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> @@ -1212,12 +1212,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> @@ -1231,23 +1231,23 @@ <!-- Macros to load system data --> <dc:macro name="duration_curve_system"> - <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:macro> <dc:macro name="floodduration_curve_system"> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="mainvalues" /> </dc:macro> <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 --> @@ -1256,17 +1256,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)) @@ -1275,7 +1275,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> @@ -1286,7 +1286,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> @@ -1300,7 +1300,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> @@ -1312,15 +1312,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> @@ -1374,7 +1374,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> @@ -1393,7 +1393,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> @@ -1403,9 +1403,9 @@ <dc:macro name="predefined_vegetation_zones"> <uinfo module="uinfo"> <vegetation_zones> - <dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)"/> + <dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)" /> - <defaultVegetationZone factory="predefined_vegetation_zonesf" target_out="{$out}" ids="{$vegzonedata}"/> + <defaultVegetationZone factory="predefined_vegetation_zonesf" target_out="{$out}" ids="{$vegzonedata}" /> </vegetation_zones> </uinfo> </dc:macro> @@ -1420,7 +1420,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> @@ -1431,13 +1431,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> @@ -1449,7 +1449,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1460,7 +1460,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> @@ -1471,7 +1471,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1482,7 +1482,7 @@ <dc:macro name="basedata_1_additionals-sinfo-with-q"> <dc:call-macro name="basedata_1_additionals-sinfo-with-q_macro"> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> @@ -1493,7 +1493,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1504,20 +1504,20 @@ <dc:macro name="basedata_1_additionals-sinfo-without-q"> <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_1_additionals_wq"> <dc:call-macro name="basedata_1_additionals_macro"> - <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_1_additionals-relative_point"> <dc:call-macro name="basedata_1_additionals_macro"> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1529,7 +1529,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> @@ -1540,20 +1540,20 @@ <dc:macro name="basedata_2_fixations"> <dc:call-macro name="fixings-macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_2_fixations_wq"> <dc:call-macro name="fixings-macro"> - <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_2_fixations_relative_point"> <dc:call-macro name="fixings-macro"> - <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1565,7 +1565,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> @@ -1576,14 +1576,14 @@ <dc:macro name="basedata_3_officials"> <dc:call-macro name="basedata_3_macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_3_officials_wq"> <dc:call-macro name="basedata_3_macro"> - <column name="{$wst_column_name}" ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1595,7 +1595,7 @@ <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')"> <heightmark name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </heightmark> </dc:group> @@ -1606,19 +1606,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> @@ -1630,7 +1630,7 @@ <dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')"> <flood_protection name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </flood_protection> </dc:group> @@ -1641,19 +1641,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> @@ -1667,7 +1667,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <column name="{$wst_column_name}" ids="delta_w-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="delta_w-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:for-each> </relativepoint> </dc:group> @@ -1678,7 +1678,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <column name="{$wst_column_name}" ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:for-each> </relativepoint> </dc:group> @@ -1697,7 +1697,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </relativepoint> </dc:group> @@ -1708,14 +1708,14 @@ <dc:macro name="basedata_7_waterlevels"> <dc:call-macro name="basedata_7_macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_7_waterlevels_wq"> <dc:call-macro name="basedata_7_macro"> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1724,84 +1724,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 module="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 module="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 module="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 module="sinfo"> <sinfo_predefined_flowdepths> - <dc:call-macro name="sinfo_predefined_flowdepth-m"/> + <dc:call-macro name="sinfo_predefined_flowdepth-m" /> </sinfo_predefined_flowdepths> <sinfo_predefined_collision> - <dc:call-macro name="sinfo_predefined_collision"/> + <dc:call-macro name="sinfo_predefined_collision" /> </sinfo_predefined_collision> <sinfo_predefined_channel> - <dc:call-macro name="sinfo_predefined_channel"/> + <dc:call-macro name="sinfo_predefined_channel" /> </sinfo_predefined_channel> <sinfo_predefined_infrastructure> - <dc:call-macro name="sinfo_predefined_infrastructure"/> + <dc:call-macro name="sinfo_predefined_infrastructure" /> </sinfo_predefined_infrastructure> <sinfo_predefined_tkh> - <dc:call-macro name="sinfo_predefined_tkh-berechnung"/> - <dc:call-macro name="sinfo_predefined_tkh-messung"/> + <dc:call-macro name="sinfo_predefined_tkh-berechnung" /> + <dc:call-macro name="sinfo_predefined_tkh-messung" /> </sinfo_predefined_tkh> <sinfo_predefined_depthevol> - <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/> - <dc:call-macro name="sinfo_predefined_depthevol-etappe"/> + <dc:call-macro name="sinfo_predefined_depthevol-aktuell" /> + <dc:call-macro name="sinfo_predefined_depthevol-etappe" /> </sinfo_predefined_depthevol> </sinfo> @@ -1810,32 +1810,32 @@ <dc:macro name="longitudinal-section-user-prototype"> <dc:comment> SINFO </dc:comment> - <dc:call-macro name="sinfo_flowdepths"/> - <dc:call-macro name="sinfo_flowdepths_minmax"/> - <dc:call-macro name="sinfo_flow_depth_development"/> - <dc:call-macro name="sinfo_tkh"/> - <dc:call-macro name="sinfo_collision"/> - <dc:call-macro name="sinfo_flood_duration"/> + <dc:call-macro name="sinfo_flowdepths" /> + <dc:call-macro name="sinfo_flowdepths_minmax" /> + <dc:call-macro name="sinfo_flow_depth_development" /> + <dc:call-macro name="sinfo_tkh" /> + <dc:call-macro name="sinfo_collision" /> + <dc:call-macro name="sinfo_flood_duration" /> <dc:comment> WINFO/DIFF/FIX </dc:comment> - <dc:call-macro name="longitudinal"/> - <dc:call-macro name="differences"/> - <dc:call-macro name="waterlevels-discharge"/> - <dc:call-macro name="longitudinal-section-fix"/> - <dc:call-macro name="longitudinal-section-fix-vollmer"/> + <dc:call-macro name="longitudinal" /> + <dc:call-macro name="differences" /> + <dc:call-macro name="waterlevels-discharge" /> + <dc:call-macro name="longitudinal-section-fix" /> + <dc:call-macro name="longitudinal-section-fix-vollmer" /> <dc:comment> MINFO </dc:comment> - <dc:call-macro name="middle_bedheights"/> - <dc:call-macro name="bedheight_differences"/> - <dc:call-macro name="bedquality"/> - <dc:call-macro name="flow-velocity"/> - <dc:call-macro name="sediment-load"/> + <dc:call-macro name="middle_bedheights" /> + <dc:call-macro name="bedheight_differences" /> + <dc:call-macro name="bedquality" /> + <dc:call-macro name="flow-velocity" /> + <dc:call-macro name="sediment-load" /> <dc:comment> UINFO </dc:comment> - <dc:call-macro name="uinfo_salix_line"/> + <dc:call-macro name="uinfo_salix_line" /> <dc:comment> BUNDU </dc:comment> - <dc:call-macro name="bundu_bezugswst"/> + <dc:call-macro name="bundu_bezugswst" /> </dc:macro> <!-- porosities --> @@ -1864,7 +1864,7 @@ <dc:if test="dc:has-result()"> <dc:for-each> <porosity description="{$depth_lower}-{$depth_upper} cm" factory="porosity" target_out="{$out}" info="{concat($info, dc:date-format('yyyy', $syear), - ' - ', dc:date-format('yyyy', $eyear))}" ids="{$pid};{$description}"/> + ' - ', dc:date-format('yyyy', $eyear))}" ids="{$pid};{$description}" /> </dc:for-each> </dc:if> </dc:context> @@ -1891,7 +1891,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <density description="{$depth_lower}-{$depth_upper} cm" factory="sedimentdensity" target_out="{$out}" info="{$info}" ids="{$sdid}"/> + <density description="{$depth_lower}-{$depth_upper} cm" factory="sedimentdensity" target_out="{$out}" info="{$info}" ids="{$sdid}" /> </dc:for-each> </dc:if> </dc:context> @@ -1900,11 +1900,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"> @@ -1913,24 +1913,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> @@ -1943,41 +1943,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> @@ -2054,20 +2054,20 @@ <!-- annotations --> <dc:macro name="annotations"> - <annotation factory="annotations" ids="{$river_id}" target_out="{$out}"/> + <annotation factory="annotations" ids="{$river_id}" target_out="{$out}" /> </dc:macro> <dc:macro name="annotations_per_type"> <annotations> <dc:context> - <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}"/> + <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}" /> <dc:statement> SELECT id AS anno_id, name AS anno_description FROM annotation_types </dc:statement> <dc:for-each> - <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}"/> + <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}" /> </dc:for-each> </dc:context> </annotations> @@ -2083,26 +2083,26 @@ 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> - <!-- bed levels --> + <!-- bed heights --> <dc:macro name="minfo-heights-diff"> <dc:context> <dc:statement> @@ -2137,8 +2137,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> @@ -2147,7 +2147,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> @@ -2155,7 +2155,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> @@ -2166,11 +2166,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> @@ -2180,8 +2180,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> @@ -2189,13 +2189,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> @@ -2205,7 +2205,7 @@ <dc:for-each> <dc:if test="$bedh_height_count > 0"> <!-- REMARK: addition 'yaer' attribute is used by intelligent datacage filter of SINFO --> - <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" year="{$bedh_year}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" year="{$bedh_year}" /> </dc:if> </dc:for-each> </dc:macro> @@ -2213,11 +2213,11 @@ <dc:macro name="bed-heights-single"> <single> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:if test="dc:has-result()"> <dc:group expr="dc:coalesce($bedh_year, 'sonstige')"> <heights name="{dc:group-key()}" description="{dc:group-key()}"> - <dc:call-macro name="bed-heights-factory_MW_TW_KL"/> + <dc:call-macro name="bed-heights-factory_MW_TW_KL" /> </heights> </dc:group> </dc:if> @@ -2229,12 +2229,12 @@ <dc:macro name="bed-heights-single-MW"> <single> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:filter expr="$bedh_height_count"> <dc:if test="dc:has-result()"> <dc:group expr="dc:coalesce($bedh_year, 'sonstige')"> <heights name="{dc:group-key()}" description="{dc:group-key()}"> - <dc:call-macro name="bed-heights-factory_MW"/> + <dc:call-macro name="bed-heights-factory_MW" /> </heights> </dc:group> </dc:if> @@ -2247,12 +2247,12 @@ <dc:macro name="bed-heights-single-KL_TW"> <single> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:filter expr="$bedh_max_count > 0 and $bedh_min_count > 0"> <dc:if test="dc:has-result()"> <dc:group expr="dc:coalesce($bedh_year, 'sonstige')"> <heights name="{dc:group-key()}" description="{dc:group-key()}"> - <dc:call-macro name="bed-heights-factory_MW"/> + <dc:call-macro name="bed-heights-factory_MW" /> </heights> </dc:group> </dc:if> @@ -2264,9 +2264,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> @@ -2274,16 +2274,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> @@ -2291,9 +2291,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> @@ -2352,7 +2352,7 @@ <dc:for-each> <measurement_value name="{$fvmd}" description="{$fvmd}" ids="{$fvmid}" factory="flowvelocitymodel" info="{$lowerQ} - {$upperQ}<BR> Pegel {$gauge}<BR> - Q = {$q} m3/s" target_out="{$out}"/> + Q = {$q} m3/s" target_out="{$out}" /> </dc:for-each> </flowvelocitymodel> </dc:if> @@ -2379,7 +2379,7 @@ AND station BETWEEN ${fromkm} AND ${tokm} </dc:statement> <dc:for-each> - <measurement_value name="{$description} - {$station} - {$datetime}" description="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}"/> + <measurement_value name="{$description} - {$station} - {$datetime}" description="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}" /> </dc:for-each> </dc:context> </flow_velocity_measurement> @@ -2407,7 +2407,7 @@ WHERE morphologic_width_id = ${width_id} </dc:statement> <dc:for-each> - <morphologic-width name="{$from_station} - {$to_station}" description="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}"/> + <morphologic-width name="{$from_station} - {$to_station}" description="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}" /> </dc:for-each> </dc:context> </dc:for-each> @@ -2448,8 +2448,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> @@ -2463,36 +2463,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"> @@ -2518,7 +2518,7 @@ AND NOT((${tokm} < r.a) or (${fromkm} > r.b)) </dc:statement> <dc:for-each> - <dem factory="demfactory" target_out="{$out}" ids="{$dem_id}" name="{$name}" info="{$info}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}"/> + <dem factory="demfactory" target_out="{$out}" ids="{$dem_id}" name="{$name}" info="{$info}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}" /> </dc:for-each> </dc:context> </dems> @@ -2528,14 +2528,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> @@ -2543,7 +2543,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> @@ -2551,7 +2551,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> @@ -2560,7 +2560,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> @@ -2568,7 +2568,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> @@ -2586,7 +2586,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> @@ -2604,7 +2604,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> @@ -2621,7 +2621,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> @@ -2633,7 +2633,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> @@ -2652,7 +2652,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> @@ -2674,7 +2674,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> @@ -2692,7 +2692,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> @@ -2708,7 +2708,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> @@ -2738,7 +2738,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> @@ -2752,7 +2752,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> @@ -2776,7 +2776,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> @@ -2791,7 +2791,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> @@ -2820,7 +2820,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> @@ -2847,14 +2847,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> @@ -2872,14 +2872,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> @@ -2887,7 +2887,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> @@ -2895,7 +2895,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> @@ -2926,7 +2926,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> @@ -2943,7 +2943,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> @@ -2970,7 +2970,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> @@ -2986,7 +2986,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> @@ -3001,14 +3001,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> @@ -3016,7 +3016,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> @@ -3024,7 +3024,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> @@ -3055,7 +3055,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> @@ -3072,7 +3072,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> @@ -3099,7 +3099,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> @@ -3115,7 +3115,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> @@ -3133,7 +3133,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> @@ -3142,10 +3142,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> @@ -3164,13 +3164,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> @@ -3185,7 +3185,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> @@ -3199,7 +3199,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> @@ -3219,14 +3219,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> @@ -3251,13 +3251,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> @@ -3275,7 +3275,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> @@ -3287,14 +3287,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> @@ -3305,14 +3305,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 @@ -3320,25 +3320,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> @@ -3371,7 +3371,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> @@ -3408,7 +3408,8 @@ JOIN facets f ON f.out_id = o.id WHERE u.gid = CAST(${user-id} AS UUID) AND ma.gid <> CAST(${artifact-id} AS uuid) - AND f.name NOT LIKE '%empty.facet%' + AND f.name NOT LIKE + '%empty.facet%' AND EXISTS ( SELECT id @@ -3419,7 +3420,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> @@ -3432,7 +3433,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> @@ -3440,32 +3441,40 @@ <dc:choose> <dc:when test="dc:coalesce(dc:get('ld_locations'), ' ') != ' '"> <dc:variable name="fromkm" type="number" expr="dc:min-number(dc:find-all('\d*\.?\d*', - dc:get('ld_locations')))"/> + dc:get('ld_locations')))" /> <dc:variable name="tokm" type="number" expr="dc:max-number(dc:find-all('\d*\.?\d*', - dc:get('ld_locations')))"/> + dc:get('ld_locations')))" /> </dc:when> <dc:otherwise> <dc:variable name="fromkm" type="number" expr="dc:fromValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_from'))"/> + dc:get('ld_locations'), dc:get('ld_from'))" /> <dc:variable name="tokm" type="number" expr="dc:toValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_to'))"/> + dc:get('ld_locations'), dc:get('ld_to'))" /> <dc:if test="$fromkm > $tokm"> <dc:message>Inverting KM filter.</dc:message> <dc:variable name="fromkm" type="number" expr="dc:toValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_to'))"/> + dc:get('ld_locations'), dc:get('ld_to'))" /> <dc:variable name="tokm" type="number" expr="dc:fromValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_from'))"/> + dc:get('ld_locations'), dc:get('ld_from'))" /> </dc:if> </dc:otherwise> </dc:choose> - <dc:macro-body/> + <dc:macro-body /> </dc:macro> <!-- S-INFO --> <dc:macro name="sinfo_flowdepths"> - <dc:filter expr="$a_state = 'state.sinfo.flow_depth' and - ( $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or - $facet_name = 'sinfo_facet_flow_depth_with_tkh' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or + <dc:filter + expr="$a_state = 'state.sinfo.flow_depth' and + ( $facet_name = 'sinfo_facet_flow_depth' or + $facet_name = 'sinfo_facet_flow_depth.filtered' or + $facet_name = 'sinfo_facet_flow_depth_waterlevel' or + $facet_name = 'sinfo_facet_flow_depth_bedheight' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_max' or + $facet_name = 'sinfo_facet_flow_depth_discharge' or + $facet_name = 'sinfo_facet_flow_depth_with_tkh' or + $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or $facet_name = 'sinfo_facet_tkh' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths> @@ -3473,12 +3482,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> @@ -3490,20 +3499,26 @@ <dc:macro name="sinfo_flowdepths_minmax"> <dc:filter expr="$a_state = 'state.sinfo.flow_depth_minmax' and - ( $facet_name = 'sinfo_facet_flow_depth_min' or $facet_name = 'sinfo_facet_flow_depth_min.filtered' or - $facet_name = 'sinfo_facet_flow_depth_max' or $facet_name = 'sinfo_facet_flow_depth_max.filtered' )"> + ( $facet_name = 'sinfo_facet_flow_depth_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_max' or + $facet_name = 'sinfo_facet_flow_depth_waterlevel' or + $facet_name = 'sinfo_facet_flow_depth_discharge' or + $facet_name = 'sinfo_facet_flow_depth_min.filtered' or + $facet_name = 'sinfo_facet_flow_depth_max' or + $facet_name = 'sinfo_facet_flow_depth_max.filtered' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths_minmax> <dc:call-macro name="collection-group"> <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> @@ -3528,12 +3543,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> @@ -3548,6 +3563,11 @@ 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_flow_depth_discharge' or + $facet_name = 'sinfo_facet_flow_depth_waterlevel' or + $facet_name = 'sinfo_facet_flow_depth_bedheight' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_max' or $facet_name = 'sinfo_facet_velocity' or $facet_name = 'sinfo_facet_velocity.filtered' or $facet_name = 'sinfo_facet_tau' or $facet_name = 'sinfo_facet_tau.filtered' or $facet_name = 'sinfo_facet_d50' or $facet_name = 'sinfo_facet_d50.filtered' )"> @@ -3557,12 +3577,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> @@ -3581,12 +3601,12 @@ <sinfo_collision description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_collision> @@ -3607,12 +3627,12 @@ <sinfo_flood_duration description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_flood_duration> @@ -3640,7 +3660,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <channelseries name="{$seriesname}" description="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}"/> + <channelseries name="{$seriesname}" description="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3649,15 +3669,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> @@ -3685,7 +3705,7 @@ <dc:group expr="$tkh_name"> <tkhx name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <tkhcolumn name="{$tkh_col_name}" description="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}"/> + <tkhcolumn name="{$tkh_col_name}" description="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}" /> </dc:for-each> </tkhx> </dc:group> @@ -3696,15 +3716,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> @@ -3728,14 +3748,14 @@ ORDER BY s.id </dc:statement> <dc:for-each> - <depth_evol name="{$depthevol_name}" description="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/> + <depth_evol name="{$depthevol_name}" description="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:context> </dc:macro> <!-- flow depth imported from CSV-files for S-INFO --> <dc:macro name="sinfo_predefined_flowdepth-m"> - <dc:call-macro name="sinfo_predefined_flowdepth-m1"/> + <dc:call-macro name="sinfo_predefined_flowdepth-m1" /> </dc:macro> <dc:macro name="sinfo_predefined_flowdepth-m1"> @@ -3761,7 +3781,7 @@ <dc:group expr="$flowdepth_name"> <sinfo_predefined_flowdepth> <dc:for-each> - <flowdepthcolumn name="{$flowdepth_col_name}" description="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/> + <flowdepthcolumn name="{$flowdepth_col_name}" description="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}" /> </dc:for-each> </sinfo_predefined_flowdepth> </dc:group> @@ -3790,7 +3810,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <infrastructureseries name="{$seriesname}" description="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}"/> + <infrastructureseries name="{$seriesname}" description="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3814,7 +3834,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}"/> + <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3832,12 +3852,12 @@ <uinfo_salix_line description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="uinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="uinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </uinfo_salix_line> @@ -3853,18 +3873,18 @@ <dc:if test="dc:has-result()"> <vegetation_zones> <dc:for-each> - <dc:variable name="vegzonedata" expr="dc:data_from_artifact($a_gid,'vegzones')"/> - <dc:variable name="label_temp" type="string" expr="concat(dc:get('ld_f'), ' km - ', dc:get('ld_t'), ' km')"/> + <dc:variable name="vegzonedata" expr="dc:data_from_artifact($a_gid,'vegzones')" /> + <dc:variable name="label_temp" type="string" expr="concat(dc:get('ld_f'), ' km - ', dc:get('ld_t'), ' km')" /> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="uinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${label_temp}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> - <dc:attribute name="ids" value="${facet_num}"/> + <dc:attribute name="factory" value="uinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${label_temp}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> + <dc:attribute name="ids" value="${facet_num}" /> <!-- veg zones string as attribute --> - <dc:attribute name="data" value="${vegzonedata}"/> + <dc:attribute name="data" value="${vegzonedata}" /> </dc:element> </dc:for-each> </vegetation_zones> @@ -3917,12 +3937,12 @@ <bundu_bezugswst description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="bundu"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="bundu" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </bundu_bezugswst>