Add journeys to places

code/PlacesDisplay/AndroidManifest.xml

@@ -15,6 +15,7 @@
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="uk.co.md87.android.contextanalyser.READ_PLACES"/>
+    <uses-permission android:name="uk.co.md87.android.contextanalyser.READ_JOURNEYS"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-sdk android:minSdkVersion="3" />
 

code/PlacesDisplay/src/uk/co/md87/android/placesdisplay/JourneysOverlay.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2009-2010 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.android.placesdisplay;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Point;
+import android.util.Log;
+import com.google.android.maps.MapView;
+import com.google.android.maps.Overlay;
+import com.google.android.maps.OverlayItem;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import uk.co.md87.android.contextapi.ContextApi;
+import uk.co.md87.android.contextapi.ContextApi.Journeys.ColumnNames;
+
+/**
+ * An overlay for showing journeys between places.
+ *
+ * @author chris
+ */
+public class JourneysOverlay extends Overlay {
+
+    private final Map<OverlayItem, Map<OverlayItem, Integer>> journeys
+            = new HashMap<OverlayItem, Map<OverlayItem, Integer>>();
+    private int max = 0;
+
+    public JourneysOverlay(final Context context, final Map<Integer, OverlayItem> places) {
+        final Cursor cursor = context.getContentResolver().query(ContextApi.Journeys.CONTENT_URI,
+                new String[] { ColumnNames.START, ColumnNames.END, ColumnNames.NUMBER },
+                null, null, null);
+
+        if (cursor.moveToFirst()) {
+            final int startColumn = cursor.getColumnIndex(ColumnNames.START);
+            final int endColumn = cursor.getColumnIndex(ColumnNames.END);
+            final int numberColumn = cursor.getColumnIndex(ColumnNames.NUMBER);
+
+            do {
+                final int start = cursor.getInt(startColumn);
+                final int end = cursor.getInt(endColumn);
+                final OverlayItem a = places.get(Math.min(start, end)),
+                        b = places.get(Math.max(start, end));
+
+                if (!journeys.containsKey(a)) {
+                    journeys.put(a, new HashMap<OverlayItem, Integer>());
+                }
+
+                final Map<OverlayItem, Integer> map = journeys.get(a);
+
+                if (!map.containsKey(b)) {
+                    map.put(b, 0);
+                }
+
+                final int total = map.get(b) + cursor.getInt(numberColumn);
+                map.put(b, total);
+                max = Math.max(max, total);
+            } while (cursor.moveToNext());
+        }
+    }
+
+    @Override
+    public void draw(Canvas canvas, MapView map, boolean shadow) {
+        super.draw(canvas, map, shadow);
+
+        final Paint paint = new Paint();
+        paint.setARGB(255, 255, 0, 0);
+        paint.setStyle(Paint.Style.FILL_AND_STROKE);
+
+        for (Map.Entry<OverlayItem, Map<OverlayItem, Integer>> start
+                : journeys.entrySet()) {
+            final Point spoint = map.getProjection().toPixels(start.getKey().getPoint(), null);
+            for (Map.Entry<OverlayItem, Integer> entry : start.getValue().entrySet()) {
+                final Point epoint = map.getProjection().toPixels(entry.getKey().getPoint(), null);
+
+                final Paint mypaint = new Paint(paint);
+
+                mypaint.setStrokeJoin(Paint.Join.ROUND);
+                mypaint.setStrokeCap(Paint.Cap.ROUND);
+                mypaint.setStrokeWidth(10 * entry.getValue() / (float) max);
+
+                canvas.drawLine(spoint.x, spoint.y, epoint.x, epoint.y, mypaint);
+            }
+        }
+    }
+
+}

code/PlacesDisplay/src/uk/co/md87/android/placesdisplay/PlacesDisplay.java

@@ -41,7 +41,9 @@ import com.google.android.maps.Overlay;
 import com.google.android.maps.OverlayItem;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import uk.co.md87.android.contextapi.ContextApi;
 import uk.co.md87.android.contextapi.ContextApi.Places.ColumnNames;
@@ -104,8 +106,8 @@ public class PlacesDisplay extends MapActivity {
 
         final Cursor cursor = managedQuery(ContextApi.Places.CONTENT_URI,
                 new String[] { ColumnNames.LATITUDE, ColumnNames.LONGITUDE,
-                ColumnNames.NAME, ColumnNames.LAST_VISIT, ColumnNames.VISIT_COUNT },
-                null, null, null);
+                ColumnNames._ID, ColumnNames.NAME, ColumnNames.LAST_VISIT,
+                ColumnNames.VISIT_COUNT }, null, null, null);
 
         final java.text.DateFormat dateFormat = DateFormat.getDateFormat(this);
         final java.text.DateFormat timeFormat = DateFormat.getTimeFormat(this);
@@ -114,15 +116,20 @@ public class PlacesDisplay extends MapActivity {
             final int latitudeColumn = cursor.getColumnIndex(ColumnNames.LATITUDE);
             final int longitudeColumn = cursor.getColumnIndex(ColumnNames.LONGITUDE);
             final int nameColumn = cursor.getColumnIndex(ColumnNames.NAME);
+            final int idColumn = cursor.getColumnIndex(ColumnNames._ID);
             final int lastVisitColumn = cursor.getColumnIndex(ColumnNames.LAST_VISIT);
             final int visitCountColumn = cursor.getColumnIndex(ColumnNames.VISIT_COUNT);
 
+            final Map<Integer, OverlayItem> places
+                    = new HashMap<Integer, OverlayItem>(cursor.getCount());
+
             do {
                 final double latitude = cursor.getDouble(latitudeColumn);
                 final double longitude = cursor.getDouble(longitudeColumn);
                 final String name = cursor.getString(nameColumn);
                 final long lastVisit = cursor.getLong(lastVisitColumn);
                 final int visitCount = cursor.getInt(visitCountColumn);
+                final int id = cursor.getInt(idColumn);
 
                 final GeoPoint point = new GeoPoint((int) (latitude * 1000000),
                         (int) (longitude * 1000000));
@@ -135,9 +142,13 @@ public class PlacesDisplay extends MapActivity {
                         + " at " + timeFormat.format(date));
 
                 overlay.addOverlay(overlayitem);
+
+                places.put(id, overlayitem);
             } while (cursor.moveToNext());
+
+            mapOverlays.add(new JourneysOverlay(this, places));
+            mapOverlays.add(overlay);
         }
-        mapOverlays.add(overlay);
     }
 
     @Override