Show DMS representation of the location

Closes #32
pR0Ps · Jan 19, 2019 · 9607c4b · 9607c4b
1 parent 9e8384e
commit 9607c4b
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/app/src/main/java/ca/cmetcalfe/locationshare/MainActivity.java b/app/src/main/java/ca/cmetcalfe/locationshare/MainActivity.java
@@ -151,10 +151,10 @@ private void updateLocation(Location location) {
 
         if (haveLocation) {
             String newline = System.getProperty("line.separator");
-            detailsText.setText(String.format("%s: %s%s%s: %s%s%s: %s",
+            detailsText.setText(String.format("%s: %s%s%s: %s (%s)%s%s: %s (%s)",
                     getString(R.string.accuracy), getAccuracy(location), newline,
-                    getString(R.string.latitude), getLatitude(location), newline,
-                    getString(R.string.longitude), getLongitude(location)));
+                    getString(R.string.latitude), getLatitude(location), getDMSLatitude(location), newline,
+                    getString(R.string.longitude), getLongitude(location), getDMSLongitude(location)));
 
             lastLocation = location;
         }
@@ -322,6 +322,26 @@ private String getLatitude(Location location) {
         return String.format(Locale.US, "%2.5f", location.getLatitude());
     }
 
+    private String getDMSLatitude(Location location) {
+        double val = location.getLatitude();
+        return String.format(Locale.US, "%.0f° %2.0f′ %2.3f″ %s",
+                Math.floor(Math.abs(val)),
+                Math.floor(Math.abs(val * 60) % 60),
+                (Math.abs(val) * 3600) % 60,
+                val > 0 ? "N" : "S"
+        );
+    }
+
+    private String getDMSLongitude(Location location) {
+        double val = location.getLongitude();
+        return String.format(Locale.US, "%.0f° %2.0f′ %2.3f″ %s",
+                Math.floor(Math.abs(val)),
+                Math.floor(Math.abs(val * 60) % 60),
+                (Math.abs(val) * 3600) % 60,
+                val > 0 ? "E" : "W"
+        );
+    }
+
     private String getLongitude(Location location) {
         return String.format(Locale.US, "%3.5f", location.getLongitude());
     }