Merge pull request #1144 from garvankeeley/1129-1087-follow-mode-hashing

1129 / 1087: in follow mode, dots not drawn

Author: crankycoder

Diff for: android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapFragment.java

@@ -201,7 +201,7 @@ public void run() {
         mAccuracyOverlay = new AccuracyCircleOverlay(mRootView.getContext(), sGPSColor);
         mMap.getOverlays().add(mAccuracyOverlay);
 
-        mObservationPointsOverlay = new ObservationPointsOverlay(mRootView.getContext(), mMap);
+        mObservationPointsOverlay = new ObservationPointsOverlay(mRootView.getContext());
         mMap.getOverlays().add(mObservationPointsOverlay);
 
         ObservedLocationsReceiver observer = ObservedLocationsReceiver.getInstance();

Diff for: android/src/main/java/org/mozilla/mozstumbler/client/mapview/ObservationPointsOverlay.java

@@ -47,8 +47,9 @@ class ObservationPointsOverlay extends Overlay {
     private final int mSize3px;
 
     LinkedHashMap<Integer, ObservationPoint> mHashedGrid;
+    private Point mHashedGridAnchorPoint = new Point(0,0);
 
-    ObservationPointsOverlay(Context ctx, MapView mapView) {
+    ObservationPointsOverlay(Context ctx) {
         super(ctx);
         mConvertPx = new DevicePixelConverter(ctx);
 
@@ -91,7 +92,7 @@ void update(ObservationPoint obsPoint, MapView mapView, boolean isMlsPointUpdate
 
         if (!isMlsPointUpdate) {
             // add to hashed grid
-            addToGridHash(obsPoint, point);
+            addToGridHash(obsPoint, point, new Point(mapView.getScrollX(), mapView.getScrollY()));
         }
 
         mapView.postInvalidate();
@@ -113,8 +114,8 @@ private void drawWifiScan(Canvas c, Point p) {
         c.drawCircle(p.x, p.y, size, mWifiPaint);
     }
 
-    private void addToGridHash(ObservationPoint obsPoint, Point screenPoint) {
-        int hash = toGridPoint(screenPoint.x, screenPoint.y);
+    private void addToGridHash(ObservationPoint obsPoint, Point screenPoint, Point currentScroll) {
+        int hash = hashedGridPoint(screenPoint.x, screenPoint.y, currentScroll.x, currentScroll.y);
         ObservationPoint gp = mHashedGrid.get(hash);
         if (gp == null || toTypeBitField(obsPoint) > toTypeBitField(gp)) {
             mHashedGrid.put(hash, obsPoint);
@@ -123,21 +124,23 @@ private void addToGridHash(ObservationPoint obsPoint, Point screenPoint) {
 
     public void zoomChanged(MapView mapView) {
         mHashedGrid = new LinkedHashMap<Integer, ObservationPoint>();
+        mHashedGridAnchorPoint = new Point(mapView.getScrollX(), mapView.getScrollY());
         final Projection pj = mapView.getProjection();
         LinkedList<ObservationPoint> points = ObservedLocationsReceiver.getInstance().getObservationPoints();
         final Iterator<ObservationPoint> i = points.iterator();
         final Point gps = new Point();
         ObservationPoint point;
+        Point zero = new Point(0, 0);
         while (i.hasNext()) {
             point = i.next();
             pj.toPixels(point.pointGPS, gps);
-            addToGridHash(point, gps);
+            addToGridHash(point, gps, zero);
         }
     }
 
-    private int toGridPoint(int x, int y) {
-        x = (int) Math.round(x / (mSize3px * 2.0));
-        y = (int) Math.round(y / (mSize3px * 2.0));
+    private int hashedGridPoint(int x, int y, int scrollX, int scrollY) {
+        x = (int) Math.round((x - mHashedGridAnchorPoint.x + scrollX) / (mSize3px * 2.0));
+        y = (int) Math.round((y - mHashedGridAnchorPoint.y + scrollY) / (mSize3px * 2.0));
         return x * 10000 + y;
     }