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

centroid - re-implement avoiding inefficient remove_empty

Browse source
This commit is contained in:
artemp 2016-07-11 10:44:59 +01:00
parent 033c54617c
commit 01e962d216
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/mapnik/geometry_centroid.hpp
View file

@ -105,17 +105,29 @@ private:
}
template <typename Geom>
result_type centroid_multi(Geom const & geom) const
result_type centroid_multi(Geom const & multi_geom) const
{
// https://github.com/mapnik/mapnik/issues/3169
#if BOOST_VERSION <= 105900
if (mapnik::geometry::has_empty(geom))
if (mapnik::geometry::has_empty(multi_geom))
{
Geom stripped = mapnik::geometry::remove_empty(geom);
return centroid_simple(stripped);
mapnik::geometry::multi_point<T> multi_pt;
multi_pt.reserve(multi_geom.size());
for (auto const& geom : multi_geom)
{
try
{
point<T> c;
boost::geometry::centroid(geom, c);
multi_pt.push_back(std::move(c));
}
catch (boost::geometry::centroid_exception const & e) {}
}
return centroid_simple(multi_pt);
}
#endif
return centroid_simple(geom);
return centroid_simple(multi_geom);
}
};