diff flys-artifacts/doc/conf/meta-data.xml @ 5349:d43ef9f709cd

Add HWSLines and HWSPoints to datacage for the map
author Andre Heinecke <aheinecke@intevation.de>
date Wed, 20 Mar 2013 16:37:02 +0100
parents 4b1d8f367428
children 51db7fbc2e77
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed Mar 20 16:35:47 2013 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml	Wed Mar 20 16:37:02 2013 +0100
@@ -1260,7 +1260,7 @@
                   </dc:elements>
                 </dc:context>
               </dc:macro>
-              <dc:macro name="flood-map-hwslines">
+              <dc:macro name="hwslines">
                 <dc:context>
                   <dc:statement>
                     SELECT count(*) as km_exists, name as name
@@ -1269,7 +1269,24 @@
                    <dc:elements>
                     <dc:if test="$km_exists>0">
                       <line>
-                        <dc:attribute name="factory" value="wmslinefactory"/>
+                        <dc:attribute name="factory" value="wmshwslinesfactory"/>
+                        <dc:attribute name="ids" value="${river_id};${name}"/>
+                        <dc:attribute name="name" value="${name}"/>
+                      </line>
+                    </dc:if>
+                  </dc:elements>
+                </dc:context>
+              </dc:macro>
+              <dc:macro name="hwspoints">
+                <dc:context>
+                  <dc:statement>
+                    SELECT count(*) as km_exists, name as name
+                    FROM hws_points WHERE river_id = ${river_id} GROUP BY name
+                  </dc:statement>
+                   <dc:elements>
+                    <dc:if test="$km_exists>0">
+                      <line>
+                        <dc:attribute name="factory" value="wmshwspointsfactory"/>
                         <dc:attribute name="ids" value="${river_id};${name}"/>
                         <dc:attribute name="name" value="${name}"/>
                       </line>
@@ -1436,9 +1453,14 @@
                     <dc:call-macro name="flood-map-km"/>
                     <dc:call-macro name="flood-map-qps"/>
                   </kilometrage>
-                  <hwslines>
-                    <dc:call-macro name="flood-map-hwslines"/>
-                  </hwslines>
+                  <hws>
+                    <hws_lines>
+                      <dc:call-macro name="hwslines"/>
+                    </hws_lines>
+                    <hws_points>
+                      <dc:call-macro name="hwspoints"/>
+                    </hws_points>
+                  </hws>
                   <dc:call-macro name="flood-map-uesk"/>
                   <gaugelocations>
                     <dc:call-macro name="flood-map-gaugelocations"/>

http://dive4elements.wald.intevation.org