fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 02:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

geofence: there is no altitude for geofence vertices, remove the TODO

Browse Source
This commit is contained in:
Beat Küng
2017-08-04 18:08:51 +02:00
committed by Lorenz Meier
parent 0ed29192b8
commit e52491c023
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/geofence.cpp
+1 -3
View File
@@ -324,8 +324,6 @@ bool Geofence::insidePolygon(const PolygonInfo &polygon, double lat, double lon,
(double)(temp_vertex_j.lon - temp_vertex_i.lon) + (double)temp_vertex_i.lat)) { (double)(temp_vertex_j.lon - temp_vertex_i.lon) + (double)temp_vertex_i.lat)) {
c = !c; c = !c;
} }
// TODO: handle altitude
} }
return c; return c;
@@ -385,7 +383,7 @@ Geofence::loadFromFile(const char *filename)
vertex.frame = MAV_FRAME_GLOBAL; vertex.frame = MAV_FRAME_GLOBAL;
vertex.nav_cmd = MAV_CMD_NAV_FENCE_POLYGON_VERTEX_INCLUSION; vertex.nav_cmd = MAV_CMD_NAV_FENCE_POLYGON_VERTEX_INCLUSION;
vertex.vertex_count = 0; // this will be filled in a second pass vertex.vertex_count = 0; // this will be filled in a second pass
vertex.alt = 0; // TODO: does this make sense? vertex.alt = 0; // alt is not used
/* if the line starts with DMS, this means that the coordinate is given as degree minute second instead of decimal degrees */ /* if the line starts with DMS, this means that the coordinate is given as degree minute second instead of decimal degrees */
if (line[textStart] == 'D' && line[textStart + 1] == 'M' && line[textStart + 2] == 'S') { if (line[textStart] == 'D' && line[textStart + 1] == 'M' && line[textStart + 2] == 'S') {