--- a/flys-artifacts/doc/conf/meta-data.xml	Thu Apr 04 10:23:17 2013 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu Apr 04 10:40:01 2013 +0200
@@ -1570,8 +1570,10 @@
           </dc:macro>
 
           <dc:macro name="flood-map-gaugelocations">
-            <dc:attribute name="factory" value="externalwmsfactory"/>
-            <dc:attribute name="ids" value="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelonline-Pegelpunkte"/>
+            <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)"/>
+            <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)"/>
+            <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)"/>
+            <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)"/>
           </dc:macro>
 
           <dc:macro name="flood-map-uesk">
@@ -1703,11 +1705,6 @@
             </dc:context>
           </dc:macro>
 
-          <dc:macro name="flood-map-catchments">
-            <dc:attribute name="factory" value="externalwmsfactory"/>
-            <dc:attribute name="ids" value="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiet"/>
-          </dc:macro>
-
           <dc:macro name="flood-map-routing">
             <qps>
               <dc:call-macro name="flood-map-qps"/>
@@ -1719,14 +1716,33 @@
             </axis>
           </dc:macro>
 
+          <dc:macro name="floodmarks">
+            <dc:context>
+              <dc:statement>
+                SELECT DISTINCT
+                coalesce(CAST (year AS VARCHAR(64)), 'Unbekanntes Jahr') as year
+                FROM flood_marks
+                WHERE river_id = ${river_id}
+              </dc:statement>
+              <dc:if test="dc:has-result()">
+                <floodmarks>
+                  <dc:for-each>
+                    <floodmark name="{$year}"
+                      factory="wmsfloodmarkfactory"
+                      ids="{$river_id};{$year};{$year}"/>
+                  </dc:for-each>
+                </floodmarks>
+              </dc:if>
+            </dc:context>
+          </dc:macro>
+
           <dc:macro name="flood-map-complete">
             <buildings>
               <dc:call-macro name="flood-map-buildings"/>
             </buildings>
-            <catchments>
-              <dc:call-macro name="flood-map-catchments"/>
-            </catchments>
-            <dc:comment><!-- TODO: HW-Marken --></dc:comment>
+            <catchments factory="externalwmsfactory"
+              ids="http://geoportal.bafg.de/wmsproxy/INSPIRE/DrainageBasin;HY.PHYSICALWATERS.CATCHMENTS;Einzugsgebiet"/>
+            <dc:call-macro name="floodmarks"/>
             <hws>
               <dc:call-macro name="hwslines"/>
               <dc:call-macro name="hwspoints"/>
@@ -1743,6 +1759,8 @@
               <dc:call-macro name="flood-map-gaugelocations"/>
             </gaugelocations>
             <background factory="wmsbackground" ids="{$river_id}"/>
+            <pegel_had_measurement_points factory="externalwmsfactory"
+              ids="http://geoportal.bafg.de/wmsproxy/HAD/HAD_31;0;HAD Abflussmessstellen"/>
           </dc:macro>
 
         </dc:if>