Fix the ordering

Author: stuartmorgan-g

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMGroundOverlayController.m

@@ -72,6 +72,8 @@ + (void)updateGroundOverlay:(GMSGroundOverlay *)groundOverlay
     groundOverlay.position = CLLocationCoordinate2DMake(platformGroundOverlay.position.latitude,
                                                         platformGroundOverlay.position.longitude);
   }
+
+  // This must be done last, to avoid visual flickers of default property values.
   groundOverlay.map = platformGroundOverlay.visible ? mapView : nil;
 }
 

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapHeatmapController.m

@@ -86,6 +86,7 @@ + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer
   }
 
   // The map must be set each time for options to update.
+  // This must be done last, to avoid visual flickers of default property values.
   heatmapTileLayer.map = mapView;
 }
 @end

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapTileOverlayController.m

@@ -47,11 +47,13 @@ - (void)updateFromPlatformTileOverlay:(FGMPlatformTileOverlay *)overlay {
 + (void)updateTileLayer:(GMSTileLayer *)tileLayer
     fromPlatformTileOverlay:(FGMPlatformTileOverlay *)platformOverlay
                 withMapView:(GMSMapView *)mapView {
-  tileLayer.map = platformOverlay.visible ? mapView : nil;
   tileLayer.opacity = 1.0 - platformOverlay.transparency;
   tileLayer.zIndex = (int)platformOverlay.zIndex;
   tileLayer.fadeIn = platformOverlay.fadeIn;
   tileLayer.tileSize = platformOverlay.tileSize;
+
+  // This must be done last, to avoid visual flickers of default property values.
+  tileLayer.map = platformOverlay.visible ? mapView : nil;
 }
 
 @end

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapCircleController.m

@@ -45,13 +45,15 @@ + (void)updateCircle:(GMSCircle *)circle
     fromPlatformCircle:(FGMPlatformCircle *)platformCircle
            withMapView:(GMSMapView *)mapView {
   circle.tappable = platformCircle.consumeTapEvents;
-  circle.map = platformCircle.visible ? mapView : nil;
   circle.zIndex = platformCircle.zIndex;
   circle.position = FGMGetCoordinateForPigeonLatLng(platformCircle.center);
   circle.radius = platformCircle.radius;
   circle.strokeColor = FGMGetColorForRGBA(platformCircle.strokeColor);
   circle.strokeWidth = platformCircle.strokeWidth;
   circle.fillColor = FGMGetColorForRGBA(platformCircle.fillColor);
+
+  // This must be done last, to avoid visual flickers of default property values.
+  circle.map = platformCircle.visible ? mapView : nil;
 }
 
 @end

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolygonController.m

@@ -53,14 +53,16 @@ + (void)updatePolygon:(GMSPolygon *)polygon
     fromPlatformPolygon:(FGMPlatformPolygon *)platformPolygon
             withMapView:(GMSMapView *)mapView {
   polygon.tappable = platformPolygon.consumesTapEvents;
-  polygon.map = platformPolygon.visible ? mapView : nil;
   polygon.zIndex = (int)platformPolygon.zIndex;
   polygon.path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(platformPolygon.points));
   polygon.holes =
       FMGPathHolesFromLocationHoles(FGMGetHolesForPigeonLatLngArrays(platformPolygon.holes));
   polygon.fillColor = FGMGetColorForRGBA(platformPolygon.fillColor);
   polygon.strokeColor = FGMGetColorForRGBA(platformPolygon.strokeColor);
   polygon.strokeWidth = platformPolygon.strokeWidth;
+
+  // This must be done last, to avoid visual flickers of default property values.
+  polygon.map = platformPolygon.visible ? mapView : nil;
 }
 
 @end

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolylineController.m

@@ -42,7 +42,6 @@ + (void)updatePolyline:(GMSPolyline *)polyline
     fromPlatformPolyline:(FGMPlatformPolyline *)platformPolyline
              withMapView:(GMSMapView *)mapView {
   polyline.tappable = platformPolyline.consumesTapEvents;
-  polyline.map = platformPolyline.visible ? mapView : nil;
   polyline.zIndex = (int)platformPolyline.zIndex;
   GMSMutablePath *path =
       FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(platformPolyline.points));
@@ -54,6 +53,9 @@ + (void)updatePolyline:(GMSPolyline *)polyline
   polyline.spans =
       GMSStyleSpans(path, FGMGetStrokeStylesFromPatterns(platformPolyline.patterns, strokeColor),
                     FGMGetSpanLengthsFromPatterns(platformPolyline.patterns), kGMSLengthRhumb);
+
+  // This must be done last, to avoid visual flickers of default property values.
+  polyline.map = platformPolyline.visible ? mapView : nil;
 }
 
 @end