changeset 2770:9ab82fe0f27b

Precised DC config. flys-artifacts/trunk@4509 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 24 May 2012 13:59:07 +0000
parents de60d1dfdcdf
children e22469664c20
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/doc/conf/meta-data.xml
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Thu May 24 13:57:00 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu May 24 13:59:07 2012 +0000
@@ -1,3 +1,10 @@
+2012-05-24	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* doc/conf/meta-data.xml: Load mainvalues in reference curves.
+
+	* doc/conf/artifacts/winfo.xml: Add mainvalues to compatibility list
+	  of reference curves; fix typo.
+
 2012-05-24	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java:
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml	Thu May 24 13:57:00 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml	Thu May 24 13:59:07 2012 +0000
@@ -208,6 +208,7 @@
                         <facet name="reference_curve" description="A ... reference curve!"/>
                         <facet name="reference_curve.manualpoints" description="points"/>
                         <facet name="relativepoint"    description="Points at curve"/>
+                        <facet name="mainvalues.w" description="facet.computed_discharge_curve.mainvalues.w"/>
                     </facets>
                 </outputmode>
                 <outputmode name="reference_curve_export" mime-type="text/plain" type="export">
@@ -286,7 +287,7 @@
                         <facet name="heightmarks_points" description="facet.other.wqkms"/>
                         <facet name="other.wqkms" description="facet.other.wqkms"/>
                         <facet name="other.wq"    description="Point-like data like fixations"/>
-                        <facet name="other.wq"    description="Point-like data like fixations"/>
+                        <facet name="other.wkms"  description="Point-like data like fixations"/>
                         <facet name="other.wkms.interpol" description="Height over km, like flood protections."/>
                         <facet name="computed_discharge_curve.manualpoints" description="Manuelle Punkte"/>
                     </facets>
--- a/flys-artifacts/doc/conf/meta-data.xml	Thu May 24 13:57:00 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu May 24 13:59:07 2012 +0000
@@ -531,6 +531,7 @@
                </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                  <dc:call-macro name="annotations"/>
+                 <dc:call-macro name="mainvalues"/>
                </dc:if>
             </dc:when>
             <dc:otherwise>

http://dive4elements.wald.intevation.org