Merge pull request #705 from tensafefrogs/flight-path-clear-on-arm

Clear the previous flight path when arming. Fixes #701.
DroidPlanner · Mar 26, 2014 · 600d840 · 600d840
2 parents c3ea4c0 + 5849b7e
commit 600d840
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/DroidPlanner/src/org/droidplanner/fragments/FlightMapFragment.java b/DroidPlanner/src/org/droidplanner/fragments/FlightMapFragment.java
@@ -29,7 +29,7 @@
 import com.google.android.gms.maps.model.PolylineOptions;
 
 public class FlightMapFragment extends DroneMap implements
-		OnMapLongClickListener, OnMarkerClickListener, OnMarkerDragListener,GuidedDialogListener {
+		OnMapLongClickListener, OnMarkerClickListener, OnMarkerDragListener, GuidedDialogListener {
 
 	private static final int ZOOM_LEVEL = 20;
 
@@ -156,6 +156,12 @@ public boolean onMarkerClick(Marker marker) {
 	@Override
 	public void onDroneEvent(DroneEventsType event, Drone drone) {
 		switch (event) {
+        case ARMING:
+            // Clear the previous flight path when arming.
+            if (drone.state.isArmed()) {
+                clearFlightPath();
+            }
+            break;
 		case GPS:
 			droneLeashPath.update(drone.guidedPoint);
 			addFlightPathPoint(drone.GPS