Merge remote-tracking branch 'origin/master' into feature/google-maps…

…-heatmap

packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## 2.2.0
 
 * Adds support for heatmap layers.
+
+## 2.1.7
+
+* Updates code for stricter analysis options.
 * Removes unnecessary imports.
 
 ## 2.1.6

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart' show listEquals;
-import 'package:flutter/material.dart' show Color;
 import 'package:flutter/foundation.dart' show immutable;
+import 'package:flutter/material.dart' show Color;
 
 import 'types.dart';
 
@@ -24,7 +24,7 @@ class Heatmap implements MapsObject<Heatmap> {
   /// [GoogleMap].
   const Heatmap({
     required this.heatmapId,
-    this.data = const [],
+    this.data = const <WeightedLatLng>[],
     this.dissipating = true,
     this.gradient,
     this.maxIntensity,
@@ -108,12 +108,14 @@ class Heatmap implements MapsObject<Heatmap> {
 
   /// Creates a new [Heatmap] object whose values are the same as this
   /// instance.
+  @override
   Heatmap clone() => copyWith(
-        dataParam: List.of(data),
+        dataParam: List<WeightedLatLng>.of(data),
         gradientParam: gradient?.clone(),
       );
 
   /// Converts this object to something serializable in JSON.
+  @override
   Object toJson() {
     final Map<String, Object> json = <String, Object>{};
 
@@ -124,7 +126,7 @@ class Heatmap implements MapsObject<Heatmap> {
     }
 
     addIfPresent('heatmapId', heatmapId.value);
-    addIfPresent('data', data.map((e) => e.toJson()).toList());
+    addIfPresent('data', data.map((WeightedLatLng e) => e.toJson()).toList());
     addIfPresent('dissipating', dissipating);
     addIfPresent('gradient', gradient?.toJson());
     addIfPresent('maxIntensity', maxIntensity);
@@ -138,18 +140,22 @@ class Heatmap implements MapsObject<Heatmap> {
 
   @override
   bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    if (other.runtimeType != runtimeType) return false;
-    final Heatmap typedOther = other as Heatmap;
-    return heatmapId == typedOther.heatmapId &&
-        listEquals(data, typedOther.data) &&
-        dissipating == typedOther.dissipating &&
-        gradient == typedOther.gradient &&
-        maxIntensity == typedOther.maxIntensity &&
-        opacity == typedOther.opacity &&
-        radius == typedOther.radius &&
-        minimumZoomIntensity == typedOther.minimumZoomIntensity &&
-        maximumZoomIntensity == typedOther.maximumZoomIntensity;
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is Heatmap &&
+        heatmapId == other.heatmapId &&
+        listEquals(data, other.data) &&
+        dissipating == other.dissipating &&
+        gradient == other.gradient &&
+        maxIntensity == other.maxIntensity &&
+        opacity == other.opacity &&
+        radius == other.radius &&
+        minimumZoomIntensity == other.minimumZoomIntensity &&
+        maximumZoomIntensity == other.maximumZoomIntensity;
   }
 
   @override
@@ -158,7 +164,17 @@ class Heatmap implements MapsObject<Heatmap> {
 
 /// Represents a mapping of intensity to color.  Interpolates between given set
 /// intensity and color values to produce a full mapping for the range [0, 1].
+@immutable
 class HeatmapGradient {
+  /// Creates a new [HeatmapGradient] object.
+  const HeatmapGradient({
+    required this.colors,
+    required this.startPoints,
+    this.colorMapSize = 256,
+  })  : assert(colors.length == startPoints.length),
+        assert(colors.length > 0),
+        assert(startPoints.length > 0);
+
   /// The specific colors for the specific intensities specified by startPoints.
   final List<Color> colors;
 
@@ -172,15 +188,6 @@ class HeatmapGradient {
   /// Android and iOS only.
   final int colorMapSize;
 
-  /// Creates a new [HeatmapGradient] object.
-  const HeatmapGradient({
-    required this.colors,
-    required this.startPoints,
-    this.colorMapSize = 256,
-  })  : assert(colors.length == startPoints.length),
-        assert(colors.length > 0),
-        assert(startPoints.length > 0);
-
   /// Creates a new [HeatmapGradient] object whose values are the same as this
   /// instance, unless overwritten by the specified parameters.
   HeatmapGradient copyWith({
@@ -198,8 +205,8 @@ class HeatmapGradient {
   /// Creates a new [HeatmapGradient] object whose values are the same as this
   /// instance.
   HeatmapGradient clone() => copyWith(
-        colorsParam: List.of(colors),
-        startPointsParam: List.of(startPoints),
+        colorsParam: List<Color>.of(colors),
+        startPointsParam: List<double>.of(startPoints),
       );
 
   /// Converts this object to something serializable in JSON.
@@ -212,7 +219,7 @@ class HeatmapGradient {
       }
     }
 
-    addIfPresent('colors', colors.map((e) => e.value).toList());
+    addIfPresent('colors', colors.map((Color e) => e.value).toList());
     addIfPresent('startPoints', startPoints);
     addIfPresent('colorMapSize', colorMapSize);
 
@@ -221,11 +228,18 @@ class HeatmapGradient {
 
   @override
   bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    if (other.runtimeType != runtimeType) return false;
-    final HeatmapGradient typedOther = other as HeatmapGradient;
-    return listEquals(colors, typedOther.colors) &&
-        listEquals(startPoints, typedOther.startPoints) &&
-        colorMapSize == typedOther.colorMapSize;
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is HeatmapGradient &&
+        listEquals(colors, other.colors) &&
+        listEquals(startPoints, other.startPoints) &&
+        colorMapSize == other.colorMapSize;
   }
+
+  @override
+  int get hashCode => Object.hash(colors, startPoints, colorMapSize);
 }

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/foundation.dart'
-    show objectRuntimeType, visibleForTesting;
+    show immutable, objectRuntimeType, visibleForTesting;
 
 /// A pair of latitude and longitude coordinates, stored as degrees.
 @immutable
@@ -128,8 +128,9 @@ class LatLngBounds {
   }
 
   @override
-  String toString() =>
-      '${objectRuntimeType(this, 'LatLngBounds')}($southwest, $northeast)';
+  String toString() {
+    return '${objectRuntimeType(this, 'LatLngBounds')}($southwest, $northeast)';
+  }
 
   @override
   bool operator ==(Object other) {
@@ -153,6 +154,7 @@ class WeightedLatLng extends LatLng {
   final double weight;
 
   /// Converts this object to something serializable in JSON.
+  @override
   Object toJson() {
     return <Object>[super.toJson(), weight];
   }
@@ -163,25 +165,26 @@ class WeightedLatLng extends LatLng {
       return null;
     }
     assert(json is List && json.length == 2);
-    final list = json as List;
-    final latLng = LatLng.fromJson(list[0])!;
+    final List<dynamic> list = json as List<dynamic>;
+    final LatLng latLng = LatLng.fromJson(list[0])!;
     return WeightedLatLng(
       latLng.latitude,
       latLng.longitude,
-      weight: list[1],
+      weight: list[1] as double,
     );
   }
 
   @override
-  String toString() =>
-      '${objectRuntimeType(this, 'WeightedLatLng')}($latitude, $longitude, $weight)';
+  String toString() {
+    return '${objectRuntimeType(this, 'WeightedLatLng')}($latitude, $longitude, $weight)';
+  }
 
   @override
-  bool operator ==(Object o) {
-    return o is WeightedLatLng &&
-        o.latitude == latitude &&
-        o.longitude == longitude &&
-        o.weight == weight;
+  bool operator ==(Object other) {
+    return other is WeightedLatLng &&
+        other.latitude == latitude &&
+        other.longitude == longitude &&
+        other.weight == weight;
   }
 
   @override

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart

@@ -8,8 +8,9 @@ export 'callbacks.dart';
 export 'camera.dart';
 export 'cap.dart';
 export 'circle.dart';
-export 'heatmap_updates.dart';
+export 'circle_updates.dart';
 export 'heatmap.dart';
+export 'heatmap_updates.dart';
 export 'joint_type.dart';
 export 'location.dart';
 export 'maps_object.dart';

packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart

@@ -148,8 +148,8 @@ void main() {
           expect(() {
             controller.updateCircles(
               CircleUpdates.from(
-                <Circle>{},
-                <Circle>{},
+                const <Circle>{},
+                const <Circle>{},
               ),
             );
           }, throwsAssertionError);
@@ -162,8 +162,8 @@ void main() {
           expect(() {
             controller.updateHeatmaps(
               HeatmapUpdates.from(
-                <Heatmap>{},
-                <Heatmap>{},
+                const <Heatmap>{},
+                const <Heatmap>{},
               ),
             );
           }, throwsAssertionError);
@@ -176,8 +176,8 @@ void main() {
           expect(() {
             controller.updatePolygons(
               PolygonUpdates.from(
-                <Polygon>{},
-                <Polygon>{},
+                const <Polygon>{},
+                const <Polygon>{},
               ),
             );
           }, throwsAssertionError);
@@ -190,8 +190,8 @@ void main() {
           expect(() {
             controller.updatePolylines(
               PolylineUpdates.from(
-                <Polyline>{},
-                <Polyline>{},
+                const <Polyline>{},
+                const <Polyline>{},
               ),
             );
           }, throwsAssertionError);
@@ -204,8 +204,8 @@ void main() {
           expect(() {
             controller.updateMarkers(
               MarkerUpdates.from(
-                <Marker>{},
-                <Marker>{},
+                const <Marker>{},
+                const <Marker>{},
               ),
             );
           }, throwsAssertionError);

packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart

@@ -233,8 +233,8 @@ void main() {
       // Geometry
       testWidgets('updateMarkers', (WidgetTester tester) async {
         final MarkerUpdates expectedUpdates = MarkerUpdates.from(
-          <Marker>{},
-          <Marker>{},
+          const <Marker>{},
+          const <Marker>{},
         );
 
         await plugin.updateMarkers(expectedUpdates, mapId: mapId);
@@ -243,8 +243,8 @@ void main() {
       });
       testWidgets('updatePolygons', (WidgetTester tester) async {
         final PolygonUpdates expectedUpdates = PolygonUpdates.from(
-          <Polygon>{},
-          <Polygon>{},
+          const <Polygon>{},
+          const <Polygon>{},
         );
 
         await plugin.updatePolygons(expectedUpdates, mapId: mapId);
@@ -253,8 +253,8 @@ void main() {
       });
       testWidgets('updatePolylines', (WidgetTester tester) async {
         final PolylineUpdates expectedUpdates = PolylineUpdates.from(
-          <Polyline>{},
-          <Polyline>{},
+          const <Polyline>{},
+          const <Polyline>{},
         );
 
         await plugin.updatePolylines(expectedUpdates, mapId: mapId);
@@ -263,8 +263,8 @@ void main() {
       });
       testWidgets('updateCircles', (WidgetTester tester) async {
         final CircleUpdates expectedUpdates = CircleUpdates.from(
-          <Circle>{},
-          <Circle>{},
+          const <Circle>{},
+          const <Circle>{},
         );
 
         await plugin.updateCircles(expectedUpdates, mapId: mapId);
@@ -273,8 +273,8 @@ void main() {
       });
       testWidgets('updateHeatmaps', (WidgetTester tester) async {
         final HeatmapUpdates expectedUpdates = HeatmapUpdates.from(
-          <Heatmap>{},
-          <Heatmap>{},
+          const <Heatmap>{},
+          const <Heatmap>{},
         );
 
         await plugin.updateHeatmaps(expectedUpdates, mapId: mapId);

packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart

@@ -444,8 +444,8 @@ void main() {
         Heatmap(
           heatmapId: const HeatmapId('1'),
           gradient: HeatmapGradient(
-            colors: <Color>[const Color(0xFFFABADA)],
-            startPoints: <double>[0],
+            colors: const <Color>[Color(0xFFFABADA)],
+            startPoints: const <double>[0],
           ),
         ),
       };