Merge branch 'master' into release

Author: arthurbenemann

ChangeLog.md

@@ -1,3 +1,7 @@
+## Droidplanner v2.1.1
+* Fix Parameters screen issue (#613)
+* Making flight screen mission markers un-draggable (#614)
+
 ## Droidplanner v2.1.0
 * Implemented the Survey Tool
 

DroidPlanner/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.droidplanner"
-          android:versionCode="58"
+          android:versionCode="59"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk

DroidPlanner/src/org/droidplanner/adapters/ParamsAdapter.java

@@ -242,7 +242,8 @@ public double getValue() {
             try {
                 return formatter.parse(valueView.getText().toString()).doubleValue();
             } catch (ParseException ex) {
-                throw new NumberFormatException(ex.getMessage());
+                // invalid number, return 0
+                return 0;
             }
         }
 

DroidPlanner/src/org/droidplanner/fragments/EditorMapFragment.java

@@ -152,4 +152,9 @@ public boolean onMarkerClick(Marker marker) {
 		}
 	}
 
+	@Override
+	protected boolean isMissionDraggable() {
+		return true;
+	}
+
 }

DroidPlanner/src/org/droidplanner/fragments/FlightMapFragment.java

@@ -172,4 +172,9 @@ public void onDroneEvent(DroneEventsType event, Drone drone) {
 		}
 		super.onDroneEvent(event,drone);
 	}
+
+	@Override
+	protected boolean isMissionDraggable() {
+		return false;
+	}
 }

DroidPlanner/src/org/droidplanner/fragments/helpers/DroneMap.java

@@ -29,6 +29,8 @@ public abstract class DroneMap extends OfflineMapFragment implements OnDroneList
 	public Drone drone;
 	public Mission mission;
 	protected Context context;
+	
+	protected abstract boolean isMissionDraggable();
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup viewGroup,
@@ -117,7 +119,7 @@ public void update() {
 			markers.updateMarker(home, false, context);
 		}
 
-		markers.updateMarkers(mission.getMarkers(), true, context);
+		markers.updateMarkers(mission.getMarkers(), isMissionDraggable(), context);
 
 		missionPath.update(mission);
 	}