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

further convert visual tests to use csv plugin over osm

Browse Source
This commit is contained in:
Dane Springmeyer 2013-05-20 22:15:52 -07:00
parent be31f7ea18
commit f06b465cf9
20 changed files with 19 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/visual_tests/data/lines.csv Normal file
View File

@ -0,0 +1,10 @@
wkt,name,nr
"LineString(0.194483 -0.117354,0.23691 -0.137246,0.252846 -0.181313,0.232953 -0.223741,0.188886 -0.239676,0.146458 -0.219784,0.130523 -0.175717,0.150415 -0.133289,0.194483 -0.117354)","Circle",6
"LineString(0.747335 -0.107159,0.789763 -0.127051,0.805698 -0.171118,0.785806 -0.213546,0.741739 -0.229481,0.699311 -0.209589,0.683376 -0.165522,0.703268 -0.123094,0.747335 -0.107159)","Circle with long name",7
"LineString(0.346487 -0.240215,0.535306 -0.240215)","Short line with long name",5
"LineString(0.347059 -0.122112,0.535878 -0.122112)","Short line",4
"LineString(0 0,0.9 0)","Rendered @ integer pos. ABCDEFGHIJKLMNOPQRSTUVWXYZ",3
"LineString(0.002268 0.073178,0.902268 0.073178)","Long line with long name",2
"LineString(0.003411 0.172529,0.103411 0.172529,0.203411 0.172529,0.303411 0.172529,0.403411 0.172529,0.503411 0.172529,0.603411 0.172529,0.703411 0.172529,0.803411 0.172529,0.903411 0.172529)","Long line with long name and many points",1
"LineString(0.002841 0.250458,0.902841 0.250458)","Short name",8
"LineString(0 -0.051,0.9 -0.051)","Rendered @ non-integer p. ABCDEFGHIJKLMNOPQRSTUVWXYZ",9
1 wkt name nr
2 LineString(0.194483 -0.117354,0.23691 -0.137246,0.252846 -0.181313,0.232953 -0.223741,0.188886 -0.239676,0.146458 -0.219784,0.130523 -0.175717,0.150415 -0.133289,0.194483 -0.117354) Circle 6
3 LineString(0.747335 -0.107159,0.789763 -0.127051,0.805698 -0.171118,0.785806 -0.213546,0.741739 -0.229481,0.699311 -0.209589,0.683376 -0.165522,0.703268 -0.123094,0.747335 -0.107159) Circle with long name 7
4 LineString(0.346487 -0.240215,0.535306 -0.240215) Short line with long name 5
5 LineString(0.347059 -0.122112,0.535878 -0.122112) Short line 4
6 LineString(0 0,0.9 0) Rendered @ integer pos. ABCDEFGHIJKLMNOPQRSTUVWXYZ 3
7 LineString(0.002268 0.073178,0.902268 0.073178) Long line with long name 2
8 LineString(0.003411 0.172529,0.103411 0.172529,0.203411 0.172529,0.303411 0.172529,0.403411 0.172529,0.503411 0.172529,0.603411 0.172529,0.703411 0.172529,0.803411 0.172529,0.903411 0.172529) Long line with long name and many points 1
9 LineString(0.002841 0.250458,0.902841 0.250458) Short name 8
10 LineString(0 -0.051,0.9 -0.051) Rendered @ non-integer p. ABCDEFGHIJKLMNOPQRSTUVWXYZ 9

117
tests/visual_tests/data/lines.osm
View File

@ -1,117 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.6' upload='true' generator='JOSM'>
<node id='132' visible='true' version='1' lat='-0.1332891529545811' lon='0.1504154935636508' />
<node id='134' visible='true' version='1' lat='-0.1757169043083409' lon='0.1305231545125279' />
<node id='136' visible='true' version='1' lat='-0.21978370904872907' lon='0.1464582071314902' />
<node id='138' visible='true' version='1' lat='-0.2396758881013458' lon='0.18888611371347797' />
<node id='140' visible='true' version='1' lat='-0.2237409658387897' lon='0.23295318200586176' />
<node id='142' visible='true' version='1' lat='-0.18131332528509406' lon='0.25284552105698477' />
<node id='144' visible='true' version='1' lat='-0.13724642835761083' lon='0.23691046843802263' />
<node id='146' visible='true' version='1' lat='-0.11735413850500562' lon='0.1944825618560347' />
<node id='148' visible='true' version='1' lat='-0.1655217334959332' lon='0.6833758097485068' />
<node id='150' visible='true' version='1' lat='-0.2095885646018953' lon='0.6993108623674691' />
<node id='152' visible='true' version='1' lat='-0.22948075753179561' lon='0.7417387689494566' />
<node id='154' visible='true' version='1' lat='-0.17111815748676526' lon='0.8056981762929635' />
<node id='156' visible='true' version='1' lat='-0.12705123945853983' lon='0.7897631236740015' />
<node id='158' visible='true' version='1' lat='-0.10715894205645898' lon='0.7473352170920137' />
<node id='160' visible='true' version='1' lat='-0.21354582405473055' lon='0.7858058372418406' />
<node id='162' visible='true' version='1' lat='-0.12309396245573988' lon='0.7032681487996296' />
<node id='164' visible='true' version='1' lat='-0.24021531354004155' lon='0.5353063117093004' />
<node id='166' visible='true' version='1' lat='-0.24021531354004155' lon='0.3464872162319133' />
<node id='168' visible='true' version='1' lat='-0.12211234158461091' lon='0.5358780838867709' />
<node id='170' visible='true' version='1' lat='-0.12211234158461091' lon='0.34705898840938354' />
<node id='172' visible='true' version='1' lat='-0.0' lon='0.9' />
<node id='174' visible='true' version='1' lat='-0.0' lon='0.0' />
<node id='176' visible='true' version='1' lat='0.07317849201080144' lon='0.9022677520769676' />
<node id='178' visible='true' version='1' lat='0.07317849201080144' lon='0.0022677520769677586' />
<node id='180' visible='true' version='1' lat='0.17252937235850266' lon='0.9034112964319083' />
<node id='182' visible='true' version='1' lat='0.17252937235851112' lon='0.8034112964319083' />
<node id='184' visible='true' version='1' lat='0.17252937235851112' lon='0.7034112964319083' />
<node id='186' visible='true' version='1' lat='0.17252937235851112' lon='0.6034112964319084' />
<node id='188' visible='true' version='1' lat='0.17252937235851112' lon='0.5034112964319082' />
<node id='190' visible='true' version='1' lat='0.17252937235851112' lon='0.40341129643190826' />
<node id='192' visible='true' version='1' lat='0.17252937235851112' lon='0.30341129643190823' />
<node id='194' visible='true' version='1' lat='0.17252937235851112' lon='0.20341129643190828' />
<node id='196' visible='true' version='1' lat='0.17252937235851112' lon='0.10341129643190829' />
<node id='198' visible='true' version='1' lat='0.17252937235850266' lon='0.0034112964319082647' />
<node id='217' visible='true' version='1' lat='0.2504581833214932' lon='0.0028405870305671026' />
<node id='218' visible='true' version='1' lat='0.2504581833214932' lon='0.9028405870305672' />
<node id='241' visible='true' version='1' lat='-0.051' lon='0.0' />
<node id='242' visible='true' version='1' lat='-0.051' lon='0.9' />
<way id='200' visible='true' version='1'>
<nd ref='146' />
<nd ref='144' />
<nd ref='142' />
<nd ref='140' />
<nd ref='138' />
<nd ref='136' />
<nd ref='134' />
<nd ref='132' />
<nd ref='146' />
<tag k='name' v='Circle' />
<tag k='nr' v='6' />
</way>
<way id='202' visible='true' version='1'>
<nd ref='158' />
<nd ref='156' />
<nd ref='154' />
<nd ref='160' />
<nd ref='152' />
<nd ref='150' />
<nd ref='148' />
<nd ref='162' />
<nd ref='158' />
<tag k='name' v='Circle with long name' />
<tag k='nr' v='7' />
</way>
<way id='204' visible='true' version='1'>
<nd ref='166' />
<nd ref='164' />
<tag k='name' v='Short line with long name' />
<tag k='nr' v='5' />
</way>
<way id='206' visible='true' version='1'>
<nd ref='170' />
<nd ref='168' />
<tag k='name' v='Short line' />
<tag k='nr' v='4' />
</way>
<way id='208' visible='true' version='1'>
<nd ref='174' />
<nd ref='172' />
<tag k='name' v='Rendered @ integer pos. ABCDEFGHIJKLMNOPQRSTUVWXYZ' />
<tag k='nr' v='3' />
</way>
<way id='210' visible='true' version='1'>
<nd ref='178' />
<nd ref='176' />
<tag k='name' v='Long line with long name' />
<tag k='nr' v='2' />
</way>
<way id='212' visible='true' version='1'>
<nd ref='198' />
<nd ref='196' />
<nd ref='194' />
<nd ref='192' />
<nd ref='190' />
<nd ref='188' />
<nd ref='186' />
<nd ref='184' />
<nd ref='182' />
<nd ref='180' />
<tag k='name' v='Long line with long name and many points' />
<tag k='nr' v='1' />
</way>
<way id='216' visible='true' version='1'>
<nd ref='217' />
<nd ref='218' />
<tag k='name' v='Short name' />
<tag k='nr' v='8' />
</way>
<way id='240' visible='true' version='1'>
<nd ref='241' />
<nd ref='242' />
<tag k='name' v='Rendered @ non-integer p. ABCDEFGHIJKLMNOPQRSTUVWXYZ' />
<tag k='nr' v='9' />
</way>
</osm>

BIN
tests/visual_tests/images/lines-1-400-400-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
tests/visual_tests/images/lines-1-800-800-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
tests/visual_tests/images/lines-1-800-800-2.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
tests/visual_tests/images/lines-2-400-400-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
tests/visual_tests/images/lines-2-600-600-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
tests/visual_tests/images/lines-2-800-800-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
tests/visual_tests/images/lines-3-400-400-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
tests/visual_tests/images/lines-3-800-800-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
tests/visual_tests/images/lines-3-800-800-2.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
tests/visual_tests/images/lines-shield-400-400-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
tests/visual_tests/images/lines-shield-400-400-2.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
tests/visual_tests/images/lines-shield-800-800-1.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
tests/visual_tests/images/lines-shield-800-800-2.0-agg-reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

4
tests/visual_tests/styles/lines-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/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/lines-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/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/lines-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/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>

4
tests/visual_tests/styles/lines-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/lines.osm</Parameter>
<Parameter name="type">csv</Parameter>
<Parameter name="file">../data/lines.csv</Parameter>
</Datasource>
</Layer>

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.Datasource(**{file=os.path.join(dirname,"data/points.csv"))
layer.styles.append('Style')
m.layers.append(layer)