compute distance works

[WhereAmI.git] / src / org / average / whereami / LastLocation.java

diff --git a/src/org/average/whereami/LastLocation.java b/src/org/average/whereami/LastLocation.java
index 914a615217ddec08903f1f33dbc390bf5d8f8fd4..b710e169f59bff77562076496d5dcdea5d0a3d20 100644 (file)
--- a/src/org/average/whereami/LastLocation.java
+++ b/src/org/average/whereami/LastLocation.java
@@ -36,7 +36,7 @@ public final class LastLocation extends Oracle {
                loc_names = res.getStringArray(R.array.loc_names);
                loc_lats = res.getStringArray(R.array.loc_lats);
                loc_lons = res.getStringArray(R.array.loc_lons);
-               loc_lons = res.getStringArray(R.array.loc_dists);
+               loc_dists = res.getStringArray(R.array.loc_dists);
 
                HttpTransport transport = AndroidHttp.newCompatibleTransport();
                JsonFactory jsonFactory = new JacksonFactory();
@@ -103,11 +103,11 @@ public final class LastLocation extends Oracle {
                                        Double.parseDouble(loc_lons[i]));
                        Log.v(TAG, "Dist from " + loc_names[i] +
                                " is " + dist);
-                       //if ((loc_dists[i] == "0") ||
-                       //    (dist < Double.parseDouble(loc_dists[i]))) {
-                       //      locmsg = loc_names[i];
-                       //      break;
-                       //}
+                       if ((loc_dists[i] == "0") ||
+                           (dist < Double.parseDouble(loc_dists[i]))) {
+                               locmsg = loc_names[i];
+                               break;
+                       }
                }
                return locmsg;
        }