Mercurial > dive4elements > river
changeset 4123:30168be950a6
Improvements on issue934/4 (double annotations/DC).
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 12 Oct 2012 20:21:44 +0200 |
| parents | 0b0192727265 |
| children | c03639e30cc5 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 2 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Oct 12 17:02:49 2012 +0200 +++ b/flys-artifacts/ChangeLog Fri Oct 12 20:21:44 2012 +0200 @@ -1,3 +1,10 @@ +2012-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Improve on issue943/4 + + * flys-artifacts/doc/conf/meta-data.xml: Do not show double + annotation entry in LS DC. + 2012-10-12 Felix Wolfsteller <felix.wolfsteller@intevation.de> Improve on issue943/4
--- a/flys-artifacts/doc/conf/meta-data.xml Fri Oct 12 17:02:49 2012 +0200 +++ b/flys-artifacts/doc/conf/meta-data.xml Fri Oct 12 20:21:44 2012 +0200 @@ -676,36 +676,29 @@ <dc:call-macro name="annotations_per_type"/> </dc:if> - <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> - - <longitudinal_section> - <dc:call-macro name="annotations"/> - </longitudinal_section> - </dc:if> - - <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> - <dc:call-macro name="annotations"/> - <!--dc:call-macro name="basedata_0"/--> - <dc:call-macro name="basedata_1_additionals-relative_point"/> - <dc:comment comment=" FIXATIONS ---------------------------"/> - <dc:call-macro name="basedata_2_fixations_relative_point"/> - <dc:comment comment=" HOEHENMARKEN ---------------------------"/> - <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, 'fix_wq_curve')"> - <dc:call-macro name="basedata_0_wq"/> - <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_relative_points"/> - </dc:if> - <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> - </dc:if> - <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')"> - <dc:call-macro name="annotations"/> - </dc:if> + <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> + <dc:call-macro name="annotations"/> + <!--dc:call-macro name="basedata_0"/--> + <dc:call-macro name="basedata_1_additionals-relative_point"/> + <dc:comment comment=" FIXATIONS ---------------------------"/> + <dc:call-macro name="basedata_2_fixations_relative_point"/> + <dc:comment comment=" HOEHENMARKEN ---------------------------"/> + <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, 'fix_wq_curve')"> + <dc:call-macro name="basedata_0_wq"/> + <dc:call-macro name="basedata_1_additionals"/> + <dc:call-macro name="basedata_2_fixations_wqkms"/> + <dc:call-macro name="basedata_3_officials"/> + <dc:call-macro name="basedata_4_heightmarks-points"/> + <dc:call-macro name="basedata_5_flood-protections_relative_points"/> + </dc:if> + <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')"> + </dc:if> + <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')"> + <dc:call-macro name="annotations"/> + </dc:if> <dc:comment comment="--- non-recommendations---"/> </dc:otherwise> </dc:choose>