Skip to content

Commit cc06439

Browse files
committed
[turns] correct variable names, remove old unused functionality
1 parent d01d6b1 commit cc06439

1 file changed

Lines changed: 4 additions & 15 deletions

File tree

include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -369,15 +369,6 @@ struct touch : public base_turn_handler
369369
return side1 == side2 && ! opposite(side1, turn);
370370
}
371371

372-
/*static inline void block_second(bool block, TurnInfo& ti)
373-
{
374-
if (block)
375-
{
376-
ti.operations[1].operation = operation_blocked;
377-
}
378-
}*/
379-
380-
381372
template
382373
<
383374
typename UniqueSubRange1,
@@ -457,7 +448,6 @@ struct touch : public base_turn_handler
457448
{
458449
ti.operations[1].operation = operation_blocked;
459450
}
460-
//block_second(block_q, ti);
461451
return;
462452
}
463453

@@ -483,7 +473,6 @@ struct touch : public base_turn_handler
483473
{
484474
ti.touch_only = true;
485475
}
486-
//block_second(block_q, ti);
487476
return;
488477
}
489478
}
@@ -608,16 +597,16 @@ struct equal : public base_turn_handler
608597

609598
typedef detail::distance_measure<coordinate_type> dm_type;
610599

611-
dm_type const dm_qk_p
600+
dm_type const dm_pk_q2
612601
= get_distance_measure(range_q.at(1), range_q.at(2), range_p.at(2));
613-
dm_type const dm_pk_q
602+
dm_type const dm_qk_p2
614603
= get_distance_measure(range_p.at(1), range_p.at(2), range_q.at(2));
615604

616-
if (dm_pk_q.measure != dm_qk_p.measure)
605+
if (dm_qk_p2.measure != dm_pk_q2.measure)
617606
{
618607
// A (possibly very small) difference is detected, which
619608
// can be used to distinguish between union/intersection
620-
ui_else_iu(dm_pk_q.measure < dm_qk_p.measure, ti);
609+
ui_else_iu(dm_qk_p2.measure < dm_pk_q2.measure, ti);
621610
return;
622611
}
623612
}

0 commit comments

Comments
 (0)