prevent potential race

Author: Emmanuel Garcia

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

@@ -303,14 +303,14 @@ public void onSnapshotReady(Bitmap bitmap) {
         }
       case "markers#update":
         {
+          invalidateMapIfNeeded();
           List<Object> markersToAdd = call.argument("markersToAdd");
           markersController.addMarkers(markersToAdd);
           List<Object> markersToChange = call.argument("markersToChange");
           markersController.changeMarkers(markersToChange);
           List<Object> markerIdsToRemove = call.argument("markerIdsToRemove");
           markersController.removeMarkers(markerIdsToRemove);
           result.success(null);
-          invalidateMapIfNeeded();
           break;
         }
       case "markers#showInfoWindow":
@@ -333,38 +333,38 @@ public void onSnapshotReady(Bitmap bitmap) {
         }
       case "polygons#update":
         {
+          invalidateMapIfNeeded();
           List<Object> polygonsToAdd = call.argument("polygonsToAdd");
           polygonsController.addPolygons(polygonsToAdd);
           List<Object> polygonsToChange = call.argument("polygonsToChange");
           polygonsController.changePolygons(polygonsToChange);
           List<Object> polygonIdsToRemove = call.argument("polygonIdsToRemove");
           polygonsController.removePolygons(polygonIdsToRemove);
           result.success(null);
-          invalidateMapIfNeeded();
           break;
         }
       case "polylines#update":
         {
+          invalidateMapIfNeeded();
           List<Object> polylinesToAdd = call.argument("polylinesToAdd");
           polylinesController.addPolylines(polylinesToAdd);
           List<Object> polylinesToChange = call.argument("polylinesToChange");
           polylinesController.changePolylines(polylinesToChange);
           List<Object> polylineIdsToRemove = call.argument("polylineIdsToRemove");
           polylinesController.removePolylines(polylineIdsToRemove);
           result.success(null);
-          invalidateMapIfNeeded();
           break;
         }
       case "circles#update":
         {
+          invalidateMapIfNeeded();
           List<Object> circlesToAdd = call.argument("circlesToAdd");
           circlesController.addCircles(circlesToAdd);
           List<Object> circlesToChange = call.argument("circlesToChange");
           circlesController.changeCircles(circlesToChange);
           List<Object> circleIdsToRemove = call.argument("circleIdsToRemove");
           circlesController.removeCircles(circleIdsToRemove);
           result.success(null);
-          invalidateMapIfNeeded();
           break;
         }
       case "map#isCompassEnabled":
@@ -437,6 +437,7 @@ public void onSnapshotReady(Bitmap bitmap) {
         }
       case "map#setStyle":
         {
+          invalidateMapIfNeeded();
           boolean mapStyleSet;
           if (call.arguments instanceof String) {
             String mapStyle = (String) call.arguments;
@@ -455,26 +456,25 @@ public void onSnapshotReady(Bitmap bitmap) {
                 "Unable to set the map style. Please check console logs for errors.");
           }
           result.success(mapStyleResult);
-          invalidateMapIfNeeded();
           break;
         }
       case "tileOverlays#update":
         {
+          invalidateMapIfNeeded();
           List<Map<String, ?>> tileOverlaysToAdd = call.argument("tileOverlaysToAdd");
           tileOverlaysController.addTileOverlays(tileOverlaysToAdd);
           List<Map<String, ?>> tileOverlaysToChange = call.argument("tileOverlaysToChange");
           tileOverlaysController.changeTileOverlays(tileOverlaysToChange);
           List<String> tileOverlaysToRemove = call.argument("tileOverlayIdsToRemove");
           tileOverlaysController.removeTileOverlays(tileOverlaysToRemove);
           result.success(null);
-          invalidateMapIfNeeded();
           break;
         }
       case "tileOverlays#clearTileCache":
         {
+          invalidateMapIfNeeded();
           String tileOverlayId = call.argument("tileOverlayId");
           tileOverlaysController.clearTileCache(tileOverlayId);
-          invalidateMapIfNeeded();
           result.success(null);
           break;
         }