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

Coding style correction : tabs to spaces

Browse source
This commit is contained in:
Alexandre Bonnasseau 2012-11-09 11:57:10 +01:00
parent efff5f0ef0
commit 267975c388
4 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
bindings/python/mapnik_layer.cpp
View file

@ -105,27 +105,27 @@ void set_maximum_extent(mapnik::layer & l, boost::optional<mapnik::box2d<double>
void set_buffer_size(mapnik::layer & l, boost::optional<int> const& buffer_size) void set_buffer_size(mapnik::layer & l, boost::optional<int> const& buffer_size)
{ {
if (buffer_size) if (buffer_size)
{ {
l.set_buffer_size(*buffer_size); l.set_buffer_size(*buffer_size);
} }
else else
{ {
l.reset_buffer_size(); l.reset_buffer_size();
} }
} }
PyObject * get_buffer_size(mapnik::layer & l) PyObject * get_buffer_size(mapnik::layer & l)
{ {
boost::optional<int> buffer_size = l.buffer_size(); boost::optional<int> buffer_size = l.buffer_size();
if (buffer_size) if (buffer_size)
{ {
return PyInt_FromLong(*buffer_size); return PyInt_FromLong(*buffer_size);
} }
else else
{ {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
} }
void export_layer() void export_layer()
@ -249,7 +249,7 @@ void export_layer()
) )
.add_property("buffer_size", .add_property("buffer_size",
&get_buffer_size, &get_buffer_size,
&set_buffer_size, &set_buffer_size,
"Get/Set the size of buffer around layer in pixels.\n" "Get/Set the size of buffer around layer in pixels.\n"
"\n" "\n"

20
include/mapnik/feature_style_processor_impl.hpp
View file

@ -244,16 +244,16 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
box2d<double> buffered_query_ext(query_ext); // buffered box2d<double> buffered_query_ext(query_ext); // buffered
boost::optional<int> layer_buffer_size = lay.buffer_size(); boost::optional<int> layer_buffer_size = lay.buffer_size();
if (layer_buffer_size) // if layer overrides buffer size, use this value to compute buffered extent if (layer_buffer_size) // if layer overrides buffer size, use this value to compute buffered extent
{ {
double extra = 2.0 * m_.scale() * *layer_buffer_size; double extra = 2.0 * m_.scale() * *layer_buffer_size;
buffered_query_ext.width(query_ext.width() + extra); buffered_query_ext.width(query_ext.width() + extra);
buffered_query_ext.height(query_ext.height() + extra); buffered_query_ext.height(query_ext.height() + extra);
} }
else else
{ {
buffered_query_ext = m_.get_buffered_extent(); buffered_query_ext = m_.get_buffered_extent();
} }
// clip buffered extent by maximum extent, if supplied // clip buffered extent by maximum extent, if supplied
boost::optional<box2d<double> > const& maximum_extent = m_.maximum_extent(); boost::optional<box2d<double> > const& maximum_extent = m_.maximum_extent();

2
src/layer.cpp
View file

@ -207,7 +207,7 @@ boost::optional<int> const& layer::buffer_size() const
void layer::reset_buffer_size() void layer::reset_buffer_size()
{ {
buffer_size_.reset(); buffer_size_.reset();
} }

44
tests/python_tests/layer_buffer_size_test.py
View file

@ -11,30 +11,30 @@ def setup():
os.chdir(execution_path('.')) os.chdir(execution_path('.'))
def test_layer_buffer_size_1(): def test_layer_buffer_size_1():
m = mapnik.Map(512,512) m = mapnik.Map(512,512)
mapnik.load_map(m,'../data/good_maps/layer_buffer_size_reduction.xml') mapnik.load_map(m,'../data/good_maps/layer_buffer_size_reduction.xml')
m.zoom_all() m.zoom_all()
im = mapnik.Image(m.width,m.height) im = mapnik.Image(m.width,m.height)
mapnik.render(m,im) mapnik.render(m,im)
actual = '/tmp/mapnik-layer-buffer-size.png' actual = '/tmp/mapnik-layer-buffer-size.png'
expected = 'images/support/mapnik-layer-buffer-size.png' expected = 'images/support/mapnik-layer-buffer-size.png'
im.save(actual) im.save(actual)
expected_im = mapnik.Image.open(expected) expected_im = mapnik.Image.open(expected)
eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
def test_layer_buffer_size_2(): def test_layer_buffer_size_2():
actual = '/tmp/mapnik-layer-buffer-size-cairo.png' actual = '/tmp/mapnik-layer-buffer-size-cairo.png'
expected = 'images/support/mapnik-layer-buffer-size-cairo.png' expected = 'images/support/mapnik-layer-buffer-size-cairo.png'
m = mapnik.Map(512,512) m = mapnik.Map(512,512)
mapnik.load_map(m,'../data/good_maps/layer_buffer_size_reduction.xml') mapnik.load_map(m,'../data/good_maps/layer_buffer_size_reduction.xml')
m.zoom_all() m.zoom_all()
surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, m.width, m.height) surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, m.width, m.height)
mapnik.render(m, surface) mapnik.render(m, surface)
surface.write_to_png(actual) surface.write_to_png(actual)
surface.finish() surface.finish()
expected_im = mapnik.Image.open(expected) expected_im = mapnik.Image.open(expected)
actual_im = mapnik.Image.open(actual) actual_im = mapnik.Image.open(actual)
eq_(actual_im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) eq_(actual_im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
if __name__ == "__main__": if __name__ == "__main__":