diff --git a/commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java b/commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java new file mode 100644 index 000000000..1f2244bf8 --- /dev/null +++ b/commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java @@ -0,0 +1,23 @@ +package fr.free.nrw.commons.caching; + +import android.content.Context; +import android.util.Log; + +/** + * Created by misao on 05-Jan-16. + */ +public class CacheController { + + private Context context; + private String coords; + + public CacheController(Context context, String coords) { + this.context = context; + this.coords = coords; + } + + public String getCoords() { + Log.d("Cache", "Coords passed to cache: " + coords); + return coords; + } +} diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java index 88191b894..25815da5a 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java @@ -68,7 +68,8 @@ public class GPSExtractor { decLongitude = 0 - convertToDegree(longitude); } - return (String.valueOf(decLatitude) + "|" + String.valueOf(decLongitude)); + //Have to return Longitude before Latitude for X/Y conversion. Long = X; Lat = Y + return ("Long|Lat" + String.valueOf(decLongitude) + "|" + String.valueOf(decLatitude)); } private double convertToDegree(String stringDMS){ diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 18d1ebebf..200a0d660 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -11,6 +11,7 @@ import android.util.Log; import android.widget.*; import fr.free.nrw.commons.*; +import fr.free.nrw.commons.caching.CacheController; import fr.free.nrw.commons.modifications.CategoryModifier; import fr.free.nrw.commons.modifications.TemplateRemoveModifier; import fr.free.nrw.commons.CommonsApplication; @@ -188,9 +189,12 @@ public class ShareActivity Log.d("Image", "Coords of image: " + coords); //TODO: Insert cache query here, only send API request if no cached categories + CacheController cacheObj = new CacheController(this, coords); + cacheObj.getCoords(); + - MwVolleyApi apiCall = new MwVolleyApi(this); //asynchronous calls to MediaWiki Commons API to match image coords with nearby Commons categories + MwVolleyApi apiCall = new MwVolleyApi(this); apiCall.request(coords); } }