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

Change visual tests directory structure.

Browse source
This commit is contained in:
Hermann Kraus 2012-03-20 21:28:21 +01:00
parent 89877edc67
commit f7a387f8af
91 changed files with 45 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/visual_tests/clean.sh
View file

@ -1,3 +1,3 @@
rm -f *-agg.png
rm -f *-out.xml
rm -f images/*-agg.png
rm -f xml_output/*-out.xml

0
tests/visual_tests/lines.osm → tests/visual_tests/data/lines.osm
View file

0
tests/visual_tests/points.dbf → tests/visual_tests/data/points.dbf
View file

0
tests/visual_tests/points.osm → tests/visual_tests/data/points.osm
View file

0
tests/visual_tests/points.shp → tests/visual_tests/data/points.shp
View file

0
tests/visual_tests/expressionformat-500-reference.png → tests/visual_tests/images/expressionformat-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
tests/visual_tests/formating-1-500-reference.png → tests/visual_tests/images/formating-1-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
tests/visual_tests/formating-2-500-reference.png → tests/visual_tests/images/formating-2-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
tests/visual_tests/formating-3-500-reference.png → tests/visual_tests/images/formating-3-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
tests/visual_tests/formating-4-500-reference.png → tests/visual_tests/images/formating-4-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 533 B

After

Width:  |  Height:  |  Size: 533 B

0
tests/visual_tests/formating-500-reference.png → tests/visual_tests/images/formating-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

0
tests/visual_tests/jalign-auto-200-reference.png → tests/visual_tests/images/jalign-auto-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
tests/visual_tests/lines-1-200-reference.png → tests/visual_tests/images/lines-1-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
tests/visual_tests/lines-1-400-reference.png → tests/visual_tests/images/lines-1-400-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
tests/visual_tests/lines-1-600-reference.png → tests/visual_tests/images/lines-1-600-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
tests/visual_tests/lines-1-800-reference.png → tests/visual_tests/images/lines-1-800-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
tests/visual_tests/lines-2-200-reference.png → tests/visual_tests/images/lines-2-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

0
tests/visual_tests/lines-2-400-reference.png → tests/visual_tests/images/lines-2-400-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

0
tests/visual_tests/lines-2-600-reference.png → tests/visual_tests/images/lines-2-600-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
tests/visual_tests/lines-2-800-reference.png → tests/visual_tests/images/lines-2-800-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
tests/visual_tests/lines-3-200-reference.png → tests/visual_tests/images/lines-3-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
tests/visual_tests/lines-3-400-reference.png → tests/visual_tests/images/lines-3-400-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
tests/visual_tests/lines-3-600-reference.png → tests/visual_tests/images/lines-3-600-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
tests/visual_tests/lines-3-800-reference.png → tests/visual_tests/images/lines-3-800-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
tests/visual_tests/lines-shield-200-reference.png → tests/visual_tests/images/lines-shield-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
tests/visual_tests/lines-shield-400-reference.png → tests/visual_tests/images/lines-shield-400-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
tests/visual_tests/lines-shield-600-reference.png → tests/visual_tests/images/lines-shield-600-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
tests/visual_tests/lines-shield-800-reference.png → tests/visual_tests/images/lines-shield-800-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
tests/visual_tests/list-100-reference.png → tests/visual_tests/images/list-100-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
tests/visual_tests/list-150-reference.png → tests/visual_tests/images/list-150-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
tests/visual_tests/list-200-reference.png → tests/visual_tests/images/list-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
tests/visual_tests/list-250-reference.png → tests/visual_tests/images/list-250-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
tests/visual_tests/list-300-reference.png → tests/visual_tests/images/list-300-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
tests/visual_tests/list-400-reference.png → tests/visual_tests/images/list-400-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
tests/visual_tests/list-600-reference.png → tests/visual_tests/images/list-600-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

0
tests/visual_tests/list-800-reference.png → tests/visual_tests/images/list-800-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

0
tests/visual_tests/python-IfElse-reference.png → tests/visual_tests/images/python-IfElse-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
tests/visual_tests/python-MyText-reference.png → tests/visual_tests/images/python-MyText-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
tests/visual_tests/python-TextNode-reference.png → tests/visual_tests/images/python-TextNode-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
tests/visual_tests/rtl-point-200-reference.png → tests/visual_tests/images/rtl-point-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
tests/visual_tests/shieldsymbolizer-1-490-reference.png → tests/visual_tests/images/shieldsymbolizer-1-490-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
tests/visual_tests/shieldsymbolizer-1-495-reference.png → tests/visual_tests/images/shieldsymbolizer-1-495-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
tests/visual_tests/shieldsymbolizer-1-497-reference.png → tests/visual_tests/images/shieldsymbolizer-1-497-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
tests/visual_tests/shieldsymbolizer-1-498-reference.png → tests/visual_tests/images/shieldsymbolizer-1-498-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

0
tests/visual_tests/shieldsymbolizer-1-499-reference.png → tests/visual_tests/images/shieldsymbolizer-1-499-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
tests/visual_tests/shieldsymbolizer-1-500-reference.png → tests/visual_tests/images/shieldsymbolizer-1-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

0
tests/visual_tests/shieldsymbolizer-1-501-reference.png → tests/visual_tests/images/shieldsymbolizer-1-501-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
tests/visual_tests/shieldsymbolizer-1-502-reference.png → tests/visual_tests/images/shieldsymbolizer-1-502-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

0
tests/visual_tests/shieldsymbolizer-1-505-reference.png → tests/visual_tests/images/shieldsymbolizer-1-505-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
tests/visual_tests/shieldsymbolizer-1-510-reference.png → tests/visual_tests/images/shieldsymbolizer-1-510-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
tests/visual_tests/simple-100-reference.png → tests/visual_tests/images/simple-100-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
tests/visual_tests/simple-150-reference.png → tests/visual_tests/images/simple-150-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
tests/visual_tests/simple-200-reference.png → tests/visual_tests/images/simple-200-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
tests/visual_tests/simple-250-reference.png → tests/visual_tests/images/simple-250-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
tests/visual_tests/simple-300-reference.png → tests/visual_tests/images/simple-300-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
tests/visual_tests/simple-400-reference.png → tests/visual_tests/images/simple-400-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
tests/visual_tests/simple-600-reference.png → tests/visual_tests/images/simple-600-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
tests/visual_tests/simple-800-reference.png → tests/visual_tests/images/simple-800-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
tests/visual_tests/simple-E-500-reference.png → tests/visual_tests/images/simple-E-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
tests/visual_tests/simple-N-500-reference.png → tests/visual_tests/images/simple-N-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
tests/visual_tests/simple-NE-500-reference.png → tests/visual_tests/images/simple-NE-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
tests/visual_tests/simple-NW-500-reference.png → tests/visual_tests/images/simple-NW-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
tests/visual_tests/simple-S-500-reference.png → tests/visual_tests/images/simple-S-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
tests/visual_tests/simple-SE-500-reference.png → tests/visual_tests/images/simple-SE-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
tests/visual_tests/simple-SW-500-reference.png → tests/visual_tests/images/simple-SW-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
tests/visual_tests/simple-W-500-reference.png → tests/visual_tests/images/simple-W-500-reference.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
tests/visual_tests/expressionformat.xml → tests/visual_tests/styles/expressionformat.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/formating-1.xml → tests/visual_tests/styles/formating-1.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/formating-2.xml → tests/visual_tests/styles/formating-2.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/formating-3.xml → tests/visual_tests/styles/formating-3.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/formating-4.xml → tests/visual_tests/styles/formating-4.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/formating.xml → tests/visual_tests/styles/formating.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/jalign-auto.xml → tests/visual_tests/styles/jalign-auto.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/lines-1.xml → tests/visual_tests/styles/lines-1.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">lines.osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/lines-2.xml → tests/visual_tests/styles/lines-2.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">lines.osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/lines-3.xml → tests/visual_tests/styles/lines-3.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">lines.osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/lines-shield.xml → tests/visual_tests/styles/lines-shield.xml
View file

@ -6,14 +6,14 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">lines.osm</Parameter>
<Parameter name="file">../data/lines.osm</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<LineSymbolizer stroke-width="1" stroke="blue"/>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" file="../data/svg/crosshair16x16.svg" spacing="30">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" file="../../data/svg/crosshair16x16.svg" spacing="30">'X'</ShieldSymbolizer>
</Rule>
</Style>

4
tests/visual_tests/list.xml → tests/visual_tests/styles/list.xml
View file

@ -7,9 +7,9 @@
<Datasource>
<!--
<Parameter name="type">osm</Parameter>
<Parameter name="file">points.osm</Parameter>-->
<Parameter name="file">../data/points.osm</Parameter>-->
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/rtl-point.xml → tests/visual_tests/styles/rtl-point.xml
View file

@ -10,7 +10,7 @@
<Parameter name="file">points.osm</Parameter>
-->
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

24
tests/visual_tests/shieldsymbolizer-1.xml → tests/visual_tests/styles/shieldsymbolizer-1.xml
View file

@ -6,53 +6,53 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../../data/points.shp</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = '1'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '2'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '3'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '4'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" dy="0" vertical-alignment="bottom">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" dy="0" vertical-alignment="bottom">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '5'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '6'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '7'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '8'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg">'X&#10;X&#10;X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X&#10;X&#10;X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '9'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg">'XXX'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'XXX'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '10'</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/images/crosshair16x16.png">'X'</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<PointSymbolizer allow-overlap="true" file="../data/raster/white-alpha.png"/>
<PointSymbolizer allow-overlap="true" file="../../data/raster/white-alpha.png"/>
</Rule>
</Style>

2
tests/visual_tests/simple-E.xml → tests/visual_tests/styles/simple-E.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/simple-N.xml → tests/visual_tests/styles/simple-N.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/simple-NE.xml → tests/visual_tests/styles/simple-NE.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/simple-NW.xml → tests/visual_tests/styles/simple-NW.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/simple-S.xml → tests/visual_tests/styles/simple-S.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/simple-SE.xml → tests/visual_tests/styles/simple-SE.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/simple-SW.xml → tests/visual_tests/styles/simple-SW.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

2
tests/visual_tests/simple-W.xml → tests/visual_tests/styles/simple-W.xml
View file

@ -6,7 +6,7 @@
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

6
tests/visual_tests/simple.xml → tests/visual_tests/styles/simple.xml
View file

@ -5,12 +5,8 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<!--
<Parameter name="type">osm</Parameter>
<Parameter name="file">points.osm</Parameter>
-->
<Parameter name="type">shape</Parameter>
<Parameter name="file">points.shp</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>

6
tests/visual_tests/test.py
View file

@ -39,10 +39,10 @@ def render(filename, width, height=100):
width = int(width)
height = int(height)
m = mapnik.Map(width, height)
mapnik.load_map(m, os.path.join(dirname, "%s.xml" % filename), False)
mapnik.load_map(m, os.path.join(dirname, "styles", "%s.xml" % filename), False)
bbox = mapnik.Box2d(-0.05, -0.01, 0.95, 0.01)
m.zoom_to_box(bbox)
basefn = os.path.join(dirname,'%s-%d' % (filename, width))
basefn = os.path.join(dirname, "images", '%s-%d' % (filename, width))
mapnik.render_to_file(m, basefn+'-agg.png')
diff = compare(basefn + '-agg.png', basefn + '-reference.png')
if diff > 0:
@ -63,6 +63,6 @@ for f in files:
m = render(f[0], width[0], width[1])
else:
m = render(f[0], width)
mapnik.save_map(m, os.path.join(dirname,"%s-out.xml" % f[0]))
mapnik.save_map(m, os.path.join(dirname, 'xml_output', "%s-out.xml" % f[0]))
summary()

6
tests/visual_tests/test_python.py
View file

@ -1,6 +1,8 @@
#!/usr/bin/env python
import mapnik
import sys
import os.path
import compare
class MyText(mapnik.FormattingNode):
def __init__(self):
@ -67,7 +69,7 @@ m.append_style('Style', style)
layer = mapnik.Layer('Layer')
layer.datasource = mapnik.Shapefile(file="points.shp")
layer.datasource = mapnik.Shapefile(file="data/points.shp")
layer.styles.append('Style')
m.layers.append(layer)
@ -95,4 +97,4 @@ format_trees = [
for format_tree in format_trees:
text.placements.defaults.format_tree = format_tree[1]
mapnik.render_to_file(m, 'python-%s.png' % format_tree[0], 'png')
mapnik.render_to_file(m, os.path.join("images", 'python-%s.png' % format_tree[0]), 'png')