--- a/flys-artifacts/doc/conf/meta-data.xml	Tue Oct 02 09:34:19 2012 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Tue Oct 02 10:38:39 2012 +0200
@@ -535,6 +535,25 @@
           </annotation>
         </dc:macro>
 
+        <dc:macro name="annotations_per_type">
+          <annotations>
+            <dc:context>
+              <dc:statement>
+                SELECT id          AS anno_id,
+                       name AS anno_description
+                FROM annotation_types
+              </dc:statement>
+              <dc:elements>
+                <annotation>
+                  <dc:attribute name="name"    value="${anno_description}"/>
+                  <dc:attribute name="factory" value="annotations"/>
+                  <dc:attribute name="ids"     value="${river_id}:${anno_description}"/>
+                </annotation>
+             </dc:elements>
+            </dc:context>
+          </annotations>
+        </dc:macro>
+
         <dc:macro name="cross_sections">
           <cross_sections>
             <dc:attribute name="id" value="flood-protections-${river_id}"/>
@@ -650,6 +669,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="annotations_per_type"/>
               </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                  <dc:call-macro name="annotations"/>