[mapserver-commits] r10295 - trunk/msautotest/renderers
svn at osgeo.org
svn at osgeo.org
Thu Jul 8 03:48:48 EDT 2010
Author: tbonfort
Date: 2010-07-08 07:48:48 +0000 (Thu, 08 Jul 2010)
New Revision: 10295
Added:
trunk/msautotest/renderers/embed_legend.map
trunk/msautotest/renderers/embed_legend_rgba.map
trunk/msautotest/renderers/embed_legend_rgba_tr.map
trunk/msautotest/renderers/embed_legend_tr.map
trunk/msautotest/renderers/embed_sb_rgb.map
trunk/msautotest/renderers/embed_sb_rgb_tr.map
trunk/msautotest/renderers/plb_embed_legend.map
trunk/msautotest/renderers/plb_embed_legend_rgba.map
trunk/msautotest/renderers/plb_embed_legend_rgba_tr.map
trunk/msautotest/renderers/plb_embed_legend_tr.map
trunk/msautotest/renderers/point_pixmap_gif.map
trunk/msautotest/renderers/symbolset
trunk/msautotest/renderers/transparent_layer.map
Removed:
trunk/msautotest/renderers/legend.map
Modified:
trunk/msautotest/renderers/polygon-hatch.map
Log:
add tests
Copied: trunk/msautotest/renderers/embed_legend.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/embed_legend.map (rev 0)
+++ trunk/msautotest/renderers/embed_legend.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,55 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+imagecolor 255 200 0
+
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+ imagecolor 255 255 255
+ label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Copied: trunk/msautotest/renderers/embed_legend_rgba.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/embed_legend_rgba.map (rev 0)
+++ trunk/msautotest/renderers/embed_legend_rgba.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,55 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+
+transparent on
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+ label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+ imagecolor 255 255 255
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Copied: trunk/msautotest/renderers/embed_legend_rgba_tr.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/embed_legend_rgba_tr.map (rev 0)
+++ trunk/msautotest/renderers/embed_legend_rgba_tr.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,55 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+
+transparent on
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+ TRANSPARENT ON
+ label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Copied: trunk/msautotest/renderers/embed_legend_tr.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/embed_legend_tr.map (rev 0)
+++ trunk/msautotest/renderers/embed_legend_tr.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,54 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+imagecolor 255 200 0
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+ TRANSPARENT ON
+ label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Added: trunk/msautotest/renderers/embed_sb_rgb.map
===================================================================
--- trunk/msautotest/renderers/embed_sb_rgb.map (rev 0)
+++ trunk/msautotest/renderers/embed_sb_rgb.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,35 @@
+#
+# Test embedded scalebar ... without transparency to RGBA output file.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+EXTENT -180 -90 180 90
+SIZE 400 300
+IMAGECOLOR 255 200 0
+fontset "../misc/fonts.lst"
+
+TRANSPARENT OFF
+
+IMAGETYPE png
+
+SCALEBAR
+ TRANSPARENT OFF
+ LABEL
+ COLOR 0 0 0
+ size 9
+ type truetype
+ font "default"
+
+ END
+ SIZE 150 3
+ COLOR 0 0 0
+ BACKGROUNDCOLOR 255 255 255
+ OUTLINECOLOR 0 0 0
+ UNITS kilometers
+ INTERVALS 3
+ STATUS EMBED
+END
+
+END
Added: trunk/msautotest/renderers/embed_sb_rgb_tr.map
===================================================================
--- trunk/msautotest/renderers/embed_sb_rgb_tr.map (rev 0)
+++ trunk/msautotest/renderers/embed_sb_rgb_tr.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,33 @@
+#
+# Test embedded scalebar ... with transparency to RGBA output file.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+EXTENT -180 -90 180 90
+SIZE 400 300
+IMAGECOLOR 255 200 0
+fontset "../misc/fonts.lst"
+TRANSPARENT OFF
+
+IMAGETYPE png
+
+SCALEBAR
+ TRANSPARENT ON
+ LABEL
+ COLOR 0 0 0
+ size 9
+ type truetype
+ font "default"
+ END
+ SIZE 150 3
+ COLOR 0 0 0
+ BACKGROUNDCOLOR 255 255 255
+ OUTLINECOLOR 0 0 0
+ UNITS kilometers
+ INTERVALS 3
+ STATUS EMBED
+END
+
+END
Deleted: trunk/msautotest/renderers/legend.map
===================================================================
--- trunk/msautotest/renderers/legend.map 2010-07-08 07:47:25 UTC (rev 10294)
+++ trunk/msautotest/renderers/legend.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -1,54 +0,0 @@
-#
-# Simple test of embedded legend support.
-#
-# REQUIRES: OUTPUT=PNG
-#
-MAP
-
-STATUS ON
-EXTENT 478300 4762880 481650 4765610
-SIZE 400 300
-shapepath "../misc/data"
-IMAGETYPE png
-fontset "../misc/fonts.lst"
-
-LEGEND
- POSITION LR
- STATUS EMBED
- TRANSPARENT ON
- label
- type truetype
- color 0 0 0
- font "default"
- size 9
- end
- #postlabelcache true
-END
-
-LAYER
- NAME shppoly
- TYPE polygon
- DATA "shppoly/poly.shp"
- STATUS default
- CLASSITEM "AREA"
- CLASS
- NAME "Big"
- EXPRESSION ([AREA] >= 500000)
- COLOR 255 0 0
- OUTLINECOLOR 0 0 0
- END
- CLASS
- NAME "Medium"
- EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
- COLOR 0 255 0
- OUTLINECOLOR 0 0 0
- END
- CLASS
- NAME "Small"
- EXPRESSION ([AREA] < 100000)
- COLOR 0 0 255
- OUTLINECOLOR 0 0 0
- END
-END
-
-END
Copied: trunk/msautotest/renderers/plb_embed_legend.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/plb_embed_legend.map (rev 0)
+++ trunk/msautotest/renderers/plb_embed_legend.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,56 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+imagecolor 255 200 0
+
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+ imagecolor 255 255 255
+ label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+ postlabelcache true
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Copied: trunk/msautotest/renderers/plb_embed_legend_rgba.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/plb_embed_legend_rgba.map (rev 0)
+++ trunk/msautotest/renderers/plb_embed_legend_rgba.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,56 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+
+transparent on
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+ label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+ imagecolor 255 255 255
+ postlabelcache true
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Copied: trunk/msautotest/renderers/plb_embed_legend_rgba_tr.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/plb_embed_legend_rgba_tr.map (rev 0)
+++ trunk/msautotest/renderers/plb_embed_legend_rgba_tr.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,56 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+
+transparent on
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+postlabelcache true
+TRANSPARENT ON
+ label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Copied: trunk/msautotest/renderers/plb_embed_legend_tr.map (from rev 10240, trunk/msautotest/renderers/legend.map)
===================================================================
--- trunk/msautotest/renderers/plb_embed_legend_tr.map (rev 0)
+++ trunk/msautotest/renderers/plb_embed_legend_tr.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,55 @@
+#
+# Simple test of embedded legend support.
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 478300 4762880 481650 4765610
+SIZE 400 300
+shapepath "../misc/data"
+IMAGETYPE png
+fontset "../misc/fonts.lst"
+imagecolor 255 200 0
+
+LEGEND
+ POSITION LR
+ STATUS EMBED
+ TRANSPARENT ON
+postlabelcache true
+label
+ type truetype
+ color 0 0 0
+ font "default"
+ size 9
+ end
+END
+
+LAYER
+ NAME shppoly
+ TYPE polygon
+ DATA "shppoly/poly.shp"
+ STATUS default
+ CLASSITEM "AREA"
+ CLASS
+ NAME "Big"
+ EXPRESSION ([AREA] >= 500000)
+ COLOR 255 0 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Medium"
+ EXPRESSION ([AREA] >= 100000 and [AREA] < 500000)
+ COLOR 0 255 0
+ OUTLINECOLOR 0 0 0
+ END
+ CLASS
+ NAME "Small"
+ EXPRESSION ([AREA] < 100000)
+ COLOR 0 0 255
+ OUTLINECOLOR 0 0 0
+ END
+END
+
+END
Copied: trunk/msautotest/renderers/point_pixmap_gif.map (from rev 10240, trunk/msautotest/renderers/point_pixmap.map)
===================================================================
--- trunk/msautotest/renderers/point_pixmap_gif.map (rev 0)
+++ trunk/msautotest/renderers/point_pixmap_gif.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,71 @@
+#
+# entity-encoded text rendering test.
+# this test may potentially segfault
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT 0 0 400 300
+SIZE 400 300
+FONTSET "../misc/fonts.lst"
+IMAGETYPE png24
+symbolset "symbolset"
+imagecolor 255 200 0
+CONFIG MS_ERRORFILE "stderr"
+DEBUG ON
+
+LAYER
+ NAME "symbol"
+ TYPE point
+ STATUS default
+ CLASS
+ NAME "test1"
+ STYLE
+ SYMBOL "gdalicongif"
+ END
+ END
+ FEATURE
+ POINTS
+ 50 50
+ END
+ END
+END
+
+LAYER
+ NAME "symbol rotated"
+ TYPE point
+ STATUS default
+ CLASS
+ NAME "test1"
+ STYLE
+ SYMBOL "gdalicongif"
+ SIZE 55
+ ANGLE 45
+ END
+ END
+ FEATURE
+ POINTS
+ 200 200
+ END
+ END
+END
+
+LAYER
+ NAME "anchors"
+ TYPE POINT
+ STATUS default
+ CLASS
+ STYLE
+ COLOR 255 0 0
+ SIZE 8
+ WIDTH 1
+ SYMBOL "circle"
+ END
+ END
+ FEATURE POINTS 50 50 END END
+ FEATURE POINTS 200 200 END END
+END
+
+END
Modified: trunk/msautotest/renderers/polygon-hatch.map
===================================================================
--- trunk/msautotest/renderers/polygon-hatch.map 2010-07-08 07:47:25 UTC (rev 10294)
+++ trunk/msautotest/renderers/polygon-hatch.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -38,7 +38,7 @@
COLOR 180 180 180
symbol "hatch"
SIZE 20
- WIDTH 10
+ WIDTH 14
ANGLE 45
END
END
Added: trunk/msautotest/renderers/symbolset
===================================================================
--- trunk/msautotest/renderers/symbolset (rev 0)
+++ trunk/msautotest/renderers/symbolset 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,49 @@
+symbolset
+
+symbol
+ name "circle"
+ type ellipse
+ points 1 1 end
+ filled true
+end
+
+symbol
+ name "ellipse"
+ type ellipse
+ points 2 1 end
+ filled true
+end
+
+symbol
+ name "vector arrow"
+ type vector
+ points
+ 0 1
+ 3 1
+ -99 -99
+ 2 0
+ 3 1
+ 2 2
+ end
+end
+
+symbol
+ name "ttf"
+ type truetype
+ font "default"
+ character "A"
+end
+
+symbol
+ name "gdalicon"
+ type pixmap
+ image "../misc/data/gdalicon.png"
+end
+symbol
+ name "gdalicongif"
+ type pixmap
+ image "../misc/data/gdalicon.gif"
+end
+
+
+end
Added: trunk/msautotest/renderers/transparent_layer.map
===================================================================
--- trunk/msautotest/renderers/transparent_layer.map (rev 0)
+++ trunk/msautotest/renderers/transparent_layer.map 2010-07-08 07:48:48 UTC (rev 10295)
@@ -0,0 +1,60 @@
+#
+# entity-encoded text rendering test.
+# this test may potentially segfault
+#
+# REQUIRES: OUTPUT=PNG
+#
+MAP
+
+STATUS ON
+EXTENT -125.549477 -69.508628 101.670954 15.840339
+SIZE 400 300
+FONTSET "../misc/fonts.lst"
+IMAGETYPE png24
+symbolset "symbolset"
+shapepath "../misc/data"
+
+CONFIG MS_ERRORFILE "stderr"
+
+
+DEBUG ON
+
+SYMBOL
+ name "hatch"
+ type hatch
+end
+
+LAYER
+ NAME "world"
+ TYPE polygon
+ STATUS on
+ DATA "world_testpoly"
+ CLASS
+ NAME "test1"
+ STYLE
+ COLOR 180 0 0
+ END
+ END
+END
+
+LAYER
+ NAME "world2"
+ TYPE polygon
+ STATUS on
+ DATA "world_testpoly"
+ OPACITY 50
+ CLASS
+ NAME "test1"
+ STYLE
+ COLOR 0 0 0
+ symbol "hatch"
+ SIZE 20
+ WIDTH 14
+ ANGLE 45
+ END
+ END
+END
+
+END
+
+END
More information about the mapserver-commits
mailing list