Skip to content

Commit 2571200

Browse files
committed
Merge branch 'mod/gmf_imperative_map_updates' into imperative_google_maps_flutter
packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
2 parents 5cae9ca + 1085875 commit 2571200

4 files changed

Lines changed: 411 additions & 4 deletions

File tree

packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,5 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
6262

6363
part 'src/controller.dart';
6464
part 'src/google_map.dart';
65+
// MOD imperative map updates (added the line below)
66+
part 'src/mod_imperative_map_updates.dart';

packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ class GoogleMapController {
3737
}
3838

3939
final _GoogleMapState _googleMapState;
40+
// MOD imperative map updates (added those 4 fields)
41+
late final _GoogleMapStateMarkersUpdateHandler _markersUpdateHandler = _GoogleMapStateMarkersUpdateHandler(this);
42+
late final _GoogleMapStatePolylinesUpdateHandler _polylinesUpdateHandler = _GoogleMapStatePolylinesUpdateHandler(this);
43+
late final _GoogleMapStatePolygonsUpdateHandler _polygonsUpdateHandler = _GoogleMapStatePolygonsUpdateHandler(this);
44+
late final _GoogleMapStateCirclesUpdateHandler _circlesUpdateHandler = _GoogleMapStateCirclesUpdateHandler(this);
4045

4146
void _connectStreams(int mapId) {
4247
if (_googleMapState.widget.onCameraMoveStarted != null) {

packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,11 @@ class _GoogleMapState extends State<GoogleMap> {
460460

461461
_updateOptions(controller);
462462
_updateClusterManagers(controller);
463-
_updateMarkers(controller);
464-
_updatePolygons(controller);
465-
_updatePolylines(controller);
466-
_updateCircles(controller);
463+
// MOD imperative map updates (commented the lines below)
464+
//_updateMarkers(controller);
465+
//_updatePolygons(controller);
466+
//_updatePolylines(controller);
467+
//_updateCircles(controller);
467468
_updateHeatmaps(controller);
468469
_updateTileOverlays(controller);
469470
_updateGroundOverlays(controller);

0 commit comments

Comments
 (0)