changeset 2749:5eb3edb4f37b

Add relative-points-fixations for duration curves in dc conf. flys-artifacts/trunk@4484 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Wed, 23 May 2012 20:42:29 +0000
parents 6717b4725ddf
children 97cb098dbf7a
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml
diffstat 2 files changed, 38 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Wed May 23 20:41:09 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed May 23 20:42:29 2012 +0000
@@ -1,3 +1,8 @@
+2012-05-23	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* doc/conf/meta-data.xml: Serve fixations with relative points
+	  for duration curves.
+
 2012-05-23	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java:
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed May 23 20:41:09 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Wed May 23 20:42:29 2012 +0000
@@ -212,6 +212,38 @@
           </fixations>
         </dc:macro>
 
+        <dc:macro name="basedata_2_fixations_relative_point">
+          <fixations>
+            <dc:context>
+              <dc:statement>
+                SELECT id          AS prot_id,
+                       description AS prot_description
+                FROM wsts WHERE kind = 2 AND river_id = ${river_id}
+              </dc:statement>
+              <dc:elements>
+                <relativepoint>
+                  <dc:attribute name="name" value="${prot_description}"/>
+                  <dc:context>
+                    <dc:statement>
+                      SELECT id       AS prot_column_id,
+                             name     AS prot_column_name,
+                             position AS prot_rel_pos
+                      FROM wst_columns WHERE wst_id = ${prot_id}
+                      ORDER by position
+                    </dc:statement>
+                    <dc:elements>
+                      <column>
+                        <dc:attribute name="name" value="${prot_column_name}"/>
+                        <dc:attribute name="ids" value="fixations-wstv-${prot_rel_pos}-${prot_id}"/>
+                        <dc:attribute name="factory" value="staticwkms"/>
+                      </column>
+                    </dc:elements>
+                  </dc:context>
+                </relativepoint>
+              </dc:elements>
+            </dc:context>
+          </fixations>
+        </dc:macro>
         <dc:macro name="basedata_4_heightmarks-points">
           <heightmarks>
             <dc:context>
@@ -530,7 +562,7 @@
                 </dc:when>
                 <dc:otherwise>
                   <dc:call-macro name="mainvalues"/>
-                  <dc:call-macro name="basedata_2_fixations"/>
+                  <dc:call-macro name="basedata_2_fixations_relative_point"/>
                 </dc:otherwise>
             </dc:choose>
           </dc:if>

http://dive4elements.wald.intevation.org