Merge pull request #2118 from MapQuest/mla-expr-v2-svg-premultiply
Added test for markers compared with points.
This commit is contained in:
Dane Springmeyer
commit
cefa9b4139
8 changed files with 284 additions and 1 deletions
70
tests/data/svg/transparent_circle.svg
Normal file
70
tests/data/svg/transparent_circle.svg
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
<?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"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="76"
|
||||
height="76"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.4 r9939"
|
||||
sodipodi:docname="transparent_circle.svg">
|
||||
<defs
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="3.8563637"
|
||||
inkscape:cx="-7.6522455"
|
||||
inkscape:cy="37.99942"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1056"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<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
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-82.01339,-82.93304)">
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:#4682b4;fill-opacity:0.2;fill-rule:evenodd;stroke:#ffff00;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.3;stroke-dasharray:none;stroke-dashoffset:0"
|
||||
id="path2985"
|
||||
sodipodi:cx="257.14285"
|
||||
sodipodi:cy="295.21933"
|
||||
sodipodi:rx="30"
|
||||
sodipodi:ry="30"
|
||||
d="m 287.14285,295.21933 c 0,16.56854 -13.43145,30 -30,30 -16.56854,0 -30,-13.43146 -30,-30 0,-16.56854 13.43146,-30 30,-30 16.56855,0 30,13.43146 30,30 z"
|
||||
transform="translate(-137.14286,-174.28571)" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
|
|
@ -0,0 +1,139 @@
|
|||
{
|
||||
"keys": [
|
||||
"",
|
||||
"1",
|
||||
"2",
|
||||
"3"
|
||||
],
|
||||
"data": {},
|
||||
"grid": [
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" !!! ",
|
||||
" !!!!!!!!! ",
|
||||
" !!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!!!!! ",
|
||||
" !!!!!!!!!!!! ",
|
||||
" !!!!!!!!! ",
|
||||
" !!! ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ####### ",
|
||||
" ########### ",
|
||||
" ############# ",
|
||||
" ############### ",
|
||||
" ################# ",
|
||||
" ################# ",
|
||||
" ################### ",
|
||||
" ################### ",
|
||||
" ################### ",
|
||||
" ################### ",
|
||||
" ################### ",
|
||||
" ################### ",
|
||||
" ################### ",
|
||||
" ################# ",
|
||||
" ################# ",
|
||||
" ############### ",
|
||||
" ############# ",
|
||||
" ########### ",
|
||||
" ####### ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" $$$$$ ",
|
||||
" $$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$$$$ ",
|
||||
" $$$$$$$$$$$ ",
|
||||
" $$$$$$$$ ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
]
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 74 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 79 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 112 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 121 KiB |
73
tests/visual_tests/styles/marker-vs-point.xml
Normal file
73
tests/visual_tests/styles/marker-vs-point.xml
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
<Map srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
|
||||
background-color="green"
|
||||
background-image-opacity="0.8"
|
||||
background-image-comp-op="screen"
|
||||
background-image="../data/pattern.png">
|
||||
|
||||
<Style name="markers">
|
||||
<Rule>
|
||||
<MarkersSymbolizer
|
||||
width="60"
|
||||
height="60"
|
||||
file="../../data/svg/transparent_circle.svg"
|
||||
/>
|
||||
</Rule>
|
||||
</Style>
|
||||
|
||||
<Style name="points">
|
||||
<Rule>
|
||||
<PointSymbolizer
|
||||
file="../../data/svg/transparent_circle.svg"
|
||||
/>
|
||||
</Rule>
|
||||
</Style>
|
||||
|
||||
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
|
||||
<StyleName>markers</StyleName>
|
||||
<Datasource>
|
||||
<Parameter name="type">csv</Parameter>
|
||||
<Parameter name="inline">
|
||||
x,y
|
||||
-2.5,3
|
||||
-2.5,0
|
||||
-2.5,-3
|
||||
</Parameter>
|
||||
</Datasource>
|
||||
</Layer>
|
||||
|
||||
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
|
||||
<StyleName>points</StyleName>
|
||||
<Datasource>
|
||||
<Parameter name="type">csv</Parameter>
|
||||
<Parameter name="inline">
|
||||
x,y
|
||||
2.5,3
|
||||
2.5,0
|
||||
2.5,-3
|
||||
</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
|
||||
-5,-5
|
||||
5,-5
|
||||
-5,5
|
||||
5,5
|
||||
</Parameter>
|
||||
</Datasource>
|
||||
</Layer>
|
||||
|
||||
</Map>
|
||||
|
|
@ -213,7 +213,8 @@ files = {
|
|||
'colorize-alpha3':{'sizes':[(512,512)]},
|
||||
'image-filters-galore':{'sizes':[(512,512)]},
|
||||
'image-filters-multi-blur':{'sizes':[(512,512)]},
|
||||
'line-opacity-multi-render':{'sizes':[(512,512)]}
|
||||
'line-opacity-multi-render':{'sizes':[(512,512)]},
|
||||
'marker-vs-point':{'sizes':[(512,512)]}
|
||||
}
|
||||
|
||||
class Reporting:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue