Mercurial > dive4elements > river
changeset 8958:3c95b89da5ea
Configured datacage for SINFO selektierte zus. Längsschnitte and twin-datacage panel for flowd depth calculation
author | gernotbelger |
---|---|
date | Fri, 23 Mar 2018 17:53:59 +0100 |
parents | 7565d7dce850 |
children | 175f113ed939 |
files | artifacts/doc/conf/meta-data.xml |
diffstat | 1 files changed, 71 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Mar 23 17:52:59 2018 +0100 +++ b/artifacts/doc/conf/meta-data.xml Fri Mar 23 17:53:59 2018 +0100 @@ -264,12 +264,15 @@ <dc:call-macro name="bed-heights-single"/> </dc:when> <dc:when test="$out = 'sinfo_flowdepth_waterlevels'"> - <!-- FIXME: check requirement what to show here... --> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> + <minfo> + <fixanalysis> + <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_4_heightmarks-points"/> - <dc:call-macro name="basedata_5_flood-protections"/> + <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> + <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> </dc:when> <dc:when test="$out = 'sinfo_flow_depth'"> @@ -395,8 +398,7 @@ <dc:when test="$out = 'historical_discharge_wq'"> <dc:call-macro name="discharge-curve-user-prototype"/> </dc:when> - <dc:when test="starts-with($out, 'sq_relation') or - $out = 'sq_overview'"> + <dc:when test="starts-with($out, 'sq_relation') or $out = 'sq_overview'"> <dc:call-macro name="discharge-curve-user-prototype"/> </dc:when> <dc:comment> Time series </dc:comment> @@ -425,6 +427,11 @@ <dc:when test="$out = 'map'"> <dc:call-macro name="flood-map"/> </dc:when> + + <dc:when test="$out = 'sinfo_flowdepth_waterlevels'"> + <dc:call-macro name="longitudinal-section-fix-vollmer_q"/> + <!-- TODO: 'Frühere Berechnungen//Bezugswasserstände' --> + </dc:when> </dc:choose> </dc:iterate> </dc:otherwise> @@ -585,6 +592,17 @@ ($facet_name = 'longitudinal_section.w' or $facet_name = 'longitudinal_section.q') "> + <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> + </dc:filter> + </dc:macro> + + <dc:macro name="longitudinal-section-fix-vollmer_q"> + <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $facet_name = 'longitudinal_section.q'"> + <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> + </dc:filter> + </dc:macro> + + <dc:macro name="longitudinal-section-fix-vollmer_macro"> <dc:if test="dc:has-result()"> <waterlevels_fix_vollmer> <dc:call-macro name="collection-group"> @@ -603,7 +621,6 @@ </dc:call-macro> </waterlevels_fix_vollmer> </dc:if> - </dc:filter> </dc:macro> <dc:macro name="longitudinal-section-fix"> @@ -1276,6 +1293,50 @@ </dc:call-macro> </dc:macro> + <dc:macro name="basedata_1_additionals-sinfo-with-q_macro"> + <dc:filter expr="$kind=1 and $sinfo_selection='Q'"> + <dc:if test="dc:has-result()"> + <additionals> + <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> + <additional name="{dc:group-key()}"> + <dc:for-each> + <dc:macro-body/> + </dc:for-each> + </additional> + </dc:group> + </additionals> + </dc:if> + </dc:filter> + </dc:macro> + + <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}]"/> + </dc:call-macro> + </dc:macro> + + <dc:macro name="basedata_1_additionals-sinfo-without-q_macro"> + <dc:filter expr="$kind=1 and $sinfo_selection='W'"> + <dc:if test="dc:has-result()"> + <additionals> + <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> + <additional name="{dc:group-key()}"> + <dc:for-each> + <dc:macro-body/> + </dc:for-each> + </additional> + </dc:group> + </additionals> + </dc:if> + </dc:filter> + </dc:macro> + + <dc:macro name="basedata_1_additionals-sinfo-without-q"> + <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro"> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + </dc:call-macro> + </dc:macro> + <dc:macro name="basedata_1_additionals_wq"> <dc:call-macro name="basedata_1_additionals_macro"> <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> @@ -3019,7 +3080,8 @@ w.description AS wst_description, COALESCE(wc.name, '') AS wst_column_name, wr.a AS deffrom, - wr.b AS defto + wr.b AS defto, + w.sinfo_selection FROM wst_columns wc JOIN wsts w ON wc.wst_id = w.id JOIN wst_ranges wr ON wc.id = wr.wst_column_id