Uploading of modified coords to geocaching.com

1 files changed, 48 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index f2a86d9..68f4149 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -373,6 +373,8 @@ public abstract class GCParser {
 
         cache.setOwn(StringUtils.equalsIgnoreCase(cache.getOwnerUserId(), Settings.getUsername()));
 
+        cache.setUserModifiedCoords(false);
+
         String tableInside = page;
 
         int pos = tableInside.indexOf(GCConstants.STRING_CACHEDETAILS);
@@ -606,7 +608,7 @@ public abstract class GCParser {
             final String originalCoords = BaseUtils.getMatch(page, GCConstants.PATTERN_LATLON_ORIG, false, null);
 
             if (null != originalCoords) {
-                final cgWaypoint waypoint = new cgWaypoint(cgeoapplication.getInstance().getString(R.string.cache_coordinates_original), WaypointType.WAYPOINT, false);
+                final cgWaypoint waypoint = new cgWaypoint(cgeoapplication.getInstance().getString(R.string.cache_coordinates_original), WaypointType.ORIGINAL, false);
                 waypoint.setCoords(new Geopoint(originalCoords));
                 cache.addOrChangeWaypoint(waypoint, false);
                 cache.setUserModifiedCoords(true);
@@ -1659,4 +1661,49 @@ public abstract class GCParser {
         }
     }
 
+    public static boolean uploadModifiedCoordinates(cgCache cache, Geopoint wpt) {
+        return editModifiedCoordinates(cache, wpt);
+    }
+
+    public static boolean deleteModifiedCoordinates(cgCache cache) {
+        return editModifiedCoordinates(cache, null);
+    }
+
+    public static boolean editModifiedCoordinates(cgCache cache, Geopoint wpt) {
+        final String page = requestHtmlPage(cache.getGeocode(), null, "n", "0");
+        final String userToken = BaseUtils.getMatch(page, GCConstants.PATTERN_USERTOKEN, "");
+        if (StringUtils.isEmpty(userToken)) {
+            return false;
+        }
+        final String uriPrefix = "http://www.geocaching.com/seek/cache_details.aspx/";
+
+        JSONObject jo;
+        try {
+            if (wpt != null) {
+                jo = new JSONObject().put("dto", (new JSONObject().put("ut", userToken)
+                        .put("data", new JSONObject()
+                                .put("lat", wpt.getLatitudeE6() / 1E6)
+                                .put("lng", wpt.getLongitudeE6() / 1E6))));
+            } else {
+                jo = new JSONObject().put("dto", (new JSONObject().put("ut", userToken)));
+            }
+
+            final String uriSuffix = wpt != null ? "SetUserCoordinate" : "ResetUserCoordinate";
+
+            HttpResponse response = Network.postJsonRequest(uriPrefix + uriSuffix, jo);
+            Log.i("Sending to " + uriPrefix + uriSuffix + " :" + jo.toString());
+
+            if (response != null && response.getStatusLine().getStatusCode() == 200) {
+                Log.i("GCParser.editModifiedCoordinates - edited on GC.com");
+                return true;
+            }
+
+        } catch (JSONException e) {
+            Log.e("Unknown exception with json wrap code");
+            e.printStackTrace();
+        }
+        Log.e("GCParser.deleteModifiedCoordinates - cannot delete modified coords");
+        return false;
+    }
+
 }