sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create tests for line-symbolizer, using expressions for parameters

Browse source 
- there are two versions:
  - line-symbolizer-expressions: stroke, stroke-width, stroke-opacity, offset
  - line-symbolizer-expressions-all: additionally test
    stroke-dasharray, stroke-linecap, stroke-linejoin, comp-op
    which are not supported right now
This commit is contained in:
Stephan Bösch-Plepelits 2014-02-10 20:02:08 +01:00
parent 0a26485d28
commit 79fde58c0e
11 changed files with 165 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tests/visual_tests/images/line-symbolizer-expressions-256-256-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
tests/visual_tests/images/line-symbolizer-expressions-256-256-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
tests/visual_tests/images/line-symbolizer-expressions-256-256-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
tests/visual_tests/images/line-symbolizer-expressions-256-256-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
tests/visual_tests/images/line-symbolizer-expressions-all-256-256-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
tests/visual_tests/images/line-symbolizer-expressions-all-256-256-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
tests/visual_tests/images/line-symbolizer-expressions-all-256-256-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
tests/visual_tests/images/line-symbolizer-expressions-all-256-256-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

91
tests/visual_tests/styles/line-symbolizer-expressions-all.xml Normal file
View file

@ -0,0 +1,91 @@
<Map
background-color="#eee"
srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="bug">
<Rule>
<Filter>[id] = 'stroke'</Filter>
<LineSymbolizer stroke-width='5' stroke='[value]' />
</Rule>
<Rule>
<Filter>[id] = 'stroke-width'</Filter>
<LineSymbolizer stroke-width='[value]' stroke='#ff0000' />
</Rule>
<Rule>
<Filter>[id] = 'stroke-opacity'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' stroke-opacity="[value]" />
</Rule>
<Rule>
<Filter>[id] = 'offset'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' offset="[value]" />
</Rule>
<Rule>
<Filter>[id] = 'stroke-dasharray'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' stroke-dasharray="[value]" />
</Rule>
<Rule>
<Filter>[id] = 'stroke-linejoin'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' stroke-linejoin="[value]" />
</Rule>
<Rule>
<Filter>[id] = 'stroke-linecap'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' stroke-linecap="[value]" />
</Rule>
<Rule>
<Filter>[id] = 'comp-op'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' comp-op="[value]" />
</Rule>
<Rule>
<TextSymbolizer face-name='DejaVu Sans Book' dy='-5'>[id]</TextSymbolizer>
</Rule>
</Style>
<Style name="frame">
<Rule>
<PolygonSymbolizer />
</Rule>
</Style>
<!--
frame is a layer with a single polygon that is used to ensure that m.zoom_all() will zoom the
map to a reasonable bounding extent to make the test easy to view with tools like nik2img.py
(which calls m.zoom_all() by default). Another approach in >= Mapnik 2.3.x is to just sent a
manual `extent` for the CSV datasource.
-->
<Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>frame</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="inline">
wkt|name
Polygon((-180.0 -125.0, -180.0 125.0, 180.0 125.0, 180.0 -125.0, -180.0 -125.0))|bounds
</Parameter>
</Datasource>
</Layer>
<!--
"bug" is a layer that should provide sample data that triggers the bug in question. It is
listed after the "frame" layer so that it renders on top and is visible.
-->
<Layer name="bug" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>bug</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="inline">
id|value|wkt
stroke|#ff0000|LineString(-160 -120,160 -120,160 -100)
stroke-width|5|LineString(-160 -90,160 -90,160 -70)
stroke-opacity|0.5|LineString(-160 -60,160 -60,160 -40)
offset|3|LineString(-160 -30,160 -30,160 -10)
stroke-dasharray|3,3|LineString(-160 0,160 0,160 20)
stroke-linejoin|bevel|LineString(-160 30,160 30,160 50)
stroke-linecap|round|LineString(-160 60,160 60,160 80)
comp-op|minus|LineString(-160 90,160 90,160 110)
</Parameter>
</Datasource>
</Layer>
</Map>

71
tests/visual_tests/styles/line-symbolizer-expressions.xml Normal file
View file

@ -0,0 +1,71 @@
<Map
background-color="#eee"
srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="bug">
<Rule>
<Filter>[id] = 'stroke'</Filter>
<LineSymbolizer stroke-width='5' stroke='[value]' />
</Rule>
<Rule>
<Filter>[id] = 'stroke-width'</Filter>
<LineSymbolizer stroke-width='[value]' stroke='#ff0000' />
</Rule>
<Rule>
<Filter>[id] = 'stroke-opacity'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' stroke-opacity="[value]" />
</Rule>
<Rule>
<Filter>[id] = 'offset'</Filter>
<LineSymbolizer stroke-width='5' stroke='#ff0000' offset="[value]" />
</Rule>
<Rule>
<TextSymbolizer face-name='DejaVu Sans Book' dy='-5'>[id]</TextSymbolizer>
</Rule>
</Style>
<Style name="frame">
<Rule>
<PolygonSymbolizer />
</Rule>
</Style>
<!--
frame is a layer with a single polygon that is used to ensure that m.zoom_all() will zoom the
map to a reasonable bounding extent to make the test easy to view with tools like nik2img.py
(which calls m.zoom_all() by default). Another approach in >= Mapnik 2.3.x is to just sent a
manual `extent` for the CSV datasource.
-->
<Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>frame</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="inline">
wkt|name
Polygon((-180.0 -125.0, -180.0 125.0, 180.0 125.0, 180.0 -125.0, -180.0 -125.0))|bounds
</Parameter>
</Datasource>
</Layer>
<!--
"bug" is a layer that should provide sample data that triggers the bug in question. It is
listed after the "frame" layer so that it renders on top and is visible.
-->
<Layer name="bug" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>bug</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="inline">
id|value|wkt
stroke|#ff0000|LineString(-160 -120,160 -120,160 -100)
stroke-width|5|LineString(-160 -90,160 -90,160 -70)
stroke-opacity|0.5|LineString(-160 -60,160 -60,160 -40)
offset|3|LineString(-160 -30,160 -30,160 -10)
</Parameter>
</Datasource>
</Layer>
</Map>

4
tests/visual_tests/test.py
View file

@ -219,7 +219,9 @@ files = {
'tiff-nodata-rgba':{'sizes':[(512,512)]},
'tiff-nodata-tolerance':{'sizes':[(512,512)]},
'tiff-nodata-edge-rgba':{'sizes':[(512,512)]},
'marker-vs-point':{'sizes':[(512,512)]}
'marker-vs-point':{'sizes':[(512,512)]},
'line-symbolizer-expressions':{'sizes':[(256,256)]},
'line-symbolizer-expressions-all':{'sizes':[(256,256)]}
}
class Reporting: