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

get_turns(L,A) - handled the back endpoint of the Linestring

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-03-03 18:16:02 +01:00
parent ebaf26c0ff
commit 4fd21c2fa7
2 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
View File

@@ -407,12 +407,12 @@ struct get_turn_info_for_endpoint
else if ( ip_j2 )
{
// NOTE: this conversion may be problematic
Point1 i21;
geometry::convert(i2, i21);
side_calculator<Point1, Point2> side_calc(i21, i1, j1, i2, j2, k2);
Point1 i2_conv;
geometry::convert(i2, i2_conv);
side_calculator<Point1, Point2> side_calc(i2_conv, i1, j1, i2, j2, k2);
TurnInfo tp = tp_model;
equal<TurnInfo>::apply(i21, i1, j1, i2, j2, k2,
equal<TurnInfo>::apply(i2_conv, i1, j1, i2, j2, k2,
tp, result.template get<0>(), result.template get<1>(), side_calc);
if ( tp.both(operation_continue) )
@@ -450,13 +450,13 @@ struct get_turn_info_for_endpoint
else if ( ip_i2 )
{
// NOTE: this conversion may be problematic
Point1 j21;
geometry::convert(j2, j21);
Point1 j2_conv;
geometry::convert(j2, j2_conv);
side_calculator<Point1, Point2> side_calc(j21, j1, i1, i2, j2, k2);
side_calculator<Point1, Point2> side_calc(j2_conv, j1, i1, i2, j2, k2);
TurnInfo tp = tp_model;
equal<TurnInfo>::apply(j21, j1, i1, i2, j2, k2,
equal<TurnInfo>::apply(j2_conv, j1, i1, i2, j2, k2,
tp, result.template get<0>(), result.template get<1>(), side_calc);
if ( tp.both(operation_continue) )

44
include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
View File

@@ -356,13 +356,13 @@ struct get_turn_info_linear_areal
bool p1i, p1j, q1i, q1j; // assign false?
bool opposite = result.template get<1>().opposite;
bool same_dirs = result.template get<1>().dir_a == 0 && result.template get<1>().dir_b == 0;
{
int p_how = result.template get<1>().how_a;
int q_how = result.template get<1>().how_b;
int p_arrival = result.template get<1>().arrival[0];
int q_arrival = result.template get<1>().arrival[1];
bool same_dirs = result.template get<1>().dir_a == 0 && result.template get<1>().dir_b == 0;
get_info_e::handle_segment(
is_p_first, is_p_last, p_how, p_arrival,
@@ -376,16 +376,18 @@ struct get_turn_info_linear_areal
pi, pj, pk, qi, qj, qk);
}
// ANALYSE AND ASSIGN FIRST
// IP on the first point of Linear Geometry
if ( EnableFirst && is_p_first && p0i && !q0i )
if ( EnableFirst && is_p_first && p0i && !q0i ) // !q0i prevents duplication
{
TurnInfo tp = tp_model;
tp.operations[0].position = position_front;
tp.operations[1].position = position_middle;
// NOTE: the conversion may be problematic
Point1 qi1;
geometry::convert(qi, qi1);
Point1 qi_conv;
geometry::convert(qi, qi_conv);
method_type replaced_method = method_touch_interior;
@@ -393,8 +395,8 @@ struct get_turn_info_linear_areal
{
if ( !opposite )
{
side_calculator<Point1, Point2> side_calc(qi1, pi, pj, qi, qj, qk);
equal<TurnInfo>::apply(qi1, pi, pj, qi, qj, qk,
side_calculator<Point1, Point2> side_calc(qi_conv, pi, pj, qi, qj, qk);
equal<TurnInfo>::apply(qi_conv, pi, pj, qi, qj, qk,
tp, result.template get<0>(), result.template get<1>(), side_calc);
}
else // opposite -> collinear
@@ -408,13 +410,13 @@ struct get_turn_info_linear_areal
else
{
// NOTE: the conversion may be problematic
Point2 pi2;
geometry::convert(pi, pi2);
Point2 pi_conv;
geometry::convert(pi, pi_conv);
side_calculator<Point1, Point2> side_calc(qi1, pi, pj, qi, pi2, qj);
side_calculator<Point1, Point2> side_calc(qi_conv, pi, pj, qi, pi_conv, qj);
// Collinear, but similar thus handled as equal
equal<TurnInfo>::apply(qi1, pi, pj, qi, pi2, qj,
equal<TurnInfo>::apply(qi_conv, pi, pj, qi, pi_conv, qj,
tp, result.template get<0>(), result.template get<1>(), side_calc);
}
@@ -429,6 +431,28 @@ struct get_turn_info_linear_areal
*out++ = tp;
}
// ANALYSE AND ASSIGN LAST
// IP on the first point of Linear Geometry
if ( EnableLast && is_p_last && p0j && !q0i ) // !q0i prevents duplication
{
TurnInfo tp = tp_model;
tp.method = q0j ? method_touch : method_touch_interior;
tp.operations[0].operation = operation_blocked;
tp.operations[1].operation = operation_union;
tp.operations[0].position = position_back;
tp.operations[1].position = position_middle;
// equals<> or collinear<> will assign the second point,
// we'd like to assign the first one
geometry::convert(result.template get<0>().intersections[0], tp.point);
AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
*out++ = tp;
return true;
}
// don't ignore anything for now
return false;
}