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

geometry_is_simple - fix handling multi-geometries (1.59)

Browse source
This commit is contained in:
artemp 2015-10-06 16:14:20 +01:00
parent 5915c4e7a5
commit 8ec1e3e73d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mapnik/geometry_is_simple.hpp
View file

@ -105,7 +105,11 @@ struct geometry_is_simple
// https://svn.boost.org/trac/boost/ticket/11710 // https://svn.boost.org/trac/boost/ticket/11710
return true; return true;
} }
return boost::geometry::is_simple(multi_line); for (auto const& line : multi_line)
{
if (!(*this)(line)) return false;
}
return true;
} }
template <typename T> template <typename T>
result_type operator() (multi_polygon<T> const& multi_poly) const result_type operator() (multi_polygon<T> const& multi_poly) const
@ -116,7 +120,11 @@ struct geometry_is_simple
// https://svn.boost.org/trac/boost/ticket/11710 // https://svn.boost.org/trac/boost/ticket/11710
return true; return true;
} }
return boost::geometry::is_simple(multi_poly); for (auto const& poly : multi_poly)
{
if (!(*this)(poly)) return false;
}
return true;
} }
}; };