changeset 2761:28e7c1637f78

Include thematic heights in dc conf for reference curves. flys-artifacts/trunk@4497 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 24 May 2012 05:59:25 +0000
parents 23b4ff116015
children 33aa37e6d98f
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml
diffstat 2 files changed, 43 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Thu May 24 05:58:33 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu May 24 05:59:25 2012 +0000
@@ -1,3 +1,8 @@
+2012-05-24	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* doc/conf/meta-data.xml: Include other "thematic" heights for
+	  reference curve relative points dc conf.
+
 2012-05-24	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java:
--- a/flys-artifacts/doc/conf/meta-data.xml	Thu May 24 05:58:33 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu May 24 05:59:25 2012 +0000
@@ -112,6 +112,40 @@
             </additionals>
         </dc:macro>
 
+        <dc:macro name="basedata_1_additionals-relative_point">
+            <dc:comment comment=".ZUS -------------------------------"/>
+            <additionals>
+              <dc:context>
+                <dc:statement>
+                  SELECT id          AS prot_id,
+                         description AS prot_description
+                  FROM wsts WHERE kind = 1 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="additionals-wstv-${prot_rel_pos}-${prot_id}"/>
+                          <dc:attribute name="factory" value="staticwkms"/>
+                        </column>
+                      </dc:elements>
+                    </dc:context>
+                  </relativepoint>
+                </dc:elements>
+              </dc:context>
+            </additionals>
+        </dc:macro>
+
         <dc:macro name="basedata_2_fixations_wst">
           <fixations>
             <dc:context>
@@ -533,12 +567,13 @@
               </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                  <dc:call-macro name="annotations"/>
-                 <dc:call-macro name="basedata_0"/>
-                 <dc:call-macro name="basedata_1_additionals"/>
+                 <!--dc:call-macro name="basedata_0"/-->
+                 <dc:call-macro name="basedata_1_additionals-relative_point"/>
                  <dc:comment comment=" FIXATIONS ---------------------------"/>
                  <dc:call-macro name="basedata_2_fixations_relative_point"/>
                  <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
-                 <dc:call-macro name="basedata_4_heightmarks-points"/>
+                 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+                 <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
                </dc:if>
              <dc:comment comment="--- non-recommendations---"/>
             </dc:otherwise>

http://dive4elements.wald.intevation.org