[google_maps_flutter] Add TileOverlay support

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.6
+
+Add TileOverlay support.
+
 ## 1.0.5
 
 Overhaul lifecycle management in GoogleMapsPlugin.

packages/google_maps_flutter/google_maps_flutter/android/build.gradle

@@ -21,6 +21,9 @@ rootProject.allprojects {
 
 apply plugin: 'com.android.library'
 
+sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_1_8
+
 android {
     compileSdkVersion 29
 
@@ -31,6 +34,10 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
 
     dependencies {
         implementation "androidx.annotation:annotation:1.1.0"

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java

@@ -23,6 +23,7 @@
 import com.google.android.gms.maps.model.PatternItem;
 import com.google.android.gms.maps.model.RoundCap;
 import com.google.android.gms.maps.model.SquareCap;
+import com.google.android.gms.maps.model.Tile;
 import io.flutter.view.FlutterMain;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -142,6 +143,13 @@ private static int toInt(Object o) {
     return ((Number) o).intValue();
   }
 
+  private static byte[] toByteArray(Object o) {
+    if (o == null) {
+      return null;
+    }
+    return (byte[]) o;
+  }
+
   static Object cameraPositionToJson(CameraPosition position) {
     if (position == null) {
       return null;
@@ -197,6 +205,18 @@ static Object circleIdToJson(String circleId) {
     return data;
   }
 
+  static Object tileOverlayArgumentsToJson(String tileOverlayId, int x, int y, int zoom) {
+    if (tileOverlayId == null) {
+      return null;
+    }
+    final Map<String, Object> data = new HashMap<>(4);
+    data.put("tileOverlayId", tileOverlayId);
+    data.put("x", x);
+    data.put("y", y);
+    data.put("zoom", zoom);
+    return data;
+  }
+
   static Object latLngToJson(LatLng latLng) {
     return Arrays.asList(latLng.latitude, latLng.longitude);
   }
@@ -615,4 +635,38 @@ private static Cap toCap(Object o) {
         throw new IllegalArgumentException("Cannot interpret " + o + " as Cap");
     }
   }
+
+  static String interpretTileOverlayOptions(Object o, TileOverlaySink sink) {
+    final Map<?, ?> data = toMap(o);
+    final Object fadeIn = data.get("fadeIn");
+    if (fadeIn != null) {
+      sink.setFadeIn(toBoolean(fadeIn));
+    }
+    final Object transparency = data.get("transparency");
+    if (transparency != null) {
+      sink.setTransparency(toFloat(transparency));
+    }
+    final Object zIndex = data.get("zIndex");
+    if (zIndex != null) {
+      sink.setZIndex(toFloat(zIndex));
+    }
+    final Object visible = data.get("visible");
+    if (visible != null) {
+      sink.setVisible(toBoolean(visible));
+    }
+    final String tileOverlayId = (String) data.get("tileOverlayId");
+    if (tileOverlayId == null) {
+      throw new IllegalArgumentException("tileOverlayId was null");
+    } else {
+      return tileOverlayId;
+    }
+  }
+
+  static Tile interpretTile(Object o) {
+    final Map<?, ?> data = toMap(o);
+    int width = toInt(data.get("width"));
+    int height = toInt(data.get("height"));
+    byte[] dataArray = toByteArray(data.get("data"));
+    return new Tile(width, height, dataArray);
+  }
 }

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java

@@ -23,6 +23,7 @@ class GoogleMapBuilder implements GoogleMapOptionsSink {
   private Object initialPolygons;
   private Object initialPolylines;
   private Object initialCircles;
+  private Object initialTileOverlays;
   private Rect padding = new Rect(0, 0, 0, 0);
 
   GoogleMapController build(
@@ -43,6 +44,7 @@ GoogleMapController build(
     controller.setInitialPolygons(initialPolygons);
     controller.setInitialPolylines(initialPolylines);
     controller.setInitialCircles(initialCircles);
+    controller.setInitialTileOverlays(initialTileOverlays);
     controller.setPadding(padding.top, padding.left, padding.bottom, padding.right);
     return controller;
   }
@@ -165,4 +167,9 @@ public void setInitialPolylines(Object initialPolylines) {
   public void setInitialCircles(Object initialCircles) {
     this.initialCircles = initialCircles;
   }
+
+  @Override
+  public void setInitialTileOverlays(Object initialTileOverlays) {
+    this.initialTileOverlays = initialTileOverlays;
+  }
 }

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java

@@ -76,10 +76,12 @@ final class GoogleMapController
   private final PolygonsController polygonsController;
   private final PolylinesController polylinesController;
   private final CirclesController circlesController;
+  private final TileOverlaysController tileOverlayController;
   private List<Object> initialMarkers;
   private List<Object> initialPolygons;
   private List<Object> initialPolylines;
   private List<Object> initialCircles;
+  private List<Object> initialTileOverlays;
 
   GoogleMapController(
       int id,
@@ -99,6 +101,7 @@ final class GoogleMapController
     this.polygonsController = new PolygonsController(methodChannel, density);
     this.polylinesController = new PolylinesController(methodChannel, density);
     this.circlesController = new CirclesController(methodChannel, density);
+    this.tileOverlayController = new TileOverlaysController(methodChannel);
   }
 
   @Override
@@ -140,10 +143,12 @@ public void onMapReady(GoogleMap googleMap) {
     polygonsController.setGoogleMap(googleMap);
     polylinesController.setGoogleMap(googleMap);
     circlesController.setGoogleMap(googleMap);
+    tileOverlayController.setGoogleMap(googleMap);
     updateInitialMarkers();
     updateInitialPolygons();
     updateInitialPolylines();
     updateInitialCircles();
+    updateInitialTileOverlays();
   }
 
   @Override
@@ -385,6 +390,24 @@ public void onSnapshotReady(Bitmap bitmap) {
           result.success(mapStyleResult);
           break;
         }
+      case "tileOverlays#update":
+        {
+          Object tileOverlaysToAdd = call.argument("tileOverlaysToAdd");
+          tileOverlayController.addTileOverlays((List<Object>) tileOverlaysToAdd);
+          Object tileOverlaysToChange = call.argument("tileOverlaysToChange");
+          tileOverlayController.changeTileOverlays((List<Object>) tileOverlaysToChange);
+          Object tileOverlaysToRemove = call.argument("tileOverlayIdsToRemove");
+          tileOverlayController.removeTileOverlays((List<Object>) tileOverlaysToRemove);
+          result.success(null);
+          break;
+        }
+      case "tileOverlays#clearTileCache":
+        {
+          Object rawTileOverlayId = call.argument("tileOverlayId");
+          tileOverlayController.clearTileCache(rawTileOverlayId);
+          result.success(null);
+          break;
+        }
       default:
         result.notImplemented();
     }
@@ -728,6 +751,18 @@ private void updateInitialCircles() {
     circlesController.addCircles(initialCircles);
   }
 
+  @Override
+  public void setInitialTileOverlays(Object initialTileOverlays) {
+    this.initialTileOverlays = (List<Object>) initialTileOverlays;
+    if (googleMap != null) {
+      updateInitialTileOverlays();
+    }
+  }
+
+  private void updateInitialTileOverlays() {
+    tileOverlayController.addTileOverlays(initialTileOverlays);
+  }
+
   @SuppressLint("MissingPermission")
   private void updateMyLocationSettings() {
     if (hasLocationPermission()) {

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java

@@ -46,6 +46,9 @@ public PlatformView create(Context context, int id, Object args) {
     if (params.containsKey("circlesToAdd")) {
       builder.setInitialCircles(params.get("circlesToAdd"));
     }
+    if (params.containsKey("tileOverlaysToAdd")) {
+      builder.setInitialTileOverlays(params.get("tileOverlaysToAdd"));
+    }
     return builder.build(id, context, binaryMessenger, lifecycleProvider);
   }
 }

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java

@@ -51,4 +51,6 @@ interface GoogleMapOptionsSink {
   void setInitialPolylines(Object initialPolylines);
 
   void setInitialCircles(Object initialCircles);
+
+  void setInitialTileOverlays(Object initialTileOverlays);
 }

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/TileOverlayBuilder.java

@@ -0,0 +1,41 @@
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.TileOverlayOptions;
+import com.google.android.gms.maps.model.TileProvider;
+
+public class TileOverlayBuilder implements TileOverlaySink {
+  private final TileOverlayOptions tileOverlayOptions;
+
+  TileOverlayBuilder() {
+    this.tileOverlayOptions = new TileOverlayOptions();
+  }
+
+  TileOverlayOptions build() {
+    return tileOverlayOptions;
+  }
+
+  @Override
+  public void setFadeIn(boolean fadeIn) {
+    tileOverlayOptions.fadeIn(fadeIn);
+  }
+
+  @Override
+  public void setTransparency(float transparency) {
+    tileOverlayOptions.transparency(transparency);
+  }
+
+  @Override
+  public void setZIndex(float zIndex) {
+    tileOverlayOptions.zIndex(zIndex);
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    tileOverlayOptions.visible(visible);
+  }
+
+  @Override
+  public void setTileProvider(TileProvider tileProvider) {
+    tileOverlayOptions.tileProvider(tileProvider);
+  }
+}

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/TileOverlayController.java

@@ -0,0 +1,46 @@
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.TileOverlay;
+import com.google.android.gms.maps.model.TileProvider;
+
+public class TileOverlayController implements TileOverlaySink {
+
+  private final TileOverlay tileOverlay;
+
+  public TileOverlayController(TileOverlay tileOverlay) {
+    this.tileOverlay = tileOverlay;
+  }
+
+  void remove() {
+    tileOverlay.remove();
+  }
+
+  void clearTileCache() {
+    tileOverlay.clearTileCache();
+  }
+
+  @Override
+  public void setFadeIn(boolean fadeIn) {
+    tileOverlay.setFadeIn(fadeIn);
+  }
+
+  @Override
+  public void setTransparency(float transparency) {
+    tileOverlay.setTransparency(transparency);
+  }
+
+  @Override
+  public void setZIndex(float zIndex) {
+    tileOverlay.setZIndex(zIndex);
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    tileOverlay.setVisible(visible);
+  }
+
+  @Override
+  public void setTileProvider(TileProvider tileProvider) {
+    // You can not change tile provider after creation
+  }
+}

packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/TileOverlaySink.java

@@ -0,0 +1,16 @@
+package io.flutter.plugins.googlemaps;
+
+import com.google.android.gms.maps.model.TileProvider;
+
+/** Receiver of TileOverlayOptions configuration. */
+public interface TileOverlaySink {
+  void setFadeIn(boolean fadeIn);
+
+  void setTransparency(float transparency);
+
+  void setZIndex(float zIndex);
+
+  void setVisible(boolean visible);
+
+  void setTileProvider(TileProvider tileProvider);
+}