From 21d47f7b4c1686f84d172c4519a84ede02d1e369 Mon Sep 17 00:00:00 2001 From: liorboyango Date: Fri, 12 Mar 2021 12:01:48 +0200 Subject: [PATCH 1/3] Added tileProvider to TileOverlay#copyWith - this fixes tileProvider not being cloned inside the TileOverlay object, which broke the TileOverlay; Fixed a runtime cast exception in the example tile_overlay.dart; --- .../google_maps_flutter/example/lib/tile_overlay.dart | 6 +++--- .../lib/src/types/tile_overlay.dart | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart index 8ae3b3bca979..a01f6b02d6d6 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/tile_overlay.dart @@ -67,8 +67,8 @@ class TileOverlayBodyState extends State { @override Widget build(BuildContext context) { - Set overlays = { - if (_tileOverlay != null) _tileOverlay, + Set overlays = { + if (_tileOverlay != null) _tileOverlay!, }; return Column( mainAxisSize: MainAxisSize.min, @@ -84,7 +84,7 @@ class TileOverlayBodyState extends State { target: LatLng(59.935460, 30.325177), zoom: 7.0, ), - tileOverlays: overlays as Set, + tileOverlays: overlays, onMapCreated: _onMapCreated, ), ), diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/tile_overlay.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/tile_overlay.dart index e31bfb461fb4..fc582d51c209 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/tile_overlay.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/tile_overlay.dart @@ -91,6 +91,7 @@ class TileOverlay implements MapsObject { /// unless overwritten by the specified parameters. TileOverlay copyWith({ bool? fadeInParam, + TileProvider? tileProviderParam, double? transparencyParam, int? zIndexParam, bool? visibleParam, @@ -99,6 +100,7 @@ class TileOverlay implements MapsObject { return TileOverlay( tileOverlayId: tileOverlayId, fadeIn: fadeInParam ?? fadeIn, + tileProvider: tileProviderParam ?? tileProvider, transparency: transparencyParam ?? transparency, zIndex: zIndexParam ?? zIndex, visible: visibleParam ?? visible, From 0e6b8f5f9c05b18e0650f13397738656783214fb Mon Sep 17 00:00:00 2001 From: liorboyango Date: Fri, 12 Mar 2021 12:29:00 +0200 Subject: [PATCH 2/3] Use commit 21d47f7; --- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 5 ++++- 1 file changed, 4 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 d30c9d030de6..1c0310be4dc1 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -7,7 +7,10 @@ dependencies: flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.0 - google_maps_flutter_platform_interface: ^2.0.0 + google_maps_flutter_platform_interface: + git: + url: https://github.com/liorboyango/plugins.git + path: packages/google_maps_flutter/google_maps_flutter_platform_interface dev_dependencies: flutter_test: From 5986f0faf0ef5edd29465b448aab7f14072a8377 Mon Sep 17 00:00:00 2001 From: liorboyango Date: Fri, 12 Mar 2021 12:32:02 +0200 Subject: [PATCH 3/3] Reverted last commit; --- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 1c0310be4dc1..d30c9d030de6 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -7,10 +7,7 @@ dependencies: flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.0 - google_maps_flutter_platform_interface: - git: - url: https://github.com/liorboyango/plugins.git - path: packages/google_maps_flutter/google_maps_flutter_platform_interface + google_maps_flutter_platform_interface: ^2.0.0 dev_dependencies: flutter_test: