From 15a6ba7847049ae139900e342e5f748671f3c2f2 Mon Sep 17 00:00:00 2001
From: duzenko <anton.duzenko@gmail.com>
Date: Mon, 1 Jul 2019 15:28:15 +0300
Subject: [PATCH 1/3] Allow (de-)serialization of CameraPosition

---
 packages/google_maps_flutter/lib/src/camera.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/lib/src/camera.dart b/packages/google_maps_flutter/lib/src/camera.dart
index ceb4289ca663..6c75475afbfe 100644
--- a/packages/google_maps_flutter/lib/src/camera.dart
+++ b/packages/google_maps_flutter/lib/src/camera.dart
@@ -51,14 +51,13 @@ class CameraPosition {
   /// will be silently clamped to the supported range.
   final double zoom;
 
-  dynamic _toMap() => <String, dynamic>{
+  dynamic toMap() => <String, dynamic>{
         'bearing': bearing,
         'target': target._toJson(),
         'tilt': tilt,
         'zoom': zoom,
       };
 
-  @visibleForTesting
   static CameraPosition fromMap(dynamic json) {
     if (json == null) {
       return null;

From f9959030316d5ed92788b9b308f3e934b6193f4e Mon Sep 17 00:00:00 2001
From: duzenko <anton.duzenko@gmail.com>
Date: Mon, 1 Jul 2019 15:43:39 +0300
Subject: [PATCH 2/3] Camera position toMap use fixes

---
 packages/google_maps_flutter/lib/src/camera.dart     | 2 +-
 packages/google_maps_flutter/lib/src/google_map.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/google_maps_flutter/lib/src/camera.dart b/packages/google_maps_flutter/lib/src/camera.dart
index 6c75475afbfe..78d624b76f50 100644
--- a/packages/google_maps_flutter/lib/src/camera.dart
+++ b/packages/google_maps_flutter/lib/src/camera.dart
@@ -97,7 +97,7 @@ class CameraUpdate {
   /// Returns a camera update that moves the camera to the specified position.
   static CameraUpdate newCameraPosition(CameraPosition cameraPosition) {
     return CameraUpdate._(
-      <dynamic>['newCameraPosition', cameraPosition._toMap()],
+      <dynamic>['newCameraPosition', cameraPosition.toMap()],
     );
   }
 
diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart
index bb20d4657d5b..6e85ed29fb5d 100644
--- a/packages/google_maps_flutter/lib/src/google_map.dart
+++ b/packages/google_maps_flutter/lib/src/google_map.dart
@@ -188,7 +188,7 @@ class _GoogleMapState extends State<GoogleMap> {
   @override
   Widget build(BuildContext context) {
     final Map<String, dynamic> creationParams = <String, dynamic>{
-      'initialCameraPosition': widget.initialCameraPosition?._toMap(),
+      'initialCameraPosition': widget.initialCameraPosition?.toMap(),
       'options': _googleMapOptions.toMap(),
       'markersToAdd': _serializeMarkerSet(widget.markers),
       'polygonsToAdd': _serializePolygonSet(widget.polygons),

From 88a62319a58e3f5c0d17716a832b92b53235dcf0 Mon Sep 17 00:00:00 2001
From: duzenko <anton.duzenko@gmail.com>
Date: Fri, 12 Jul 2019 13:19:19 +0300
Subject: [PATCH 3/3] Updated the pubspec and changelog

---
 packages/google_maps_flutter/CHANGELOG.md | 4 ++++
 packages/google_maps_flutter/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index 484226649e7e..95b7fedd0d7f 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.19+3
+
+* Allow (de-)serialization of CameraPosition
+
 ## 0.5.19+2
 
 * Fix polygons for iOS
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 11e70eaf34f6..154934bd338f 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.19+2
+version: 0.5.19+3
 
 dependencies:
   flutter: