#45 puts the selected field paper page overlay in front of the others…

…, but behind the osm overlays
posm · Apr 22, 2016 · 158045e · 158045e
1 parent 4a0b206
commit 158045e
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/MapboxAndroidSDK/src/main/java/org/fieldpapers/model/FPAtlas.java b/MapboxAndroidSDK/src/main/java/org/fieldpapers/model/FPAtlas.java
@@ -16,7 +16,9 @@
 import com.mapbox.mapboxsdk.overlay.PathOverlay;
 import com.mapbox.mapboxsdk.views.MapView;
 import com.mapbox.mapboxsdk.views.MapViewListener;
+import com.spatialdev.osm.marker.OSMItemizedIconOverlay;
 import com.spatialdev.osm.renderer.OSMLine;
+import com.spatialdev.osm.renderer.OSMOverlay;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
@@ -173,6 +175,26 @@ private void setSelectedPathOverlay(FPPage page) {
             selectedPathOverlay.getPaint().setColor(Color.BLACK);
         }
         PathOverlay pathOverlay = page.pathOverlay();
+        List<Overlay> overlays = mapView.getOverlays();
+
+        // Remove overlay to select and then put it in the right place in the list
+        // so that it is in front of the other PathOverlays but behind the OSM
+        // overlays.
+        overlays.remove(pathOverlay);
+        int len = overlays.size();
+        boolean overlayMoved = false;
+        for (int i = 0; i < len; ++i) {
+            Overlay o = overlays.get(i);
+            if (o instanceof OSMOverlay || o instanceof OSMItemizedIconOverlay) {
+                overlays.add(i-1, pathOverlay);
+                overlayMoved = true;
+                break;
+            }
+        }
+        if (!overlayMoved) {
+            overlays.add(pathOverlay);
+        }
+
         pathOverlay.getPaint().setARGB(255, OSMLine.DEFAULT_R, OSMLine.DEFAULT_G, OSMLine.DEFAULT_B);
         selectedPathOverlay = pathOverlay;
     }