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

Merge pull request #2321 from plepe/bug-1900

Browse source 
Visual tests for issue #1900 (face-name and fontset-name in Format)
This commit is contained in:
Dane Springmeyer 2014-07-29 17:06:02 -07:00
commit 13c59729ae
11 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tests/visual_tests/images/formatting-5-500-100-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
tests/visual_tests/images/formatting-5-500-100-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
tests/visual_tests/images/formatting-5-500-100-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
tests/visual_tests/images/formatting-5-500-100-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
tests/visual_tests/images/formatting-6-500-100-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
tests/visual_tests/images/formatting-6-500-100-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
tests/visual_tests/images/formatting-6-500-100-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
tests/visual_tests/images/formatting-6-500-100-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

23
tests/visual_tests/styles/formatting-5.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<FontSet name="book"><Font face-name="DejaVu Sans Book"/></FontSet>
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<PointSymbolizer/>
<!-- Basic test -->
<TextSymbolizer fontset-name="book" size="16" placement="point" dx="0" dy="5">
[name]+'&#10;'<Format face-name="DejaVu Sans Oblique" size="9" opacity="1">'('+[name]+')'</Format></TextSymbolizer>
</Rule>
</Style>
</Map>

24
tests/visual_tests/styles/formatting-6.xml Normal file
View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<FontSet name="book"><Font face-name="DejaVu Sans Book"/></FontSet>
<FontSet name="oblique"><Font face-name="DejaVu Sans Oblique"/></FontSet>
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<PointSymbolizer/>
<!-- Basic test -->
<TextSymbolizer fontset-name="book" size="16" placement="point" dx="0" dy="5">
[name]+'&#10;'<Format fontset-name="oblique" size="9" opacity="1">'('+[name]+')'</Format></TextSymbolizer>
</Rule>
</Style>
</Map>

2
tests/visual_tests/test.py
View file

@ -138,6 +138,8 @@ files = {
'formatting-2': {'bbox':default_text_box},
'formatting-3': {'bbox':default_text_box},
'formatting-4': {'bbox':default_text_box},
'formatting-5': {'bbox':default_text_box},
'formatting-6': {'bbox':default_text_box},
'expressionformat': {'bbox':default_text_box},
'shieldsymbolizer-1': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},
'shieldsymbolizer-2': {'sizes': sizes_many_in_small_range,'bbox':default_text_box},