# HG changeset patch
# User Bjoern Schilberg <bjoern@intevation.de>
# Date 1316443011 0
# Node ID 63db3b08f3284900964c9b2a1a1d1e29c95efe6b
# Parent  47ecf98f09eb86c8479a05e6a58b1339ae042c47
Adjust wms saar styling in the flys karten-archive styling.


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

diff -r 47ecf98f09eb -r 63db3b08f328 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Sep 19 12:44:51 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Sep 19 14:36:51 2011 +0000
@@ -1,3 +1,12 @@
+2011-09-16  Bjoern Schilberg <bjoern.schilberg@intevation.de>
+
+	* doc/mapserver/fontset.txt:
+	  Added initial font set for km_annotation layer.
+	* doc/mapserver/symbols/symbols.sym:
+	  Added square symbol for km and fixpoint layer.
+	* doc/mapserver/saar-mapfile.map:
+	  Adjust styling in the flys karte-archiv way.
+
 2011-09-19  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java,
diff -r 47ecf98f09eb -r 63db3b08f328 flys-artifacts/doc/mapserver/fontset.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/doc/mapserver/fontset.txt	Mon Sep 19 14:36:51 2011 +0000
@@ -0,0 +1,5 @@
+# LiberationsSans weist eine metrische Identitaet zu Arial auf und ist unter
+# einer freien Lizenz (modifizierte GPL 2) verfuegbar.
+# Quelle: http://de.wikipedia.org/wiki/Arial
+
+LiberationSans-Italic /usr/share/fonts/truetype/LiberationSans-Italic.ttf
diff -r 47ecf98f09eb -r 63db3b08f328 flys-artifacts/doc/mapserver/saar-mapfile.map
--- a/flys-artifacts/doc/mapserver/saar-mapfile.map	Mon Sep 19 12:44:51 2011 +0000
+++ b/flys-artifacts/doc/mapserver/saar-mapfile.map	Mon Sep 19 14:36:51 2011 +0000
@@ -5,7 +5,7 @@
     MAXSIZE 4000
     EXTENT 2539488.036000 5450928.892000 2575486.407000 5507352.839000
     UNITS DD
-    #FONTSET "fontset.txt"
+    FONTSET "fontset.txt"
     SYMBOLSET './symbols/symbols.sym'
     IMAGECOLOR 255 255 255
     PROJECTION
@@ -66,13 +66,14 @@
         CLASS
             NAME "catchment"
             STYLE
-                SIZE 5
-                COLOR "#000000"
+                COLOR "#000080"
+                OUTLINECOLOR "#000000"
             END
         END
     END
     LAYER
         NAME km 
+	GROUP km
 	EXTENT 2539489.068000 5450953.000500 2575482.527500 5507278.634500
         DEBUG 0
 	DUMP TRUE
@@ -94,13 +95,46 @@
         CLASS
             NAME "km"
   	    STYLE
-             COLOR "#000000"
-	     OUTLINECOLOR 255 0 0
-  	     SYMBOL 'point'
-  	     SIZE 6
+             COLOR "#ff0000"
+  	     SYMBOL 'square'
+  	     SIZE 5
   	   END
         END
     END
+
+    LAYER
+	NAME km_annotation 
+	GROUP km
+	EXTENT 2539489.068000 5450953.000500 2575482.527500 5507278.634500
+        DEBUG 5
+	DUMP TRUE
+  
+        METADATA
+            "wms_title" "km_annotation"
+        END
+  	
+	TYPE ANNOTATION 
+  	STATUS ON 
+        INCLUDE "oracle_dbconnection.include"
+	DATA "GEOM FROM river_axes_km USING SRID 31466"
+        FILTER 'river_id=1'
+  	LABELITEM km
+
+        MAXSCALE 25000 
+
+  	CLASS 
+  	  LABEL 
+  	    ANGLE auto 
+  	    SIZE 10
+  	    COLOR "#000000" 
+  	    TYPE truetype 
+  	    FONT LiberationSans-Italic 
+	    POSITION ur
+	    OFFSET 2 2
+  	  END
+  	END 
+    END
+
     LAYER
         NAME buildings 
         EXTENT 2540544.253718 5456266.217464 2567747.834199 5502557.982120
@@ -123,9 +157,7 @@
         CLASS
             NAME "buildings"
             STYLE
-        	ANGLE 0
-        	COLOR 255 34 34
-        	OFFSET 0 0
+        	COLOR "#ff2222"
             END
         END
     END
@@ -151,9 +183,8 @@
         CLASS
             NAME "fixpoints"
   	    STYLE
-             COLOR "#000000"
-	     OUTLINECOLOR 255 0 0
-  	     SYMBOL 'point'
+             COLOR "#ffff00"
+  	     SYMBOL 'square'
   	     SIZE 6
   	   END
         END
@@ -180,9 +211,7 @@
         CLASS
             NAME "riveraxes"
             STYLE
-		 ANGLE 0
-       		 COLOR 0 42 140
-                 OFFSET 0 0
+       		 COLOR "#0000ff"
             END
         END
     END
@@ -206,12 +235,12 @@
             "init=epsg:31466"
         END
 
+	MAXSCALEDENOM 100000
+
         CLASS
             NAME "qps"
             STYLE
-		ANGLE 0
-        	COLOR 0 0 255
-        	OFFSET 0 0
+        	COLOR "#0000ff"
             END
         END
     END
@@ -238,9 +267,7 @@
         CLASS
             NAME "hws"
             STYLE
-        	ANGLE 0
-        	COLOR 255 34 34
-        	OFFSET 0 0
+        	COLOR "#ff2222" 
             END
         END
     END
@@ -266,8 +293,8 @@
         CLASS
             NAME "floodplain"
             STYLE
-                SIZE 5
-                COLOR "#000000"
+                COLOR "#800080"
+		OUTLINECOLOR "#000080"
             END
         END
     END
diff -r 47ecf98f09eb -r 63db3b08f328 flys-artifacts/doc/mapserver/symbols/symbols.sym
--- a/flys-artifacts/doc/mapserver/symbols/symbols.sym	Mon Sep 19 12:44:51 2011 +0000
+++ b/flys-artifacts/doc/mapserver/symbols/symbols.sym	Mon Sep 19 14:36:51 2011 +0000
@@ -7,4 +7,16 @@
   END
   FILLED TRUE
 END
+SYMBOL
+  NAME "square"
+  TYPE VECTOR
+  POINTS
+    0 0
+    0 1
+    1 1
+    1 0
+    0 0
+  END
+  FILLED TRUE
 END
+END