diff gnv-artifacts/doc/conf/conf.xml @ 625:40ead2d2a08d

Restructured configuration, removed duplicated entry and store config information in MapfileGenerator to avoid reading config file every time while updating mapfile. gnv-artifacts/trunk@697 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 22 Feb 2010 11:29:34 +0000
parents 6a3a1da5e680
children c8749d83d9b6
line wrap: on
line diff
--- a/gnv-artifacts/doc/conf/conf.xml	Mon Feb 22 10:43:25 2010 +0000
+++ b/gnv-artifacts/doc/conf/conf.xml	Mon Feb 22 11:29:34 2010 +0000
@@ -461,7 +461,6 @@
             <samples number="1024"/>
             <extrapolation rounds="0"/>
             <ground interpolation="bilinear" />
-            <result-shapefile-directory path="${artifacts.config.dir}/../shapefiles/"/>
         </horizontal-cross-section>
 
         <vertical-cross-section>
@@ -476,6 +475,19 @@
             </filters>
             -->
         </vertical-cross-section>
+
+        <!-- The target directory for shapefiles -->
+        <shapefile-directory path="${artifacts.config.dir}/../shapefiles/" />
+
+        <!-- In this section the required Configuration for mapfile generation is
+             given. -->
+        <map-generator>
+            <mapfile path="/opt/artifacts/mapfiles/mapfile.map" />
+            <templates>
+                <path>${artifacts.config.dir}/maptemplates</path>
+                <maptemplate>mapfile.vm</maptemplate>
+            </templates>
+        </map-generator>
     </gnv>
 
     <velocity>
@@ -514,17 +526,4 @@
         <sql></sql> -->
     </database>
 
-    <!-- In this section the required Configuration for mapfile generation is
-         given. -->
-    <map-generator>
-        <mapfile>
-            <name>mapfile.map</name>
-            <path>/opt/artifacts/mapfiles</path>
-            <shapefiles>/opt/artifacts/shapefiles</shapefiles>
-        </mapfile>
-        <templates>
-            <path>/opt/artifacts/conf/maptemplates</path>
-            <maptemplate>mapfile.vm</maptemplate>
-        </templates>
-    </map-generator>
 </artifact-database>

http://dive4elements.wald.intevation.org