diff flys-artifacts/doc/conf/meta-data.xml @ 2671:055315495f8d

Modified floodmap specific datacage configuration and improved WMS catchment layer. flys-artifacts/trunk@4359 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 08 May 2012 12:14:55 +0000
parents b23c956c5aa2
children 5afccab9aac1
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml	Tue May 08 11:29:13 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Tue May 08 12:14:55 2012 +0000
@@ -624,14 +624,15 @@
               <dc:macro name="flood-map-catchments">
                 <dc:context>
                   <dc:statement>
-                    SELECT count(*) as km_exists
-                    FROM catchment WHERE river_id = ${river_id}
+                    SELECT count(*) as km_exists, name as name
+                    FROM catchment WHERE river_id = ${river_id} GROUP BY name
                   </dc:statement>
                    <dc:elements>
                     <dc:if test="$km_exists>0">
                       <catchments>
                         <dc:attribute name="factory" value="wmscatchmentfactory"/>
-                        <dc:attribute name="ids" value="${river_id}"/>
+                        <dc:attribute name="ids" value="${river_id};${name}"/>
+                        <dc:attribute name="name" value="${name}"/>
                       </catchments>
                     </dc:if>
                   </dc:elements>
@@ -796,13 +797,15 @@
                     <dc:call-macro name="flood-map-km"/>
                     <dc:call-macro name="flood-map-qps"/>
                     <dc:call-macro name="flood-map-hws"/>
-                    <dc:call-macro name="flood-map-catchments"/>
                     <dc:call-macro name="flood-map-floodplain"/>
                     <dc:call-macro name="flood-map-lines"/>
                     <dc:call-macro name="flood-map-buildings"/>
                     <dc:call-macro name="flood-map-fixpoints"/>
                   </kilometrage>
                   <dc:call-macro name="flood-map-uesk"/>
+                  <catchments>
+                    <dc:call-macro name="flood-map-catchments"/>
+                  </catchments>
                   <rastermap>
                       <background>
                           <dc:attribute name="factory" value="wmsbackground"/>

http://dive4elements.wald.intevation.org