From f0b9d35bfd9c346f64f253551264193749e9b9eb Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Wed, 3 Feb 2016 16:05:12 +1300
Subject: [PATCH] Minor formatting/comments

---
 .../fr/free/nrw/commons/upload/GPSExtractor.java     | 12 ++++--------
 .../fr/free/nrw/commons/upload/ShareActivity.java    |  3 ++-
 2 files changed, 6 insertions(+), 9 deletions(-)

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 df42f46ee..f841d1d06 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
@@ -13,7 +13,7 @@ public class GPSExtractor {
 
     private String filePath;
     private double decLatitude, decLongitude;
-    Context context;
+    private Context context;
     private static final String TAG = GPSExtractor.class.getName();
     public boolean imageCoordsExists;
 
@@ -54,17 +54,17 @@ public class GPSExtractor {
         }
         else {
             imageCoordsExists = true;
+            Log.d(TAG, "Picture has GPS info");
+
             latitude = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE);
             latitude_ref = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF);
             longitude = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE);
             longitude_ref = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF);
-
-
             Log.d("Image", "Latitude: " + latitude + " " + latitude_ref);
             Log.d("Image", "Longitude: " + longitude + " " + longitude_ref);
+
             decimalCoords = getDecimalCoords(latitude, latitude_ref, longitude, longitude_ref);
             return decimalCoords;
-
         }
     }
 
@@ -79,8 +79,6 @@ public class GPSExtractor {
     //Converts format of coords into decimal coords as required by MediaWiki API
     private String getDecimalCoords(String latitude, String latitude_ref, String longitude, String longitude_ref) {
 
-
-
         if(latitude_ref.equals("N")){
             decLatitude = convertToDegree(latitude);
         }
@@ -100,7 +98,6 @@ public class GPSExtractor {
         return decimalCoords;
     }
 
-
     private double convertToDegree(String stringDMS){
         double result;
         String[] DMS = stringDMS.split(",", 3);
@@ -123,5 +120,4 @@ public class GPSExtractor {
         result = degrees + (minutes/60) + (seconds/3600);
         return result;
     }
-
 }
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 7bae66c1f..f07dce191 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
@@ -201,8 +201,9 @@ public  class       ShareActivity
             //extract the coordinates of image in decimal degrees
             Log.d(TAG, "Calling GPSExtractor");
             GPSExtractor imageObj = new GPSExtractor(filePath, this);
-            String decimalCoords = imageObj.getCoords();
 
+            //Gets image coords if exist, otherwise gets last known coords
+            String decimalCoords = imageObj.getCoords();
 
             if (decimalCoords != null) {
                 Log.d(TAG, "Decimal coords of image: " + decimalCoords);