[Dive4elements-commits] [PATCH 2 of 2] Move floodplain into its own directory and reindent

Wald Commits scm-commit at wald.intevation.org
Tue Apr 9 17:59:29 CEST 2013


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1365523154 -7200
# Node ID 51208225eb41d4ca6e3d3bcabe70fbddb7cd9527
# Parent  d03171f6651190fa9718eedea372c4e045bcf737
Move floodplain into its own directory and reindent

diff -r d03171f66511 -r 51208225eb41 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Tue Apr 09 17:32:01 2013 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Tue Apr 09 17:59:14 2013 +0200
@@ -1193,45 +1193,47 @@
           </dc:macro>
 
           <dc:macro name="flood-map-floodplain">
-            <dc:context>
-              <dc:statement>
-                SELECT DISTINCT
-                fp.kind_id AS kind_id,
-                flk.name AS kind_name
-                FROM floodplain fp
-                JOIN floodplain_kinds flk on fp.kind_id = flk.id
-                WHERE river_id = ${river_id}
-                AND kind_id=1
-              </dc:statement>
-              <dc:if test="dc:has-result()">
-                <dc:for-each>
-                  <floody factory="wmsfloodplainfactory"
-                          description="{$kind_name}"
-                          ids="{$river_id};{$kind_name};{$kind_id}"/>
-                </dc:for-each>
-              </dc:if>
-            </dc:context>
-            <dc:context>
-              <dc:statement>
-                SELECT DISTINCT
-                flk.name AS kind_name,
-                fp.kind_id AS kind_id,
-                fp.name AS layer_name
-                FROM floodplain fp
-                JOIN floodplain_kinds flk on fp.kind_id = flk.id
-                WHERE river_id = ${river_id}
-                AND kind_id <> 1
-              </dc:statement>
-              <dc:if test="dc:has-result()">
-                <other>
+            <floodplain>
+              <dc:context>
+                <dc:statement>
+                  SELECT DISTINCT
+                  fp.kind_id AS kind_id,
+                  flk.name AS kind_name
+                  FROM floodplain fp
+                  JOIN floodplain_kinds flk on fp.kind_id = flk.id
+                  WHERE river_id = ${river_id}
+                  AND kind_id=1
+                </dc:statement>
+                <dc:if test="dc:has-result()">
                   <dc:for-each>
                     <floody factory="wmsfloodplainfactory"
-                            description="{$layer_name}"
-                            ids="{$river_id};{$layer_name};{$kind_id}"/>
+                      description="{$kind_name}"
+                      ids="{$river_id};{$kind_name};{$kind_id}"/>
                   </dc:for-each>
-                </other>
-              </dc:if>
-            </dc:context>
+                </dc:if>
+              </dc:context>
+              <dc:context>
+                <dc:statement>
+                  SELECT DISTINCT
+                  flk.name AS kind_name,
+                  fp.kind_id AS kind_id,
+                  fp.name AS layer_name
+                  FROM floodplain fp
+                  JOIN floodplain_kinds flk on fp.kind_id = flk.id
+                  WHERE river_id = ${river_id}
+                  AND kind_id <> 1
+                </dc:statement>
+                <dc:if test="dc:has-result()">
+                  <other>
+                    <dc:for-each>
+                      <floody factory="wmsfloodplainfactory"
+                        description="{$layer_name}"
+                        ids="{$river_id};{$layer_name};{$kind_id}"/>
+                    </dc:for-each>
+                  </other>
+                </dc:if>
+              </dc:context>
+            </floodplain>
           </dc:macro>
 
           <dc:macro name="hwslines_by_kind">


More information about the Dive4elements-commits mailing list