--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 11 07:33:00 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 11 07:59:42 2011 +0000
@@ -239,40 +239,16 @@
                 </dc:elements>
               </dc:context>
             </flood-protections>
-            <extra-longitudinal-sections>
-              <dc:attribute name="id" value="extra-longitudinal-sections-${river_id}"/>
-              <dc:context>
-                <dc:statement>
-                  SELECT id          AS els_id,
-                         description AS els_description
-                  FROM wsts WHERE kind = 1 AND river_id = ${river_id}
-                </dc:statement>
-                <dc:elements>
-                  <extra-longitudinal-section>
-                    <dc:attribute name="name" value="${els_description}"/>
-                    <dc:attribute name="db-id" value="${els_id}"/>
-                    <columns>
-                      <dc:context>
-                        <dc:statement>
-                          SELECT id       AS els_column_id,
-                                 name     AS els_column_name,
-                                 position AS els_rel_pos
-                          FROM wst_columns WHERE wst_id = ${els_id}
-                          ORDER by position
-                        </dc:statement>
-                        <dc:elements>
-                          <column>
-                             <dc:attribute name="name" value="${els_column_name}"/>
-                             <dc:attribute name="ids" value="flood_protection-wstv-${els_rel_pos}-${els_id}"/>
-                            <dc:attribute name="factory" value="staticwkms"/>
-                          </column>
-                        </dc:elements>
-                      </dc:context>
-                    </columns>
-                  </extra-longitudinal-section>
-                </dc:elements>
-              </dc:context>
-            </extra-longitudinal-sections>
+            <!-- base data -->
+            <dc:call-macro name="basedata_0"/>
+            <!--extra-longitudinal-sections-->
+            <dc:call-macro name="basedata_1_additionals"/>
+
+            <!-- fixations -->
+            <dc:call-macro name="basedata_2_fixations"/>
+
+            <!-- flood water marks-->
+            <dc:call-macro name="basedata_4_heightmarks-points"/>
           </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve') and not (dc:contains($parameters, 'recommended'))">
               <discharge-table-nn>
@@ -617,6 +593,7 @@
       </dc:comment>
       <dc:choose>
       <dc:when test="dc:contains($artifact-outs, 'longitudinal_section')">
+        <differences>
         <dc:context>
         <dc:statement>
           SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description
@@ -624,7 +601,6 @@
           WHERE f.name = 'w_differences' and f.out_id = o.id and o.artifact_id = a.id;
         </dc:statement>
             <dc:elements>
-             <differences>
               <dc:element name="${facet_name}">
                 <dc:attribute name="description" value="${facet_description}"/>
                 <dc:attribute name="factory"     value="winfo"/>
@@ -632,9 +608,9 @@
                 <dc:attribute name="ids"         value="${aid}"/>
                 <dc:attribute name="out"         value="w_differences"/>
               </dc:element>
-             </differences>
             </dc:elements>
         </dc:context>
+	</differences>
       </dc:when>
       </dc:choose>
       <old_calculations>
@@ -666,7 +642,7 @@
                     Import longitudinal sections only if the ${artifact-out} is defined as 'longitudinal_section'
                     ---------------------------------------------------------------------------------------------
                   </dc:comment>
-                  <dc:when test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
+                  <dc:when test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'discharge_longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')))">
                     <dc:context>
                       <dc:statement>
                         SELECT id AS out_id