Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_OABendyRuler: cope with polyfence holding boundary points

This commit is contained in:
Peter Barker 2019-06-12 11:28:23 +10:00 committed by Randy Mackay
parent 3a7f1b882e
commit dfca32a2af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AC_Avoidance/AP_OABendyRuler.cpp
View File

@ -206,13 +206,13 @@ bool AP_OABendyRuler::calc_margin_from_polygon_fence(const Location &start, cons
if (fence == nullptr) {
return false;
}
if (((fence->get_enabled_fences() & AC_FENCE_TYPE_POLYGON) == 0) || !fence->is_polygon_valid()) {
if (((fence->get_enabled_fences() & AC_FENCE_TYPE_POLYGON) == 0) || !fence->polyfence_const().valid_const()) {
return false;
}
// get polygon boundary
uint16_t num_points;
const Vector2f* boundary = fence->get_boundary_points(num_points);
const Vector2f* boundary = fence->polyfence_const().get_boundary_points(num_points);
if (num_points < 3) {
// this should have already been checked by is_polygon_valid() but just in case
return false;