[google_maps_flutter] Avoid unnecessary redraws (flutter#1933)

Author: ppicas

AUTHORS

@@ -43,3 +43,4 @@ Audrius Karosevicius <audrius.karosevicius@gmail.com>
 Lukasz Piliszczuk <lukasz@intheloup.io>
 SoundReply Solutions GmbH <ch@soundreply.com>
 Rafal Wachol <rwachol@gmail.com>
+Pau Picas <pau.picas@gmail.com>

packages/google_maps_flutter/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.21
+
+* Don't recreate map elements if they didn't change since last widget build.
+
 ## 0.5.20+6
 
 * Adds support for toggling the traffic layer

packages/google_maps_flutter/lib/src/circle.dart

@@ -141,7 +141,16 @@ class Circle {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
     final Circle typedOther = other;
-    return circleId == typedOther.circleId;
+    return circleId == typedOther.circleId &&
+        consumeTapEvents == typedOther.consumeTapEvents &&
+        fillColor == typedOther.fillColor &&
+        center == typedOther.center &&
+        radius == typedOther.radius &&
+        strokeColor == typedOther.strokeColor &&
+        strokeWidth == typedOther.strokeWidth &&
+        visible == typedOther.visible &&
+        zIndex == typedOther.zIndex &&
+        onTap == typedOther.onTap;
   }
 
   @override

packages/google_maps_flutter/lib/src/circle_updates.dart

@@ -36,9 +36,17 @@ class _CircleUpdates {
         .map(idToCurrentCircle)
         .toSet();
 
+    /// Returns `true` if [current] is not equals to previous one with the
+    /// same id.
+    bool hasChanged(Circle current) {
+      final Circle previous = previousCircles[current.circleId];
+      return current != previous;
+    }
+
     final Set<Circle> _circlesToChange = currentCircleIds
         .intersection(prevCircleIds)
         .map(idToCurrentCircle)
+        .where(hasChanged)
         .toSet();
 
     circlesToAdd = _circlesToAdd;

packages/google_maps_flutter/lib/src/marker.dart

@@ -283,7 +283,19 @@ class Marker {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
     final Marker typedOther = other;
-    return markerId == typedOther.markerId;
+    return markerId == typedOther.markerId &&
+        alpha == typedOther.alpha &&
+        anchor == typedOther.anchor &&
+        consumeTapEvents == typedOther.consumeTapEvents &&
+        draggable == typedOther.draggable &&
+        flat == typedOther.flat &&
+        icon == typedOther.icon &&
+        infoWindow == typedOther.infoWindow &&
+        position == typedOther.position &&
+        rotation == typedOther.rotation &&
+        visible == typedOther.visible &&
+        zIndex == typedOther.zIndex &&
+        onTap == typedOther.onTap;
   }
 
   @override

packages/google_maps_flutter/lib/src/marker_updates.dart

@@ -36,9 +36,17 @@ class _MarkerUpdates {
         .map(idToCurrentMarker)
         .toSet();
 
+    /// Returns `true` if [current] is not equals to previous one with the
+    /// same id.
+    bool hasChanged(Marker current) {
+      final Marker previous = previousMarkers[current.markerId];
+      return current != previous;
+    }
+
     final Set<Marker> _markersToChange = currentMarkerIds
         .intersection(prevMarkerIds)
         .map(idToCurrentMarker)
+        .where(hasChanged)
         .toSet();
 
     markersToAdd = _markersToAdd;

packages/google_maps_flutter/lib/src/polygon.dart

@@ -150,7 +150,16 @@ class Polygon {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
     final Polygon typedOther = other;
-    return polygonId == typedOther.polygonId;
+    return polygonId == typedOther.polygonId &&
+        consumeTapEvents == typedOther.consumeTapEvents &&
+        fillColor == typedOther.fillColor &&
+        geodesic == typedOther.geodesic &&
+        listEquals(points, typedOther.points) &&
+        visible == typedOther.visible &&
+        strokeColor == typedOther.strokeColor &&
+        strokeWidth == typedOther.strokeWidth &&
+        zIndex == typedOther.zIndex &&
+        onTap == typedOther.onTap;
   }
 
   @override

packages/google_maps_flutter/lib/src/polygon_updates.dart

@@ -36,9 +36,17 @@ class _PolygonUpdates {
         .map(idToCurrentPolygon)
         .toSet();
 
+    /// Returns `true` if [current] is not equals to previous one with the
+    /// same id.
+    bool hasChanged(Polygon current) {
+      final Polygon previous = previousPolygons[current.polygonId];
+      return current != previous;
+    }
+
     final Set<Polygon> _polygonsToChange = currentPolygonIds
         .intersection(prevPolygonIds)
         .map(idToCurrentPolygon)
+        .where(hasChanged)
         .toSet();
 
     polygonsToAdd = _polygonsToAdd;

packages/google_maps_flutter/lib/src/polyline.dart

@@ -192,7 +192,19 @@ class Polyline {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
     final Polyline typedOther = other;
-    return polylineId == typedOther.polylineId;
+    return polylineId == typedOther.polylineId &&
+        consumeTapEvents == typedOther.consumeTapEvents &&
+        color == typedOther.color &&
+        geodesic == typedOther.geodesic &&
+        jointType == typedOther.jointType &&
+        listEquals(patterns, typedOther.patterns) &&
+        listEquals(points, typedOther.points) &&
+        startCap == typedOther.startCap &&
+        endCap == typedOther.endCap &&
+        visible == typedOther.visible &&
+        width == typedOther.width &&
+        zIndex == typedOther.zIndex &&
+        onTap == typedOther.onTap;
   }
 
   @override

packages/google_maps_flutter/lib/src/polyline_updates.dart

@@ -38,9 +38,17 @@ class _PolylineUpdates {
         .map(idToCurrentPolyline)
         .toSet();
 
+    /// Returns `true` if [current] is not equals to previous one with the
+    /// same id.
+    bool hasChanged(Polyline current) {
+      final Polyline previous = previousPolylines[current.polylineId];
+      return current != previous;
+    }
+
     final Set<Polyline> _polylinesToChange = currentPolylineIds
         .intersection(prevPolylineIds)
         .map(idToCurrentPolyline)
+        .where(hasChanged)
         .toSet();
 
     polylinesToAdd = _polylinesToAdd;