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

add tests for map 'base' parameter

Browse source
This commit is contained in:
Dane Springmeyer 2011-05-25 23:51:08 +00:00
parent 7a17c7e597
commit b7a0204bf2
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG
View file

@ -14,6 +14,12 @@ For a complete change history, see the SVN log.
Mapnik Trunk
------------
- Added map.base parameter that can be set to control where files with relative paths should be interpreted
from when a map is loaded from a string or saved to a string. It defaults to an empty string which means
that the base path will be the current working directory of the mapnik process. When a stylesheet is read
from a file that files directory is used. And a custom value can still be passed as an argument to
load_map_from_string().
- Added python function 'render_grid' to allow conversion of grid buffer to python object containing list of grid
pixels, list of keys, and a and dictionary of feature attributes.

21
tests/python_tests/object_test.py
View file

@ -344,16 +344,14 @@ def test_map_init():
eq_(m.width, 256)
eq_(m.height, 256)
eq_(m.srs, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
eq_(m.base, '')
m = mapnik2.Map(256, 256, '+proj=latlong')
eq_(m.width, 256)
eq_(m.height, 256)
eq_(m.srs, '+proj=latlong')
# Map initialization from string
def test_map_init_from_string():
map_string = '''<Map background-color="steelblue" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
map_string = '''<Map background-color="steelblue" base="./" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="My Style">
<Rule>
<PolygonSymbolizer>
@ -375,10 +373,19 @@ def test_map_init_from_string():
</Map>'''
m = mapnik2.Map(600, 300)
eq_(m.base, '')
mapnik2.load_map_from_string(m, map_string)
mapnik2.load_map_from_string(m, map_string, False, "")
mapnik2.load_map_from_string(m, map_string, True, "")
eq_(m.base, './')
mapnik2.load_map_from_string(m, map_string, False, "") # this "" will have no effect
eq_(m.base, './')
try:
mapnik2.load_map_from_string(m, map_string, False, "/tmp")
except RuntimeError:
pass # runtime error expected because shapefile path should be wrong and datasource will throw
eq_(m.base, '/tmp') # /tmp will be set despite the exception because load_map mostly worked
m.base = 'foo'
mapnik2.load_map_from_string(m, map_string, True, ".")
eq_(m.base, '.')
raise(Todo("Need to write more map property tests in 'object_test.py'..."))
# Map pickling