diff flys-artifacts/doc/conf/meta-data.xml @ 4121:f5e13feb35c5

Fix 943/3: Show flood-protections in WSP DC.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 12 Oct 2012 16:43:00 +0200
parents 8d88e8118ba8
children 0b0192727265
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Oct 12 15:16:56 2012 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Oct 12 16:43:00 2012 +0200
@@ -490,24 +490,22 @@
                   <dc:attribute name="name" value="${prot_description}"/>
                   <dc:attribute name="db-id" value="${prot_id}"/>
                   <dc:attribute name="factory" value="staticwkms"/>
-                  <columns>
-                    <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="flood_protection-wstv-${prot_rel_pos}-${prot_id}"/>
-                          <dc:attribute name="factory" value="staticwkms"/>
-                        </column>
-                      </dc:elements>
-                    </dc:context>
-                  </columns>
+                  <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="flood_protection-wstv-${prot_rel_pos}-${prot_id}"/>
+                        <dc:attribute name="factory" value="staticwkms"/>
+                      </column>
+                    </dc:elements>
+                  </dc:context>
                 </flood_protection>
               </dc:elements>
             </dc:context>
@@ -669,6 +667,7 @@
                  <dc:call-macro name="basedata_4_heightmarks-points"/>
                  <dc:comment comment=" AMTL LINIEN  ---------------------------"/>
                  <dc:call-macro name="basedata_3_officials"/>
+                 <dc:call-macro name="basedata_5_flood-protections"/>
                  <dc:call-macro name="annotations_per_type"/>
               </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">

http://dive4elements.wald.intevation.org