From f905632b920b130bfe19dd72d81882c10e1db179 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 11 Mar 2013 15:09:04 -0700
Subject: [PATCH] visual testcase for #1744

---
 tests/data/svg/rect2.svg                      |  39 ++++++++++++
 ...vg-opacity-500-100-1.0-grid-reference.json |  37 +++++++++++
 ...-svg-opacity-500-100-1.0-agg-reference.png | Bin 0 -> 229 bytes
 ...vg-opacity-500-100-1.0-cairo-reference.png | Bin 0 -> 228 bytes
 ...-svg-opacity-500-100-2.0-agg-reference.png | Bin 0 -> 261 bytes
 ...vg-opacity-500-100-2.0-cairo-reference.png | Bin 0 -> 318 bytes
 .../styles/marker-svg-opacity.xml             |  58 ++++++++++++++++++
 tests/visual_tests/test.py                    |   1 +
 8 files changed, 135 insertions(+)
 create mode 100644 tests/data/svg/rect2.svg
 create mode 100644 tests/visual_tests/grids/marker-svg-opacity-500-100-1.0-grid-reference.json
 create mode 100644 tests/visual_tests/images/marker-svg-opacity-500-100-1.0-agg-reference.png
 create mode 100644 tests/visual_tests/images/marker-svg-opacity-500-100-1.0-cairo-reference.png
 create mode 100644 tests/visual_tests/images/marker-svg-opacity-500-100-2.0-agg-reference.png
 create mode 100644 tests/visual_tests/images/marker-svg-opacity-500-100-2.0-cairo-reference.png
 create mode 100644 tests/visual_tests/styles/marker-svg-opacity.xml

diff --git a/tests/data/svg/rect2.svg b/tests/data/svg/rect2.svg
new file mode 100644
index 000000000..37907075f
--- /dev/null
+++ b/tests/data/svg/rect2.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+ 
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="10"
+   height="9.9999971"
+   id="svg6102">
+  <defs
+     id="defs6104" />
+  <metadata
+     id="metadata6107">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-240,-532.36218)"
+     id="layer1">
+    <rect
+       width="10"
+       height="9.9999971"
+       x="240"
+       y="532.36218"
+       id="rect6613"
+       style="opacity:.5;color:#000000;fill:red;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/tests/visual_tests/grids/marker-svg-opacity-500-100-1.0-grid-reference.json b/tests/visual_tests/grids/marker-svg-opacity-500-100-1.0-grid-reference.json
new file mode 100644
index 000000000..c9c95ba75
--- /dev/null
+++ b/tests/visual_tests/grids/marker-svg-opacity-500-100-1.0-grid-reference.json
@@ -0,0 +1,37 @@
+{
+ "keys": [
+  "", 
+  "4", 
+  "3", 
+  "2", 
+  "1"
+ ], 
+ "data": {}, 
+ "grid": [
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                     !!!                                                     ", 
+  "                                                                     !!!                                                     ", 
+  "                                                                     !!!                                                     ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                ###                                                          ", 
+  "                                                                ###                                                          ", 
+  "                                                                ###                                                          ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                           $$$                                                               ", 
+  "                                                           $$$                                                               ", 
+  "                                                           $$$                                                               ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                      %%%                                                                    ", 
+  "                                                      %%%                                                                    ", 
+  "                                                      %%%                                                                    ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             ", 
+  "                                                                                                                             "
+ ]
+}
\ No newline at end of file
diff --git a/tests/visual_tests/images/marker-svg-opacity-500-100-1.0-agg-reference.png b/tests/visual_tests/images/marker-svg-opacity-500-100-1.0-agg-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..11c31d9e0c2e64fd5fc54b0bfa4be42d8f0ccddb
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7Pr?4;s$)=b0{eTotfKP}kkp9iU@E1riFm$*j
zhyf|)k|4ie28V{{+c|(z46U9njv*Cu-rhOL+iW1f;ONA<q`5=v#eVY)rkm%^{n5Sq
z@6XQL+rGzM|E;ek>c`H&@I(9e&mX<>k~m(vUg};V?y1kUoS9+6yz}1+doTn)d=IUf
z_(ch%^3Y2LhBfMY9x3kifCxP-VPI%D+3Nq;e^woHldrh!?-OB_Aa{DY`njxgN@xNA
DeG^z3

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/images/marker-svg-opacity-500-100-1.0-cairo-reference.png b/tests/visual_tests/images/marker-svg-opacity-500-100-1.0-cairo-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..b480bab643b365398109367d7f8a137d5565f069
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7Pr?4;s$)=b0{eTotfKP}kkp2(EVDgY1zX6cN
zR1)MD%+N4f+fM?>YxQ(-45^s&_Rc}xW&;5RM<pqbs0B<azuxoCa@e-nxZZoaef_&_
zZ)=Z#{MYT-dYO@d;oqq`+jAF#c@+10R89P%^wRZV2?N8m&p&PVEnY6+1QEK_edr|v
z!y5HJwNv9%!0HwiSTQiX=3HOlp+5;M6lfvKz>rY%@bZtz%kHy0mD!ju&2kRNrJk;S
JF6*2UngE>EREYop

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/images/marker-svg-opacity-500-100-2.0-agg-reference.png b/tests/visual_tests/images/marker-svg-opacity-500-100-2.0-agg-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d5ac73ae061471951db4b97cb6935429c4ae4a3
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7Pr?4;s$)=b0{eTotfKP}kkp9iU@E1riFm$*j
zhyf|)k|4ie28V{{+c|(z3`;#-978JRyuIVd+h8EV>Zp^z$o=CxoBFB+7dCAEKK;*5
z^Sj$#&Mn_8-rZ(bx-lbhmx|`yk6*s3u5a&~$0chkYE`9G@+IWOi<K8H20wlA`||ba
zd*qPC7A{`y<nBLp@$&=9aCH!|*1maK?&oc}WZ+zcc|dDkmbdOd?KXc`#Fo&P;%x3Q
Ug&+6LGX(j=)78&qol`;+0GUQ>&;S4c

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/images/marker-svg-opacity-500-100-2.0-cairo-reference.png b/tests/visual_tests/images/marker-svg-opacity-500-100-2.0-cairo-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..148dfc66f23fdc3c27470623e1dafa7117017fe9
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7Pr?4;s$)=b0{eYBofKP}kkVXUl!F(W@+;*!C
z$Yw7I@(X6**SGKA-=LkI3es`f)5S5QV$Rz;j=4^b5^jMD*d|<HVdnLBmUVcwfbYcS
zfSYeBxY*k66@QO6O1J-6zWZVApEa-FX1__gbfH~Ojkoqi(j~t8*Iz#^28w)Jo@yz7
zTu)`MXMKO%-$~2c`{r@U+KO6LX_b5ldGTW9g^R&YU+l*%W%)r2S?$8b%bnc)r!IbO
x$C?LWw;~&uxJ$+J|MCwHpM2Q)CbECYea1(#CSNE@%vc5TwWq6}%Q~loCIBHlg3SN`

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/styles/marker-svg-opacity.xml b/tests/visual_tests/styles/marker-svg-opacity.xml
new file mode 100644
index 000000000..43a00467b
--- /dev/null
+++ b/tests/visual_tests/styles/marker-svg-opacity.xml
@@ -0,0 +1,58 @@
+<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+
+    <Style name="ellipse">
+        <Rule>
+            <Filter>[id]=1</Filter>
+            <MarkersSymbolizer file="../../data/svg/rect2.svg" />
+        </Rule>
+        <Rule>
+            <Filter>[id]=2</Filter>
+            <MarkersSymbolizer opacity=".5" file="../../data/svg/rect2.svg" />
+        </Rule>
+        <Rule>
+            <Filter>[id]=3</Filter>
+            <MarkersSymbolizer fill-opacity=".5" file="../../data/svg/rect2.svg" />
+        </Rule>
+        <Rule>
+            <Filter>[id]=4</Filter>
+            <MarkersSymbolizer stroke-opacity=".5" file="../../data/svg/rect2.svg" />
+        </Rule>
+    </Style>
+
+    <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+        <StyleName>ellipse</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y,id
+1,1,1
+2,2,2
+3,3,3
+4,4,4
+            </Parameter>
+        </Datasource>
+    </Layer>
+
+    <!-- points to frame data view -->
+
+    <Style name="frame">
+        <Rule>
+            <PointSymbolizer />
+        </Rule>
+    </Style>
+
+    <Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
+        <StyleName>frame</StyleName>
+        <Datasource>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="inline">
+x,y
+0,0
+5,0
+0,5
+5,5
+            </Parameter>
+        </Datasource>
+    </Layer>
+    
+</Map>
\ No newline at end of file
diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py
index 733e548ac..1054ac084 100755
--- a/tests/visual_tests/test.py
+++ b/tests/visual_tests/test.py
@@ -42,6 +42,7 @@ files = [
     # fails with clang++ on os x
     #{'name': "lines-shield", 'sizes': sizes_few_square,'bbox':default_text_box},
     {'name': "collision", 'sizes':[(600,400)]},
+    {'name': "marker-svg-opacity"},
     {'name': "marker-multi-policy", 'sizes':[(600,400)]},
     {'name': "marker-on-line", 'sizes':[(600,400)],
         'bbox': mapnik.Box2d(-10, 0, 15, 20)},