changeset 2773:ea03f26a7d50

Added concrete themes for maps. flys-artifacts/trunk@4512 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Fri, 25 May 2012 08:57:14 +0000
parents 5e8e42a36a90
children b2727413fae2
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/themes.xml
diffstat 2 files changed, 195 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri May 25 07:49:11 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri May 25 08:57:14 2012 +0000
@@ -1,3 +1,8 @@
+2012-05-25  Raimund Renkert <raimund.renkert@intevation.de>
+
+	* doc/conf/themes.xml:
+	  Added concrete themes for maps.
+
 2012-05-25	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/XYChartGenerator.java:
--- a/flys-artifacts/doc/conf/themes.xml	Fri May 25 07:49:11 2012 +0000
+++ b/flys-artifacts/doc/conf/themes.xml	Fri May 25 08:57:14 2012 +0000
@@ -780,6 +780,95 @@
                 <inherit from="Areas"/>
             </inherits>
         </theme>
+
+        <!-- Map -->
+        <theme name="Floodmaps">
+            <inherits>
+                <inherit from="Floodmap"/>
+            </inherits>
+        </theme>
+
+        <theme name="Floodplains">
+            <inherits>
+                <inherit from="Floodplain"/>
+            </inherits>
+        </theme>
+
+        <theme name="WSPLGEN">
+            <inherits>
+                <inherit from="WSPLGENS"/>
+            </inherits>
+        </theme>
+
+        <theme name="RiverAxis">
+            <inherits>
+                <inherit from="RiverAxes"/>
+            </inherits>
+        </theme>
+
+        <theme name="Kms">
+            <inherits>
+                <inherit from="Km"/>
+            </inherits>
+        </theme>
+
+
+        <theme name="Fixpoints">
+            <inherits>
+                <inherit from="Fixpoint"/>
+            </inherits>
+        </theme>
+
+
+        <theme name="GaugeLocation">
+            <inherits>
+                <inherit from="GaugeLocations"/>
+            </inherits>
+        </theme>
+
+
+        <theme name="Qps">
+            <inherits>
+                <inherit from="Qp"/>
+            </inherits>
+        </theme>
+
+        <theme name="Hws">
+            <inherits>
+                <inherit from="Hw"/>
+            </inherits>
+        </theme>
+
+        <theme name="Catchment">
+            <inherits>
+                <inherit from="Catchments"/>
+            </inherits>
+        </theme>
+
+        <theme name="FloodmapLines">
+            <inherits>
+                <inherit from="FloodmapLine"/>
+            </inherits>
+        </theme>
+
+        <theme name="Buildings">
+            <inherits>
+                <inherit from="Building"/>
+            </inherits>
+        </theme>
+
+        <theme name="HydrBoundariesLines">
+            <inherits>
+                <inherit from="HydrBoundariesLine"/>
+            </inherits>
+        </theme>
+
+        <theme name="HydrBoundariesPolys">
+            <inherits>
+                <inherit from="HydrBoundariesPoly"/>
+            </inherits>
+        </theme>
+
     </themegroup>
 
     <themegroup name="default-2">
@@ -1550,6 +1639,93 @@
                 <inherit from="Areas"/>
             </inherits>
         </theme>
+
+        <!-- Map -->
+        <theme name="Floodmaps">
+            <inherits>
+                <inherit from="Floodmap"/>
+            </inherits>
+        </theme>
+
+        <theme name="Floodplains">
+            <inherits>
+                <inherit from="Floodplain"/>
+            </inherits>
+        </theme>
+
+        <theme name="WSPLGEN">
+            <inherits>
+                <inherit from="WSPLGENS"/>
+            </inherits>
+        </theme>
+
+        <theme name="RiverAxis">
+            <inherits>
+                <inherit from="RiverAxes"/>
+            </inherits>
+        </theme>
+
+        <theme name="Kms">
+            <inherits>
+                <inherit from="Km"/>
+            </inherits>
+        </theme>
+
+
+        <theme name="Fixpoints">
+            <inherits>
+                <inherit from="Fixpoint"/>
+            </inherits>
+        </theme>
+
+        <theme name="GaugeLocation">
+            <inherits>
+                <inherit from="GaugeLocations"/>
+            </inherits>
+        </theme>
+
+        <theme name="Qps">
+            <inherits>
+                <inherit from="Qp"/>
+            </inherits>
+        </theme>
+
+        <theme name="Hws">
+            <inherits>
+                <inherit from="Hw"/>
+            </inherits>
+        </theme>
+
+        <theme name="Catchment">
+            <inherits>
+                <inherit from="Catchments"/>
+            </inherits>
+        </theme>
+
+        <theme name="FloodmapLines">
+            <inherits>
+                <inherit from="FloodmapLine"/>
+            </inherits>
+        </theme>
+
+        <theme name="Buildings">
+            <inherits>
+                <inherit from="Building"/>
+            </inherits>
+        </theme>
+
+        <theme name="HydrBoundariesLines">
+            <inherits>
+                <inherit from="HydrBoundariesLine"/>
+            </inherits>
+        </theme>
+
+        <theme name="HydrBoundariesPolys">
+            <inherits>
+                <inherit from="HydrBoundariesPoly"/>
+            </inherits>
+        </theme>
+
     </themegroup>
 
     <!-- Virtual themes are following now! -->
@@ -1646,7 +1822,7 @@
 
 
         <!-- MAP relevant themes -->
-        <theme name="WSPLGEN">
+        <theme name="WSPLGENS">
             <fields>
                 <field name="wsplgen_cat1" type="Color" display="Hintergrund" default="178, 201, 215"/>
                 <field name="wsplgen_cat2" type="Color" display="Hintergrund" default="111, 147, 170"/>
@@ -1656,14 +1832,14 @@
             </fields>
         </theme>
 
-        <theme name="RiverAxis">
+        <theme name="RiverAxes">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 205"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="3" hints="h"/>
             </fields>
         </theme>
 
-        <theme name="Kms">
+        <theme name="Km">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="5" hints="h"/>
@@ -1673,7 +1849,7 @@
             </fields>
         </theme>
 
-        <theme name="Fixpoints">
+        <theme name="Fixpoint">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="3" hints="h"/>
@@ -1681,7 +1857,7 @@
             </fields>
         </theme>
 
-        <theme name="Floodmaps">
+        <theme name="Floodmap">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="1" hints="h"/>
@@ -1689,7 +1865,7 @@
             </fields>
         </theme>
 
-        <theme name="GaugeLocation">
+        <theme name="GaugeLocations">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="1" hints="h"/>
@@ -1697,21 +1873,21 @@
             </fields>
         </theme>
 
-        <theme name="Qps">
+        <theme name="Qp">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="3" hints="h"/>
             </fields>
         </theme>
 
-        <theme name="Hws">
+        <theme name="Hw">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="3" hints="h"/>
             </fields>
         </theme>
 
-        <theme name="Catchment">
+        <theme name="Catchments">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="1" hints="h"/>
@@ -1727,28 +1903,28 @@
             </fields>
         </theme>
 
-        <theme name="FloodmapLines">
+        <theme name="FloodmapLine">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="3" hints="h"/>
             </fields>
         </theme>
 
-        <theme name="Buildings">
+        <theme name="Building">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="5" hints="h"/>
             </fields>
         </theme>
 
-        <theme name="HydrBoundariesLines">
+        <theme name="HydrBoundariesLine">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="5" hints="h"/>
             </fields>
         </theme>
 
-        <theme name="HydrBoundariesPolys">
+        <theme name="HydrBoundariesPoly">
             <fields>
                 <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/>
                 <field name="linesize"  type="int"   display="Liniendicke" default="5" hints="h"/>
@@ -1905,7 +2081,7 @@
         <mapping from="floodmap.hydr_boundaries" to="HydrBoundariesLines"/>
         <mapping from="floodmap.hydr_boundaries_poly" to="HydrBoundariesPolys"/>
         <mapping from="floodmap.catchment" to="Catchment"/>
-        <mapping from="floodmap.floodplain" to="Floodplain"/>
+        <mapping from="floodmap.floodplain" to="Floodplains"/>
         <mapping from="floodmap.lines" to="FloodmapLines"/>
         <mapping from="floodmap.buildings" to="Buildings"/>
         <mapping from="floodmap.fixpoints" to="Fixpoints"/>

http://dive4elements.wald.intevation.org