boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 11:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:boostorg/geometry into develop

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-05-18 00:21:38 +02:00
parent c4ca605bab e79e6c9e2e
commit e6fccafd40
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/test/algorithms/dissolve.cpp
View File

@@ -273,6 +273,13 @@ void test_all()
"POLYGON((5 0,2.5 9,9.5 3.5,0.5 3.5,7.5 9,5 0))",
0, 11, 25.6158412);
// CCW polygons should turn CW after dissolve
test_one<polygon, polygon>("cw",
"POLYGON((2 8,8 8,8 0,0 0,0 6,4 6,4 4,2 4,2 8))",
0, 7, 60);
test_one<polygon, polygon>("ccw",
"POLYGON((2 8,2 4,4 4,4 6,0 6,0 0,8 0,8 8,2 8))",
0, 12, 64); // TODO: should have the same, 7, 60. The polygon is dissolved (splitted) but the extra polygon is still on top of the other
// Multi-geometries
{

7
include/boost/geometry/extensions/algorithms/detail/overlay/dissolver.hpp
View File

@@ -125,7 +125,12 @@ class plusmin_policy
//negative = true;
typedef typename geometry::point_type<Geometry2>::type point_type;
typedef overlay::turn_info<point_type> turn_info;
typedef overlay::turn_info
<
point_type,
typename segment_ratio_type<point_type, RescalePolicy>::type
> turn_info;
std::deque<turn_info> turns;
// Get (and stop on) any intersection