archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

Start moving visual test usage from osm to csv plugin

Browse Source
This commit is contained in:
Dane Springmeyer 2013-05-20 22:03:13 -07:00
parent 866320be14
commit be31f7ea18
23 changed files with 64 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/visual_tests/data/points.csv Normal file
View File

@ -0,0 +1,11 @@
lat,long,name,nr
0,0,Test one,1
0,0.1,Test two,2
0,0.2,Test three,3
0,0.3,Test four,4
0,0.4,Test five,5
0,0.5,Test six,6
0,0.6,Test seven,7
0,0.7,Test eight,8
0,0.8,Test nine,9
0,0.9,Test ten,10
1 lat long name nr
2 0 0 Test one 1
3 0 0.1 Test two 2
4 0 0.2 Test three 3
5 0 0.3 Test four 4
6 0 0.4 Test five 5
7 0 0.5 Test six 6
8 0 0.6 Test seven 7
9 0 0.7 Test eight 8
10 0 0.8 Test nine 9
11 0 0.9 Test ten 10

43
tests/visual_tests/data/points.osm
View File

@ -1,43 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.6' generator='JOSM'>
<node id='-1' lat='0' lon='0'>
<tag k='name' v='Test one' />
<tag k='nr' v='1' />
</node>
<node id='-2' lat='0' lon='0.1'>
<tag k='name' v='Test two' />
<tag k='nr' v='2' />
</node>
<node id='-3' lat='0' lon='0.2'>
<tag k='name' v='Test three' />
<tag k='nr' v='3' />
</node>
<node id='-4' lat='0' lon='0.3'>
<tag k='name' v='Test four' />
<tag k='nr' v='4' />
</node>
<node id='-5' lat='0' lon='0.4'>
<tag k='name' v='Test five' />
<tag k='nr' v='5' />
</node>
<node id='-6' lat='0' lon='0.5'>
<tag k='name' v='Test six' />
<tag k='nr' v='6' />
</node>
<node id='-7' lat='0' lon='0.6'>
<tag k='name' v='Test seven' />
<tag k='nr' v='7' />
</node>
<node id='-8' lat='0' lon='0.7'>
<tag k='name' v='Test eight' />
<tag k='nr' v='8' />
</node>
<node id='-9' lat='0' lon='0.8'>
<tag k='name' v='Test nine' />
<tag k='nr' v='9' />
</node>
<node id='-10' lat='0' lon='0.9'>
<tag k='name' v='Test ten' />
<tag k='nr' v='10' />
</node>
</osm>

4
tests/visual_tests/styles/expressionformat.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/formatting-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/formatting-2.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/formatting-3.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/formatting-4.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>

6
tests/visual_tests/styles/jalign-auto.xml
View File

@ -5,14 +5,14 @@
<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>
<Style name="My Style">
<Rule>
<Filter>[nr] = '5'</Filter>
<Filter>[nr] = 5</Filter>
<PointSymbolizer/>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="-30" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="0" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>

4
tests/visual_tests/styles/list.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>

6
tests/visual_tests/styles/rtl-point.xml
View File

@ -5,14 +5,14 @@
<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>
<Style name="My Style">
<Rule>
<Filter>[nr]='5'</Filter>
<Filter>[nr]=5</Filter>
<PointSymbolizer/>
<TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="0" dy="16" wrap-width="10">'مخيّم دير البلح'</TextSymbolizer>
</Rule>

24
tests/visual_tests/styles/shieldsymbolizer-1.xml
View File

@ -5,50 +5,50 @@
<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>
<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">'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">'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">'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">'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">'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">'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">'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">'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">'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">'X'</ShieldSymbolizer>
</Rule>
<Rule>

4
tests/visual_tests/styles/simple-E.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/simple-N.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/simple-NE.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/simple-NW.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/simple-S.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/simple-SE.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/simple-SW.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/simple-W.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/simple-shield.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/simple.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/test.py
View File

@ -20,10 +20,10 @@ defaults = {
'sizes': [(500, 100)],
'scales':[1.0,2.0],
'agg': True,
'cairo': True,
'cairo': False,
# disabled for 2.2.x since cairo tests are unstable (springmeyer)
#'cairo': mapnik.has_cairo(),
'grid': True
'grid': False
}
sizes_many_in_big_range = [(800, 100), (600, 100), (400, 100),

2
tests/visual_tests/test_python.py
View File

@ -85,7 +85,7 @@ formatnode.fill = mapnik.Color("green")
format_trees = [
('TextNode', mapnik.FormattingText("[name]")),
('MyText', MyText()),
('IfElse', IfElse("[nr] != '5'",
('IfElse', IfElse("[nr] != 5",
mapnik.FormattingText("[name]"),
mapnik.FormattingText("'SPECIAL!'"))),
('Format', formatnode),