# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1319804280 0
# Node ID 205eb6f124a5f581004169ba2cb8326b22f16510
# Parent  d5d2bffb26cad78b6cea7c0e222a6b16a57a2cc0
Load and display annotations in w-difference diagrams, minor polishing.

flys-artifacts/trunk@3112 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r d5d2bffb26ca -r 205eb6f124a5 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Oct 28 12:09:58 2011 +0000
+++ b/flys-artifacts/ChangeLog	Fri Oct 28 12:18:00 2011 +0000
@@ -1,3 +1,14 @@
+2011-10-28	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Load and display annotations in w-differences, minor polishing.
+
+	* src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java,
+	  src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java:
+	  Use FacetType 'instead' of string. Allow Annotations in
+	  WDifferences- diagram.
+
+	* doc/conf/meta-data.xml: Recommend annotations in w-differences case.
+
 2011-10-28	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/collections/AttributeWriter.java: 
diff -r d5d2bffb26ca -r 205eb6f124a5 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Oct 28 12:09:58 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Oct 28 12:18:00 2011 +0000
@@ -10,6 +10,12 @@
       <dc:elements>
         <river>
           <dc:attribute name="name" value="${river_name}"/>
+          <dc:if test="dc:contains($artifact-outs, 'w_differences')">
+            <annotation>
+              <dc:attribute name="factory" value="annotations"/>
+              <dc:attribute name="ids"     value="${river_id}"/>
+            </annotation>
+          </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
             <dc:choose>
               <dc:when test="dc:contains($parameters, 'recommended')">
diff -r d5d2bffb26ca -r 205eb6f124a5 flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java	Fri Oct 28 12:09:58 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java	Fri Oct 28 12:18:00 2011 +0000
@@ -279,8 +279,7 @@
         else if (name.equals(LONGITUDINAL_ANNOTATION)) {
             doAnnotationsOut(f.getData(artifact, context), facet, attr, visible);
         }
-        // TODO -> type, and merge with WDifferencesCurveGenerator
-        else if (name.equals("other.wkms")) {
+        else if (name.equals(STATIC_WKMS)) {
             doWOut((WKms) f.getData(artifact, context), facet, attr, visible);
         }
         else if (name.equals(W_DIFFERENCES)) {
diff -r d5d2bffb26ca -r 205eb6f124a5 flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java	Fri Oct 28 12:09:58 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java	Fri Oct 28 12:18:00 2011 +0000
@@ -152,9 +152,12 @@
         else if (name.equals(LONGITUDINAL_W)) {
             doWOut((WQKms) f.getData(artifact, context), facet, attr, visible);
         }
-        else if (name.equals("other.wkms")) {
+        else if (name.equals(STATIC_WKMS)) {
             doWOut((WKms) f.getData(artifact, context), facet, attr, visible);
         }
+        else if (name.equals(LONGITUDINAL_ANNOTATION)) {
+            doAnnotationsOut(f.getData(artifact, context), facet, attr, visible);
+        }
         else {
             logger.warn("Unknown facet name: " + name);
             return;