[PATCH] Put all macros for wst-data in one place and reduce code duplications

Wald Commits scm-commit at wald.intevation.org
Tue Sep 23 10:11:56 CEST 2014


# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1411459912 -7200
# Node ID 60212ed5602331720ac26aab1564d8e619dfc24a
# Parent  33d90858b2dc8c89dfcf410e9c5b0b1a6db3df10
Put all macros for wst-data in one place and reduce code duplications.

diff -r 33d90858b2dc -r 60212ed56023 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Mon Sep 22 18:17:47 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Tue Sep 23 10:11:52 2014 +0200
@@ -84,7 +84,7 @@
                   <dc:when test="$out = 'computed_discharge_curve'">
                     <dc:call-macro name="mainvalues"/>
                     <dc:call-macro name="basedata_3_officials_wq"/>
-                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
+                    <dc:call-macro name="basedata_2_fixations_wq"/>
                   </dc:when>
                   <dc:when test="$out = 'fix_wq_curve'">
                     <dc:call-macro name="mainvalues"/>
@@ -1074,6 +1074,8 @@
         </dc:if>
       </dc:filter>
     </dc:macro>
+
+
     <!-- Macros to load system data -->
 
     <dc:macro name="annotations">
@@ -1127,6 +1129,89 @@
       </hyks>
     </dc:macro>
 
+
+    <!-- wst-data -->
+
+    <!-- model-waterlevels -->
+    <dc:macro name="basedata_0_macro">
+      <dc:filter expr="$kind = 0">
+        <dc:if test="dc:has-result()">
+          <basedata>
+            <dc:group expr="$wst_description">
+              <basedata name="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:macro-body/>
+                </dc:for-each>
+              </basedata>
+            </dc:group>
+          </basedata>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="basedata_0">
+      <dc:call-macro name="basedata_0_macro">
+        <column name="{$wst_column_name}"
+                ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwqkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_0_wq">
+      <dc:call-macro name="basedata_0_macro">
+        <column name="{$wst_column_name}"
+                ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
+                factory="wqinterpol" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <!-- additional longitudinal sections -->
+    <dc:macro name="basedata_1_additionals_macro">
+      <dc:filter expr="$kind=1">
+        <dc:if test="dc:has-result()">
+          <additionals>
+            <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
+              <additional name="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:macro-body/>
+                </dc:for-each>
+              </additional>
+            </dc:group>
+          </additionals>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="basedata_1_additionals">
+      <dc:call-macro name="basedata_1_additionals_macro">
+        <column name="{$wst_column_name}"
+                ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwqkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_1_additionals_wq">
+      <dc:call-macro name="basedata_1_additionals_macro">
+        <column name="{$wst_column_name}"
+                ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
+                factory="wqinterpol" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_1_additionals-relative_point">
+      <dc:call-macro name="basedata_1_additionals_macro">
+        <column name="{$wst_column_name}"
+                ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <!-- fixations -->
     <dc:macro name="fixings-macro">
       <dc:filter expr="$kind=2">
         <dc:if test="dc:has-result()">
@@ -1143,15 +1228,6 @@
       </dc:filter>
     </dc:macro>
 
-    <dc:macro name="basedata_2_fixations_wqkms">
-      <dc:call-macro name="fixings-macro">
-        <column name="{$wst_column_name}"
-                ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                factory="wqinterpol" target_out="{$out}"
-                info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
     <dc:macro name="basedata_2_fixations">
       <dc:call-macro name="fixings-macro">
         <column name="{$wst_column_name}"
@@ -1161,18 +1237,33 @@
       </dc:call-macro>
     </dc:macro>
 
-    <dc:macro name="basedata_3_officials">
+    <dc:macro name="basedata_2_fixations_wq">
+      <dc:call-macro name="fixings-macro">
+        <column name="{$wst_column_name}"
+                ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
+                factory="wqinterpol" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_2_fixations_relative_point">
+      <dc:call-macro name="fixings-macro">
+        <column name="{$wst_column_name}"
+                ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <!-- official lines -->
+    <dc:macro name="basedata_3_macro">
       <dc:filter expr="$kind=3">
         <dc:if test="dc:has-result()">
           <officiallines>
             <dc:group expr="$wst_description">
               <official name="{dc:group-key()}">
                 <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwqkms"
-                          target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
+                  <dc:macro-body/>
                 </dc:for-each>
               </official>
             </dc:group>
@@ -1181,37 +1272,35 @@
       </dc:filter>
     </dc:macro>
 
-    <dc:macro name="basedata_3_officials_wq">
-      <dc:filter expr="$kind=3">
-        <dc:if test="dc:has-result()">
-          <officiallines>
-            <dc:group expr="$wst_description">
-              <official name="{dc:group-key()}">
-                <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="wqinterpol"
-                          target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
-                </dc:for-each>
-              </official>
-            </dc:group>
-          </officiallines>
-        </dc:if>
-      </dc:filter>
+    <dc:macro name="basedata_3_officials">
+      <dc:call-macro name="basedata_3_macro">
+        <column name="{$wst_column_name}"
+                ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwqkms"
+                target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
     </dc:macro>
 
-    <dc:macro name="basedata_4_heightmarks-points">
+    <dc:macro name="basedata_3_officials_wq">
+      <dc:call-macro name="basedata_3_macro">
+        <column name="{$wst_column_name}"
+                ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}"
+                factory="wqinterpol"
+                target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <!-- flood marks -->
+    <dc:macro name="basedata_4_macro">
       <dc:filter expr="$kind=4">
         <dc:if test="dc:has-result()">
           <heightmarks>
             <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')">
               <heightmark name="{dc:group-key()}">
                 <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms" target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
+                  <dc:macro-body/>
                 </dc:for-each>
               </heightmark>
             </dc:group>
@@ -1220,25 +1309,153 @@
       </dc:filter>
     </dc:macro>
 
+    <dc:macro name="basedata_4_heightmarks-points">
+      <dc:call-macro name="basedata_4_macro">
+        <column name="{$wst_column_name}"
+                ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_4_heightmarks-points_wq">
+      <dc:call-macro name="basedata_4_macro">
+        <column name="{$wst_column_name}"
+                ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
+                factory="wqinterpol" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
     <dc:macro name="basedata_4_heightmarks-points-relative_points">
-      <dc:filter expr="$kind=4">
+      <dc:call-macro name="basedata_4_macro">
+        <column name="{$wst_column_name}"
+                ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <!-- flood protection structures -->
+    <dc:macro name="basedata_5_macro">
+      <dc:filter expr="$kind=5">
         <dc:if test="dc:has-result()">
-          <heightmarks>
-            <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')">
-              <relativepoint name="{dc:group-key()}">
+          <flood_protections>
+            <dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')">
+              <flood_protection name="{dc:group-key()}">
                 <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms" target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
+                  <dc:macro-body/>
                 </dc:for-each>
-              </relativepoint>
+              </flood_protection>
             </dc:group>
-          </heightmarks>
+          </flood_protections>
         </dc:if>
       </dc:filter>
     </dc:macro>
 
+    <dc:macro name="basedata_5_flood-protections">
+      <dc:call-macro name="basedata_5_macro">
+        <column name="{$wst_column_name}"
+                ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_5_flood-protections_wq">
+      <dc:call-macro name="basedata_5_macro">
+        <column name="{$wst_column_name}"
+                ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
+                factory="wqinterpol" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_5_flood-protections_relative_points">
+      <dc:call-macro name="basedata_5_macro">
+        <column name="{$wst_column_name}"
+                ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <!-- waterlevel differences imported from CSV-files for M-INFO -->
+    <dc:macro name="basedata_6_delta_w">
+      <dc:filter expr="$kind=6">
+        <dc:if test="dc:has-result()">
+          <delta_w>
+            <delta_w_cm>
+              <dc:filter expr="contains($wst_description, 'cm.csv')">
+                <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
+                  <relativepoint name="{dc:group-key()}">
+                    <dc:for-each>
+                      <column name="{$wst_column_name}"
+                              ids="delta_w-wstv-{$wst_column_position}-{$wst_id}"
+                              factory="staticwkms"
+                              target_out="{$out}"
+                              info="{$info} [km {$deffrom} - {$defto}]"/>
+                    </dc:for-each>
+                  </relativepoint>
+                </dc:group>
+              </dc:filter>
+            </delta_w_cm>
+            <delta_w_cma>
+              <dc:filter expr="contains($wst_description, 'cm-a.csv')">
+                <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
+                  <relativepoint name="{dc:group-key()}">
+                    <dc:for-each>
+                      <column name="{$wst_column_name}"
+                              ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}"
+                              factory="staticwkms" target_out="{$out}"
+                              info="{$info} [km {$deffrom} - {$defto}]"/>
+                    </dc:for-each>
+                  </relativepoint>
+                </dc:group>
+              </dc:filter>
+            </delta_w_cma>
+          </delta_w>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <!-- waterlevels imported from CSV-files for M-INFO -->
+    <dc:macro name="basedata_7_macro">
+      <dc:filter expr="$kind=7">
+        <dc:if test="dc:has-result()">
+          <wlevel>
+            <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
+              <relativepoint name="{dc:group-key()}">
+                <dc:for-each>
+                  <dc:macro-body/>
+                </dc:for-each>
+              </relativepoint>
+            </dc:group>
+          </wlevel>
+        </dc:if>
+      </dc:filter>
+    </dc:macro>
+
+    <dc:macro name="basedata_7_waterlevels">
+      <dc:call-macro name="basedata_7_macro">
+        <column name="{$wst_column_name}"
+                ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
+                factory="staticwqkms" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="basedata_7_waterlevels_wq">
+      <dc:call-macro name="basedata_7_macro">
+        <column name="{$wst_column_name}"
+                ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
+                factory="wqinterpol" target_out="{$out}"
+                info="{$info} [km {$deffrom} - {$defto}]"/>
+      </dc:call-macro>
+    </dc:macro>
+
+
+    <!-- prototypes -->
 
     <!-- discharge curve prototype -->
     <dc:macro name="discharge-curve-prototype">
@@ -1249,15 +1466,13 @@
         <dc:call-macro name="historical_discharge_curve"/>
         <dc:call-macro name="basedata_0_wq"/>
         <dc:call-macro name="basedata_1_additionals_wq"/>
-        <dc:call-macro name="basedata_2_fixations_wqkms"/>
+        <dc:call-macro name="basedata_2_fixations_wq"/>
         <dc:call-macro name="basedata_3_officials_wq"/>
-        <dc:call-macro name="basedata_4_heightmarks-points"/>
-        <dc:call-macro name="basedata_5_flood-protections"/>
+        <dc:call-macro name="basedata_4_heightmarks-points_wq"/>
+        <dc:call-macro name="basedata_5_flood-protections_wq"/>
         <minfo>
           <dc:call-macro name="sqrelations"/>
-          <!-- add MINFO-Fixation-Data here -->
-          <!-- basedata_6_...-->
-          <!-- basedata_7_...-->
+          <dc:call-macro name="basedata_7_waterlevels_wq"/>
         </minfo>
     </dc:macro>
 
@@ -1302,6 +1517,8 @@
       <dc:call-macro name="sediment-load"/>
     </dc:macro>
 
+
+    <!-- porosities -->
     <dc:macro name="porosities">
       <porosities>
       <dc:context>
@@ -1367,6 +1584,7 @@
       </densities>
     </dc:macro>
 
+    <!-- sediment load -->
     <dc:macro name="load">
       <year description="{$timespan}"
             factory="sedimentload"
@@ -1520,26 +1738,7 @@
       </sedimentloads>
     </dc:macro>
 
-
-    <dc:macro name="basedata_5_flood-protections">
-      <dc:filter expr="$kind=5">
-        <dc:if test="dc:has-result()">
-          <flood_protections>
-            <dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')">
-              <flood_protection name="{dc:group-key()}">
-                <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms" target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
-                </dc:for-each>
-              </flood_protection>
-            </dc:group>
-          </flood_protections>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
+    <!-- annotations -->
     <dc:macro name="annotations_per_type">
       <annotations>
         <dc:context>
@@ -1576,122 +1775,6 @@
       </sources_sinks>
     </dc:macro>
 
-    <dc:macro name="basedata_2_fixations_relative_point">
-      <dc:filter expr="$kind=2">
-        <dc:if test="dc:has-result()">
-          <fixations>
-            <dc:group expr="dc:replace($wst_description, 'Fixierungen/', '')">
-              <relativepoint name="{dc:group-key()}">
-                <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="fixations-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms" target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
-                </dc:for-each>
-              </relativepoint>
-            </dc:group>
-          </fixations>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-    <dc:macro name="basedata_5_flood-protections_relative_points">
-      <dc:filter expr="$kind=5">
-        <dc:if test="dc:has-result()">
-          <flood_protections>
-            <dc:group expr="$wst_description">
-              <relativepoint name="{dc:group-key()}">
-                <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms" target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
-                </dc:for-each>
-              </relativepoint>
-            </dc:group>
-          </flood_protections>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals-relative_point">
-      <dc:filter expr="$kind=1">
-        <dc:if test="dc:has-result()">
-          <additionals>
-            <dc:group expr="$wst_description">
-              <relativepoint name="{dc:group-key()}">
-                <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwkms" target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
-                </dc:for-each>
-              </relativepoint>
-            </dc:group>
-          </additionals>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-
-    <dc:macro name="basedata_7_waterlevels">
-      <dc:filter expr="$kind=7">
-        <dc:if test="dc:has-result()">
-          <wlevel>
-            <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
-              <relativepoint name="{dc:group-key()}">
-                <dc:for-each>
-                  <column name="{$wst_column_name}"
-                          ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                          factory="staticwqkms" target_out="{$out}"
-                          info="{$info} [km {$deffrom} - {$defto}]"/>
-                </dc:for-each>
-              </relativepoint>
-            </dc:group>
-          </wlevel>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-
-    <dc:macro name="basedata_6_delta_w">
-      <dc:filter expr="$kind=6">
-        <dc:if test="dc:has-result()">
-          <delta_w>
-            <delta_w_cm>
-              <dc:filter expr="contains($wst_description, 'cm.csv')">
-                <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
-                  <relativepoint name="{dc:group-key()}">
-                    <dc:for-each>
-                      <column name="{$wst_column_name}"
-                              ids="delta_w-wstv-{$wst_column_position}-{$wst_id}"
-                              factory="staticwkms"
-                              target_out="{$out}"
-                              info="{$info} [km {$deffrom} - {$defto}]"/>
-                    </dc:for-each>
-                  </relativepoint>
-                </dc:group>
-              </dc:filter>
-            </delta_w_cm>
-            <delta_w_cma>
-              <dc:filter expr="contains($wst_description, 'cm-a.csv')">
-                <dc:group expr="dc:replace($wst_description, 'CSV/', '')">
-                  <relativepoint name="{dc:group-key()}">
-                    <dc:for-each>
-                      <column name="{$wst_column_name}"
-                              ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}"
-                              factory="staticwkms" target_out="{$out}"
-                              info="{$info} [km {$deffrom} - {$defto}]"/>
-                    </dc:for-each>
-                  </relativepoint>
-                </dc:group>
-              </dc:filter>
-            </delta_w_cma>
-          </delta_w>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
     <dc:macro name="discharge_table_gauge">
       <dc:context>
         <dc:statement>
@@ -2095,83 +2178,6 @@
       </dc:context>
     </dc:macro>
 
-    <dc:macro name="basedata_0_macro">
-      <dc:filter expr="$kind = 0">
-        <dc:if test="dc:has-result()">
-          <basedata>
-            <dc:group expr="$wst_description">
-              <basedata name="{dc:group-key()}">
-                <dc:for-each>
-                  <dc:macro-body/>
-                </dc:for-each>
-              </basedata>
-            </dc:group>
-          </basedata>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-    <dc:macro name="basedata_0">
-      <dc:call-macro name="basedata_0_macro">
-        <column name="{$wst_column_name}"
-                ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms" target_out="{$out}"
-                info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
-    <dc:macro name="basedata_0_wq">
-      <dc:call-macro name="basedata_0_macro">
-        <column name="{$wst_column_name}"
-                ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
-                factory="wqinterpol" target_out="{$out}"
-                info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals_macro">
-      <dc:filter expr="$kind=1">
-        <dc:if test="dc:has-result()">
-          <additionals>
-            <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')">
-              <additional name="{dc:group-key()}">
-                <dc:for-each>
-                  <dc:macro-body/>
-                </dc:for-each>
-              </additional>
-            </dc:group>
-          </additionals>
-        </dc:if>
-      </dc:filter>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals">
-      <dc:call-macro name="basedata_1_additionals_macro">
-        <column name="{$wst_column_name}"
-                ids="additionals-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwqkms" target_out="{$out}"
-                info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals_marks">
-      <dc:call-macro name="basedata_1_additionals_macro">
-        <column name="{$wst_column_name}"
-                ids="additionalsmarks-wstv-{$wst_column_position}-{$wst_id}"
-                factory="staticwkms" target_out="{$out}"
-                info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
-    <dc:macro name="basedata_1_additionals_wq">
-      <dc:call-macro name="basedata_1_additionals_macro">
-        <column name="{$wst_column_name}"
-                ids="base_data-wstv-{$wst_column_position}-{$wst_id}"
-                factory="wqinterpol" target_out="{$out}"
-                info="{$info} [km {$deffrom} - {$defto}]"/>
-      </dc:call-macro>
-    </dc:macro>
-
     <!-- Floodmap part -->
     <dc:macro name="flood-map-complete">
       <dc:call-macro name="flood-map-buildings"/>


More information about the Dive4Elements-commits mailing list