From 857ed82dd552c54a66d01d6b76224e076a84fecd Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 21 Jan 2021 18:07:44 -0800 Subject: [PATCH 1/3] minor fixes --- .../method_channel_google_maps_flutter.dart | 10 +++++++--- .../lib/src/types/types.dart | 1 + 2 files changed, 8 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 0ebfad5b5137..406d9b624da6 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/foundation.dart'; 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:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:stream_transform/stream_transform.dart'; import '../types/tile_overlay_updates.dart'; @@ -193,9 +194,12 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { final Map tileOverlaysForThisMap = _tileOverlays[mapId]; final String tileOverlayId = call.arguments['tileOverlayId']; - final TileOverlay tileOverlay = tileOverlaysForThisMap[tileOverlayId]; - assert(tileOverlay.tileProvider.getTile != null); - final Tile tile = await tileOverlay.tileProvider.getTile( + final TileOverlay tileOverlay = tileOverlaysForThisMap[TileOverlayId(tileOverlayId)]; + Tile tile; + if (tileOverlay == null || tileOverlay.tileProvider == null) { + return TileProvider.noTile.toJson(); + } + tile = await tileOverlay.tileProvider.getTile( call.arguments['x'], call.arguments['y'], call.arguments['zoom'], 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 e4b5c0bc3ab2..9ff271fd48bb 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 @@ -29,3 +29,4 @@ export 'utils/circle.dart'; export 'utils/marker.dart'; export 'utils/polygon.dart'; export 'utils/polyline.dart'; +export 'utils/tile_overlay.dart'; \ No newline at end of file From c9bbd6b873ab86c89ee049be8c0951cef025c603 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 21 Jan 2021 18:08:21 -0800 Subject: [PATCH 2/3] format --- .../src/method_channel/method_channel_google_maps_flutter.dart | 3 ++- .../lib/src/types/types.dart | 2 +- 2 files changed, 3 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 406d9b624da6..10fadc8333bb 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 @@ -194,7 +194,8 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { final Map tileOverlaysForThisMap = _tileOverlays[mapId]; final String tileOverlayId = call.arguments['tileOverlayId']; - final TileOverlay tileOverlay = tileOverlaysForThisMap[TileOverlayId(tileOverlayId)]; + final TileOverlay tileOverlay = + tileOverlaysForThisMap[TileOverlayId(tileOverlayId)]; Tile tile; if (tileOverlay == null || tileOverlay.tileProvider == null) { return TileProvider.noTile.toJson(); 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 9ff271fd48bb..3e2002f80ae3 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 @@ -29,4 +29,4 @@ export 'utils/circle.dart'; export 'utils/marker.dart'; export 'utils/polygon.dart'; export 'utils/polyline.dart'; -export 'utils/tile_overlay.dart'; \ No newline at end of file +export 'utils/tile_overlay.dart'; From db54cf9658a753b35380a5c0d4149ef575a27d0f Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 21 Jan 2021 19:15:37 -0800 Subject: [PATCH 3/3] fix ci --- .../src/method_channel/method_channel_google_maps_flutter.dart | 1 - 1 file changed, 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 10fadc8333bb..8b7af2cc3515 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,7 +10,6 @@ import 'package:flutter/foundation.dart'; 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:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:stream_transform/stream_transform.dart'; import '../types/tile_overlay_updates.dart';