Mercurial > dive4elements > river
changeset 4596:a44f56472d35
meta-data.xml: Moved duration-curve definitions into more appropriate places.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 30 Nov 2012 12:01:51 +0100 |
| parents | 0b48085f93aa |
| children | 120001bf687f |
| files | flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 9 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml Fri Nov 30 12:00:58 2012 +0100 +++ b/flys-artifacts/doc/conf/meta-data.xml Fri Nov 30 12:01:51 2012 +0100 @@ -711,6 +711,9 @@ <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> <dc:call-macro name="mainvalues"/> </dc:if> + <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> + <dc:call-macro name="mainvalues"/> + </dc:if> <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> <dc:call-macro name="annotations"/> <dc:call-macro name="mainvalues"/> @@ -771,7 +774,12 @@ <dc:call-macro name="basedata_5_flood-protections"/> <dc:call-macro name="annotations_per_type"/> </dc:if> - + <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> + <dc:call-macro name="mainvalues"/> + <dc:call-macro name="basedata_2_fixations_relative_point"/> + <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> + <dc:call-macro name="basedata_5_flood-protections_relative_points"/> + </dc:if> <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> <dc:call-macro name="annotations"/> <!--dc:call-macro name="basedata_0"/--> @@ -914,20 +922,6 @@ </computed_discharge_curve> </dc:if> - <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> - <dc:choose> - <dc:when test="dc:contains($parameters, 'recommended')"> - <dc:call-macro name="mainvalues"/> - </dc:when> - <dc:otherwise> - <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:otherwise> - </dc:choose> - </dc:if> - <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve') and not (dc:contains($parameters, 'recommended'))"> <discharge_table_nn> <discharge_table_gauge>