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

Add new test and change handling of scale_factor in tests.

Browse source
This commit is contained in:
Hermann Kraus 2013-03-25 02:25:05 +01:00
parent 2a6b243ae6
commit ab6156a087
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tests/visual_tests/styles/charspacing-lines.xml Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = "2"</Filter>
<LineSymbolizer stroke-width="2" stroke="red"/>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-90" character-spacing="0.0">"Char spacing 0.0"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-80" character-spacing="0.1">"Char spacing 0.1"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-70" character-spacing="0.2">"Char spacing 0.2"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-60" character-spacing="0.3">"Char spacing 0.3"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-50" character-spacing="0.4">"Char spacing 0.4"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-40" character-spacing="0.5">"Char spacing 0.5"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-30" character-spacing="0.6">"Char spacing 0.6"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-20" character-spacing="0.7">"Char spacing 0.7"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="-10" character-spacing="0.8">"Char spacing 0.8"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="0" character-spacing="0.9">"Char spacing 0.9"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="10" character-spacing="1.0">"Char spacing 1.0"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="20" character-spacing="1.5">"Char spacing 1.5"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="30" character-spacing="2">"Char spacing 2.0"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="40" character-spacing="2.5">"Char spacing 2.5"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="50" character-spacing="4">"Char spacing 4"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="60" character-spacing="6">"Char spacing 6"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" allow-overlap="true" placement="line" vertical-alignment="top" dy="70" character-spacing="8">"Char spacing 8"</TextSymbolizer>
</Rule>
</Style>
</Map>

3
tests/visual_tests/test.py
View file

@ -70,6 +70,7 @@ text_tests = [
{'name': "orientation", 'sizes': [(800, 200)], 'bbox':default_text_box},
{'name': "hb-fontsets", 'sizes': [(800, 200)], 'bbox':default_text_box},
{'name': "charspacing", 'sizes': [(200, 400)], 'bbox':default_text_box},
{'name': "charspacing-lines", 'sizes': [(300, 300)], 'bbox':default_text_box},
{'name': "line_break", 'sizes': [(800, 800)], 'bbox':default_text_box},
{'name': "rtl-point", 'sizes': [(200, 200)],'bbox':default_text_box},
{'name': "jalign-auto", 'sizes': [(200, 200)],'bbox':default_text_box},
@ -144,7 +145,7 @@ def report_create(quiet=False):
def render(config, width, height, bbox, scale_factor, quiet=False, overwrite_failures=False):
filename = config['name']
m = mapnik.Map(width, height)
m = mapnik.Map(int(width*scale_factor), int(height*scale_factor))
postfix = "%s-%d-%d-%s" % (filename,width,height,scale_factor)
## AGG rendering