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

small changes of methods/operations and comments to generation of turns for the first points

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-01-08 17:09:59 +01:00
parent 518156a727
commit a326d7a258
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/geometry/algorithms/detail/relate/turns.hpp
View File

@@ -310,6 +310,8 @@ struct get_turn_info_linear_linear
// NEW VERSION BEGINS HERE
// TODO: maybe turns should be calculated WRT Q since we might assume that Q may be Areal CW
int spi = result.template get<1>().sides.sides[0].first;
int spj = result.template get<1>().sides.sides[0].second;
int sqi = result.template get<1>().sides.sides[1].first;
@@ -318,16 +320,17 @@ struct get_turn_info_linear_linear
TurnInfo tp = tp_model;
// collinear collinear arbitrary
// |-------> |-------> |--->
// |---->-->--> <--<----|--| <---|
// Both first points are IPs
if ( is_p_first_ip && is_q_first_ip )
{
// collinear collinear
// |-------> |------->
// |---->-->--> <--<----|--|
if ( ip_count == 2 )
{
if ( !col_op )
{
assign(pi, qi, result, pi, ov::method_equal, ov::operation_continue, ov::operation_continue, tp, out);
assign(pi, qi, result, pi, ov::method_touch, ov::operation_continue, ov::operation_continue, tp, out);
}
else
{
@@ -335,8 +338,8 @@ struct get_turn_info_linear_linear
bool equal_ji = equals::equals_point_point(pj, qi);
if ( equal_ij && equal_ji )
{
assign(pi, qi, result, pi, ov::method_equal, ov::operation_continue, ov::operation_continue, tp, out);
assign(pi, qi, result, qi, ov::method_equal, ov::operation_continue, ov::operation_continue, tp, out);
assign(pi, qi, result, pi, ov::method_touch, ov::operation_continue, ov::operation_continue, tp, out);
assign(pi, qi, result, qi, ov::method_equal, ov::operation_opposite, ov::operation_opposite, tp, out);
}
else
{
@@ -345,7 +348,7 @@ struct get_turn_info_linear_linear
if ( equal_ij )
{
assign(pi, qi, result, pi, ov::method_touch, ov::operation_continue, ov::operation_continue, tp, out);
assign(pi, qi, result, qi, ov::method_touch_interior, ov::operation_union, ov::operation_blocked, tp, out);
assign(pi, qi, result, qi, ov::method_touch_interior, ov::operation_opposite, ov::operation_opposite, tp, out);
}
else if ( equal_ji )
{
@@ -360,7 +363,10 @@ struct get_turn_info_linear_linear
}
}
}
else
// arbitrary
// |--->
// <---|
else // ip_count == 1
{
// TODO: Is this ok? Assuming that Q is considered as CW