# HG changeset patch
# User Raimund Renkert <raimund.renkert@intevation.de>
# Date 1326292370 0
# Node ID 2f5cb58e662e3ccb2dfdb7102b88640ffb292529
# Parent  925c88ecb8420eab2c8d0431091b0e6a99bca0df
Introduced new output type 'map'.



flys-artifacts/trunk@3654 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 925c88ecb842 -r 2f5cb58e662e flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Jan 11 14:13:11 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Jan 11 14:32:50 2012 +0000
@@ -1,3 +1,14 @@
+2012-01-11  Raimund Renkert <raimund.renkert@intevation.de>
+
+	* doc/conf/conf.xml:
+	  Added output generator for output type 'map'.
+
+	* doc/conf/artifacts/map.xml:
+	  Changed output name to 'map'.
+
+	* doc/conf/meta-data.xml:
+	  Added new output type 'map'.
+
 2011-01-11	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Fix flys/issue446 (Dauerline/Abflusskurve am Pegel: Eigenschaften vom
diff -r 925c88ecb842 -r 2f5cb58e662e flys-artifacts/doc/conf/artifacts/map.xml
--- a/flys-artifacts/doc/conf/artifacts/map.xml	Wed Jan 11 14:13:11 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/map.xml	Wed Jan 11 14:32:50 2012 +0000
@@ -12,7 +12,7 @@
 
          <state id="state.map.new" description="state.map.new" state="de.intevation.flys.artifacts.MapArtifact$MapState">
             <outputmodes>
-                <outputmode name="floodmap" description="output.uesk.map.description" type="map">
+                <outputmode name="map" description="output.uesk.map.description" type="map">
                     <facets>
                         <facet name="floodmap.wsplgen"/>
                         <facet name="floodmap.barriers"/>
diff -r 925c88ecb842 -r 2f5cb58e662e flys-artifacts/doc/conf/conf.xml
--- a/flys-artifacts/doc/conf/conf.xml	Wed Jan 11 14:13:11 2012 +0000
+++ b/flys-artifacts/doc/conf/conf.xml	Wed Jan 11 14:32:50 2012 +0000
@@ -160,6 +160,7 @@
         <output-generator name="w_differences_chartinfo">de.intevation.flys.exports.WDifferencesCurveInfoGenerator</output-generator>
         <output-generator name="w_differences_export">de.intevation.flys.exports.WDifferencesExporter</output-generator>
         <output-generator name="floodmap">de.intevation.flys.exports.MapGenerator</output-generator>
+        <output-generator name="map">de.intevation.flys.exports.MapGenerator</output-generator>
         <!-- Error report generators. -->
         <output-generator name="discharge_longitudinal_section_report">de.intevation.flys.exports.ReportGenerator</output-generator>
         <output-generator name="waterlevel_report">de.intevation.flys.exports.ReportGenerator</output-generator>
diff -r 925c88ecb842 -r 2f5cb58e662e flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed Jan 11 14:13:11 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Wed Jan 11 14:32:50 2012 +0000
@@ -475,6 +475,17 @@
                 <dc:call-macro name="annotations"/>
               </longitudinal-section>
           </dc:if>
+          <dc:if test="dc:contains($artifact-outs, 'map')">
+              <map>
+              <dc:choose>
+                  <dc:when test="dc:contains($parameters, 'recommended')">
+                  </dc:when>
+                  <dc:otherwise>
+                      <dc:call-macro name="flood-map-complete"/>
+                  </dc:otherwise>
+              </dc:choose>
+              </map>
+          </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'floodmap')">
               <floodmap>
               <dc:choose>