Mercurial > dive4elements > river
changeset 8266:512b5c948881
merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 12 Sep 2014 14:56:49 +0200 |
| parents | 78184aa612dd (current diff) 9bb8d581f6ca (diff) |
| children | 99912f51468d |
| files | |
| diffstat | 1 files changed, 20 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Sep 12 14:56:22 2014 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri Sep 12 14:56:49 2014 +0200 @@ -166,9 +166,7 @@ </computed_discharge_curve> </dc:when> <dc:when test="$out = 'discharge_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> - <dc:call-macro name="basedata_1_additionals_wq"/> - <dc:call-macro name="basedata_5_flood-protections"/> + <dc:call-macro name="discharge-prototype"/> <computed_discharge_curve> <dc:call-macro name="mainvalues"/> </computed_discharge_curve> @@ -188,11 +186,7 @@ <dc:call-macro name="basedata_5_flood-protections_relative_points"/> </dc:when> <dc:when test="$out = 'fix_wq_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> - <dc:call-macro name="basedata_1_additionals_marks"/> - <dc:call-macro name="basedata_2_fixations_wqkms"/> - <dc:call-macro name="basedata_3_officials"/> - <dc:call-macro name="basedata_5_flood-protections_relative_points"/> + <dc:call-macro name="discharge-prototype"/> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> <dc:call-macro name="longitudinal-section-prototype"/> @@ -1342,6 +1336,24 @@ <dc:call-macro name="sediment-load"/> </dc:macro> + <dc:macro name="discharge-prototype"> + <dc:call-macro name="discharge-curve-prototype"/> + <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_4_heightmarks-points"/> + <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"/> + + <computed_discharge_curve> + <dc:call-macro name="mainvalues"/> + </computed_discharge_curve> + </dc:macro> + <dc:macro name="porosities"> <porosities> <dc:context>