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

grid_vertex_converter: Fix handling of empty polygon

Browse source
This commit is contained in:
Jiri Drbalek 2018-02-13 14:13:34 +00:00
parent a602c65354
commit 2f2dcf1eea
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/mapnik/grid_vertex_converter.hpp
View file

@ -168,14 +168,17 @@ private:
double get_hit_bitmap_scale(box2d<T> const& envelope) const double get_hit_bitmap_scale(box2d<T> const& envelope) const
{ {
T size = envelope.width() * envelope.height(); if (envelope.valid())
// Polygon with huge area can lead to excessive memory allocation.
// This is more or less arbitrarily chosen limit for the maximum bitmap resolution.
// Bitmap bigger than this limit is scaled down to fit into this resolution.
const std::size_t max_size = 8192 * 8192;
if (size > max_size)
{ {
return std::sqrt(max_size / size); T size = envelope.width() * envelope.height();
// Polygon with huge area can lead to excessive memory allocation.
// This is more or less arbitrarily chosen limit for the maximum bitmap resolution.
// Bitmap bigger than this limit is scaled down to fit into this resolution.
const std::size_t max_size = 8192 * 8192;
if (size > max_size)
{
return std::sqrt(max_size / size);
}
} }
return 1; return 1;
} }
@ -212,15 +215,17 @@ private:
double scale_factor) const double scale_factor) const
{ {
mapnik::geometry::point<T> interior; mapnik::geometry::point<T> interior;
if (!mapnik::geometry::interior(poly, scale_factor, interior)) if (envelope.valid())
{ {
auto center = envelope.center(); if (!mapnik::geometry::interior(poly, scale_factor, interior))
interior.x = center.x; {
interior.y = center.y; auto center = envelope.center();
interior.x = center.x;
interior.y = center.y;
}
vt_.forward(&interior.x, &interior.y);
} }
vt_.forward(&interior.x, &interior.y);
return interior; return interior;
} }