[google_maps_flutter_android] Address android review comments

Author: jokerttu

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

@@ -41,6 +41,7 @@
 import com.google.maps.android.heatmaps.Gradient;
 import com.google.maps.android.heatmaps.WeightedLatLng;
 import io.flutter.FlutterInjector;
+import io.flutter.plugins.googlemaps.Messages.FlutterError;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -881,8 +882,12 @@ static Tile tileFromPigeon(Messages.PlatformTile tile) {
     sink.setClickable(groundOverlay.getClickable());
     sink.setImage(toBitmapDescriptor(groundOverlay.getImage(), assetManager, density, wrapper));
     if (groundOverlay.getPosition() != null) {
-      assert groundOverlay.getWidth() != null
-          : "Width is required when using a ground overlay with a position.";
+      if (groundOverlay.getWidth() == null) {
+        throw new FlutterError(
+            "Invalid GroundOverlay",
+            "Width is required when using a ground overlay with a position.",
+            null);
+      }
       sink.setPosition(
           latLngFromPigeon(groundOverlay.getPosition()),
           groundOverlay.getWidth().floatValue(),
@@ -906,8 +911,8 @@ static Tile tileFromPigeon(Messages.PlatformTile tile) {
       @NonNull String groundOverlayId,
       boolean isCreatedWithBounds) {
 
-    // Dummy image is used as image is required field of PlatformGroundOverlay and converting image
-    // back to image descriptor is not currently supported.
+    // Dummy image is used as image is a required field of PlatformGroundOverlay and converting
+    // BitmapDescriptor used by Google Maps back to PlatformImageDescriptor is not currently supported.
     Messages.PlatformBitmap dummyImage =
         new Messages.PlatformBitmap.Builder()
             .setBitmap(

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java

@@ -692,6 +692,57 @@ public void buildGroundOverlayAnchorForPigeonWithCrossingMeridian() {
     Assert.assertEquals(0.5, anchor.getY(), 1e-15);
   }
 
+  private void assertGroundOverlayEquals(
+      Messages.PlatformGroundOverlay result,
+      GroundOverlay expectedOverlay,
+      String expectedId,
+      LatLng expectedPosition,
+      LatLngBounds expectedBounds) {
+    Assert.assertEquals(expectedId, result.getGroundOverlayId());
+    if (expectedPosition != null) {
+      Assert.assertNotNull(result.getPosition());
+      Assert.assertEquals(expectedPosition.latitude, result.getPosition().getLatitude(), 1e-15);
+      Assert.assertEquals(expectedPosition.longitude, result.getPosition().getLongitude(), 1e-15);
+      Assert.assertNotNull(result.getWidth());
+      Assert.assertNotNull(result.getHeight());
+      Assert.assertEquals(expectedOverlay.getWidth(), result.getWidth(), 1e-15);
+      Assert.assertEquals(expectedOverlay.getHeight(), result.getHeight(), 1e-15);
+    } else {
+      Assert.assertNull(result.getPosition());
+    }
+    if (expectedBounds != null) {
+      Assert.assertNotNull(result.getBounds());
+      Assert.assertEquals(
+          expectedBounds.southwest.latitude,
+          result.getBounds().getSouthwest().getLatitude(),
+          1e-15);
+      Assert.assertEquals(
+          expectedBounds.southwest.longitude,
+          result.getBounds().getSouthwest().getLongitude(),
+          1e-15);
+      Assert.assertEquals(
+          expectedBounds.northeast.latitude,
+          result.getBounds().getNortheast().getLatitude(),
+          1e-15);
+      Assert.assertEquals(
+          expectedBounds.northeast.longitude,
+          result.getBounds().getNortheast().getLongitude(),
+          1e-15);
+    } else {
+      Assert.assertNull(result.getBounds());
+    }
+
+    Assert.assertEquals(expectedOverlay.getBearing(), result.getBearing(), 1e-15);
+    Assert.assertEquals(expectedOverlay.getTransparency(), result.getTransparency(), 1e-6);
+    Assert.assertEquals(expectedOverlay.getZIndex(), result.getZIndex().intValue(), 1e-6);
+    Assert.assertEquals(expectedOverlay.isVisible(), result.getVisible());
+    Assert.assertEquals(expectedOverlay.isClickable(), result.getClickable());
+    Messages.PlatformDoublePair anchor = result.getAnchor();
+    Assert.assertNotNull(anchor);
+    Assert.assertEquals(0.5, anchor.getX(), 1e-6);
+    Assert.assertEquals(0.5, anchor.getY(), 1e-6);
+  }
+
   @Test
   public void groundOverlayToPigeonWithPosition() {
     GroundOverlay mockGroundOverlay = mock(GroundOverlay.class);
@@ -709,28 +760,11 @@ public void groundOverlayToPigeonWithPosition() {
     when(mockGroundOverlay.isVisible()).thenReturn(true);
     when(mockGroundOverlay.isClickable()).thenReturn(false);
 
+    String overlayId = "overlay_1";
     Messages.PlatformGroundOverlay result =
-        Convert.groundOverlayToPigeon(mockGroundOverlay, "overlay_1", false);
-
-    Assert.assertEquals("overlay_1", result.getGroundOverlayId());
-    Assert.assertNotNull(result.getPosition());
-    Assert.assertEquals(position.latitude, result.getPosition().getLatitude(), 1e-15);
-    Assert.assertEquals(position.longitude, result.getPosition().getLongitude(), 1e-15);
-    Assert.assertNotNull(result.getWidth());
-    Assert.assertNotNull(result.getHeight());
-    Assert.assertEquals(30.0, result.getWidth(), 1e-15);
-    Assert.assertEquals(40.0, result.getHeight(), 1e-15);
-    Assert.assertEquals(50.0, result.getBearing(), 1e-15);
-    Assert.assertEquals(0.6, result.getTransparency(), 1e-6);
-    Assert.assertEquals(7, result.getZIndex().intValue());
-    Assert.assertTrue(result.getVisible());
-    Assert.assertFalse(result.getClickable());
-    Assert.assertNull(result.getBounds());
+        Convert.groundOverlayToPigeon(mockGroundOverlay, overlayId, false);
 
-    Messages.PlatformDoublePair anchor = result.getAnchor();
-    Assert.assertNotNull(anchor);
-    Assert.assertEquals(0.5, anchor.getX(), 1e-6);
-    Assert.assertEquals(0.5, anchor.getY(), 1e-6);
+    assertGroundOverlayEquals(result, mockGroundOverlay, overlayId, position, null);
   }
 
   @Test
@@ -750,34 +784,11 @@ public void groundOverlayToPigeonWithBounds() {
     when(mockGroundOverlay.isVisible()).thenReturn(true);
     when(mockGroundOverlay.isClickable()).thenReturn(false);
 
+    String overlayId = "overlay_2";
     Messages.PlatformGroundOverlay result =
-        Convert.groundOverlayToPigeon(mockGroundOverlay, "overlay_2", true);
-
-    Assert.assertEquals("overlay_2", result.getGroundOverlayId());
-    Assert.assertNotNull(result.getBounds());
-    Assert.assertEquals(
-        bounds.southwest.latitude, result.getBounds().getSouthwest().getLatitude(), 1e-15);
-    Assert.assertEquals(
-        bounds.southwest.longitude, result.getBounds().getSouthwest().getLongitude(), 1e-15);
-    Assert.assertEquals(
-        bounds.northeast.latitude, result.getBounds().getNortheast().getLatitude(), 1e-15);
-    Assert.assertEquals(
-        bounds.northeast.longitude, result.getBounds().getNortheast().getLongitude(), 1e-15);
-    Assert.assertNotNull(result.getWidth());
-    Assert.assertNotNull(result.getHeight());
-    Assert.assertEquals(30.0, result.getWidth(), 1e-15);
-    Assert.assertEquals(40.0, result.getHeight(), 1e-15);
-    Assert.assertEquals(50.0, result.getBearing(), 1e-15);
-    Assert.assertEquals(0.6, result.getTransparency(), 1e-6);
-    Assert.assertEquals(7, result.getZIndex().intValue());
-    Assert.assertTrue(result.getVisible());
-    Assert.assertFalse(result.getClickable());
-    Assert.assertNull(result.getPosition());
+        Convert.groundOverlayToPigeon(mockGroundOverlay, overlayId, true);
 
-    Messages.PlatformDoublePair anchor = result.getAnchor();
-    Assert.assertNotNull(anchor);
-    Assert.assertEquals(0.5, anchor.getX(), 1e-6);
-    Assert.assertEquals(0.5, anchor.getY(), 1e-6);
+    assertGroundOverlayEquals(result, mockGroundOverlay, overlayId, null, bounds);
   }
 }
 

packages/google_maps_flutter/google_maps_flutter_android/example/integration_test/google_maps_tests.dart

@@ -4,6 +4,7 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 import 'dart:typed_data';
 import 'dart:ui' as ui;
 
@@ -20,6 +21,11 @@ const double _kInitialZoomLevel = 5;
 const CameraPosition _kInitialCameraPosition =
     CameraPosition(target: _kInitialMapCenter, zoom: _kInitialZoomLevel);
 const String _kCloudMapId = '000000000000000'; // Dummy map ID.
+
+// The tolerance value for floating-point comparisons in the tests.
+// This value was selected as the minimum possible value that the test passes.
+// There are multiple float conversions and calculations when data is converted
+// between Dart and platform implementations.
 const double _floatTolerance = 1e-8;
 
 void googleMapsTests() {
@@ -995,7 +1001,7 @@ void googleMapsTests() {
   },
       // TODO(cyanglaz): un-skip the test when we can test this on CI with API key enabled.
       // https://github.com/flutter/flutter/issues/57057
-      skip: true);
+      skip: Platform.isAndroid);
 
   testWidgets(
     'set tileOverlay correctly',

packages/google_maps_flutter/google_maps_flutter_android/example/lib/ground_overlay.dart

@@ -131,6 +131,8 @@ class GroundOverlayBodyState extends State<GroundOverlayBody> {
   void _setBearing() {
     assert(_groundOverlay != null);
     setState(() {
+      // Adjusts the bearing by 10 degrees, wrapping around at 360 degrees.
+      // 10 is the increment, 350 degrees of the full circle -10.
       _groundOverlay = _groundOverlay!.copyWith(
           bearingParam: _groundOverlay!.bearing >= 350
               ? 0

packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/integration_test/google_maps_test.dart

@@ -20,6 +20,11 @@ const double _kInitialZoomLevel = 5;
 const CameraPosition _kInitialCameraPosition =
     CameraPosition(target: _kInitialMapCenter, zoom: _kInitialZoomLevel);
 const String _kCloudMapId = '000000000000000'; // Dummy map ID.
+
+// The tolerance value for floating-point comparisons in the tests.
+// This value was selected as the minimum possible value that the test passes.
+// There are multiple float conversions and calculations when data is converted
+// between Dart and platform implementations.
 const double _floatTolerance = 1e-6;
 
 void main() {

packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/ground_overlay.dart

@@ -128,6 +128,8 @@ class GroundOverlayBodyState extends State<GroundOverlayBody> {
   void _setBearing() {
     assert(_groundOverlay != null);
     setState(() {
+      // Adjusts the bearing by 10 degrees, wrapping around at 360 degrees.
+      // 10 is the increment, 350 degrees of the full circle -10.
       _groundOverlay = _groundOverlay!.copyWith(
           bearingParam: _groundOverlay!.bearing >= 350
               ? 0