mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Minor formatting/comments

Browse source
This commit is contained in:
misaochan 2016-02-03 16:05:12 +13:00
parent e05f78ce85
commit f0b9d35bfd
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
View file

@ -13,7 +13,7 @@ public class GPSExtractor {
private String filePath; private String filePath;
private double decLatitude, decLongitude; private double decLatitude, decLongitude;
Context context; private Context context;
private static final String TAG = GPSExtractor.class.getName(); private static final String TAG = GPSExtractor.class.getName();
public boolean imageCoordsExists; public boolean imageCoordsExists;
@ -54,17 +54,17 @@ public class GPSExtractor {
} }
else { else {
imageCoordsExists = true; imageCoordsExists = true;
Log.d(TAG, "Picture has GPS info");
latitude = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE); latitude = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE);
latitude_ref = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF); latitude_ref = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF);
longitude = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE); longitude = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE);
longitude_ref = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF); longitude_ref = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF);
Log.d("Image", "Latitude: " + latitude + " " + latitude_ref); Log.d("Image", "Latitude: " + latitude + " " + latitude_ref);
Log.d("Image", "Longitude: " + longitude + " " + longitude_ref); Log.d("Image", "Longitude: " + longitude + " " + longitude_ref);
decimalCoords = getDecimalCoords(latitude, latitude_ref, longitude, longitude_ref); decimalCoords = getDecimalCoords(latitude, latitude_ref, longitude, longitude_ref);
return decimalCoords; return decimalCoords;
} }
} }
@ -79,8 +79,6 @@ public class GPSExtractor {
//Converts format of coords into decimal coords as required by MediaWiki API //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) { private String getDecimalCoords(String latitude, String latitude_ref, String longitude, String longitude_ref) {
if(latitude_ref.equals("N")){ if(latitude_ref.equals("N")){
decLatitude = convertToDegree(latitude); decLatitude = convertToDegree(latitude);
} }
@ -100,7 +98,6 @@ public class GPSExtractor {
return decimalCoords; return decimalCoords;
} }
private double convertToDegree(String stringDMS){ private double convertToDegree(String stringDMS){
double result; double result;
String[] DMS = stringDMS.split(",", 3); String[] DMS = stringDMS.split(",", 3);
@ -123,5 +120,4 @@ public class GPSExtractor {
result = degrees + (minutes/60) + (seconds/3600); result = degrees + (minutes/60) + (seconds/3600);
return result; return result;
} }
} }

3
commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -201,8 +201,9 @@ public class ShareActivity
//extract the coordinates of image in decimal degrees //extract the coordinates of image in decimal degrees
Log.d(TAG, "Calling GPSExtractor"); Log.d(TAG, "Calling GPSExtractor");
GPSExtractor imageObj = new GPSExtractor(filePath, this); 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) { if (decimalCoords != null) {
Log.d(TAG, "Decimal coords of image: " + decimalCoords); Log.d(TAG, "Decimal coords of image: " + decimalCoords);