changeset 1851:67aa74efc024

Recommend mainvalues for Duration Curve Diagrams, minor refactoring. flys-artifacts/trunk@3195 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Wed, 09 Nov 2011 13:17:55 +0000
parents 0463e1f80bfd
children feef1121e800
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml
diffstat 2 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Wed Nov 09 13:13:01 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Nov 09 13:17:55 2011 +0000
@@ -1,3 +1,10 @@
+2011-11-09  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Recommend mainvalues for Duration Curve Diagrams.
+
+	* doc/conf/meta-data.xml: Recommend mainvalues for duration curve
+	  diagrams. refactored into macro.
+
 2011-11-09  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	Handle MainValue Facets in Duration Curve Diagrams.
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed Nov 09 13:13:01 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Wed Nov 09 13:17:55 2011 +0000
@@ -77,6 +77,12 @@
               </dc:context>
             </addtionals>
         </dc:macro>
+        <dc:macro name="mainvalues">
+          <mainvalue>
+            <dc:attribute name="factory" value="mainvalue"/>
+            <dc:attribute name="ids"     value="${river_id}"/>
+          </mainvalue>
+        </dc:macro>
         <river>
           <dc:attribute name="name" value="${river_name}"/>
           <dc:if test="dc:contains($artifact-outs, 'w_differences')">
@@ -428,12 +434,12 @@
           </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
               <computed-discharge-curve>
-                <mainvalue>
-                  <dc:attribute name="factory" value="mainvalue"/>
-                  <dc:attribute name="ids"  value="${river_id}"/>
-                </mainvalue>
+                <dc:call-macro name="mainvalues"/>
               </computed-discharge-curve>
           </dc:if>
+          <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
+            <dc:call-macro name="mainvalues"/>
+          </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
               <longitudinal-section>
                 <dc:call-macro name="longitudinal_section-recommended"/>

http://dive4elements.wald.intevation.org