From 399d56e2fc51ab9c938306769fc8161f16e7cedb Mon Sep 17 00:00:00 2001 From: fdesj Date: Fri, 30 Aug 2013 01:56:08 +0400 Subject: [PATCH 1/2] utfgrid test for line and polygons --- renderers/expected/line_simple.json | 1 + renderers/expected/polygon-simple.json | 1 + renderers/line_simple.map | 1 + renderers/polygon-simple.map | 1 + 4 files changed, 4 insertions(+) create mode 100644 renderers/expected/line_simple.json create mode 100644 renderers/expected/polygon-simple.json diff --git a/renderers/expected/line_simple.json b/renderers/expected/line_simple.json new file mode 100644 index 00000000..0e4b70d6 --- /dev/null +++ b/renderers/expected/line_simple.json @@ -0,0 +1 @@ +{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !!!!!!!!! "," !!!!!!!!!!!! !! "," !!!!!!!!!!!! !!! "," !!!!!!! !!! "," ! !!! "," ! !!! "," !! !! "," !! $ "," ! $$$$$ "," ! $$$ $$$ ! "," !! $$$ $$$ !! "," !! $$$ !! ## "," ! $$ !! ### "," !! $$$ ! ### "," !! $$$ ! #### "," ! $$$ ! ### "," ! $$$ ! ## "," !! $$$ ! ## "," !! $$$ ! ### "," ! $$$ !! ## ","!! $$ !! ## #","!! $$$ !! ## ##","! $$$ !!! ## ##","! $$ !!!!! ## ## ","! !!!!! #### ## ","!!! !!!!! ####### ## "," !!!! !!!!! ### ## "," !!!! !!!!! ## ## "," !!!! !!!!! ## ## "," !!!! !!!!! ### # "," !!!! !!!!! ####### # "," !!!!!! ####### # "," #### "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "],"keys":["","1","2","3"],"data":{}} \ No newline at end of file diff --git a/renderers/expected/polygon-simple.json b/renderers/expected/polygon-simple.json new file mode 100644 index 00000000..31473a0a --- /dev/null +++ b/renderers/expected/polygon-simple.json @@ -0,0 +1 @@ +{"grid":[" "," "," "," "," "," "," "," "," "," #### "," ######### "," ########## "," $$$$ ######## "," $$$$$$$$$$ !! ###### "," $$$$$$$$$$$$$$ !!!!! ############ "," $$$$$$$$$$$$$$ !!!! ################"," $$$$$$$$$$$$$ !!!! "," $$$$$$$$$$ ! "," $$$$$$$$ "," $$$$$ "," $$$ %%%%%%% "," %%%%%%%%%%%%%% "," %%%%%%%%%%%%%%%%%%%%%% "," %%%%%%%%%%%%%% %%%%%%%%%%%% ","%%%%%%%%%%%%%%%%%%%%%%%%%% "," %%%%%%%%%%%%%%%%%%%%% "," %%%%%%%%%%%%%% "," %%%%%%% "," "," "," "," "," "," "," "," "," "],"keys":["","1","2","3","4"],"data":{}} \ No newline at end of file diff --git a/renderers/line_simple.map b/renderers/line_simple.map index 90fd6d30..660fbaa6 100644 --- a/renderers/line_simple.map +++ b/renderers/line_simple.map @@ -4,6 +4,7 @@ # RUN_PARMS: line_simple.svg [SHP2IMG] -m [MAPFILE] -i svg -o [RESULT] # RUN_PARMS: line_simple.cairo.png [SHP2IMG] -m [MAPFILE] -i cairopng -o [RESULT] # RUN_PARMS: line_simple.cairo.jpg [SHP2IMG] -m [MAPFILE] -i cairojpeg -o [RESULT] +# RUN_PARMS: line_simple.json [SHP2IMG] -m [MAPFILE] -i json -o [RESULT] # map diff --git a/renderers/polygon-simple.map b/renderers/polygon-simple.map index 200bacb9..fbfe5364 100644 --- a/renderers/polygon-simple.map +++ b/renderers/polygon-simple.map @@ -3,6 +3,7 @@ # RUN_PARMS: polygon-simple.pdf [SHP2IMG] -m [MAPFILE] -i pdf -o [RESULT] # RUN_PARMS: polygon-simple.svg [SHP2IMG] -m [MAPFILE] -i svg -o [RESULT] # RUN_PARMS: polygon-simple.cairo.png [SHP2IMG] -m [MAPFILE] -i cairopng -o [RESULT] +# RUN_PARMS: polygon-simple.json [SHP2IMG] -m [MAPFILE] -i json -o [RESULT] # # # entity-encoded text rendering test. From 584fcd1c1fee3d0d5d7767c1c45283775229d3c1 Mon Sep 17 00:00:00 2001 From: fdesj Date: Fri, 30 Aug 2013 17:33:51 +0400 Subject: [PATCH 2/2] added utfgrid symbols tests --- renderers/expected/point_ellipse_utfgrid.json | 1 + renderers/expected/point_pixmap_utfgrid.json | 1 + renderers/expected/point_vector_utfgrid.json | 1 + renderers/point_ellipse_utfgrid.map | 37 +++++++++++++++++++ renderers/point_pixmap_utfgrid.map | 35 ++++++++++++++++++ renderers/point_vector_utfgrid.map | 35 ++++++++++++++++++ 6 files changed, 110 insertions(+) create mode 100644 renderers/expected/point_ellipse_utfgrid.json create mode 100644 renderers/expected/point_pixmap_utfgrid.json create mode 100644 renderers/expected/point_vector_utfgrid.json create mode 100644 renderers/point_ellipse_utfgrid.map create mode 100644 renderers/point_pixmap_utfgrid.map create mode 100644 renderers/point_vector_utfgrid.map diff --git a/renderers/expected/point_ellipse_utfgrid.json b/renderers/expected/point_ellipse_utfgrid.json new file mode 100644 index 00000000..16c1ec57 --- /dev/null +++ b/renderers/expected/point_ellipse_utfgrid.json @@ -0,0 +1 @@ +{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !!!!!! "," !!!!!!!!!! "," !!!!!!!!!!! "," !!!!!!!!!!! "," !!!!!!!!!! "," !!!!!!! "," "," "," "],"keys":["","1"],"data":{}} \ No newline at end of file diff --git a/renderers/expected/point_pixmap_utfgrid.json b/renderers/expected/point_pixmap_utfgrid.json new file mode 100644 index 00000000..a610c527 --- /dev/null +++ b/renderers/expected/point_pixmap_utfgrid.json @@ -0,0 +1 @@ +{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !!!!!!!!! "," !!!!!!!!! "," !!!!!!!!! "," !!!!!!!!! "," !!!!!!!!! "," !!!!!!!!! "," !!!!!!!!! "," !!!!!!!!! "," !!!!!!!!! "," "],"keys":["","1"],"data":{}} \ No newline at end of file diff --git a/renderers/expected/point_vector_utfgrid.json b/renderers/expected/point_vector_utfgrid.json new file mode 100644 index 00000000..489a135d --- /dev/null +++ b/renderers/expected/point_vector_utfgrid.json @@ -0,0 +1 @@ +{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !! "," !! "," "," "," "," "," "],"keys":["","1"],"data":{}} \ No newline at end of file diff --git a/renderers/point_ellipse_utfgrid.map b/renderers/point_ellipse_utfgrid.map new file mode 100644 index 00000000..b28ab0a4 --- /dev/null +++ b/renderers/point_ellipse_utfgrid.map @@ -0,0 +1,37 @@ +# RUN_PARMS: point_ellipse_utfgrid.json [SHP2IMG] -m [MAPFILE] -i json -o [RESULT] +# +# entity-encoded text rendering test. +# this test may potentially segfault +# +# +MAP + +STATUS ON +EXTENT 0 0 400 300 +SIZE 200 150 +FONTSET "../misc/fonts.lst" +IMAGETYPE png24 +symbolset "symbolset" + +CONFIG MS_ERRORFILE "stderr" + +LAYER + NAME "symbol" + TYPE point + STATUS default + CLASS + NAME "test1" + STYLE + SYMBOL "ellipse" + COLOR 0 0 255 + SIZE 20 + END + END + FEATURE + POINTS + 50 50 + END + END +END + +END diff --git a/renderers/point_pixmap_utfgrid.map b/renderers/point_pixmap_utfgrid.map new file mode 100644 index 00000000..6159839d --- /dev/null +++ b/renderers/point_pixmap_utfgrid.map @@ -0,0 +1,35 @@ +# RUN_PARMS: point_pixmap_utfgrid.json [SHP2IMG] -m [MAPFILE] -i json -o [RESULT] +# +# +# entity-encoded text rendering test. +# this test may potentially segfault +# +MAP + +STATUS ON +EXTENT 0 0 400 300 +SIZE 200 150 +FONTSET "../misc/fonts.lst" +IMAGETYPE png24 +symbolset "symbolset" + +CONFIG MS_ERRORFILE "stderr" + +LAYER + NAME "symbol" + TYPE point + STATUS default + CLASS + NAME "test1" + STYLE + SYMBOL "gdalicon" + END + END + FEATURE + POINTS + 50 50 + END + END +END + +END diff --git a/renderers/point_vector_utfgrid.map b/renderers/point_vector_utfgrid.map new file mode 100644 index 00000000..95e0305f --- /dev/null +++ b/renderers/point_vector_utfgrid.map @@ -0,0 +1,35 @@ +# RUN_PARMS: point_vector_utfgrid.json [SHP2IMG] -m [MAPFILE] -i json -o [RESULT] +# +# +# entity-encoded text rendering test. +# this test may potentially segfault +# +MAP + +STATUS ON +EXTENT 0 0 400 300 +SIZE 200 150 +FONTSET "../misc/fonts.lst" +IMAGETYPE png24 +symbolset "symbolset" + +LAYER + NAME "symbol" + TYPE point + STATUS default + CLASS + NAME "test1" + STYLE + SYMBOL "vector arrow" + COLOR 0 0 0 + SIZE 5 + END + END + FEATURE + POINTS + 50 50 + END + END +END + +END