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

finish porting pip to geometry.hpp

Browse source
This commit is contained in:
Dane Springmeyer 2016-09-02 11:08:33 -07:00
parent cc446f8ed7
commit e0d82f90de
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/mapnik/hit_test_filter.hpp
View file

@ -91,31 +91,16 @@ struct hit_test_visitor
} }
bool operator() (geometry::polygon<double> const& poly) const bool operator() (geometry::polygon<double> const& poly) const
{ {
//auto const& exterior = geom.exterior_ring;
//std::size_t num_points = exterior.size();
//if (num_points < 4) return false;
//for (std::size_t i = 1; i < num_points; ++i)
//{
// auto const& pt0 = exterior[i-1];
// auto const& pt1 = exterior[i];
// todo - account for tolerance
// if (pip(pt0.x,pt0.y,pt1.x,pt1.y,x_,y_))
// {
// inside = !inside;
// }
//}
//if (!inside) return false;
//// FIXME !!!
bool inside = false; bool inside = false;
bool exterior = true; std::size_t ring_count = 0;
for (auto const& ring : poly) for (auto const& ring : poly)
{ {
++ring_count;
bool is_exterior = (ring_count == 1);
std::size_t num_points = ring.size(); std::size_t num_points = ring.size();
if (num_points < 4) if (num_points < 4)
{ {
if (exterior) return false; if (is_exterior) return false;
else continue; else continue;
} }
@ -129,8 +114,8 @@ struct hit_test_visitor
inside = !inside; inside = !inside;
} }
} }
if (is_exterior && !inside) return false;
} }
////////////////////////////
return inside; return inside;
} }
bool operator() (geometry::multi_polygon<double> const& geom) const bool operator() (geometry::multi_polygon<double> const& geom) const