# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1350066104 -7200
# Node ID 30168be950a611b7c57707088285311a39d3f5fd
# Parent  0b01927272655d42a5141f5add1353713e843f75
Improvements on issue934/4 (double annotations/DC).

diff -r 0b0192727265 -r 30168be950a6 flys-artifacts/ChangeLog
--- 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
diff -r 0b0192727265 -r 30168be950a6 flys-artifacts/doc/conf/meta-data.xml
--- 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>