[Dive4elements-commits] [PATCH 1 of 2] Put the correct annotations into flowvelocity dc and fix measurement name

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1365166543 -7200
# Node ID bf319ba67212a41e13caae8f4b3c2f3629f4b857
# Parent  9245ef9e349b81f341fd4075fead7e5e3b237549
Put the correct annotations into flowvelocity dc and fix measurement name.

diff -r 9245ef9e349b -r bf319ba67212 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Apr 05 12:11:58 2013 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Apr 05 14:55:43 2013 +0200
@@ -581,7 +581,7 @@
                           AND station BETWEEN ${fromkm} AND ${tokm}
                       </dc:statement>
                       <dc:for-each>
-                        <measurement_value name="{$id}-{$description}-{$station}-{$datetime}"
+                        <measurement_value name="{$description} - {$station} - {$datetime}"
                                            ids="{$id}"
                                            factory="flowvelocity"/>
                       </dc:for-each>
@@ -672,9 +672,6 @@
              <dc:if test="dc:contains($artifact-outs, 'bed_difference_height_year')">
                <dc:call-macro name="annotations"/>
              </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
-               <dc:call-macro name="annotations"/>
-             </dc:if>
           </dc:when>
           <dc:otherwise>
             <dc:comment>
@@ -729,7 +726,7 @@
               <dc:call-macro name="flood-map-complete"/>
             </dc:if>
             <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
-              <dc:call-macro name="annotations"/>
+              <dc:call-macro name="annotations_per_type"/>
               <dc:call-macro name="flow_velocity_measurements"/>
             </dc:if>
             <dc:comment>