Mercurial > dive4elements > river
changeset 2732:7311d0336600
Adjusted dc conf.
flys-artifacts/trunk@4465 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 22 May 2012 19:42:54 +0000 |
| parents | 55a3b575f644 |
| children | ac9a03ed32c1 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue May 22 18:50:57 2012 +0000 +++ b/flys-artifacts/ChangeLog Tue May 22 19:42:54 2012 +0000 @@ -1,3 +1,9 @@ +2012-05-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * doc/conf/meta-data.xml: Allow loading of fixations and thmatic + heights in longitudinal sections, make discharge-curve-misbehavior + testable with trunk. + 2012-05-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java:
--- a/flys-artifacts/doc/conf/meta-data.xml Tue May 22 18:50:57 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Tue May 22 19:42:54 2012 +0000 @@ -407,7 +407,10 @@ </dc:if> <dc:if test="dc:contains($artifact-outs, 'discharge_longitudinal_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_4_heightmarks-points"/> + <dc:call-macro name="basedata_5_flood-protections"/> </dc:if> <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> <dc:call-macro name="basedata_0_wq"/> @@ -484,9 +487,11 @@ <dc:elements> <historical> <dc:attribute name="name" value="${gauge_desc}"/> + <dc:attribute name="factory" value="gaugedischarge"/> <dc:attribute name="from" value="${g_start}"/> <dc:attribute name="to" value="${g_stop}"/> - <dc:attribute name="db-id" value="${discharge_id}"/></historical> + <dc:attribute name="ids" value="${discharge_id}-${g_start}-${g_stop}"/> + </historical> </dc:elements> </dc:context> </gauge>