# HG changeset patch
# User Bjoern Schilberg <bjoern@intevation.de>
# Date 1299249152 -3600
# Node ID 281225579b44a38225ccf1ad8887f10a153ba651
# Parent  c52235937ab895e303e5bba23b018b9500ad8137
Modified line style CartographicLineSymbol mapfile testcases.

diff -r c52235937ab8 -r 281225579b44 ChangeLog
--- a/ChangeLog	Fri Mar 04 15:28:13 2011 +0100
+++ b/ChangeLog	Fri Mar 04 15:32:32 2011 +0100
@@ -1,3 +1,18 @@
+2011-03-04  Bjoern Schilberg  <bjoern.schilberg@intevation.de>
+
+	* M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.map,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.sym,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.map,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.sym,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.map,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.sym,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.map,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.sym,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.map,
+	  M mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.sym:
+
+	  Modified line style CartographicLineSymbol mapfile testcases.
+
 2011-03-04  Bjoern Schilberg  <bjoern.schilberg@intevation.de>
 
 	* M mxd/Styles/point/SimpleMarkerSymbol/p_single_4pt_c255-0-0.map,
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.map
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.map	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.map	Fri Mar 04 15:32:32 2011 +0100
@@ -1,6 +1,6 @@
 LAYER
 	NAME "l_cartoline_1pt_c255-255-255_butt-bever"
-	DATA "gewaesserlinien-joined"
+	DATA "gewaesserlinien"
 	TYPE LINE
 	GROUP "line"
 	STATUS ON
@@ -8,8 +8,13 @@
 		"wms_title"                     "l_cartoline_1pt_c255-255-255_butt-bever"
 	END
 	CLASS
-		SYMBOL "l_cartoline_1pt_c255-255-255_butt-bever"
-		COLOR 0 0 0
-		WIDTH 1
+		STYLE
+			SYMBOL "l_cartoline_1pt_c255-255-255_butt-bever"
+			LINECAP butt #[butt|round|square|triangle]
+  			LINEJOIN bevel #[round|miter|bevel]
+        	#LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+			COLOR 0 0 0
+			WIDTH 1
+		END
 	END
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.sym
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.sym	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-bever.sym	Fri Mar 04 15:32:32 2011 +0100
@@ -1,7 +1,6 @@
 SYMBOL
-  NAME "CartographicLine"
-  TYPE cartoline
-  LINECAP butt #[butt|round|square|triangle]
-  LINEJOIN bevel #[round|miter|bevel]
-  #LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+  NAME "l_cartoline_1pt_c255-255-255_butt-bever"
+  ## AGG library error. Cartoline drawing is deprecated with AGG
+  #TYPE CARTOLINE
+  TYPE SIMPLE
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.map
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.map	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.map	Fri Mar 04 15:32:32 2011 +0100
@@ -1,6 +1,6 @@
 LAYER
 	NAME "l_cartoline_1pt_c255-255-255_butt-miter"
-	DATA "gewaesserlinien-joined"
+	DATA "gewaesserlinien"
 	TYPE LINE
 	GROUP "line"
 	STATUS ON
@@ -8,8 +8,13 @@
 		"wms_title"                     "l_cartoline_1pt_c255-255-255_butt-miter"
 	END
 	CLASS
-		SYMBOL "l_cartoline_1pt_c255-255-255_butt-miter"
-		COLOR 0 0 0
-		WIDTH 1
+		STYLE
+			SYMBOL "l_cartoline_1pt_c255-255-255_butt-miter"
+			LINECAP butt #[butt|round|square|triangle]
+			LINEJOIN miter #[round|miter|bevel]
+			#LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+			COLOR 0 0 0
+			WIDTH 1
+		END
 	END
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.sym
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.sym	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-miter.sym	Fri Mar 04 15:32:32 2011 +0100
@@ -1,7 +1,6 @@
 SYMBOL
-  NAME "CartographicLine"
-  TYPE cartoline
-  LINECAP butt #[butt|round|square|triangle]
-  LINEJOIN miter #[round|miter|bevel]
-  #LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+  NAME "l_cartoline_1pt_c255-255-255_butt-miter"
+  ## AGG library error. Cartoline drawing is deprecated with AGG
+  #TYPE CARTOLINE
+  TYPE SIMPLE
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.map
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.map	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.map	Fri Mar 04 15:32:32 2011 +0100
@@ -1,6 +1,6 @@
 LAYER
 	NAME "l_cartoline_1pt_c255-255-255_butt-round"
-	DATA "gewaesserlinien-joined"
+	DATA "gewaesserlinien"
 	TYPE LINE
 	GROUP "line"
 	STATUS ON
@@ -8,8 +8,13 @@
 		"wms_title"                     "l_cartoline_1pt_c255-255-255_butt-round"
 	END
 	CLASS
-		SYMBOL "l_cartoline_1pt_c255-255-255_butt-round"
-		COLOR 0 0 0
-		WIDTH 1
+		STYLE
+			SYMBOL "l_cartoline_1pt_c255-255-255_butt-round"
+			LINECAP butt #[butt|round|square|triangle]
+			LINEJOIN round #[round|miter|bevel]
+			#LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+			COLOR 0 0 0
+			WIDTH 1
+		END
 	END
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.sym
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.sym	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_butt-round.sym	Fri Mar 04 15:32:32 2011 +0100
@@ -1,7 +1,6 @@
 SYMBOL
-  NAME "CartographicLine"
-  TYPE cartoline
-  LINECAP butt #[butt|round|square|triangle]
-  LINEJOIN round #[round|miter|bevel]
-  #LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+  NAME "l_cartoline_1pt_c255-255-255_butt-round"
+  ## AGG library error. Cartoline drawing is deprecated with AGG
+  #TYPE CARTOLINE
+  TYPE SIMPLE
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.map
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.map	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.map	Fri Mar 04 15:32:32 2011 +0100
@@ -1,6 +1,6 @@
 LAYER
 	NAME "l_cartoline_1pt_c255-255-255_round-butted"
-	DATA "gewaesserlinien-joined"
+	DATA "gewaesserlinien"
 	TYPE LINE
 	GROUP "line"
 	STATUS ON
@@ -8,8 +8,13 @@
 		"wms_title"                     "l_cartoline_1pt_c255-255-255_round-butted"
 	END
 	CLASS
-		SYMBOL "l_cartoline_1pt_c255-255-255_round-butted"
-		COLOR 0 0 0
-		WIDTH 1
+		STYLE
+			SYMBOL "l_cartoline_1pt_c255-255-255_round-butted"
+			LINECAP butt #[butt|round|square|triangle]
+			LINEJOIN round #[round|miter|bevel]
+			#LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+			COLOR 0 0 0
+			WIDTH 1
+		END
 	END
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.sym
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.sym	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_1pt_c255-255-255_round-butted.sym	Fri Mar 04 15:32:32 2011 +0100
@@ -1,7 +1,6 @@
 SYMBOL
-  NAME "CartographicLine"
-  TYPE cartoline
-  LINECAP butt #[butt|round|square|triangle]
-  LINEJOIN round #[round|miter|bevel]
-  #LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+  NAME "l_cartoline_1pt_c255-255-255_round-butted"
+  ## AGG library error. Cartoline drawing is deprecated with AGG
+  #TYPE CARTOLINE
+  TYPE SIMPLE
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.map
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.map	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.map	Fri Mar 04 15:32:32 2011 +0100
@@ -1,6 +1,6 @@
 LAYER
 	NAME "l_cartoline_6pt_c255-255-255_butt-round_template"
-	DATA "gewaesserlinien-joined"
+	DATA "gewaesserlinien"
 	TYPE LINE
 	GROUP "line"
 	STATUS ON
@@ -8,8 +8,14 @@
 		"wms_title"                     "l_cartoline_6pt_c255-255-255_butt-round_template"
 	END
 	CLASS
-		SYMBOL "l_cartoline_6pt_c255-255-255_butt-round_template"
-		COLOR 0 0 0
-		WIDTH 6
+		STYLE
+			SYMBOL "l_cartoline_6pt_c255-255-255_butt-round_template"
+			LINECAP butt #[butt|round|square|triangle]
+			LINEJOIN round #[round|miter|bevel]
+			#LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
+			PATTERN 1 1 END
+			COLOR 0 0 0
+			WIDTH 6
+		END
 	END
 END
diff -r c52235937ab8 -r 281225579b44 mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.sym
--- a/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.sym	Fri Mar 04 15:28:13 2011 +0100
+++ b/mxd/Styles/line/CartographicLineSymbol/l_cartoline_6pt_c255-255-255_butt-round_template.sym	Fri Mar 04 15:32:32 2011 +0100
@@ -1,8 +1,6 @@
 SYMBOL
-	NAME "CartographicLine"
-	TYPE cartoline
-	LINECAP butt #[butt|round|square|triangle]
-	LINEJOIN round #[round|miter|bevel]
-	#LINEJOINMAXSIZE 3 #only relevant for LINEJOIN type MITER
-	PATTERN 1 1 END
+	NAME "l_cartoline_6pt_c255-255-255_butt-round_template"
+	## AGG library error. Cartoline drawing is deprecated with AGG
+	#TYPE CARTOLINE
+	TYPE SIMPLE
 END