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

update new (in harfbuzz branch) visual tests to csv plugin where possible

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-12 20:18:25 -04:00
parent 0322fd07c4
commit af8d47f7ae
18 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

6
tests/visual_tests/styles/charspacing.xml
View file

@ -4,13 +4,13 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = "6"</Filter>
<Filter>[nr] = 6</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-90" character-spacing="0.0">"Char spacing 0.0"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-80" character-spacing="0.1">"Char spacing 0.1"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" vertical-alignment="top" dy="-70" character-spacing="0.2">"Char spacing 0.2"</TextSymbolizer>

4
tests/visual_tests/styles/formatting.xml
View file

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

4
tests/visual_tests/styles/harfbuzz.xml
View file

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

4
tests/visual_tests/styles/hb-fontsets.xml
View file

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

4
tests/visual_tests/styles/khmer.xml
View file

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

4
tests/visual_tests/styles/line_break.xml
View file

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

24
tests/visual_tests/styles/orientation.xml
View file

@ -5,59 +5,59 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = '1'</Filter>
<Filter>[nr] = 1</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '2'</Filter>
<Filter>[nr] = 2</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="90">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '3'</Filter>
<Filter>[nr] = 3</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="180">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '4'</Filter>
<Filter>[nr] = 4</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45" dy="10">"Line&#10;break"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '5'</Filter>
<Filter>[nr] = 5</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="45" dy="10">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '6'</Filter>
<Filter>[nr] = 6</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="90" dy="10">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '7'</Filter>
<Filter>[nr] = 7</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="180" dy="10">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '8'</Filter>
<Filter>[nr] = 8</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="0" horizontal-alignment="right" vertical-alignment="top" rotate-displacement="true">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '9'</Filter>
<Filter>[nr] = 9</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="90" horizontal-alignment="right" vertical-alignment="top" rotate-displacement="true">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
<Rule>
<Filter>[nr] = '10'</Filter>
<Filter>[nr] = 10</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" orientation="180" horizontal-alignment="right" vertical-alignment="top" rotate-displacement="true">"XYZ"</TextSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>

24
tests/visual_tests/styles/shieldsymbolizer-2.xml
View file

@ -6,50 +6,50 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = '1'</Filter>
<Filter>[nr] = 1</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '2'</Filter>
<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" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '3'</Filter>
<Filter>[nr] = 3</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '4'</Filter>
<Filter>[nr] = 4</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" dy="0" vertical-alignment="bottom" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '5'</Filter>
<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" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '6'</Filter>
<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" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '7'</Filter>
<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" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '8'</Filter>
<Filter>[nr] = 8</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true">'X&#10;X&#10;X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '9'</Filter>
<Filter>[nr] = 9</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true">'XXX'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '10'</Filter>
<Filter>[nr] = 10</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png" unlock-image="true">'X'</ShieldSymbolizer>
</Rule>
<Rule>

24
tests/visual_tests/styles/shieldsymbolizer-3.xml
View file

@ -6,50 +6,50 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = '1'</Filter>
<Filter>[nr] = 1</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '2'</Filter>
<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" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '3'</Filter>
<Filter>[nr] = 3</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '4'</Filter>
<Filter>[nr] = 4</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" dy="0" vertical-alignment="bottom" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '5'</Filter>
<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" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '6'</Filter>
<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" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '7'</Filter>
<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" unlock-image="false" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '8'</Filter>
<Filter>[nr] = 8</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="false" shield-dx="15">'X&#10;X&#10;X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '9'</Filter>
<Filter>[nr] = 9</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="false" shield-dx="15">'XXX'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '10'</Filter>
<Filter>[nr] = 10</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png" unlock-image="false" shield-dx="15" dy="20">'X'</ShieldSymbolizer>
</Rule>
<Rule>

24
tests/visual_tests/styles/shieldsymbolizer-4.xml
View file

@ -6,50 +6,50 @@
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">osm</Parameter>
<Parameter name="file">../data/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<Filter>[nr] = '1'</Filter>
<Filter>[nr] = 1</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '2'</Filter>
<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" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '3'</Filter>
<Filter>[nr] = 3</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '4'</Filter>
<Filter>[nr] = 4</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" dy="0" vertical-alignment="bottom" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '5'</Filter>
<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" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '6'</Filter>
<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" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '7'</Filter>
<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" unlock-image="true" shield-dx="15">'X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '8'</Filter>
<Filter>[nr] = 8</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true" shield-dx="15">'X&#10;X&#10;X'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '9'</Filter>
<Filter>[nr] = 9</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" unlock-image="true" shield-dx="15">'XXX'</ShieldSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = '10'</Filter>
<Filter>[nr] = 10</Filter>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png" unlock-image="true" shield-dx="15" dy="20">'X'</ShieldSymbolizer>
</Rule>
<Rule>

4
tests/visual_tests/styles/text-bengali.xml
View file

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

4
tests/visual_tests/styles/text-bug1820+0.xml
View file

@ -5,8 +5,8 @@
<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/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/text-bug1820+1.xml
View file

@ -5,8 +5,8 @@
<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/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/text-bug1820-1.xml
View file

@ -5,8 +5,8 @@
<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/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/text-expressionformat-color.xml
View file

@ -5,8 +5,8 @@
<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/points.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/points.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/text-malayalam.xml
View file

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

2
tests/visual_tests/test_python.py
View file

@ -71,7 +71,7 @@ m.append_style('Style', style)
layer = mapnik.Layer('Layer')
layer.datasource = mapnik.Osm(file=os.path.join(dirname,"data/points.osm"))
layer.datasource = mapnik.Osm(file=os.path.join(dirname,"data/points.csv"))
layer.styles.append('Style')
m.layers.append(layer)