Proper location handling

code/Common/BaseFactory.java

@@ -31,7 +31,7 @@ import android.os.Build;
 public abstract class BaseFactory {
 
     protected boolean shouldUseFake() {
-        return "sdk".equals(Build.PRODUCT);
+        return Build.PRODUCT.endsWith("sdk");
     }
 
 }

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/ContextAnalyserService.java

@@ -24,8 +24,16 @@ package uk.co.md87.android.contextanalyser;
 
 import android.app.Service;
 import android.content.Intent;
+import android.location.Address;
+import android.location.Geocoder;
+import android.location.Location;
 import android.os.Handler;
 import android.os.IBinder;
+import android.util.Log;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 
 import java.util.Map;
 
@@ -36,6 +44,7 @@ import uk.co.md87.android.common.accel.AccelReaderFactory;
 import uk.co.md87.android.common.accel.Sampler;
 import uk.co.md87.android.common.geo.LocationMonitor;
 import uk.co.md87.android.common.geo.LocationMonitorFactory;
+import uk.co.md87.android.contextanalyser.DataHelper.LocationResult;
 
 /**
  *
@@ -43,6 +52,8 @@ import uk.co.md87.android.common.geo.LocationMonitorFactory;
  */
 public class ContextAnalyserService extends Service {
 
+    private static final int POLLING_DELAY = 60000;
+
     private final Runnable scheduleRunnable = new Runnable() {
 
         public void run() {
@@ -57,8 +68,15 @@ public class ContextAnalyserService extends Service {
         }
     };
 
-    public static Map<Float[], String> model;
+    private Map<Float[], String> model;
+
+    private final Map<String, Long> names = new HashMap<String, Long>();
 
+    private double lat = 0, lon = 0;
+    private int locationCount = 0;
+    private LocationResult lastLocation;
+    private Geocoder geocoder;
+    
     private Sampler sampler;
     private Classifier classifier;
     private Aggregator aggregator;
@@ -75,18 +93,86 @@ public class ContextAnalyserService extends Service {
         classifier = new Classifier(ModelReader.getModel(this, R.raw.basic_model).entrySet());
         aggregator = new Aggregator();
         dataHelper = new DataHelper(this);
+        geocoder = new Geocoder(this);
 
-        handler.postDelayed(scheduleRunnable, 60000);
+        names.putAll(dataHelper.getUnnamedLocations());
+
+        handler.postDelayed(scheduleRunnable, POLLING_DELAY);
     }
     
     public void poll() {
-        handler.postDelayed(scheduleRunnable, 60000);
+        handler.postDelayed(scheduleRunnable, POLLING_DELAY);
+
+        Log.v(getClass().getSimpleName(), "Polling...");
 
         sampler.start();
+        
+        pollLocation();
+        pollGeolocation();
+    }
+
+    protected void pollLocation() {
+        final double newLat = locationMonitor.getLat();
+        final double newLon = locationMonitor.getLon();
+        final float[] distance = new float[1];
+        Location.distanceBetween(newLat, newLon, lat, lon, distance);
+
+        if ((lat == 0 && lon == 0) || distance[0] > 500) {
+            // New location
+            lat = newLat;
+            lon = newLon;
+            locationCount = 1;
+            lastLocation = dataHelper.findLocation(lat, lon);
+
+            Log.i(getClass().getSimpleName(), "Location: " + lastLocation);
+        } else {
+            // Existing location
+
+            if (++locationCount > 2 && lastLocation == null) {
+                // But we don't know it yet - add it!
+                final String name = lat + "," + lon;
+
+                final long id = dataHelper.addLocation(name, lat, lon);
+                lastLocation = dataHelper.findLocation(lat, lon);
+
+                Log.i(getClass().getSimpleName(), "Location (new): " + lastLocation);
+
+                names.put(name, id);
+            }
+        }
+    }
+
+    protected void pollGeolocation() {
+        final Iterator<Map.Entry<String, Long>> it = names.entrySet().iterator();
+        while (it.hasNext()) {
+            final Map.Entry<String, Long> tuple = it.next();
+
+            Log.v(getClass().getSimpleName(), "Attempting to geocode " + tuple.getKey());
+            
+            final String[] parts = tuple.getKey().split(",", 2);
+
+            try {
+                final List<Address> addresses = geocoder.getFromLocation(
+                        Double.parseDouble(parts[0]), Double.parseDouble(parts[1]), 1);
+
+                if (addresses != null && !addresses.isEmpty()) {
+                    // We found a nice address
+
+                    dataHelper.updateLocation(tuple.getValue(),
+                            addresses.get(0).getAddressLine(0));
+
+                    it.remove();
+                }
+            } catch (IOException ex) {
+                // Do nothing
+            }
+        }
     }
 
     public void analyse() {
         aggregator.addClassification(classifier.classify(sampler.getData()));
+
+        Log.v(getClass().getSimpleName(), "Aggregator says: " + aggregator.getClassification());
     }
 
     @Override

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/DataHelper.java

@@ -28,6 +28,9 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteStatement;
 import android.location.Location;
+import android.util.Log;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
@@ -41,10 +44,13 @@ public class DataHelper {
 
     private static final String INSERT_LOCATION = "insert into "
       + LOCATIONS_TABLE + "(name, lat, lon) values (?, ?, ?)";
+    private static final String UPDATE_LOCATION = "update "
+      + LOCATIONS_TABLE + " set name = ? where id = ?";
+    private static final String UNNAMED_QUERY = "name LIKE '%.%,%.%'";
     private static final String LOCATION_QUERY = "lat > %1$s - 0.005 and "
             + "lat < %1$s + 0.005 and lon > %2$s - 0.01 and lon < %2$s + 0.01";
 
-    private final SQLiteStatement insertLocationStatement;
+    private final SQLiteStatement insertLocationStatement, updateLocationStatement;
 
     private final Context context;
     private SQLiteDatabase db;
@@ -55,15 +61,44 @@ public class DataHelper {
         final OpenHelper helper = new OpenHelper(context);
         this.db = helper.getWritableDatabase();
         this.insertLocationStatement = db.compileStatement(INSERT_LOCATION);
+        this.updateLocationStatement = db.compileStatement(UPDATE_LOCATION);
     }
 
     public long addLocation(final String name, final double lat, final double lon) {
+        Log.i(getClass().getSimpleName(), "Adding new place at " + lat + ", " + lon);
         insertLocationStatement.bindString(1, name);
         insertLocationStatement.bindDouble(2, lat);
         insertLocationStatement.bindDouble(3, lon);
         return insertLocationStatement.executeInsert();
     }
 
+    public void updateLocation(final long id, final String name) {
+        Log.i(getClass().getSimpleName(), "Setting name of place " + id + " to " + name);
+        updateLocationStatement.bindString(1, name);
+        updateLocationStatement.bindLong(2, id);
+        updateLocationStatement.execute();
+    }
+
+    public Map<String, Long> getUnnamedLocations() {
+        final Map<String, Long> results = new HashMap<String, Long>();
+        
+        final Cursor cursor = db.query(LOCATIONS_TABLE,
+                new String[] { "id", "name" },
+                UNNAMED_QUERY, null, null, null, null);
+        
+        if (cursor.moveToFirst()) {
+            do {
+                results.put(cursor.getString(1), cursor.getLong(0));
+            } while (cursor.moveToNext());
+        }
+
+        if (cursor != null && !cursor.isClosed()) {
+            cursor.close();
+        }
+
+        return results;
+    }
+
     public LocationResult findLocation(final double lat, final double lon) {
         final Cursor cursor = db.query(LOCATIONS_TABLE,
                 new String[] { "id", "name", "lat", "lon" },
@@ -117,6 +152,11 @@ public class DataHelper {
             return name;
         }
 
+        @Override
+        public String toString() {
+            return "LocationResult{id=" + id + "name=" + name + "lat=" + lat + "lon=" + lon + '}';
+        }
+
     }
 
     private static class OpenHelper extends SQLiteOpenHelper {

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/IntroActivity.java

@@ -36,7 +36,6 @@ public class IntroActivity extends Activity {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        // ToDo add your GUI initialization code here
 
         startService(new Intent(this, ContextAnalyserService.class));
     }