Fixed wrong storing of Corrected coordinates

arcao · Apr 10, 2014 · 2aab09f · 2aab09f
1 parent fef66c0
commit 2aab09f
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/src/locus/api/mapper/LocusDataMapper.java b/src/locus/api/mapper/LocusDataMapper.java
@@ -153,16 +153,11 @@ protected static void updateCacheLocationByCorrectedCoordinates(Context mContext
 		if (correctedCoordinateUserWaypoint == null)
 			return;
 
-		Location originalLocation = p.getLocation();
-
-		Location newLocation = new Location(correctedCoordinateUserWaypoint.getClass().getName());
-		newLocation.setLatitude(correctedCoordinateUserWaypoint.getLatitude());
-		newLocation.setLongitude(correctedCoordinateUserWaypoint.getLongitude());
-		p.getLocation().set(newLocation);
+		Location location = p.getLocation();
 
 		p.gcData.setComputed(true);
-		p.gcData.setLatOriginal(originalLocation.getLatitude());
-		p.gcData.setLonOriginal(originalLocation.getLongitude());
+		p.gcData.setLatOriginal(location.getLatitude());
+		p.gcData.setLonOriginal(location.getLongitude());
 
 		// store original location to waypoint
 		GeocachingWaypoint waypoint = getWaypointByNamePrefix(p, ORIGINAL_COORDINATES_WAYPOINT_PREFIX);
@@ -174,8 +169,14 @@ protected static void updateCacheLocationByCorrectedCoordinates(Context mContext
 		waypoint.setCode(ORIGINAL_COORDINATES_WAYPOINT_PREFIX + p.gcData.getCacheID().substring(2));
 		waypoint.setType(GeocachingWaypoint.CACHE_WAYPOINT_TYPE_REFERENCE);
 		waypoint.setName(mContext.getString(R.string.original_coordinates_name));
-		waypoint.setLat(originalLocation.getLatitude());
-		waypoint.setLon(originalLocation.getLongitude());
+		waypoint.setLat(location.getLatitude());
+		waypoint.setLon(location.getLongitude());
+
+		// update coordinates to new location
+		Location newLocation = new Location(correctedCoordinateUserWaypoint.getClass().getName());
+		newLocation.setLatitude(correctedCoordinateUserWaypoint.getLatitude());
+		newLocation.setLongitude(correctedCoordinateUserWaypoint.getLongitude());
+		location.set(newLocation);
 	}
 
 	protected static GeocachingWaypoint toLocusWaypoint(com.arcao.geocaching.api.data.Waypoint waypoint) {
@@ -492,11 +493,10 @@ public static Waypoint fixComputedCoordinates(Context mContext, Waypoint toPoint
 		if (!fromPoint.gcData.isComputed() || toPoint.gcData.isComputed())
 			return toPoint;
 
-		Location original = toPoint.getLocation();
+		Location location = toPoint.getLocation();
 
-		toPoint.getLocation().set(fromPoint.getLocation());
-		toPoint.gcData.setLatOriginal(original.getLatitude());
-		toPoint.gcData.setLonOriginal(original.getLongitude());
+		toPoint.gcData.setLatOriginal(location.getLatitude());
+		toPoint.gcData.setLonOriginal(location.getLongitude());
 		toPoint.gcData.setComputed(true);
 
 		// store original location to waypoint
@@ -509,10 +509,11 @@ public static Waypoint fixComputedCoordinates(Context mContext, Waypoint toPoint
 		waypoint.setCode(ORIGINAL_COORDINATES_WAYPOINT_PREFIX + toPoint.gcData.getCacheID().substring(2));
 		waypoint.setType(GeocachingWaypoint.CACHE_WAYPOINT_TYPE_REFERENCE);
 		waypoint.setName(mContext.getString(R.string.original_coordinates_name));
-		waypoint.setLat(original.getLatitude());
-		waypoint.setLon(original.getLongitude());
-
+		waypoint.setLat(location.getLatitude());
+		waypoint.setLon(location.getLongitude());
 
+		// update coordinates to new location
+		location.set(fromPoint.getLocation());
 		return toPoint;
 	}