[Dive4elements-commits] [PATCH 4 of 5] meta-data.xml: Resolved discharge_longitudinal_section definitions and use

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1354273358 -3600
# Node ID 120001bf687f3ea19cfb365f6c30c5b6c7ed6397
# Parent  a44f56472d35e48145d184a3d82fbae61dc3ed13
meta-data.xml: Resolved discharge_longitudinal_section definitions and use
new longitudinal_section prototype.

diff -r a44f56472d35 -r 120001bf687f flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 30 12:01:51 2012 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 30 12:02:38 2012 +0100
@@ -750,29 +750,12 @@
                  <dc:call-macro name="cross_sections"/>
                  <dc:call-macro name="hyks"/>
               </dc:if>
-              <dc:if test="dc:contains($artifact-outs, 'discharge_longitudinal_section')">
-                 <dc:call-macro name="basedata_0"/>
-                 <dc:call-macro name="basedata_1_additionals"/>
-                 <dc:call-macro name="basedata_2_fixations"/>
-                 <dc:call-macro name="basedata_3_officials"/>
-                 <dc:call-macro name="basedata_4_heightmarks-points"/>
-                 <dc:call-macro name="basedata_5_flood-protections"/>
-              </dc:if>
               <!--dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
                  <dc:call-macro name="basedata_0_wq"/>
                  <dc:call-macro name="basedata_4_heightmarks-wq"/>
               </dc:if-->
-              <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))">
-                 <dc:call-macro name="basedata_0"/>
-                 <dc:call-macro name="basedata_1_additionals"/>
-                 <dc:comment comment=" FIXATIONS ---------------------------"/>
-                 <dc:call-macro name="basedata_2_fixations"/>
-                 <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
-                 <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 test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')) or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
+                  <dc:call-macro name="longitudinal-section-prototype"/>
               </dc:if>
               <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
                   <dc:call-macro name="mainvalues"/>