From 5a7a89a093683d00a6207302fecf5660dc22da38 Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Wed, 4 Mar 2020 15:47:25 +0800
Subject: [PATCH 01/48] add google_maps_flutter_platform_interface

---
 .../CHANGELOG.md                              |  11 +
 .../LICENSE                                   |  27 +++
 .../README.md                                 |  26 ++
 ...oogle_maps_flutter_platform_interface.dart | 228 ++++++++++++++++++
 .../method_channel_google_maps_flutter.dart   | 197 +++++++++++++++
 .../pubspec.yaml                              |  22 ++
 ...thod_channel_google_maps_flutter_test.dart |  70 ++++++
 7 files changed, 581 insertions(+)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/LICENSE
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/README.md
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
new file mode 100644
index 000000000000..5a2c14e8c728
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
@@ -0,0 +1,11 @@
+## 1.0.0
+
+* Initial release.
+
+## 1.0.0+1
+
+* Update README
+
+## 1.0.0+2
+
+* Add PlatformInterface methods according to GoogleMapsFlutter
\ No newline at end of file
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/LICENSE b/packages/google_maps_flutter/google_maps_flutter_platform_interface/LICENSE
new file mode 100644
index 000000000000..8940a4be1b58
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/LICENSE
@@ -0,0 +1,27 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/README.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/README.md
new file mode 100644
index 000000000000..6489ba39cbd8
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/README.md
@@ -0,0 +1,26 @@
+# google_maps_flutter_platform_interface
+
+A common platform interface for the [`google_maps_flutter`][1] plugin.
+
+This interface allows platform-specific implementations of the `google_maps_flutter`
+plugin, as well as the plugin itself, to ensure they are supporting the
+same interface.
+
+# Usage
+
+To implement a new platform-specific implementation of `google_maps_flutter`, extend
+[`GoogleMapsFlutterPlatform`][2] with an implementation that performs the
+platform-specific behavior, and when you register your plugin, set the default
+`GoogleMapsFlutterPlatform` by calling
+`GoogleMapsFlutterPlatform.instance = MyPlatformGoogleMapsFlutter()`.
+
+# Note on breaking changes
+
+Strongly prefer non-breaking changes (such as adding a method to the interface)
+over breaking changes for this package.
+
+See https://flutter.dev/go/platform-interface-breaking-changes for a discussion
+on why a less-clean interface is preferable to a breaking change.
+
+[1]: ../google_maps_flutter
+[2]: lib/google_maps_flutter_platform_interface.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
new file mode 100644
index 000000000000..98f7011f5e47
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -0,0 +1,228 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:ui';
+
+import 'package:meta/meta.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+import 'method_channel_google_maps_flutter.dart';
+
+/// Exception when a map style is invalid or was unable to be set.
+///
+/// See also: `setStyle` on [GoogleMapController] for why this exception
+/// might be thrown.
+class MapStyleException implements Exception {
+  /// Default constructor for [MapStyleException].
+  const MapStyleException(this.cause);
+
+  /// The reason `GoogleMapController.setStyle` would throw this exception.
+  final String cause;
+}
+
+
+/// Represents a point coordinate in the [GoogleMap]'s view.
+///
+/// The screen location is specified in screen pixels (not display pixels) relative
+/// to the top left of the map, not top left of the whole screen. (x, y) = (0, 0)
+/// corresponds to top-left of the [GoogleMap] not the whole screen.
+@immutable
+class ScreenCoordinate {
+  /// Creates an immutable representation of a point coordinate in the [GoogleMap]'s view.
+  const ScreenCoordinate({
+    @required this.x,
+    @required this.y,
+  });
+
+  /// Represents the number of pixels from the left of the [GoogleMap].
+  final int x;
+
+  /// Represents the number of pixels from the top of the [GoogleMap].
+  final int y;
+
+  /// [x] [y] coordinate in Json format
+  dynamic toJson() {
+    return <String, int>{
+      "x": x,
+      "y": y,
+    };
+  }
+
+  @override
+  String toString() => '$runtimeType($x, $y)';
+
+  @override
+  bool operator ==(Object o) {
+    return o is ScreenCoordinate && o.x == x && o.y == y;
+  }
+
+  @override
+  int get hashCode => hashValues(x, y);
+}
+
+/// The interface that implementations of google_maps_flutter must implement.
+///
+/// Platform implementations should extend this class rather than implement it as `google_maps_flutter`
+/// does not consider newly added methods to be breaking changes. Extending this class
+/// (using `extends`) ensures that the subclass will get the default implementation, while
+/// platform implementations that `implements` this interface will be broken by newly added
+/// [GoogleMapsFlutterPlatform] methods.
+abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
+  /// Constructs a GoogleMapsFlutterPlatform.
+  GoogleMapsFlutterPlatform() : super(token: _token);
+
+  static final Object _token = Object();
+
+  static GoogleMapsFlutterPlatform _instance = MethodChannelGoogleMapsFlutter(0);
+
+  /// The default instance of [GoogleMapsFlutterPlatform] to use.
+  ///
+  /// Defaults to [MethodChannelUrlLauncher].
+  static GoogleMapsFlutterPlatform get instance => _instance;
+
+  /// Platform-specific plugins should set this with their own platform-specific
+  /// class that extends [GoogleMapsFlutterPlatform] when they register themselves.
+  static set instance(GoogleMapsFlutterPlatform instance) {
+    PlatformInterface.verifyToken(instance, _token);
+    _instance = instance;
+  }
+
+  /// Updates configuration options of the map user interface.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) async {
+    throw UnimplementedError('updateMapOptions() has not been implemented.');
+  }
+
+  /// Updates marker configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) async {
+    throw UnimplementedError('updateMarkers() has not been implemented.');
+  }
+
+  /// Updates polygon configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) async {
+    throw UnimplementedError('updatePolygons() has not been implemented.');
+  }
+
+  /// Updates polyline configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) async {
+    throw UnimplementedError('updatePolylines() has not been implemented.');
+  }
+
+  /// Updates circle configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updateCircles(Map<String, dynamic> circleUpdates) async {
+    throw UnimplementedError('updateCircles() has not been implemented.');
+  }
+
+  /// Starts an animated change of the map camera position.
+  ///
+  /// The returned [Future] completes after the change has been started on the
+  /// platform side.
+  Future<void> animateCamera(Map<String, dynamic> cameraUpdate) async {
+    throw UnimplementedError('animateCamera() has not been implemented.');
+  }
+
+  /// Changes the map camera position.
+  ///
+  /// The returned [Future] completes after the change has been made on the
+  /// platform side.
+  Future<void> moveCamera(Map<String, dynamic> cameraUpdate) async {
+    throw UnimplementedError('moveCamera() has not been implemented.');
+  }
+
+  /// Sets the styling of the base map.
+  ///
+  /// Set to `null` to clear any previous custom styling.
+  ///
+  /// If problems were detected with the [mapStyle], including un-parsable
+  /// styling JSON, unrecognized feature type, unrecognized element type, or
+  /// invalid styler keys: [MapStyleException] is thrown and the current
+  /// style is left unchanged.
+  ///
+  /// The style string can be generated using [map style tool](https://mapstyle.withgoogle.com/).
+  /// Also, refer [iOS](https://developers.google.com/maps/documentation/ios-sdk/style-reference)
+  /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
+  /// style reference for more information regarding the supported styles.
+  Future<void> setMapStyle(String mapStyle) async {
+    throw UnimplementedError('setMapStyle() has not been implemented.');
+  }
+
+  /// Return [Map<String, dynamic>] defining the region that is visible in a map.
+  Future<Map<String, dynamic>> getVisibleRegion() async {
+    throw UnimplementedError('getVisibleRegion() has not been implemented.');
+  }
+
+  /// Returns [List] corresponding to the [ScreenCoordinate] in the current map view.
+  ///
+  /// Returned [List] corresponds to a screen location. The screen location is specified in screen
+  /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
+  Future<List<dynamic>> getLatLng(ScreenCoordinate screenCoordinate) async {
+    throw UnimplementedError('getLatLng() has not been implemented.');
+  }
+
+  /// Programmatically show the Info Window for a [Marker].
+  ///
+  /// The `markerId` must match one of the markers on the map.
+  /// An invalid `markerId` triggers an "Invalid markerId" error.
+  ///
+  /// * See also:
+  ///   * [hideMarkerInfoWindow] to hide the Info Window.
+  ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
+  Future<void> showMarkerInfoWindow( String markerId ) async {
+    throw UnimplementedError('showMarkerInfoWindow() has not been implemented.');
+  }
+
+  /// Programmatically hide the Info Window for a [Marker].
+  ///
+  /// The `markerId` must match one of the markers on the map.
+  /// An invalid `markerId` triggers an "Invalid markerId" error.
+  ///
+  /// * See also:
+  ///   * [showMarkerInfoWindow] to show the Info Window.
+  ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
+  Future<void> hideMarkerInfoWindow(String markerId ) async {
+    throw UnimplementedError('hideMarkerInfoWindow() has not been implemented.');
+  }
+
+  /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
+  ///
+  /// The `markerId` must match one of the markers on the map.
+  /// An invalid `markerId` triggers an "Invalid markerId" error.
+  ///
+  /// * See also:
+  ///   * [showMarkerInfoWindow] to show the Info Window.
+  ///   * [hideMarkerInfoWindow] to hide the Info Window.
+  Future<bool> isMarkerInfoWindowShown(String markerId ) async {
+    throw UnimplementedError('updateMapOptions() has not been implemented.');
+  }
+
+  /// Returns the current zoom level of the map
+  Future<double> getZoomLevel() async {
+    throw UnimplementedError('getZoomLevel() has not been implemented.');
+  }
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
new file mode 100644
index 000000000000..2d6d8829d5d7
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
@@ -0,0 +1,197 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/services.dart';
+
+import 'google_maps_flutter_platform_interface.dart';
+
+MethodChannel _channel;
+
+/// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
+class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
+
+///Initialize control of a [MethodChannelGoogleMapsFlutter] with [id].
+  MethodChannelGoogleMapsFlutter(int id){
+    _channel = MethodChannel('plugins.flutter.io/google_maps_$id');
+  }
+
+  /// Updates configuration options of the map user interface.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) async {
+    assert(optionsUpdate != null);
+    await _channel.invokeMethod<void>(
+      'map#update',
+      <String, dynamic>{
+        'options': optionsUpdate,
+      },
+    );
+  }
+
+  /// Updates marker configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) async {
+    assert(markerUpdates != null);
+    await _channel.invokeMethod<void>(
+      'markers#update',
+      markerUpdates,
+    );
+  }
+
+  /// Updates polygon configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) async {
+    assert(polygonUpdates != null);
+    await _channel.invokeMethod<void>(
+      'polygons#update',
+      polygonUpdates,
+    );
+  }
+
+  /// Updates polyline configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) async {
+    assert(polylineUpdates != null);
+    await _channel.invokeMethod<void>(
+      'polylines#update',
+      polylineUpdates,
+    );
+  }
+
+  /// Updates circle configuration.
+  ///
+  /// Change listeners are notified once the update has been made on the
+  /// platform side.
+  ///
+  /// The returned [Future] completes after listeners have been notified.
+  Future<void> updateCircles(Map<String, dynamic> circleUpdates) async {
+    assert(circleUpdates != null);
+    await _channel.invokeMethod<void>(
+      'circles#update',
+      circleUpdates,
+    );
+  }
+
+  /// Starts an animated change of the map camera position.
+  ///
+  /// The returned [Future] completes after the change has been started on the
+  /// platform side.
+  Future<void> animateCamera(dynamic cameraUpdate) async {
+    await _channel.invokeMethod<void>('camera#animate', <String, dynamic>{
+      'cameraUpdate': cameraUpdate,
+    });
+  }
+
+  /// Changes the map camera position.
+  ///
+  /// The returned [Future] completes after the change has been made on the
+  /// platform side.
+  Future<void> moveCamera(dynamic cameraUpdate) async {
+    await _channel.invokeMethod<void>('camera#move', <String, dynamic>{
+      'cameraUpdate': cameraUpdate,
+    });
+  }
+
+  /// Sets the styling of the base map.
+  ///
+  /// Set to `null` to clear any previous custom styling.
+  ///
+  /// If problems were detected with the [mapStyle], including un-parsable
+  /// styling JSON, unrecognized feature type, unrecognized element type, or
+  /// invalid styler keys: [MapStyleException] is thrown and the current
+  /// style is left unchanged.
+  ///
+  /// The style string can be generated using [map style tool](https://mapstyle.withgoogle.com/).
+  /// Also, refer [iOS](https://developers.google.com/maps/documentation/ios-sdk/style-reference)
+  /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
+  /// style reference for more information regarding the supported styles.
+  Future<void> setMapStyle(String mapStyle) async {
+    final List<dynamic> successAndError =
+    await _channel.invokeMethod<List<dynamic>>('map#setStyle', mapStyle);
+    final bool success = successAndError[0];
+    if (!success) {
+      throw MapStyleException(successAndError[1]);
+    }
+  }
+
+  /// Return [Map<String, dynamic>] defining the region that is visible in a map.
+  Future<Map<String, dynamic>> getVisibleRegion() async {
+    return await _channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion');
+  }
+
+  /// Returns [List] corresponding to the [ScreenCoordinate] in the current map view.
+  ///
+  /// Returned [List] corresponds to a screen location. The screen location is specified in screen
+  /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
+  Future<List<dynamic>> getLatLng(ScreenCoordinate screenCoordinate) async {
+    return await _channel.invokeMethod<List<dynamic>>(
+        'map#getLatLng', screenCoordinate.toJson());
+  }
+
+  /// Programmatically show the Info Window for a [Marker].
+  ///
+  /// The `markerId` must match one of the markers on the map.
+  /// An invalid `markerId` triggers an "Invalid markerId" error.
+  ///
+  /// * See also:
+  ///   * [hideMarkerInfoWindow] to hide the Info Window.
+  ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
+  Future<void> showMarkerInfoWindow( String markerId ) async {
+    assert(markerId != null);
+    await _channel.invokeMethod<void>(
+        'markers#showInfoWindow', <String, String>{'markerId': markerId});
+  }
+
+  /// Programmatically hide the Info Window for a [Marker].
+  ///
+  /// The `markerId` must match one of the markers on the map.
+  /// An invalid `markerId` triggers an "Invalid markerId" error.
+  ///
+  /// * See also:
+  ///   * [showMarkerInfoWindow] to show the Info Window.
+  ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
+  Future<void> hideMarkerInfoWindow(String markerId ) async {
+    assert(markerId != null);
+    await _channel.invokeMethod<void>(
+        'markers#hideInfoWindow', <String, String>{'markerId': markerId});
+  }
+
+  /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
+  ///
+  /// The `markerId` must match one of the markers on the map.
+  /// An invalid `markerId` triggers an "Invalid markerId" error.
+  ///
+  /// * See also:
+  ///   * [showMarkerInfoWindow] to show the Info Window.
+  ///   * [hideMarkerInfoWindow] to hide the Info Window.
+  Future<bool> isMarkerInfoWindowShown(String markerId ) async {
+    assert(markerId != null);
+    return await _channel.invokeMethod<bool>('markers#isInfoWindowShown',
+        <String, String>{'markerId': markerId});
+  }
+
+  /// Returns the current zoom level of the map
+  Future<double> getZoomLevel() async {
+    final double zoomLevel =
+    await _channel.invokeMethod<double>('map#getZoomLevel');
+    return zoomLevel;
+  }
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
new file mode 100644
index 000000000000..17fd5557d396
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
@@ -0,0 +1,22 @@
+name: google_maps_flutter_platform_interface
+description: A common platform interface for the google_maps_flutter plugin.
+homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter_platform_interface
+# NOTE: We strongly prefer non-breaking changes, even at the expense of a
+# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
+version: 1.0.0+2
+
+dependencies:
+  flutter:
+    sdk: flutter
+  meta: ^1.0.5
+  plugin_platform_interface: ^1.0.1
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  mockito: ^4.1.1
+  pedantic: ^1.8.0
+
+environment:
+  sdk: ">=2.0.0-dev.28.0 <3.0.0"
+  flutter: ">=1.9.1+hotfix.4 <2.0.0"
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
new file mode 100644
index 000000000000..d57bb38223cd
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
@@ -0,0 +1,70 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:mockito/mockito.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+import 'package:google_maps_flutter_platform_interface/method_channel_google_maps_flutter.dart';
+import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('$GoogleMapsFlutterPlatform', () {
+    test('$MethodChannelGoogleMapsFlutter() is the default instance', () {
+      expect(GoogleMapsFlutterPlatform.instance,
+          isInstanceOf<MethodChannelGoogleMapsFlutter>());
+    });
+
+    test('Cannot be implemented with `implements`', () {
+      expect(() {
+        GoogleMapsFlutterPlatform.instance = ImplementsGoogleMapsFlutterPlatform();
+      }, throwsA(isInstanceOf<AssertionError>()));
+    });
+
+    test('Can be mocked with `implements`', () {
+      final GoogleMapsFlutterPlatformMock mock = GoogleMapsFlutterPlatformMock();
+      GoogleMapsFlutterPlatform.instance = mock;
+    });
+
+    test('Can be extended', () {
+      GoogleMapsFlutterPlatform.instance = ExtendsGoogleMapsFlutterPlatform();
+    });
+  });
+
+  group('$MethodChannelGoogleMapsFlutter', () {
+    const MethodChannel channel =
+        MethodChannel('plugins.flutter.io/google_maps_flutter');
+    final List<MethodCall> log = <MethodCall>[];
+    channel.setMockMethodCallHandler((MethodCall methodCall) async {
+      log.add(methodCall);
+    });
+
+    final MethodChannelGoogleMapsFlutter map = MethodChannelGoogleMapsFlutter(0);
+
+    tearDown(() {
+      log.clear();
+    });
+
+    test('foo', () async {
+//      await map.foo();
+      expect(
+        log,
+        <Matcher>[
+        ],
+      );
+    });
+  });
+}
+
+class GoogleMapsFlutterPlatformMock extends Mock
+    with MockPlatformInterfaceMixin
+    implements GoogleMapsFlutterPlatform {}
+
+class ImplementsGoogleMapsFlutterPlatform extends Mock
+    implements GoogleMapsFlutterPlatform {}
+
+class ExtendsGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform {}

From 910c6ae9b7393ec11de4056d4a6c250906adb9a3 Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Wed, 4 Mar 2020 16:04:19 +0800
Subject: [PATCH 02/48] removed unused_local_variable

---
 .../test/method_channel_google_maps_flutter_test.dart           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
index d57bb38223cd..43f2bf2c1393 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
@@ -43,7 +43,7 @@ void main() {
       log.add(methodCall);
     });
 
-    final MethodChannelGoogleMapsFlutter map = MethodChannelGoogleMapsFlutter(0);
+//    final MethodChannelGoogleMapsFlutter map = MethodChannelGoogleMapsFlutter(0);
 
     tearDown(() {
       log.clear();

From 5afbe027c1e1cbcb920cb381d0828d28b7fe9365 Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Wed, 4 Mar 2020 16:25:00 +0800
Subject: [PATCH 03/48] format

---
 ...oogle_maps_flutter_platform_interface.dart | 16 ++++++++------
 .../method_channel_google_maps_flutter.dart   | 22 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 98f7011f5e47..59d3f64895f4 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -22,7 +22,6 @@ class MapStyleException implements Exception {
   final String cause;
 }
 
-
 /// Represents a point coordinate in the [GoogleMap]'s view.
 ///
 /// The screen location is specified in screen pixels (not display pixels) relative
@@ -75,7 +74,8 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
 
   static final Object _token = Object();
 
-  static GoogleMapsFlutterPlatform _instance = MethodChannelGoogleMapsFlutter(0);
+  static GoogleMapsFlutterPlatform _instance =
+      MethodChannelGoogleMapsFlutter(0);
 
   /// The default instance of [GoogleMapsFlutterPlatform] to use.
   ///
@@ -193,8 +193,9 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> showMarkerInfoWindow( String markerId ) async {
-    throw UnimplementedError('showMarkerInfoWindow() has not been implemented.');
+  Future<void> showMarkerInfoWindow(String markerId) async {
+    throw UnimplementedError(
+        'showMarkerInfoWindow() has not been implemented.');
   }
 
   /// Programmatically hide the Info Window for a [Marker].
@@ -205,8 +206,9 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> hideMarkerInfoWindow(String markerId ) async {
-    throw UnimplementedError('hideMarkerInfoWindow() has not been implemented.');
+  Future<void> hideMarkerInfoWindow(String markerId) async {
+    throw UnimplementedError(
+        'hideMarkerInfoWindow() has not been implemented.');
   }
 
   /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
@@ -217,7 +219,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
-  Future<bool> isMarkerInfoWindowShown(String markerId ) async {
+  Future<bool> isMarkerInfoWindowShown(String markerId) async {
     throw UnimplementedError('updateMapOptions() has not been implemented.');
   }
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
index 2d6d8829d5d7..430a41d3ab02 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
@@ -12,9 +12,8 @@ MethodChannel _channel;
 
 /// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
-
-///Initialize control of a [MethodChannelGoogleMapsFlutter] with [id].
-  MethodChannelGoogleMapsFlutter(int id){
+  ///Initialize control of a [MethodChannelGoogleMapsFlutter] with [id].
+  MethodChannelGoogleMapsFlutter(int id) {
     _channel = MethodChannel('plugins.flutter.io/google_maps_$id');
   }
 
@@ -125,7 +124,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// style reference for more information regarding the supported styles.
   Future<void> setMapStyle(String mapStyle) async {
     final List<dynamic> successAndError =
-    await _channel.invokeMethod<List<dynamic>>('map#setStyle', mapStyle);
+        await _channel.invokeMethod<List<dynamic>>('map#setStyle', mapStyle);
     final bool success = successAndError[0];
     if (!success) {
       throw MapStyleException(successAndError[1]);
@@ -134,7 +133,8 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
 
   /// Return [Map<String, dynamic>] defining the region that is visible in a map.
   Future<Map<String, dynamic>> getVisibleRegion() async {
-    return await _channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion');
+    return await _channel
+        .invokeMapMethod<String, dynamic>('map#getVisibleRegion');
   }
 
   /// Returns [List] corresponding to the [ScreenCoordinate] in the current map view.
@@ -154,7 +154,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> showMarkerInfoWindow( String markerId ) async {
+  Future<void> showMarkerInfoWindow(String markerId) async {
     assert(markerId != null);
     await _channel.invokeMethod<void>(
         'markers#showInfoWindow', <String, String>{'markerId': markerId});
@@ -168,7 +168,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> hideMarkerInfoWindow(String markerId ) async {
+  Future<void> hideMarkerInfoWindow(String markerId) async {
     assert(markerId != null);
     await _channel.invokeMethod<void>(
         'markers#hideInfoWindow', <String, String>{'markerId': markerId});
@@ -182,16 +182,16 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
-  Future<bool> isMarkerInfoWindowShown(String markerId ) async {
+  Future<bool> isMarkerInfoWindowShown(String markerId) async {
     assert(markerId != null);
-    return await _channel.invokeMethod<bool>('markers#isInfoWindowShown',
-        <String, String>{'markerId': markerId});
+    return await _channel.invokeMethod<bool>(
+        'markers#isInfoWindowShown', <String, String>{'markerId': markerId});
   }
 
   /// Returns the current zoom level of the map
   Future<double> getZoomLevel() async {
     final double zoomLevel =
-    await _channel.invokeMethod<double>('map#getZoomLevel');
+        await _channel.invokeMethod<double>('map#getZoomLevel');
     return zoomLevel;
   }
 }

From 4c0ac1f2b7f91c6b81ae2e210e72e15b01afa8bd Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Wed, 4 Mar 2020 16:36:52 +0800
Subject: [PATCH 04/48] format

---
 .../test/method_channel_google_maps_flutter_test.dart     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
index 43f2bf2c1393..7484fa2357cc 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
@@ -21,12 +21,14 @@ void main() {
 
     test('Cannot be implemented with `implements`', () {
       expect(() {
-        GoogleMapsFlutterPlatform.instance = ImplementsGoogleMapsFlutterPlatform();
+        GoogleMapsFlutterPlatform.instance =
+            ImplementsGoogleMapsFlutterPlatform();
       }, throwsA(isInstanceOf<AssertionError>()));
     });
 
     test('Can be mocked with `implements`', () {
-      final GoogleMapsFlutterPlatformMock mock = GoogleMapsFlutterPlatformMock();
+      final GoogleMapsFlutterPlatformMock mock =
+          GoogleMapsFlutterPlatformMock();
       GoogleMapsFlutterPlatform.instance = mock;
     });
 
@@ -37,7 +39,7 @@ void main() {
 
   group('$MethodChannelGoogleMapsFlutter', () {
     const MethodChannel channel =
-        MethodChannel('plugins.flutter.io/google_maps_flutter');
+    MethodChannel('plugins.flutter.io/google_maps_flutter');
     final List<MethodCall> log = <MethodCall>[];
     channel.setMockMethodCallHandler((MethodCall methodCall) async {
       log.add(methodCall);

From 5276fbc2b8b689aaecec40938fc3dde8870fdb85 Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Wed, 4 Mar 2020 16:42:20 +0800
Subject: [PATCH 05/48] format#

---
 .../test/method_channel_google_maps_flutter_test.dart        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
index 7484fa2357cc..ea08bad7b31a 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
@@ -39,7 +39,7 @@ void main() {
 
   group('$MethodChannelGoogleMapsFlutter', () {
     const MethodChannel channel =
-    MethodChannel('plugins.flutter.io/google_maps_flutter');
+        MethodChannel('plugins.flutter.io/google_maps_flutter');
     final List<MethodCall> log = <MethodCall>[];
     channel.setMockMethodCallHandler((MethodCall methodCall) async {
       log.add(methodCall);
@@ -55,8 +55,7 @@ void main() {
 //      await map.foo();
       expect(
         log,
-        <Matcher>[
-        ],
+        <Matcher>[],
       );
     });
   });

From 9c35d4cb3cc03bae87ef1b715d5c95b538ff5451 Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Wed, 4 Mar 2020 19:12:32 +0800
Subject: [PATCH 06/48] update CHANGELOG

---
 .../CHANGELOG.md                                      | 11 +++++++----
 .../pubspec.yaml                                      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
index 5a2c14e8c728..b08f0559b70c 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
@@ -1,11 +1,14 @@
-## 1.0.0
+## 1.0.0+3
+* Clean up format
 
-* Initial release.
+## 1.0.0+2
+
+* Add PlatformInterface methods according to GoogleMapsFlutter
 
 ## 1.0.0+1
 
 * Update README
 
-## 1.0.0+2
+## 1.0.0
 
-* Add PlatformInterface methods according to GoogleMapsFlutter
\ No newline at end of file
+* Initial release.
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
index 17fd5557d396..12cc9e957a6b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
@@ -3,7 +3,7 @@ description: A common platform interface for the google_maps_flutter plugin.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter_platform_interface
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 1.0.0+2
+version: 1.0.0+3
 
 dependencies:
   flutter:

From 0d99e157531d9b02916fdbf19980fd1979ccd1e2 Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Thu, 5 Mar 2020 15:16:19 +0800
Subject: [PATCH 07/48] Move MethodChannel code to
 MethodChannelGoogleMapsFlutter

---
 .../google_maps_flutter/CHANGELOG.md          |  4 +
 .../lib/google_maps_flutter.dart              |  2 +
 .../lib/src/controller.dart                   | 79 +++++----------
 .../google_maps_flutter/pubspec.yaml          |  6 +-
 .../CHANGELOG.md                              |  3 +
 ...oogle_maps_flutter_platform_interface.dart | 98 ++++++++-----------
 .../method_channel_google_maps_flutter.dart   | 30 +++++-
 .../pubspec.yaml                              |  2 +-
 8 files changed, 110 insertions(+), 114 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
index 1027affdf24a..fa0ac1051482 100644
--- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0
+
+* Move MethodChannel code to MethodChannelGoogleMapsFlutter (Flutter Platform Interface)
+
 ## 0.5.25+3
 
 * Rename 'Page' in the example app to avoid type conflict with the Flutter Framework.
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index 5f3889f7b2f1..e1481e4896fc 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -13,6 +13,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+
 part 'src/bitmap.dart';
 part 'src/callbacks.dart';
 part 'src/camera.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 750bb69393e7..3c48a3199913 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -4,14 +4,16 @@
 
 part of google_maps_flutter;
 
+final GoogleMapsFlutterPlatform _googleMapsFlutterPlatform =
+    GoogleMapsFlutterPlatform.instance;
+
 /// Controller for a single GoogleMap instance running on the host platform.
 class GoogleMapController {
   GoogleMapController._(
-    this.channel,
     CameraPosition initialCameraPosition,
     this._googleMapState,
-  ) : assert(channel != null) {
-    channel.setMethodCallHandler(_handleMethodCall);
+  ) : assert(_googleMapsFlutterPlatform != null) {
+    _googleMapsFlutterPlatform.setMethodCallHandler(_handleMethodCall);
   }
 
   /// Initialize control of a [GoogleMap] with [id].
@@ -24,11 +26,8 @@ class GoogleMapController {
     _GoogleMapState googleMapState,
   ) async {
     assert(id != null);
-    final MethodChannel channel =
-        MethodChannel('plugins.flutter.io/google_maps_$id');
-    await channel.invokeMethod<void>('map#waitForMap');
+    _googleMapsFlutterPlatform.init(id);
     return GoogleMapController._(
-      channel,
       initialCameraPosition,
       googleMapState,
     );
@@ -38,7 +37,7 @@ class GoogleMapController {
   ///
   /// Accessible only for testing.
   @visibleForTesting
-  final MethodChannel channel;
+  MethodChannel channel;
 
   final _GoogleMapState _googleMapState;
 
@@ -100,12 +99,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) async {
     assert(optionsUpdate != null);
-    await channel.invokeMethod<void>(
-      'map#update',
-      <String, dynamic>{
-        'options': optionsUpdate,
-      },
-    );
+    await _googleMapsFlutterPlatform.updateMapOptions(optionsUpdate);
   }
 
   /// Updates marker configuration.
@@ -116,10 +110,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateMarkers(_MarkerUpdates markerUpdates) async {
     assert(markerUpdates != null);
-    await channel.invokeMethod<void>(
-      'markers#update',
-      markerUpdates._toMap(),
-    );
+    await _googleMapsFlutterPlatform.updateMarkers(markerUpdates._toMap());
   }
 
   /// Updates polygon configuration.
@@ -130,10 +121,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updatePolygons(_PolygonUpdates polygonUpdates) async {
     assert(polygonUpdates != null);
-    await channel.invokeMethod<void>(
-      'polygons#update',
-      polygonUpdates._toMap(),
-    );
+    await _googleMapsFlutterPlatform.updatePolygons(polygonUpdates._toMap());
   }
 
   /// Updates polyline configuration.
@@ -144,10 +132,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updatePolylines(_PolylineUpdates polylineUpdates) async {
     assert(polylineUpdates != null);
-    await channel.invokeMethod<void>(
-      'polylines#update',
-      polylineUpdates._toMap(),
-    );
+    await _googleMapsFlutterPlatform.updatePolylines(polylineUpdates._toMap());
   }
 
   /// Updates circle configuration.
@@ -158,10 +143,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateCircles(_CircleUpdates circleUpdates) async {
     assert(circleUpdates != null);
-    await channel.invokeMethod<void>(
-      'circles#update',
-      circleUpdates._toMap(),
-    );
+    await _googleMapsFlutterPlatform.updateCircles(circleUpdates._toMap());
   }
 
   /// Starts an animated change of the map camera position.
@@ -169,9 +151,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   Future<void> animateCamera(CameraUpdate cameraUpdate) async {
-    await channel.invokeMethod<void>('camera#animate', <String, dynamic>{
-      'cameraUpdate': cameraUpdate._toJson(),
-    });
+    await _googleMapsFlutterPlatform.animateCamera(cameraUpdate._toJson());
   }
 
   /// Changes the map camera position.
@@ -179,9 +159,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   Future<void> moveCamera(CameraUpdate cameraUpdate) async {
-    await channel.invokeMethod<void>('camera#move', <String, dynamic>{
-      'cameraUpdate': cameraUpdate._toJson(),
-    });
+    await _googleMapsFlutterPlatform.moveCamera(cameraUpdate._toJson());
   }
 
   /// Sets the styling of the base map.
@@ -198,18 +176,13 @@ class GoogleMapController {
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
   Future<void> setMapStyle(String mapStyle) async {
-    final List<dynamic> successAndError =
-        await channel.invokeMethod<List<dynamic>>('map#setStyle', mapStyle);
-    final bool success = successAndError[0];
-    if (!success) {
-      throw MapStyleException(successAndError[1]);
-    }
+    await _googleMapsFlutterPlatform.setMapStyle(mapStyle);
   }
 
   /// Return [LatLngBounds] defining the region that is visible in a map.
   Future<LatLngBounds> getVisibleRegion() async {
     final Map<String, dynamic> latLngBounds =
-        await channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion');
+        await _googleMapsFlutterPlatform.getVisibleRegion();
     final LatLng southwest = LatLng._fromJson(latLngBounds['southwest']);
     final LatLng northeast = LatLng._fromJson(latLngBounds['northeast']);
 
@@ -222,8 +195,8 @@ class GoogleMapController {
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
   Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) async {
-    final Map<String, int> point = await channel.invokeMapMethod<String, int>(
-        'map#getScreenCoordinate', latLng._toJson());
+    final Map<String, int> point =
+        await _googleMapsFlutterPlatform.getScreenCoordinate(latLng._toJson());
     return ScreenCoordinate(x: point['x'], y: point['y']);
   }
 
@@ -232,8 +205,8 @@ class GoogleMapController {
   /// Returned [LatLng] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
   Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) async {
-    final List<dynamic> latLng = await channel.invokeMethod<List<dynamic>>(
-        'map#getLatLng', screenCoordinate._toJson());
+    final List<dynamic> latLng =
+        await _googleMapsFlutterPlatform.getLatLng(screenCoordinate._toJson());
     return LatLng(latLng[0], latLng[1]);
   }
 
@@ -247,8 +220,7 @@ class GoogleMapController {
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   Future<void> showMarkerInfoWindow(MarkerId markerId) async {
     assert(markerId != null);
-    await channel.invokeMethod<void>(
-        'markers#showInfoWindow', <String, String>{'markerId': markerId.value});
+    await _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId.value);
   }
 
   /// Programmatically hide the Info Window for a [Marker].
@@ -261,8 +233,7 @@ class GoogleMapController {
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   Future<void> hideMarkerInfoWindow(MarkerId markerId) async {
     assert(markerId != null);
-    await channel.invokeMethod<void>(
-        'markers#hideInfoWindow', <String, String>{'markerId': markerId.value});
+    await _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId.value);
   }
 
   /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
@@ -275,14 +246,12 @@ class GoogleMapController {
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   Future<bool> isMarkerInfoWindowShown(MarkerId markerId) async {
     assert(markerId != null);
-    return await channel.invokeMethod<bool>('markers#isInfoWindowShown',
-        <String, String>{'markerId': markerId.value});
+    return _googleMapsFlutterPlatform.isMarkerInfoWindowShown(markerId.value);
   }
 
   /// Returns the current zoom level of the map
   Future<double> getZoomLevel() async {
-    final double zoomLevel =
-        await channel.invokeMethod<double>('map#getZoomLevel');
+    final double zoomLevel = await _googleMapsFlutterPlatform.getZoomLevel();
     return zoomLevel;
   }
 
diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
index 0f88a9a0ad18..5ac431b4aec3 100644
--- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
@@ -1,12 +1,14 @@
 name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter
-version: 0.5.25+3
+version: 0.6.0
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^1.0.0
+  google_maps_flutter_platform_interface:
+  google_maps_flutter_web:
 
 dev_dependencies:
   flutter_test:
@@ -27,6 +29,8 @@ flutter:
         pluginClass: GoogleMapsPlugin
       ios:
         pluginClass: FLTGoogleMapsPlugin
+      web:
+        default_package: google_maps_flutter_web
 
 environment:
   sdk: ">=2.0.0-dev.47.0 <3.0.0"
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
index b08f0559b70c..5442f6828779 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.0.0+4
+* Add init method and Move MethodChannel code to MethodChannelGoogleMapsFlutter 
+
 ## 1.0.0+3
 * Clean up format
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 59d3f64895f4..9888c4b6f63b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:ui';
 
+import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
@@ -22,45 +23,6 @@ class MapStyleException implements Exception {
   final String cause;
 }
 
-/// Represents a point coordinate in the [GoogleMap]'s view.
-///
-/// The screen location is specified in screen pixels (not display pixels) relative
-/// to the top left of the map, not top left of the whole screen. (x, y) = (0, 0)
-/// corresponds to top-left of the [GoogleMap] not the whole screen.
-@immutable
-class ScreenCoordinate {
-  /// Creates an immutable representation of a point coordinate in the [GoogleMap]'s view.
-  const ScreenCoordinate({
-    @required this.x,
-    @required this.y,
-  });
-
-  /// Represents the number of pixels from the left of the [GoogleMap].
-  final int x;
-
-  /// Represents the number of pixels from the top of the [GoogleMap].
-  final int y;
-
-  /// [x] [y] coordinate in Json format
-  dynamic toJson() {
-    return <String, int>{
-      "x": x,
-      "y": y,
-    };
-  }
-
-  @override
-  String toString() => '$runtimeType($x, $y)';
-
-  @override
-  bool operator ==(Object o) {
-    return o is ScreenCoordinate && o.x == x && o.y == y;
-  }
-
-  @override
-  int get hashCode => hashValues(x, y);
-}
-
 /// The interface that implementations of google_maps_flutter must implement.
 ///
 /// Platform implementations should extend this class rather than implement it as `google_maps_flutter`
@@ -89,13 +51,27 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     _instance = instance;
   }
 
+  /// /// Initializes the platform interface with [id].
+  ///
+  /// This method is called when the plugin is first initialized.
+  Future<void> init(int id) {
+    throw UnimplementedError('init() has not been implemented.');
+  }
+
+  MethodChannel get channel {}
+
+  void setMethodCallHandler(dynamic call) {
+    throw UnimplementedError(
+        'setMethodCallHandler() has not been implemented.');
+  }
+
   /// Updates configuration options of the map user interface.
   ///
   /// Change listeners are notified once the update has been made on the
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) async {
+  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) {
     throw UnimplementedError('updateMapOptions() has not been implemented.');
   }
 
@@ -105,7 +81,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) async {
+  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) {
     throw UnimplementedError('updateMarkers() has not been implemented.');
   }
 
@@ -115,7 +91,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) async {
+  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) {
     throw UnimplementedError('updatePolygons() has not been implemented.');
   }
 
@@ -125,7 +101,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) async {
+  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) {
     throw UnimplementedError('updatePolylines() has not been implemented.');
   }
 
@@ -135,7 +111,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateCircles(Map<String, dynamic> circleUpdates) async {
+  Future<void> updateCircles(Map<String, dynamic> circleUpdates) {
     throw UnimplementedError('updateCircles() has not been implemented.');
   }
 
@@ -143,7 +119,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   ///
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
-  Future<void> animateCamera(Map<String, dynamic> cameraUpdate) async {
+  Future<void> animateCamera(dynamic cameraUpdate) {
     throw UnimplementedError('animateCamera() has not been implemented.');
   }
 
@@ -151,7 +127,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   ///
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
-  Future<void> moveCamera(Map<String, dynamic> cameraUpdate) async {
+  Future<void> moveCamera(dynamic cameraUpdate) {
     throw UnimplementedError('moveCamera() has not been implemented.');
   }
 
@@ -168,23 +144,33 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// Also, refer [iOS](https://developers.google.com/maps/documentation/ios-sdk/style-reference)
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
-  Future<void> setMapStyle(String mapStyle) async {
+  Future<void> setMapStyle(String mapStyle) {
     throw UnimplementedError('setMapStyle() has not been implemented.');
   }
 
   /// Return [Map<String, dynamic>] defining the region that is visible in a map.
-  Future<Map<String, dynamic>> getVisibleRegion() async {
+  Future<Map<String, dynamic>> getVisibleRegion() {
     throw UnimplementedError('getVisibleRegion() has not been implemented.');
   }
 
-  /// Returns [List] corresponding to the [ScreenCoordinate] in the current map view.
+  /// Return point [Map<String, int>] of the [latLngInJson] in the current map view.
   ///
-  /// Returned [List] corresponds to a screen location. The screen location is specified in screen
-  /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
-  Future<List<dynamic>> getLatLng(ScreenCoordinate screenCoordinate) async {
+  /// A projection is used to translate between on screen location and geographic coordinates.
+  /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
+  /// of the map, not necessarily of the whole screen.
+  Future<List<dynamic>> getLatLng(dynamic latLng) {
     throw UnimplementedError('getLatLng() has not been implemented.');
   }
 
+  /// Return point [Map<String, int>] of the [screenCoordinateInJson] in the current map view.
+  ///
+  /// A projection is used to translate between on screen location and geographic coordinates.
+  /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
+  /// of the map, not necessarily of the whole screen.
+  Future<Map<String, int>> getScreenCoordinate(dynamic screenCoordinateInJson) {
+    throw UnimplementedError('getScreenCoordinate() has not been implemented.');
+  }
+
   /// Programmatically show the Info Window for a [Marker].
   ///
   /// The `markerId` must match one of the markers on the map.
@@ -193,7 +179,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> showMarkerInfoWindow(String markerId) async {
+  Future<void> showMarkerInfoWindow(String markerId) {
     throw UnimplementedError(
         'showMarkerInfoWindow() has not been implemented.');
   }
@@ -206,7 +192,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> hideMarkerInfoWindow(String markerId) async {
+  Future<void> hideMarkerInfoWindow(String markerId) {
     throw UnimplementedError(
         'hideMarkerInfoWindow() has not been implemented.');
   }
@@ -219,12 +205,12 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
-  Future<bool> isMarkerInfoWindowShown(String markerId) async {
+  Future<bool> isMarkerInfoWindowShown(String markerId) {
     throw UnimplementedError('updateMapOptions() has not been implemented.');
   }
 
   /// Returns the current zoom level of the map
-  Future<double> getZoomLevel() async {
+  Future<double> getZoomLevel() {
     throw UnimplementedError('getZoomLevel() has not been implemented.');
   }
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
index 430a41d3ab02..e60e35038f57 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
@@ -17,6 +17,22 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
     _channel = MethodChannel('plugins.flutter.io/google_maps_$id');
   }
 
+  /// /// Initializes the platform interface with [id].
+  ///
+  /// This method is called when the plugin is first initialized.
+  Future<void> init(int id) async {
+    _channel = MethodChannel('plugins.flutter.io/google_maps_$id');
+    await _channel.invokeMethod<void>('map#waitForMap');
+  }
+
+  MethodChannel get channel {
+    return _channel;
+  }
+
+  void setMethodCallHandler(dynamic call) {
+    _channel.setMethodCallHandler(call);
+  }
+
   /// Updates configuration options of the map user interface.
   ///
   /// Change listeners are notified once the update has been made on the
@@ -137,11 +153,23 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
         .invokeMapMethod<String, dynamic>('map#getVisibleRegion');
   }
 
+  /// Return point [Map<String, int>] of the [screenCoordinateInJson] in the current map view.
+  ///
+  /// A projection is used to translate between on screen location and geographic coordinates.
+  /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
+  /// of the map, not necessarily of the whole screen.
+  Future<Map<String, int>> getScreenCoordinate(
+      dynamic screenCoordinateInJson) async {
+    final Map<String, int> point = await _channel.invokeMapMethod<String, int>(
+        'map#getScreenCoordinate', screenCoordinateInJson);
+    return point;
+  }
+
   /// Returns [List] corresponding to the [ScreenCoordinate] in the current map view.
   ///
   /// Returned [List] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
-  Future<List<dynamic>> getLatLng(ScreenCoordinate screenCoordinate) async {
+  Future<List<dynamic>> getLatLng(dynamic screenCoordinate) async {
     return await _channel.invokeMethod<List<dynamic>>(
         'map#getLatLng', screenCoordinate.toJson());
   }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
index 12cc9e957a6b..ed39ce659a4d 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
@@ -3,7 +3,7 @@ description: A common platform interface for the google_maps_flutter plugin.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter_platform_interface
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 1.0.0+3
+version: 1.0.0+4
 
 dependencies:
   flutter:

From 152bd4a1f8a99ca7f80a8f29c820fb36e5d03c3f Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Thu, 5 Mar 2020 16:02:56 +0800
Subject: [PATCH 08/48] Update dependencies

---
 packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
index 5ac431b4aec3..ab7a3390369c 100644
--- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
@@ -8,7 +8,9 @@ dependencies:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^1.0.0
   google_maps_flutter_platform_interface:
-  google_maps_flutter_web:
+    path: ../google_maps_flutter_platform_interface
+#  google_maps_flutter_web:
+#    path: ../google_maps_flutter_web
 
 dev_dependencies:
   flutter_test:

From 6c2a92c4e0ece46858e22e33cb4f6c68fc47f44f Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Mon, 9 Mar 2020 09:01:39 +0800
Subject: [PATCH 09/48] add buildView method

---
 .../google_maps_flutter/example/.gitignore    |  40 +++++++++++++++++
 .../example/android/.gitignore                |   7 +++
 .../flutter/plugins/example/MainActivity.kt   |  12 +++++
 .../example/ios/.gitignore                    |  32 +++++++++++++
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 ++++
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 ++++
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 ++++
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 ++++
 .../example/ios/Runner/AppDelegate.swift      |  13 ++++++
 .../ios/Runner/Runner-Bridging-Header.h       |   1 +
 .../google_maps_flutter/example/pubspec.yaml  |   1 +
 .../example/test/widget_test.dart             |  30 +++++++++++++
 .../example/web/favicon.png                   | Bin 0 -> 917 bytes
 .../example/web/icons/Icon-192.png            | Bin 0 -> 5292 bytes
 .../example/web/icons/Icon-512.png            | Bin 0 -> 8252 bytes
 .../example/web/index.html                    |  42 ++++++++++++++++++
 .../example/web/manifest.json                 |  23 ++++++++++
 .../lib/src/google_map.dart                   |  25 +++--------
 .../google_maps_flutter/pubspec.yaml          |   4 +-
 ...oogle_maps_flutter_platform_interface.dart |  17 +++++--
 .../method_channel_google_maps_flutter.dart   |  40 ++++++++++++++---
 21 files changed, 289 insertions(+), 30 deletions(-)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/.gitignore
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/favicon.png
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-192.png
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-512.png
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/index.html
 create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/.gitignore b/packages/google_maps_flutter/google_maps_flutter/example/.gitignore
new file mode 100644
index 000000000000..78b3c2b33643
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/.gitignore
@@ -0,0 +1,40 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Exceptions to above rules.
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore b/packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore
new file mode 100644
index 000000000000..bc2100d8f75e
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore
@@ -0,0 +1,7 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt
new file mode 100644
index 000000000000..5917557e48ab
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt
@@ -0,0 +1,12 @@
+package io.flutter.plugins.example
+
+import androidx.annotation.NonNull;
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugins.GeneratedPluginRegistrant
+
+class MainActivity: FlutterActivity() {
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine);
+    }
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore b/packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore
new file mode 100644
index 000000000000..e96ef602b8d1
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore
@@ -0,0 +1,32 @@
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000000..18d981003d68
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000000..f9b0d7c5ea15
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000000..18d981003d68
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000000..f9b0d7c5ea15
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift
new file mode 100644
index 000000000000..70693e4a8c12
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift
@@ -0,0 +1,13 @@
+import UIKit
+import Flutter
+
+@UIApplicationMain
+@objc class AppDelegate: FlutterAppDelegate {
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    GeneratedPluginRegistrant.register(with: self)
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h
new file mode 100644
index 000000000000..308a2a560b42
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h
@@ -0,0 +1 @@
+#import "GeneratedPluginRegistrant.h"
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
index c7b2c5ff6715..2a3ecc5b4892 100644
--- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
@@ -11,6 +11,7 @@ dependencies:
   google_maps_flutter:
     path: ../
   flutter_plugin_android_lifecycle: ^1.0.0
+  google_maps: ">=3.0.0 <4.0.0"
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart b/packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart
new file mode 100644
index 000000000000..747db1da35e8
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart
@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility that Flutter provides. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:example/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/favicon.png b/packages/google_maps_flutter/google_maps_flutter/example/web/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1
GIT binary patch
literal 917
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7
zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2
zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l<c?^6clWVQqrt~T->1AfjnEK
zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o
z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo
zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8
zTYqUsf!gYFyJnXpu0!n&N*<mM6;!yDy;iI!?0xZxS-@9o){@>SYAX-%d(5<QWisP%
zpKxJ^!zO{CB{zx^b({)M+}nHh%-rj7^M&&ZcU$j%zjx;LVyDXoIuhq|8P;5s=KHG5
z<JUB4<A0$RmNJizixz(PY{v3_`K1HjE{oV$3+pLbhDf-dGF^GSkNIsaZ^^?aj@RFX
zmI#!cuT=hV*<Wg+koNS~T)(gK8EvWbJGDN%Cgswi@;rmS$PYP}{^d1_2Ol_C#PhDD
zFw$(<^hU$>gVjrHJWqXQshj@!<B9Fv+a9JEO;0$m^uEygb*U`#RIBf=|21JrRHoLF
zSVqsI&*oWt$jm+Fz?pMwCX>Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr
zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf
zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od
z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz
oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM

literal 0
HcmV?d00001

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-192.png b/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-192.png
new file mode 100644
index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa
GIT binary patch
literal 5292
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

literal 0
HcmV?d00001

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-512.png b/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6
GIT binary patch
literal 8252
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

literal 0
HcmV?d00001

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/index.html b/packages/google_maps_flutter/google_maps_flutter/example/web/index.html
new file mode 100644
index 000000000000..bf817badbc9a
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/web/index.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="example">
+  <link rel="apple-touch-icon" href="/icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="shortcut icon" type="image/png" href="/favicon.png"/>
+
+  <title>example</title>
+  <link rel="manifest" href="/manifest.json">
+  <style>
+      html, body, #map-canvas {
+        height: 100%;
+        margin: 0px;
+        padding: 0px
+      }
+    </style>
+</head>
+<body>
+  <!-- This script installs service_worker.js to provide PWA functionality to
+       application. For more information, see:
+       https://developers.google.com/web/fundamentals/primers/service-workers -->
+  <script>
+    if ('serviceWorker' in navigator) {
+      window.addEventListener('load', function () {
+        navigator.serviceWorker.register('/flutter_service_worker.js');
+      });
+    }
+  </script>
+  <script src="main.dart.js" type="application/javascript"></script>
+  <script src="http://maps.googleapis.com/maps/api/js?key=AIzaSyBpMfYdtYGKzYTN0j-_0mKOkM-PmJmeVMo"></script>
+  <script defer src="page.dart.js"></script>
+</body>
+</html>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json b/packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json
new file mode 100644
index 000000000000..c63800102369
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json
@@ -0,0 +1,23 @@
+{
+    "name": "example",
+    "short_name": "example",
+    "start_url": ".",
+    "display": "minimal-ui",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
index f6a413a82ffb..dff999aab10b 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
@@ -219,26 +219,11 @@ class _GoogleMapState extends State<GoogleMap> {
       'polylinesToAdd': _serializePolylineSet(widget.polylines),
       'circlesToAdd': _serializeCircleSet(widget.circles),
     };
-    if (defaultTargetPlatform == TargetPlatform.android) {
-      return AndroidView(
-        viewType: 'plugins.flutter.io/google_maps',
-        onPlatformViewCreated: onPlatformViewCreated,
-        gestureRecognizers: widget.gestureRecognizers,
-        creationParams: creationParams,
-        creationParamsCodec: const StandardMessageCodec(),
-      );
-    } else if (defaultTargetPlatform == TargetPlatform.iOS) {
-      return UiKitView(
-        viewType: 'plugins.flutter.io/google_maps',
-        onPlatformViewCreated: onPlatformViewCreated,
-        gestureRecognizers: widget.gestureRecognizers,
-        creationParams: creationParams,
-        creationParamsCodec: const StandardMessageCodec(),
-      );
-    }
-
-    return Text(
-        '$defaultTargetPlatform is not yet supported by the maps plugin');
+    return _googleMapsFlutterPlatform.buildView(
+      creationParams,
+      widget.gestureRecognizers,
+      onPlatformViewCreated,
+    );
   }
 
   @override
diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
index ab7a3390369c..636255a6205b 100644
--- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
@@ -9,8 +9,8 @@ dependencies:
   flutter_plugin_android_lifecycle: ^1.0.0
   google_maps_flutter_platform_interface:
     path: ../google_maps_flutter_platform_interface
-#  google_maps_flutter_web:
-#    path: ../google_maps_flutter_web
+  google_maps_flutter_web:
+    path: ../google_maps_flutter_web
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 9888c4b6f63b..5cbed251d78b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -4,8 +4,11 @@
 
 import 'dart:async';
 import 'dart:ui';
-
+import 'package:flutter/widgets.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
 import 'package:meta/meta.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
@@ -37,11 +40,11 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   static final Object _token = Object();
 
   static GoogleMapsFlutterPlatform _instance =
-      MethodChannelGoogleMapsFlutter(0);
+      MethodChannelGoogleMapsFlutter();
 
   /// The default instance of [GoogleMapsFlutterPlatform] to use.
   ///
-  /// Defaults to [MethodChannelUrlLauncher].
+  /// Defaults to [MethodChannelGoogleMapsFlutter].
   static GoogleMapsFlutterPlatform get instance => _instance;
 
   /// Platform-specific plugins should set this with their own platform-specific
@@ -213,4 +216,12 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   Future<double> getZoomLevel() {
     throw UnimplementedError('getZoomLevel() has not been implemented.');
   }
+
+  ///TODO
+  Widget buildView(
+      Map<String, dynamic> creationParams,
+      Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers,
+      PlatformViewCreatedCallback onPlatformViewCreated) {
+    throw UnimplementedError('buildView() has not been implemented.');
+  }
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
index e60e35038f57..262899910324 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
@@ -4,24 +4,27 @@
 
 import 'dart:async';
 
+import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/gestures.dart';
 
 import 'google_maps_flutter_platform_interface.dart';
 
 MethodChannel _channel;
 
+
 /// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
-  ///Initialize control of a [MethodChannelGoogleMapsFlutter] with [id].
-  MethodChannelGoogleMapsFlutter(int id) {
-    _channel = MethodChannel('plugins.flutter.io/google_maps_$id');
-  }
+
+  int _id;
 
   /// /// Initializes the platform interface with [id].
   ///
   /// This method is called when the plugin is first initialized.
   Future<void> init(int id) async {
-    _channel = MethodChannel('plugins.flutter.io/google_maps_$id');
+    this._id = id;
+    _channel = MethodChannel('plugins.flutter.io/google_maps_$_id');
     await _channel.invokeMethod<void>('map#waitForMap');
   }
 
@@ -222,4 +225,31 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
         await _channel.invokeMethod<double>('map#getZoomLevel');
     return zoomLevel;
   }
+
+  Widget buildView(
+      Map<String, dynamic> creationParams,
+      Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers,
+      PlatformViewCreatedCallback onPlatformViewCreated) {
+    if (defaultTargetPlatform == TargetPlatform.android) {
+      return AndroidView(
+        viewType: 'plugins.flutter.io/google_maps',
+        onPlatformViewCreated: onPlatformViewCreated,
+        gestureRecognizers: gestureRecognizers,
+        creationParams: creationParams,
+        creationParamsCodec: const StandardMessageCodec(),
+      );
+    } else if (defaultTargetPlatform == TargetPlatform.iOS) {
+      return UiKitView(
+        viewType: 'plugins.flutter.io/google_maps',
+        onPlatformViewCreated: onPlatformViewCreated,
+        gestureRecognizers: gestureRecognizers,
+        creationParams: creationParams,
+        creationParamsCodec: const StandardMessageCodec(),
+      );
+    }
+    return Text(
+        '$defaultTargetPlatform is not yet supported by the maps plugin');
+  }
+
+
 }

From 73d23a25c98e02b7dfae87df32981f715f961380 Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Mon, 9 Mar 2020 09:53:58 +0800
Subject: [PATCH 10/48] update pubspec

---
 packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
index 636255a6205b..a996ede4febf 100644
--- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
@@ -8,9 +8,6 @@ dependencies:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^1.0.0
   google_maps_flutter_platform_interface:
-    path: ../google_maps_flutter_platform_interface
-  google_maps_flutter_web:
-    path: ../google_maps_flutter_web
 
 dev_dependencies:
   flutter_test:

From 25099abf7c7b773ba635f8b69ccee52cdffecbaa Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Sat, 21 Mar 2020 00:26:07 +0800
Subject: [PATCH 11/48] bugs fix

---
 .../google_maps_flutter/example/pubspec.yaml  |  2 +-
 .../example/test/widget_test.dart             | 30 -----------
 .../example/web/index.html                    |  9 +---
 .../lib/src/controller.dart                   |  4 +-
 .../method_channel_google_maps_flutter.dart   | 52 +++++++++----------
 5 files changed, 31 insertions(+), 66 deletions(-)
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
index 2a3ecc5b4892..da8306f90edc 100644
--- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   google_maps_flutter:
     path: ../
   flutter_plugin_android_lifecycle: ^1.0.0
-  google_maps: ">=3.0.0 <4.0.0"
+  google_maps: ^3.0.0
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart b/packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart
deleted file mode 100644
index 747db1da35e8..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/test/widget_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:example/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/index.html b/packages/google_maps_flutter/google_maps_flutter/example/web/index.html
index bf817badbc9a..365abcaaf7dd 100644
--- a/packages/google_maps_flutter/google_maps_flutter/example/web/index.html
+++ b/packages/google_maps_flutter/google_maps_flutter/example/web/index.html
@@ -16,13 +16,6 @@
 
   <title>example</title>
   <link rel="manifest" href="/manifest.json">
-  <style>
-      html, body, #map-canvas {
-        height: 100%;
-        margin: 0px;
-        padding: 0px
-      }
-    </style>
 </head>
 <body>
   <!-- This script installs service_worker.js to provide PWA functionality to
@@ -36,7 +29,7 @@
     }
   </script>
   <script src="main.dart.js" type="application/javascript"></script>
-  <script src="http://maps.googleapis.com/maps/api/js?key=AIzaSyBpMfYdtYGKzYTN0j-_0mKOkM-PmJmeVMo"></script>
+  <script src="http://maps.googleapis.com/maps/api/js?key=API_KEY"></script>
   <script defer src="page.dart.js"></script>
 </body>
 </html>
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 3c48a3199913..0d879bbe9c9a 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -37,7 +37,9 @@ class GoogleMapController {
   ///
   /// Accessible only for testing.
   @visibleForTesting
-  MethodChannel channel;
+  MethodChannel get channel {
+    return _googleMapsFlutterPlatform.channel;
+  }
 
   final _GoogleMapState _googleMapState;
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
index 262899910324..939d8d87e014 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
@@ -22,10 +22,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// /// Initializes the platform interface with [id].
   ///
   /// This method is called when the plugin is first initialized.
-  Future<void> init(int id) async {
+  Future<void> init(int id) {
     this._id = id;
     _channel = MethodChannel('plugins.flutter.io/google_maps_$_id');
-    await _channel.invokeMethod<void>('map#waitForMap');
+    _channel.invokeMethod<void>('map#waitForMap');
   }
 
   MethodChannel get channel {
@@ -42,9 +42,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) async {
+  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) {
     assert(optionsUpdate != null);
-    await _channel.invokeMethod<void>(
+    _channel.invokeMethod<void>(
       'map#update',
       <String, dynamic>{
         'options': optionsUpdate,
@@ -58,9 +58,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) async {
+  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) {
     assert(markerUpdates != null);
-    await _channel.invokeMethod<void>(
+    _channel.invokeMethod<void>(
       'markers#update',
       markerUpdates,
     );
@@ -72,9 +72,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) async {
+  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) {
     assert(polygonUpdates != null);
-    await _channel.invokeMethod<void>(
+    _channel.invokeMethod<void>(
       'polygons#update',
       polygonUpdates,
     );
@@ -86,9 +86,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) async {
+  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) {
     assert(polylineUpdates != null);
-    await _channel.invokeMethod<void>(
+    _channel.invokeMethod<void>(
       'polylines#update',
       polylineUpdates,
     );
@@ -100,9 +100,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateCircles(Map<String, dynamic> circleUpdates) async {
+  Future<void> updateCircles(Map<String, dynamic> circleUpdates) {
     assert(circleUpdates != null);
-    await _channel.invokeMethod<void>(
+    _channel.invokeMethod<void>(
       'circles#update',
       circleUpdates,
     );
@@ -112,8 +112,8 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
-  Future<void> animateCamera(dynamic cameraUpdate) async {
-    await _channel.invokeMethod<void>('camera#animate', <String, dynamic>{
+  Future<void> animateCamera(dynamic cameraUpdate) {
+    _channel.invokeMethod<void>('camera#animate', <String, dynamic>{
       'cameraUpdate': cameraUpdate,
     });
   }
@@ -122,8 +122,8 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
-  Future<void> moveCamera(dynamic cameraUpdate) async {
-    await _channel.invokeMethod<void>('camera#move', <String, dynamic>{
+  Future<void> moveCamera(dynamic cameraUpdate) {
+    _channel.invokeMethod<void>('camera#move', <String, dynamic>{
       'cameraUpdate': cameraUpdate,
     });
   }
@@ -151,8 +151,8 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   }
 
   /// Return [Map<String, dynamic>] defining the region that is visible in a map.
-  Future<Map<String, dynamic>> getVisibleRegion() async {
-    return await _channel
+  Future<Map<String, dynamic>> getVisibleRegion() {
+    return _channel
         .invokeMapMethod<String, dynamic>('map#getVisibleRegion');
   }
 
@@ -172,8 +172,8 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// Returned [List] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
-  Future<List<dynamic>> getLatLng(dynamic screenCoordinate) async {
-    return await _channel.invokeMethod<List<dynamic>>(
+  Future<List<dynamic>> getLatLng(dynamic screenCoordinate) {
+    return _channel.invokeMethod<List<dynamic>>(
         'map#getLatLng', screenCoordinate.toJson());
   }
 
@@ -185,9 +185,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> showMarkerInfoWindow(String markerId) async {
+  Future<void> showMarkerInfoWindow(String markerId) {
     assert(markerId != null);
-    await _channel.invokeMethod<void>(
+    _channel.invokeMethod<void>(
         'markers#showInfoWindow', <String, String>{'markerId': markerId});
   }
 
@@ -199,9 +199,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> hideMarkerInfoWindow(String markerId) async {
+  Future<void> hideMarkerInfoWindow(String markerId) {
     assert(markerId != null);
-    await _channel.invokeMethod<void>(
+    _channel.invokeMethod<void>(
         'markers#hideInfoWindow', <String, String>{'markerId': markerId});
   }
 
@@ -213,9 +213,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
-  Future<bool> isMarkerInfoWindowShown(String markerId) async {
+  Future<bool> isMarkerInfoWindowShown(String markerId) {
     assert(markerId != null);
-    return await _channel.invokeMethod<bool>(
+    return _channel.invokeMethod<bool>(
         'markers#isInfoWindowShown', <String, String>{'markerId': markerId});
   }
 

From cf190ef46ffd28f64250769ad05195deae2ca837 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Sun, 22 Mar 2020 13:23:16 -0700
Subject: [PATCH 12/48] Some adjustments to the PR.

* Make the method_channel implementation private, so it can't be
imported from other packages.
* Fix all the problems with Future<void> functions not returning a
future.
---
 ...oogle_maps_flutter_platform_interface.dart |  8 +-
 .../method_channel_google_maps_flutter.dart   | 74 ++++++++++++-------
 ...thod_channel_google_maps_flutter_test.dart |  2 +-
 3 files changed, 49 insertions(+), 35 deletions(-)
 rename packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/{ => src/method_channel}/method_channel_google_maps_flutter.dart (86%)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 5cbed251d78b..3ea1308459b9 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -3,16 +3,14 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:ui';
 import 'package:flutter/widgets.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:meta/meta.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
-import 'method_channel_google_maps_flutter.dart';
+import 'src/method_channel/method_channel_google_maps_flutter.dart';
 
 /// Exception when a map style is invalid or was unable to be set.
 ///
@@ -61,8 +59,6 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     throw UnimplementedError('init() has not been implemented.');
   }
 
-  MethodChannel get channel {}
-
   void setMethodCallHandler(dynamic call) {
     throw UnimplementedError(
         'setMethodCallHandler() has not been implemented.');
@@ -217,7 +213,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     throw UnimplementedError('getZoomLevel() has not been implemented.');
   }
 
-  ///TODO
+  /// TODO
   Widget buildView(
       Map<String, dynamic> creationParams,
       Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers,
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
similarity index 86%
rename from packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 939d8d87e014..e94136fa3266 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -9,42 +9,48 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/gestures.dart';
 
-import 'google_maps_flutter_platform_interface.dart';
-
-MethodChannel _channel;
-
+import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 /// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
 
   int _id;
 
-  /// /// Initializes the platform interface with [id].
-  ///
-  /// This method is called when the plugin is first initialized.
-  Future<void> init(int id) {
-    this._id = id;
-    _channel = MethodChannel('plugins.flutter.io/google_maps_$_id');
-    _channel.invokeMethod<void>('map#waitForMap');
-  }
+  MethodChannel _channel;
 
+  /// The MethodChannel backing this implementation.
+  @visibleForTesting
   MethodChannel get channel {
     return _channel;
   }
 
+  // TODO: Remove this, and have a private MethodCallHandler that funnels
+  // events to the appropriate Stream.
   void setMethodCallHandler(dynamic call) {
     _channel.setMethodCallHandler(call);
   }
 
+  /// Initializes the platform interface with [id].
+  ///
+  /// This method is called when the plugin is first initialized.
+  @override
+  Future<void> init(int id) {
+    this._id = id;
+    _channel = MethodChannel('plugins.flutter.io/google_maps_$_id');
+    // TODO: Install the internal methodCallHandler here.
+    return _channel.invokeMethod<void>('map#waitForMap');
+  }
+
   /// Updates configuration options of the map user interface.
   ///
   /// Change listeners are notified once the update has been made on the
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
+  @override
   Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) {
     assert(optionsUpdate != null);
-    _channel.invokeMethod<void>(
+    return _channel.invokeMethod<void>(
       'map#update',
       <String, dynamic>{
         'options': optionsUpdate,
@@ -58,9 +64,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
+  @override
   Future<void> updateMarkers(Map<String, dynamic> markerUpdates) {
     assert(markerUpdates != null);
-    _channel.invokeMethod<void>(
+    return _channel.invokeMethod<void>(
       'markers#update',
       markerUpdates,
     );
@@ -72,9 +79,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
+  @override
   Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) {
     assert(polygonUpdates != null);
-    _channel.invokeMethod<void>(
+    return _channel.invokeMethod<void>(
       'polygons#update',
       polygonUpdates,
     );
@@ -86,9 +94,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
+  @override
   Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) {
     assert(polylineUpdates != null);
-    _channel.invokeMethod<void>(
+    return _channel.invokeMethod<void>(
       'polylines#update',
       polylineUpdates,
     );
@@ -100,9 +109,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
+  @override
   Future<void> updateCircles(Map<String, dynamic> circleUpdates) {
     assert(circleUpdates != null);
-    _channel.invokeMethod<void>(
+    return _channel.invokeMethod<void>(
       'circles#update',
       circleUpdates,
     );
@@ -112,8 +122,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
+  @override
   Future<void> animateCamera(dynamic cameraUpdate) {
-    _channel.invokeMethod<void>('camera#animate', <String, dynamic>{
+    return _channel.invokeMethod<void>('camera#animate', <String, dynamic>{
       'cameraUpdate': cameraUpdate,
     });
   }
@@ -122,8 +133,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
+  @override
   Future<void> moveCamera(dynamic cameraUpdate) {
-    _channel.invokeMethod<void>('camera#move', <String, dynamic>{
+    return _channel.invokeMethod<void>('camera#move', <String, dynamic>{
       'cameraUpdate': cameraUpdate,
     });
   }
@@ -141,6 +153,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// Also, refer [iOS](https://developers.google.com/maps/documentation/ios-sdk/style-reference)
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
+  @override
   Future<void> setMapStyle(String mapStyle) async {
     final List<dynamic> successAndError =
         await _channel.invokeMethod<List<dynamic>>('map#setStyle', mapStyle);
@@ -151,6 +164,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   }
 
   /// Return [Map<String, dynamic>] defining the region that is visible in a map.
+  @override
   Future<Map<String, dynamic>> getVisibleRegion() {
     return _channel
         .invokeMapMethod<String, dynamic>('map#getVisibleRegion');
@@ -161,17 +175,18 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// A projection is used to translate between on screen location and geographic coordinates.
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
+  @override
   Future<Map<String, int>> getScreenCoordinate(
-      dynamic screenCoordinateInJson) async {
-    final Map<String, int> point = await _channel.invokeMapMethod<String, int>(
+      dynamic screenCoordinateInJson) {
+    return _channel.invokeMapMethod<String, int>(
         'map#getScreenCoordinate', screenCoordinateInJson);
-    return point;
   }
 
   /// Returns [List] corresponding to the [ScreenCoordinate] in the current map view.
   ///
   /// Returned [List] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
+  @override
   Future<List<dynamic>> getLatLng(dynamic screenCoordinate) {
     return _channel.invokeMethod<List<dynamic>>(
         'map#getLatLng', screenCoordinate.toJson());
@@ -185,9 +200,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
+  @override
   Future<void> showMarkerInfoWindow(String markerId) {
     assert(markerId != null);
-    _channel.invokeMethod<void>(
+    return _channel.invokeMethod<void>(
         'markers#showInfoWindow', <String, String>{'markerId': markerId});
   }
 
@@ -199,9 +215,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
+  @override
   Future<void> hideMarkerInfoWindow(String markerId) {
     assert(markerId != null);
-    _channel.invokeMethod<void>(
+    return _channel.invokeMethod<void>(
         'markers#hideInfoWindow', <String, String>{'markerId': markerId});
   }
 
@@ -213,6 +230,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
+  @override
   Future<bool> isMarkerInfoWindowShown(String markerId) {
     assert(markerId != null);
     return _channel.invokeMethod<bool>(
@@ -220,12 +238,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   }
 
   /// Returns the current zoom level of the map
-  Future<double> getZoomLevel() async {
-    final double zoomLevel =
-        await _channel.invokeMethod<double>('map#getZoomLevel');
-    return zoomLevel;
+  @override
+  Future<double> getZoomLevel() {
+    return _channel.invokeMethod<double>('map#getZoomLevel');
   }
 
+  @override
   Widget buildView(
       Map<String, dynamic> creationParams,
       Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers,
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
index ea08bad7b31a..a003b94d544c 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
-import 'package:google_maps_flutter_platform_interface/method_channel_google_maps_flutter.dart';
+import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 void main() {

From ae0c68d193dbd75c8be40b9600b06cab0c7876e2 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Sun, 22 Mar 2020 13:46:21 -0700
Subject: [PATCH 13/48] dartfmt -w .

---
 .../google_maps_flutter/lib/google_maps_flutter.dart     | 2 ++
 .../google_maps_flutter/lib/src/controller.dart          | 6 ++++--
 .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 1 +
 .../lib/google_maps_flutter_platform_interface.dart      | 3 +--
 .../method_channel_google_maps_flutter.dart              | 9 ++-------
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index e1481e4896fc..7e17b900ff9a 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -14,6 +14,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+// TODO: Remove this import after e2e tests have been migrated.
+import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 
 part 'src/bitmap.dart';
 part 'src/callbacks.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 0d879bbe9c9a..ca4bfb7ab3f0 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -26,7 +26,7 @@ class GoogleMapController {
     _GoogleMapState googleMapState,
   ) async {
     assert(id != null);
-    _googleMapsFlutterPlatform.init(id);
+    await _googleMapsFlutterPlatform.init(id);
     return GoogleMapController._(
       initialCameraPosition,
       googleMapState,
@@ -36,9 +36,11 @@ class GoogleMapController {
   /// Used to communicate with the native platform.
   ///
   /// Accessible only for testing.
+  // TODO: Remove this once tests are migrated to not need this.
   @visibleForTesting
   MethodChannel get channel {
-    return _googleMapsFlutterPlatform.channel;
+    return (_googleMapsFlutterPlatform as MethodChannelGoogleMapsFlutter)
+        .channel;
   }
 
   final _GoogleMapState _googleMapState;
diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
index a996ede4febf..58f0439cd01f 100644
--- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml
@@ -8,6 +8,7 @@ dependencies:
     sdk: flutter
   flutter_plugin_android_lifecycle: ^1.0.0
   google_maps_flutter_platform_interface:
+    path: ../google_maps_flutter_platform_interface
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 3ea1308459b9..08c41304d5d1 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -37,8 +37,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
 
   static final Object _token = Object();
 
-  static GoogleMapsFlutterPlatform _instance =
-      MethodChannelGoogleMapsFlutter();
+  static GoogleMapsFlutterPlatform _instance = MethodChannelGoogleMapsFlutter();
 
   /// The default instance of [GoogleMapsFlutterPlatform] to use.
   ///
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index e94136fa3266..96552a624406 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -13,7 +13,6 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 
 /// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
-
   int _id;
 
   MethodChannel _channel;
@@ -166,8 +165,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// Return [Map<String, dynamic>] defining the region that is visible in a map.
   @override
   Future<Map<String, dynamic>> getVisibleRegion() {
-    return _channel
-        .invokeMapMethod<String, dynamic>('map#getVisibleRegion');
+    return _channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion');
   }
 
   /// Return point [Map<String, int>] of the [screenCoordinateInJson] in the current map view.
@@ -176,8 +174,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
   @override
-  Future<Map<String, int>> getScreenCoordinate(
-      dynamic screenCoordinateInJson) {
+  Future<Map<String, int>> getScreenCoordinate(dynamic screenCoordinateInJson) {
     return _channel.invokeMapMethod<String, int>(
         'map#getScreenCoordinate', screenCoordinateInJson);
   }
@@ -268,6 +265,4 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
     return Text(
         '$defaultTargetPlatform is not yet supported by the maps plugin');
   }
-
-
 }

From 35798fa4ec49fe0ce2df6049cc390c370e23f653 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Mon, 23 Mar 2020 15:08:34 -0700
Subject: [PATCH 14/48] Expose the MethodChannel so e2e tests are happy.

---
 .../google_maps_flutter/lib/src/controller.dart            | 7 +++++--
 .../lib/google_maps_flutter_platform_interface.dart        | 1 +
 .../method_channel/method_channel_google_maps_flutter.dart | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index ca4bfb7ab3f0..24255d1bc51e 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -39,8 +39,11 @@ class GoogleMapController {
   // TODO: Remove this once tests are migrated to not need this.
   @visibleForTesting
   MethodChannel get channel {
-    return (_googleMapsFlutterPlatform as MethodChannelGoogleMapsFlutter)
-        .channel;
+    if (_googleMapsFlutterPlatform is MethodChannelGoogleMapsFlutter) {
+      return (_googleMapsFlutterPlatform as MethodChannelGoogleMapsFlutter)
+          .channel;
+    }
+    return null;
   }
 
   final _GoogleMapState _googleMapState;
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 08c41304d5d1..b4b52495b88f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -58,6 +58,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     throw UnimplementedError('init() has not been implemented.');
   }
 
+  /// This is only needed by the MethodChannel implementation
   void setMethodCallHandler(dynamic call) {
     throw UnimplementedError(
         'setMethodCallHandler() has not been implemented.');
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 96552a624406..456b280f7051 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -18,7 +18,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   MethodChannel _channel;
 
   /// The MethodChannel backing this implementation.
-  @visibleForTesting
+  /// Used in e2e tests (in other package).
   MethodChannel get channel {
     return _channel;
   }

From c43d0aa8f4958a876b963ed1521174ba5b399f89 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 11:09:37 -0700
Subject: [PATCH 15/48] Move platform into src so we can create a barrel file
 to export stuff.

---
 .../platform_interface/google_maps_flutter_platform.dart}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/{google_maps_flutter_platform_interface.dart => src/platform_interface/google_maps_flutter_platform.dart} (100%)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart

From fc9ba91786c88f9f2204f63a2aabf25dd434ad5a Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 11:11:18 -0700
Subject: [PATCH 16/48] Create barrel file to export only certain things from
 src

---
 .../lib/google_maps_flutter_platform_interface.dart             | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
new file mode 100644
index 000000000000..9c4c4f2ae98b
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -0,0 +1,2 @@
+
+export 'src/platform_interface/google_maps_flutter_platform.dart';

From 3228de631e117a2065786974dfba44758105b57b Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 11:12:49 -0700
Subject: [PATCH 17/48] Adjust imports in platform interface

---
 .../src/platform_interface/google_maps_flutter_platform.dart  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index b4b52495b88f..8d878646ba34 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -8,9 +8,9 @@ import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
-import 'src/method_channel/method_channel_google_maps_flutter.dart';
+import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 /// Exception when a map style is invalid or was unable to be set.
 ///

From 4b630d6f0685d2a62ae3fe2151d4e7d10f8fcceb Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 11:40:46 -0700
Subject: [PATCH 18/48] Move LatLng and LagLngBounds to the platform interface
 package. Reexport from core plugin to maintain current API.

---
 .../google_maps_flutter/lib/google_maps_flutter.dart          | 4 +++-
 .../lib/google_maps_flutter_platform_interface.dart           | 1 +
 .../lib/src/types}/location.dart                              | 3 ++-
 .../lib/src/types/types.dart                                  | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/location.dart (98%)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index 7e17b900ff9a..05a9f17a25c9 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -17,6 +17,9 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 // TODO: Remove this import after e2e tests have been migrated.
 import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 
+export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'
+  show LatLng, LatLngBounds;
+
 part 'src/bitmap.dart';
 part 'src/callbacks.dart';
 part 'src/camera.dart';
@@ -26,7 +29,6 @@ part 'src/circle_updates.dart';
 part 'src/controller.dart';
 part 'src/google_map.dart';
 part 'src/joint_type.dart';
-part 'src/location.dart';
 part 'src/marker.dart';
 part 'src/marker_updates.dart';
 part 'src/pattern_item.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 9c4c4f2ae98b..c5a5cc16d4bf 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -1,2 +1,3 @@
 
 export 'src/platform_interface/google_maps_flutter_platform.dart';
+export 'src/types/types.dart';
\ No newline at end of file
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/location.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
similarity index 98%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/location.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
index ae299ce9583d..60fe25ec086b 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/location.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
@@ -1,8 +1,9 @@
 // Copyright 2018 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+import 'dart:ui' show hashValues;
 
-part of google_maps_flutter;
+import 'package:meta/meta.dart';
 
 /// A pair of latitude and longitude coordinates, stored as degrees.
 class LatLng {
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
new file mode 100644
index 000000000000..b9d9f8597d99
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
@@ -0,0 +1,3 @@
+// All the public types exposed by this package.
+
+export 'location.dart';
\ No newline at end of file

From fdb43294e8441a782509cbc8c5f00d6458f237b8 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 12:56:30 -0700
Subject: [PATCH 19/48] Move ui.dart to platform_interface. Expose .toJson so
 it can be used by other toJson methods.

---
 .../google_maps_flutter/lib/google_maps_flutter.dart |  3 +--
 .../google_maps_flutter_platform.dart                | 12 ------------
 .../lib/src/types/location.dart                      |  6 +++---
 .../lib/src/types/types.dart                         |  3 ++-
 .../lib/src/types}/ui.dart                           |  8 +++++---
 5 files changed, 11 insertions(+), 21 deletions(-)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/ui.dart (95%)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index 05a9f17a25c9..2cb6135b9971 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -18,7 +18,7 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 
 export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'
-  show LatLng, LatLngBounds;
+  show LatLng, LatLngBounds, MapType, CameraTargetBounds, MinMaxZoomPreference, MapStyleException;
 
 part 'src/bitmap.dart';
 part 'src/callbacks.dart';
@@ -37,4 +37,3 @@ part 'src/polygon_updates.dart';
 part 'src/polyline.dart';
 part 'src/polyline_updates.dart';
 part 'src/screen_coordinate.dart';
-part 'src/ui.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 8d878646ba34..7ef695070301 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -12,18 +12,6 @@ import 'package:flutter/gestures.dart';
 import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
-/// Exception when a map style is invalid or was unable to be set.
-///
-/// See also: `setStyle` on [GoogleMapController] for why this exception
-/// might be thrown.
-class MapStyleException implements Exception {
-  /// Default constructor for [MapStyleException].
-  const MapStyleException(this.cause);
-
-  /// The reason `GoogleMapController.setStyle` would throw this exception.
-  final String cause;
-}
-
 /// The interface that implementations of google_maps_flutter must implement.
 ///
 /// Platform implementations should extend this class rather than implement it as `google_maps_flutter`
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
index 60fe25ec086b..6c48454d68b6 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
@@ -27,7 +27,7 @@ class LatLng {
   /// The longitude in degrees between -180.0 (inclusive) and 180.0 (exclusive).
   final double longitude;
 
-  dynamic _toJson() {
+  dynamic toJson() {
     return <double>[latitude, longitude];
   }
 
@@ -74,8 +74,8 @@ class LatLngBounds {
   /// The northeast corner of the rectangle.
   final LatLng northeast;
 
-  dynamic _toList() {
-    return <dynamic>[southwest._toJson(), northeast._toJson()];
+  dynamic toJson() {
+    return <dynamic>[southwest.toJson(), northeast.toJson()];
   }
 
   /// Returns whether this rectangle contains the given [LatLng].
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
index b9d9f8597d99..7faaadefacdd 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
@@ -1,3 +1,4 @@
 // All the public types exposed by this package.
 
-export 'location.dart';
\ No newline at end of file
+export 'location.dart';
+export 'ui.dart';
\ No newline at end of file
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/ui.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
similarity index 95%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/ui.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
index 4b57ebd7440f..dc6da97030d1 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/ui.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:ui' show hashValues;
+
+import 'location.dart';
 
 /// Type of map tiles to display.
 // Enum constants must be indexed to match the corresponding int constants of
@@ -42,7 +44,7 @@ class CameraTargetBounds {
   /// Unbounded camera target.
   static const CameraTargetBounds unbounded = CameraTargetBounds(null);
 
-  dynamic _toJson() => <dynamic>[bounds?._toList()];
+  dynamic toJson() => <dynamic>[bounds?.toJson()];
 
   @override
   bool operator ==(dynamic other) {
@@ -82,7 +84,7 @@ class MinMaxZoomPreference {
   static const MinMaxZoomPreference unbounded =
       MinMaxZoomPreference(null, null);
 
-  dynamic _toJson() => <dynamic>[minZoom, maxZoom];
+  dynamic toJson() => <dynamic>[minZoom, maxZoom];
 
   @override
   bool operator ==(dynamic other) {

From 56c1873ccfc76a06074df90c69010e781980200d Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 14:40:08 -0700
Subject: [PATCH 20/48] Move Polygon and Polyline, and all the related types.

---
 .../lib/google_maps_flutter.dart              | 24 ++++++++-----
 .../lib/src/types}/bitmap.dart                |  9 +++--
 .../lib/src/types}/cap.dart                   |  7 ++--
 .../lib/src/types}/joint_type.dart            |  2 +-
 .../lib/src/types}/pattern_item.dart          |  4 +--
 .../lib/src/types}/polygon.dart               | 27 ++++-----------
 .../lib/src/types}/polygon_updates.dart       | 24 ++++++++-----
 .../lib/src/types}/polyline.dart              | 34 ++++++-------------
 .../lib/src/types}/polyline_updates.dart      | 24 ++++++++-----
 .../lib/src/types/types.dart                  |  8 +++++
 .../lib/src/types/ui.dart                     |  2 +-
 .../lib/src/types/utils/polygon.dart          | 18 ++++++++++
 .../lib/src/types/utils/polyline.dart         | 19 +++++++++++
 13 files changed, 121 insertions(+), 81 deletions(-)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/bitmap.dart (93%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/cap.dart (91%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/joint_type.dart (94%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/pattern_item.dart (91%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/polygon.dart (90%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/polygon_updates.dart (79%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/polyline.dart (90%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/polyline_updates.dart (82%)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index 2cb6135b9971..0d92f444f09a 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -18,22 +18,28 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 
 export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'
-  show LatLng, LatLngBounds, MapType, CameraTargetBounds, MinMaxZoomPreference, MapStyleException;
+  show 
+    BitmapDescriptor,
+    CameraTargetBounds, 
+    Cap,
+    JointType,
+    LatLng, 
+    LatLngBounds, 
+    MapStyleException,
+    MapType, 
+    MinMaxZoomPreference,
+    PatternItem,
+    Polygon,
+    PolygonId,
+    Polyline,
+    PolylineId;
 
-part 'src/bitmap.dart';
 part 'src/callbacks.dart';
 part 'src/camera.dart';
-part 'src/cap.dart';
 part 'src/circle.dart';
 part 'src/circle_updates.dart';
 part 'src/controller.dart';
 part 'src/google_map.dart';
-part 'src/joint_type.dart';
 part 'src/marker.dart';
 part 'src/marker_updates.dart';
-part 'src/pattern_item.dart';
-part 'src/polygon.dart';
-part 'src/polygon_updates.dart';
-part 'src/polyline.dart';
-part 'src/polyline_updates.dart';
 part 'src/screen_coordinate.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
similarity index 93%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
index 7cf5b2e25b7e..5abb0c3b1ee2 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/bitmap.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
@@ -2,7 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:async' show Future;
+import 'dart:typed_data' show Uint8List;
+
+import 'package:flutter/material.dart' show ImageConfiguration, AssetImage, AssetBundleImageKey;
+import 'package:flutter/services.dart' show AssetBundle;
+import 'package:meta/meta.dart' show visibleForTesting;
 
 /// Defines a bitmap image. For a marker, this class can be used to set the
 /// image of the marker icon. For a ground overlay, it can be used to set the
@@ -110,6 +115,4 @@ class BitmapDescriptor {
   /// Used for testing only.
   @visibleForTesting
   dynamic toJson() => _json;
-
-  dynamic _toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/cap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
similarity index 91%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/cap.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
index 1a6be1f3f528..922355a071e6 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/cap.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
@@ -1,8 +1,9 @@
 // Copyright 2019 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+import 'package:meta/meta.dart' show immutable;
 
-part of google_maps_flutter;
+import 'types.dart';
 
 /// Cap that can be applied at the start or end vertex of a [Polyline].
 @immutable
@@ -43,10 +44,10 @@ class Cap {
   }) {
     assert(bitmapDescriptor != null);
     assert(refWidth > 0.0);
-    return Cap._(<dynamic>['customCap', bitmapDescriptor._toJson(), refWidth]);
+    return Cap._(<dynamic>['customCap', bitmapDescriptor.toJson(), refWidth]);
   }
 
   final dynamic _json;
 
-  dynamic _toJson() => _json;
+  dynamic toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/joint_type.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/joint_type.dart
similarity index 94%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/joint_type.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/joint_type.dart
index ced61ba77417..c7df0b298624 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/joint_type.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/joint_type.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'package:meta/meta.dart' show immutable;
 
 /// Joint types for [Polyline].
 @immutable
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/pattern_item.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
similarity index 91%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/pattern_item.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
index 82e8703d10e2..4b34c3cb3753 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/pattern_item.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'package:meta/meta.dart' show immutable, required;
 
 /// Item used in the stroke pattern for a Polyline.
 @immutable
@@ -30,5 +30,5 @@ class PatternItem {
 
   final dynamic _json;
 
-  dynamic _toJson() => _json;
+  dynamic toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/polygon.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon.dart
similarity index 90%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/polygon.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon.dart
index 973667eece09..a3e681868297 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/polygon.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon.dart
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'package:flutter/foundation.dart' show listEquals, VoidCallback;
+import 'package:flutter/material.dart' show Color, Colors;
+import 'package:meta/meta.dart' show immutable, required;
+
+import 'types.dart';
 
 /// Uniquely identifies a [Polygon] among [GoogleMap] polygons.
 ///
@@ -127,7 +131,7 @@ class Polygon {
     return copyWith(pointsParam: List<LatLng>.of(points));
   }
 
-  dynamic _toJson() {
+  dynamic toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
     void addIfPresent(String fieldName, dynamic value) {
@@ -174,25 +178,8 @@ class Polygon {
   dynamic _pointsToJson() {
     final List<dynamic> result = <dynamic>[];
     for (final LatLng point in points) {
-      result.add(point._toJson());
+      result.add(point.toJson());
     }
     return result;
   }
 }
-
-Map<PolygonId, Polygon> _keyByPolygonId(Iterable<Polygon> polygons) {
-  if (polygons == null) {
-    return <PolygonId, Polygon>{};
-  }
-  return Map<PolygonId, Polygon>.fromEntries(polygons.map((Polygon polygon) =>
-      MapEntry<PolygonId, Polygon>(polygon.polygonId, polygon.clone())));
-}
-
-List<Map<String, dynamic>> _serializePolygonSet(Set<Polygon> polygons) {
-  if (polygons == null) {
-    return null;
-  }
-  return polygons
-      .map<Map<String, dynamic>>((Polygon p) => p._toJson())
-      .toList();
-}
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/polygon_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
similarity index 79%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/polygon_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
index 5a14c6b8ec5c..e0c04e5dcc2a 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/polygon_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
@@ -2,14 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:ui' show hashValues;
+
+import 'package:flutter/foundation.dart' show setEquals;
+
+import 'types.dart';
+import 'utils/polygon.dart';
 
 /// [Polygon] update events to be applied to the [GoogleMap].
 ///
 /// Used in [GoogleMapController] when the map is updated.
-class _PolygonUpdates {
-  /// Computes [_PolygonUpdates] given previous and current [Polygon]s.
-  _PolygonUpdates.from(Set<Polygon> previous, Set<Polygon> current) {
+// (Do not re-export from plugin)
+class PolygonUpdates {
+  /// Computes [PolygonUpdates] given previous and current [Polygon]s.
+  PolygonUpdates.from(Set<Polygon> previous, Set<Polygon> current) {
     if (previous == null) {
       previous = Set<Polygon>.identity();
     }
@@ -18,8 +24,8 @@ class _PolygonUpdates {
       current = Set<Polygon>.identity();
     }
 
-    final Map<PolygonId, Polygon> previousPolygons = _keyByPolygonId(previous);
-    final Map<PolygonId, Polygon> currentPolygons = _keyByPolygonId(current);
+    final Map<PolygonId, Polygon> previousPolygons = keyByPolygonId(previous);
+    final Map<PolygonId, Polygon> currentPolygons = keyByPolygonId(current);
 
     final Set<PolygonId> prevPolygonIds = previousPolygons.keys.toSet();
     final Set<PolygonId> currentPolygonIds = currentPolygons.keys.toSet();
@@ -67,8 +73,8 @@ class _PolygonUpdates {
       }
     }
 
-    addIfNonNull('polygonsToAdd', _serializePolygonSet(polygonsToAdd));
-    addIfNonNull('polygonsToChange', _serializePolygonSet(polygonsToChange));
+    addIfNonNull('polygonsToAdd', serializePolygonSet(polygonsToAdd));
+    addIfNonNull('polygonsToChange', serializePolygonSet(polygonsToChange));
     addIfNonNull('polygonIdsToRemove',
         polygonIdsToRemove.map<dynamic>((PolygonId m) => m.value).toList());
 
@@ -79,7 +85,7 @@ class _PolygonUpdates {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
-    final _PolygonUpdates typedOther = other;
+    final PolygonUpdates typedOther = other;
     return setEquals(polygonsToAdd, typedOther.polygonsToAdd) &&
         setEquals(polygonIdsToRemove, typedOther.polygonIdsToRemove) &&
         setEquals(polygonsToChange, typedOther.polygonsToChange);
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/polyline.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline.dart
similarity index 90%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/polyline.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline.dart
index c27b19e2843e..0798a00930e6 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/polyline.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline.dart
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'package:flutter/foundation.dart' show listEquals, VoidCallback;
+import 'package:flutter/material.dart' show Color, Colors;
+import 'package:meta/meta.dart' show immutable, required;
+
+import 'types.dart';
 
 /// Uniquely identifies a [Polyline] among [GoogleMap] polylines.
 ///
@@ -169,7 +173,7 @@ class Polyline {
     );
   }
 
-  dynamic _toJson() {
+  dynamic toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
     void addIfPresent(String fieldName, dynamic value) {
@@ -181,10 +185,10 @@ class Polyline {
     addIfPresent('polylineId', polylineId.value);
     addIfPresent('consumeTapEvents', consumeTapEvents);
     addIfPresent('color', color.value);
-    addIfPresent('endCap', endCap?._toJson());
+    addIfPresent('endCap', endCap?.toJson());
     addIfPresent('geodesic', geodesic);
     addIfPresent('jointType', jointType?.value);
-    addIfPresent('startCap', startCap?._toJson());
+    addIfPresent('startCap', startCap?.toJson());
     addIfPresent('visible', visible);
     addIfPresent('width', width);
     addIfPresent('zIndex', zIndex);
@@ -225,7 +229,7 @@ class Polyline {
   dynamic _pointsToJson() {
     final List<dynamic> result = <dynamic>[];
     for (final LatLng point in points) {
-      result.add(point._toJson());
+      result.add(point.toJson());
     }
     return result;
   }
@@ -234,27 +238,9 @@ class Polyline {
     final List<dynamic> result = <dynamic>[];
     for (final PatternItem patternItem in patterns) {
       if (patternItem != null) {
-        result.add(patternItem._toJson());
+        result.add(patternItem.toJson());
       }
     }
     return result;
   }
 }
-
-Map<PolylineId, Polyline> _keyByPolylineId(Iterable<Polyline> polylines) {
-  if (polylines == null) {
-    return <PolylineId, Polyline>{};
-  }
-  return Map<PolylineId, Polyline>.fromEntries(polylines.map(
-      (Polyline polyline) => MapEntry<PolylineId, Polyline>(
-          polyline.polylineId, polyline.clone())));
-}
-
-List<Map<String, dynamic>> _serializePolylineSet(Set<Polyline> polylines) {
-  if (polylines == null) {
-    return null;
-  }
-  return polylines
-      .map<Map<String, dynamic>>((Polyline p) => p._toJson())
-      .toList();
-}
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/polyline_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
similarity index 82%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/polyline_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
index ed972a51c8bf..2b1c8cabde31 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/polyline_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
@@ -2,14 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:ui' show hashValues;
+
+import 'package:flutter/foundation.dart' show setEquals;
+
+import 'utils/polyline.dart';
+import 'types.dart';
 
 /// [Polyline] update events to be applied to the [GoogleMap].
 ///
 /// Used in [GoogleMapController] when the map is updated.
-class _PolylineUpdates {
-  /// Computes [_PolylineUpdates] given previous and current [Polyline]s.
-  _PolylineUpdates.from(Set<Polyline> previous, Set<Polyline> current) {
+// (Do not re-export)
+class PolylineUpdates {
+  /// Computes [PolylineUpdates] given previous and current [Polyline]s.
+  PolylineUpdates.from(Set<Polyline> previous, Set<Polyline> current) {
     if (previous == null) {
       previous = Set<Polyline>.identity();
     }
@@ -19,9 +25,9 @@ class _PolylineUpdates {
     }
 
     final Map<PolylineId, Polyline> previousPolylines =
-        _keyByPolylineId(previous);
+        keyByPolylineId(previous);
     final Map<PolylineId, Polyline> currentPolylines =
-        _keyByPolylineId(current);
+        keyByPolylineId(current);
 
     final Set<PolylineId> prevPolylineIds = previousPolylines.keys.toSet();
     final Set<PolylineId> currentPolylineIds = currentPolylines.keys.toSet();
@@ -69,8 +75,8 @@ class _PolylineUpdates {
       }
     }
 
-    addIfNonNull('polylinesToAdd', _serializePolylineSet(polylinesToAdd));
-    addIfNonNull('polylinesToChange', _serializePolylineSet(polylinesToChange));
+    addIfNonNull('polylinesToAdd', serializePolylineSet(polylinesToAdd));
+    addIfNonNull('polylinesToChange', serializePolylineSet(polylinesToChange));
     addIfNonNull('polylineIdsToRemove',
         polylineIdsToRemove.map<dynamic>((PolylineId m) => m.value).toList());
 
@@ -81,7 +87,7 @@ class _PolylineUpdates {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
-    final _PolylineUpdates typedOther = other;
+    final PolylineUpdates typedOther = other;
     return setEquals(polylinesToAdd, typedOther.polylinesToAdd) &&
         setEquals(polylineIdsToRemove, typedOther.polylineIdsToRemove) &&
         setEquals(polylinesToChange, typedOther.polylinesToChange);
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
index 7faaadefacdd..741ff117f75b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
@@ -1,4 +1,12 @@
 // All the public types exposed by this package.
 
+export 'bitmap.dart';
+export 'cap.dart';
+export 'joint_type.dart';
 export 'location.dart';
+export 'pattern_item.dart';
+export 'polygon_updates.dart';
+export 'polygon.dart';
+export 'polyline_updates.dart';
+export 'polyline.dart';
 export 'ui.dart';
\ No newline at end of file
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
index dc6da97030d1..5d895e614b92 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
@@ -4,7 +4,7 @@
 
 import 'dart:ui' show hashValues;
 
-import 'location.dart';
+import 'types.dart';
 
 /// Type of map tiles to display.
 // Enum constants must be indexed to match the corresponding int constants of
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
new file mode 100644
index 000000000000..bf5ee893ec2e
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
@@ -0,0 +1,18 @@
+import '../types.dart';
+
+Map<PolygonId, Polygon> keyByPolygonId(Iterable<Polygon> polygons) {
+  if (polygons == null) {
+    return <PolygonId, Polygon>{};
+  }
+  return Map<PolygonId, Polygon>.fromEntries(polygons.map((Polygon polygon) =>
+      MapEntry<PolygonId, Polygon>(polygon.polygonId, polygon.clone())));
+}
+
+List<Map<String, dynamic>> serializePolygonSet(Set<Polygon> polygons) {
+  if (polygons == null) {
+    return null;
+  }
+  return polygons
+      .map<Map<String, dynamic>>((Polygon p) => p.toJson())
+      .toList();
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart
new file mode 100644
index 000000000000..3f7256143988
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart
@@ -0,0 +1,19 @@
+import '../types.dart';
+
+Map<PolylineId, Polyline> keyByPolylineId(Iterable<Polyline> polylines) {
+  if (polylines == null) {
+    return <PolylineId, Polyline>{};
+  }
+  return Map<PolylineId, Polyline>.fromEntries(polylines.map(
+      (Polyline polyline) => MapEntry<PolylineId, Polyline>(
+          polyline.polylineId, polyline.clone())));
+}
+
+List<Map<String, dynamic>> serializePolylineSet(Set<Polyline> polylines) {
+  if (polylines == null) {
+    return null;
+  }
+  return polylines
+      .map<Map<String, dynamic>>((Polyline p) => p.toJson())
+      .toList();
+}

From 39c4bd6e85ffd5b3ccca76c400eeb5d740e53aff Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 14:57:51 -0700
Subject: [PATCH 21/48] Move Circle and Marker files to platform_interface.

---
 .../lib/google_maps_flutter.dart              | 10 +++----
 .../lib/src/types}/circle.dart                | 25 +++++------------
 .../lib/src/types}/circle_updates.dart        | 24 ++++++++++------
 .../lib/src/types}/marker.dart                | 28 ++++++-------------
 .../lib/src/types}/marker_updates.dart        | 24 ++++++++++------
 .../lib/src/types/types.dart                  |  4 +++
 .../lib/src/types/utils/circle.dart           | 16 +++++++++++
 .../lib/src/types/utils/marker.dart           | 16 +++++++++++
 8 files changed, 87 insertions(+), 60 deletions(-)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/circle.dart (89%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/circle_updates.dart (79%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/marker.dart (94%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/marker_updates.dart (79%)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index 0d92f444f09a..a59e3ebc1ac1 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -5,7 +5,6 @@
 library google_maps_flutter;
 
 import 'dart:async';
-import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
@@ -22,11 +21,16 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
     BitmapDescriptor,
     CameraTargetBounds, 
     Cap,
+    Circle,
+    CircleId,
+    InfoWindow,
     JointType,
     LatLng, 
     LatLngBounds, 
     MapStyleException,
     MapType, 
+    Marker,
+    MarkerId,
     MinMaxZoomPreference,
     PatternItem,
     Polygon,
@@ -36,10 +40,6 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 
 part 'src/callbacks.dart';
 part 'src/camera.dart';
-part 'src/circle.dart';
-part 'src/circle_updates.dart';
 part 'src/controller.dart';
 part 'src/google_map.dart';
-part 'src/marker.dart';
-part 'src/marker_updates.dart';
 part 'src/screen_coordinate.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/circle.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle.dart
similarity index 89%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/circle.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle.dart
index 3edfc88ed4e0..c39acd1c41c5 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/circle.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle.dart
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'package:flutter/foundation.dart' show VoidCallback;
+import 'package:flutter/material.dart' show Color, Colors;
+import 'package:meta/meta.dart' show immutable, required;
+
+import 'types.dart';
 
 /// Uniquely identifies a [Circle] among [GoogleMap] circles.
 ///
@@ -119,7 +123,7 @@ class Circle {
   /// Creates a new [Circle] object whose values are the same as this instance.
   Circle clone() => copyWith();
 
-  dynamic _toJson() {
+  dynamic toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
     void addIfPresent(String fieldName, dynamic value) {
@@ -131,7 +135,7 @@ class Circle {
     addIfPresent('circleId', circleId.value);
     addIfPresent('consumeTapEvents', consumeTapEvents);
     addIfPresent('fillColor', fillColor.value);
-    addIfPresent('center', center._toJson());
+    addIfPresent('center', center.toJson());
     addIfPresent('radius', radius);
     addIfPresent('strokeColor', strokeColor.value);
     addIfPresent('strokeWidth', strokeWidth);
@@ -160,18 +164,3 @@ class Circle {
   @override
   int get hashCode => circleId.hashCode;
 }
-
-Map<CircleId, Circle> _keyByCircleId(Iterable<Circle> circles) {
-  if (circles == null) {
-    return <CircleId, Circle>{};
-  }
-  return Map<CircleId, Circle>.fromEntries(circles.map((Circle circle) =>
-      MapEntry<CircleId, Circle>(circle.circleId, circle.clone())));
-}
-
-List<Map<String, dynamic>> _serializeCircleSet(Set<Circle> circles) {
-  if (circles == null) {
-    return null;
-  }
-  return circles.map<Map<String, dynamic>>((Circle p) => p._toJson()).toList();
-}
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/circle_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
similarity index 79%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/circle_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
index c977c4182c98..89240805c19d 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/circle_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
@@ -2,14 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:ui' show hashValues;
+
+import 'package:flutter/foundation.dart' show setEquals;
+
+import 'types.dart';
+import 'utils/circle.dart';
 
 /// [Circle] update events to be applied to the [GoogleMap].
 ///
 /// Used in [GoogleMapController] when the map is updated.
-class _CircleUpdates {
-  /// Computes [_CircleUpdates] given previous and current [Circle]s.
-  _CircleUpdates.from(Set<Circle> previous, Set<Circle> current) {
+// (Do not re-export)
+class CircleUpdates {
+  /// Computes [CircleUpdates] given previous and current [Circle]s.
+  CircleUpdates.from(Set<Circle> previous, Set<Circle> current) {
     if (previous == null) {
       previous = Set<Circle>.identity();
     }
@@ -18,8 +24,8 @@ class _CircleUpdates {
       current = Set<Circle>.identity();
     }
 
-    final Map<CircleId, Circle> previousCircles = _keyByCircleId(previous);
-    final Map<CircleId, Circle> currentCircles = _keyByCircleId(current);
+    final Map<CircleId, Circle> previousCircles = keyByCircleId(previous);
+    final Map<CircleId, Circle> currentCircles = keyByCircleId(current);
 
     final Set<CircleId> prevCircleIds = previousCircles.keys.toSet();
     final Set<CircleId> currentCircleIds = currentCircles.keys.toSet();
@@ -67,8 +73,8 @@ class _CircleUpdates {
       }
     }
 
-    addIfNonNull('circlesToAdd', _serializeCircleSet(circlesToAdd));
-    addIfNonNull('circlesToChange', _serializeCircleSet(circlesToChange));
+    addIfNonNull('circlesToAdd', serializeCircleSet(circlesToAdd));
+    addIfNonNull('circlesToChange', serializeCircleSet(circlesToChange));
     addIfNonNull('circleIdsToRemove',
         circleIdsToRemove.map<dynamic>((CircleId m) => m.value).toList());
 
@@ -79,7 +85,7 @@ class _CircleUpdates {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
-    final _CircleUpdates typedOther = other;
+    final CircleUpdates typedOther = other;
     return setEquals(circlesToAdd, typedOther.circlesToAdd) &&
         setEquals(circleIdsToRemove, typedOther.circleIdsToRemove) &&
         setEquals(circlesToChange, typedOther.circlesToChange);
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/marker.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker.dart
similarity index 94%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/marker.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker.dart
index 480f0a379c1e..fc8fd1e66031 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/marker.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker.dart
@@ -2,7 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:ui' show hashValues, Offset;
+
+import 'package:flutter/foundation.dart' show ValueChanged, VoidCallback;
+import 'package:meta/meta.dart' show immutable, required;
+
+import 'types.dart';
 
 dynamic _offsetToJson(Offset offset) {
   if (offset == null) {
@@ -262,7 +267,7 @@ class Marker {
   /// Creates a new [Marker] object whose values are the same as this instance.
   Marker clone() => copyWith();
 
-  Map<String, dynamic> _toJson() {
+  Map<String, dynamic> toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
     void addIfPresent(String fieldName, dynamic value) {
@@ -277,9 +282,9 @@ class Marker {
     addIfPresent('consumeTapEvents', consumeTapEvents);
     addIfPresent('draggable', draggable);
     addIfPresent('flat', flat);
-    addIfPresent('icon', icon?._toJson());
+    addIfPresent('icon', icon?.toJson());
     addIfPresent('infoWindow', infoWindow?._toJson());
-    addIfPresent('position', position?._toJson());
+    addIfPresent('position', position?.toJson());
     addIfPresent('rotation', rotation);
     addIfPresent('visible', visible);
     addIfPresent('zIndex', zIndex);
@@ -316,18 +321,3 @@ class Marker {
         'visible: $visible, zIndex: $zIndex, onTap: $onTap}';
   }
 }
-
-Map<MarkerId, Marker> _keyByMarkerId(Iterable<Marker> markers) {
-  if (markers == null) {
-    return <MarkerId, Marker>{};
-  }
-  return Map<MarkerId, Marker>.fromEntries(markers.map((Marker marker) =>
-      MapEntry<MarkerId, Marker>(marker.markerId, marker.clone())));
-}
-
-List<Map<String, dynamic>> _serializeMarkerSet(Set<Marker> markers) {
-  if (markers == null) {
-    return null;
-  }
-  return markers.map<Map<String, dynamic>>((Marker m) => m._toJson()).toList();
-}
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/marker_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
similarity index 79%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/marker_updates.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
index d4a08255e069..0c357a33d413 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/marker_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
@@ -2,14 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:ui' show hashValues;
+
+import 'package:flutter/foundation.dart' show setEquals;
+
+import 'types.dart';
+import 'utils/marker.dart';
 
 /// [Marker] update events to be applied to the [GoogleMap].
 ///
 /// Used in [GoogleMapController] when the map is updated.
-class _MarkerUpdates {
-  /// Computes [_MarkerUpdates] given previous and current [Marker]s.
-  _MarkerUpdates.from(Set<Marker> previous, Set<Marker> current) {
+// (Do not re-export)
+class MarkerUpdates {
+  /// Computes [MarkerUpdates] given previous and current [Marker]s.
+  MarkerUpdates.from(Set<Marker> previous, Set<Marker> current) {
     if (previous == null) {
       previous = Set<Marker>.identity();
     }
@@ -18,8 +24,8 @@ class _MarkerUpdates {
       current = Set<Marker>.identity();
     }
 
-    final Map<MarkerId, Marker> previousMarkers = _keyByMarkerId(previous);
-    final Map<MarkerId, Marker> currentMarkers = _keyByMarkerId(current);
+    final Map<MarkerId, Marker> previousMarkers = keyByMarkerId(previous);
+    final Map<MarkerId, Marker> currentMarkers = keyByMarkerId(current);
 
     final Set<MarkerId> prevMarkerIds = previousMarkers.keys.toSet();
     final Set<MarkerId> currentMarkerIds = currentMarkers.keys.toSet();
@@ -67,8 +73,8 @@ class _MarkerUpdates {
       }
     }
 
-    addIfNonNull('markersToAdd', _serializeMarkerSet(markersToAdd));
-    addIfNonNull('markersToChange', _serializeMarkerSet(markersToChange));
+    addIfNonNull('markersToAdd', serializeMarkerSet(markersToAdd));
+    addIfNonNull('markersToChange', serializeMarkerSet(markersToChange));
     addIfNonNull('markerIdsToRemove',
         markerIdsToRemove.map<dynamic>((MarkerId m) => m.value).toList());
 
@@ -79,7 +85,7 @@ class _MarkerUpdates {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other.runtimeType != runtimeType) return false;
-    final _MarkerUpdates typedOther = other;
+    final MarkerUpdates typedOther = other;
     return setEquals(markersToAdd, typedOther.markersToAdd) &&
         setEquals(markerIdsToRemove, typedOther.markerIdsToRemove) &&
         setEquals(markersToChange, typedOther.markersToChange);
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
index 741ff117f75b..3957b31cd120 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
@@ -2,8 +2,12 @@
 
 export 'bitmap.dart';
 export 'cap.dart';
+export 'circle_updates.dart';
+export 'circle.dart';
 export 'joint_type.dart';
 export 'location.dart';
+export 'marker_updates.dart';
+export 'marker.dart';
 export 'pattern_item.dart';
 export 'polygon_updates.dart';
 export 'polygon.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart
new file mode 100644
index 000000000000..139af16adf43
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart
@@ -0,0 +1,16 @@
+import '../types.dart';
+
+Map<CircleId, Circle> keyByCircleId(Iterable<Circle> circles) {
+  if (circles == null) {
+    return <CircleId, Circle>{};
+  }
+  return Map<CircleId, Circle>.fromEntries(circles.map((Circle circle) =>
+      MapEntry<CircleId, Circle>(circle.circleId, circle.clone())));
+}
+
+List<Map<String, dynamic>> serializeCircleSet(Set<Circle> circles) {
+  if (circles == null) {
+    return null;
+  }
+  return circles.map<Map<String, dynamic>>((Circle p) => p.toJson()).toList();
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart
new file mode 100644
index 000000000000..62a2d115fe48
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart
@@ -0,0 +1,16 @@
+import '../types.dart';
+
+Map<MarkerId, Marker> keyByMarkerId(Iterable<Marker> markers) {
+  if (markers == null) {
+    return <MarkerId, Marker>{};
+  }
+  return Map<MarkerId, Marker>.fromEntries(markers.map((Marker marker) =>
+      MapEntry<MarkerId, Marker>(marker.markerId, marker.clone())));
+}
+
+List<Map<String, dynamic>> serializeMarkerSet(Set<Marker> markers) {
+  if (markers == null) {
+    return null;
+  }
+  return markers.map<Map<String, dynamic>>((Marker m) => m.toJson()).toList();
+}

From a35d82f69b4634f12375684eb407825e642e973d Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 17:47:10 -0700
Subject: [PATCH 22/48] Move callbacks, camera and screen cordinate to platform
 interface. Export from the core plugin to preserve public API.

---
 .../lib/google_maps_flutter.dart               | 11 ++++++-----
 .../lib/src/types}/callbacks.dart              |  2 --
 .../lib/src/types}/camera.dart                 | 18 +++++++++++-------
 .../lib/src/types/location.dart                |  7 ++++---
 .../lib/src/types/polygon_updates.dart         |  2 +-
 .../lib/src/types}/screen_coordinate.dart      |  5 +++--
 .../lib/src/types/types.dart                   |  5 ++++-
 7 files changed, 29 insertions(+), 21 deletions(-)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/callbacks.dart (98%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/camera.dart (94%)
 rename packages/google_maps_flutter/{google_maps_flutter/lib/src => google_maps_flutter_platform_interface/lib/src/types}/screen_coordinate.dart (90%)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index a59e3ebc1ac1..45a1898ba609 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -13,13 +13,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
-// TODO: Remove this import after e2e tests have been migrated.
 import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 
 export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'
   show 
+    ArgumentCallbacks,
+    ArgumentCallback,
     BitmapDescriptor,
+    CameraPosition,
     CameraTargetBounds, 
+    CameraUpdate,
     Cap,
     Circle,
     CircleId,
@@ -36,10 +39,8 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
     Polygon,
     PolygonId,
     Polyline,
-    PolylineId;
+    PolylineId,
+    ScreenCoordinate;
 
-part 'src/callbacks.dart';
-part 'src/camera.dart';
 part 'src/controller.dart';
 part 'src/google_map.dart';
-part 'src/screen_coordinate.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/callbacks.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/callbacks.dart
similarity index 98%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/callbacks.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/callbacks.dart
index 284c7134cbfb..18328b3c65c2 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/callbacks.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/callbacks.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
-
 /// Callback function taking a single argument.
 typedef void ArgumentCallback<T>(T argument);
 
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/camera.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/camera.dart
similarity index 94%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/camera.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/camera.dart
index 043d0f8c9d78..f9ef3aa9aadb 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/camera.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/camera.dart
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of google_maps_flutter;
+import 'dart:ui' show hashValues, Offset;
+
+import 'package:meta/meta.dart' show required;
+
+import 'types.dart';
 
 /// The position of the map "camera", the view point from which the world is shown in the map view.
 ///
@@ -61,7 +65,7 @@ class CameraPosition {
   /// Mainly for internal use when calling [CameraUpdate.newCameraPosition].
   dynamic toMap() => <String, dynamic>{
         'bearing': bearing,
-        'target': target._toJson(),
+        'target': target.toJson(),
         'tilt': tilt,
         'zoom': zoom,
       };
@@ -75,7 +79,7 @@ class CameraPosition {
     }
     return CameraPosition(
       bearing: json['bearing'],
-      target: LatLng._fromJson(json['target']),
+      target: LatLng.fromJson(json['target']),
       tilt: json['tilt'],
       zoom: json['zoom'],
     );
@@ -115,7 +119,7 @@ class CameraUpdate {
   /// Returns a camera update that moves the camera target to the specified
   /// geographical location.
   static CameraUpdate newLatLng(LatLng latLng) {
-    return CameraUpdate._(<dynamic>['newLatLng', latLng._toJson()]);
+    return CameraUpdate._(<dynamic>['newLatLng', latLng.toJson()]);
   }
 
   /// Returns a camera update that transforms the camera so that the specified
@@ -125,7 +129,7 @@ class CameraUpdate {
   static CameraUpdate newLatLngBounds(LatLngBounds bounds, double padding) {
     return CameraUpdate._(<dynamic>[
       'newLatLngBounds',
-      bounds._toList(),
+      bounds.toJson(),
       padding,
     ]);
   }
@@ -134,7 +138,7 @@ class CameraUpdate {
   /// geographical location and zoom level.
   static CameraUpdate newLatLngZoom(LatLng latLng, double zoom) {
     return CameraUpdate._(
-      <dynamic>['newLatLngZoom', latLng._toJson(), zoom],
+      <dynamic>['newLatLngZoom', latLng.toJson(), zoom],
     );
   }
 
@@ -188,5 +192,5 @@ class CameraUpdate {
 
   final dynamic _json;
 
-  dynamic _toJson() => _json;
+  dynamic toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
index 6c48454d68b6..34f78b911c40 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
@@ -31,7 +31,8 @@ class LatLng {
     return <double>[latitude, longitude];
   }
 
-  static LatLng _fromJson(dynamic json) {
+  /// Initialize a LatLng from an \[lat, lng\] array.
+  static LatLng fromJson(dynamic json) {
     if (json == null) {
       return null;
     }
@@ -103,8 +104,8 @@ class LatLngBounds {
       return null;
     }
     return LatLngBounds(
-      southwest: LatLng._fromJson(json[0]),
-      northeast: LatLng._fromJson(json[1]),
+      southwest: LatLng.fromJson(json[0]),
+      northeast: LatLng.fromJson(json[1]),
     );
   }
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
index e0c04e5dcc2a..5487e372e72c 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
@@ -12,7 +12,7 @@ import 'utils/polygon.dart';
 /// [Polygon] update events to be applied to the [GoogleMap].
 ///
 /// Used in [GoogleMapController] when the map is updated.
-// (Do not re-export from plugin)
+// (Do not re-export)
 class PolygonUpdates {
   /// Computes [PolygonUpdates] given previous and current [Polygon]s.
   PolygonUpdates.from(Set<Polygon> previous, Set<Polygon> current) {
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/screen_coordinate.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
similarity index 90%
rename from packages/google_maps_flutter/google_maps_flutter/lib/src/screen_coordinate.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
index e58abe9cefad..b9df42a86668 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/screen_coordinate.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
@@ -1,8 +1,9 @@
 // Copyright 2019 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+import 'dart:ui' show hashValues;
 
-part of google_maps_flutter;
+import 'package:meta/meta.dart' show immutable, required;
 
 /// Represents a point coordinate in the [GoogleMap]'s view.
 ///
@@ -23,7 +24,7 @@ class ScreenCoordinate {
   /// Represents the number of pixels from the top of the [GoogleMap].
   final int y;
 
-  dynamic _toJson() {
+  dynamic toJson() {
     return <String, int>{
       "x": x,
       "y": y,
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
index 3957b31cd120..d7dc9b63531b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
@@ -1,6 +1,8 @@
 // All the public types exposed by this package.
 
 export 'bitmap.dart';
+export 'callbacks.dart';
+export 'camera.dart';
 export 'cap.dart';
 export 'circle_updates.dart';
 export 'circle.dart';
@@ -13,4 +15,5 @@ export 'polygon_updates.dart';
 export 'polygon.dart';
 export 'polyline_updates.dart';
 export 'polyline.dart';
-export 'ui.dart';
\ No newline at end of file
+export 'screen_coordinate.dart';
+export 'ui.dart';

From 7d9b1b88ece5ac99e27c6cd23e440c04adef3087 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 17:57:43 -0700
Subject: [PATCH 23/48] Adapt controller and map widget to new API. Expose _toX
 methods as toJson where needed.

---
 .../lib/src/controller.dart                   | 34 +++++++++---------
 .../lib/src/google_map.dart                   | 36 +++++++++----------
 .../lib/src/types/circle_updates.dart         |  2 +-
 .../lib/src/types/marker_updates.dart         |  2 +-
 .../lib/src/types/polygon_updates.dart        |  2 +-
 .../lib/src/types/polyline_updates.dart       |  2 +-
 .../lib/src/types/types.dart                  |  6 ++++
 7 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 24255d1bc51e..f160ea968f73 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -72,7 +72,7 @@ class GoogleMapController {
         break;
       case 'marker#onDragEnd':
         _googleMapState.onMarkerDragEnd(call.arguments['markerId'],
-            LatLng._fromJson(call.arguments['position']));
+            LatLng.fromJson(call.arguments['position']));
         break;
       case 'infoWindow#onTap':
         _googleMapState.onInfoWindowTap(call.arguments['markerId']);
@@ -87,11 +87,11 @@ class GoogleMapController {
         _googleMapState.onCircleTap(call.arguments['circleId']);
         break;
       case 'map#onTap':
-        _googleMapState.onTap(LatLng._fromJson(call.arguments['position']));
+        _googleMapState.onTap(LatLng.fromJson(call.arguments['position']));
         break;
       case 'map#onLongPress':
         _googleMapState
-            .onLongPress(LatLng._fromJson(call.arguments['position']));
+            .onLongPress(LatLng.fromJson(call.arguments['position']));
         break;
       default:
         throw MissingPluginException();
@@ -115,9 +115,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updateMarkers(_MarkerUpdates markerUpdates) async {
+  Future<void> _updateMarkers(MarkerUpdates markerUpdates) async {
     assert(markerUpdates != null);
-    await _googleMapsFlutterPlatform.updateMarkers(markerUpdates._toMap());
+    await _googleMapsFlutterPlatform.updateMarkers(markerUpdates.toJson());
   }
 
   /// Updates polygon configuration.
@@ -126,9 +126,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updatePolygons(_PolygonUpdates polygonUpdates) async {
+  Future<void> _updatePolygons(PolygonUpdates polygonUpdates) async {
     assert(polygonUpdates != null);
-    await _googleMapsFlutterPlatform.updatePolygons(polygonUpdates._toMap());
+    await _googleMapsFlutterPlatform.updatePolygons(polygonUpdates.toJson());
   }
 
   /// Updates polyline configuration.
@@ -137,9 +137,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updatePolylines(_PolylineUpdates polylineUpdates) async {
+  Future<void> _updatePolylines(PolylineUpdates polylineUpdates) async {
     assert(polylineUpdates != null);
-    await _googleMapsFlutterPlatform.updatePolylines(polylineUpdates._toMap());
+    await _googleMapsFlutterPlatform.updatePolylines(polylineUpdates.toJson());
   }
 
   /// Updates circle configuration.
@@ -148,9 +148,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updateCircles(_CircleUpdates circleUpdates) async {
+  Future<void> _updateCircles(CircleUpdates circleUpdates) async {
     assert(circleUpdates != null);
-    await _googleMapsFlutterPlatform.updateCircles(circleUpdates._toMap());
+    await _googleMapsFlutterPlatform.updateCircles(circleUpdates.toJson());
   }
 
   /// Starts an animated change of the map camera position.
@@ -158,7 +158,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   Future<void> animateCamera(CameraUpdate cameraUpdate) async {
-    await _googleMapsFlutterPlatform.animateCamera(cameraUpdate._toJson());
+    await _googleMapsFlutterPlatform.animateCamera(cameraUpdate.toJson());
   }
 
   /// Changes the map camera position.
@@ -166,7 +166,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   Future<void> moveCamera(CameraUpdate cameraUpdate) async {
-    await _googleMapsFlutterPlatform.moveCamera(cameraUpdate._toJson());
+    await _googleMapsFlutterPlatform.moveCamera(cameraUpdate.toJson());
   }
 
   /// Sets the styling of the base map.
@@ -190,8 +190,8 @@ class GoogleMapController {
   Future<LatLngBounds> getVisibleRegion() async {
     final Map<String, dynamic> latLngBounds =
         await _googleMapsFlutterPlatform.getVisibleRegion();
-    final LatLng southwest = LatLng._fromJson(latLngBounds['southwest']);
-    final LatLng northeast = LatLng._fromJson(latLngBounds['northeast']);
+    final LatLng southwest = LatLng.fromJson(latLngBounds['southwest']);
+    final LatLng northeast = LatLng.fromJson(latLngBounds['northeast']);
 
     return LatLngBounds(northeast: northeast, southwest: southwest);
   }
@@ -203,7 +203,7 @@ class GoogleMapController {
   /// of the map, not necessarily of the whole screen.
   Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) async {
     final Map<String, int> point =
-        await _googleMapsFlutterPlatform.getScreenCoordinate(latLng._toJson());
+        await _googleMapsFlutterPlatform.getScreenCoordinate(latLng.toJson());
     return ScreenCoordinate(x: point['x'], y: point['y']);
   }
 
@@ -213,7 +213,7 @@ class GoogleMapController {
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
   Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) async {
     final List<dynamic> latLng =
-        await _googleMapsFlutterPlatform.getLatLng(screenCoordinate._toJson());
+        await _googleMapsFlutterPlatform.getLatLng(screenCoordinate.toJson());
     return LatLng(latLng[0], latLng[1]);
   }
 
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
index dff999aab10b..1ba5ffc57e95 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
@@ -214,10 +214,10 @@ class _GoogleMapState extends State<GoogleMap> {
     final Map<String, dynamic> creationParams = <String, dynamic>{
       'initialCameraPosition': widget.initialCameraPosition?.toMap(),
       'options': _googleMapOptions.toMap(),
-      'markersToAdd': _serializeMarkerSet(widget.markers),
-      'polygonsToAdd': _serializePolygonSet(widget.polygons),
-      'polylinesToAdd': _serializePolylineSet(widget.polylines),
-      'circlesToAdd': _serializeCircleSet(widget.circles),
+      'markersToAdd': serializeMarkerSet(widget.markers),
+      'polygonsToAdd': serializePolygonSet(widget.polygons),
+      'polylinesToAdd': serializePolylineSet(widget.polylines),
+      'circlesToAdd': serializeCircleSet(widget.circles),
     };
     return _googleMapsFlutterPlatform.buildView(
       creationParams,
@@ -230,10 +230,10 @@ class _GoogleMapState extends State<GoogleMap> {
   void initState() {
     super.initState();
     _googleMapOptions = _GoogleMapOptions.fromWidget(widget);
-    _markers = _keyByMarkerId(widget.markers);
-    _polygons = _keyByPolygonId(widget.polygons);
-    _polylines = _keyByPolylineId(widget.polylines);
-    _circles = _keyByCircleId(widget.circles);
+    _markers = keyByMarkerId(widget.markers);
+    _polygons = keyByPolygonId(widget.polygons);
+    _polylines = keyByPolylineId(widget.polylines);
+    _circles = keyByCircleId(widget.circles);
   }
 
   @override
@@ -263,32 +263,32 @@ class _GoogleMapState extends State<GoogleMap> {
     final GoogleMapController controller = await _controller.future;
     // ignore: unawaited_futures
     controller._updateMarkers(
-        _MarkerUpdates.from(_markers.values.toSet(), widget.markers));
-    _markers = _keyByMarkerId(widget.markers);
+        MarkerUpdates.from(_markers.values.toSet(), widget.markers));
+    _markers = keyByMarkerId(widget.markers);
   }
 
   void _updatePolygons() async {
     final GoogleMapController controller = await _controller.future;
     // ignore: unawaited_futures
     controller._updatePolygons(
-        _PolygonUpdates.from(_polygons.values.toSet(), widget.polygons));
-    _polygons = _keyByPolygonId(widget.polygons);
+        PolygonUpdates.from(_polygons.values.toSet(), widget.polygons));
+    _polygons = keyByPolygonId(widget.polygons);
   }
 
   void _updatePolylines() async {
     final GoogleMapController controller = await _controller.future;
     // ignore: unawaited_futures
     controller._updatePolylines(
-        _PolylineUpdates.from(_polylines.values.toSet(), widget.polylines));
-    _polylines = _keyByPolylineId(widget.polylines);
+        PolylineUpdates.from(_polylines.values.toSet(), widget.polylines));
+    _polylines = keyByPolylineId(widget.polylines);
   }
 
   void _updateCircles() async {
     final GoogleMapController controller = await _controller.future;
     // ignore: unawaited_futures
     controller._updateCircles(
-        _CircleUpdates.from(_circles.values.toSet(), widget.circles));
-    _circles = _keyByCircleId(widget.circles);
+        CircleUpdates.from(_circles.values.toSet(), widget.circles));
+    _circles = keyByCircleId(widget.circles);
   }
 
   Future<void> onPlatformViewCreated(int id) async {
@@ -450,9 +450,9 @@ class _GoogleMapOptions {
 
     addIfNonNull('compassEnabled', compassEnabled);
     addIfNonNull('mapToolbarEnabled', mapToolbarEnabled);
-    addIfNonNull('cameraTargetBounds', cameraTargetBounds?._toJson());
+    addIfNonNull('cameraTargetBounds', cameraTargetBounds?.toJson());
     addIfNonNull('mapType', mapType?.index);
-    addIfNonNull('minMaxZoomPreference', minMaxZoomPreference?._toJson());
+    addIfNonNull('minMaxZoomPreference', minMaxZoomPreference?.toJson());
     addIfNonNull('rotateGesturesEnabled', rotateGesturesEnabled);
     addIfNonNull('scrollGesturesEnabled', scrollGesturesEnabled);
     addIfNonNull('tiltGesturesEnabled', tiltGesturesEnabled);
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
index 89240805c19d..5dd75d7cb40b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
@@ -64,7 +64,7 @@ class CircleUpdates {
   Set<CircleId> circleIdsToRemove;
   Set<Circle> circlesToChange;
 
-  Map<String, dynamic> _toMap() {
+  Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
     void addIfNonNull(String fieldName, dynamic value) {
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
index 0c357a33d413..4add2144e1bc 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
@@ -64,7 +64,7 @@ class MarkerUpdates {
   Set<MarkerId> markerIdsToRemove;
   Set<Marker> markersToChange;
 
-  Map<String, dynamic> _toMap() {
+  Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
     void addIfNonNull(String fieldName, dynamic value) {
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
index 5487e372e72c..8c69efe2b402 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
@@ -64,7 +64,7 @@ class PolygonUpdates {
   Set<PolygonId> polygonIdsToRemove;
   Set<Polygon> polygonsToChange;
 
-  Map<String, dynamic> _toMap() {
+  Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
     void addIfNonNull(String fieldName, dynamic value) {
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
index 2b1c8cabde31..5714354c4bdf 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
@@ -66,7 +66,7 @@ class PolylineUpdates {
   Set<PolylineId> polylineIdsToRemove;
   Set<Polyline> polylinesToChange;
 
-  Map<String, dynamic> _toMap() {
+  Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
     void addIfNonNull(String fieldName, dynamic value) {
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
index d7dc9b63531b..0b13637ded74 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
@@ -17,3 +17,9 @@ export 'polyline_updates.dart';
 export 'polyline.dart';
 export 'screen_coordinate.dart';
 export 'ui.dart';
+
+// Export the utils, they're used by the Widget
+export 'utils/circle.dart';
+export 'utils/marker.dart';
+export 'utils/polygon.dart';
+export 'utils/polyline.dart';

From b745850cd95a0c2036fc49eff6d8bc7722a14849 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 24 Mar 2020 18:02:50 -0700
Subject: [PATCH 24/48] dartfmt -w .

---
 .../lib/google_maps_flutter.dart              | 50 +++++++++----------
 ...oogle_maps_flutter_platform_interface.dart |  3 +-
 .../lib/src/types/bitmap.dart                 |  3 +-
 .../lib/src/types/polyline_updates.dart       |  3 +-
 .../lib/src/types/utils/polygon.dart          |  4 +-
 5 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index 45a1898ba609..8b52237c17eb 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -16,31 +16,31 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 
 export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'
-  show 
-    ArgumentCallbacks,
-    ArgumentCallback,
-    BitmapDescriptor,
-    CameraPosition,
-    CameraTargetBounds, 
-    CameraUpdate,
-    Cap,
-    Circle,
-    CircleId,
-    InfoWindow,
-    JointType,
-    LatLng, 
-    LatLngBounds, 
-    MapStyleException,
-    MapType, 
-    Marker,
-    MarkerId,
-    MinMaxZoomPreference,
-    PatternItem,
-    Polygon,
-    PolygonId,
-    Polyline,
-    PolylineId,
-    ScreenCoordinate;
+    show
+        ArgumentCallbacks,
+        ArgumentCallback,
+        BitmapDescriptor,
+        CameraPosition,
+        CameraTargetBounds,
+        CameraUpdate,
+        Cap,
+        Circle,
+        CircleId,
+        InfoWindow,
+        JointType,
+        LatLng,
+        LatLngBounds,
+        MapStyleException,
+        MapType,
+        Marker,
+        MarkerId,
+        MinMaxZoomPreference,
+        PatternItem,
+        Polygon,
+        PolygonId,
+        Polyline,
+        PolylineId,
+        ScreenCoordinate;
 
 part 'src/controller.dart';
 part 'src/google_map.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index c5a5cc16d4bf..64c270bc1a9a 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -1,3 +1,2 @@
-
 export 'src/platform_interface/google_maps_flutter_platform.dart';
-export 'src/types/types.dart';
\ No newline at end of file
+export 'src/types/types.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
index 5abb0c3b1ee2..0fc07bc9e863 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
@@ -5,7 +5,8 @@
 import 'dart:async' show Future;
 import 'dart:typed_data' show Uint8List;
 
-import 'package:flutter/material.dart' show ImageConfiguration, AssetImage, AssetBundleImageKey;
+import 'package:flutter/material.dart'
+    show ImageConfiguration, AssetImage, AssetBundleImageKey;
 import 'package:flutter/services.dart' show AssetBundle;
 import 'package:meta/meta.dart' show visibleForTesting;
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
index 5714354c4bdf..df45653840c8 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
@@ -26,8 +26,7 @@ class PolylineUpdates {
 
     final Map<PolylineId, Polyline> previousPolylines =
         keyByPolylineId(previous);
-    final Map<PolylineId, Polyline> currentPolylines =
-        keyByPolylineId(current);
+    final Map<PolylineId, Polyline> currentPolylines = keyByPolylineId(current);
 
     final Set<PolylineId> prevPolylineIds = previousPolylines.keys.toSet();
     final Set<PolylineId> currentPolylineIds = currentPolylines.keys.toSet();
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
index bf5ee893ec2e..b865358af99b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
@@ -12,7 +12,5 @@ List<Map<String, dynamic>> serializePolygonSet(Set<Polygon> polygons) {
   if (polygons == null) {
     return null;
   }
-  return polygons
-      .map<Map<String, dynamic>>((Polygon p) => p.toJson())
-      .toList();
+  return polygons.map<Map<String, dynamic>>((Polygon p) => p.toJson()).toList();
 }

From 45d386d17155172365c2c9a1cab9205cee1b9e83 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 25 Mar 2020 14:47:41 -0700
Subject: [PATCH 25/48] Use EntityUpdate classes in the corresponding platform
 interface methods.

Update MethodChannel implementation and plugin to new API.
---
 .../lib/src/controller.dart                   | 12 +++++-----
 .../method_channel_google_maps_flutter.dart   | 24 +++++++++----------
 .../google_maps_flutter_platform.dart         | 13 +++++-----
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index f160ea968f73..55ce6e31fdc0 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -117,7 +117,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateMarkers(MarkerUpdates markerUpdates) async {
     assert(markerUpdates != null);
-    await _googleMapsFlutterPlatform.updateMarkers(markerUpdates.toJson());
+    await _googleMapsFlutterPlatform.updateMarkers(markerUpdates);
   }
 
   /// Updates polygon configuration.
@@ -128,7 +128,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updatePolygons(PolygonUpdates polygonUpdates) async {
     assert(polygonUpdates != null);
-    await _googleMapsFlutterPlatform.updatePolygons(polygonUpdates.toJson());
+    await _googleMapsFlutterPlatform.updatePolygons(polygonUpdates);
   }
 
   /// Updates polyline configuration.
@@ -139,7 +139,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updatePolylines(PolylineUpdates polylineUpdates) async {
     assert(polylineUpdates != null);
-    await _googleMapsFlutterPlatform.updatePolylines(polylineUpdates.toJson());
+    await _googleMapsFlutterPlatform.updatePolylines(polylineUpdates);
   }
 
   /// Updates circle configuration.
@@ -150,7 +150,7 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateCircles(CircleUpdates circleUpdates) async {
     assert(circleUpdates != null);
-    await _googleMapsFlutterPlatform.updateCircles(circleUpdates.toJson());
+    await _googleMapsFlutterPlatform.updateCircles(circleUpdates);
   }
 
   /// Starts an animated change of the map camera position.
@@ -158,7 +158,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   Future<void> animateCamera(CameraUpdate cameraUpdate) async {
-    await _googleMapsFlutterPlatform.animateCamera(cameraUpdate.toJson());
+    await _googleMapsFlutterPlatform.animateCamera(cameraUpdate);
   }
 
   /// Changes the map camera position.
@@ -166,7 +166,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   Future<void> moveCamera(CameraUpdate cameraUpdate) async {
-    await _googleMapsFlutterPlatform.moveCamera(cameraUpdate.toJson());
+    await _googleMapsFlutterPlatform.moveCamera(cameraUpdate);
   }
 
   /// Sets the styling of the base map.
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 456b280f7051..b0af3d4dc9f9 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -64,11 +64,11 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) {
+  Future<void> updateMarkers(MarkerUpdates markerUpdates) {
     assert(markerUpdates != null);
     return _channel.invokeMethod<void>(
       'markers#update',
-      markerUpdates,
+      markerUpdates.toJson(),
     );
   }
 
@@ -79,11 +79,11 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) {
+  Future<void> updatePolygons(PolygonUpdates polygonUpdates) {
     assert(polygonUpdates != null);
     return _channel.invokeMethod<void>(
       'polygons#update',
-      polygonUpdates,
+      polygonUpdates.toJson(),
     );
   }
 
@@ -94,11 +94,11 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) {
+  Future<void> updatePolylines(PolylineUpdates polylineUpdates) {
     assert(polylineUpdates != null);
     return _channel.invokeMethod<void>(
       'polylines#update',
-      polylineUpdates,
+      polylineUpdates.toJson(),
     );
   }
 
@@ -109,11 +109,11 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updateCircles(Map<String, dynamic> circleUpdates) {
+  Future<void> updateCircles(CircleUpdates circleUpdates) {
     assert(circleUpdates != null);
     return _channel.invokeMethod<void>(
       'circles#update',
-      circleUpdates,
+      circleUpdates.toJson(),
     );
   }
 
@@ -122,9 +122,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   @override
-  Future<void> animateCamera(dynamic cameraUpdate) {
+  Future<void> animateCamera(CameraUpdate cameraUpdate) {
     return _channel.invokeMethod<void>('camera#animate', <String, dynamic>{
-      'cameraUpdate': cameraUpdate,
+      'cameraUpdate': cameraUpdate.toJson(),
     });
   }
 
@@ -133,9 +133,9 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   @override
-  Future<void> moveCamera(dynamic cameraUpdate) {
+  Future<void> moveCamera(CameraUpdate cameraUpdate) {
     return _channel.invokeMethod<void>('camera#move', <String, dynamic>{
-      'cameraUpdate': cameraUpdate,
+      'cameraUpdate': cameraUpdate.toJson(),
     });
   }
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 7ef695070301..53e3f55aa289 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -10,6 +10,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 
 import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
+import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 /// The interface that implementations of google_maps_flutter must implement.
@@ -68,7 +69,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMarkers(Map<String, dynamic> markerUpdates) {
+  Future<void> updateMarkers(MarkerUpdates markerUpdates) {
     throw UnimplementedError('updateMarkers() has not been implemented.');
   }
 
@@ -78,7 +79,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolygons(Map<String, dynamic> polygonUpdates) {
+  Future<void> updatePolygons(PolygonUpdates polygonUpdates) {
     throw UnimplementedError('updatePolygons() has not been implemented.');
   }
 
@@ -88,7 +89,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolylines(Map<String, dynamic> polylineUpdates) {
+  Future<void> updatePolylines(PolylineUpdates polylineUpdates) {
     throw UnimplementedError('updatePolylines() has not been implemented.');
   }
 
@@ -98,7 +99,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateCircles(Map<String, dynamic> circleUpdates) {
+  Future<void> updateCircles(CircleUpdates circleUpdates) {
     throw UnimplementedError('updateCircles() has not been implemented.');
   }
 
@@ -106,7 +107,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   ///
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
-  Future<void> animateCamera(dynamic cameraUpdate) {
+  Future<void> animateCamera(CameraUpdate cameraUpdate) {
     throw UnimplementedError('animateCamera() has not been implemented.');
   }
 
@@ -114,7 +115,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   ///
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
-  Future<void> moveCamera(dynamic cameraUpdate) {
+  Future<void> moveCamera(CameraUpdate cameraUpdate) {
     throw UnimplementedError('moveCamera() has not been implemented.');
   }
 

From 364c8291a9ff691cc39b7dbc41bcca73e421fff5 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 25 Mar 2020 15:22:11 -0700
Subject: [PATCH 26/48] Modify the platform interface in methods that return
 map boundaries to use the appropriate classes.

Move as much logic as possible to the MethodChannel.
---
 .../lib/src/controller.dart                   | 21 ++++---------
 .../method_channel_google_maps_flutter.dart   | 30 ++++++++++++-------
 .../google_maps_flutter_platform.dart         | 16 +++++-----
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 55ce6e31fdc0..79e52a8808cd 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -187,13 +187,8 @@ class GoogleMapController {
   }
 
   /// Return [LatLngBounds] defining the region that is visible in a map.
-  Future<LatLngBounds> getVisibleRegion() async {
-    final Map<String, dynamic> latLngBounds =
-        await _googleMapsFlutterPlatform.getVisibleRegion();
-    final LatLng southwest = LatLng.fromJson(latLngBounds['southwest']);
-    final LatLng northeast = LatLng.fromJson(latLngBounds['northeast']);
-
-    return LatLngBounds(northeast: northeast, southwest: southwest);
+  Future<LatLngBounds> getVisibleRegion() {
+    return _googleMapsFlutterPlatform.getVisibleRegion();
   }
 
   /// Return [ScreenCoordinate] of the [LatLng] in the current map view.
@@ -201,20 +196,16 @@ class GoogleMapController {
   /// A projection is used to translate between on screen location and geographic coordinates.
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
-  Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) async {
-    final Map<String, int> point =
-        await _googleMapsFlutterPlatform.getScreenCoordinate(latLng.toJson());
-    return ScreenCoordinate(x: point['x'], y: point['y']);
+  Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) {
+    return _googleMapsFlutterPlatform.getScreenCoordinate(latLng);
   }
 
   /// Returns [LatLng] corresponding to the [ScreenCoordinate] in the current map view.
   ///
   /// Returned [LatLng] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
-  Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) async {
-    final List<dynamic> latLng =
-        await _googleMapsFlutterPlatform.getLatLng(screenCoordinate.toJson());
-    return LatLng(latLng[0], latLng[1]);
+  Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) {
+    return _googleMapsFlutterPlatform.getLatLng(screenCoordinate);
   }
 
   /// Programmatically show the Info Window for a [Marker].
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index b0af3d4dc9f9..199928fd440f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -162,10 +162,15 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
     }
   }
 
-  /// Return [Map<String, dynamic>] defining the region that is visible in a map.
+  /// Return the region that is visible in a map.
   @override
-  Future<Map<String, dynamic>> getVisibleRegion() {
-    return _channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion');
+  Future<LatLngBounds> getVisibleRegion() async {
+    final Map<String, dynamic> latLngBounds =
+        await _channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion');
+    final LatLng southwest = LatLng.fromJson(latLngBounds['southwest']);
+    final LatLng northeast = LatLng.fromJson(latLngBounds['northeast']);
+
+    return LatLngBounds(northeast: northeast, southwest: southwest);
   }
 
   /// Return point [Map<String, int>] of the [screenCoordinateInJson] in the current map view.
@@ -174,19 +179,24 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
   @override
-  Future<Map<String, int>> getScreenCoordinate(dynamic screenCoordinateInJson) {
-    return _channel.invokeMapMethod<String, int>(
-        'map#getScreenCoordinate', screenCoordinateInJson);
+  Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) async {
+    final Map<String, int> point =
+        await _channel.invokeMapMethod<String, int>(
+        'map#getScreenCoordinate', latLng.toJson());
+
+    return ScreenCoordinate(x: point['x'], y: point['y']);
   }
 
-  /// Returns [List] corresponding to the [ScreenCoordinate] in the current map view.
+  /// Returns [LatLng] corresponding to the [ScreenCoordinate] in the current map view.
   ///
-  /// Returned [List] corresponds to a screen location. The screen location is specified in screen
+  /// Returned [LatLng] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
   @override
-  Future<List<dynamic>> getLatLng(dynamic screenCoordinate) {
-    return _channel.invokeMethod<List<dynamic>>(
+  Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) async {
+    final List<dynamic> latLng =
+        await _channel.invokeMethod<List<dynamic>>(
         'map#getLatLng', screenCoordinate.toJson());
+    return LatLng(latLng[0], latLng[1]);
   }
 
   /// Programmatically show the Info Window for a [Marker].
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 53e3f55aa289..47cc15d067e4 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -136,27 +136,27 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     throw UnimplementedError('setMapStyle() has not been implemented.');
   }
 
-  /// Return [Map<String, dynamic>] defining the region that is visible in a map.
-  Future<Map<String, dynamic>> getVisibleRegion() {
+  /// Return the region that is visible in a map.
+  Future<LatLngBounds> getVisibleRegion() {
     throw UnimplementedError('getVisibleRegion() has not been implemented.');
   }
 
-  /// Return point [Map<String, int>] of the [latLngInJson] in the current map view.
+  /// Return [ScreenCoordinate] of the [LatLng] in the current map view.
   ///
   /// A projection is used to translate between on screen location and geographic coordinates.
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
-  Future<List<dynamic>> getLatLng(dynamic latLng) {
-    throw UnimplementedError('getLatLng() has not been implemented.');
+  Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) {
+    throw UnimplementedError('getScreenCoordinate() has not been implemented.');
   }
 
-  /// Return point [Map<String, int>] of the [screenCoordinateInJson] in the current map view.
+  /// Returns [LatLng] corresponding to the [ScreenCoordinate] in the current map view.
   ///
   /// A projection is used to translate between on screen location and geographic coordinates.
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
-  Future<Map<String, int>> getScreenCoordinate(dynamic screenCoordinateInJson) {
-    throw UnimplementedError('getScreenCoordinate() has not been implemented.');
+  Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) {
+    throw UnimplementedError('getLatLng() has not been implemented.');
   }
 
   /// Programmatically show the Info Window for a [Marker].

From e879738381077560f99aaa8d370e60b1953081d2 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 25 Mar 2020 16:54:45 -0700
Subject: [PATCH 27/48] Utilize MarkerId instances instead of Strings in the
 relevant methods.

Update the MethodChannel and core plugin implementation to the new API.
---
 .../google_maps_flutter/lib/src/controller.dart      |  6 +++---
 .../method_channel_google_maps_flutter.dart          | 12 ++++++------
 .../google_maps_flutter_platform.dart                |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 79e52a8808cd..2a972a81551d 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -218,7 +218,7 @@ class GoogleMapController {
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   Future<void> showMarkerInfoWindow(MarkerId markerId) async {
     assert(markerId != null);
-    await _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId.value);
+    await _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId);
   }
 
   /// Programmatically hide the Info Window for a [Marker].
@@ -231,7 +231,7 @@ class GoogleMapController {
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   Future<void> hideMarkerInfoWindow(MarkerId markerId) async {
     assert(markerId != null);
-    await _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId.value);
+    await _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId);
   }
 
   /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
@@ -244,7 +244,7 @@ class GoogleMapController {
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   Future<bool> isMarkerInfoWindowShown(MarkerId markerId) async {
     assert(markerId != null);
-    return _googleMapsFlutterPlatform.isMarkerInfoWindowShown(markerId.value);
+    return _googleMapsFlutterPlatform.isMarkerInfoWindowShown(markerId);
   }
 
   /// Returns the current zoom level of the map
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 199928fd440f..1cf7d0ee5c10 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -208,10 +208,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   @override
-  Future<void> showMarkerInfoWindow(String markerId) {
+  Future<void> showMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
     return _channel.invokeMethod<void>(
-        'markers#showInfoWindow', <String, String>{'markerId': markerId});
+        'markers#showInfoWindow', <String, String>{'markerId': markerId.value});
   }
 
   /// Programmatically hide the Info Window for a [Marker].
@@ -223,10 +223,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   @override
-  Future<void> hideMarkerInfoWindow(String markerId) {
+  Future<void> hideMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
     return _channel.invokeMethod<void>(
-        'markers#hideInfoWindow', <String, String>{'markerId': markerId});
+        'markers#hideInfoWindow', <String, String>{'markerId': markerId.value});
   }
 
   /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
@@ -238,10 +238,10 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   @override
-  Future<bool> isMarkerInfoWindowShown(String markerId) {
+  Future<bool> isMarkerInfoWindowShown(MarkerId markerId) {
     assert(markerId != null);
     return _channel.invokeMethod<bool>(
-        'markers#isInfoWindowShown', <String, String>{'markerId': markerId});
+        'markers#isInfoWindowShown', <String, String>{'markerId': markerId.value});
   }
 
   /// Returns the current zoom level of the map
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 47cc15d067e4..ea515a5eb21e 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -167,7 +167,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> showMarkerInfoWindow(String markerId) {
+  Future<void> showMarkerInfoWindow(MarkerId markerId) {
     throw UnimplementedError(
         'showMarkerInfoWindow() has not been implemented.');
   }
@@ -180,7 +180,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> hideMarkerInfoWindow(String markerId) {
+  Future<void> hideMarkerInfoWindow(MarkerId markerId) {
     throw UnimplementedError(
         'hideMarkerInfoWindow() has not been implemented.');
   }
@@ -193,7 +193,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
-  Future<bool> isMarkerInfoWindowShown(String markerId) {
+  Future<bool> isMarkerInfoWindowShown(MarkerId markerId) {
     throw UnimplementedError('updateMapOptions() has not been implemented.');
   }
 

From 8eb9371b3a118761214002ed9b6df3cfe68092ee Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Thu, 26 Mar 2020 12:18:42 -0700
Subject: [PATCH 28/48] Return futures from the platform directly, no need to
 await for those.

---
 .../lib/src/controller.dart                   | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 2a972a81551d..b68b81e3cd09 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -4,6 +4,9 @@
 
 part of google_maps_flutter;
 
+// TODO: the _googleMapsFlutterPlatform is currently stateful (needs to keep
+// subscriptions that are related to the mapId), however this is a singleton.
+// We need to be able to create configured instances of the platform.
 final GoogleMapsFlutterPlatform _googleMapsFlutterPlatform =
     GoogleMapsFlutterPlatform.instance;
 
@@ -104,9 +107,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) async {
+  Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) {
     assert(optionsUpdate != null);
-    await _googleMapsFlutterPlatform.updateMapOptions(optionsUpdate);
+    return _googleMapsFlutterPlatform.updateMapOptions(optionsUpdate);
   }
 
   /// Updates marker configuration.
@@ -115,9 +118,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updateMarkers(MarkerUpdates markerUpdates) async {
+  Future<void> _updateMarkers(MarkerUpdates markerUpdates) {
     assert(markerUpdates != null);
-    await _googleMapsFlutterPlatform.updateMarkers(markerUpdates);
+    return _googleMapsFlutterPlatform.updateMarkers(markerUpdates);
   }
 
   /// Updates polygon configuration.
@@ -126,9 +129,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updatePolygons(PolygonUpdates polygonUpdates) async {
+  Future<void> _updatePolygons(PolygonUpdates polygonUpdates) {
     assert(polygonUpdates != null);
-    await _googleMapsFlutterPlatform.updatePolygons(polygonUpdates);
+    return _googleMapsFlutterPlatform.updatePolygons(polygonUpdates);
   }
 
   /// Updates polyline configuration.
@@ -137,9 +140,9 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updatePolylines(PolylineUpdates polylineUpdates) async {
+  Future<void> _updatePolylines(PolylineUpdates polylineUpdates) {
     assert(polylineUpdates != null);
-    await _googleMapsFlutterPlatform.updatePolylines(polylineUpdates);
+    return _googleMapsFlutterPlatform.updatePolylines(polylineUpdates);
   }
 
   /// Updates circle configuration.
@@ -148,25 +151,25 @@ class GoogleMapController {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> _updateCircles(CircleUpdates circleUpdates) async {
+  Future<void> _updateCircles(CircleUpdates circleUpdates) {
     assert(circleUpdates != null);
-    await _googleMapsFlutterPlatform.updateCircles(circleUpdates);
+    return _googleMapsFlutterPlatform.updateCircles(circleUpdates);
   }
 
   /// Starts an animated change of the map camera position.
   ///
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
-  Future<void> animateCamera(CameraUpdate cameraUpdate) async {
-    await _googleMapsFlutterPlatform.animateCamera(cameraUpdate);
+  Future<void> animateCamera(CameraUpdate cameraUpdate) {
+    return _googleMapsFlutterPlatform.animateCamera(cameraUpdate);
   }
 
   /// Changes the map camera position.
   ///
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
-  Future<void> moveCamera(CameraUpdate cameraUpdate) async {
-    await _googleMapsFlutterPlatform.moveCamera(cameraUpdate);
+  Future<void> moveCamera(CameraUpdate cameraUpdate) {
+    return _googleMapsFlutterPlatform.moveCamera(cameraUpdate);
   }
 
   /// Sets the styling of the base map.
@@ -182,8 +185,8 @@ class GoogleMapController {
   /// Also, refer [iOS](https://developers.google.com/maps/documentation/ios-sdk/style-reference)
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
-  Future<void> setMapStyle(String mapStyle) async {
-    await _googleMapsFlutterPlatform.setMapStyle(mapStyle);
+  Future<void> setMapStyle(String mapStyle) {
+    return _googleMapsFlutterPlatform.setMapStyle(mapStyle);
   }
 
   /// Return [LatLngBounds] defining the region that is visible in a map.
@@ -216,9 +219,9 @@ class GoogleMapController {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> showMarkerInfoWindow(MarkerId markerId) async {
+  Future<void> showMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
-    await _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId);
+    return _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId);
   }
 
   /// Programmatically hide the Info Window for a [Marker].
@@ -229,9 +232,9 @@ class GoogleMapController {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> hideMarkerInfoWindow(MarkerId markerId) async {
+  Future<void> hideMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
-    await _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId);
+    return _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId);
   }
 
   /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
@@ -242,15 +245,14 @@ class GoogleMapController {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
-  Future<bool> isMarkerInfoWindowShown(MarkerId markerId) async {
+  Future<bool> isMarkerInfoWindowShown(MarkerId markerId) {
     assert(markerId != null);
     return _googleMapsFlutterPlatform.isMarkerInfoWindowShown(markerId);
   }
 
   /// Returns the current zoom level of the map
-  Future<double> getZoomLevel() async {
-    final double zoomLevel = await _googleMapsFlutterPlatform.getZoomLevel();
-    return zoomLevel;
+  Future<double> getZoomLevel() {
+    return _googleMapsFlutterPlatform.getZoomLevel();
   }
 
   /// Returns the image bytes of the map

From be832c91ba058f6dcf75ad5e1617c1341229b293 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Thu, 26 Mar 2020 18:33:11 -0700
Subject: [PATCH 29/48] Make mapId a mandatory parameter on the interface
 methods.

The interface can be a singleton, but implementations can still keep references to multiple different method
channels.
---
 .../lib/src/controller.dart                   | 155 +++++++------
 .../method_channel_google_maps_flutter.dart   | 205 +++++++++++++-----
 .../google_maps_flutter_platform.dart         |  81 +++++--
 .../lib/src/streams/google_maps_streams.dart  |   1 +
 4 files changed, 293 insertions(+), 149 deletions(-)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index b68b81e3cd09..51f52f91d064 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -4,20 +4,19 @@
 
 part of google_maps_flutter;
 
-// TODO: the _googleMapsFlutterPlatform is currently stateful (needs to keep
-// subscriptions that are related to the mapId), however this is a singleton.
-// We need to be able to create configured instances of the platform.
 final GoogleMapsFlutterPlatform _googleMapsFlutterPlatform =
     GoogleMapsFlutterPlatform.instance;
 
 /// Controller for a single GoogleMap instance running on the host platform.
 class GoogleMapController {
+  /// The mapId for this controller
+  final int mapId;
+
   GoogleMapController._(
     CameraPosition initialCameraPosition,
-    this._googleMapState,
-  ) : assert(_googleMapsFlutterPlatform != null) {
-    _googleMapsFlutterPlatform.setMethodCallHandler(_handleMethodCall);
-  }
+    this._googleMapState, {
+    @required this.mapId,
+  }) : assert(_googleMapsFlutterPlatform != null);
 
   /// Initialize control of a [GoogleMap] with [id].
   ///
@@ -33,6 +32,7 @@ class GoogleMapController {
     return GoogleMapController._(
       initialCameraPosition,
       googleMapState,
+      mapId: id,
     );
   }
 
@@ -44,62 +44,62 @@ class GoogleMapController {
   MethodChannel get channel {
     if (_googleMapsFlutterPlatform is MethodChannelGoogleMapsFlutter) {
       return (_googleMapsFlutterPlatform as MethodChannelGoogleMapsFlutter)
-          .channel;
+          .channel(_mapId);
     }
     return null;
   }
 
   final _GoogleMapState _googleMapState;
 
-  Future<dynamic> _handleMethodCall(MethodCall call) async {
-    switch (call.method) {
-      case 'camera#onMoveStarted':
-        if (_googleMapState.widget.onCameraMoveStarted != null) {
-          _googleMapState.widget.onCameraMoveStarted();
-        }
-        break;
-      case 'camera#onMove':
-        if (_googleMapState.widget.onCameraMove != null) {
-          _googleMapState.widget.onCameraMove(
-            CameraPosition.fromMap(call.arguments['position']),
-          );
-        }
-        break;
-      case 'camera#onIdle':
-        if (_googleMapState.widget.onCameraIdle != null) {
-          _googleMapState.widget.onCameraIdle();
-        }
-        break;
-      case 'marker#onTap':
-        _googleMapState.onMarkerTap(call.arguments['markerId']);
-        break;
-      case 'marker#onDragEnd':
-        _googleMapState.onMarkerDragEnd(call.arguments['markerId'],
-            LatLng.fromJson(call.arguments['position']));
-        break;
-      case 'infoWindow#onTap':
-        _googleMapState.onInfoWindowTap(call.arguments['markerId']);
-        break;
-      case 'polyline#onTap':
-        _googleMapState.onPolylineTap(call.arguments['polylineId']);
-        break;
-      case 'polygon#onTap':
-        _googleMapState.onPolygonTap(call.arguments['polygonId']);
-        break;
-      case 'circle#onTap':
-        _googleMapState.onCircleTap(call.arguments['circleId']);
-        break;
-      case 'map#onTap':
-        _googleMapState.onTap(LatLng.fromJson(call.arguments['position']));
-        break;
-      case 'map#onLongPress':
-        _googleMapState
-            .onLongPress(LatLng.fromJson(call.arguments['position']));
-        break;
-      default:
-        throw MissingPluginException();
-    }
-  }
+  // Future<dynamic> _handleMethodCall(MethodCall call) async {
+  //   switch (call.method) {
+  //     case 'camera#onMoveStarted':
+  //       if (_googleMapState.widget.onCameraMoveStarted != null) {
+  //         _googleMapState.widget.onCameraMoveStarted();
+  //       }
+  //       break;
+  //     case 'camera#onMove':
+  //       if (_googleMapState.widget.onCameraMove != null) {
+  //         _googleMapState.widget.onCameraMove(
+  //           CameraPosition.fromMap(call.arguments['position']),
+  //         );
+  //       }
+  //       break;
+  //     case 'camera#onIdle':
+  //       if (_googleMapState.widget.onCameraIdle != null) {
+  //         _googleMapState.widget.onCameraIdle();
+  //       }
+  //       break;
+  //     case 'marker#onTap':
+  //       _googleMapState.onMarkerTap(call.arguments['markerId']);
+  //       break;
+  //     case 'marker#onDragEnd':
+  //       _googleMapState.onMarkerDragEnd(call.arguments['markerId'],
+  //           LatLng.fromJson(call.arguments['position']));
+  //       break;
+  //     case 'infoWindow#onTap':
+  //       _googleMapState.onInfoWindowTap(call.arguments['markerId']);
+  //       break;
+  //     case 'polyline#onTap':
+  //       _googleMapState.onPolylineTap(call.arguments['polylineId']);
+  //       break;
+  //     case 'polygon#onTap':
+  //       _googleMapState.onPolygonTap(call.arguments['polygonId']);
+  //       break;
+  //     case 'circle#onTap':
+  //       _googleMapState.onCircleTap(call.arguments['circleId']);
+  //       break;
+  //     case 'map#onTap':
+  //       _googleMapState.onTap(LatLng.fromJson(call.arguments['position']));
+  //       break;
+  //     case 'map#onLongPress':
+  //       _googleMapState
+  //           .onLongPress(LatLng.fromJson(call.arguments['position']));
+  //       break;
+  //     default:
+  //       throw MissingPluginException();
+  //   }
+  // }
 
   /// Updates configuration options of the map user interface.
   ///
@@ -109,7 +109,8 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) {
     assert(optionsUpdate != null);
-    return _googleMapsFlutterPlatform.updateMapOptions(optionsUpdate);
+    return _googleMapsFlutterPlatform.updateMapOptions(optionsUpdate,
+        mapId: _mapId);
   }
 
   /// Updates marker configuration.
@@ -120,7 +121,8 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateMarkers(MarkerUpdates markerUpdates) {
     assert(markerUpdates != null);
-    return _googleMapsFlutterPlatform.updateMarkers(markerUpdates);
+    return _googleMapsFlutterPlatform.updateMarkers(markerUpdates,
+        mapId: _mapId);
   }
 
   /// Updates polygon configuration.
@@ -131,7 +133,8 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updatePolygons(PolygonUpdates polygonUpdates) {
     assert(polygonUpdates != null);
-    return _googleMapsFlutterPlatform.updatePolygons(polygonUpdates);
+    return _googleMapsFlutterPlatform.updatePolygons(polygonUpdates,
+        mapId: _mapId);
   }
 
   /// Updates polyline configuration.
@@ -142,7 +145,8 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updatePolylines(PolylineUpdates polylineUpdates) {
     assert(polylineUpdates != null);
-    return _googleMapsFlutterPlatform.updatePolylines(polylineUpdates);
+    return _googleMapsFlutterPlatform.updatePolylines(polylineUpdates,
+        mapId: _mapId);
   }
 
   /// Updates circle configuration.
@@ -153,7 +157,8 @@ class GoogleMapController {
   /// The returned [Future] completes after listeners have been notified.
   Future<void> _updateCircles(CircleUpdates circleUpdates) {
     assert(circleUpdates != null);
-    return _googleMapsFlutterPlatform.updateCircles(circleUpdates);
+    return _googleMapsFlutterPlatform.updateCircles(circleUpdates,
+        mapId: _mapId);
   }
 
   /// Starts an animated change of the map camera position.
@@ -161,7 +166,8 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   Future<void> animateCamera(CameraUpdate cameraUpdate) {
-    return _googleMapsFlutterPlatform.animateCamera(cameraUpdate);
+    return _googleMapsFlutterPlatform.animateCamera(cameraUpdate,
+        mapId: _mapId);
   }
 
   /// Changes the map camera position.
@@ -169,7 +175,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   Future<void> moveCamera(CameraUpdate cameraUpdate) {
-    return _googleMapsFlutterPlatform.moveCamera(cameraUpdate);
+    return _googleMapsFlutterPlatform.moveCamera(cameraUpdate, mapId: _mapId);
   }
 
   /// Sets the styling of the base map.
@@ -186,12 +192,12 @@ class GoogleMapController {
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
   Future<void> setMapStyle(String mapStyle) {
-    return _googleMapsFlutterPlatform.setMapStyle(mapStyle);
+    return _googleMapsFlutterPlatform.setMapStyle(mapStyle, mapId: _mapId);
   }
 
   /// Return [LatLngBounds] defining the region that is visible in a map.
   Future<LatLngBounds> getVisibleRegion() {
-    return _googleMapsFlutterPlatform.getVisibleRegion();
+    return _googleMapsFlutterPlatform.getVisibleRegion(mapId: _mapId);
   }
 
   /// Return [ScreenCoordinate] of the [LatLng] in the current map view.
@@ -200,7 +206,8 @@ class GoogleMapController {
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
   Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) {
-    return _googleMapsFlutterPlatform.getScreenCoordinate(latLng);
+    return _googleMapsFlutterPlatform.getScreenCoordinate(latLng,
+        mapId: _mapId);
   }
 
   /// Returns [LatLng] corresponding to the [ScreenCoordinate] in the current map view.
@@ -208,7 +215,8 @@ class GoogleMapController {
   /// Returned [LatLng] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
   Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) {
-    return _googleMapsFlutterPlatform.getLatLng(screenCoordinate);
+    return _googleMapsFlutterPlatform.getLatLng(screenCoordinate,
+        mapId: _mapId);
   }
 
   /// Programmatically show the Info Window for a [Marker].
@@ -221,7 +229,8 @@ class GoogleMapController {
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   Future<void> showMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
-    return _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId);
+    return _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId,
+        mapId: _mapId);
   }
 
   /// Programmatically hide the Info Window for a [Marker].
@@ -234,7 +243,8 @@ class GoogleMapController {
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   Future<void> hideMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
-    return _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId);
+    return _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId,
+        mapId: _mapId);
   }
 
   /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
@@ -247,12 +257,13 @@ class GoogleMapController {
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   Future<bool> isMarkerInfoWindowShown(MarkerId markerId) {
     assert(markerId != null);
-    return _googleMapsFlutterPlatform.isMarkerInfoWindowShown(markerId);
+    return _googleMapsFlutterPlatform.isMarkerInfoWindowShown(markerId,
+        mapId: _mapId);
   }
 
   /// Returns the current zoom level of the map
   Future<double> getZoomLevel() {
-    return _googleMapsFlutterPlatform.getZoomLevel();
+    return _googleMapsFlutterPlatform.getZoomLevel(mapId: _mapId);
   }
 
   /// Returns the image bytes of the map
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 1cf7d0ee5c10..457c0af759d1 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -13,31 +13,78 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 
 /// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
-  int _id;
+  // Keep a collection of id -> channel
+  // Every method call passes the int mapId
+  Map<int, MethodChannel> _channels = {};
 
-  MethodChannel _channel;
-
-  /// The MethodChannel backing this implementation.
-  /// Used in e2e tests (in other package).
-  MethodChannel get channel {
-    return _channel;
-  }
-
-  // TODO: Remove this, and have a private MethodCallHandler that funnels
-  // events to the appropriate Stream.
-  void setMethodCallHandler(dynamic call) {
-    _channel.setMethodCallHandler(call);
+  /// Accesses the MethodChannel associated to the passed mapId.
+  MethodChannel channel(int mapId) {
+    return _channels[mapId];
   }
 
   /// Initializes the platform interface with [id].
   ///
   /// This method is called when the plugin is first initialized.
   @override
-  Future<void> init(int id) {
-    this._id = id;
-    _channel = MethodChannel('plugins.flutter.io/google_maps_$_id');
-    // TODO: Install the internal methodCallHandler here.
-    return _channel.invokeMethod<void>('map#waitForMap');
+  Future<void> init(int mapId) {
+    MethodChannel channel;
+    if (!_channels.containsKey(mapId)) {
+      channel = MethodChannel('plugins.flutter.io/google_maps_$mapId');
+      channel.setMethodCallHandler(
+          (MethodCall call) => _handleMethodCall(call, mapId));
+      _channels[mapId] = channel;
+    }
+    return channel.invokeMethod<void>('map#waitForMap');
+  }
+
+  Future<dynamic> _handleMethodCall(MethodCall call, int mapId) async {
+    switch (call.method) {
+      // case 'camera#onMoveStarted':
+      //   if (_googleMapState.widget.onCameraMoveStarted != null) {
+      //     _googleMapState.widget.onCameraMoveStarted();
+      //   }
+      //   break;
+      // case 'camera#onMove':
+      //   if (_googleMapState.widget.onCameraMove != null) {
+      //     _googleMapState.widget.onCameraMove(
+      //       CameraPosition.fromMap(call.arguments['position']),
+      //     );
+      //   }
+      //   break;
+      // case 'camera#onIdle':
+      //   if (_googleMapState.widget.onCameraIdle != null) {
+      //     _googleMapState.widget.onCameraIdle();
+      //   }
+      //   break;
+      // case 'marker#onTap':
+      //   _googleMapState.onMarkerTap(call.arguments['markerId']);
+      //   break;
+      // case 'marker#onDragEnd':
+      //   _googleMapState.onMarkerDragEnd(call.arguments['markerId'],
+      //       LatLng.fromJson(call.arguments['position']));
+      //   break;
+      // case 'infoWindow#onTap':
+      //   _googleMapState.onInfoWindowTap(call.arguments['markerId']);
+      //   break;
+      // case 'polyline#onTap':
+      //   _googleMapState.onPolylineTap(call.arguments['polylineId']);
+      //   break;
+      // case 'polygon#onTap':
+      //   _googleMapState.onPolygonTap(call.arguments['polygonId']);
+      //   break;
+      // case 'circle#onTap':
+      //   _googleMapState.onCircleTap(call.arguments['circleId']);
+      //   break;
+      // case 'map#onTap':
+      //   _googleMapState.onTap(LatLng.fromJson(call.arguments['position']));
+      //   break;
+      // case 'map#onLongPress':
+      //   _googleMapState
+      //       .onLongPress(LatLng.fromJson(call.arguments['position']));
+      //   break;
+      default:
+        throw MissingPluginException();
+    }
   }
 
   /// Updates configuration options of the map user interface.
@@ -47,9 +94,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) {
+  Future<void> updateMapOptions(
+    Map<String, dynamic> optionsUpdate, {
+    @required int mapId,
+  }) {
     assert(optionsUpdate != null);
-    return _channel.invokeMethod<void>(
+    return channel(mapId).invokeMethod<void>(
       'map#update',
       <String, dynamic>{
         'options': optionsUpdate,
@@ -64,9 +114,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updateMarkers(MarkerUpdates markerUpdates) {
+  Future<void> updateMarkers(
+    MarkerUpdates markerUpdates, {
+    @required int mapId,
+  }) {
     assert(markerUpdates != null);
-    return _channel.invokeMethod<void>(
+    return channel(mapId).invokeMethod<void>(
       'markers#update',
       markerUpdates.toJson(),
     );
@@ -79,9 +132,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updatePolygons(PolygonUpdates polygonUpdates) {
+  Future<void> updatePolygons(
+    PolygonUpdates polygonUpdates, {
+    @required int mapId,
+  }) {
     assert(polygonUpdates != null);
-    return _channel.invokeMethod<void>(
+    return channel(mapId).invokeMethod<void>(
       'polygons#update',
       polygonUpdates.toJson(),
     );
@@ -94,9 +150,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updatePolylines(PolylineUpdates polylineUpdates) {
+  Future<void> updatePolylines(
+    PolylineUpdates polylineUpdates, {
+    @required int mapId,
+  }) {
     assert(polylineUpdates != null);
-    return _channel.invokeMethod<void>(
+    return channel(mapId).invokeMethod<void>(
       'polylines#update',
       polylineUpdates.toJson(),
     );
@@ -109,9 +168,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///
   /// The returned [Future] completes after listeners have been notified.
   @override
-  Future<void> updateCircles(CircleUpdates circleUpdates) {
+  Future<void> updateCircles(
+    CircleUpdates circleUpdates, {
+    @required int mapId,
+  }) {
     assert(circleUpdates != null);
-    return _channel.invokeMethod<void>(
+    return channel(mapId).invokeMethod<void>(
       'circles#update',
       circleUpdates.toJson(),
     );
@@ -122,8 +184,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   @override
-  Future<void> animateCamera(CameraUpdate cameraUpdate) {
-    return _channel.invokeMethod<void>('camera#animate', <String, dynamic>{
+  Future<void> animateCamera(
+    CameraUpdate cameraUpdate, {
+    @required int mapId,
+  }) {
+    return channel(mapId)
+        .invokeMethod<void>('camera#animate', <String, dynamic>{
       'cameraUpdate': cameraUpdate.toJson(),
     });
   }
@@ -133,8 +199,11 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   @override
-  Future<void> moveCamera(CameraUpdate cameraUpdate) {
-    return _channel.invokeMethod<void>('camera#move', <String, dynamic>{
+  Future<void> moveCamera(
+    CameraUpdate cameraUpdate, {
+    @required int mapId,
+  }) {
+    return channel(mapId).invokeMethod<void>('camera#move', <String, dynamic>{
       'cameraUpdate': cameraUpdate.toJson(),
     });
   }
@@ -153,9 +222,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
   @override
-  Future<void> setMapStyle(String mapStyle) async {
-    final List<dynamic> successAndError =
-        await _channel.invokeMethod<List<dynamic>>('map#setStyle', mapStyle);
+  Future<void> setMapStyle(
+    String mapStyle, {
+    @required int mapId,
+  }) async {
+    final List<dynamic> successAndError = await channel(mapId)
+        .invokeMethod<List<dynamic>>('map#setStyle', mapStyle);
     final bool success = successAndError[0];
     if (!success) {
       throw MapStyleException(successAndError[1]);
@@ -164,9 +236,11 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
 
   /// Return the region that is visible in a map.
   @override
-  Future<LatLngBounds> getVisibleRegion() async {
-    final Map<String, dynamic> latLngBounds =
-        await _channel.invokeMapMethod<String, dynamic>('map#getVisibleRegion');
+  Future<LatLngBounds> getVisibleRegion({
+    @required int mapId,
+  }) async {
+    final Map<String, dynamic> latLngBounds = await channel(mapId)
+        .invokeMapMethod<String, dynamic>('map#getVisibleRegion');
     final LatLng southwest = LatLng.fromJson(latLngBounds['southwest']);
     final LatLng northeast = LatLng.fromJson(latLngBounds['northeast']);
 
@@ -179,10 +253,13 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
   @override
-  Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) async {
-    final Map<String, int> point =
-        await _channel.invokeMapMethod<String, int>(
-        'map#getScreenCoordinate', latLng.toJson());
+  Future<ScreenCoordinate> getScreenCoordinate(
+    LatLng latLng, {
+    @required int mapId,
+  }) async {
+    final Map<String, int> point = await channel(mapId)
+        .invokeMapMethod<String, int>(
+            'map#getScreenCoordinate', latLng.toJson());
 
     return ScreenCoordinate(x: point['x'], y: point['y']);
   }
@@ -192,10 +269,13 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   /// Returned [LatLng] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
   @override
-  Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) async {
-    final List<dynamic> latLng =
-        await _channel.invokeMethod<List<dynamic>>(
-        'map#getLatLng', screenCoordinate.toJson());
+  Future<LatLng> getLatLng(
+    ScreenCoordinate screenCoordinate, {
+    @required int mapId,
+  }) async {
+    final List<dynamic> latLng = await channel(mapId)
+        .invokeMethod<List<dynamic>>(
+            'map#getLatLng', screenCoordinate.toJson());
     return LatLng(latLng[0], latLng[1]);
   }
 
@@ -208,9 +288,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   @override
-  Future<void> showMarkerInfoWindow(MarkerId markerId) {
+  Future<void> showMarkerInfoWindow(
+    MarkerId markerId, {
+    @required int mapId,
+  }) {
     assert(markerId != null);
-    return _channel.invokeMethod<void>(
+    return channel(mapId).invokeMethod<void>(
         'markers#showInfoWindow', <String, String>{'markerId': markerId.value});
   }
 
@@ -223,9 +306,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
   @override
-  Future<void> hideMarkerInfoWindow(MarkerId markerId) {
+  Future<void> hideMarkerInfoWindow(
+    MarkerId markerId, {
+    @required int mapId,
+  }) {
     assert(markerId != null);
-    return _channel.invokeMethod<void>(
+    return channel(mapId).invokeMethod<void>(
         'markers#hideInfoWindow', <String, String>{'markerId': markerId.value});
   }
 
@@ -238,18 +324,27 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   @override
-  Future<bool> isMarkerInfoWindowShown(MarkerId markerId) {
+  Future<bool> isMarkerInfoWindowShown(
+    MarkerId markerId, {
+    @required int mapId,
+  }) {
     assert(markerId != null);
-    return _channel.invokeMethod<bool>(
-        'markers#isInfoWindowShown', <String, String>{'markerId': markerId.value});
+    return channel(mapId).invokeMethod<bool>('markers#isInfoWindowShown',
+        <String, String>{'markerId': markerId.value});
   }
 
   /// Returns the current zoom level of the map
   @override
-  Future<double> getZoomLevel() {
-    return _channel.invokeMethod<double>('map#getZoomLevel');
+  Future<double> getZoomLevel({
+    @required int mapId,
+  }) {
+    return channel(mapId).invokeMethod<double>('map#getZoomLevel');
   }
 
+  /// This method builds the appropriate platform view where the map
+  /// can be rendered.
+  /// The `mapId` is passed as a parameter from the framework on the
+  /// `onPlatformViewCreated` callback.
   @override
   Widget buildView(
       Map<String, dynamic> creationParams,
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index ea515a5eb21e..85829dabd848 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -43,23 +43,20 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// /// Initializes the platform interface with [id].
   ///
   /// This method is called when the plugin is first initialized.
-  Future<void> init(int id) {
+  Future<void> init(int mapId) {
     throw UnimplementedError('init() has not been implemented.');
   }
 
-  /// This is only needed by the MethodChannel implementation
-  void setMethodCallHandler(dynamic call) {
-    throw UnimplementedError(
-        'setMethodCallHandler() has not been implemented.');
-  }
-
   /// Updates configuration options of the map user interface.
   ///
   /// Change listeners are notified once the update has been made on the
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMapOptions(Map<String, dynamic> optionsUpdate) {
+  Future<void> updateMapOptions(
+    Map<String, dynamic> optionsUpdate, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('updateMapOptions() has not been implemented.');
   }
 
@@ -69,7 +66,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateMarkers(MarkerUpdates markerUpdates) {
+  Future<void> updateMarkers(
+    MarkerUpdates markerUpdates, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('updateMarkers() has not been implemented.');
   }
 
@@ -79,7 +79,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolygons(PolygonUpdates polygonUpdates) {
+  Future<void> updatePolygons(
+    PolygonUpdates polygonUpdates, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('updatePolygons() has not been implemented.');
   }
 
@@ -89,7 +92,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updatePolylines(PolylineUpdates polylineUpdates) {
+  Future<void> updatePolylines(
+    PolylineUpdates polylineUpdates, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('updatePolylines() has not been implemented.');
   }
 
@@ -99,7 +105,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// platform side.
   ///
   /// The returned [Future] completes after listeners have been notified.
-  Future<void> updateCircles(CircleUpdates circleUpdates) {
+  Future<void> updateCircles(
+    CircleUpdates circleUpdates, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('updateCircles() has not been implemented.');
   }
 
@@ -107,7 +116,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   ///
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
-  Future<void> animateCamera(CameraUpdate cameraUpdate) {
+  Future<void> animateCamera(
+    CameraUpdate cameraUpdate, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('animateCamera() has not been implemented.');
   }
 
@@ -115,7 +127,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   ///
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
-  Future<void> moveCamera(CameraUpdate cameraUpdate) {
+  Future<void> moveCamera(
+    CameraUpdate cameraUpdate, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('moveCamera() has not been implemented.');
   }
 
@@ -132,12 +147,17 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// Also, refer [iOS](https://developers.google.com/maps/documentation/ios-sdk/style-reference)
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
-  Future<void> setMapStyle(String mapStyle) {
+  Future<void> setMapStyle(
+    String mapStyle, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('setMapStyle() has not been implemented.');
   }
 
   /// Return the region that is visible in a map.
-  Future<LatLngBounds> getVisibleRegion() {
+  Future<LatLngBounds> getVisibleRegion({
+    @required int mapId,
+  }) {
     throw UnimplementedError('getVisibleRegion() has not been implemented.');
   }
 
@@ -146,7 +166,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// A projection is used to translate between on screen location and geographic coordinates.
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
-  Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) {
+  Future<ScreenCoordinate> getScreenCoordinate(
+    LatLng latLng, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('getScreenCoordinate() has not been implemented.');
   }
 
@@ -155,7 +178,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// A projection is used to translate between on screen location and geographic coordinates.
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
-  Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) {
+  Future<LatLng> getLatLng(
+    ScreenCoordinate screenCoordinate, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('getLatLng() has not been implemented.');
   }
 
@@ -167,7 +193,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> showMarkerInfoWindow(MarkerId markerId) {
+  Future<void> showMarkerInfoWindow(
+    MarkerId markerId, {
+    @required int mapId,
+  }) {
     throw UnimplementedError(
         'showMarkerInfoWindow() has not been implemented.');
   }
@@ -180,7 +209,10 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [isMarkerInfoWindowShown] to check if the Info Window is showing.
-  Future<void> hideMarkerInfoWindow(MarkerId markerId) {
+  Future<void> hideMarkerInfoWindow(
+    MarkerId markerId, {
+    @required int mapId,
+  }) {
     throw UnimplementedError(
         'hideMarkerInfoWindow() has not been implemented.');
   }
@@ -193,12 +225,17 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// * See also:
   ///   * [showMarkerInfoWindow] to show the Info Window.
   ///   * [hideMarkerInfoWindow] to hide the Info Window.
-  Future<bool> isMarkerInfoWindowShown(MarkerId markerId) {
+  Future<bool> isMarkerInfoWindowShown(
+    MarkerId markerId, {
+    @required int mapId,
+  }) {
     throw UnimplementedError('updateMapOptions() has not been implemented.');
   }
 
   /// Returns the current zoom level of the map
-  Future<double> getZoomLevel() {
+  Future<double> getZoomLevel({
+    @required int mapId,
+  }) {
     throw UnimplementedError('getZoomLevel() has not been implemented.');
   }
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart
@@ -0,0 +1 @@
+

From faf9b97b414f7ebfd30d6c446f0811e9f485e117 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Thu, 26 Mar 2020 20:42:26 -0700
Subject: [PATCH 30/48] Add the 11 native event Streams to the platform
 interface.

Wire them up in the method channel.
Add Event types so we can filter views of the stream later.
---
 ...oogle_maps_flutter_platform_interface.dart |   1 +
 .../lib/src/events/map_event.dart             |  91 +++++++++
 .../method_channel_google_maps_flutter.dart   | 188 ++++++++++++++----
 .../google_maps_flutter_platform.dart         |  58 ++++++
 .../lib/src/streams/google_maps_streams.dart  |   1 -
 5 files changed, 295 insertions(+), 44 deletions(-)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 64c270bc1a9a..3e2104434c9b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -1,2 +1,3 @@
 export 'src/platform_interface/google_maps_flutter_platform.dart';
 export 'src/types/types.dart';
+export 'src/events/map_event.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
new file mode 100644
index 000000000000..eabf2ad55a66
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
@@ -0,0 +1,91 @@
+import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+
+/// Basic event coming from the native side of Maps.
+///
+/// All BasicMapEvent contains is the `mapId` that originated the event.
+class MapEvent<T> {
+  /// The ID of the Map this event is associated to.
+  final int mapId;
+
+  /// The value wrapped by this event
+  final T value;
+
+  /// Constructor
+  MapEvent(this.mapId, this.value);
+}
+
+/// A `ValueMapEvent` associated to a `position`.
+class _PositionedMapEvent<T> extends MapEvent<T> {
+  /// The position where this event happened.
+  final LatLng position;
+
+  /// Constructor
+  _PositionedMapEvent(int mapId, this.position, T value) : super(mapId, value);
+}
+
+/// An event fired when the Camera of a [mapId] starts moving.
+class CameraMoveStartedEvent extends MapEvent<void> {
+  /// Constructor
+  CameraMoveStartedEvent(int mapId) : super(mapId, null);
+}
+
+/// An event fired while the Camera of a [mapId] moves.
+class CameraMoveEvent extends MapEvent<CameraPosition> {
+  /// Constructor
+  CameraMoveEvent(int mapId, CameraPosition position) : super(mapId, position);
+}
+
+/// An event fired when the Camera of a [mapId] becomes idle.
+class CameraIdleEvent extends MapEvent<void> {
+  /// Constructor
+  CameraIdleEvent(int mapId) : super(mapId, null);
+}
+
+/// An event fired when a [Marker] is tapped.
+class MarkerTapEvent extends MapEvent<MarkerId> {
+  /// Constructor
+  MarkerTapEvent(int mapId, MarkerId markerId) : super(mapId, markerId);
+}
+
+/// An event fired when an [InfoWindow] is tapped.
+class InfoWindowTapEvent extends MapEvent<MarkerId> {
+  /// Constructor
+  InfoWindowTapEvent(int mapId, MarkerId markerId) : super(mapId, markerId);
+}
+
+/// An event fired when a [Marker] is dragged to a new [LatLng].
+class MarkerDragEndEvent extends _PositionedMapEvent<MarkerId> {
+  /// Constructor
+  MarkerDragEndEvent(int mapId, LatLng position, MarkerId markerId)
+      : super(mapId, position, markerId);
+}
+
+/// An event fired when a [Polyline] is tapped.
+class PolylineTapEvent extends MapEvent<PolylineId> {
+  /// Constructor
+  PolylineTapEvent(int mapId, PolylineId polylineId) : super(mapId, polylineId);
+}
+
+/// An event fired when a [Polygon] is tapped.
+class PolygonTapEvent extends MapEvent<PolygonId> {
+  /// Constructor
+  PolygonTapEvent(int mapId, PolygonId polygonId) : super(mapId, polygonId);
+}
+
+/// An event fired when a [Circle] is tapped.
+class CircleTapEvent extends MapEvent<CircleId> {
+  /// Constructor
+  CircleTapEvent(int mapId, CircleId circleId) : super(mapId, circleId);
+}
+
+/// An event fired when a Map is tapped.
+class MapTapEvent extends _PositionedMapEvent<void> {
+  /// Constructor
+  MapTapEvent(int mapId, LatLng position) : super(mapId, position, null);
+}
+
+/// An event fired when a Map is long pressed.
+class MapLongPressEvent extends _PositionedMapEvent<void> {
+  /// Constructor
+  MapLongPressEvent(int mapId, LatLng position) : super(mapId, position, null);
+}
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 457c0af759d1..db602dffc427 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -37,51 +37,153 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
     return channel.invokeMethod<void>('map#waitForMap');
   }
 
+  // The controller we need to broadcast the different events coming
+  // from handleMethodCall.
+  //
+  // It is a `broadcast` because multiple controllers will connect to
+  // different stream views of this Controller.
+  StreamController<MapEvent> _events = StreamController<MapEvent>.broadcast();
+
+  @override
+  Stream<CameraMoveStartedEvent> onCameraMoveStarted({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is CameraMoveStartedEvent);
+  }
+
+  @override
+  Stream<CameraMoveEvent> onCameraMove({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is CameraMoveEvent);
+  }
+
+  @override
+  Stream<CameraIdleEvent> onCameraIdle({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is CameraIdleEvent);
+  }
+
+  @override
+  Stream<MarkerTapEvent> onMarkerTap({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is MarkerTapEvent);
+  }
+
+  @override
+  Stream<InfoWindowTapEvent> onInfoWindowTap({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is InfoWindowTapEvent);
+  }
+
+  @override
+  Stream<MarkerDragEndEvent> onMarkerDragEnd({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is MarkerDragEndEvent);
+  }
+
+  @override
+  Stream<PolylineTapEvent> onPolylineTap({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is PolylineTapEvent);
+  }
+
+  @override
+  Stream<PolygonTapEvent> onPolygonTap({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is PolygonTapEvent);
+  }
+
+  @override
+  Stream<CircleTapEvent> onCircleTap({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is CircleTapEvent);
+  }
+
+  @override
+  Stream<MapTapEvent> onTap({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is MapTapEvent);
+  }
+
+  @override
+  Stream<MapLongPressEvent> onLongPress({@required int mapId}) {
+    return _events.stream
+        .where((event) => event.mapId == mapId)
+        .where((event) => event is MapLongPressEvent);
+  }
+
   Future<dynamic> _handleMethodCall(MethodCall call, int mapId) async {
     switch (call.method) {
-      // case 'camera#onMoveStarted':
-      //   if (_googleMapState.widget.onCameraMoveStarted != null) {
-      //     _googleMapState.widget.onCameraMoveStarted();
-      //   }
-      //   break;
-      // case 'camera#onMove':
-      //   if (_googleMapState.widget.onCameraMove != null) {
-      //     _googleMapState.widget.onCameraMove(
-      //       CameraPosition.fromMap(call.arguments['position']),
-      //     );
-      //   }
-      //   break;
-      // case 'camera#onIdle':
-      //   if (_googleMapState.widget.onCameraIdle != null) {
-      //     _googleMapState.widget.onCameraIdle();
-      //   }
-      //   break;
-      // case 'marker#onTap':
-      //   _googleMapState.onMarkerTap(call.arguments['markerId']);
-      //   break;
-      // case 'marker#onDragEnd':
-      //   _googleMapState.onMarkerDragEnd(call.arguments['markerId'],
-      //       LatLng.fromJson(call.arguments['position']));
-      //   break;
-      // case 'infoWindow#onTap':
-      //   _googleMapState.onInfoWindowTap(call.arguments['markerId']);
-      //   break;
-      // case 'polyline#onTap':
-      //   _googleMapState.onPolylineTap(call.arguments['polylineId']);
-      //   break;
-      // case 'polygon#onTap':
-      //   _googleMapState.onPolygonTap(call.arguments['polygonId']);
-      //   break;
-      // case 'circle#onTap':
-      //   _googleMapState.onCircleTap(call.arguments['circleId']);
-      //   break;
-      // case 'map#onTap':
-      //   _googleMapState.onTap(LatLng.fromJson(call.arguments['position']));
-      //   break;
-      // case 'map#onLongPress':
-      //   _googleMapState
-      //       .onLongPress(LatLng.fromJson(call.arguments['position']));
-      //   break;
+      case 'camera#onMoveStarted':
+        _events.add(CameraMoveStartedEvent(mapId));
+        break;
+      case 'camera#onMove':
+        _events.add(CameraMoveEvent(
+          mapId,
+          CameraPosition.fromMap(call.arguments['position']),
+        ));
+        break;
+      case 'camera#onIdle':
+        _events.add(CameraIdleEvent(mapId));
+        break;
+      case 'marker#onTap':
+        _events.add(MarkerTapEvent(
+          mapId,
+          MarkerId(call.arguments['markerId']),
+        ));
+        break;
+      case 'marker#onDragEnd':
+        _events.add(MarkerDragEndEvent(
+          mapId,
+          LatLng.fromJson(call.arguments['position']),
+          MarkerId(call.arguments['markerId']),
+        ));
+        break;
+      case 'infoWindow#onTap':
+        _events.add(InfoWindowTapEvent(
+          mapId,
+          MarkerId(call.arguments['markerId']),
+        ));
+        break;
+      case 'polyline#onTap':
+        _events.add(PolylineTapEvent(
+          mapId,
+          PolylineId(call.arguments['polylineId']),
+        ));
+        break;
+      case 'polygon#onTap':
+        _events.add(PolygonTapEvent(
+          mapId,
+          PolygonId(call.arguments['polygonId']),
+        ));
+        break;
+      case 'circle#onTap':
+        _events.add(CircleTapEvent(
+          mapId,
+          CircleId(call.arguments['circleId']),
+        ));
+        break;
+      case 'map#onTap':
+        _events.add(MapTapEvent(
+          mapId,
+          LatLng.fromJson(call.arguments['position']),
+        ));
+        break;
+      case 'map#onLongPress':
+        _events.add(MapLongPressEvent(
+          mapId,
+          LatLng.fromJson(call.arguments['position']),
+        ));
+        break;
       default:
         throw MissingPluginException();
     }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 85829dabd848..6e2d32300134 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -239,6 +239,64 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     throw UnimplementedError('getZoomLevel() has not been implemented.');
   }
 
+  // The following are the 11 possible streams of data from the native side
+  // into the plugin
+
+  /// The Camera started moving.
+  Stream<CameraMoveStartedEvent> onCameraMoveStarted({@required int mapId}) {
+    throw UnimplementedError('onCameraMoveStarted() has not been implemented.');
+  }
+
+  /// The Camera finished moving to a new [CameraPosition].
+  Stream<CameraMoveEvent> onCameraMove({@required int mapId}) {
+    throw UnimplementedError('onCameraMove() has not been implemented.');
+  }
+
+  /// The Camera is now idle.
+  Stream<CameraIdleEvent> onCameraIdle({@required int mapId}) {
+    throw UnimplementedError('onCameraMove() has not been implemented.');
+  }
+
+  /// A [Marker] has been tapped.
+  Stream<MarkerTapEvent> onMarkerTap({@required int mapId}) {
+    throw UnimplementedError('onMarkerTap() has not been implemented.');
+  }
+
+  /// An [InfoWindow] has been tapped.
+  Stream<InfoWindowTapEvent> onInfoWindowTap({@required int mapId}) {
+    throw UnimplementedError('onInfoWindowTap() has not been implemented.');
+  }
+
+  /// A [Marker] has been dragged to a different [LatLng] position.
+  Stream<MarkerDragEndEvent> onMarkerDragEnd({@required int mapId}) {
+    throw UnimplementedError('onMarkerDragEnd() has not been implemented.');
+  }
+
+  /// A [Polyline] has been tapped.
+  Stream<PolylineTapEvent> onPolylineTap({@required int mapId}) {
+    throw UnimplementedError('onPolylineTap() has not been implemented.');
+  }
+
+  /// A [Polygon] has been tapped.
+  Stream<PolygonTapEvent> onPolygonTap({@required int mapId}) {
+    throw UnimplementedError('onPolygonTap() has not been implemented.');
+  }
+
+  /// A [Circle] has been tapped.
+  Stream<CircleTapEvent> onCircleTap({@required int mapId}) {
+    throw UnimplementedError('onCircleTap() has not been implemented.');
+  }
+
+  /// A Map has been tapped at a certain [LatLng].
+  Stream<MapTapEvent> onTap({@required int mapId}) {
+    throw UnimplementedError('onTap() has not been implemented.');
+  }
+
+  /// A Map has been long-pressed at a certain [LatLng].
+  Stream<MapLongPressEvent> onLongPress({@required int mapId}) {
+    throw UnimplementedError('onLongPress() has not been implemented.');
+  }
+
   /// TODO
   Widget buildView(
       Map<String, dynamic> creationParams,
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart
deleted file mode 100644
index 8b137891791f..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/streams/google_maps_streams.dart
+++ /dev/null
@@ -1 +0,0 @@
-

From 425299da037be9baef60e3428b4cd49da9233cea Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Thu, 26 Mar 2020 21:05:20 -0700
Subject: [PATCH 31/48] Connect to the streams coming from the platform
 interface.

Make the event handler methods in the widget less stringly typed.
---
 .../lib/src/controller.dart                   | 126 ++++++++----------
 .../lib/src/google_map.dart                   |  30 ++---
 2 files changed, 69 insertions(+), 87 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 51f52f91d064..55071bc6236c 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -16,7 +16,9 @@ class GoogleMapController {
     CameraPosition initialCameraPosition,
     this._googleMapState, {
     @required this.mapId,
-  }) : assert(_googleMapsFlutterPlatform != null);
+  }) : assert(_googleMapsFlutterPlatform != null) {
+    _connectStreams(mapId);
+  }
 
   /// Initialize control of a [GoogleMap] with [id].
   ///
@@ -44,62 +46,51 @@ class GoogleMapController {
   MethodChannel get channel {
     if (_googleMapsFlutterPlatform is MethodChannelGoogleMapsFlutter) {
       return (_googleMapsFlutterPlatform as MethodChannelGoogleMapsFlutter)
-          .channel(_mapId);
+          .channel(mapId);
     }
     return null;
   }
 
   final _GoogleMapState _googleMapState;
 
-  // Future<dynamic> _handleMethodCall(MethodCall call) async {
-  //   switch (call.method) {
-  //     case 'camera#onMoveStarted':
-  //       if (_googleMapState.widget.onCameraMoveStarted != null) {
-  //         _googleMapState.widget.onCameraMoveStarted();
-  //       }
-  //       break;
-  //     case 'camera#onMove':
-  //       if (_googleMapState.widget.onCameraMove != null) {
-  //         _googleMapState.widget.onCameraMove(
-  //           CameraPosition.fromMap(call.arguments['position']),
-  //         );
-  //       }
-  //       break;
-  //     case 'camera#onIdle':
-  //       if (_googleMapState.widget.onCameraIdle != null) {
-  //         _googleMapState.widget.onCameraIdle();
-  //       }
-  //       break;
-  //     case 'marker#onTap':
-  //       _googleMapState.onMarkerTap(call.arguments['markerId']);
-  //       break;
-  //     case 'marker#onDragEnd':
-  //       _googleMapState.onMarkerDragEnd(call.arguments['markerId'],
-  //           LatLng.fromJson(call.arguments['position']));
-  //       break;
-  //     case 'infoWindow#onTap':
-  //       _googleMapState.onInfoWindowTap(call.arguments['markerId']);
-  //       break;
-  //     case 'polyline#onTap':
-  //       _googleMapState.onPolylineTap(call.arguments['polylineId']);
-  //       break;
-  //     case 'polygon#onTap':
-  //       _googleMapState.onPolygonTap(call.arguments['polygonId']);
-  //       break;
-  //     case 'circle#onTap':
-  //       _googleMapState.onCircleTap(call.arguments['circleId']);
-  //       break;
-  //     case 'map#onTap':
-  //       _googleMapState.onTap(LatLng.fromJson(call.arguments['position']));
-  //       break;
-  //     case 'map#onLongPress':
-  //       _googleMapState
-  //           .onLongPress(LatLng.fromJson(call.arguments['position']));
-  //       break;
-  //     default:
-  //       throw MissingPluginException();
-  //   }
-  // }
+  void _connectStreams(int mapId) {
+    if (_googleMapState.widget.onCameraMoveStarted != null) {
+      _googleMapsFlutterPlatform
+          .onCameraMoveStarted(mapId: mapId)
+          .listen((_) => _googleMapState.widget.onCameraMoveStarted());
+    }
+    if (_googleMapState.widget.onCameraMove != null) {
+      _googleMapsFlutterPlatform.onCameraMove(mapId: mapId).listen(
+          (CameraMoveEvent e) => _googleMapState.widget.onCameraMove(e.value));
+    }
+    if (_googleMapState.widget.onCameraIdle != null) {
+      _googleMapsFlutterPlatform
+          .onCameraIdle(mapId: mapId)
+          .listen((_) => _googleMapState.widget.onCameraIdle());
+    }
+    _googleMapsFlutterPlatform
+        .onMarkerTap(mapId: mapId)
+        .listen((MarkerTapEvent e) => _googleMapState.onMarkerTap(e.value));
+    _googleMapsFlutterPlatform.onMarkerDragEnd(mapId: mapId).listen(
+        (MarkerDragEndEvent e) =>
+            _googleMapState.onMarkerDragEnd(e.value, e.position));
+    _googleMapsFlutterPlatform.onInfoWindowTap(mapId: mapId).listen(
+        (InfoWindowTapEvent e) => _googleMapState.onInfoWindowTap(e.value));
+    _googleMapsFlutterPlatform
+        .onPolylineTap(mapId: mapId)
+        .listen((PolylineTapEvent e) => _googleMapState.onPolylineTap(e.value));
+    _googleMapsFlutterPlatform
+        .onPolygonTap(mapId: mapId)
+        .listen((PolygonTapEvent e) => _googleMapState.onPolygonTap(e.value));
+    _googleMapsFlutterPlatform
+        .onCircleTap(mapId: mapId)
+        .listen((CircleTapEvent e) => _googleMapState.onCircleTap(e.value));
+    _googleMapsFlutterPlatform
+        .onTap(mapId: mapId)
+        .listen((MapTapEvent e) => _googleMapState.onTap(e.position));
+    _googleMapsFlutterPlatform.onLongPress(mapId: mapId).listen(
+        (MapLongPressEvent e) => _googleMapState.onLongPress(e.position));
+  }
 
   /// Updates configuration options of the map user interface.
   ///
@@ -110,7 +101,7 @@ class GoogleMapController {
   Future<void> _updateMapOptions(Map<String, dynamic> optionsUpdate) {
     assert(optionsUpdate != null);
     return _googleMapsFlutterPlatform.updateMapOptions(optionsUpdate,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Updates marker configuration.
@@ -122,7 +113,7 @@ class GoogleMapController {
   Future<void> _updateMarkers(MarkerUpdates markerUpdates) {
     assert(markerUpdates != null);
     return _googleMapsFlutterPlatform.updateMarkers(markerUpdates,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Updates polygon configuration.
@@ -134,7 +125,7 @@ class GoogleMapController {
   Future<void> _updatePolygons(PolygonUpdates polygonUpdates) {
     assert(polygonUpdates != null);
     return _googleMapsFlutterPlatform.updatePolygons(polygonUpdates,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Updates polyline configuration.
@@ -146,7 +137,7 @@ class GoogleMapController {
   Future<void> _updatePolylines(PolylineUpdates polylineUpdates) {
     assert(polylineUpdates != null);
     return _googleMapsFlutterPlatform.updatePolylines(polylineUpdates,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Updates circle configuration.
@@ -158,7 +149,7 @@ class GoogleMapController {
   Future<void> _updateCircles(CircleUpdates circleUpdates) {
     assert(circleUpdates != null);
     return _googleMapsFlutterPlatform.updateCircles(circleUpdates,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Starts an animated change of the map camera position.
@@ -166,8 +157,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been started on the
   /// platform side.
   Future<void> animateCamera(CameraUpdate cameraUpdate) {
-    return _googleMapsFlutterPlatform.animateCamera(cameraUpdate,
-        mapId: _mapId);
+    return _googleMapsFlutterPlatform.animateCamera(cameraUpdate, mapId: mapId);
   }
 
   /// Changes the map camera position.
@@ -175,7 +165,7 @@ class GoogleMapController {
   /// The returned [Future] completes after the change has been made on the
   /// platform side.
   Future<void> moveCamera(CameraUpdate cameraUpdate) {
-    return _googleMapsFlutterPlatform.moveCamera(cameraUpdate, mapId: _mapId);
+    return _googleMapsFlutterPlatform.moveCamera(cameraUpdate, mapId: mapId);
   }
 
   /// Sets the styling of the base map.
@@ -192,12 +182,12 @@ class GoogleMapController {
   /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
   /// style reference for more information regarding the supported styles.
   Future<void> setMapStyle(String mapStyle) {
-    return _googleMapsFlutterPlatform.setMapStyle(mapStyle, mapId: _mapId);
+    return _googleMapsFlutterPlatform.setMapStyle(mapStyle, mapId: mapId);
   }
 
   /// Return [LatLngBounds] defining the region that is visible in a map.
   Future<LatLngBounds> getVisibleRegion() {
-    return _googleMapsFlutterPlatform.getVisibleRegion(mapId: _mapId);
+    return _googleMapsFlutterPlatform.getVisibleRegion(mapId: mapId);
   }
 
   /// Return [ScreenCoordinate] of the [LatLng] in the current map view.
@@ -206,8 +196,7 @@ class GoogleMapController {
   /// Screen location is in screen pixels (not display pixels) with respect to the top left corner
   /// of the map, not necessarily of the whole screen.
   Future<ScreenCoordinate> getScreenCoordinate(LatLng latLng) {
-    return _googleMapsFlutterPlatform.getScreenCoordinate(latLng,
-        mapId: _mapId);
+    return _googleMapsFlutterPlatform.getScreenCoordinate(latLng, mapId: mapId);
   }
 
   /// Returns [LatLng] corresponding to the [ScreenCoordinate] in the current map view.
@@ -215,8 +204,7 @@ class GoogleMapController {
   /// Returned [LatLng] corresponds to a screen location. The screen location is specified in screen
   /// pixels (not display pixels) relative to the top left of the map, not top left of the whole screen.
   Future<LatLng> getLatLng(ScreenCoordinate screenCoordinate) {
-    return _googleMapsFlutterPlatform.getLatLng(screenCoordinate,
-        mapId: _mapId);
+    return _googleMapsFlutterPlatform.getLatLng(screenCoordinate, mapId: mapId);
   }
 
   /// Programmatically show the Info Window for a [Marker].
@@ -230,7 +218,7 @@ class GoogleMapController {
   Future<void> showMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
     return _googleMapsFlutterPlatform.showMarkerInfoWindow(markerId,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Programmatically hide the Info Window for a [Marker].
@@ -244,7 +232,7 @@ class GoogleMapController {
   Future<void> hideMarkerInfoWindow(MarkerId markerId) {
     assert(markerId != null);
     return _googleMapsFlutterPlatform.hideMarkerInfoWindow(markerId,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Returns `true` when the [InfoWindow] is showing, `false` otherwise.
@@ -258,12 +246,12 @@ class GoogleMapController {
   Future<bool> isMarkerInfoWindowShown(MarkerId markerId) {
     assert(markerId != null);
     return _googleMapsFlutterPlatform.isMarkerInfoWindowShown(markerId,
-        mapId: _mapId);
+        mapId: mapId);
   }
 
   /// Returns the current zoom level of the map
   Future<double> getZoomLevel() {
-    return _googleMapsFlutterPlatform.getZoomLevel(mapId: _mapId);
+    return _googleMapsFlutterPlatform.getZoomLevel(mapId: mapId);
   }
 
   /// Returns the image bytes of the map
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
index 1ba5ffc57e95..8658b7646b07 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
@@ -303,45 +303,39 @@ class _GoogleMapState extends State<GoogleMap> {
     }
   }
 
-  void onMarkerTap(String markerIdParam) {
-    assert(markerIdParam != null);
-    final MarkerId markerId = MarkerId(markerIdParam);
+  void onMarkerTap(MarkerId markerId) {
+    assert(markerId != null);
     if (_markers[markerId]?.onTap != null) {
       _markers[markerId].onTap();
     }
   }
 
-  void onMarkerDragEnd(String markerIdParam, LatLng position) {
-    assert(markerIdParam != null);
-    final MarkerId markerId = MarkerId(markerIdParam);
+  void onMarkerDragEnd(MarkerId markerId, LatLng position) {
+    assert(markerId != null);
     if (_markers[markerId]?.onDragEnd != null) {
       _markers[markerId].onDragEnd(position);
     }
   }
 
-  void onPolygonTap(String polygonIdParam) {
-    assert(polygonIdParam != null);
-    final PolygonId polygonId = PolygonId(polygonIdParam);
+  void onPolygonTap(PolygonId polygonId) {
+    assert(polygonId != null);
     _polygons[polygonId].onTap();
   }
 
-  void onPolylineTap(String polylineIdParam) {
-    assert(polylineIdParam != null);
-    final PolylineId polylineId = PolylineId(polylineIdParam);
+  void onPolylineTap(PolylineId polylineId) {
+    assert(polylineId != null);
     if (_polylines[polylineId]?.onTap != null) {
       _polylines[polylineId].onTap();
     }
   }
 
-  void onCircleTap(String circleIdParam) {
-    assert(circleIdParam != null);
-    final CircleId circleId = CircleId(circleIdParam);
+  void onCircleTap(CircleId circleId) {
+    assert(circleId != null);
     _circles[circleId].onTap();
   }
 
-  void onInfoWindowTap(String markerIdParam) {
-    assert(markerIdParam != null);
-    final MarkerId markerId = MarkerId(markerIdParam);
+  void onInfoWindowTap(MarkerId markerId) {
+    assert(markerId != null);
     if (_markers[markerId]?.infoWindow?.onTap != null) {
       _markers[markerId].infoWindow.onTap();
     }

From 551c47fd6bb24764f546f8a498eb831549b752b9 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Thu, 26 Mar 2020 21:29:05 -0700
Subject: [PATCH 32/48] Ensure the streams are of the right type.

TODO: Extract the where/map to something configurable.
(StreamTransformer, maybe?)
---
 .../method_channel_google_maps_flutter.dart   | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index db602dffc427..90938612b26a 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -48,77 +48,88 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   Stream<CameraMoveStartedEvent> onCameraMoveStarted({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is CameraMoveStartedEvent);
+        .where((event) => event is CameraMoveStartedEvent)
+        .map((event) => event as CameraMoveStartedEvent);
   }
 
   @override
   Stream<CameraMoveEvent> onCameraMove({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is CameraMoveEvent);
+        .where((event) => event is CameraMoveEvent)
+        .map((event) => event as CameraMoveEvent);
   }
 
   @override
   Stream<CameraIdleEvent> onCameraIdle({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is CameraIdleEvent);
+        .where((event) => event is CameraIdleEvent)
+        .map((event) => event as CameraIdleEvent);
   }
 
   @override
   Stream<MarkerTapEvent> onMarkerTap({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is MarkerTapEvent);
+        .where((event) => event is MarkerTapEvent)
+        .map((event) => event as MarkerTapEvent);
   }
 
   @override
   Stream<InfoWindowTapEvent> onInfoWindowTap({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is InfoWindowTapEvent);
+        .where((event) => event is InfoWindowTapEvent)
+        .map((event) => event as InfoWindowTapEvent);
   }
 
   @override
   Stream<MarkerDragEndEvent> onMarkerDragEnd({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is MarkerDragEndEvent);
+        .where((event) => event is MarkerDragEndEvent)
+        .map((event) => event as MarkerDragEndEvent);
   }
 
   @override
   Stream<PolylineTapEvent> onPolylineTap({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is PolylineTapEvent);
+        .where((event) => event is PolylineTapEvent)
+        .map((event) => event as PolylineTapEvent);
   }
 
   @override
   Stream<PolygonTapEvent> onPolygonTap({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is PolygonTapEvent);
+        .where((event) => event is PolygonTapEvent)
+        .map((event) => event as PolygonTapEvent);
   }
 
   @override
   Stream<CircleTapEvent> onCircleTap({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is CircleTapEvent);
+        .where((event) => event is CircleTapEvent)
+        .map((event) => event as CircleTapEvent);
   }
 
   @override
   Stream<MapTapEvent> onTap({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is MapTapEvent);
+        .where((event) => event is MapTapEvent)
+        .map((event) => event as MapTapEvent);
   }
 
   @override
   Stream<MapLongPressEvent> onLongPress({@required int mapId}) {
     return _events.stream
         .where((event) => event.mapId == mapId)
-        .where((event) => event is MapLongPressEvent);
+        .where((event) => event is MapLongPressEvent)
+        .map((event) => event as MapLongPressEvent);
   }
 
   Future<dynamic> _handleMethodCall(MethodCall call, int mapId) async {

From e81023406286ed8f749d4e4dd214768d313710cc Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 27 Mar 2020 11:48:32 -0700
Subject: [PATCH 33/48] Use stream_transform package to get the whereType
 extension.

---
 .../method_channel_google_maps_flutter.dart   | 83 ++++++-------------
 .../pubspec.yaml                              |  1 +
 2 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 90938612b26a..1d665e9d0ad5 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter/gestures.dart';
 
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+import 'package:stream_transform/stream_transform.dart';
 
 /// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
@@ -42,155 +43,125 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   //
   // It is a `broadcast` because multiple controllers will connect to
   // different stream views of this Controller.
-  StreamController<MapEvent> _events = StreamController<MapEvent>.broadcast();
+  StreamController<MapEvent> _controller = StreamController<MapEvent>.broadcast();
+
+  // Returns a filtered view of the events in the _controller, by mapId.
+  Stream<MapEvent> _events(int mapId) => _controller.stream.where((event) => event.mapId == mapId);
 
   @override
   Stream<CameraMoveStartedEvent> onCameraMoveStarted({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is CameraMoveStartedEvent)
-        .map((event) => event as CameraMoveStartedEvent);
+    return _events(mapId).whereType<CameraMoveStartedEvent>();
   }
 
   @override
   Stream<CameraMoveEvent> onCameraMove({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is CameraMoveEvent)
-        .map((event) => event as CameraMoveEvent);
+    return _events(mapId).whereType<CameraMoveEvent>();
   }
 
   @override
   Stream<CameraIdleEvent> onCameraIdle({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is CameraIdleEvent)
-        .map((event) => event as CameraIdleEvent);
+    return _events(mapId).whereType<CameraIdleEvent>();
   }
 
   @override
   Stream<MarkerTapEvent> onMarkerTap({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is MarkerTapEvent)
-        .map((event) => event as MarkerTapEvent);
+    return _events(mapId).whereType<MarkerTapEvent>();
   }
 
   @override
   Stream<InfoWindowTapEvent> onInfoWindowTap({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is InfoWindowTapEvent)
-        .map((event) => event as InfoWindowTapEvent);
+    return _events(mapId).whereType<InfoWindowTapEvent>();
   }
 
   @override
   Stream<MarkerDragEndEvent> onMarkerDragEnd({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is MarkerDragEndEvent)
-        .map((event) => event as MarkerDragEndEvent);
+    return _events(mapId).whereType<MarkerDragEndEvent>();
   }
 
   @override
   Stream<PolylineTapEvent> onPolylineTap({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is PolylineTapEvent)
-        .map((event) => event as PolylineTapEvent);
+    return _events(mapId).whereType<PolylineTapEvent>();
   }
 
   @override
   Stream<PolygonTapEvent> onPolygonTap({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is PolygonTapEvent)
-        .map((event) => event as PolygonTapEvent);
+    return _events(mapId).whereType<PolygonTapEvent>();
   }
 
   @override
   Stream<CircleTapEvent> onCircleTap({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is CircleTapEvent)
-        .map((event) => event as CircleTapEvent);
+    return _events(mapId).whereType<CircleTapEvent>();
   }
 
   @override
   Stream<MapTapEvent> onTap({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is MapTapEvent)
-        .map((event) => event as MapTapEvent);
+    return _events(mapId).whereType<MapTapEvent>();
   }
 
   @override
   Stream<MapLongPressEvent> onLongPress({@required int mapId}) {
-    return _events.stream
-        .where((event) => event.mapId == mapId)
-        .where((event) => event is MapLongPressEvent)
-        .map((event) => event as MapLongPressEvent);
+    return _events(mapId).whereType<MapLongPressEvent>();
   }
 
   Future<dynamic> _handleMethodCall(MethodCall call, int mapId) async {
     switch (call.method) {
       case 'camera#onMoveStarted':
-        _events.add(CameraMoveStartedEvent(mapId));
+        _controller.add(CameraMoveStartedEvent(mapId));
         break;
       case 'camera#onMove':
-        _events.add(CameraMoveEvent(
+        _controller.add(CameraMoveEvent(
           mapId,
           CameraPosition.fromMap(call.arguments['position']),
         ));
         break;
       case 'camera#onIdle':
-        _events.add(CameraIdleEvent(mapId));
+        _controller.add(CameraIdleEvent(mapId));
         break;
       case 'marker#onTap':
-        _events.add(MarkerTapEvent(
+        _controller.add(MarkerTapEvent(
           mapId,
           MarkerId(call.arguments['markerId']),
         ));
         break;
       case 'marker#onDragEnd':
-        _events.add(MarkerDragEndEvent(
+        _controller.add(MarkerDragEndEvent(
           mapId,
           LatLng.fromJson(call.arguments['position']),
           MarkerId(call.arguments['markerId']),
         ));
         break;
       case 'infoWindow#onTap':
-        _events.add(InfoWindowTapEvent(
+        _controller.add(InfoWindowTapEvent(
           mapId,
           MarkerId(call.arguments['markerId']),
         ));
         break;
       case 'polyline#onTap':
-        _events.add(PolylineTapEvent(
+        _controller.add(PolylineTapEvent(
           mapId,
           PolylineId(call.arguments['polylineId']),
         ));
         break;
       case 'polygon#onTap':
-        _events.add(PolygonTapEvent(
+        _controller.add(PolygonTapEvent(
           mapId,
           PolygonId(call.arguments['polygonId']),
         ));
         break;
       case 'circle#onTap':
-        _events.add(CircleTapEvent(
+        _controller.add(CircleTapEvent(
           mapId,
           CircleId(call.arguments['circleId']),
         ));
         break;
       case 'map#onTap':
-        _events.add(MapTapEvent(
+        _controller.add(MapTapEvent(
           mapId,
           LatLng.fromJson(call.arguments['position']),
         ));
         break;
       case 'map#onLongPress':
-        _events.add(MapLongPressEvent(
+        _controller.add(MapLongPressEvent(
           mapId,
           LatLng.fromJson(call.arguments['position']),
         ));
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
index ed39ce659a4d..a878a2dddfff 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
@@ -10,6 +10,7 @@ dependencies:
     sdk: flutter
   meta: ^1.0.5
   plugin_platform_interface: ^1.0.1
+  stream_transform: ^1.2.0
 
 dev_dependencies:
   flutter_test:

From ba72342b5903045632177058ef06148c442c857d Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 27 Mar 2020 12:13:04 -0700
Subject: [PATCH 34/48] Final vars should be final

---
 .../method_channel/method_channel_google_maps_flutter.dart    | 4 ++--
 .../lib/src/types/pattern_item.dart                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 1d665e9d0ad5..d6c64eb85b65 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -16,7 +16,7 @@ import 'package:stream_transform/stream_transform.dart';
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   // Keep a collection of id -> channel
   // Every method call passes the int mapId
-  Map<int, MethodChannel> _channels = {};
+  final Map<int, MethodChannel> _channels = {};
 
   /// Accesses the MethodChannel associated to the passed mapId.
   MethodChannel channel(int mapId) {
@@ -43,7 +43,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   //
   // It is a `broadcast` because multiple controllers will connect to
   // different stream views of this Controller.
-  StreamController<MapEvent> _controller = StreamController<MapEvent>.broadcast();
+  final StreamController<MapEvent> _controller = StreamController<MapEvent>.broadcast();
 
   // Returns a filtered view of the events in the _controller, by mapId.
   Stream<MapEvent> _events(int mapId) => _controller.stream.where((event) => event.mapId == mapId);
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
index 4b34c3cb3753..95de941e52dd 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:meta/meta.dart' show immutable, required;
+import 'package:meta/meta.dart' show immutable;
 
 /// Item used in the stroke pattern for a Polyline.
 @immutable

From b2547b5676eef77867c51cf3d856794c07b7c051 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 27 Mar 2020 17:02:22 -0700
Subject: [PATCH 35/48] dartfmt -w .

---
 .../method_channel/method_channel_google_maps_flutter.dart  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index d6c64eb85b65..1a343ca45a86 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -43,10 +43,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   //
   // It is a `broadcast` because multiple controllers will connect to
   // different stream views of this Controller.
-  final StreamController<MapEvent> _controller = StreamController<MapEvent>.broadcast();
+  final StreamController<MapEvent> _controller =
+      StreamController<MapEvent>.broadcast();
 
   // Returns a filtered view of the events in the _controller, by mapId.
-  Stream<MapEvent> _events(int mapId) => _controller.stream.where((event) => event.mapId == mapId);
+  Stream<MapEvent> _events(int mapId) =>
+      _controller.stream.where((event) => event.mapId == mapId);
 
   @override
   Stream<CameraMoveStartedEvent> onCameraMoveStarted({@required int mapId}) {

From e13335168baee5c7de881f908ba463cceacf4886 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Mon, 30 Mar 2020 17:02:34 -0700
Subject: [PATCH 36/48] Rename test according to what it tests.

---
 .../google_maps_flutter_platform_test.dart}                       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/google_maps_flutter/google_maps_flutter_platform_interface/test/{method_channel_google_maps_flutter_test.dart => platform_interface/google_maps_flutter_platform_test.dart} (100%)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel_google_maps_flutter_test.dart
rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart

From 69dcf5be26e7ef655f78f8a9f69dfdd72fa740ae Mon Sep 17 00:00:00 2001
From: chung2012 <chungyl2012@gmail.com>
Date: Wed, 1 Apr 2020 00:46:27 +0800
Subject: [PATCH 37/48] buildView document

---
 .../src/platform_interface/google_maps_flutter_platform.dart    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 6e2d32300134..78cf078f1bbd 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -297,7 +297,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     throw UnimplementedError('onLongPress() has not been implemented.');
   }
 
-  /// TODO
+  /// Returns a widget displaying the map view
   Widget buildView(
       Map<String, dynamic> creationParams,
       Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers,

From c8ca414747e17e335735ed16240509a926bceacb Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Tue, 31 Mar 2020 14:06:21 -0700
Subject: [PATCH 38/48] Move CameraPositionCallback to the platform interface

---
 .../google_maps_flutter/lib/google_maps_flutter.dart   |  1 +
 .../google_maps_flutter/lib/src/google_map.dart        |  8 --------
 .../lib/src/events/map_event.dart                      |  4 ++--
 .../lib/src/types/callbacks.dart                       | 10 ++++++++++
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index 8b52237c17eb..ab51ed9fc1e2 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -21,6 +21,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
         ArgumentCallback,
         BitmapDescriptor,
         CameraPosition,
+        CameraPositionCallback,
         CameraTargetBounds,
         CameraUpdate,
         Cap,
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
index 8658b7646b07..be15e2238b89 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart
@@ -10,14 +10,6 @@ part of google_maps_flutter;
 /// map is created.
 typedef void MapCreatedCallback(GoogleMapController controller);
 
-/// Callback that receives updates to the camera position.
-///
-/// This callback is triggered when the platform Google Map
-/// registers a camera movement.
-///
-/// This is used in [GoogleMap.onCameraMove].
-typedef void CameraPositionCallback(CameraPosition position);
-
 /// A widget which displays a map with data obtained from the Google Maps service.
 class GoogleMap extends StatefulWidget {
   /// Creates a widget displaying data from Google Maps services.
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
index eabf2ad55a66..afc2c18d883f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
@@ -2,7 +2,7 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 
 /// Basic event coming from the native side of Maps.
 ///
-/// All BasicMapEvent contains is the `mapId` that originated the event.
+/// All MapEvents contain the `mapId` that originated the event.
 class MapEvent<T> {
   /// The ID of the Map this event is associated to.
   final int mapId;
@@ -14,7 +14,7 @@ class MapEvent<T> {
   MapEvent(this.mapId, this.value);
 }
 
-/// A `ValueMapEvent` associated to a `position`.
+/// A `MapEvent` associated to a `position`.
 class _PositionedMapEvent<T> extends MapEvent<T> {
   /// The position where this event happened.
   final LatLng position;
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/callbacks.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/callbacks.dart
index 18328b3c65c2..c20ece5d6c7c 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/callbacks.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/callbacks.dart
@@ -2,6 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'types.dart';
+
+/// Callback that receives updates to the camera position.
+///
+/// This callback is triggered when the platform Google Map
+/// registers a camera movement.
+///
+/// This is used in [GoogleMap.onCameraMove].
+typedef void CameraPositionCallback(CameraPosition position);
+
 /// Callback function taking a single argument.
 typedef void ArgumentCallback<T>(T argument);
 

From fbc3b3ef2b866babd44a15c481c57484bcca35c4 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 1 Apr 2020 15:35:10 -0700
Subject: [PATCH 39/48] Move takeSnapshot to platform_interface.

---
 .../google_maps_flutter/lib/google_maps_flutter.dart     | 1 +
 .../google_maps_flutter/lib/src/controller.dart          | 4 ++--
 .../method_channel_google_maps_flutter.dart              | 9 +++++++++
 .../platform_interface/google_maps_flutter_platform.dart | 9 +++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
index ab51ed9fc1e2..a17b30ca6226 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart
@@ -5,6 +5,7 @@
 library google_maps_flutter;
 
 import 'dart:async';
+import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
index 55071bc6236c..c87b2dacb09c 100644
--- a/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart
@@ -255,7 +255,7 @@ class GoogleMapController {
   }
 
   /// Returns the image bytes of the map
-  Future<Uint8List> takeSnapshot() async {
-    return await channel.invokeMethod<Uint8List>('map#takeSnapshot');
+  Future<Uint8List> takeSnapshot() {
+    return _googleMapsFlutterPlatform.takeSnapshot(mapId: mapId);
   }
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 1a343ca45a86..7273f04b2732 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
@@ -427,6 +428,14 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
     return channel(mapId).invokeMethod<double>('map#getZoomLevel');
   }
 
+  /// Returns the image bytes of the map
+  @override
+  Future<Uint8List> takeSnapshot({
+    @required int mapId,
+  }) {
+    return channel(mapId).invokeMethod<Uint8List>('map#takeSnapshot');
+  }
+
   /// This method builds the appropriate platform view where the map
   /// can be rendered.
   /// The `mapId` is passed as a parameter from the framework on the
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 78cf078f1bbd..8f1e9fc28379 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:typed_data';
+
 import 'package:flutter/widgets.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
@@ -239,6 +241,13 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
     throw UnimplementedError('getZoomLevel() has not been implemented.');
   }
 
+  /// Returns the image bytes of the map
+  Future<Uint8List> takeSnapshot({
+    @required int mapId,
+  }) {
+    throw UnimplementedError('takeSnapshot() has not been implemented.');
+  }
+
   // The following are the 11 possible streams of data from the native side
   // into the plugin
 

From 95af9f0b4365b23da02bb349495d118e676d7fae Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 1 Apr 2020 15:38:36 -0700
Subject: [PATCH 40/48] Set google_maps_flutter_platform_interface version to
 1.0.0

---
 .../CHANGELOG.md                                   | 14 --------------
 .../pubspec.yaml                                   |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
index 5442f6828779..0d8803f93540 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md
@@ -1,17 +1,3 @@
-## 1.0.0+4
-* Add init method and Move MethodChannel code to MethodChannelGoogleMapsFlutter 
-
-## 1.0.0+3
-* Clean up format
-
-## 1.0.0+2
-
-* Add PlatformInterface methods according to GoogleMapsFlutter
-
-## 1.0.0+1
-
-* Update README
-
 ## 1.0.0
 
 * Initial release.
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
index a878a2dddfff..2cd840b07e3a 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml
@@ -3,7 +3,7 @@ description: A common platform interface for the google_maps_flutter plugin.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter_platform_interface
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 1.0.0+4
+version: 1.0.0
 
 dependencies:
   flutter:

From 63f5d0dfc8f0beaf408ab2b6c72aa6b1d434b794 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 12:13:39 -0700
Subject: [PATCH 41/48] Revert changes to the example.

---
 .../example/android/.gitignore                |   7 ----
 .../flutter/plugins/example/MainActivity.kt   |  12 ------
 .../example/ios/.gitignore                    |  32 ----------------
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 ----
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 ----
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 ----
 .../xcshareddata/WorkspaceSettings.xcsettings |   8 ----
 .../example/ios/Runner/AppDelegate.swift      |  13 -------
 .../ios/Runner/Runner-Bridging-Header.h       |   1 -
 .../google_maps_flutter/example/pubspec.yaml  |   1 -
 .../example/web/favicon.png                   | Bin 917 -> 0 bytes
 .../example/web/icons/Icon-192.png            | Bin 5292 -> 0 bytes
 .../example/web/icons/Icon-512.png            | Bin 8252 -> 0 bytes
 .../example/web/index.html                    |  35 ------------------
 .../example/web/manifest.json                 |  23 ------------
 15 files changed, 156 deletions(-)
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/favicon.png
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-192.png
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-512.png
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/index.html
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore b/packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore
deleted file mode 100644
index bc2100d8f75e..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/android/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt
deleted file mode 100644
index 5917557e48ab..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/kotlin/io/flutter/plugins/example/MainActivity.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.flutter.plugins.example
-
-import androidx.annotation.NonNull;
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugins.GeneratedPluginRegistrant
-
-class MainActivity: FlutterActivity() {
-    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
-    }
-}
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore b/packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore
deleted file mode 100644
index e96ef602b8d1..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/ios/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003d68..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index f9b0d7c5ea15..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003d68..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index f9b0d7c5ea15..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift
deleted file mode 100644
index 70693e4a8c12..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/AppDelegate.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import UIKit
-import Flutter
-
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h
deleted file mode 100644
index 308a2a560b42..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner/Runner-Bridging-Header.h
+++ /dev/null
@@ -1 +0,0 @@
-#import "GeneratedPluginRegistrant.h"
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
index da8306f90edc..c7b2c5ff6715 100644
--- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
@@ -11,7 +11,6 @@ dependencies:
   google_maps_flutter:
     path: ../
   flutter_plugin_android_lifecycle: ^1.0.0
-  google_maps: ^3.0.0
 
 dev_dependencies:
   flutter_driver:
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/favicon.png b/packages/google_maps_flutter/google_maps_flutter/example/web/favicon.png
deleted file mode 100644
index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 917
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7
zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2
zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l<c?^6clWVQqrt~T->1AfjnEK
zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o
z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo
zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8
zTYqUsf!gYFyJnXpu0!n&N*<mM6;!yDy;iI!?0xZxS-@9o){@>SYAX-%d(5<QWisP%
zpKxJ^!zO{CB{zx^b({)M+}nHh%-rj7^M&&ZcU$j%zjx;LVyDXoIuhq|8P;5s=KHG5
z<JUB4<A0$RmNJizixz(PY{v3_`K1HjE{oV$3+pLbhDf-dGF^GSkNIsaZ^^?aj@RFX
zmI#!cuT=hV*<Wg+koNS~T)(gK8EvWbJGDN%Cgswi@;rmS$PYP}{^d1_2Ol_C#PhDD
zFw$(<^hU$>gVjrHJWqXQshj@!<B9Fv+a9JEO;0$m^uEygb*U`#RIBf=|21JrRHoLF
zSVqsI&*oWt$jm+Fz?pMwCX>Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr
zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf
zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od
z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz
oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-192.png b/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-192.png
deleted file mode 100644
index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5292
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

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-512.png b/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-512.png
deleted file mode 100644
index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8252
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

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/index.html b/packages/google_maps_flutter/google_maps_flutter/example/web/index.html
deleted file mode 100644
index 365abcaaf7dd..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/web/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="A new Flutter project.">
-
-  <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="example">
-  <link rel="apple-touch-icon" href="/icons/Icon-192.png">
-
-  <!-- Favicon -->
-  <link rel="shortcut icon" type="image/png" href="/favicon.png"/>
-
-  <title>example</title>
-  <link rel="manifest" href="/manifest.json">
-</head>
-<body>
-  <!-- This script installs service_worker.js to provide PWA functionality to
-       application. For more information, see:
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
-  <script>
-    if ('serviceWorker' in navigator) {
-      window.addEventListener('load', function () {
-        navigator.serviceWorker.register('/flutter_service_worker.js');
-      });
-    }
-  </script>
-  <script src="main.dart.js" type="application/javascript"></script>
-  <script src="http://maps.googleapis.com/maps/api/js?key=API_KEY"></script>
-  <script defer src="page.dart.js"></script>
-</body>
-</html>
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json b/packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json
deleted file mode 100644
index c63800102369..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "example",
-    "short_name": "example",
-    "start_url": ".",
-    "display": "minimal-ui",
-    "background_color": "#0175C2",
-    "theme_color": "#0175C2",
-    "description": "A new Flutter project.",
-    "orientation": "portrait-primary",
-    "prefer_related_applications": false,
-    "icons": [
-        {
-            "src": "icons/Icon-192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ]
-}

From 99346d64c088e38f3ac57622b407d0451e3d877b Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 12:16:49 -0700
Subject: [PATCH 42/48] Remove .gitignore from example dir

---
 .../google_maps_flutter/example/.gitignore    | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter/example/.gitignore

diff --git a/packages/google_maps_flutter/google_maps_flutter/example/.gitignore b/packages/google_maps_flutter/google_maps_flutter/example/.gitignore
deleted file mode 100644
index 78b3c2b33643..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter/example/.gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Exceptions to above rules.
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

From f5a601393122b4dffedb6ebc6664fd8284342a96 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 13:59:55 -0700
Subject: [PATCH 43/48] Appease the analyzer.

---
 .../lib/src/types/bitmap.dart                               | 3 ---
 .../lib/src/types/camera.dart                               | 1 +
 .../lib/src/types/cap.dart                                  | 1 +
 .../lib/src/types/circle.dart                               | 1 +
 .../lib/src/types/circle_updates.dart                       | 6 ++++++
 .../lib/src/types/location.dart                             | 2 ++
 .../lib/src/types/marker.dart                               | 1 +
 .../lib/src/types/marker_updates.dart                       | 6 ++++++
 .../lib/src/types/pattern_item.dart                         | 1 +
 .../lib/src/types/polygon.dart                              | 1 +
 .../lib/src/types/polygon_updates.dart                      | 6 ++++++
 .../lib/src/types/polyline.dart                             | 1 +
 .../lib/src/types/polyline_updates.dart                     | 5 +++++
 .../lib/src/types/screen_coordinate.dart                    | 1 +
 .../lib/src/types/ui.dart                                   | 2 ++
 15 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
index 0fc07bc9e863..40581b43e065 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart
@@ -8,7 +8,6 @@ import 'dart:typed_data' show Uint8List;
 import 'package:flutter/material.dart'
     show ImageConfiguration, AssetImage, AssetBundleImageKey;
 import 'package:flutter/services.dart' show AssetBundle;
-import 'package:meta/meta.dart' show visibleForTesting;
 
 /// Defines a bitmap image. For a marker, this class can be used to set the
 /// image of the marker icon. For a ground overlay, it can be used to set the
@@ -113,7 +112,5 @@ class BitmapDescriptor {
   final dynamic _json;
 
   /// Convert the object to a Json format.
-  /// Used for testing only.
-  @visibleForTesting
   dynamic toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/camera.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/camera.dart
index f9ef3aa9aadb..10ea1e98846a 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/camera.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/camera.dart
@@ -192,5 +192,6 @@ class CameraUpdate {
 
   final dynamic _json;
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
index 922355a071e6..fa2e08a467a2 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
@@ -49,5 +49,6 @@ class Cap {
 
   final dynamic _json;
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle.dart
index c39acd1c41c5..d1418a4c30b1 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle.dart
@@ -123,6 +123,7 @@ class Circle {
   /// Creates a new [Circle] object whose values are the same as this instance.
   Circle clone() => copyWith();
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
index 5dd75d7cb40b..6f494423a38f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/circle_updates.dart
@@ -60,10 +60,16 @@ class CircleUpdates {
     circlesToChange = _circlesToChange;
   }
 
+  /// Set of Circles to be added in this update.
   Set<Circle> circlesToAdd;
+
+  /// Set of CircleIds to be removed in this update.
   Set<CircleId> circleIdsToRemove;
+
+  /// Set of Circles to be changed in this update.
   Set<Circle> circlesToChange;
 
+  /// Converts this object to something serializable in JSON.
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
index 34f78b911c40..f33437856406 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
@@ -27,6 +27,7 @@ class LatLng {
   /// The longitude in degrees between -180.0 (inclusive) and 180.0 (exclusive).
   final double longitude;
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() {
     return <double>[latitude, longitude];
   }
@@ -75,6 +76,7 @@ class LatLngBounds {
   /// The northeast corner of the rectangle.
   final LatLng northeast;
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() {
     return <dynamic>[southwest.toJson(), northeast.toJson()];
   }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker.dart
index fc8fd1e66031..9b57f9676334 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker.dart
@@ -267,6 +267,7 @@ class Marker {
   /// Creates a new [Marker] object whose values are the same as this instance.
   Marker clone() => copyWith();
 
+  /// Converts this object to something serializable in JSON.
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
index 4add2144e1bc..bb6ea8813ea3 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/marker_updates.dart
@@ -60,10 +60,16 @@ class MarkerUpdates {
     markersToChange = _markersToChange;
   }
 
+  /// Set of Markers to be added in this update.
   Set<Marker> markersToAdd;
+
+  /// Set of MarkerIds to be removed in this update.
   Set<MarkerId> markerIdsToRemove;
+
+  /// Set of Markers to be changed in this update.
   Set<Marker> markersToChange;
 
+  /// Converts this object to something serializable in JSON.
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
index 95de941e52dd..28c7ce9d33dd 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/pattern_item.dart
@@ -30,5 +30,6 @@ class PatternItem {
 
   final dynamic _json;
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() => _json;
 }
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon.dart
index a3e681868297..3b5e25060faf 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon.dart
@@ -131,6 +131,7 @@ class Polygon {
     return copyWith(pointsParam: List<LatLng>.of(points));
   }
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
index 8c69efe2b402..cc8b8e26c896 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polygon_updates.dart
@@ -60,10 +60,16 @@ class PolygonUpdates {
     polygonsToChange = _polygonsToChange;
   }
 
+  /// Set of Polygons to be added in this update.
   Set<Polygon> polygonsToAdd;
+
+  /// Set of PolygonIds to be removed in this update.
   Set<PolygonId> polygonIdsToRemove;
+
+  /// Set of Polygons to be changed in this update.
   Set<Polygon> polygonsToChange;
 
+  /// Converts this object to something serializable in JSON.
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline.dart
index 0798a00930e6..ae5c3b976352 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline.dart
@@ -173,6 +173,7 @@ class Polyline {
     );
   }
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() {
     final Map<String, dynamic> json = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
index df45653840c8..2c986c6e6043 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
@@ -61,8 +61,13 @@ class PolylineUpdates {
     polylinesToChange = _polylinesToChange;
   }
 
+  /// Set of Polylines to be added in this update.
   Set<Polyline> polylinesToAdd;
+
+  /// Set of PolylineIds to be removed in this update.
   Set<PolylineId> polylineIdsToRemove;
+
+  /// Set of Polylines to be changed in this update.
   Set<Polyline> polylinesToChange;
 
   Map<String, dynamic> toJson() {
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
index b9df42a86668..26525a2e8492 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
@@ -24,6 +24,7 @@ class ScreenCoordinate {
   /// Represents the number of pixels from the top of the [GoogleMap].
   final int y;
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() {
     return <String, int>{
       "x": x,
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
index 5d895e614b92..8d84171bac03 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/ui.dart
@@ -44,6 +44,7 @@ class CameraTargetBounds {
   /// Unbounded camera target.
   static const CameraTargetBounds unbounded = CameraTargetBounds(null);
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() => <dynamic>[bounds?.toJson()];
 
   @override
@@ -84,6 +85,7 @@ class MinMaxZoomPreference {
   static const MinMaxZoomPreference unbounded =
       MinMaxZoomPreference(null, null);
 
+  /// Converts this object to something serializable in JSON.
   dynamic toJson() => <dynamic>[minZoom, maxZoom];
 
   @override

From 545500b5646bbb3dda35bdc811c1cfe66253dd23 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 14:48:49 -0700
Subject: [PATCH 44/48] Appease analyze some more.

---
 .../lib/google_maps_flutter_platform_interface.dart         | 4 ++++
 .../lib/src/events/map_event.dart                           | 4 ++++
 .../lib/src/types/cap.dart                                  | 1 +
 .../lib/src/types/location.dart                             | 1 +
 .../lib/src/types/polyline_updates.dart                     | 1 +
 .../lib/src/types/screen_coordinate.dart                    | 1 +
 .../lib/src/types/types.dart                                | 5 ++++-
 .../lib/src/types/utils/circle.dart                         | 6 ++++++
 .../lib/src/types/utils/marker.dart                         | 6 ++++++
 .../lib/src/types/utils/polygon.dart                        | 6 ++++++
 .../lib/src/types/utils/polyline.dart                       | 6 ++++++
 11 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
index 3e2104434c9b..cb28b40470fd 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/google_maps_flutter_platform_interface.dart
@@ -1,3 +1,7 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 export 'src/platform_interface/google_maps_flutter_platform.dart';
 export 'src/types/types.dart';
 export 'src/events/map_event.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
index afc2c18d883f..e597be4d6213 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
@@ -1,3 +1,7 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 /// Basic event coming from the native side of Maps.
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
index fa2e08a467a2..68bf14c36408 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/cap.dart
@@ -1,6 +1,7 @@
 // Copyright 2019 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'package:meta/meta.dart' show immutable;
 
 import 'types.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
index f33437856406..6b76a6d496ac 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/location.dart
@@ -1,6 +1,7 @@
 // Copyright 2018 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'dart:ui' show hashValues;
 
 import 'package:meta/meta.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
index 2c986c6e6043..f871928c0ac4 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/polyline_updates.dart
@@ -70,6 +70,7 @@ class PolylineUpdates {
   /// Set of Polylines to be changed in this update.
   Set<Polyline> polylinesToChange;
 
+  /// Converts this object to something serializable in JSON.
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> updateMap = <String, dynamic>{};
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
index 26525a2e8492..965db7969bc2 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/screen_coordinate.dart
@@ -1,6 +1,7 @@
 // Copyright 2019 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 import 'dart:ui' show hashValues;
 
 import 'package:meta/meta.dart' show immutable, required;
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
index 0b13637ded74..e56c3a5dd646 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart
@@ -1,5 +1,8 @@
-// All the public types exposed by this package.
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
+// All the public types exposed by this package.
 export 'bitmap.dart';
 export 'callbacks.dart';
 export 'camera.dart';
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart
index 139af16adf43..5c3af96f8e02 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/circle.dart
@@ -1,5 +1,10 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import '../types.dart';
 
+/// Converts an [Iterable] of Circles in a Map of CircleId -> Circle.
 Map<CircleId, Circle> keyByCircleId(Iterable<Circle> circles) {
   if (circles == null) {
     return <CircleId, Circle>{};
@@ -8,6 +13,7 @@ Map<CircleId, Circle> keyByCircleId(Iterable<Circle> circles) {
       MapEntry<CircleId, Circle>(circle.circleId, circle.clone())));
 }
 
+/// Converts a Set of Circles into something serializable in JSON.
 List<Map<String, dynamic>> serializeCircleSet(Set<Circle> circles) {
   if (circles == null) {
     return null;
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart
index 62a2d115fe48..7a2c76d8055b 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/marker.dart
@@ -1,5 +1,10 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import '../types.dart';
 
+/// Converts an [Iterable] of Markers in a Map of MarkerId -> Marker.
 Map<MarkerId, Marker> keyByMarkerId(Iterable<Marker> markers) {
   if (markers == null) {
     return <MarkerId, Marker>{};
@@ -8,6 +13,7 @@ Map<MarkerId, Marker> keyByMarkerId(Iterable<Marker> markers) {
       MapEntry<MarkerId, Marker>(marker.markerId, marker.clone())));
 }
 
+/// Converts a Set of Markers into something serializable in JSON.
 List<Map<String, dynamic>> serializeMarkerSet(Set<Marker> markers) {
   if (markers == null) {
     return null;
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
index b865358af99b..9434ddaa077d 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polygon.dart
@@ -1,5 +1,10 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import '../types.dart';
 
+/// Converts an [Iterable] of Polygons in a Map of PolygonId -> Polygon.
 Map<PolygonId, Polygon> keyByPolygonId(Iterable<Polygon> polygons) {
   if (polygons == null) {
     return <PolygonId, Polygon>{};
@@ -8,6 +13,7 @@ Map<PolygonId, Polygon> keyByPolygonId(Iterable<Polygon> polygons) {
       MapEntry<PolygonId, Polygon>(polygon.polygonId, polygon.clone())));
 }
 
+/// Converts a Set of Polygons into something serializable in JSON.
 List<Map<String, dynamic>> serializePolygonSet(Set<Polygon> polygons) {
   if (polygons == null) {
     return null;
diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart
index 3f7256143988..9cef6319ddb5 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/polyline.dart
@@ -1,5 +1,10 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import '../types.dart';
 
+/// Converts an [Iterable] of Polylines in a Map of PolylineId -> Polyline.
 Map<PolylineId, Polyline> keyByPolylineId(Iterable<Polyline> polylines) {
   if (polylines == null) {
     return <PolylineId, Polyline>{};
@@ -9,6 +14,7 @@ Map<PolylineId, Polyline> keyByPolylineId(Iterable<Polyline> polylines) {
           polyline.polylineId, polyline.clone())));
 }
 
+/// Converts a Set of Polylines into something serializable in JSON.
 List<Map<String, dynamic>> serializePolylineSet(Set<Polyline> polylines) {
   if (polylines == null) {
     return null;

From 609200f26f90d88c7892a2696f5724a1329c09b2 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 15:03:53 -0700
Subject: [PATCH 45/48] Rename _controller to _mapEventStreamController

---
 .../method_channel_google_maps_flutter.dart   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 7273f04b2732..1c8f995c6c12 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -44,12 +44,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   //
   // It is a `broadcast` because multiple controllers will connect to
   // different stream views of this Controller.
-  final StreamController<MapEvent> _controller =
+  final StreamController<MapEvent> _mapEventStreamController =
       StreamController<MapEvent>.broadcast();
 
   // Returns a filtered view of the events in the _controller, by mapId.
   Stream<MapEvent> _events(int mapId) =>
-      _controller.stream.where((event) => event.mapId == mapId);
+      _mapEventStreamController.stream.where((event) => event.mapId == mapId);
 
   @override
   Stream<CameraMoveStartedEvent> onCameraMoveStarted({@required int mapId}) {
@@ -109,62 +109,62 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   Future<dynamic> _handleMethodCall(MethodCall call, int mapId) async {
     switch (call.method) {
       case 'camera#onMoveStarted':
-        _controller.add(CameraMoveStartedEvent(mapId));
+        _mapEventStreamController.add(CameraMoveStartedEvent(mapId));
         break;
       case 'camera#onMove':
-        _controller.add(CameraMoveEvent(
+        _mapEventStreamController.add(CameraMoveEvent(
           mapId,
           CameraPosition.fromMap(call.arguments['position']),
         ));
         break;
       case 'camera#onIdle':
-        _controller.add(CameraIdleEvent(mapId));
+        _mapEventStreamController.add(CameraIdleEvent(mapId));
         break;
       case 'marker#onTap':
-        _controller.add(MarkerTapEvent(
+        _mapEventStreamController.add(MarkerTapEvent(
           mapId,
           MarkerId(call.arguments['markerId']),
         ));
         break;
       case 'marker#onDragEnd':
-        _controller.add(MarkerDragEndEvent(
+        _mapEventStreamController.add(MarkerDragEndEvent(
           mapId,
           LatLng.fromJson(call.arguments['position']),
           MarkerId(call.arguments['markerId']),
         ));
         break;
       case 'infoWindow#onTap':
-        _controller.add(InfoWindowTapEvent(
+        _mapEventStreamController.add(InfoWindowTapEvent(
           mapId,
           MarkerId(call.arguments['markerId']),
         ));
         break;
       case 'polyline#onTap':
-        _controller.add(PolylineTapEvent(
+        _mapEventStreamController.add(PolylineTapEvent(
           mapId,
           PolylineId(call.arguments['polylineId']),
         ));
         break;
       case 'polygon#onTap':
-        _controller.add(PolygonTapEvent(
+        _mapEventStreamController.add(PolygonTapEvent(
           mapId,
           PolygonId(call.arguments['polygonId']),
         ));
         break;
       case 'circle#onTap':
-        _controller.add(CircleTapEvent(
+        _mapEventStreamController.add(CircleTapEvent(
           mapId,
           CircleId(call.arguments['circleId']),
         ));
         break;
       case 'map#onTap':
-        _controller.add(MapTapEvent(
+        _mapEventStreamController.add(MapTapEvent(
           mapId,
           LatLng.fromJson(call.arguments['position']),
         ));
         break;
       case 'map#onLongPress':
-        _controller.add(MapLongPressEvent(
+        _mapEventStreamController.add(MapLongPressEvent(
           mapId,
           LatLng.fromJson(call.arguments['position']),
         ));

From a3efd0fb785f69da4fb3610f64a63170d5a3ddab Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 16:14:40 -0700
Subject: [PATCH 46/48] Update some docs on the platform

---
 .../google_maps_flutter_platform.dart            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
index 8f1e9fc28379..b89d3420c68e 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/platform_interface/google_maps_flutter_platform.dart
@@ -15,13 +15,14 @@ import 'package:google_maps_flutter_platform_interface/src/method_channel/method
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
-/// The interface that implementations of google_maps_flutter must implement.
+/// The interface that platform-specific implementations of `google_maps_flutter` must extend.
 ///
-/// Platform implementations should extend this class rather than implement it as `google_maps_flutter`
-/// does not consider newly added methods to be breaking changes. Extending this class
-/// (using `extends`) ensures that the subclass will get the default implementation, while
-/// platform implementations that `implements` this interface will be broken by newly added
-/// [GoogleMapsFlutterPlatform] methods.
+/// Avoid `implements` of this interface. Using `implements` makes adding any new
+/// methods here a breaking change for end users of your platform!
+///
+/// Do `extends GoogleMapsFlutterPlatform` instead, so new methods added here are
+/// inherited in your code with the default implementation (that throws at runtime),
+/// rather than breaking your users at compile time.
 abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// Constructs a GoogleMapsFlutterPlatform.
   GoogleMapsFlutterPlatform() : super(token: _token);
@@ -146,9 +147,6 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface {
   /// style is left unchanged.
   ///
   /// The style string can be generated using [map style tool](https://mapstyle.withgoogle.com/).
-  /// Also, refer [iOS](https://developers.google.com/maps/documentation/ios-sdk/style-reference)
-  /// and [Android](https://developers.google.com/maps/documentation/android-sdk/style-reference)
-  /// style reference for more information regarding the supported styles.
   Future<void> setMapStyle(
     String mapStyle, {
     @required int mapId,

From 98e09524d0731f1fd73e7b495b336d5edb707956 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 16:28:18 -0700
Subject: [PATCH 47/48] Document MapEvent constructors.

---
 .../lib/src/events/map_event.dart             | 88 +++++++++++++++----
 1 file changed, 73 insertions(+), 15 deletions(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
index e597be4d6213..c462b4b182e2 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/events/map_event.dart
@@ -3,10 +3,37 @@
 // found in the LICENSE file.
 
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
+import 'package:google_maps_flutter_platform_interface/src/method_channel/method_channel_google_maps_flutter.dart';
 
-/// Basic event coming from the native side of Maps.
+/// Generic Event coming from the native side of Maps.
 ///
-/// All MapEvents contain the `mapId` that originated the event.
+/// All MapEvents contain the `mapId` that originated the event. This should
+/// never be `null`.
+///
+/// The `<T>` on this event represents the type of the `value` that is
+/// contained within the event.
+///
+/// This class is used as a base class for all the events that might be
+/// triggered from a Map, but it is never used directly as an event type.
+///
+/// Do NOT instantiate new events like `MapEvent<ValueType>(mapId, val)` directly,
+/// use a specific class instead:
+///
+/// Do `class NewEvent extend MapEvent<ValueType>` when creating your own events.
+/// See below for examples: `CameraMoveStartedEvent`, `MarkerDragEndEvent`...
+/// These events are more semantic and pleasant to use than raw generics. They
+/// can be (and in fact, are) filtered by the `instanceof`-operator.
+///
+/// (See [MethodChannelGoogleMapsFlutter.onCameraMoveStarted], for example)
+///
+/// If your event needs a `position`, alongside the `value`, do
+/// `extends _PositionedMapEvent<ValueType>` instead. This adds a `LatLng position`
+/// attribute.
+///
+/// If your event *only* needs a `position`, do `extend _PositionedMapEvent<void>`
+/// do NOT `extend MapEvent<LatLng>`. The former lets consumers of these
+/// events to access the `.position` property, rather than the more generic `.value`
+/// yielded from the latter.
 class MapEvent<T> {
   /// The ID of the Map this event is associated to.
   final int mapId;
@@ -14,7 +41,10 @@ class MapEvent<T> {
   /// The value wrapped by this event
   final T value;
 
-  /// Constructor
+  /// Build a Map Event, that relates a mapId with a given value.
+  ///
+  /// The `mapId` is the id of the map that triggered the event.
+  /// `value` may be `null` in events that don't transport any meaningful data.
   MapEvent(this.mapId, this.value);
 }
 
@@ -23,73 +53,101 @@ class _PositionedMapEvent<T> extends MapEvent<T> {
   /// The position where this event happened.
   final LatLng position;
 
-  /// Constructor
+  /// Build a Positioned MapEvent, that relates a mapId and a position with a value.
+  ///
+  /// The `mapId` is the id of the map that triggered the event.
+  /// `value` may be `null` in events that don't transport any meaningful data.
   _PositionedMapEvent(int mapId, this.position, T value) : super(mapId, value);
 }
 
+// The following events are the ones exposed to the end user. They are semantic extensions
+// of the two base classes above.
+//
+// These events are used to create the appropriate [Stream] objects, with information
+// coming from the native side.
+
 /// An event fired when the Camera of a [mapId] starts moving.
 class CameraMoveStartedEvent extends MapEvent<void> {
-  /// Constructor
+  /// Build a CameraMoveStarted Event triggered from the map represented by `mapId`.
   CameraMoveStartedEvent(int mapId) : super(mapId, null);
 }
 
 /// An event fired while the Camera of a [mapId] moves.
 class CameraMoveEvent extends MapEvent<CameraPosition> {
-  /// Constructor
+  /// Build a CameraMove Event triggered from the map represented by `mapId`.
+  ///
+  /// The `value` of this event is a [CameraPosition] object with the current position of the Camera.
   CameraMoveEvent(int mapId, CameraPosition position) : super(mapId, position);
 }
 
 /// An event fired when the Camera of a [mapId] becomes idle.
 class CameraIdleEvent extends MapEvent<void> {
-  /// Constructor
+  /// Build a CameraIdle Event triggered from the map represented by `mapId`.
   CameraIdleEvent(int mapId) : super(mapId, null);
 }
 
 /// An event fired when a [Marker] is tapped.
 class MarkerTapEvent extends MapEvent<MarkerId> {
-  /// Constructor
+  /// Build a MarkerTap Event triggered from the map represented by `mapId`.
+  ///
+  /// The `value` of this event is a [MarkerId] object that represents the tapped Marker.
   MarkerTapEvent(int mapId, MarkerId markerId) : super(mapId, markerId);
 }
 
 /// An event fired when an [InfoWindow] is tapped.
 class InfoWindowTapEvent extends MapEvent<MarkerId> {
-  /// Constructor
+  /// Build an InfoWindowTap Event triggered from the map represented by `mapId`.
+  ///
+  /// The `value` of this event is a [MarkerId] object that represents the tapped InfoWindow.
   InfoWindowTapEvent(int mapId, MarkerId markerId) : super(mapId, markerId);
 }
 
 /// An event fired when a [Marker] is dragged to a new [LatLng].
 class MarkerDragEndEvent extends _PositionedMapEvent<MarkerId> {
-  /// Constructor
+  /// Build a MarkerDragEnd Event triggered from the map represented by `mapId`.
+  ///
+  /// The `position` on this event is the [LatLng] on which the Marker was dropped.
+  /// The `value` of this event is a [MarkerId] object that represents the moved Marker.
   MarkerDragEndEvent(int mapId, LatLng position, MarkerId markerId)
       : super(mapId, position, markerId);
 }
 
 /// An event fired when a [Polyline] is tapped.
 class PolylineTapEvent extends MapEvent<PolylineId> {
-  /// Constructor
+  /// Build an PolylineTap Event triggered from the map represented by `mapId`.
+  ///
+  /// The `value` of this event is a [PolylineId] object that represents the tapped Polyline.
   PolylineTapEvent(int mapId, PolylineId polylineId) : super(mapId, polylineId);
 }
 
 /// An event fired when a [Polygon] is tapped.
 class PolygonTapEvent extends MapEvent<PolygonId> {
-  /// Constructor
+  /// Build an PolygonTap Event triggered from the map represented by `mapId`.
+  ///
+  /// The `value` of this event is a [PolygonId] object that represents the tapped Polygon.
   PolygonTapEvent(int mapId, PolygonId polygonId) : super(mapId, polygonId);
 }
 
 /// An event fired when a [Circle] is tapped.
 class CircleTapEvent extends MapEvent<CircleId> {
-  /// Constructor
+  /// Build an CircleTap Event triggered from the map represented by `mapId`.
+  ///
+  /// The `value` of this event is a [CircleId] object that represents the tapped Circle.
   CircleTapEvent(int mapId, CircleId circleId) : super(mapId, circleId);
 }
 
 /// An event fired when a Map is tapped.
 class MapTapEvent extends _PositionedMapEvent<void> {
-  /// Constructor
+  /// Build an MapTap Event triggered from the map represented by `mapId`.
+  ///
+  /// The `position` of this event is the LatLng where the Map was tapped.
   MapTapEvent(int mapId, LatLng position) : super(mapId, position, null);
 }
 
 /// An event fired when a Map is long pressed.
 class MapLongPressEvent extends _PositionedMapEvent<void> {
-  /// Constructor
+  /// Build an MapTap Event triggered from the map represented by `mapId`.
+  ///
+  /// The `position` of this event is the LatLng where the Map was long pressed.
   MapLongPressEvent(int mapId, LatLng position) : super(mapId, position, null);
 }

From 5057b0abca700f046b7550fc18624d689d45f382 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Fri, 3 Apr 2020 17:53:32 -0700
Subject: [PATCH 48/48] Document method_channel class

---
 .../method_channel_google_maps_flutter.dart           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
index 1c8f995c6c12..edbc51ab5afd 100644
--- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart
@@ -13,7 +13,16 @@ import 'package:flutter/gestures.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 import 'package:stream_transform/stream_transform.dart';
 
-/// An implementation of [GoogleMapsFlutterPlatform] that uses method channels.
+/// An implementation of [GoogleMapsFlutterPlatform] that uses [MethodChannel] to communicate with the native code.
+///
+/// The `google_maps_flutter` plugin code itself never talks to the native code directly. It delegates
+/// all those calls to an instance of a class that extends the GoogleMapsFlutterPlatform.
+///
+/// The architecture above allows for platforms that communicate differently with the native side
+/// (like web) to have a common interface to extend.
+///
+/// This is the instance that runs when the native side talks to your Flutter app through MethodChannels,
+/// like the Android and iOS platforms.
 class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
   // Keep a collection of id -> channel
   // Every method call passes the int mapId