From f2e9806c6b70a499db08a8a9ca72a59afa7586eb Mon Sep 17 00:00:00 2001 From: Rexios Date: Wed, 13 Apr 2022 18:27:14 -0400 Subject: [PATCH 01/94] Worked on platform interface --- .../method_channel_google_maps_flutter.dart | 16 +++ .../google_maps_flutter_platform.dart | 16 +++ .../lib/src/types/heatmap_layer.dart | 128 ++++++++++++++++++ .../lib/src/types/heatmap_layer_updates.dart | 27 ++++ .../lib/src/types/location.dart | 42 ++++++ .../lib/src/types/types.dart | 3 + .../lib/src/types/utils/heatmap_layer.dart | 20 +++ .../google_maps_flutter_platform_test.dart | 1 + 8 files changed, 253 insertions(+) create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart 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 99f4fddaccd3..5089a63f9a59 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 @@ -324,6 +324,18 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { ); } + @override + Future updateHeatmapLayers( + HeatmapLayerUpdates heatmapLayerUpdates, { + required int mapId, + }) { + assert(heatmapLayerUpdates != null); + return channel(mapId).invokeMethod( + 'heatmapLayers#update', + heatmapLayerUpdates.toJson(), + ); + } + @override Future updateTileOverlays({ required Set newTileOverlays, @@ -490,6 +502,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers, Map mapOptions = const {}, @@ -501,6 +514,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { 'polygonsToAdd': serializePolygonSet(polygons), 'polylinesToAdd': serializePolylineSet(polylines), 'circlesToAdd': serializeCircleSet(circles), + 'heatmapLayersToAdd': serializeHeatmapLayerSet(heatmapLayers), 'tileOverlaysToAdd': serializeTileOverlaySet(tileOverlays), }; @@ -572,6 +586,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers, Map mapOptions = const {}, @@ -585,6 +600,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { polygons: polygons, polylines: polylines, circles: circles, + heatmapLayers: heatmapLayers, tileOverlays: tileOverlays, gestureRecognizers: gestureRecognizers, mapOptions: mapOptions, 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 6b39973134be..ab2ade3f61c1 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 @@ -115,6 +115,19 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { throw UnimplementedError('updateCircles() has not been implemented.'); } + /// Updates heatmap layer 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 updateHeatmapLayers( + HeatmapLayerUpdates heatmapLayerUpdates, { + required int mapId, + }) { + throw UnimplementedError('updateHeatmapLayers() has not been implemented.'); + } + /// Updates tile overlay configuration. /// /// Change listeners are notified once the update has been made on the @@ -357,6 +370,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, @@ -385,6 +399,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers, Map mapOptions = const {}, @@ -397,6 +412,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { polygons: polygons, polylines: polylines, circles: circles, + heatmapLayers: heatmapLayers, tileOverlays: tileOverlays, gestureRecognizers: gestureRecognizers, mapOptions: mapOptions, diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart new file mode 100644 index 000000000000..822232a3a4c3 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart @@ -0,0 +1,128 @@ +// Copyright 2013 The Flutter 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:flutter/foundation.dart' show listEquals; +import 'package:flutter/material.dart' show Color; +import 'package:flutter/foundation.dart' show immutable; + +import 'types.dart'; + +/// Uniquely identifies a [HeatmapLayer] among [GoogleMap] heatmap layers. +/// +/// This does not have to be globally unique, only unique among the list. +@immutable +class HeatmapLayerId extends MapsObjectId { + /// Creates an immutable identifier for a [HeatmapLayer]. + const HeatmapLayerId(String value) : super(value); +} + +/// Draws a heatmap layer on the map. +@immutable +class HeatmapLayer implements MapsObject { + /// Creates an immutable representation of a [HeatmapLayer] to draw on + /// [GoogleMap]. + const HeatmapLayer({ + required this.heatmapLayerId, + this.data = const [], + this.dissipating = true, + this.gradient, + this.maxIntensity, + this.opacity = 0.6, + this.radius, + }); + + /// Uniquely identifies a [HeatmapLayer]. + final HeatmapLayerId heatmapLayerId; + + @override + HeatmapLayerId get mapsId => heatmapLayerId; + + /// The data points to display. + final List data; + + /// Specifies whether heatmaps dissipate on zoom. By default, the radius of + /// influence of a data point is specified by the radius option only. When + /// dissipating is disabled, the radius option is interpreted as a radius at + /// zoom level 0. + final bool dissipating; + + /// The color gradient of the heatmap + final List? gradient; + + /// The maximum intensity of the heatmap. By default, heatmap colors are + /// dynamically scaled according to the greatest concentration of points at + /// any particular pixel on the map. This property allows you to specify a + /// fixed maximum. + final double? maxIntensity; + + /// The opacity of the heatmap, expressed as a number between 0 and 1. + /// Defaults to 0.6. + final double opacity; + + /// The radius of influence for each data point, in pixels. + final double? radius; + + /// Creates a new [HeatmapLayer] object whose values are the same as this + /// instance, unless overwritten by the specified parameters. + HeatmapLayer copyWith({ + List? dataParam, + bool? dissipatingParam, + List? gradientParam, + double? maxIntensityParam, + double? opacityParam, + double? radiusParam, + }) { + return HeatmapLayer( + heatmapLayerId: heatmapLayerId, + data: dataParam ?? data, + dissipating: dissipatingParam ?? dissipating, + gradient: gradientParam ?? gradient, + maxIntensity: maxIntensityParam ?? maxIntensity, + opacity: opacityParam ?? opacity, + radius: radiusParam ?? radius, + ); + } + + /// Creates a new [HeatmapLayer] object whose values are the same as this + /// instance. + HeatmapLayer clone() => copyWith(); + + /// Converts this object to something serializable in JSON. + Object toJson() { + final Map json = {}; + + void addIfPresent(String fieldName, Object? value) { + if (value != null) { + json[fieldName] = value; + } + } + + addIfPresent('heatmapLayerId', heatmapLayerId.value); + addIfPresent('data', data.map((e) => e.toJson())); + addIfPresent('dissipating', dissipating); + addIfPresent('gradient', gradient?.map((e) => e.value)); + addIfPresent('maxIntensity', maxIntensity); + addIfPresent('opacity', opacity); + addIfPresent('radius', radius); + + return json; + } + + @override + bool operator ==(Object other) { + if (identical(this, other)) return true; + if (other.runtimeType != runtimeType) return false; + final HeatmapLayer typedOther = other as HeatmapLayer; + return heatmapLayerId == typedOther.heatmapLayerId && + listEquals(data, typedOther.data) && + dissipating == typedOther.dissipating && + listEquals(gradient, typedOther.gradient) && + maxIntensity == typedOther.maxIntensity && + opacity == typedOther.opacity && + radius == typedOther.radius; + } + + @override + int get hashCode => heatmapLayerId.hashCode; +} diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart new file mode 100644 index 000000000000..4a750c7f8101 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart @@ -0,0 +1,27 @@ +// Copyright 2013 The Flutter 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'; + +/// [HeatmapLayer] update events to be applied to the [GoogleMap]. +/// +/// Used in [GoogleMapController] when the map is updated. +// (Do not re-export) +class HeatmapLayerUpdates extends MapsObjectUpdates { + /// Computes [HeatmapLayerUpdates] given previous and current [HeatmapLayer]s. + HeatmapLayerUpdates.from( + Set previous, + Set current, + ) : super.from(previous, current, objectName: 'heatmapLayer'); + + /// Set of HeatmapLayers to be added in this update. + Set get heatmapLayersToAdd => objectsToAdd; + + /// Set of HeatmapLayers to be removed in this update. + Set get heatmapLayerIdsToRemove => + objectIdsToRemove.cast(); + + /// Set of HeatmapLayers to be changed in this update. + Set get heatmapLayersToChange => objectsToChange; +} 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 5bc4ca608f1a..7f51a2d101f8 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 @@ -132,3 +132,45 @@ class LatLngBounds { @override int get hashCode => Object.hash(southwest, northeast); } + +/// A data point entry for a heatmap. +/// This is a geographical data point with a weight attribute. +class WeightedLatLng { + /// The location of the data point. + final LatLng location; + + /// The weighting value of the data point. + final double weight; + + /// Creates a [WeightedLatLng] with the specified [weight] + WeightedLatLng(this.location, {this.weight = 1.0}); + + /// Converts this object to something serializable in JSON. + Object toJson() { + return [location.toJson(), weight]; + } + + /// Initialize a [WeightedLatLng] from an \[location, weight\] array. + static WeightedLatLng? fromJson(Object? json) { + if (json == null) { + return null; + } + assert(json is List && json.length == 2); + final list = json as List; + return WeightedLatLng( + LatLng.fromJson(list[0])!, + weight: list[1], + ); + } + + @override + String toString() => '$runtimeType($location, $weight)'; + + @override + bool operator ==(Object o) { + return o is WeightedLatLng && o.location == location && o.weight == weight; + } + + @override + int get hashCode => Object.hash(location, weight); +} 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 5e2e4c234ccf..02093237a25f 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 @@ -9,6 +9,8 @@ export 'camera.dart'; export 'cap.dart'; export 'circle_updates.dart'; export 'circle.dart'; +export 'heatmap_layer_updates.dart'; +export 'heatmap_layer.dart'; export 'joint_type.dart'; export 'location.dart'; export 'maps_object_updates.dart'; @@ -28,6 +30,7 @@ export 'ui.dart'; // Export the utils, they're used by the Widget export 'utils/circle.dart'; +export 'utils/heatmap_layer.dart'; export 'utils/marker.dart'; export 'utils/polygon.dart'; export 'utils/polyline.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart new file mode 100644 index 000000000000..99e466fb5eaa --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart @@ -0,0 +1,20 @@ +// Copyright 2013 The Flutter 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'; +import 'maps_object.dart'; + +/// Converts an [Iterable] of HeatmapLayers in a Map of +/// HeatmapLayerId -> HeatmapLayer. +Map keyByHeatmapLayerId( + Iterable heatmapLayers, +) { + return keyByMapsObjectId(heatmapLayers) + .cast(); +} + +/// Converts a Set of HeatmapLayers into something serializable in JSON. +Object serializeHeatmapLayerSet(Set heatmapLayers) { + return serializeMapsObjectSet(heatmapLayers); +} diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart index c381f9e30750..0344508351bf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart @@ -80,6 +80,7 @@ class BuildViewGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, From 2203401354c7d4ebd53db9a8b80cf4b0162befb5 Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 12:15:54 -0400 Subject: [PATCH 02/94] Added heatmap layer code to web --- .../google_maps_flutter/pubspec.yaml | 3 +- .../test/map_creation_test.dart | 7 ++ .../lib/google_maps_flutter_web.dart | 3 + .../lib/src/convert.dart | 13 ++++ .../lib/src/google_maps_controller.dart | 26 +++++++ .../lib/src/google_maps_flutter_web.dart | 11 +++ .../lib/src/heatmap_layer.dart | 35 +++++++++ .../lib/src/heatmap_layers.dart | 74 +++++++++++++++++++ .../google_maps_flutter_web/pubspec.yaml | 3 +- 9 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart create mode 100644 packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 741fe6910037..8e2047f19f56 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -21,7 +21,8 @@ dependencies: flutter: sdk: flutter flutter_plugin_android_lifecycle: ^2.0.1 - google_maps_flutter_platform_interface: ^2.1.2 + 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/test/map_creation_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/map_creation_test.dart index 73e1e77646cd..f5912a4fd290 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/map_creation_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/map_creation_test.dart @@ -117,6 +117,12 @@ class TestGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform { required int mapId, }) async {} + @override + Future updateHeatmapLayers( + HeatmapLayerUpdates heatmapLayerUpdates, { + required int mapId, + }) async {} + @override Future updateTileOverlays({ required Set newTileOverlays, @@ -284,6 +290,7 @@ class TestGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart index 0355f2923528..36eca77ac88a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart @@ -24,6 +24,7 @@ import 'package:stream_transform/stream_transform.dart'; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:google_maps/google_maps.dart' as gmaps; +import 'package:google_maps/google_maps_visualization.dart' as gmaps_visualization; import 'src/third_party/to_screen_location/to_screen_location.dart'; import 'src/types.dart'; @@ -32,6 +33,8 @@ part 'src/google_maps_flutter_web.dart'; part 'src/google_maps_controller.dart'; part 'src/circle.dart'; part 'src/circles.dart'; +part 'src/heatmap_layer.dart'; +part 'src/heatmap_layers.dart'; part 'src/polygon.dart'; part 'src/polygons.dart'; part 'src/polyline.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index c026a03be804..e23200a72ba2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -277,6 +277,19 @@ gmaps.CircleOptions _circleOptionsFromCircle(Circle circle) { return circleOptions; } +gmaps_visualization.HeatmapLayerOptions _heatmapLayerOptionsFromHeatmapLayer( + HeatmapLayer heatmapLayer, +) { + final heatmapLayerOptions = gmaps_visualization.HeatmapLayerOptions() + ..data = heatmapLayer.data + ..dissipating = heatmapLayer.dissipating + ..gradient = heatmapLayer.gradient?.map(_getCssColor).toList() + ..maxIntensity = heatmapLayer.maxIntensity + ..opacity = heatmapLayer.opacity + ..radius = heatmapLayer.radius; + return heatmapLayerOptions; +} + gmaps.PolygonOptions _polygonOptionsFromPolygon( gmaps.GMap googleMap, Polygon polygon) { List path = []; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart index edf47764f346..9a06ebcede26 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart @@ -19,6 +19,7 @@ class GoogleMapController { final Set _polygons; final Set _polylines; final Set _circles; + final Set _heatmapLayers; // The raw options passed by the user, before converting to gmaps. // Caching this allows us to re-create the map faithfully when needed. Map _rawMapOptions = {}; @@ -62,6 +63,7 @@ class GoogleMapController { // Geometry controllers, for different features of the map. CirclesController? _circlesController; + HeatmapLayersController? _heatmapLayersController; PolygonsController? _polygonsController; PolylinesController? _polylinesController; MarkersController? _markersController; @@ -80,6 +82,7 @@ class GoogleMapController { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set> gestureRecognizers = const >{}, @@ -91,8 +94,11 @@ class GoogleMapController { _polygons = polygons, _polylines = polylines, _circles = circles, + _heatmapLayers = heatmapLayers, _rawMapOptions = mapOptions { _circlesController = CirclesController(stream: this._streamController); + _heatmapLayersController = + HeatmapLayersController(stream: this._streamController); _polygonsController = PolygonsController(stream: this._streamController); _polylinesController = PolylinesController(stream: this._streamController); _markersController = MarkersController(stream: this._streamController); @@ -117,12 +123,14 @@ class GoogleMapController { DebugCreateMapFunction? createMap, MarkersController? markers, CirclesController? circles, + HeatmapLayersController? heatmapLayers, PolygonsController? polygons, PolylinesController? polylines, }) { _overrideCreateMap = createMap; _markersController = markers ?? _markersController; _circlesController = circles ?? _circlesController; + _heatmapLayersController = heatmapLayers ?? _heatmapLayersController; _polygonsController = polygons ?? _polygonsController; _polylinesController = polylines ?? _polylinesController; } @@ -176,6 +184,7 @@ class GoogleMapController { _renderInitialGeometry( markers: _markers, circles: _circles, + heatmapLayers: _heatmapLayers, polygons: _polygons, polylines: _polylines, ); @@ -226,6 +235,8 @@ class GoogleMapController { // null. assert(_circlesController != null, 'Cannot attach a map to a null CirclesController instance.'); + assert(_heatmapLayersController != null, + 'Cannot attach a map to a null HeatmapLayersController instance.'); assert(_polygonsController != null, 'Cannot attach a map to a null PolygonsController instance.'); assert(_polylinesController != null, @@ -234,6 +245,7 @@ class GoogleMapController { 'Cannot attach a map to a null MarkersController instance.'); _circlesController!.bindToMap(_mapId, map); + _heatmapLayersController!.bindToMap(_mapId, map); _polygonsController!.bindToMap(_mapId, map); _polylinesController!.bindToMap(_mapId, map); _markersController!.bindToMap(_mapId, map); @@ -245,6 +257,7 @@ class GoogleMapController { void _renderInitialGeometry({ Set markers = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set polygons = const {}, Set polylines = const {}, }) { @@ -259,6 +272,7 @@ class GoogleMapController { _markersController!.addMarkers(markers); _circlesController!.addCircles(circles); + _heatmapLayersController!.addHeatmapLayers(heatmapLayers); _polygonsController!.addPolygons(polygons); _polylinesController!.addPolylines(polylines); } @@ -361,6 +375,17 @@ class GoogleMapController { _circlesController?.removeCircles(updates.circleIdsToRemove); } + /// Applies [HeatmapLayerUpdates] to the currently managed heatmap layers. + void updateHeatmapLayers(HeatmapLayerUpdates updates) { + assert(_heatmapLayersController != null, + 'Cannot update heatmap layers after dispose().'); + _heatmapLayersController?.addHeatmapLayers(updates.heatmapLayersToAdd); + _heatmapLayersController + ?.changeHeatmapLayers(updates.heatmapLayersToChange); + _heatmapLayersController + ?.removeHeatmapLayers(updates.heatmapLayerIdsToRemove); + } + /// Applies [PolygonUpdates] to the currently managed polygons. void updatePolygons(PolygonUpdates updates) { assert( @@ -417,6 +442,7 @@ class GoogleMapController { _widget = null; _googleMap = null; _circlesController = null; + _heatmapLayersController = null; _polygonsController = null; _polylinesController = null; _markersController = null; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart index 47bfdc7bba15..632be1d7b8e9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart @@ -89,6 +89,15 @@ class GoogleMapsPlugin extends GoogleMapsFlutterPlatform { _map(mapId).updateCircles(circleUpdates); } + /// Applies the passed in `heatmapLayerUpdates` to the `mapId`. + @override + Future updateHeatmapLayers( + HeatmapLayerUpdates heatmapLayerUpdates, { + required int mapId, + }) async { + _map(mapId).updateHeatmapLayers(heatmapLayerUpdates); + } + @override Future updateTileOverlays({ required Set newTileOverlays, @@ -296,6 +305,7 @@ class GoogleMapsPlugin extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmapLayers = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, @@ -317,6 +327,7 @@ class GoogleMapsPlugin extends GoogleMapsFlutterPlatform { polygons: polygons, polylines: polylines, circles: circles, + heatmapLayers: heatmapLayers, mapOptions: mapOptions, )..init(); // Initialize the controller diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart new file mode 100644 index 000000000000..8d8b3654cbd0 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart @@ -0,0 +1,35 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// 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_web; + +/// The `HeatmapLayerController` class wraps a [gmaps_visualization.HeatmapLayer] and its `onTap` behavior. +class HeatmapLayerController { + gmaps_visualization.HeatmapLayer? _heatmapLayer; + + /// Creates a `HeatmapLayerController`, which wraps a [gmaps_visualization.HeatmapLayer] object and its `onTap` behavior. + HeatmapLayerController({required gmaps_visualization.HeatmapLayer heatmapLayer}) + : _heatmapLayer = heatmapLayer; + + /// Returns the wrapped [gmaps_visualization.HeatmapLayer]. Only used for testing. + @visibleForTesting + gmaps_visualization.HeatmapLayer? get heatmapLayer => _heatmapLayer; + + /// Updates the options of the wrapped [gmaps_visualization.HeatmapLayer] object. + /// + /// This cannot be called after [remove]. + void update(gmaps_visualization.HeatmapLayerOptions options) { + assert(_heatmapLayer != null, + 'Cannot `update` HeatmapLayer after calling `remove`.'); + _heatmapLayer!.options = options; + } + + /// Disposes of the currently wrapped [gmaps_visualization.HeatmapLayer]. + void remove() { + if (_heatmapLayer != null) { + _heatmapLayer!.map = null; + _heatmapLayer = null; + } + } +} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart new file mode 100644 index 000000000000..6b35c9083c97 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart @@ -0,0 +1,74 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// 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_web; + +/// This class manages all the [HeatmapLayerController]s associated to a [GoogleMapController]. +class HeatmapLayersController extends GeometryController { + // A cache of [HeatmapLayerController]s indexed by their [HeatmapLayerId]. + final Map _heatmapLayerIdToController; + + // The stream over which heatmapLayers broadcast their events + StreamController _streamController; + + /// Initialize the cache. The [StreamController] comes from the [GoogleMapController], and is shared with other controllers. + HeatmapLayersController({ + required StreamController stream, + }) : _streamController = stream, + _heatmapLayerIdToController = + Map(); + + /// Returns the cache of [HeatmapLayerController]s. Test only. + @visibleForTesting + Map get heatmapLayers => + _heatmapLayerIdToController; + + /// Adds a set of [HeatmapLayer] objects to the cache. + /// + /// Wraps each [HeatmapLayer] into its corresponding [HeatmapLayerController]. + void addHeatmapLayers(Set heatmapLayersToAdd) { + heatmapLayersToAdd.forEach((heatmapLayer) { + _addHeatmapLayer(heatmapLayer); + }); + } + + void _addHeatmapLayer(HeatmapLayer heatmapLayer) { + if (heatmapLayer == null) { + return; + } + + final populationOptions = + _heatmapLayerOptionsFromHeatmapLayer(heatmapLayer); + gmaps_visualization.HeatmapLayer gmHeatmapLayer = + gmaps_visualization.HeatmapLayer(populationOptions); + gmHeatmapLayer.map = googleMap; + HeatmapLayerController controller = + HeatmapLayerController(heatmapLayer: gmHeatmapLayer); + _heatmapLayerIdToController[heatmapLayer.heatmapLayerId] = controller; + } + + /// Updates a set of [HeatmapLayer] objects with new options. + void changeHeatmapLayers(Set heatmapLayersToChange) { + heatmapLayersToChange.forEach((heatmapLayerToChange) { + _changeHeatmapLayer(heatmapLayerToChange); + }); + } + + void _changeHeatmapLayer(HeatmapLayer heatmapLayer) { + final heatmapLayerController = + _heatmapLayerIdToController[heatmapLayer.heatmapLayerId]; + heatmapLayerController + ?.update(_heatmapLayerOptionsFromHeatmapLayer(heatmapLayer)); + } + + /// Removes a set of [HeatmapLayerId]s from the cache. + void removeHeatmapLayers(Set heatmapLayerIdsToRemove) { + heatmapLayerIdsToRemove.forEach((heatmapLayerId) { + final HeatmapLayerController? heatmapLayerController = + _heatmapLayerIdToController[heatmapLayerId]; + heatmapLayerController?.remove(); + _heatmapLayerIdToController.remove(heatmapLayerId); + }); + } +} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 2780175d29e2..782c754af209 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -21,7 +21,8 @@ dependencies: sdk: flutter flutter_web_plugins: sdk: flutter - google_maps_flutter_platform_interface: ^2.1.2 + google_maps_flutter_platform_interface: + path: ../google_maps_flutter_platform_interface google_maps: ^5.2.0 pedantic: ^1.10.0 sanitize_html: ^2.0.0 From bcc8f07b44fe253c3f1fe855f6ab3d1419c5efbf Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 12:34:19 -0400 Subject: [PATCH 03/94] Added web target to example --- .../google_maps_flutter/example/pubspec.yaml | 2 + .../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/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes .../example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes .../example/web/index.html | 107 ++++++++++++++++++ .../example/web/manifest.json | 35 ++++++ 8 files changed, 144 insertions(+) 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/icons/Icon-maskable-192.png create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-maskable-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/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index dbc32b0ef2f8..adaea72d92c5 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -18,6 +18,8 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: ../ + google_maps_flutter_web: + path: ../../google_maps_flutter_web dev_dependencies: espresso: ^0.1.0+2 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~(l1AfjnEK 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*SYAX-%d(5gVjrHJWqXQshj@!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/icons/Icon-maskable-192.png b/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 zcmdT|`#%%j|KDb2V@0DPm$^(Lx5}lO%Yv(=e*7hl@QqKS50#~#^IQPxBmuh|i9sXnt4ch@VT0F7% zMtrs@KWIOo+QV@lSs66A>2pz6-`9Jk=0vv&u?)^F@HZ)-6HT=B7LF;rdj zskUyBfbojcX#CS>WrIWo9D=DIwcXM8=I5D{SGf$~=gh-$LwY?*)cD%38%sCc?5OsX z-XfkyL-1`VavZ?>(pI-xp-kYq=1hsnyP^TLb%0vKRSo^~r{x?ISLY1i7KjSp z*0h&jG(Rkkq2+G_6eS>n&6>&Xk+ngOMcYrk<8KrukQHzfx675^^s$~<@d$9X{VBbg z2Fd4Z%g`!-P}d#`?B4#S-9x*eNlOVRnDrn#jY@~$jfQ-~3Od;A;x-BI1BEDdvr`pI z#D)d)!2_`GiZOUu1crb!hqH=ezs0qk<_xDm_Kkw?r*?0C3|Io6>$!kyDl;eH=aqg$B zsH_|ZD?jP2dc=)|L>DZmGyYKa06~5?C2Lc0#D%62p(YS;%_DRCB1k(+eLGXVMe+=4 zkKiJ%!N6^mxqM=wq`0+yoE#VHF%R<{mMamR9o_1JH8jfnJ?NPLs$9U!9!dq8 z0B{dI2!M|sYGH&9TAY34OlpIsQ4i5bnbG>?cWwat1I13|r|_inLE?FS@Hxdxn_YZN z3jfUO*X9Q@?HZ>Q{W0z60!bbGh557XIKu1?)u|cf%go`pwo}CD=0tau-}t@R2OrSH zQzZr%JfYa`>2!g??76=GJ$%ECbQh7Q2wLRp9QoyiRHP7VE^>JHm>9EqR3<$Y=Z1K^SHuwxCy-5@z3 zVM{XNNm}yM*pRdLKp??+_2&!bp#`=(Lh1vR{~j%n;cJv~9lXeMv)@}Odta)RnK|6* zC+IVSWumLo%{6bLDpn)Gz>6r&;Qs0^+Sz_yx_KNz9Dlt^ax`4>;EWrIT#(lJ_40<= z750fHZ7hI{}%%5`;lwkI4<_FJw@!U^vW;igL0k+mK)-j zYuCK#mCDK3F|SC}tC2>m$ZCqNB7ac-0UFBJ|8RxmG@4a4qdjvMzzS&h9pQmu^x&*= zGvapd1#K%Da&)8f?<9WN`2H^qpd@{7In6DNM&916TRqtF4;3`R|Nhwbw=(4|^Io@T zIjoR?tB8d*sO>PX4vaIHF|W;WVl6L1JvSmStgnRQq zTX4(>1f^5QOAH{=18Q2Vc1JI{V=yOr7yZJf4Vpfo zeHXdhBe{PyY;)yF;=ycMW@Kb>t;yE>;f79~AlJ8k`xWucCxJfsXf2P72bAavWL1G#W z;o%kdH(mYCM{$~yw4({KatNGim49O2HY6O07$B`*K7}MvgI=4x=SKdKVb8C$eJseA$tmSFOztFd*3W`J`yIB_~}k%Sd_bPBK8LxH)?8#jM{^%J_0|L z!gFI|68)G}ex5`Xh{5pB%GtlJ{Z5em*e0sH+sU1UVl7<5%Bq+YrHWL7?X?3LBi1R@_)F-_OqI1Zv`L zb6^Lq#H^2@d_(Z4E6xA9Z4o3kvf78ZDz!5W1#Mp|E;rvJz&4qj2pXVxKB8Vg0}ek%4erou@QM&2t7Cn5GwYqy%{>jI z)4;3SAgqVi#b{kqX#$Mt6L8NhZYgonb7>+r#BHje)bvaZ2c0nAvrN3gez+dNXaV;A zmyR0z@9h4@6~rJik-=2M-T+d`t&@YWhsoP_XP-NsVO}wmo!nR~QVWU?nVlQjNfgcTzE-PkfIX5G z1?&MwaeuzhF=u)X%Vpg_e@>d2yZwxl6-r3OMqDn8_6m^4z3zG##cK0Fsgq8fcvmhu z{73jseR%X%$85H^jRAcrhd&k!i^xL9FrS7qw2$&gwAS8AfAk#g_E_tP;x66fS`Mn@SNVrcn_N;EQm z`Mt3Z%rw%hDqTH-s~6SrIL$hIPKL5^7ejkLTBr46;pHTQDdoErS(B>``t;+1+M zvU&Se9@T_BeK;A^p|n^krIR+6rH~BjvRIugf`&EuX9u69`9C?9ANVL8l(rY6#mu^i z=*5Q)-%o*tWl`#b8p*ZH0I}hn#gV%|jt6V_JanDGuekR*-wF`u;amTCpGG|1;4A5$ zYbHF{?G1vv5;8Ph5%kEW)t|am2_4ik!`7q{ymfHoe^Z99c|$;FAL+NbxE-_zheYbV z3hb0`uZGTsgA5TG(X|GVDSJyJxsyR7V5PS_WSnYgwc_D60m7u*x4b2D79r5UgtL18 zcCHWk+K6N1Pg2c;0#r-)XpwGX?|Iv)^CLWqwF=a}fXUSM?n6E;cCeW5ER^om#{)Jr zJR81pkK?VoFm@N-s%hd7@hBS0xuCD0-UDVLDDkl7Ck=BAj*^ps`393}AJ+Ruq@fl9 z%R(&?5Nc3lnEKGaYMLmRzKXow1+Gh|O-LG7XiNxkG^uyv zpAtLINwMK}IWK65hOw&O>~EJ}x@lDBtB`yKeV1%GtY4PzT%@~wa1VgZn7QRwc7C)_ zpEF~upeDRg_<#w=dLQ)E?AzXUQpbKXYxkp>;c@aOr6A|dHA?KaZkL0svwB^U#zmx0 zzW4^&G!w7YeRxt<9;d@8H=u(j{6+Uj5AuTluvZZD4b+#+6Rp?(yJ`BC9EW9!b&KdPvzJYe5l7 zMJ9aC@S;sA0{F0XyVY{}FzW0Vh)0mPf_BX82E+CD&)wf2!x@{RO~XBYu80TONl3e+ zA7W$ra6LcDW_j4s-`3tI^VhG*sa5lLc+V6ONf=hO@q4|p`CinYqk1Ko*MbZ6_M05k zSwSwkvu;`|I*_Vl=zPd|dVD0lh&Ha)CSJJvV{AEdF{^Kn_Yfsd!{Pc1GNgw}(^~%)jk5~0L~ms|Rez1fiK~s5t(p1ci5Gq$JC#^JrXf?8 z-Y-Zi_Hvi>oBzV8DSRG!7dm|%IlZg3^0{5~;>)8-+Nk&EhAd(}s^7%MuU}lphNW9Q zT)DPo(ob{tB7_?u;4-qGDo!sh&7gHaJfkh43QwL|bbFVi@+oy;i;M zM&CP^v~lx1U`pi9PmSr&Mc<%HAq0DGH?Ft95)WY`P?~7O z`O^Nr{Py9M#Ls4Y7OM?e%Y*Mvrme%=DwQaye^Qut_1pOMrg^!5u(f9p(D%MR%1K>% zRGw%=dYvw@)o}Fw@tOtPjz`45mfpn;OT&V(;z75J*<$52{sB65$gDjwX3Xa!x_wE- z!#RpwHM#WrO*|~f7z}(}o7US(+0FYLM}6de>gQdtPazXz?OcNv4R^oYLJ_BQOd_l172oSK$6!1r@g+B@0ofJ4*{>_AIxfe-#xp>(1 z@Y3Nfd>fmqvjL;?+DmZk*KsfXJf<%~(gcLwEez%>1c6XSboURUh&k=B)MS>6kw9bY z{7vdev7;A}5fy*ZE23DS{J?8at~xwVk`pEwP5^k?XMQ7u64;KmFJ#POzdG#np~F&H ze-BUh@g54)dsS%nkBb}+GuUEKU~pHcYIg4vSo$J(J|U36bs0Use+3A&IMcR%6@jv$ z=+QI+@wW@?iu}Hpyzlvj-EYeop{f65GX0O%>w#0t|V z1-svWk`hU~m`|O$kw5?Yn5UhI%9P-<45A(v0ld1n+%Ziq&TVpBcV9n}L9Tus-TI)f zd_(g+nYCDR@+wYNQm1GwxhUN4tGMLCzDzPqY$~`l<47{+l<{FZ$L6(>J)|}!bi<)| zE35dl{a2)&leQ@LlDxLQOfUDS`;+ZQ4ozrleQwaR-K|@9T{#hB5Z^t#8 zC-d_G;B4;F#8A2EBL58s$zF-=SCr`P#z zNCTnHF&|X@q>SkAoYu>&s9v@zCpv9lLSH-UZzfhJh`EZA{X#%nqw@@aW^vPcfQrlPs(qQxmC|4tp^&sHy!H!2FH5eC{M@g;ElWNzlb-+ zxpfc0m4<}L){4|RZ>KReag2j%Ot_UKkgpJN!7Y_y3;Ssz{9 z!K3isRtaFtQII5^6}cm9RZd5nTp9psk&u1C(BY`(_tolBwzV_@0F*m%3G%Y?2utyS zY`xM0iDRT)yTyYukFeGQ&W@ReM+ADG1xu@ruq&^GK35`+2r}b^V!m1(VgH|QhIPDE X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-maskable-512.png b/packages/google_maps_flutter/google_maps_flutter/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx 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..6cef285dfb1e --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/example/web/index.html @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + google_maps_flutter_example + + + + + + + + + + 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..8753cd239ed1 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "google_maps_flutter_example", + "short_name": "google_maps_flutter_example", + "start_url": ".", + "display": "standalone", + "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" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} From b179c93bd54b6f1fe4d4e5636408ecff3c8f453b Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 13:31:40 -0400 Subject: [PATCH 04/94] Worked on interface --- .../example/lib/heatmap_layer.dart | 120 ++++++++++++++++++ .../google_maps_flutter/example/lib/main.dart | 2 + .../lib/google_maps_flutter.dart | 3 + .../lib/src/controller.dart | 12 ++ .../lib/src/google_map.dart | 19 +++ .../test/fake_maps_controllers.dart | 75 +++++++++++ .../lib/src/types/heatmap_layer.dart | 5 +- .../lib/src/types/location.dart | 7 +- .../google_maps_flutter_web/README.md | 2 + .../lib/src/convert.dart | 6 + 10 files changed, 248 insertions(+), 3 deletions(-) create mode 100644 packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap_layer.dart diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap_layer.dart new file mode 100644 index 000000000000..0f8e3c6460f5 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap_layer.dart @@ -0,0 +1,120 @@ +// ignore_for_file: public_member_api_docs + +import 'package:flutter/material.dart'; +import 'package:google_maps_flutter/google_maps_flutter.dart'; +import 'package:google_maps_flutter_example/page.dart'; + +class HeatmapLayerPage extends GoogleMapExampleAppPage { + const HeatmapLayerPage() : super(const Icon(Icons.map), 'Heatmap layer'); + + @override + Widget build(BuildContext context) { + return const HeatmapLayerBody(); + } +} + +class HeatmapLayerBody extends StatefulWidget { + const HeatmapLayerBody(); + + @override + State createState() => HeatmapLayerBodyState(); +} + +class HeatmapLayerBodyState extends State { + static const LatLng sanFrancisco = LatLng(37.774546, -122.433523); + + List disabledPoints = [ + WeightedLatLng(37.782, -122.447), + WeightedLatLng(37.782, -122.445), + WeightedLatLng(37.782, -122.443), + WeightedLatLng(37.782, -122.441), + WeightedLatLng(37.782, -122.439), + WeightedLatLng(37.782, -122.437), + WeightedLatLng(37.782, -122.435), + WeightedLatLng(37.785, -122.447), + WeightedLatLng(37.785, -122.445), + WeightedLatLng(37.785, -122.443), + WeightedLatLng(37.785, -122.441), + WeightedLatLng(37.785, -122.439), + WeightedLatLng(37.785, -122.437), + WeightedLatLng(37.785, -122.435) + ]; + + List enabledPoints = []; + + void _addPoint() { + if (disabledPoints.isEmpty) { + return; + } + + final WeightedLatLng point = disabledPoints.first; + disabledPoints.removeAt(0); + + setState(() => enabledPoints.add(point)); + } + + void _removePoint() { + if (enabledPoints.isEmpty) { + return; + } + + final WeightedLatLng point = enabledPoints.first; + enabledPoints.removeAt(0); + + setState(() => disabledPoints.add(point)); + } + + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Center( + child: SizedBox( + width: 350.0, + height: 300.0, + child: GoogleMap( + initialCameraPosition: const CameraPosition( + target: sanFrancisco, + zoom: 13, + ), + heatmapLayers: { + HeatmapLayer( + heatmapLayerId: const HeatmapLayerId('test'), + data: enabledPoints, + ) + }), + ), + ), + Expanded( + child: SingleChildScrollView( + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Row( + children: [ + Column( + children: [ + TextButton( + child: const Text('Add point'), + onPressed: + disabledPoints.isNotEmpty ? _addPoint : null, + ), + TextButton( + child: const Text('Remove point'), + onPressed: + enabledPoints.isNotEmpty ? _removePoint : null, + ), + ], + ) + ], + ) + ], + ), + ), + ), + ], + ); + } +} diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart index f4d420a72f7c..0e883aee5ec2 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart @@ -10,6 +10,7 @@ import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter_example/lite_mode.dart'; import 'animate_camera.dart'; +import 'heatmap_layer.dart'; import 'map_click.dart'; import 'map_coordinates.dart'; import 'map_ui.dart'; @@ -41,6 +42,7 @@ final List _allPages = [ const SnapshotPage(), const LiteModePage(), const TileOverlayPage(), + const HeatmapLayerPage(), ]; class MapsDemo extends StatelessWidget { 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 5b1e67c943dd..3a3a67b608bd 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 @@ -27,10 +27,13 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf Cap, Circle, CircleId, + HeatmapLayer, + HeatmapLayerId, InfoWindow, JointType, LatLng, LatLngBounds, + WeightedLatLng, MapStyleException, MapType, Marker, 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 088589e4a2ce..f612a761c63f 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 @@ -154,6 +154,18 @@ class GoogleMapController { .updateCircles(circleUpdates, mapId: mapId); } + /// Updates heatmap layer 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 _updateHeatmapLayers(HeatmapLayerUpdates heatmapLayerUpdates) { + assert(heatmapLayerUpdates != null); + return GoogleMapsFlutterPlatform.instance + .updateHeatmapLayers(heatmapLayerUpdates, mapId: mapId); + } + /// Updates tile overlays configuration. /// /// Change listeners are notified once the update has been made on the 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 8ecbfbbad499..2833ae98d1ea 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 @@ -113,6 +113,7 @@ class GoogleMap extends StatefulWidget { this.polygons = const {}, this.polylines = const {}, this.circles = const {}, + this.heatmapLayers = const {}, this.onCameraMoveStarted, this.tileOverlays = const {}, this.onCameraMove, @@ -191,6 +192,9 @@ class GoogleMap extends StatefulWidget { /// Circles to be placed on the map. final Set circles; + /// Heatmap layers to show on the map. + final Set heatmapLayers; + /// Tile overlays to be placed on the map. final Set tileOverlays; @@ -294,6 +298,8 @@ class _GoogleMapState extends State { Map _polygons = {}; Map _polylines = {}; Map _circles = {}; + Map _heatmapLayers = + {}; late _GoogleMapOptions _googleMapOptions; @override @@ -309,6 +315,7 @@ class _GoogleMapState extends State { polygons: widget.polygons, polylines: widget.polylines, circles: widget.circles, + heatmapLayers: widget.heatmapLayers, gestureRecognizers: widget.gestureRecognizers, mapOptions: _googleMapOptions.toMap(), ); @@ -322,6 +329,7 @@ class _GoogleMapState extends State { _polygons = keyByPolygonId(widget.polygons); _polylines = keyByPolylineId(widget.polylines); _circles = keyByCircleId(widget.circles); + _heatmapLayers = keyByHeatmapLayerId(widget.heatmapLayers); } @override @@ -343,6 +351,7 @@ class _GoogleMapState extends State { _updatePolygons(); _updatePolylines(); _updateCircles(); + _updateHeatmapLayers(); _updateTileOverlays(); } @@ -391,6 +400,16 @@ class _GoogleMapState extends State { _circles = keyByCircleId(widget.circles); } + Future _updateHeatmapLayers() async { + final GoogleMapController controller = await _controller.future; + // ignore: unawaited_futures + controller._updateHeatmapLayers( + HeatmapLayerUpdates.from( + _heatmapLayers.values.toSet(), widget.heatmapLayers), + ); + _heatmapLayers = keyByHeatmapLayerId(widget.heatmapLayers); + } + Future _updateTileOverlays() async { final GoogleMapController controller = await _controller.future; // ignore: unawaited_futures diff --git a/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart index bac3ceabc4de..a26e829dbe7e 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart @@ -4,6 +4,7 @@ import 'dart:typed_data'; +import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; @@ -20,6 +21,7 @@ class FakePlatformGoogleMap { updatePolygons(params); updatePolylines(params); updateCircles(params); + updateHeatmapLayers(params); updateTileOverlays(Map.castFrom(params)); } @@ -85,6 +87,12 @@ class FakePlatformGoogleMap { Set circlesToChange = {}; + Set heatmapLayerIdsToRemove = {}; + + Set heatmapLayersToAdd = {}; + + Set heatmapLayersToChange = {}; + Set tileOverlayIdsToRemove = {}; Set tileOverlaysToAdd = {}; @@ -112,6 +120,9 @@ class FakePlatformGoogleMap { case 'circles#update': updateCircles(call.arguments as Map?); return Future.sync(() {}); + case 'heatmapLayers#update': + updateHeatmapLayers(call.arguments as Map?); + return Future.sync(() {}); default: return Future.sync(() {}); } @@ -288,6 +299,18 @@ class FakePlatformGoogleMap { circlesToChange = _deserializeCircles(circleUpdates['circlesToChange']); } + void updateHeatmapLayers(Map? heatmapLayerUpdates) { + if (heatmapLayerUpdates == null) { + return; + } + heatmapLayersToAdd = + _deserializeHeatmapLayers(heatmapLayerUpdates['heatmapLayersToAdd']); + heatmapLayerIdsToRemove = _deserializeHeatmapLayerIds( + heatmapLayerUpdates['heatmapLayerIdsToRemove'] as List?); + heatmapLayersToChange = + _deserializeHeatmapLayers(heatmapLayerUpdates['heatmapLayersToChange']); + } + void updateTileOverlays(Map updateTileOverlayUpdates) { if (updateTileOverlayUpdates == null) { return; @@ -346,6 +369,58 @@ class FakePlatformGoogleMap { return result; } + Set _deserializeHeatmapLayerIds( + List? heatmapLayerIds) { + if (heatmapLayerIds == null) { + return {}; + } + return heatmapLayerIds + .map( + (dynamic heatmapLayerId) => HeatmapLayerId(heatmapLayerId as String), + ) + .toSet(); + } + + Set _deserializeHeatmapLayers(dynamic heatmapLayers) { + if (heatmapLayers == null) { + return {}; + } + final List heatmapLayersData = heatmapLayers as List; + final Set result = {}; + for (final Map heatmapLayerData + in heatmapLayersData.cast>()) { + final String heatmapLayerId = + heatmapLayerData['heatmapLayerId'] as String; + + final List dataData = heatmapLayerData['data'] as List; + final List data = + dataData.map((dynamic e) => WeightedLatLng.fromJson(e)!).toList(); + + final bool dissipating = heatmapLayerData['dissipating'] as bool; + + final List? gradientData = + heatmapLayerData['gradient'] as List?; + final List? gradient = + gradientData?.cast().map((int e) => Color(e)).toList(); + + final double? maxIntensity = heatmapLayerData['maxIntensity'] as double?; + final double opacity = heatmapLayerData['opacity'] as double; + final double? radius = heatmapLayerData['radius'] as double?; + + result.add(HeatmapLayer( + heatmapLayerId: HeatmapLayerId(heatmapLayerId), + data: data, + dissipating: dissipating, + gradient: gradient, + maxIntensity: maxIntensity, + opacity: opacity, + radius: radius, + )); + } + + return result; + } + Set _deserializeTileOverlayIds(List? tileOverlayIds) { if (tileOverlayIds == null || tileOverlayIds.isEmpty) { return {}; diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart index 822232a3a4c3..ae9a5105f18b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart @@ -86,7 +86,10 @@ class HeatmapLayer implements MapsObject { /// Creates a new [HeatmapLayer] object whose values are the same as this /// instance. - HeatmapLayer clone() => copyWith(); + HeatmapLayer clone() => copyWith( + dataParam: List.of(data), + gradientParam: gradient != null ? List.of(gradient!) : null, + ); /// Converts this object to something serializable in JSON. Object toJson() { 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 7f51a2d101f8..f6f5c2262bf8 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 @@ -143,7 +143,8 @@ class WeightedLatLng { final double weight; /// Creates a [WeightedLatLng] with the specified [weight] - WeightedLatLng(this.location, {this.weight = 1.0}); + WeightedLatLng(double latitude, double longitude, {this.weight = 1.0}) + : location = LatLng(latitude, longitude); /// Converts this object to something serializable in JSON. Object toJson() { @@ -157,8 +158,10 @@ class WeightedLatLng { } assert(json is List && json.length == 2); final list = json as List; + final latLng = LatLng.fromJson(list[0])!; return WeightedLatLng( - LatLng.fromJson(list[0])!, + latLng.latitude, + latLng.longitude, weight: list[1], ); } diff --git a/packages/google_maps_flutter/google_maps_flutter_web/README.md b/packages/google_maps_flutter/google_maps_flutter_web/README.md index 9e7ce94e3e59..f4ec5ab8a524 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/README.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/README.md @@ -26,6 +26,8 @@ Modify the `` tag of your `web/index.html` to load the Google Maps JavaScr Now you should be able to use the Google Maps plugin normally. +To use heatmap layers, add `&libraries=visualization` to the end of the URL. + ## Limitations of the web version The following map options are not available in web, because the map doesn't rotate there: diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index e23200a72ba2..8274e8a27abd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -282,6 +282,12 @@ gmaps_visualization.HeatmapLayerOptions _heatmapLayerOptionsFromHeatmapLayer( ) { final heatmapLayerOptions = gmaps_visualization.HeatmapLayerOptions() ..data = heatmapLayer.data + .map( + (e) => gmaps_visualization.WeightedLocation() + ..location = gmaps.LatLng(e.location.latitude, e.location.longitude) + ..weight = e.weight, + ) + .toList() ..dissipating = heatmapLayer.dissipating ..gradient = heatmapLayer.gradient?.map(_getCssColor).toList() ..maxIntensity = heatmapLayer.maxIntensity From 6ee7ae846cd5a20812b02f5bebd70c2d7da7b476 Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 17:04:12 -0400 Subject: [PATCH 05/94] Worked on Android implementation --- .../google_maps_flutter/android/build.gradle | 1 + .../flutter/plugins/googlemaps/Convert.java | 70 +++++++++++++ .../googlemaps/GoogleMapController.java | 29 ++++++ .../googlemaps/GoogleMapOptionsSink.java | 2 + .../plugins/googlemaps/HeatmapBuilder.java | 44 +++++++++ .../plugins/googlemaps/HeatmapController.java | 51 ++++++++++ .../googlemaps/HeatmapOptionsSink.java | 19 ++++ .../googlemaps/HeatmapsController.java | 97 +++++++++++++++++++ .../test/fake_maps_controllers.dart | 2 +- .../lib/src/types/heatmap_layer.dart | 6 +- 10 files changed, 318 insertions(+), 3 deletions(-) create mode 100644 packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java create mode 100644 packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java create mode 100644 packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java create mode 100644 packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java diff --git a/packages/google_maps_flutter/google_maps_flutter/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter/android/build.gradle index bf283bea9ef9..6cbbc7202c59 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter/android/build.gradle @@ -36,6 +36,7 @@ android { dependencies { implementation "androidx.annotation:annotation:1.1.0" implementation 'com.google.android.gms:play-services-maps:17.0.0' + implementation 'com.google.maps.android:android-maps-utils:2.3.0' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test:rules:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java index 72c6959fe55e..b8ceae8e3337 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java @@ -24,6 +24,9 @@ import com.google.android.gms.maps.model.RoundCap; import com.google.android.gms.maps.model.SquareCap; import com.google.android.gms.maps.model.Tile; +import com.google.maps.android.heatmaps.Gradient; +import com.google.maps.android.heatmaps.WeightedLatLng; + import io.flutter.view.FlutterMain; import java.util.ArrayList; import java.util.Arrays; @@ -225,6 +228,11 @@ static LatLng toLatLng(Object o) { return new LatLng(toDouble(data.get(0)), toDouble(data.get(1))); } + static WeightedLatLng toWeightedLatLng(Object o) { + final List data = toList(o); + return new WeightedLatLng(toLatLng(data.get(0)), toDouble(data.get(1))); + } + static Point toPoint(Object o) { Object x = toMap(o).get("x"); Object y = toMap(o).get("y"); @@ -592,6 +600,36 @@ static String interpretCircleOptions(Object o, CircleOptionsSink sink) { } } + static String interpretHeatmapOptions(Object o, HeatmapOptionsSink sink) { + final Map data = toMap(o); + final Object rawWeightedData = data.get("data"); + if (rawWeightedData != null) { + sink.setWeightedData(toWeightedData(rawWeightedData)); + } + final Object gradient = data.get("gradient"); + if (gradient != null) { + sink.setGradient(toGradient(gradient)); + } + final Object maxIntensity = data.get("maxIntensity"); + if (maxIntensity != null) { + sink.setMaxIntensity(toDouble(maxIntensity)); + } + final Object opacity = data.get("opacity"); + if (opacity != null) { + sink.setOpacity(toDouble(opacity)); + } + final Object radius = data.get("radius"); + if (radius != null) { + sink.setRadius(toInt(radius)); + } + final String heatmapId = (String) data.get("heatmapId"); + if (heatmapId == null) { + throw new IllegalArgumentException("heatmapId was null"); + } else { + return heatmapId; + } + } + private static List toPoints(Object o) { final List data = toList(o); final List points = new ArrayList<>(data.size()); @@ -603,6 +641,38 @@ private static List toPoints(Object o) { return points; } + private static List toWeightedData(Object o) { + final List data = toList(o); + final List weightedData = new ArrayList<>(data.size()); + + for (Object rawWeightedPoint : data) { + weightedData.add(toWeightedLatLng(rawWeightedPoint)); + } + return weightedData; + } + + private static Gradient toGradient(Object o) { + final List data = toList(o); + final int[] colors = new int[data.size()]; + final float[] startPoints = new float[data.size()]; + final double startPointInterval = 1.0 / data.size(); + float currentStartPoint = 0; + + for (int i = 0; i < data.size(); i++) { + colors[i] = toInt(data.get(i)); + startPoints[i] = currentStartPoint; + + currentStartPoint += startPointInterval; + + // Make sure the start point doesn't exceed the max value + if (currentStartPoint > 1) { + currentStartPoint = 1; + } + } + + return new Gradient(colors, startPoints); + } + private static List> toHoles(Object o) { final List data = toList(o); final List> holes = new ArrayList<>(data.size()); diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java index 9b8810354b8f..96e061de1ca2 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java @@ -76,11 +76,13 @@ final class GoogleMapController private final PolygonsController polygonsController; private final PolylinesController polylinesController; private final CirclesController circlesController; + private final HeatmapsController heatmapsController; private final TileOverlaysController tileOverlaysController; private List initialMarkers; private List initialPolygons; private List initialPolylines; private List initialCircles; + private List initialHeatmaps; private List> initialTileOverlays; GoogleMapController( @@ -101,6 +103,7 @@ final class GoogleMapController this.polygonsController = new PolygonsController(methodChannel, density); this.polylinesController = new PolylinesController(methodChannel, density); this.circlesController = new CirclesController(methodChannel, density); + this.heatmapsController = new HeatmapsController(); this.tileOverlaysController = new TileOverlaysController(methodChannel); } @@ -143,11 +146,13 @@ public void onMapReady(GoogleMap googleMap) { polygonsController.setGoogleMap(googleMap); polylinesController.setGoogleMap(googleMap); circlesController.setGoogleMap(googleMap); + heatmapsController.setGoogleMap(googleMap); tileOverlaysController.setGoogleMap(googleMap); updateInitialMarkers(); updateInitialPolygons(); updateInitialPolylines(); updateInitialCircles(); + updateInitialHeatmaps(); updateInitialTileOverlays(); } @@ -304,6 +309,17 @@ public void onSnapshotReady(Bitmap bitmap) { result.success(null); break; } + case "heatmaps#update": + { + List heatmapsToAdd = call.argument("heatmapsToAdd"); + heatmapsController.addHeatmaps(heatmapsToAdd); + List heatmapsToChange = call.argument("heatmapsToChange"); + heatmapsController.changeHeatmaps(heatmapsToChange); + List heatmapIdsToRemove = call.argument("heatmapIdsToRemove"); + heatmapsController.removeHeatmaps(heatmapIdsToRemove); + result.success(null); + break; + } case "map#isCompassEnabled": { result.success(googleMap.getUiSettings().isCompassEnabled()); @@ -765,10 +781,23 @@ public void setInitialCircles(Object initialCircles) { } } + @Override + public void setInitialHeatmaps(Object initialHeatmaps) { + ArrayList heatmaps = (ArrayList) initialHeatmaps; + this.initialHeatmaps = heatmaps != null ? new ArrayList<>(heatmaps) : null; + if (googleMap != null) { + updateInitialHeatmaps(); + } + } + private void updateInitialCircles() { circlesController.addCircles(initialCircles); } + private void updateInitialHeatmaps() { + heatmapsController.addHeatmaps(initialHeatmaps); + } + @Override public void setInitialTileOverlays(List> initialTileOverlays) { this.initialTileOverlays = initialTileOverlays; diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java index 17f0d970a4ef..5a1691afff55 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java @@ -54,5 +54,7 @@ interface GoogleMapOptionsSink { void setInitialCircles(Object initialCircles); + void setInitialHeatmaps(Object initialHeatmaps); + void setInitialTileOverlays(List> initialTileOverlays); } diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java new file mode 100644 index 000000000000..5e6ceeb3890f --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java @@ -0,0 +1,44 @@ +package io.flutter.plugins.googlemaps; + +import com.google.maps.android.heatmaps.Gradient; +import com.google.maps.android.heatmaps.HeatmapTileProvider; +import com.google.maps.android.heatmaps.WeightedLatLng; + +import java.util.List; + +public class HeatmapBuilder implements HeatmapOptionsSink { + private final HeatmapTileProvider.Builder heatmapOptions; + + HeatmapBuilder() { + this.heatmapOptions = new HeatmapTileProvider.Builder(); + } + + HeatmapTileProvider build() { + return heatmapOptions.build(); + } + + @Override + public void setWeightedData(List weightedData) { + heatmapOptions.weightedData(weightedData); + } + + @Override + public void setGradient(Gradient gradient) { + heatmapOptions.gradient(gradient); + } + + @Override + public void setMaxIntensity(double maxIntensity) { + heatmapOptions.maxIntensity(maxIntensity); + } + + @Override + public void setOpacity(double opacity) { + heatmapOptions.opacity(opacity); + } + + @Override + public void setRadius(int radius) { + heatmapOptions.radius(radius); + } +} diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java new file mode 100644 index 000000000000..c60ffccd5a56 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java @@ -0,0 +1,51 @@ +package io.flutter.plugins.googlemaps; + +import com.google.android.gms.maps.model.TileOverlay; +import com.google.maps.android.heatmaps.Gradient; +import com.google.maps.android.heatmaps.HeatmapTileProvider; +import com.google.maps.android.heatmaps.WeightedLatLng; + +import java.util.List; + +public class HeatmapController implements HeatmapOptionsSink { + private final HeatmapTileProvider heatmap; + private final TileOverlay heatmapTileOverlay; + + HeatmapController(HeatmapTileProvider heatmap, TileOverlay heatmapTileOverlay) { + this.heatmap = heatmap; + this.heatmapTileOverlay = heatmapTileOverlay; + } + + void remove() { + heatmapTileOverlay.remove(); + } + + void clearTileCache() { + heatmapTileOverlay.clearTileCache(); + } + + @Override + public void setWeightedData(List weightedData) { + heatmap.setWeightedData(weightedData); + } + + @Override + public void setGradient(Gradient gradient) { + heatmap.setGradient(gradient); + } + + @Override + public void setMaxIntensity(double maxIntensity) { + heatmap.setMaxIntensity(maxIntensity); + } + + @Override + public void setOpacity(double opacity) { + heatmap.setOpacity(opacity); + } + + @Override + public void setRadius(int radius) { + heatmap.setRadius(radius); + } +} \ No newline at end of file diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java new file mode 100644 index 000000000000..44e0f4d3d59c --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java @@ -0,0 +1,19 @@ +package io.flutter.plugins.googlemaps; + +import com.google.maps.android.heatmaps.Gradient; +import com.google.maps.android.heatmaps.WeightedLatLng; + +import java.util.List; + +/** Receiver of Heatmap configuration options. */ +interface HeatmapOptionsSink { + void setWeightedData(List weightedData); + + void setGradient(Gradient gradient); + + void setMaxIntensity(double maxIntensity); + + void setOpacity(double opacity); + + void setRadius(int radius); +} diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java new file mode 100644 index 000000000000..72b152fdbe8e --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java @@ -0,0 +1,97 @@ +package io.flutter.plugins.googlemaps; + +import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.model.TileOverlay; +import com.google.android.gms.maps.model.TileOverlayOptions; +import com.google.maps.android.heatmaps.HeatmapTileProvider; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class HeatmapsController { + private final Map heatmapIdToController; + private GoogleMap googleMap; + + HeatmapsController() { + this.heatmapIdToController = new HashMap<>(); + } + + void setGoogleMap(GoogleMap googleMap) { + this.googleMap = googleMap; + } + + void addHeatmaps(List heatmapsToAdd) { + if (heatmapsToAdd == null) { + return; + } + for (Object heatmapToAdd : heatmapsToAdd) { + addHeatmap(heatmapToAdd); + } + } + + void changeHeatmaps(List heatmapsToChange) { + if (heatmapsToChange == null) { + return; + } + for (Object heatmapToChange : heatmapsToChange) { + changeHeatmap(heatmapToChange); + } + } + + void removeHeatmaps(List heatmapIdsToRemove) { + if (heatmapIdsToRemove == null) { + return; + } + for (Object rawHeatmapId : heatmapIdsToRemove) { + if (rawHeatmapId == null) { + continue; + } + String heatmapId = (String) rawHeatmapId; + final HeatmapController heatmapController = heatmapIdToController.remove(heatmapId); + if (heatmapController != null) { + heatmapController.remove(); + } + } + } + + private void addHeatmap(Object heatmapOptions) { + if (heatmapOptions == null) { + return; + } + HeatmapBuilder heatmapBuilder = new HeatmapBuilder(); + String heatmapId = + Convert.interpretHeatmapOptions(heatmapOptions, heatmapBuilder); + + HeatmapTileProvider heatmap = heatmapBuilder.build(); + TileOverlay heatmapTileOverlay = googleMap.addTileOverlay(new TileOverlayOptions().tileProvider(heatmap)); + HeatmapController heatmapController = new HeatmapController(heatmap, heatmapTileOverlay); + heatmapIdToController.put(heatmapId, heatmapController); + } + + private void changeHeatmap(Object heatmapOptions) { + if (heatmapOptions == null) { + return; + } + String heatmapId = getHeatmapId(heatmapOptions); + HeatmapController heatmapController = heatmapIdToController.get(heatmapId); + if (heatmapController != null) { + Convert.interpretHeatmapOptions(heatmapOptions, heatmapController); + heatmapController.clearTileCache(); + } + } + + private void removeHeatmap(String heatmapId) { + HeatmapController heatmapController = heatmapIdToController.get(heatmapId); + if (heatmapController != null) { + heatmapController.remove(); + heatmapIdToController.remove(heatmapId); + } + } + + @SuppressWarnings("unchecked") + private static String getHeatmapId(Object heatmap) { + Map heatmapMap = (Map) heatmap; + return (String) heatmapMap.get("heatmapId"); + } +} diff --git a/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart index a26e829dbe7e..1dc09720389c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart @@ -405,7 +405,7 @@ class FakePlatformGoogleMap { final double? maxIntensity = heatmapLayerData['maxIntensity'] as double?; final double opacity = heatmapLayerData['opacity'] as double; - final double? radius = heatmapLayerData['radius'] as double?; + final int? radius = heatmapLayerData['radius'] as int?; result.add(HeatmapLayer( heatmapLayerId: HeatmapLayerId(heatmapLayerId), diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart index ae9a5105f18b..409e9deecf56 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart @@ -45,6 +45,8 @@ class HeatmapLayer implements MapsObject { /// influence of a data point is specified by the radius option only. When /// dissipating is disabled, the radius option is interpreted as a radius at /// zoom level 0. + /// + /// TODO: Not on android final bool dissipating; /// The color gradient of the heatmap @@ -61,7 +63,7 @@ class HeatmapLayer implements MapsObject { final double opacity; /// The radius of influence for each data point, in pixels. - final double? radius; + final int? radius; /// Creates a new [HeatmapLayer] object whose values are the same as this /// instance, unless overwritten by the specified parameters. @@ -71,7 +73,7 @@ class HeatmapLayer implements MapsObject { List? gradientParam, double? maxIntensityParam, double? opacityParam, - double? radiusParam, + int? radiusParam, }) { return HeatmapLayer( heatmapLayerId: heatmapLayerId, From 7f789651e70797d6ce785db5a07c361d19601aeb Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 17:10:23 -0400 Subject: [PATCH 06/94] Refactoring --- .../plugins/googlemaps/GoogleMapBuilder.java | 7 ++ .../lib/{heatmap_layer.dart => heatmap.dart} | 20 ++--- .../google_maps_flutter/example/lib/main.dart | 4 +- .../lib/google_maps_flutter.dart | 4 +- .../lib/src/controller.dart | 8 +- .../lib/src/google_map.dart | 24 +++--- .../test/fake_maps_controllers.dart | 70 +++++++++--------- .../test/map_creation_test.dart | 6 +- .../method_channel_google_maps_flutter.dart | 18 ++--- .../google_maps_flutter_platform.dart | 14 ++-- .../{heatmap_layer.dart => heatmap.dart} | 46 ++++++------ .../lib/src/types/heatmap_layer_updates.dart | 27 ------- .../lib/src/types/heatmap_updates.dart | 26 +++++++ .../lib/src/types/types.dart | 6 +- .../lib/src/types/utils/heatmap.dart | 19 +++++ .../lib/src/types/utils/heatmap_layer.dart | 20 ----- .../google_maps_flutter_platform_test.dart | 2 +- .../google_maps_flutter_web/README.md | 2 +- .../lib/google_maps_flutter_web.dart | 7 +- .../lib/src/convert.dart | 20 ++--- .../lib/src/google_maps_controller.dart | 51 ++++++------- .../lib/src/google_maps_flutter_web.dart | 12 +-- .../lib/src/heatmap.dart | 34 +++++++++ .../lib/src/heatmap_layer.dart | 35 --------- .../lib/src/heatmap_layers.dart | 74 ------------------- .../lib/src/heatmaps.dart | 68 +++++++++++++++++ 26 files changed, 309 insertions(+), 315 deletions(-) rename packages/google_maps_flutter/google_maps_flutter/example/lib/{heatmap_layer.dart => heatmap.dart} (85%) rename packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/{heatmap_layer.dart => heatmap.dart} (74%) delete mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_updates.dart create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap.dart delete mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart create mode 100644 packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart create mode 100644 packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java index ad5179a69a45..d3cc7c6c8f58 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java @@ -25,6 +25,7 @@ class GoogleMapBuilder implements GoogleMapOptionsSink { private Object initialPolygons; private Object initialPolylines; private Object initialCircles; + private Object initialHeatmaps; private List> initialTileOverlays; private Rect padding = new Rect(0, 0, 0, 0); @@ -46,6 +47,7 @@ GoogleMapController build( controller.setInitialPolygons(initialPolygons); controller.setInitialPolylines(initialPolylines); controller.setInitialCircles(initialCircles); + controller.setInitialHeatmaps(initialHeatmaps); controller.setPadding(padding.top, padding.left, padding.bottom, padding.right); controller.setInitialTileOverlays(initialTileOverlays); return controller; @@ -170,6 +172,11 @@ public void setInitialCircles(Object initialCircles) { this.initialCircles = initialCircles; } + @Override + public void setInitialHeatmaps(Object initialHeatmaps) { + this.initialHeatmaps = initialHeatmaps; + } + @Override public void setInitialTileOverlays(List> initialTileOverlays) { this.initialTileOverlays = initialTileOverlays; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap_layer.dart rename to packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart index 0f8e3c6460f5..2878e10b9e8a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap_layer.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart @@ -4,23 +4,23 @@ import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter_example/page.dart'; -class HeatmapLayerPage extends GoogleMapExampleAppPage { - const HeatmapLayerPage() : super(const Icon(Icons.map), 'Heatmap layer'); +class HeatmapPage extends GoogleMapExampleAppPage { + const HeatmapPage() : super(const Icon(Icons.map), 'Heatmaps'); @override Widget build(BuildContext context) { - return const HeatmapLayerBody(); + return const HeatmapBody(); } } -class HeatmapLayerBody extends StatefulWidget { - const HeatmapLayerBody(); +class HeatmapBody extends StatefulWidget { + const HeatmapBody(); @override - State createState() => HeatmapLayerBodyState(); + State createState() => HeatmapBodyState(); } -class HeatmapLayerBodyState extends State { +class HeatmapBodyState extends State { static const LatLng sanFrancisco = LatLng(37.774546, -122.433523); List disabledPoints = [ @@ -79,9 +79,9 @@ class HeatmapLayerBodyState extends State { target: sanFrancisco, zoom: 13, ), - heatmapLayers: { - HeatmapLayer( - heatmapLayerId: const HeatmapLayerId('test'), + heatmaps: { + Heatmap( + heatmapId: const HeatmapId('test'), data: enabledPoints, ) }), diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart index 0e883aee5ec2..3febce512fed 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart @@ -10,7 +10,7 @@ import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter_example/lite_mode.dart'; import 'animate_camera.dart'; -import 'heatmap_layer.dart'; +import 'heatmap.dart'; import 'map_click.dart'; import 'map_coordinates.dart'; import 'map_ui.dart'; @@ -42,7 +42,7 @@ final List _allPages = [ const SnapshotPage(), const LiteModePage(), const TileOverlayPage(), - const HeatmapLayerPage(), + const HeatmapPage(), ]; class MapsDemo extends StatelessWidget { 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 3a3a67b608bd..717da1b5ac5a 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 @@ -27,8 +27,8 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf Cap, Circle, CircleId, - HeatmapLayer, - HeatmapLayerId, + Heatmap, + HeatmapId, InfoWindow, JointType, LatLng, 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 f612a761c63f..7b4e68cd225c 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 @@ -154,16 +154,16 @@ class GoogleMapController { .updateCircles(circleUpdates, mapId: mapId); } - /// Updates heatmap layer configuration. + /// Updates heatmap 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 _updateHeatmapLayers(HeatmapLayerUpdates heatmapLayerUpdates) { - assert(heatmapLayerUpdates != null); + Future _updateHeatmaps(HeatmapUpdates heatmapUpdates) { + assert(heatmapUpdates != null); return GoogleMapsFlutterPlatform.instance - .updateHeatmapLayers(heatmapLayerUpdates, mapId: mapId); + .updateHeatmaps(heatmapUpdates, mapId: mapId); } /// Updates tile overlays configuration. 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 2833ae98d1ea..7f83c1c7ad39 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 @@ -113,7 +113,7 @@ class GoogleMap extends StatefulWidget { this.polygons = const {}, this.polylines = const {}, this.circles = const {}, - this.heatmapLayers = const {}, + this.heatmaps = const {}, this.onCameraMoveStarted, this.tileOverlays = const {}, this.onCameraMove, @@ -192,8 +192,8 @@ class GoogleMap extends StatefulWidget { /// Circles to be placed on the map. final Set circles; - /// Heatmap layers to show on the map. - final Set heatmapLayers; + /// Heatmaps to show on the map. + final Set heatmaps; /// Tile overlays to be placed on the map. final Set tileOverlays; @@ -298,8 +298,7 @@ class _GoogleMapState extends State { Map _polygons = {}; Map _polylines = {}; Map _circles = {}; - Map _heatmapLayers = - {}; + Map _heatmaps = {}; late _GoogleMapOptions _googleMapOptions; @override @@ -315,7 +314,7 @@ class _GoogleMapState extends State { polygons: widget.polygons, polylines: widget.polylines, circles: widget.circles, - heatmapLayers: widget.heatmapLayers, + heatmaps: widget.heatmaps, gestureRecognizers: widget.gestureRecognizers, mapOptions: _googleMapOptions.toMap(), ); @@ -329,7 +328,7 @@ class _GoogleMapState extends State { _polygons = keyByPolygonId(widget.polygons); _polylines = keyByPolylineId(widget.polylines); _circles = keyByCircleId(widget.circles); - _heatmapLayers = keyByHeatmapLayerId(widget.heatmapLayers); + _heatmaps = keyByHeatmapId(widget.heatmaps); } @override @@ -351,7 +350,7 @@ class _GoogleMapState extends State { _updatePolygons(); _updatePolylines(); _updateCircles(); - _updateHeatmapLayers(); + _updateHeatmaps(); _updateTileOverlays(); } @@ -400,14 +399,13 @@ class _GoogleMapState extends State { _circles = keyByCircleId(widget.circles); } - Future _updateHeatmapLayers() async { + Future _updateHeatmaps() async { final GoogleMapController controller = await _controller.future; // ignore: unawaited_futures - controller._updateHeatmapLayers( - HeatmapLayerUpdates.from( - _heatmapLayers.values.toSet(), widget.heatmapLayers), + controller._updateHeatmaps( + HeatmapUpdates.from(_heatmaps.values.toSet(), widget.heatmaps), ); - _heatmapLayers = keyByHeatmapLayerId(widget.heatmapLayers); + _heatmaps = keyByHeatmapId(widget.heatmaps); } Future _updateTileOverlays() async { diff --git a/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart b/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart index 1dc09720389c..ec93632ffcca 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart @@ -21,7 +21,7 @@ class FakePlatformGoogleMap { updatePolygons(params); updatePolylines(params); updateCircles(params); - updateHeatmapLayers(params); + updateHeatmaps(params); updateTileOverlays(Map.castFrom(params)); } @@ -87,11 +87,11 @@ class FakePlatformGoogleMap { Set circlesToChange = {}; - Set heatmapLayerIdsToRemove = {}; + Set heatmapIdsToRemove = {}; - Set heatmapLayersToAdd = {}; + Set heatmapsToAdd = {}; - Set heatmapLayersToChange = {}; + Set heatmapsToChange = {}; Set tileOverlayIdsToRemove = {}; @@ -120,8 +120,8 @@ class FakePlatformGoogleMap { case 'circles#update': updateCircles(call.arguments as Map?); return Future.sync(() {}); - case 'heatmapLayers#update': - updateHeatmapLayers(call.arguments as Map?); + case 'heatmaps#update': + updateHeatmaps(call.arguments as Map?); return Future.sync(() {}); default: return Future.sync(() {}); @@ -299,16 +299,14 @@ class FakePlatformGoogleMap { circlesToChange = _deserializeCircles(circleUpdates['circlesToChange']); } - void updateHeatmapLayers(Map? heatmapLayerUpdates) { - if (heatmapLayerUpdates == null) { + void updateHeatmaps(Map? heatmapUpdates) { + if (heatmapUpdates == null) { return; } - heatmapLayersToAdd = - _deserializeHeatmapLayers(heatmapLayerUpdates['heatmapLayersToAdd']); - heatmapLayerIdsToRemove = _deserializeHeatmapLayerIds( - heatmapLayerUpdates['heatmapLayerIdsToRemove'] as List?); - heatmapLayersToChange = - _deserializeHeatmapLayers(heatmapLayerUpdates['heatmapLayersToChange']); + heatmapsToAdd = _deserializeHeatmaps(heatmapUpdates['heatmapsToAdd']); + heatmapIdsToRemove = _deserializeHeatmapIds( + heatmapUpdates['heatmapIdsToRemove'] as List?); + heatmapsToChange = _deserializeHeatmaps(heatmapUpdates['heatmapsToChange']); } void updateTileOverlays(Map updateTileOverlayUpdates) { @@ -369,46 +367,44 @@ class FakePlatformGoogleMap { return result; } - Set _deserializeHeatmapLayerIds( - List? heatmapLayerIds) { - if (heatmapLayerIds == null) { - return {}; + Set _deserializeHeatmapIds(List? heatmapIds) { + if (heatmapIds == null) { + return {}; } - return heatmapLayerIds + return heatmapIds .map( - (dynamic heatmapLayerId) => HeatmapLayerId(heatmapLayerId as String), + (dynamic heatmapId) => HeatmapId(heatmapId as String), ) .toSet(); } - Set _deserializeHeatmapLayers(dynamic heatmapLayers) { - if (heatmapLayers == null) { - return {}; + Set _deserializeHeatmaps(dynamic heatmaps) { + if (heatmaps == null) { + return {}; } - final List heatmapLayersData = heatmapLayers as List; - final Set result = {}; - for (final Map heatmapLayerData - in heatmapLayersData.cast>()) { - final String heatmapLayerId = - heatmapLayerData['heatmapLayerId'] as String; + final List heatmapsData = heatmaps as List; + final Set result = {}; + for (final Map heatmapData + in heatmapsData.cast>()) { + final String heatmapId = heatmapData['heatmapId'] as String; - final List dataData = heatmapLayerData['data'] as List; + final List dataData = heatmapData['data'] as List; final List data = dataData.map((dynamic e) => WeightedLatLng.fromJson(e)!).toList(); - final bool dissipating = heatmapLayerData['dissipating'] as bool; + final bool dissipating = heatmapData['dissipating'] as bool; final List? gradientData = - heatmapLayerData['gradient'] as List?; + heatmapData['gradient'] as List?; final List? gradient = gradientData?.cast().map((int e) => Color(e)).toList(); - final double? maxIntensity = heatmapLayerData['maxIntensity'] as double?; - final double opacity = heatmapLayerData['opacity'] as double; - final int? radius = heatmapLayerData['radius'] as int?; + final double? maxIntensity = heatmapData['maxIntensity'] as double?; + final double opacity = heatmapData['opacity'] as double; + final int? radius = heatmapData['radius'] as int?; - result.add(HeatmapLayer( - heatmapLayerId: HeatmapLayerId(heatmapLayerId), + result.add(Heatmap( + heatmapId: HeatmapId(heatmapId), data: data, dissipating: dissipating, gradient: gradient, diff --git a/packages/google_maps_flutter/google_maps_flutter/test/map_creation_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/map_creation_test.dart index f5912a4fd290..15c19d52eb2f 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/map_creation_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/map_creation_test.dart @@ -118,8 +118,8 @@ class TestGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform { }) async {} @override - Future updateHeatmapLayers( - HeatmapLayerUpdates heatmapLayerUpdates, { + Future updateHeatmaps( + HeatmapUpdates heatmapUpdates, { required int mapId, }) async {} @@ -290,7 +290,7 @@ class TestGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, 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 5089a63f9a59..66669eaa8d76 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 @@ -325,14 +325,14 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { } @override - Future updateHeatmapLayers( - HeatmapLayerUpdates heatmapLayerUpdates, { + Future updateHeatmaps( + HeatmapUpdates heatmapUpdates, { required int mapId, }) { - assert(heatmapLayerUpdates != null); + assert(heatmapUpdates != null); return channel(mapId).invokeMethod( - 'heatmapLayers#update', - heatmapLayerUpdates.toJson(), + 'heatmaps#update', + heatmapUpdates.toJson(), ); } @@ -502,7 +502,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers, Map mapOptions = const {}, @@ -514,7 +514,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { 'polygonsToAdd': serializePolygonSet(polygons), 'polylinesToAdd': serializePolylineSet(polylines), 'circlesToAdd': serializeCircleSet(circles), - 'heatmapLayersToAdd': serializeHeatmapLayerSet(heatmapLayers), + 'heatmapsToAdd': serializeHeatmapSet(heatmaps), 'tileOverlaysToAdd': serializeTileOverlaySet(tileOverlays), }; @@ -586,7 +586,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers, Map mapOptions = const {}, @@ -600,7 +600,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform { polygons: polygons, polylines: polylines, circles: circles, - heatmapLayers: heatmapLayers, + heatmaps: heatmaps, tileOverlays: tileOverlays, gestureRecognizers: gestureRecognizers, mapOptions: mapOptions, 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 ab2ade3f61c1..6f219dcc8f5c 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 @@ -115,17 +115,17 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { throw UnimplementedError('updateCircles() has not been implemented.'); } - /// Updates heatmap layer configuration. + /// Updates heatmap 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 updateHeatmapLayers( - HeatmapLayerUpdates heatmapLayerUpdates, { + Future updateHeatmaps( + HeatmapUpdates heatmapUpdates, { required int mapId, }) { - throw UnimplementedError('updateHeatmapLayers() has not been implemented.'); + throw UnimplementedError('updateHeatmaps() has not been implemented.'); } /// Updates tile overlay configuration. @@ -370,7 +370,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, @@ -399,7 +399,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers, Map mapOptions = const {}, @@ -412,7 +412,7 @@ abstract class GoogleMapsFlutterPlatform extends PlatformInterface { polygons: polygons, polylines: polylines, circles: circles, - heatmapLayers: heatmapLayers, + heatmaps: heatmaps, tileOverlays: tileOverlays, gestureRecognizers: gestureRecognizers, mapOptions: mapOptions, diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart similarity index 74% rename from packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart rename to packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart index 409e9deecf56..f4b81136abab 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart @@ -8,22 +8,22 @@ import 'package:flutter/foundation.dart' show immutable; import 'types.dart'; -/// Uniquely identifies a [HeatmapLayer] among [GoogleMap] heatmap layers. +/// Uniquely identifies a [Heatmap] among [GoogleMap] heatmaps. /// /// This does not have to be globally unique, only unique among the list. @immutable -class HeatmapLayerId extends MapsObjectId { - /// Creates an immutable identifier for a [HeatmapLayer]. - const HeatmapLayerId(String value) : super(value); +class HeatmapId extends MapsObjectId { + /// Creates an immutable identifier for a [Heatmap]. + const HeatmapId(String value) : super(value); } -/// Draws a heatmap layer on the map. +/// Draws a heatmap on the map. @immutable -class HeatmapLayer implements MapsObject { - /// Creates an immutable representation of a [HeatmapLayer] to draw on +class Heatmap implements MapsObject { + /// Creates an immutable representation of a [Heatmap] to draw on /// [GoogleMap]. - const HeatmapLayer({ - required this.heatmapLayerId, + const Heatmap({ + required this.heatmapId, this.data = const [], this.dissipating = true, this.gradient, @@ -32,11 +32,11 @@ class HeatmapLayer implements MapsObject { this.radius, }); - /// Uniquely identifies a [HeatmapLayer]. - final HeatmapLayerId heatmapLayerId; + /// Uniquely identifies a [Heatmap]. + final HeatmapId heatmapId; @override - HeatmapLayerId get mapsId => heatmapLayerId; + HeatmapId get mapsId => heatmapId; /// The data points to display. final List data; @@ -45,7 +45,7 @@ class HeatmapLayer implements MapsObject { /// influence of a data point is specified by the radius option only. When /// dissipating is disabled, the radius option is interpreted as a radius at /// zoom level 0. - /// + /// /// TODO: Not on android final bool dissipating; @@ -65,9 +65,9 @@ class HeatmapLayer implements MapsObject { /// The radius of influence for each data point, in pixels. final int? radius; - /// Creates a new [HeatmapLayer] object whose values are the same as this + /// Creates a new [Heatmap] object whose values are the same as this /// instance, unless overwritten by the specified parameters. - HeatmapLayer copyWith({ + Heatmap copyWith({ List? dataParam, bool? dissipatingParam, List? gradientParam, @@ -75,8 +75,8 @@ class HeatmapLayer implements MapsObject { double? opacityParam, int? radiusParam, }) { - return HeatmapLayer( - heatmapLayerId: heatmapLayerId, + return Heatmap( + heatmapId: heatmapId, data: dataParam ?? data, dissipating: dissipatingParam ?? dissipating, gradient: gradientParam ?? gradient, @@ -86,9 +86,9 @@ class HeatmapLayer implements MapsObject { ); } - /// Creates a new [HeatmapLayer] object whose values are the same as this + /// Creates a new [Heatmap] object whose values are the same as this /// instance. - HeatmapLayer clone() => copyWith( + Heatmap clone() => copyWith( dataParam: List.of(data), gradientParam: gradient != null ? List.of(gradient!) : null, ); @@ -103,7 +103,7 @@ class HeatmapLayer implements MapsObject { } } - addIfPresent('heatmapLayerId', heatmapLayerId.value); + addIfPresent('heatmapId', heatmapId.value); addIfPresent('data', data.map((e) => e.toJson())); addIfPresent('dissipating', dissipating); addIfPresent('gradient', gradient?.map((e) => e.value)); @@ -118,8 +118,8 @@ class HeatmapLayer implements MapsObject { bool operator ==(Object other) { if (identical(this, other)) return true; if (other.runtimeType != runtimeType) return false; - final HeatmapLayer typedOther = other as HeatmapLayer; - return heatmapLayerId == typedOther.heatmapLayerId && + final Heatmap typedOther = other as Heatmap; + return heatmapId == typedOther.heatmapId && listEquals(data, typedOther.data) && dissipating == typedOther.dissipating && listEquals(gradient, typedOther.gradient) && @@ -129,5 +129,5 @@ class HeatmapLayer implements MapsObject { } @override - int get hashCode => heatmapLayerId.hashCode; + int get hashCode => heatmapId.hashCode; } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart deleted file mode 100644 index 4a750c7f8101..000000000000 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_layer_updates.dart +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2013 The Flutter 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'; - -/// [HeatmapLayer] update events to be applied to the [GoogleMap]. -/// -/// Used in [GoogleMapController] when the map is updated. -// (Do not re-export) -class HeatmapLayerUpdates extends MapsObjectUpdates { - /// Computes [HeatmapLayerUpdates] given previous and current [HeatmapLayer]s. - HeatmapLayerUpdates.from( - Set previous, - Set current, - ) : super.from(previous, current, objectName: 'heatmapLayer'); - - /// Set of HeatmapLayers to be added in this update. - Set get heatmapLayersToAdd => objectsToAdd; - - /// Set of HeatmapLayers to be removed in this update. - Set get heatmapLayerIdsToRemove => - objectIdsToRemove.cast(); - - /// Set of HeatmapLayers to be changed in this update. - Set get heatmapLayersToChange => objectsToChange; -} diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_updates.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_updates.dart new file mode 100644 index 000000000000..06a6d1e3fa67 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap_updates.dart @@ -0,0 +1,26 @@ +// Copyright 2013 The Flutter 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'; + +/// [Heatmap] update events to be applied to the [GoogleMap]. +/// +/// Used in [GoogleMapController] when the map is updated. +// (Do not re-export) +class HeatmapUpdates extends MapsObjectUpdates { + /// Computes [HeatmapUpdates] given previous and current [Heatmap]s. + HeatmapUpdates.from( + Set previous, + Set current, + ) : super.from(previous, current, objectName: 'heatmap'); + + /// Set of Heatmaps to be added in this update. + Set get heatmapsToAdd => objectsToAdd; + + /// Set of Heatmaps to be removed in this update. + Set get heatmapIdsToRemove => objectIdsToRemove.cast(); + + /// Set of Heatmaps to be changed in this update. + Set get heatmapsToChange => objectsToChange; +} 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 02093237a25f..c0937dfc818f 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 @@ -9,8 +9,8 @@ export 'camera.dart'; export 'cap.dart'; export 'circle_updates.dart'; export 'circle.dart'; -export 'heatmap_layer_updates.dart'; -export 'heatmap_layer.dart'; +export 'heatmap_updates.dart'; +export 'heatmap.dart'; export 'joint_type.dart'; export 'location.dart'; export 'maps_object_updates.dart'; @@ -30,7 +30,7 @@ export 'ui.dart'; // Export the utils, they're used by the Widget export 'utils/circle.dart'; -export 'utils/heatmap_layer.dart'; +export 'utils/heatmap.dart'; export 'utils/marker.dart'; export 'utils/polygon.dart'; export 'utils/polyline.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap.dart new file mode 100644 index 000000000000..ff6e7944601f --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap.dart @@ -0,0 +1,19 @@ +// Copyright 2013 The Flutter 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'; +import 'maps_object.dart'; + +/// Converts an [Iterable] of Heatmaps in a Map of +/// HeatmapId -> Heatmap. +Map keyByHeatmapId( + Iterable heatmaps, +) { + return keyByMapsObjectId(heatmaps).cast(); +} + +/// Converts a Set of Heatmaps into something serializable in JSON. +Object serializeHeatmapSet(Set heatmaps) { + return serializeMapsObjectSet(heatmaps); +} diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart deleted file mode 100644 index 99e466fb5eaa..000000000000 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/heatmap_layer.dart +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2013 The Flutter 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'; -import 'maps_object.dart'; - -/// Converts an [Iterable] of HeatmapLayers in a Map of -/// HeatmapLayerId -> HeatmapLayer. -Map keyByHeatmapLayerId( - Iterable heatmapLayers, -) { - return keyByMapsObjectId(heatmapLayers) - .cast(); -} - -/// Converts a Set of HeatmapLayers into something serializable in JSON. -Object serializeHeatmapLayerSet(Set heatmapLayers) { - return serializeMapsObjectSet(heatmapLayers); -} diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart index 0344508351bf..c3b4444aeb47 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/platform_interface/google_maps_flutter_platform_test.dart @@ -80,7 +80,7 @@ class BuildViewGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, diff --git a/packages/google_maps_flutter/google_maps_flutter_web/README.md b/packages/google_maps_flutter/google_maps_flutter_web/README.md index f4ec5ab8a524..8bece2669099 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/README.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/README.md @@ -26,7 +26,7 @@ Modify the `` tag of your `web/index.html` to load the Google Maps JavaScr Now you should be able to use the Google Maps plugin normally. -To use heatmap layers, add `&libraries=visualization` to the end of the URL. +To use heatmaps, add `&libraries=visualization` to the end of the URL. ## Limitations of the web version diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart index 36eca77ac88a..d81f80ddb86a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart @@ -24,7 +24,8 @@ import 'package:stream_transform/stream_transform.dart'; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:google_maps/google_maps.dart' as gmaps; -import 'package:google_maps/google_maps_visualization.dart' as gmaps_visualization; +import 'package:google_maps/google_maps_visualization.dart' + as gmaps_visualization; import 'src/third_party/to_screen_location/to_screen_location.dart'; import 'src/types.dart'; @@ -33,8 +34,8 @@ part 'src/google_maps_flutter_web.dart'; part 'src/google_maps_controller.dart'; part 'src/circle.dart'; part 'src/circles.dart'; -part 'src/heatmap_layer.dart'; -part 'src/heatmap_layers.dart'; +part 'src/heatmap.dart'; +part 'src/heatmaps.dart'; part 'src/polygon.dart'; part 'src/polygons.dart'; part 'src/polyline.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 8274e8a27abd..3cee75ccdf2e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -277,23 +277,23 @@ gmaps.CircleOptions _circleOptionsFromCircle(Circle circle) { return circleOptions; } -gmaps_visualization.HeatmapLayerOptions _heatmapLayerOptionsFromHeatmapLayer( - HeatmapLayer heatmapLayer, +gmaps_visualization.HeatmapLayerOptions _heatmapOptionsFromHeatmap( + Heatmap heatmap, ) { - final heatmapLayerOptions = gmaps_visualization.HeatmapLayerOptions() - ..data = heatmapLayer.data + final heatmapOptions = gmaps_visualization.HeatmapLayerOptions() + ..data = heatmap.data .map( (e) => gmaps_visualization.WeightedLocation() ..location = gmaps.LatLng(e.location.latitude, e.location.longitude) ..weight = e.weight, ) .toList() - ..dissipating = heatmapLayer.dissipating - ..gradient = heatmapLayer.gradient?.map(_getCssColor).toList() - ..maxIntensity = heatmapLayer.maxIntensity - ..opacity = heatmapLayer.opacity - ..radius = heatmapLayer.radius; - return heatmapLayerOptions; + ..dissipating = heatmap.dissipating + ..gradient = heatmap.gradient?.map(_getCssColor).toList() + ..maxIntensity = heatmap.maxIntensity + ..opacity = heatmap.opacity + ..radius = heatmap.radius; + return heatmapOptions; } gmaps.PolygonOptions _polygonOptionsFromPolygon( diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart index 9a06ebcede26..30603afcec8e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart @@ -19,7 +19,7 @@ class GoogleMapController { final Set _polygons; final Set _polylines; final Set _circles; - final Set _heatmapLayers; + final Set _heatmaps; // The raw options passed by the user, before converting to gmaps. // Caching this allows us to re-create the map faithfully when needed. Map _rawMapOptions = {}; @@ -63,7 +63,7 @@ class GoogleMapController { // Geometry controllers, for different features of the map. CirclesController? _circlesController; - HeatmapLayersController? _heatmapLayersController; + HeatmapsController? _heatmapsController; PolygonsController? _polygonsController; PolylinesController? _polylinesController; MarkersController? _markersController; @@ -82,7 +82,7 @@ class GoogleMapController { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set> gestureRecognizers = const >{}, @@ -94,11 +94,10 @@ class GoogleMapController { _polygons = polygons, _polylines = polylines, _circles = circles, - _heatmapLayers = heatmapLayers, + _heatmaps = heatmaps, _rawMapOptions = mapOptions { _circlesController = CirclesController(stream: this._streamController); - _heatmapLayersController = - HeatmapLayersController(stream: this._streamController); + _heatmapsController = HeatmapsController(stream: this._streamController); _polygonsController = PolygonsController(stream: this._streamController); _polylinesController = PolylinesController(stream: this._streamController); _markersController = MarkersController(stream: this._streamController); @@ -123,14 +122,14 @@ class GoogleMapController { DebugCreateMapFunction? createMap, MarkersController? markers, CirclesController? circles, - HeatmapLayersController? heatmapLayers, + HeatmapsController? heatmaps, PolygonsController? polygons, PolylinesController? polylines, }) { _overrideCreateMap = createMap; _markersController = markers ?? _markersController; _circlesController = circles ?? _circlesController; - _heatmapLayersController = heatmapLayers ?? _heatmapLayersController; + _heatmapsController = heatmaps ?? _heatmapsController; _polygonsController = polygons ?? _polygonsController; _polylinesController = polylines ?? _polylinesController; } @@ -184,7 +183,7 @@ class GoogleMapController { _renderInitialGeometry( markers: _markers, circles: _circles, - heatmapLayers: _heatmapLayers, + heatmaps: _heatmaps, polygons: _polygons, polylines: _polylines, ); @@ -235,8 +234,8 @@ class GoogleMapController { // null. assert(_circlesController != null, 'Cannot attach a map to a null CirclesController instance.'); - assert(_heatmapLayersController != null, - 'Cannot attach a map to a null HeatmapLayersController instance.'); + assert(_heatmapsController != null, + 'Cannot attach a map to a null HeatmapsController instance.'); assert(_polygonsController != null, 'Cannot attach a map to a null PolygonsController instance.'); assert(_polylinesController != null, @@ -245,7 +244,7 @@ class GoogleMapController { 'Cannot attach a map to a null MarkersController instance.'); _circlesController!.bindToMap(_mapId, map); - _heatmapLayersController!.bindToMap(_mapId, map); + _heatmapsController!.bindToMap(_mapId, map); _polygonsController!.bindToMap(_mapId, map); _polylinesController!.bindToMap(_mapId, map); _markersController!.bindToMap(_mapId, map); @@ -257,7 +256,7 @@ class GoogleMapController { void _renderInitialGeometry({ Set markers = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set polygons = const {}, Set polylines = const {}, }) { @@ -272,7 +271,7 @@ class GoogleMapController { _markersController!.addMarkers(markers); _circlesController!.addCircles(circles); - _heatmapLayersController!.addHeatmapLayers(heatmapLayers); + _heatmapsController!.addHeatmaps(heatmaps); _polygonsController!.addPolygons(polygons); _polylinesController!.addPolylines(polylines); } @@ -369,21 +368,23 @@ class GoogleMapController { /// Applies [CircleUpdates] to the currently managed circles. void updateCircles(CircleUpdates updates) { assert( - _circlesController != null, 'Cannot update circles after dispose().'); + _circlesController != null, + 'Cannot update circles after dispose().', + ); _circlesController?.addCircles(updates.circlesToAdd); _circlesController?.changeCircles(updates.circlesToChange); _circlesController?.removeCircles(updates.circleIdsToRemove); } - /// Applies [HeatmapLayerUpdates] to the currently managed heatmap layers. - void updateHeatmapLayers(HeatmapLayerUpdates updates) { - assert(_heatmapLayersController != null, - 'Cannot update heatmap layers after dispose().'); - _heatmapLayersController?.addHeatmapLayers(updates.heatmapLayersToAdd); - _heatmapLayersController - ?.changeHeatmapLayers(updates.heatmapLayersToChange); - _heatmapLayersController - ?.removeHeatmapLayers(updates.heatmapLayerIdsToRemove); + /// Applies [HeatmapUpdates] to the currently managed heatmaps. + void updateHeatmaps(HeatmapUpdates updates) { + assert( + _heatmapsController != null, + 'Cannot update heatmaps after dispose().', + ); + _heatmapsController?.addHeatmaps(updates.heatmapsToAdd); + _heatmapsController?.changeHeatmaps(updates.heatmapsToChange); + _heatmapsController?.removeHeatmaps(updates.heatmapIdsToRemove); } /// Applies [PolygonUpdates] to the currently managed polygons. @@ -442,7 +443,7 @@ class GoogleMapController { _widget = null; _googleMap = null; _circlesController = null; - _heatmapLayersController = null; + _heatmapsController = null; _polygonsController = null; _polylinesController = null; _markersController = null; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart index 632be1d7b8e9..c6829f262f0c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_flutter_web.dart @@ -89,13 +89,13 @@ class GoogleMapsPlugin extends GoogleMapsFlutterPlatform { _map(mapId).updateCircles(circleUpdates); } - /// Applies the passed in `heatmapLayerUpdates` to the `mapId`. + /// Applies the passed in `heatmapUpdates` to the `mapId`. @override - Future updateHeatmapLayers( - HeatmapLayerUpdates heatmapLayerUpdates, { + Future updateHeatmaps( + HeatmapUpdates heatmapUpdates, { required int mapId, }) async { - _map(mapId).updateHeatmapLayers(heatmapLayerUpdates); + _map(mapId).updateHeatmaps(heatmapUpdates); } @override @@ -305,7 +305,7 @@ class GoogleMapsPlugin extends GoogleMapsFlutterPlatform { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmapLayers = const {}, + Set heatmaps = const {}, Set tileOverlays = const {}, Set>? gestureRecognizers = const >{}, @@ -327,7 +327,7 @@ class GoogleMapsPlugin extends GoogleMapsFlutterPlatform { polygons: polygons, polylines: polylines, circles: circles, - heatmapLayers: heatmapLayers, + heatmaps: heatmaps, mapOptions: mapOptions, )..init(); // Initialize the controller diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart new file mode 100644 index 000000000000..55c6d3febdc6 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart @@ -0,0 +1,34 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// 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_web; + +/// The `HeatmapController` class wraps a [gmaps_visualization.HeatmapLayer] and its `onTap` behavior. +class HeatmapController { + gmaps_visualization.HeatmapLayer? _heatmap; + + /// Creates a `HeatmapController`, which wraps a [gmaps_visualization.HeatmapLayer] object and its `onTap` behavior. + HeatmapController({required gmaps_visualization.HeatmapLayer heatmap}) + : _heatmap = heatmap; + + /// Returns the wrapped [gmaps_visualization.Heatmap]. Only used for testing. + @visibleForTesting + gmaps_visualization.HeatmapLayer? get heatmap => _heatmap; + + /// Updates the options of the wrapped [gmaps_visualization.HeatmapLayer] object. + /// + /// This cannot be called after [remove]. + void update(gmaps_visualization.HeatmapLayerOptions options) { + assert(_heatmap != null, 'Cannot `update` Heatmap after calling `remove`.'); + _heatmap!.options = options; + } + + /// Disposes of the currently wrapped [gmaps_visualization.HeatmapLayer]. + void remove() { + if (_heatmap != null) { + _heatmap!.map = null; + _heatmap = null; + } + } +} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart deleted file mode 100644 index 8d8b3654cbd0..000000000000 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layer.dart +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// 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_web; - -/// The `HeatmapLayerController` class wraps a [gmaps_visualization.HeatmapLayer] and its `onTap` behavior. -class HeatmapLayerController { - gmaps_visualization.HeatmapLayer? _heatmapLayer; - - /// Creates a `HeatmapLayerController`, which wraps a [gmaps_visualization.HeatmapLayer] object and its `onTap` behavior. - HeatmapLayerController({required gmaps_visualization.HeatmapLayer heatmapLayer}) - : _heatmapLayer = heatmapLayer; - - /// Returns the wrapped [gmaps_visualization.HeatmapLayer]. Only used for testing. - @visibleForTesting - gmaps_visualization.HeatmapLayer? get heatmapLayer => _heatmapLayer; - - /// Updates the options of the wrapped [gmaps_visualization.HeatmapLayer] object. - /// - /// This cannot be called after [remove]. - void update(gmaps_visualization.HeatmapLayerOptions options) { - assert(_heatmapLayer != null, - 'Cannot `update` HeatmapLayer after calling `remove`.'); - _heatmapLayer!.options = options; - } - - /// Disposes of the currently wrapped [gmaps_visualization.HeatmapLayer]. - void remove() { - if (_heatmapLayer != null) { - _heatmapLayer!.map = null; - _heatmapLayer = null; - } - } -} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart deleted file mode 100644 index 6b35c9083c97..000000000000 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap_layers.dart +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// 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_web; - -/// This class manages all the [HeatmapLayerController]s associated to a [GoogleMapController]. -class HeatmapLayersController extends GeometryController { - // A cache of [HeatmapLayerController]s indexed by their [HeatmapLayerId]. - final Map _heatmapLayerIdToController; - - // The stream over which heatmapLayers broadcast their events - StreamController _streamController; - - /// Initialize the cache. The [StreamController] comes from the [GoogleMapController], and is shared with other controllers. - HeatmapLayersController({ - required StreamController stream, - }) : _streamController = stream, - _heatmapLayerIdToController = - Map(); - - /// Returns the cache of [HeatmapLayerController]s. Test only. - @visibleForTesting - Map get heatmapLayers => - _heatmapLayerIdToController; - - /// Adds a set of [HeatmapLayer] objects to the cache. - /// - /// Wraps each [HeatmapLayer] into its corresponding [HeatmapLayerController]. - void addHeatmapLayers(Set heatmapLayersToAdd) { - heatmapLayersToAdd.forEach((heatmapLayer) { - _addHeatmapLayer(heatmapLayer); - }); - } - - void _addHeatmapLayer(HeatmapLayer heatmapLayer) { - if (heatmapLayer == null) { - return; - } - - final populationOptions = - _heatmapLayerOptionsFromHeatmapLayer(heatmapLayer); - gmaps_visualization.HeatmapLayer gmHeatmapLayer = - gmaps_visualization.HeatmapLayer(populationOptions); - gmHeatmapLayer.map = googleMap; - HeatmapLayerController controller = - HeatmapLayerController(heatmapLayer: gmHeatmapLayer); - _heatmapLayerIdToController[heatmapLayer.heatmapLayerId] = controller; - } - - /// Updates a set of [HeatmapLayer] objects with new options. - void changeHeatmapLayers(Set heatmapLayersToChange) { - heatmapLayersToChange.forEach((heatmapLayerToChange) { - _changeHeatmapLayer(heatmapLayerToChange); - }); - } - - void _changeHeatmapLayer(HeatmapLayer heatmapLayer) { - final heatmapLayerController = - _heatmapLayerIdToController[heatmapLayer.heatmapLayerId]; - heatmapLayerController - ?.update(_heatmapLayerOptionsFromHeatmapLayer(heatmapLayer)); - } - - /// Removes a set of [HeatmapLayerId]s from the cache. - void removeHeatmapLayers(Set heatmapLayerIdsToRemove) { - heatmapLayerIdsToRemove.forEach((heatmapLayerId) { - final HeatmapLayerController? heatmapLayerController = - _heatmapLayerIdToController[heatmapLayerId]; - heatmapLayerController?.remove(); - _heatmapLayerIdToController.remove(heatmapLayerId); - }); - } -} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart new file mode 100644 index 000000000000..490bbf69831e --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart @@ -0,0 +1,68 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// 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_web; + +/// This class manages all the [HeatmapController]s associated to a [GoogleMapController]. +class HeatmapsController extends GeometryController { + // A cache of [HeatmapController]s indexed by their [HeatmapId]. + final Map _heatmapIdToController; + + // The stream over which heatmaps broadcast their events + StreamController _streamController; + + /// Initialize the cache. The [StreamController] comes from the [GoogleMapController], and is shared with other controllers. + HeatmapsController({ + required StreamController stream, + }) : _streamController = stream, + _heatmapIdToController = Map(); + + /// Returns the cache of [HeatmapController]s. Test only. + @visibleForTesting + Map get heatmaps => _heatmapIdToController; + + /// Adds a set of [Heatmap] objects to the cache. + /// + /// Wraps each [Heatmap] into its corresponding [HeatmapController]. + void addHeatmaps(Set heatmapsToAdd) { + heatmapsToAdd.forEach((heatmap) { + _addHeatmap(heatmap); + }); + } + + void _addHeatmap(Heatmap heatmap) { + if (heatmap == null) { + return; + } + + final populationOptions = _heatmapOptionsFromHeatmap(heatmap); + gmaps_visualization.HeatmapLayer gmHeatmap = + gmaps_visualization.HeatmapLayer(populationOptions); + gmHeatmap.map = googleMap; + HeatmapController controller = HeatmapController(heatmap: gmHeatmap); + _heatmapIdToController[heatmap.heatmapId] = controller; + } + + /// Updates a set of [Heatmap] objects with new options. + void changeHeatmaps(Set heatmapsToChange) { + heatmapsToChange.forEach((heatmapToChange) { + _changeHeatmap(heatmapToChange); + }); + } + + void _changeHeatmap(Heatmap heatmap) { + final heatmapController = _heatmapIdToController[heatmap.heatmapId]; + heatmapController?.update(_heatmapOptionsFromHeatmap(heatmap)); + } + + /// Removes a set of [HeatmapId]s from the cache. + void removeHeatmaps(Set heatmapIdsToRemove) { + heatmapIdsToRemove.forEach((heatmapId) { + final HeatmapController? heatmapController = + _heatmapIdToController[heatmapId]; + heatmapController?.remove(); + _heatmapIdToController.remove(heatmapId); + }); + } +} From 09c1fabe2a1e20a72b7132e4d9e3a82e29a4e4dd Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 17:48:28 -0400 Subject: [PATCH 07/94] Android works --- .../java/io/flutter/plugins/googlemaps/GoogleMapFactory.java | 3 +++ .../google_maps_flutter/example/lib/heatmap.dart | 4 ++-- .../lib/src/types/heatmap.dart | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java index ca9ac184a76e..7fe6347010fa 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java @@ -47,6 +47,9 @@ public PlatformView create(Context context, int id, Object args) { if (params.containsKey("circlesToAdd")) { builder.setInitialCircles(params.get("circlesToAdd")); } + if (params.containsKey("heatmapsToAdd")) { + builder.setInitialHeatmaps(params.get("heatmapsToAdd")); + } if (params.containsKey("tileOverlaysToAdd")) { builder.setInitialTileOverlays((List>) params.get("tileOverlaysToAdd")); } diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart index 2878e10b9e8a..050d24b3cda3 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart @@ -23,7 +23,7 @@ class HeatmapBody extends StatefulWidget { class HeatmapBodyState extends State { static const LatLng sanFrancisco = LatLng(37.774546, -122.433523); - List disabledPoints = [ + List enabledPoints = [ WeightedLatLng(37.782, -122.447), WeightedLatLng(37.782, -122.445), WeightedLatLng(37.782, -122.443), @@ -40,7 +40,7 @@ class HeatmapBodyState extends State { WeightedLatLng(37.785, -122.435) ]; - List enabledPoints = []; + List disabledPoints = []; void _addPoint() { if (disabledPoints.isEmpty) { diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart index f4b81136abab..6b0278036ebc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart @@ -104,7 +104,7 @@ class Heatmap implements MapsObject { } addIfPresent('heatmapId', heatmapId.value); - addIfPresent('data', data.map((e) => e.toJson())); + addIfPresent('data', data.map((e) => e.toJson()).toList()); addIfPresent('dissipating', dissipating); addIfPresent('gradient', gradient?.map((e) => e.value)); addIfPresent('maxIntensity', maxIntensity); From cf29213f105edad428bfd9032e1e17cb5725d91a Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 19:59:54 -0400 Subject: [PATCH 08/94] Java formatting --- .../flutter/plugins/googlemaps/Convert.java | 1 - .../googlemaps/GoogleMapController.java | 12 +- .../plugins/googlemaps/HeatmapBuilder.java | 69 +++++---- .../plugins/googlemaps/HeatmapController.java | 83 ++++++----- .../googlemaps/HeatmapOptionsSink.java | 11 +- .../googlemaps/HeatmapsController.java | 137 +++++++++--------- .../googlemaps/TileProviderController.java | 3 +- 7 files changed, 158 insertions(+), 158 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java index b8ceae8e3337..ef16fc815d32 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java @@ -26,7 +26,6 @@ import com.google.android.gms.maps.model.Tile; import com.google.maps.android.heatmaps.Gradient; import com.google.maps.android.heatmaps.WeightedLatLng; - import io.flutter.view.FlutterMain; import java.util.ArrayList; import java.util.Arrays; diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java index 96e061de1ca2..56edb5bda830 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java @@ -545,17 +545,21 @@ private void setGoogleMapListener(@Nullable GoogleMapListener listener) { } // @Override - // The minimum supported version of Flutter doesn't have this method on the PlatformView interface, but the maximum + // The minimum supported version of Flutter doesn't have this method on the PlatformView + // interface, but the maximum // does. This will override it when available even with the annotation commented out. public void onInputConnectionLocked() { - // TODO(mklim): Remove this empty override once https://github.com/flutter/flutter/issues/40126 is fixed in stable. + // TODO(mklim): Remove this empty override once https://github.com/flutter/flutter/issues/40126 + // is fixed in stable. } // @Override - // The minimum supported version of Flutter doesn't have this method on the PlatformView interface, but the maximum + // The minimum supported version of Flutter doesn't have this method on the PlatformView + // interface, but the maximum // does. This will override it when available even with the annotation commented out. public void onInputConnectionUnlocked() { - // TODO(mklim): Remove this empty override once https://github.com/flutter/flutter/issues/40126 is fixed in stable. + // TODO(mklim): Remove this empty override once https://github.com/flutter/flutter/issues/40126 + // is fixed in stable. } // DefaultLifecycleObserver diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java index 5e6ceeb3890f..c22d195fd288 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java @@ -3,42 +3,41 @@ import com.google.maps.android.heatmaps.Gradient; import com.google.maps.android.heatmaps.HeatmapTileProvider; import com.google.maps.android.heatmaps.WeightedLatLng; - import java.util.List; public class HeatmapBuilder implements HeatmapOptionsSink { - private final HeatmapTileProvider.Builder heatmapOptions; - - HeatmapBuilder() { - this.heatmapOptions = new HeatmapTileProvider.Builder(); - } - - HeatmapTileProvider build() { - return heatmapOptions.build(); - } - - @Override - public void setWeightedData(List weightedData) { - heatmapOptions.weightedData(weightedData); - } - - @Override - public void setGradient(Gradient gradient) { - heatmapOptions.gradient(gradient); - } - - @Override - public void setMaxIntensity(double maxIntensity) { - heatmapOptions.maxIntensity(maxIntensity); - } - - @Override - public void setOpacity(double opacity) { - heatmapOptions.opacity(opacity); - } - - @Override - public void setRadius(int radius) { - heatmapOptions.radius(radius); - } + private final HeatmapTileProvider.Builder heatmapOptions; + + HeatmapBuilder() { + this.heatmapOptions = new HeatmapTileProvider.Builder(); + } + + HeatmapTileProvider build() { + return heatmapOptions.build(); + } + + @Override + public void setWeightedData(List weightedData) { + heatmapOptions.weightedData(weightedData); + } + + @Override + public void setGradient(Gradient gradient) { + heatmapOptions.gradient(gradient); + } + + @Override + public void setMaxIntensity(double maxIntensity) { + heatmapOptions.maxIntensity(maxIntensity); + } + + @Override + public void setOpacity(double opacity) { + heatmapOptions.opacity(opacity); + } + + @Override + public void setRadius(int radius) { + heatmapOptions.radius(radius); + } } diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java index c60ffccd5a56..93217a627592 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java @@ -4,48 +4,47 @@ import com.google.maps.android.heatmaps.Gradient; import com.google.maps.android.heatmaps.HeatmapTileProvider; import com.google.maps.android.heatmaps.WeightedLatLng; - import java.util.List; public class HeatmapController implements HeatmapOptionsSink { - private final HeatmapTileProvider heatmap; - private final TileOverlay heatmapTileOverlay; - - HeatmapController(HeatmapTileProvider heatmap, TileOverlay heatmapTileOverlay) { - this.heatmap = heatmap; - this.heatmapTileOverlay = heatmapTileOverlay; - } - - void remove() { - heatmapTileOverlay.remove(); - } - - void clearTileCache() { - heatmapTileOverlay.clearTileCache(); - } - - @Override - public void setWeightedData(List weightedData) { - heatmap.setWeightedData(weightedData); - } - - @Override - public void setGradient(Gradient gradient) { - heatmap.setGradient(gradient); - } - - @Override - public void setMaxIntensity(double maxIntensity) { - heatmap.setMaxIntensity(maxIntensity); - } - - @Override - public void setOpacity(double opacity) { - heatmap.setOpacity(opacity); - } - - @Override - public void setRadius(int radius) { - heatmap.setRadius(radius); - } -} \ No newline at end of file + private final HeatmapTileProvider heatmap; + private final TileOverlay heatmapTileOverlay; + + HeatmapController(HeatmapTileProvider heatmap, TileOverlay heatmapTileOverlay) { + this.heatmap = heatmap; + this.heatmapTileOverlay = heatmapTileOverlay; + } + + void remove() { + heatmapTileOverlay.remove(); + } + + void clearTileCache() { + heatmapTileOverlay.clearTileCache(); + } + + @Override + public void setWeightedData(List weightedData) { + heatmap.setWeightedData(weightedData); + } + + @Override + public void setGradient(Gradient gradient) { + heatmap.setGradient(gradient); + } + + @Override + public void setMaxIntensity(double maxIntensity) { + heatmap.setMaxIntensity(maxIntensity); + } + + @Override + public void setOpacity(double opacity) { + heatmap.setOpacity(opacity); + } + + @Override + public void setRadius(int radius) { + heatmap.setRadius(radius); + } +} diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java index 44e0f4d3d59c..1e9fb894a938 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java @@ -2,18 +2,17 @@ import com.google.maps.android.heatmaps.Gradient; import com.google.maps.android.heatmaps.WeightedLatLng; - import java.util.List; /** Receiver of Heatmap configuration options. */ interface HeatmapOptionsSink { - void setWeightedData(List weightedData); + void setWeightedData(List weightedData); - void setGradient(Gradient gradient); + void setGradient(Gradient gradient); - void setMaxIntensity(double maxIntensity); + void setMaxIntensity(double maxIntensity); - void setOpacity(double opacity); + void setOpacity(double opacity); - void setRadius(int radius); + void setRadius(int radius); } diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java index 72b152fdbe8e..7c2a811e8fc1 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java @@ -4,94 +4,93 @@ import com.google.android.gms.maps.model.TileOverlay; import com.google.android.gms.maps.model.TileOverlayOptions; import com.google.maps.android.heatmaps.HeatmapTileProvider; - import java.util.HashMap; import java.util.List; import java.util.Map; public class HeatmapsController { - private final Map heatmapIdToController; - private GoogleMap googleMap; + private final Map heatmapIdToController; + private GoogleMap googleMap; - HeatmapsController() { - this.heatmapIdToController = new HashMap<>(); - } + HeatmapsController() { + this.heatmapIdToController = new HashMap<>(); + } - void setGoogleMap(GoogleMap googleMap) { - this.googleMap = googleMap; + void setGoogleMap(GoogleMap googleMap) { + this.googleMap = googleMap; + } + + void addHeatmaps(List heatmapsToAdd) { + if (heatmapsToAdd == null) { + return; + } + for (Object heatmapToAdd : heatmapsToAdd) { + addHeatmap(heatmapToAdd); } + } - void addHeatmaps(List heatmapsToAdd) { - if (heatmapsToAdd == null) { - return; - } - for (Object heatmapToAdd : heatmapsToAdd) { - addHeatmap(heatmapToAdd); - } + void changeHeatmaps(List heatmapsToChange) { + if (heatmapsToChange == null) { + return; } + for (Object heatmapToChange : heatmapsToChange) { + changeHeatmap(heatmapToChange); + } + } - void changeHeatmaps(List heatmapsToChange) { - if (heatmapsToChange == null) { - return; - } - for (Object heatmapToChange : heatmapsToChange) { - changeHeatmap(heatmapToChange); - } + void removeHeatmaps(List heatmapIdsToRemove) { + if (heatmapIdsToRemove == null) { + return; + } + for (Object rawHeatmapId : heatmapIdsToRemove) { + if (rawHeatmapId == null) { + continue; + } + String heatmapId = (String) rawHeatmapId; + final HeatmapController heatmapController = heatmapIdToController.remove(heatmapId); + if (heatmapController != null) { + heatmapController.remove(); + } } + } - void removeHeatmaps(List heatmapIdsToRemove) { - if (heatmapIdsToRemove == null) { - return; - } - for (Object rawHeatmapId : heatmapIdsToRemove) { - if (rawHeatmapId == null) { - continue; - } - String heatmapId = (String) rawHeatmapId; - final HeatmapController heatmapController = heatmapIdToController.remove(heatmapId); - if (heatmapController != null) { - heatmapController.remove(); - } - } + private void addHeatmap(Object heatmapOptions) { + if (heatmapOptions == null) { + return; } + HeatmapBuilder heatmapBuilder = new HeatmapBuilder(); + String heatmapId = Convert.interpretHeatmapOptions(heatmapOptions, heatmapBuilder); - private void addHeatmap(Object heatmapOptions) { - if (heatmapOptions == null) { - return; - } - HeatmapBuilder heatmapBuilder = new HeatmapBuilder(); - String heatmapId = - Convert.interpretHeatmapOptions(heatmapOptions, heatmapBuilder); + HeatmapTileProvider heatmap = heatmapBuilder.build(); + TileOverlay heatmapTileOverlay = + googleMap.addTileOverlay(new TileOverlayOptions().tileProvider(heatmap)); + HeatmapController heatmapController = new HeatmapController(heatmap, heatmapTileOverlay); + heatmapIdToController.put(heatmapId, heatmapController); + } - HeatmapTileProvider heatmap = heatmapBuilder.build(); - TileOverlay heatmapTileOverlay = googleMap.addTileOverlay(new TileOverlayOptions().tileProvider(heatmap)); - HeatmapController heatmapController = new HeatmapController(heatmap, heatmapTileOverlay); - heatmapIdToController.put(heatmapId, heatmapController); + private void changeHeatmap(Object heatmapOptions) { + if (heatmapOptions == null) { + return; } - - private void changeHeatmap(Object heatmapOptions) { - if (heatmapOptions == null) { - return; - } - String heatmapId = getHeatmapId(heatmapOptions); - HeatmapController heatmapController = heatmapIdToController.get(heatmapId); - if (heatmapController != null) { - Convert.interpretHeatmapOptions(heatmapOptions, heatmapController); - heatmapController.clearTileCache(); - } + String heatmapId = getHeatmapId(heatmapOptions); + HeatmapController heatmapController = heatmapIdToController.get(heatmapId); + if (heatmapController != null) { + Convert.interpretHeatmapOptions(heatmapOptions, heatmapController); + heatmapController.clearTileCache(); } + } - private void removeHeatmap(String heatmapId) { - HeatmapController heatmapController = heatmapIdToController.get(heatmapId); - if (heatmapController != null) { - heatmapController.remove(); - heatmapIdToController.remove(heatmapId); - } + private void removeHeatmap(String heatmapId) { + HeatmapController heatmapController = heatmapIdToController.get(heatmapId); + if (heatmapController != null) { + heatmapController.remove(); + heatmapIdToController.remove(heatmapId); } + } - @SuppressWarnings("unchecked") - private static String getHeatmapId(Object heatmap) { - Map heatmapMap = (Map) heatmap; - return (String) heatmapMap.get("heatmapId"); - } + @SuppressWarnings("unchecked") + private static String getHeatmapId(Object heatmap) { + Map heatmapMap = (Map) heatmap; + return (String) heatmapMap.get("heatmapId"); + } } diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/TileProviderController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/TileProviderController.java index 73530d1b5158..143cfc22c59e 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/TileProviderController.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/TileProviderController.java @@ -56,7 +56,8 @@ Tile getTile() { Convert.tileOverlayArgumentsToJson(tileOverlayId, x, y, zoom), this)); try { - // Because `methodChannel.invokeMethod` is async, we use a `countDownLatch` make it synchronized. + // Because `methodChannel.invokeMethod` is async, we use a `countDownLatch` make it + // synchronized. countDownLatch.await(); } catch (InterruptedException e) { Log.e( From b2436f568c05bb6d0bf9b4963f9af88802eea5fd Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 20:02:21 -0400 Subject: [PATCH 09/94] Fixed dart analysis --- .../lib/src/google_maps_controller.dart | 2 +- .../google_maps_flutter_web/lib/src/heatmaps.dart | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart index 30603afcec8e..4b917e8b02fa 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart @@ -97,7 +97,7 @@ class GoogleMapController { _heatmaps = heatmaps, _rawMapOptions = mapOptions { _circlesController = CirclesController(stream: this._streamController); - _heatmapsController = HeatmapsController(stream: this._streamController); + _heatmapsController = HeatmapsController(); _polygonsController = PolygonsController(stream: this._streamController); _polylinesController = PolylinesController(stream: this._streamController); _markersController = MarkersController(stream: this._streamController); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart index 490bbf69831e..811c4d1835c2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart @@ -9,14 +9,9 @@ class HeatmapsController extends GeometryController { // A cache of [HeatmapController]s indexed by their [HeatmapId]. final Map _heatmapIdToController; - // The stream over which heatmaps broadcast their events - StreamController _streamController; - - /// Initialize the cache. The [StreamController] comes from the [GoogleMapController], and is shared with other controllers. - HeatmapsController({ - required StreamController stream, - }) : _streamController = stream, - _heatmapIdToController = Map(); + /// Initialize the cache + HeatmapsController() + : _heatmapIdToController = Map(); /// Returns the cache of [HeatmapController]s. Test only. @visibleForTesting From 37c58ad06228103deccd7629afde78de1f69dfaf Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 14 Apr 2022 20:19:44 -0400 Subject: [PATCH 10/94] Added copyright text --- .../java/io/flutter/plugins/googlemaps/HeatmapBuilder.java | 4 ++++ .../java/io/flutter/plugins/googlemaps/HeatmapController.java | 4 ++++ .../io/flutter/plugins/googlemaps/HeatmapOptionsSink.java | 4 ++++ .../io/flutter/plugins/googlemaps/HeatmapsController.java | 4 ++++ .../google_maps_flutter/example/lib/heatmap.dart | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java index c22d195fd288..87e17dd91801 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapBuilder.java @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + package io.flutter.plugins.googlemaps; import com.google.maps.android.heatmaps.Gradient; diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java index 93217a627592..ba07df79802c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapController.java @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + package io.flutter.plugins.googlemaps; import com.google.android.gms.maps.model.TileOverlay; diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java index 1e9fb894a938..54ba25a2f230 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapOptionsSink.java @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + package io.flutter.plugins.googlemaps; import com.google.maps.android.heatmaps.Gradient; diff --git a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java index 7c2a811e8fc1..f040bcc0435d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java +++ b/packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/HeatmapsController.java @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + package io.flutter.plugins.googlemaps; import com.google.android.gms.maps.GoogleMap; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart index 050d24b3cda3..05fa02ea3abc 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart @@ -1,3 +1,7 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + // ignore_for_file: public_member_api_docs import 'package:flutter/material.dart'; From 789cd9a6a120bdba759aa50525724fb44a4a4f1f Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 16 Apr 2022 19:46:44 -0400 Subject: [PATCH 11/94] Web tests --- .../ios/Classes/GoogleMapController.m | 2 + .../ios/google_maps_flutter.podspec | 1 + .../lib/src/types/location.dart | 15 +++++ .../google_maps_controller_test.dart | 58 +++++++++++++++++++ .../google_maps_controller_test.mocks.dart | 51 +++++++++++++--- .../google_maps_plugin_test.dart | 7 +++ .../google_maps_plugin_test.mocks.dart | 11 +++- 7 files changed, 134 insertions(+), 11 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m index ca8068129566..cf9e886169e4 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m @@ -309,6 +309,8 @@ - (void)onMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result { [_circlesController removeCircleIds:circleIdsToRemove]; } result(nil); + } else if ([call.method isEqualToString:@"heatmaps#update"]) { + // TODO } else if ([call.method isEqualToString:@"tileOverlays#update"]) { id tileOverlaysToAdd = call.arguments[@"tileOverlaysToAdd"]; if ([tileOverlaysToAdd isKindOfClass:[NSArray class]]) { diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec index e34919c30484..439b139f3a06 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec +++ b/packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec @@ -19,6 +19,7 @@ Downloaded by pub (not CocoaPods). s.module_map = 'Classes/google_maps_flutter.modulemap' s.dependency 'Flutter' s.dependency 'GoogleMaps' + s.dependency 'Google-Maps-iOS-Utils' s.static_framework = true s.platform = :ios, '9.0' # GoogleMaps does not support arm64 simulators. 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 f6f5c2262bf8..e6ce67eecece 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 @@ -54,6 +54,10 @@ class LatLng { @override int get hashCode => Object.hash(latitude, longitude); + + /// Create a [WeightedLatLng] from this [LatLng] with the specified [weight]. + WeightedLatLng weighted([double weight = 1.0]) => + WeightedLatLng.fromLatLng(this, weight: weight); } /// A latitude/longitude aligned rectangle. @@ -146,6 +150,9 @@ class WeightedLatLng { WeightedLatLng(double latitude, double longitude, {this.weight = 1.0}) : location = LatLng(latitude, longitude); + /// Creates a [WeightedLatLng] with the specified [location] and [weight]. + WeightedLatLng.fromLatLng(this.location, {this.weight = 1.0}); + /// Converts this object to something serializable in JSON. Object toJson() { return [location.toJson(), weight]; @@ -177,3 +184,11 @@ class WeightedLatLng { @override int get hashCode => Object.hash(location, weight); } + +/// Convenience extensions on [LatLng] iterables. +extension LatLngIterableExtension on Iterable { + /// Converts a [LatLng] iterable to a [WeightedLatLng] iterable with each + /// [WeightedLatLng] having the specified [weight]. + Iterable weighted([double weight = 1.0]) => + map((latLng) => latLng.weighted(weight)); +} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart index 39aa641b10e4..b3c6e0bce239 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart @@ -22,6 +22,7 @@ const _acceptableDelta = 0.0000000001; @GenerateMocks([], customMocks: [ MockSpec(returnNullOnMissingStub: true), + MockSpec(returnNullOnMissingStub: true), MockSpec(returnNullOnMissingStub: true), MockSpec(returnNullOnMissingStub: true), MockSpec(returnNullOnMissingStub: true), @@ -44,6 +45,7 @@ void main() { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, + Set heatmaps = const {}, Map options = const {}, }) { return GoogleMapController( @@ -54,6 +56,7 @@ void main() { polygons: polygons, polylines: polylines, circles: circles, + heatmaps: heatmaps, mapOptions: options, ); } @@ -147,6 +150,15 @@ void main() { }, throwsAssertionError); }); + testWidgets('cannot updateHeatmaps after dispose', + (WidgetTester tester) async { + controller.dispose(); + + expect(() { + controller.updateHeatmaps(HeatmapUpdates.from({}, {})); + }, throwsAssertionError); + }); + testWidgets('cannot updatePolygons after dispose', (WidgetTester tester) async { controller.dispose(); @@ -193,6 +205,7 @@ void main() { group('init', () { late MockCirclesController circles; + late MockHeatmapsController heatmaps; late MockMarkersController markers; late MockPolygonsController polygons; late MockPolylinesController polylines; @@ -200,6 +213,7 @@ void main() { setUp(() { circles = MockCirclesController(); + heatmaps = MockHeatmapsController(); markers = MockMarkersController(); polygons = MockPolygonsController(); polylines = MockPolylinesController(); @@ -211,6 +225,7 @@ void main() { controller.debugSetOverrides( createMap: (_, __) => map, circles: circles, + heatmaps: heatmaps, markers: markers, polygons: polygons, polylines: polylines, @@ -243,6 +258,7 @@ void main() { controller.debugSetOverrides( createMap: (_, __) => map, circles: circles, + heatmaps: heatmaps, markers: markers, polygons: polygons, polylines: polylines, @@ -251,6 +267,7 @@ void main() { controller.init(); verify(circles.bindToMap(mapId, map)); + verify(heatmaps.bindToMap(mapId, map)); verify(markers.bindToMap(mapId, map)); verify(polygons.bindToMap(mapId, map)); verify(polylines.bindToMap(mapId, map)); @@ -262,6 +279,16 @@ void main() { circleId: CircleId('circle-1'), zIndex: 1234, ), + }, heatmaps: { + Heatmap( + heatmapId: HeatmapId('heatmap-1'), + data: [ + LatLng(43.355114, -5.851333), + LatLng(43.354797, -5.851860), + LatLng(43.354469, -5.851318), + LatLng(43.354762, -5.850824), + ].weighted().toList(), + ), }, markers: { Marker( markerId: MarkerId('marker-1'), @@ -304,6 +331,7 @@ void main() { controller.debugSetOverrides( circles: circles, + heatmaps: heatmaps, markers: markers, polygons: polygons, polylines: polylines, @@ -313,6 +341,8 @@ void main() { final capturedCircles = verify(circles.addCircles(captureAny)).captured[0] as Set; + final capturedHeatmaps = verify(heatmaps.addHeatmaps(captureAny)) + .captured[0] as Set; final capturedMarkers = verify(markers.addMarkers(captureAny)).captured[0] as Set; final capturedPolygons = verify(polygons.addPolygons(captureAny)) @@ -322,6 +352,7 @@ void main() { expect(capturedCircles.first.circleId.value, 'circle-1'); expect(capturedCircles.first.zIndex, 1234); + expect(capturedHeatmaps.first.heatmapId.value, 'heatmap-1'); expect(capturedMarkers.first.markerId.value, 'marker-1'); expect(capturedMarkers.first.infoWindow.snippet, 'snippet for test'); expect(capturedMarkers.first.infoWindow.title, 'title for test'); @@ -568,6 +599,33 @@ void main() { })); }); + testWidgets('updateHeatmaps', (WidgetTester tester) async { + final mock = MockHeatmapsController(); + controller.debugSetOverrides(heatmaps: mock); + + final previous = { + Heatmap(heatmapId: HeatmapId('to-be-updated')), + Heatmap(heatmapId: HeatmapId('to-be-removed')), + }; + + final current = { + Heatmap(heatmapId: HeatmapId('to-be-updated'), dissipating: false), + Heatmap(heatmapId: HeatmapId('to-be-added')), + }; + + controller.updateHeatmaps(HeatmapUpdates.from(previous, current)); + + verify(mock.removeHeatmaps({ + HeatmapId('to-be-removed'), + })); + verify(mock.addHeatmaps({ + Heatmap(heatmapId: HeatmapId('to-be-added')), + })); + verify(mock.changeHeatmaps({ + Heatmap(heatmapId: HeatmapId('to-be-updated'), dissipating: false), + })); + }); + testWidgets('updateMarkers', (WidgetTester tester) async { final mock = MockMarkersController(); controller.debugSetOverrides(markers: mock); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.mocks.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.mocks.dart index 530707c6c328..0c7e99588030 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.mocks.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.0.16 from annotations +// Mocks generated by Mockito 5.1.0 from annotations // in google_maps_flutter_web_integration_tests/integration_test/google_maps_controller_test.dart. // Do not manually edit this file. @@ -8,6 +8,7 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf import 'package:google_maps_flutter_web/google_maps_flutter_web.dart' as _i3; import 'package:mockito/mockito.dart' as _i1; +// ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references @@ -58,8 +59,48 @@ class MockCirclesController extends _i1.Mock implements _i3.CirclesController { void bindToMap(int? mapId, _i2.GMap? googleMap) => super.noSuchMethod(Invocation.method(#bindToMap, [mapId, googleMap]), returnValueForMissingStub: null); +} + +/// A class which mocks [HeatmapsController]. +/// +/// See the documentation for Mockito's code generation for more information. +class MockHeatmapsController extends _i1.Mock + implements _i3.HeatmapsController { + @override + Map<_i4.HeatmapId, _i3.HeatmapController> get heatmaps => + (super.noSuchMethod(Invocation.getter(#heatmaps), + returnValue: <_i4.HeatmapId, _i3.HeatmapController>{}) + as Map<_i4.HeatmapId, _i3.HeatmapController>); + @override + _i2.GMap get googleMap => (super.noSuchMethod(Invocation.getter(#googleMap), + returnValue: _FakeGMap_0()) as _i2.GMap); @override - String toString() => super.toString(); + set googleMap(_i2.GMap? _googleMap) => + super.noSuchMethod(Invocation.setter(#googleMap, _googleMap), + returnValueForMissingStub: null); + @override + int get mapId => + (super.noSuchMethod(Invocation.getter(#mapId), returnValue: 0) as int); + @override + set mapId(int? _mapId) => + super.noSuchMethod(Invocation.setter(#mapId, _mapId), + returnValueForMissingStub: null); + @override + void addHeatmaps(Set<_i4.Heatmap>? heatmapsToAdd) => + super.noSuchMethod(Invocation.method(#addHeatmaps, [heatmapsToAdd]), + returnValueForMissingStub: null); + @override + void changeHeatmaps(Set<_i4.Heatmap>? heatmapsToChange) => + super.noSuchMethod(Invocation.method(#changeHeatmaps, [heatmapsToChange]), + returnValueForMissingStub: null); + @override + void removeHeatmaps(Set<_i4.HeatmapId>? heatmapIdsToRemove) => super + .noSuchMethod(Invocation.method(#removeHeatmaps, [heatmapIdsToRemove]), + returnValueForMissingStub: null); + @override + void bindToMap(int? mapId, _i2.GMap? googleMap) => + super.noSuchMethod(Invocation.method(#bindToMap, [mapId, googleMap]), + returnValueForMissingStub: null); } /// A class which mocks [PolygonsController]. @@ -102,8 +143,6 @@ class MockPolygonsController extends _i1.Mock void bindToMap(int? mapId, _i2.GMap? googleMap) => super.noSuchMethod(Invocation.method(#bindToMap, [mapId, googleMap]), returnValueForMissingStub: null); - @override - String toString() => super.toString(); } /// A class which mocks [PolylinesController]. @@ -146,8 +185,6 @@ class MockPolylinesController extends _i1.Mock void bindToMap(int? mapId, _i2.GMap? googleMap) => super.noSuchMethod(Invocation.method(#bindToMap, [mapId, googleMap]), returnValueForMissingStub: null); - @override - String toString() => super.toString(); } /// A class which mocks [MarkersController]. @@ -201,6 +238,4 @@ class MockMarkersController extends _i1.Mock implements _i3.MarkersController { void bindToMap(int? mapId, _i2.GMap? googleMap) => super.noSuchMethod(Invocation.method(#bindToMap, [mapId, googleMap]), returnValueForMissingStub: null); - @override - String toString() => super.toString(); } diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart index a3cf86e593fe..5559fcabb256 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart @@ -246,6 +246,13 @@ void main() { verify(controller.updateCircles(expectedUpdates)); }); + testWidgets('updateHeatmaps', (WidgetTester tester) async { + final expectedUpdates = HeatmapUpdates.from({}, {}); + + await plugin.updateHeatmaps(expectedUpdates, mapId: mapId); + + verify(controller.updateHeatmaps(expectedUpdates)); + }); // Camera testWidgets('animateCamera', (WidgetTester tester) async { final expectedUpdates = diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.mocks.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.mocks.dart index d2df11c6ffa9..982cd1427801 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.mocks.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.0.16 from annotations +// Mocks generated by Mockito 5.1.0 from annotations // in google_maps_flutter_web_integration_tests/integration_test/google_maps_plugin_test.dart. // Do not manually edit this file. @@ -9,6 +9,7 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf import 'package:google_maps_flutter_web/google_maps_flutter_web.dart' as _i4; import 'package:mockito/mockito.dart' as _i1; +// ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references @@ -52,6 +53,7 @@ class MockGoogleMapController extends _i1.Mock {_i4.DebugCreateMapFunction? createMap, _i4.MarkersController? markers, _i4.CirclesController? circles, + _i4.HeatmapsController? heatmaps, _i4.PolygonsController? polygons, _i4.PolylinesController? polylines}) => super.noSuchMethod( @@ -59,6 +61,7 @@ class MockGoogleMapController extends _i1.Mock #createMap: createMap, #markers: markers, #circles: circles, + #heatmaps: heatmaps, #polygons: polygons, #polylines: polylines }), @@ -100,6 +103,10 @@ class MockGoogleMapController extends _i1.Mock super.noSuchMethod(Invocation.method(#updateCircles, [updates]), returnValueForMissingStub: null); @override + void updateHeatmaps(_i3.HeatmapUpdates? updates) => + super.noSuchMethod(Invocation.method(#updateHeatmaps, [updates]), + returnValueForMissingStub: null); + @override void updatePolygons(_i3.PolygonUpdates? updates) => super.noSuchMethod(Invocation.method(#updatePolygons, [updates]), returnValueForMissingStub: null); @@ -126,6 +133,4 @@ class MockGoogleMapController extends _i1.Mock @override void dispose() => super.noSuchMethod(Invocation.method(#dispose, []), returnValueForMissingStub: null); - @override - String toString() => super.toString(); } From 977dfd4cac4cc34c68f2871158e45f18f8e3f32f Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 16 Apr 2022 19:56:31 -0400 Subject: [PATCH 12/94] Heatmap updates test --- .../google_maps_flutter/CHANGELOG.md | 3 +- .../ios/Classes/GoogleMapController.m | 1 + .../google_maps_flutter/pubspec.yaml | 2 +- .../test/heatmap_updates_test.dart | 179 ++++++++++++++++++ .../CHANGELOG.md | 4 + .../pubspec.yaml | 2 +- .../google_maps_flutter_web/CHANGELOG.md | 4 + .../google_maps_flutter_web/pubspec.yaml | 2 +- 8 files changed, 193 insertions(+), 4 deletions(-) create mode 100644 packages/google_maps_flutter/google_maps_flutter/test/heatmap_updates_test.dart diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 3ecea7c465e7..ddee48cbc096 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,6 +1,7 @@ -## NEXT +## 2.2.0 * Adds OS version support information to README. +* Adds support for heatmap layers. ## 2.1.3 diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m index cf9e886169e4..2d5a11ddb72c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m @@ -311,6 +311,7 @@ - (void)onMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result { result(nil); } else if ([call.method isEqualToString:@"heatmaps#update"]) { // TODO + result(nil); } else if ([call.method isEqualToString:@"tileOverlays#update"]) { id tileOverlaysToAdd = call.arguments[@"tileOverlaysToAdd"]; if ([tileOverlaysToAdd isKindOfClass:[NSArray class]]) { diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 8e2047f19f56..a5752e982a9b 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/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. repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_flutter/google_maps_flutter issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.1.3 +version: 2.2.0 environment: sdk: ">=2.14.0 <3.0.0" diff --git a/packages/google_maps_flutter/google_maps_flutter/test/heatmap_updates_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/heatmap_updates_test.dart new file mode 100644 index 000000000000..24205cadccb3 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter/test/heatmap_updates_test.dart @@ -0,0 +1,179 @@ +// Copyright 2013 The Flutter 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:flutter/services.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:google_maps_flutter/google_maps_flutter.dart'; + +import 'fake_maps_controllers.dart'; + +Widget _mapWithHeatmaps(Set heatmaps) { + return Directionality( + textDirection: TextDirection.ltr, + child: GoogleMap( + initialCameraPosition: const CameraPosition(target: LatLng(10.0, 15.0)), + heatmaps: heatmaps, + ), + ); +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + final FakePlatformViewsController fakePlatformViewsController = + FakePlatformViewsController(); + + setUpAll(() { + SystemChannels.platform_views.setMockMethodCallHandler( + fakePlatformViewsController.fakePlatformViewsMethodHandler); + }); + + setUp(() { + fakePlatformViewsController.reset(); + }); + + testWidgets('Initializing a heatmap', (WidgetTester tester) async { + const Heatmap c1 = Heatmap(heatmapId: HeatmapId('heatmap_1')); + await tester.pumpWidget(_mapWithHeatmaps({c1})); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + expect(platformGoogleMap.heatmapsToAdd.length, 1); + + final Heatmap initializedHeatmap = platformGoogleMap.heatmapsToAdd.first; + expect(initializedHeatmap, equals(c1)); + expect(platformGoogleMap.heatmapIdsToRemove.isEmpty, true); + expect(platformGoogleMap.heatmapsToChange.isEmpty, true); + }); + + testWidgets('Adding a heatmap', (WidgetTester tester) async { + const Heatmap c1 = Heatmap(heatmapId: HeatmapId('heatmap_1')); + const Heatmap c2 = Heatmap(heatmapId: HeatmapId('heatmap_2')); + + await tester.pumpWidget(_mapWithHeatmaps({c1})); + await tester.pumpWidget(_mapWithHeatmaps({c1, c2})); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + expect(platformGoogleMap.heatmapsToAdd.length, 1); + + final Heatmap addedHeatmap = platformGoogleMap.heatmapsToAdd.first; + expect(addedHeatmap, equals(c2)); + + expect(platformGoogleMap.heatmapIdsToRemove.isEmpty, true); + + expect(platformGoogleMap.heatmapsToChange.isEmpty, true); + }); + + testWidgets('Removing a heatmap', (WidgetTester tester) async { + const Heatmap c1 = Heatmap(heatmapId: HeatmapId('heatmap_1')); + + await tester.pumpWidget(_mapWithHeatmaps({c1})); + await tester.pumpWidget(_mapWithHeatmaps({})); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + expect(platformGoogleMap.heatmapIdsToRemove.length, 1); + expect(platformGoogleMap.heatmapIdsToRemove.first, equals(c1.heatmapId)); + + expect(platformGoogleMap.heatmapsToChange.isEmpty, true); + expect(platformGoogleMap.heatmapsToAdd.isEmpty, true); + }); + + testWidgets('Updating a heatmap', (WidgetTester tester) async { + const Heatmap c1 = Heatmap(heatmapId: HeatmapId('heatmap_1')); + const Heatmap c2 = Heatmap(heatmapId: HeatmapId('heatmap_1'), radius: 10); + + await tester.pumpWidget(_mapWithHeatmaps({c1})); + await tester.pumpWidget(_mapWithHeatmaps({c2})); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + expect(platformGoogleMap.heatmapsToChange.length, 1); + expect(platformGoogleMap.heatmapsToChange.first, equals(c2)); + + expect(platformGoogleMap.heatmapIdsToRemove.isEmpty, true); + expect(platformGoogleMap.heatmapsToAdd.isEmpty, true); + }); + + testWidgets('Updating a heatmap', (WidgetTester tester) async { + const Heatmap c1 = Heatmap(heatmapId: HeatmapId('heatmap_1')); + const Heatmap c2 = Heatmap(heatmapId: HeatmapId('heatmap_1'), radius: 10); + + await tester.pumpWidget(_mapWithHeatmaps({c1})); + await tester.pumpWidget(_mapWithHeatmaps({c2})); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + expect(platformGoogleMap.heatmapsToChange.length, 1); + + final Heatmap update = platformGoogleMap.heatmapsToChange.first; + expect(update, equals(c2)); + expect(update.radius, 10); + }); + + testWidgets('Multi Update', (WidgetTester tester) async { + Heatmap c1 = const Heatmap(heatmapId: HeatmapId('heatmap_1')); + Heatmap c2 = const Heatmap(heatmapId: HeatmapId('heatmap_2')); + final Set prev = {c1, c2}; + c1 = const Heatmap(heatmapId: HeatmapId('heatmap_1'), dissipating: false); + c2 = const Heatmap(heatmapId: HeatmapId('heatmap_2'), radius: 10); + final Set cur = {c1, c2}; + + await tester.pumpWidget(_mapWithHeatmaps(prev)); + await tester.pumpWidget(_mapWithHeatmaps(cur)); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + + expect(platformGoogleMap.heatmapsToChange, cur); + expect(platformGoogleMap.heatmapIdsToRemove.isEmpty, true); + expect(platformGoogleMap.heatmapsToAdd.isEmpty, true); + }); + + testWidgets('Multi Update', (WidgetTester tester) async { + Heatmap c2 = const Heatmap(heatmapId: HeatmapId('heatmap_2')); + const Heatmap c3 = Heatmap(heatmapId: HeatmapId('heatmap_3')); + final Set prev = {c2, c3}; + + // c1 is added, c2 is updated, c3 is removed. + const Heatmap c1 = Heatmap(heatmapId: HeatmapId('heatmap_1')); + c2 = const Heatmap(heatmapId: HeatmapId('heatmap_2'), radius: 10); + final Set cur = {c1, c2}; + + await tester.pumpWidget(_mapWithHeatmaps(prev)); + await tester.pumpWidget(_mapWithHeatmaps(cur)); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + + expect(platformGoogleMap.heatmapsToChange.length, 1); + expect(platformGoogleMap.heatmapsToAdd.length, 1); + expect(platformGoogleMap.heatmapIdsToRemove.length, 1); + + expect(platformGoogleMap.heatmapsToChange.first, equals(c2)); + expect(platformGoogleMap.heatmapsToAdd.first, equals(c1)); + expect(platformGoogleMap.heatmapIdsToRemove.first, equals(c3.heatmapId)); + }); + + testWidgets('Partial Update', (WidgetTester tester) async { + const Heatmap c1 = Heatmap(heatmapId: HeatmapId('heatmap_1')); + const Heatmap c2 = Heatmap(heatmapId: HeatmapId('heatmap_2')); + Heatmap c3 = const Heatmap(heatmapId: HeatmapId('heatmap_3')); + final Set prev = {c1, c2, c3}; + c3 = const Heatmap(heatmapId: HeatmapId('heatmap_3'), radius: 10); + final Set cur = {c1, c2, c3}; + + await tester.pumpWidget(_mapWithHeatmaps(prev)); + await tester.pumpWidget(_mapWithHeatmaps(cur)); + + final FakePlatformGoogleMap platformGoogleMap = + fakePlatformViewsController.lastCreatedView!; + + expect(platformGoogleMap.heatmapsToChange, {c3}); + expect(platformGoogleMap.heatmapIdsToRemove.isEmpty, true); + expect(platformGoogleMap.heatmapsToAdd.isEmpty, true); + }); +} 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 b955bc033210..75a4a681878d 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,7 @@ +## 2.2.0 + +* Adds support for heatmap layers. + ## 2.1.6 * Migrates from `ui.hash*` to `Object.hash*`. 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 8df31fcf626b..9eb33f010dc5 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 @@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_fl issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # 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: 2.1.6 +version: 2.2.0 environment: sdk: '>=2.12.0 <3.0.0' diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 8a3b94151de2..ca04e7c5a793 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.3 + +* Adds support for heatmap layers. + ## 0.3.2+1 * Removes dependency on `meta`. diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 782c754af209..d173ec71a51b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.3.2+1 +version: 0.3.3 environment: sdk: ">=2.12.0 <3.0.0" From d27c28c3d9051d891e8b1b1e094d1bc0467ee2d6 Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 16 Apr 2022 20:54:50 -0400 Subject: [PATCH 13/94] Gradient works --- .../ios/Runner.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../example/lib/heatmap.dart | 19 +++++++++++++++++++ .../example/web/index.html | 2 +- .../ios/google_maps_flutter.podspec | 1 + .../lib/src/types/heatmap.dart | 4 ++-- .../lib/src/convert.dart | 10 +++++++++- 7 files changed, 35 insertions(+), 7 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj index 6a0466c3c6d9..bec5bc9d94bb 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ @@ -275,7 +275,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1320; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c983bfc640ff..a60a46be23c1 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { Heatmap( heatmapId: const HeatmapId('test'), data: enabledPoints, + gradient: const [ + Color.fromARGB(0, 0, 255, 255), + Color.fromARGB(255, 0, 255, 255), + Color.fromARGB(255, 0, 191, 255), + Color.fromARGB(255, 0, 127, 255), + Color.fromARGB(255, 0, 63, 255), + Color.fromARGB(255, 0, 0, 255), + Color.fromARGB(255, 0, 0, 223), + Color.fromARGB(255, 0, 0, 191), + Color.fromARGB(255, 0, 0, 159), + Color.fromARGB(255, 0, 0, 127), + Color.fromARGB(255, 63, 0, 91), + Color.fromARGB(255, 127, 0, 63), + Color.fromARGB(255, 191, 0, 31), + Color.fromARGB(255, 255, 0, 0), + ], + maxIntensity: 1, + opacity: 0.6, + radius: 10, ) }), ), 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 6cef285dfb1e..1243dbf2852b 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 @@ -33,7 +33,7 @@ - + - + From 797889241550bbfea1be3288a3eed9e2dad210f7 Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 3 May 2022 12:46:03 -0400 Subject: [PATCH 35/94] Fixed another web test issue --- .../example/integration_test/shape_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart index fd87caa8b80b..6778cf75fe03 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart @@ -208,7 +208,7 @@ void main() { final options = gmaps_visualization.HeatmapLayerOptions() ..data = [gmaps.LatLng(0, 0)]; - expect(heatmap.data, isNull); + expect(heatmap.data, hasLength(0)); controller.update(options); From d76e1610a780cab4c7c4e67312823f72e0ec6fea Mon Sep 17 00:00:00 2001 From: Rexios Date: Wed, 4 May 2022 11:28:06 -0400 Subject: [PATCH 36/94] Got NSAssert working --- .../google_maps_flutter/ios/Classes/JsonConversions.h | 1 + .../google_maps_flutter/ios/Classes/JsonConversions.m | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.h b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.h index f7ae6ff31d00..5062a81ee2ae 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.h +++ b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.h @@ -3,6 +3,7 @@ // found in the LICENSE file. #import +#import #import @import GoogleMapsUtils; diff --git a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.m b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.m index c0bdb2a53a15..69c38bcf018b 100644 --- a/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.m +++ b/packages/google_maps_flutter/google_maps_flutter/ios/Classes/JsonConversions.m @@ -69,6 +69,10 @@ + (UIColor *)toColor:(NSNumber *)numberColor { } + (GMUWeightedLatLng *)toWeightedLatLng:(NSArray *)data { + NSAssert(data.count == 2, @"WeightedLatLng data must have length of 2"); + if (data.count != 2) { + return nil; + } return [[GMUWeightedLatLng alloc] initWithCoordinate:[FLTGoogleMapJsonConversions toLocation:data[0]] intensity:[FLTGoogleMapJsonConversions toDouble:data[1]]]; @@ -78,6 +82,7 @@ + (GMUWeightedLatLng *)toWeightedLatLng:(NSArray *)data { NSMutableArray *weightedData = [[NSMutableArray alloc] init]; for (NSArray *latLng in data) { GMUWeightedLatLng *weightedLatLng = [FLTGoogleMapJsonConversions toWeightedLatLng:latLng]; + if (weightedLatLng == nil) continue; [weightedData addObject:weightedLatLng]; } From dd3c82fbd7a62d59a52ff17fecc22353a3435036 Mon Sep 17 00:00:00 2001 From: Rexios Date: Wed, 4 May 2022 20:22:13 -0400 Subject: [PATCH 37/94] Removed incorrect doc comment --- .../lib/src/types/heatmap.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart index 840a6a230eef..0c6e66dda31a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/heatmap.dart @@ -66,7 +66,6 @@ class Heatmap implements MapsObject { final double? maxIntensity; /// The opacity of the heatmap, expressed as a number between 0 and 1. - /// Defaults to 0.6. final double opacity; /// The radius of influence for each data point, in pixels. From 994fd1fafdb1d609b754c9310e2c6ae85bb8dc0f Mon Sep 17 00:00:00 2001 From: Rexios Date: Tue, 10 May 2022 18:07:24 -0400 Subject: [PATCH 38/94] Fixed analysis issues with HeatmapPage in example --- .../google_maps_flutter/example/lib/heatmap.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart index 1682fe79cbe4..c5c6ff6047b3 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart @@ -10,7 +10,8 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter_example/page.dart'; class HeatmapPage extends GoogleMapExampleAppPage { - const HeatmapPage() : super(const Icon(Icons.map), 'Heatmaps'); + const HeatmapPage({Key? key}) + : super(const Icon(Icons.map), 'Heatmaps', key: key); @override Widget build(BuildContext context) { @@ -19,7 +20,7 @@ class HeatmapPage extends GoogleMapExampleAppPage { } class HeatmapBody extends StatefulWidget { - const HeatmapBody(); + const HeatmapBody({Key? key}) : super(key: key); @override State createState() => HeatmapBodyState(); @@ -127,14 +128,14 @@ class HeatmapBodyState extends State { Column( children: [ TextButton( - child: const Text('Add point'), onPressed: disabledPoints.isNotEmpty ? _addPoint : null, + child: const Text('Add point'), ), TextButton( - child: const Text('Remove point'), onPressed: enabledPoints.isNotEmpty ? _removePoint : null, + child: const Text('Remove point'), ), ], ) From 3c6c7cde5d4d6e91e5694e68f46daea6fff90257 Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 21 May 2022 12:35:53 -0400 Subject: [PATCH 39/94] Fixed analysis issues --- .../google_maps_controller_test.dart | 49 ++++++++------ .../google_maps_plugin_test.dart | 5 +- .../example/integration_test/shape_test.dart | 8 +-- .../example/integration_test/shapes_test.dart | 66 +++++++++++-------- .../lib/google_maps_flutter_web.dart | 8 +-- .../lib/src/convert.dart | 28 ++++---- .../lib/src/heatmap.dart | 4 +- .../lib/src/heatmaps.dart | 30 ++++----- 8 files changed, 108 insertions(+), 90 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart index 5756cc3fce44..39faf932fb05 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart @@ -160,7 +160,12 @@ void main() { controller.dispose(); expect(() { - controller.updateHeatmaps(HeatmapUpdates.from({}, {})); + controller.updateHeatmaps( + HeatmapUpdates.from( + {}, + {}, + ), + ); }, throwsAssertionError); }); @@ -308,16 +313,16 @@ void main() { ), }, heatmaps: { Heatmap( - heatmapId: HeatmapId('heatmap-1'), - data: [ - LatLng(43.355114, -5.851333), - LatLng(43.354797, -5.851860), - LatLng(43.354469, -5.851318), - LatLng(43.354762, -5.850824), + heatmapId: const HeatmapId('heatmap-1'), + data: [ + const LatLng(43.355114, -5.851333), + const LatLng(43.354797, -5.851860), + const LatLng(43.354469, -5.851318), + const LatLng(43.354762, -5.850824), ].weighted().toList(), ), }, markers: { - Marker( + const Marker( markerId: MarkerId('marker-1'), infoWindow: InfoWindow( title: 'title for test', @@ -635,29 +640,31 @@ void main() { }); testWidgets('updateHeatmaps', (WidgetTester tester) async { - final mock = MockHeatmapsController(); + final MockHeatmapsController mock = MockHeatmapsController(); controller.debugSetOverrides(heatmaps: mock); - final previous = { - Heatmap(heatmapId: HeatmapId('to-be-updated')), - Heatmap(heatmapId: HeatmapId('to-be-removed')), + final Set previous = { + const Heatmap(heatmapId: HeatmapId('to-be-updated')), + const Heatmap(heatmapId: HeatmapId('to-be-removed')), }; - final current = { - Heatmap(heatmapId: HeatmapId('to-be-updated'), dissipating: false), - Heatmap(heatmapId: HeatmapId('to-be-added')), + final Set current = { + const Heatmap( + heatmapId: HeatmapId('to-be-updated'), dissipating: false), + const Heatmap(heatmapId: HeatmapId('to-be-added')), }; controller.updateHeatmaps(HeatmapUpdates.from(previous, current)); - verify(mock.removeHeatmaps({ - HeatmapId('to-be-removed'), + verify(mock.removeHeatmaps({ + const HeatmapId('to-be-removed'), })); - verify(mock.addHeatmaps({ - Heatmap(heatmapId: HeatmapId('to-be-added')), + verify(mock.addHeatmaps({ + const Heatmap(heatmapId: HeatmapId('to-be-added')), })); - verify(mock.changeHeatmaps({ - Heatmap(heatmapId: HeatmapId('to-be-updated'), dissipating: false), + verify(mock.changeHeatmaps({ + const Heatmap( + heatmapId: HeatmapId('to-be-updated'), dissipating: false), })); }); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart index 79551cff9364..491ca5934def 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart @@ -272,7 +272,10 @@ void main() { verify(controller.updateCircles(expectedUpdates)); }); testWidgets('updateHeatmaps', (WidgetTester tester) async { - final expectedUpdates = HeatmapUpdates.from({}, {}); + final HeatmapUpdates expectedUpdates = HeatmapUpdates.from( + {}, + {}, + ); await plugin.updateHeatmaps(expectedUpdates, mapId: mapId); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart index ddbe89f58911..7a4e07a8fae1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart @@ -215,9 +215,9 @@ void main() { }); testWidgets('update', (WidgetTester tester) async { - final controller = HeatmapController(heatmap: heatmap); - final options = gmaps_visualization.HeatmapLayerOptions() - ..data = [gmaps.LatLng(0, 0)]; + final HeatmapController controller = HeatmapController(heatmap: heatmap); + final gmaps_visualization.HeatmapLayerOptions options = gmaps_visualization.HeatmapLayerOptions() + ..data = [gmaps.LatLng(0, 0)]; expect(heatmap.data, hasLength(0)); @@ -241,7 +241,7 @@ void main() { testWidgets('cannot call update after remove', (WidgetTester tester) async { - final options = gmaps_visualization.HeatmapLayerOptions() + final gmaps_visualization.HeatmapLayerOptions options = gmaps_visualization.HeatmapLayerOptions() ..dissipating = true; controller.remove(); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart index 88a119668408..8edc3a039c50 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart @@ -8,9 +8,9 @@ import 'dart:ui'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_maps/google_maps.dart' as gmaps; +import 'package:google_maps/google_maps_geometry.dart' as geometry; import 'package:google_maps/google_maps_visualization.dart' as gmaps_visualization; -import 'package:google_maps/google_maps_geometry.dart' as geometry; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:google_maps_flutter_web/google_maps_flutter_web.dart'; import 'package:integration_test/integration_test.dart'; @@ -380,41 +380,46 @@ void main() { }); testWidgets('addHeatmaps', (WidgetTester tester) async { - final heatmaps = { - Heatmap(heatmapId: HeatmapId('1')), - Heatmap(heatmapId: HeatmapId('2')), + final Set heatmaps = { + const Heatmap(heatmapId: HeatmapId('1')), + const Heatmap(heatmapId: HeatmapId('2')), }; controller.addHeatmaps(heatmaps); expect(controller.heatmaps.length, 2); - expect(controller.heatmaps, contains(HeatmapId('1'))); - expect(controller.heatmaps, contains(HeatmapId('2'))); - expect(controller.heatmaps, isNot(contains(HeatmapId('66')))); + expect(controller.heatmaps, contains(const HeatmapId('1'))); + expect(controller.heatmaps, contains(const HeatmapId('2'))); + expect(controller.heatmaps, isNot(contains(const HeatmapId('66')))); }); testWidgets('changeHeatmaps', (WidgetTester tester) async { - final heatmaps = { - Heatmap(heatmapId: HeatmapId('1')), + final Set heatmaps = { + const Heatmap(heatmapId: HeatmapId('1')), }; controller.addHeatmaps(heatmaps); - expect(controller.heatmaps[HeatmapId('1')]?.heatmap?.data, hasLength(0)); + expect(controller.heatmaps[const HeatmapId('1')]?.heatmap?.data, + hasLength(0)); - final updatedHeatmaps = { - Heatmap(heatmapId: HeatmapId('1'), data: [WeightedLatLng(0, 0)]), + final Set updatedHeatmaps = { + Heatmap( + heatmapId: const HeatmapId('1'), + data: [WeightedLatLng(0, 0)], + ), }; controller.changeHeatmaps(updatedHeatmaps); expect(controller.heatmaps.length, 1); - expect(controller.heatmaps[HeatmapId('1')]?.heatmap?.data, hasLength(1)); + expect(controller.heatmaps[const HeatmapId('1')]?.heatmap?.data, + hasLength(1)); }); testWidgets('removeHeatmaps', (WidgetTester tester) async { - final heatmaps = { - Heatmap(heatmapId: HeatmapId('1')), - Heatmap(heatmapId: HeatmapId('2')), - Heatmap(heatmapId: HeatmapId('3')), + final Set heatmaps = { + const Heatmap(heatmapId: HeatmapId('1')), + const Heatmap(heatmapId: HeatmapId('2')), + const Heatmap(heatmapId: HeatmapId('3')), }; controller.addHeatmaps(heatmaps); @@ -422,33 +427,36 @@ void main() { expect(controller.heatmaps.length, 3); // Remove some polylines... - final heatmapIdsToRemove = { - HeatmapId('1'), - HeatmapId('3'), + final Set heatmapIdsToRemove = { + const HeatmapId('1'), + const HeatmapId('3'), }; controller.removeHeatmaps(heatmapIdsToRemove); expect(controller.heatmaps.length, 1); - expect(controller.heatmaps, isNot(contains(HeatmapId('1')))); - expect(controller.heatmaps, contains(HeatmapId('2'))); - expect(controller.heatmaps, isNot(contains(HeatmapId('3')))); + expect(controller.heatmaps, isNot(contains(const HeatmapId('1')))); + expect(controller.heatmaps, contains(const HeatmapId('2'))); + expect(controller.heatmaps, isNot(contains(const HeatmapId('3')))); }); testWidgets('Converts colors to CSS', (WidgetTester tester) async { - final heatmaps = { + final Set heatmaps = { Heatmap( - heatmapId: HeatmapId('1'), - gradient: - HeatmapGradient(colors: [Color(0xFFFABADA)], startPoints: [0]), + heatmapId: const HeatmapId('1'), + gradient: HeatmapGradient( + colors: [const Color(0xFFFABADA)], + startPoints: [0], + ), ), }; controller.addHeatmaps(heatmaps); - final heatmap = controller.heatmaps.values.first.heatmap!; + final gmaps_visualization.HeatmapLayer heatmap = + controller.heatmaps.values.first.heatmap!; - expect(heatmap.get('gradient'), ['rgba(250, 186, 218, 1)']); + expect(heatmap.get('gradient'), ['rgba(250, 186, 218, 1)']); }); }); } diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart index 4883e0d78cd7..8f3172eb15dd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart @@ -16,11 +16,11 @@ import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:google_maps/google_maps.dart' as gmaps; +import 'package:google_maps/google_maps_visualization.dart' + as gmaps_visualization; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:sanitize_html/sanitize_html.dart'; import 'package:stream_transform/stream_transform.dart'; -import 'package:google_maps/google_maps_visualization.dart' - as gmaps_visualization; import 'src/shims/dart_ui.dart' as ui; // Conditionally imports dart:ui in web import 'src/third_party/to_screen_location/to_screen_location.dart'; @@ -31,10 +31,10 @@ part 'src/circles.dart'; part 'src/convert.dart'; part 'src/google_maps_controller.dart'; part 'src/google_maps_flutter_web.dart'; -part 'src/marker.dart'; -part 'src/markers.dart'; part 'src/heatmap.dart'; part 'src/heatmaps.dart'; +part 'src/marker.dart'; +part 'src/markers.dart'; part 'src/polygon.dart'; part 'src/polygons.dart'; part 'src/polyline.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 9ce39a54e6af..d157db790feb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -307,19 +307,21 @@ gmaps.CircleOptions _circleOptionsFromCircle(Circle circle) { gmaps_visualization.HeatmapLayerOptions _heatmapOptionsFromHeatmap( Heatmap heatmap, ) { - final heatmapOptions = gmaps_visualization.HeatmapLayerOptions() - ..data = heatmap.data - .map( - (e) => gmaps_visualization.WeightedLocation() - ..location = gmaps.LatLng(e.latitude, e.longitude) - ..weight = e.weight, - ) - .toList() - ..dissipating = heatmap.dissipating - ..gradient = heatmap.gradient?.colors.map(_getCssColorWithAlpha).toList() - ..maxIntensity = heatmap.maxIntensity - ..opacity = heatmap.opacity - ..radius = heatmap.radius; + final gmaps_visualization.HeatmapLayerOptions heatmapOptions = + gmaps_visualization.HeatmapLayerOptions() + ..data = heatmap.data + .map( + (WeightedLatLng e) => gmaps_visualization.WeightedLocation() + ..location = gmaps.LatLng(e.latitude, e.longitude) + ..weight = e.weight, + ) + .toList() + ..dissipating = heatmap.dissipating + ..gradient = + heatmap.gradient?.colors.map(_getCssColorWithAlpha).toList() + ..maxIntensity = heatmap.maxIntensity + ..opacity = heatmap.opacity + ..radius = heatmap.radius; return heatmapOptions; } diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart index 179eb0bc9480..7b04624aedcb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart @@ -6,12 +6,12 @@ part of google_maps_flutter_web; /// The `HeatmapController` class wraps a [gmaps_visualization.HeatmapLayer] and its `onTap` behavior. class HeatmapController { - gmaps_visualization.HeatmapLayer? _heatmap; - /// Creates a `HeatmapController`, which wraps a [gmaps_visualization.HeatmapLayer] object and its `onTap` behavior. HeatmapController({required gmaps_visualization.HeatmapLayer heatmap}) : _heatmap = heatmap; + gmaps_visualization.HeatmapLayer? _heatmap; + /// Returns the wrapped [gmaps_visualization.HeatmapLayer]. Only used for testing. @visibleForTesting gmaps_visualization.HeatmapLayer? get heatmap => _heatmap; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart index 811c4d1835c2..be4f05d293fa 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart @@ -6,12 +6,12 @@ part of google_maps_flutter_web; /// This class manages all the [HeatmapController]s associated to a [GoogleMapController]. class HeatmapsController extends GeometryController { - // A cache of [HeatmapController]s indexed by their [HeatmapId]. - final Map _heatmapIdToController; - /// Initialize the cache HeatmapsController() - : _heatmapIdToController = Map(); + : _heatmapIdToController = {}; + + // A cache of [HeatmapController]s indexed by their [HeatmapId]. + final Map _heatmapIdToController; /// Returns the cache of [HeatmapController]s. Test only. @visibleForTesting @@ -21,9 +21,7 @@ class HeatmapsController extends GeometryController { /// /// Wraps each [Heatmap] into its corresponding [HeatmapController]. void addHeatmaps(Set heatmapsToAdd) { - heatmapsToAdd.forEach((heatmap) { - _addHeatmap(heatmap); - }); + heatmapsToAdd.forEach(_addHeatmap); } void _addHeatmap(Heatmap heatmap) { @@ -31,33 +29,33 @@ class HeatmapsController extends GeometryController { return; } - final populationOptions = _heatmapOptionsFromHeatmap(heatmap); - gmaps_visualization.HeatmapLayer gmHeatmap = + final gmaps_visualization.HeatmapLayerOptions populationOptions = + _heatmapOptionsFromHeatmap(heatmap); + final gmaps_visualization.HeatmapLayer gmHeatmap = gmaps_visualization.HeatmapLayer(populationOptions); gmHeatmap.map = googleMap; - HeatmapController controller = HeatmapController(heatmap: gmHeatmap); + final HeatmapController controller = HeatmapController(heatmap: gmHeatmap); _heatmapIdToController[heatmap.heatmapId] = controller; } /// Updates a set of [Heatmap] objects with new options. void changeHeatmaps(Set heatmapsToChange) { - heatmapsToChange.forEach((heatmapToChange) { - _changeHeatmap(heatmapToChange); - }); + heatmapsToChange.forEach(_changeHeatmap); } void _changeHeatmap(Heatmap heatmap) { - final heatmapController = _heatmapIdToController[heatmap.heatmapId]; + final HeatmapController? heatmapController = + _heatmapIdToController[heatmap.heatmapId]; heatmapController?.update(_heatmapOptionsFromHeatmap(heatmap)); } /// Removes a set of [HeatmapId]s from the cache. void removeHeatmaps(Set heatmapIdsToRemove) { - heatmapIdsToRemove.forEach((heatmapId) { + for (final HeatmapId heatmapId in heatmapIdsToRemove) { final HeatmapController? heatmapController = _heatmapIdToController[heatmapId]; heatmapController?.remove(); _heatmapIdToController.remove(heatmapId); - }); + } } } From f63af880636958ff59a1f055dd380d1081c81620 Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 21 May 2022 12:36:24 -0400 Subject: [PATCH 40/94] Formatting --- .../example/integration_test/shape_test.dart | 9 +++++---- .../lib/src/google_maps_controller.dart | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart index 7a4e07a8fae1..e9058a467074 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart @@ -216,8 +216,9 @@ void main() { testWidgets('update', (WidgetTester tester) async { final HeatmapController controller = HeatmapController(heatmap: heatmap); - final gmaps_visualization.HeatmapLayerOptions options = gmaps_visualization.HeatmapLayerOptions() - ..data = [gmaps.LatLng(0, 0)]; + final gmaps_visualization.HeatmapLayerOptions options = + gmaps_visualization.HeatmapLayerOptions() + ..data = [gmaps.LatLng(0, 0)]; expect(heatmap.data, hasLength(0)); @@ -241,8 +242,8 @@ void main() { testWidgets('cannot call update after remove', (WidgetTester tester) async { - final gmaps_visualization.HeatmapLayerOptions options = gmaps_visualization.HeatmapLayerOptions() - ..dissipating = true; + final gmaps_visualization.HeatmapLayerOptions options = + gmaps_visualization.HeatmapLayerOptions()..dissipating = true; controller.remove(); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart index 3da39862168a..7d662e532459 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/google_maps_controller.dart @@ -20,7 +20,7 @@ class GoogleMapController { Set polygons = const {}, Set polylines = const {}, Set circles = const {}, - Set heatmaps = const {}, + Set heatmaps = const {}, Map mapOptions = const {}, }) : _mapId = mapId, _streamController = streamController, From 1160e32945668fc826979997a4899d4844deaddf Mon Sep 17 00:00:00 2001 From: Rexios Date: Sat, 21 May 2022 12:45:08 -0400 Subject: [PATCH 41/94] Fixed issues --- .../google_maps_flutter/example/.metadata | 28 ++++++- .../example/lib/heatmap.dart | 28 +++---- .../example/web/index.html | 84 +++++-------------- .../lib/src/types/location.dart | 30 +++---- .../google_maps_flutter_web/README.md | 2 +- .../google_maps_controller_test.dart | 16 ++-- .../example/integration_test/shape_test.dart | 15 ++-- .../example/integration_test/shapes_test.dart | 9 +- .../lib/google_maps_flutter_web.dart | 3 +- .../lib/src/convert.dart | 8 +- .../lib/src/heatmap.dart | 18 ++-- .../lib/src/heatmaps.dart | 6 +- 12 files changed, 107 insertions(+), 140 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/.metadata b/packages/google_maps_flutter/google_maps_flutter/example/.metadata index 46e884ce48d1..a89c97712faa 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/.metadata +++ b/packages/google_maps_flutter/google_maps_flutter/example/.metadata @@ -1,8 +1,30 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 3ea4d06340a97a1e9d7cae97567c64e0569dcaa2 - channel: beta + revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + channel: stable + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + - platform: web + create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart index c5c6ff6047b3..7cc42521f254 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/heatmap.dart @@ -30,20 +30,20 @@ class HeatmapBodyState extends State { static const LatLng sanFrancisco = LatLng(37.774546, -122.433523); List enabledPoints = [ - WeightedLatLng(37.782, -122.447), - WeightedLatLng(37.782, -122.445), - WeightedLatLng(37.782, -122.443), - WeightedLatLng(37.782, -122.441), - WeightedLatLng(37.782, -122.439), - WeightedLatLng(37.782, -122.437), - WeightedLatLng(37.782, -122.435), - WeightedLatLng(37.785, -122.447), - WeightedLatLng(37.785, -122.445), - WeightedLatLng(37.785, -122.443), - WeightedLatLng(37.785, -122.441), - WeightedLatLng(37.785, -122.439), - WeightedLatLng(37.785, -122.437), - WeightedLatLng(37.785, -122.435) + const WeightedLatLng(37.782, -122.447), + const WeightedLatLng(37.782, -122.445), + const WeightedLatLng(37.782, -122.443), + const WeightedLatLng(37.782, -122.441), + const WeightedLatLng(37.782, -122.439), + const WeightedLatLng(37.782, -122.437), + const WeightedLatLng(37.782, -122.435), + const WeightedLatLng(37.785, -122.447), + const WeightedLatLng(37.785, -122.445), + const WeightedLatLng(37.785, -122.443), + const WeightedLatLng(37.785, -122.441), + const WeightedLatLng(37.785, -122.439), + const WeightedLatLng(37.785, -122.437), + const WeightedLatLng(37.785, -122.435) ]; List disabledPoints = []; 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 1243dbf2852b..33b3d26173ea 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 @@ -32,76 +32,30 @@ google_maps_flutter_example - + + + + + - 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 ce8c2a7498bb..ef1b18436b87 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 @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/foundation.dart' show visibleForTesting; +import 'package:flutter/foundation.dart' + show objectRuntimeType, visibleForTesting; /// A pair of latitude and longitude coordinates, stored as degrees. class LatLng { @@ -45,7 +46,8 @@ class LatLng { } @override - String toString() => '$runtimeType($latitude, $longitude)'; + String toString() => + '${objectRuntimeType(this, 'LatLng')}($latitude, $longitude)'; @override bool operator ==(Object o) { @@ -122,9 +124,8 @@ class LatLngBounds { } @override - String toString() { - return '$runtimeType($southwest, $northeast)'; - } + String toString() => + '${objectRuntimeType(this, 'LatLngBounds')}($southwest, $northeast)'; @override bool operator ==(Object o) { @@ -140,13 +141,13 @@ class LatLngBounds { /// A data point entry for a heatmap. /// This is a geographical data point with a weight attribute. class WeightedLatLng extends LatLng { - /// The weighting value of the data point. - final double weight; - /// Creates a [WeightedLatLng] with the specified [weight] - WeightedLatLng(double latitude, double longitude, {this.weight = 1.0}) + const WeightedLatLng(double latitude, double longitude, {this.weight = 1.0}) : super(latitude, longitude); + /// The weighting value of the data point. + final double weight; + /// Converts this object to something serializable in JSON. Object toJson() { return [super.toJson(), weight]; @@ -168,7 +169,8 @@ class WeightedLatLng extends LatLng { } @override - String toString() => '$runtimeType($latitude, $longitude, $weight)'; + String toString() => + '${objectRuntimeType(this, 'WeightedLatLng')}($latitude, $longitude, $weight)'; @override bool operator ==(Object o) { @@ -181,11 +183,3 @@ class WeightedLatLng extends LatLng { @override int get hashCode => Object.hash(latitude, longitude, weight); } - -/// Convenience extensions on [LatLng] iterables. -extension LatLngIterableExtension on Iterable { - /// Converts a [LatLng] iterable to a [WeightedLatLng] iterable with each - /// [WeightedLatLng] having the specified [weight]. - Iterable weighted([double weight = 1.0]) => - map((latLng) => latLng.weighted(weight)); -} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/README.md b/packages/google_maps_flutter/google_maps_flutter_web/README.md index 8bece2669099..4222386a4799 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/README.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/README.md @@ -26,7 +26,7 @@ Modify the `` tag of your `web/index.html` to load the Google Maps JavaScr Now you should be able to use the Google Maps plugin normally. -To use heatmaps, add `&libraries=visualization` to the end of the URL. +To use heatmaps, add `&libraries=visualization` to the end of the URL. See [the documentation](https://developers.google.com/maps/documentation/javascript/libraries) for more information. ## Limitations of the web version diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart index 39faf932fb05..f06eec071574 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart @@ -312,14 +312,14 @@ void main() { zIndex: 1234, ), }, heatmaps: { - Heatmap( - heatmapId: const HeatmapId('heatmap-1'), - data: [ - const LatLng(43.355114, -5.851333), - const LatLng(43.354797, -5.851860), - const LatLng(43.354469, -5.851318), - const LatLng(43.354762, -5.850824), - ].weighted().toList(), + const Heatmap( + heatmapId: HeatmapId('heatmap-1'), + data: [ + WeightedLatLng(43.355114, -5.851333), + WeightedLatLng(43.354797, -5.851860), + WeightedLatLng(43.354469, -5.851318), + WeightedLatLng(43.354762, -5.850824), + ], ), }, markers: { const Marker( diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart index e9058a467074..f7836a20e8cb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart @@ -6,8 +6,7 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_maps/google_maps.dart' as gmaps; -import 'package:google_maps/google_maps_visualization.dart' - as gmaps_visualization; +import 'package:google_maps/google_maps_visualization.dart' as visualization; import 'package:google_maps_flutter_web/google_maps_flutter_web.dart'; import 'package:integration_test/integration_test.dart'; @@ -208,16 +207,16 @@ void main() { }); group('HeatmapController', () { - late gmaps_visualization.HeatmapLayer heatmap; + late visualization.HeatmapLayer heatmap; setUp(() { - heatmap = gmaps_visualization.HeatmapLayer(); + heatmap = visualization.HeatmapLayer(); }); testWidgets('update', (WidgetTester tester) async { final HeatmapController controller = HeatmapController(heatmap: heatmap); - final gmaps_visualization.HeatmapLayerOptions options = - gmaps_visualization.HeatmapLayerOptions() + final visualization.HeatmapLayerOptions options = + visualization.HeatmapLayerOptions() ..data = [gmaps.LatLng(0, 0)]; expect(heatmap.data, hasLength(0)); @@ -242,8 +241,8 @@ void main() { testWidgets('cannot call update after remove', (WidgetTester tester) async { - final gmaps_visualization.HeatmapLayerOptions options = - gmaps_visualization.HeatmapLayerOptions()..dissipating = true; + final visualization.HeatmapLayerOptions options = + visualization.HeatmapLayerOptions()..dissipating = true; controller.remove(); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart index 8edc3a039c50..5c0d606a1860 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart @@ -9,8 +9,7 @@ import 'dart:ui'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_maps/google_maps.dart' as gmaps; import 'package:google_maps/google_maps_geometry.dart' as geometry; -import 'package:google_maps/google_maps_visualization.dart' - as gmaps_visualization; +import 'package:google_maps/google_maps_visualization.dart' as visualization; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:google_maps_flutter_web/google_maps_flutter_web.dart'; import 'package:integration_test/integration_test.dart'; @@ -403,8 +402,8 @@ void main() { hasLength(0)); final Set updatedHeatmaps = { - Heatmap( - heatmapId: const HeatmapId('1'), + const Heatmap( + heatmapId: HeatmapId('1'), data: [WeightedLatLng(0, 0)], ), }; @@ -453,7 +452,7 @@ void main() { controller.addHeatmaps(heatmaps); - final gmaps_visualization.HeatmapLayer heatmap = + final visualization.HeatmapLayer heatmap = controller.heatmaps.values.first.heatmap!; expect(heatmap.get('gradient'), ['rgba(250, 186, 218, 1)']); diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart index 8f3172eb15dd..8c1409ff2779 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/google_maps_flutter_web.dart @@ -16,8 +16,7 @@ import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:google_maps/google_maps.dart' as gmaps; -import 'package:google_maps/google_maps_visualization.dart' - as gmaps_visualization; +import 'package:google_maps/google_maps_visualization.dart' as visualization; import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'; import 'package:sanitize_html/sanitize_html.dart'; import 'package:stream_transform/stream_transform.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index d157db790feb..82c276b7e26e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -304,14 +304,14 @@ gmaps.CircleOptions _circleOptionsFromCircle(Circle circle) { return circleOptions; } -gmaps_visualization.HeatmapLayerOptions _heatmapOptionsFromHeatmap( +visualization.HeatmapLayerOptions _heatmapOptionsFromHeatmap( Heatmap heatmap, ) { - final gmaps_visualization.HeatmapLayerOptions heatmapOptions = - gmaps_visualization.HeatmapLayerOptions() + final visualization.HeatmapLayerOptions heatmapOptions = + visualization.HeatmapLayerOptions() ..data = heatmap.data .map( - (WeightedLatLng e) => gmaps_visualization.WeightedLocation() + (WeightedLatLng e) => visualization.WeightedLocation() ..location = gmaps.LatLng(e.latitude, e.longitude) ..weight = e.weight, ) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart index 7b04624aedcb..4dc79a8b0bde 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmap.dart @@ -4,27 +4,27 @@ part of google_maps_flutter_web; -/// The `HeatmapController` class wraps a [gmaps_visualization.HeatmapLayer] and its `onTap` behavior. +/// The `HeatmapController` class wraps a [visualization.HeatmapLayer] and its `onTap` behavior. class HeatmapController { - /// Creates a `HeatmapController`, which wraps a [gmaps_visualization.HeatmapLayer] object and its `onTap` behavior. - HeatmapController({required gmaps_visualization.HeatmapLayer heatmap}) + /// Creates a `HeatmapController`, which wraps a [visualization.HeatmapLayer] object and its `onTap` behavior. + HeatmapController({required visualization.HeatmapLayer heatmap}) : _heatmap = heatmap; - gmaps_visualization.HeatmapLayer? _heatmap; + visualization.HeatmapLayer? _heatmap; - /// Returns the wrapped [gmaps_visualization.HeatmapLayer]. Only used for testing. + /// Returns the wrapped [visualization.HeatmapLayer]. Only used for testing. @visibleForTesting - gmaps_visualization.HeatmapLayer? get heatmap => _heatmap; + visualization.HeatmapLayer? get heatmap => _heatmap; - /// Updates the options of the wrapped [gmaps_visualization.HeatmapLayer] object. + /// Updates the options of the wrapped [visualization.HeatmapLayer] object. /// /// This cannot be called after [remove]. - void update(gmaps_visualization.HeatmapLayerOptions options) { + void update(visualization.HeatmapLayerOptions options) { assert(_heatmap != null, 'Cannot `update` Heatmap after calling `remove`.'); _heatmap!.options = options; } - /// Disposes of the currently wrapped [gmaps_visualization.HeatmapLayer]. + /// Disposes of the currently wrapped [visualization.HeatmapLayer]. void remove() { if (_heatmap != null) { _heatmap!.map = null; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart index be4f05d293fa..46bf64d9b3c2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/heatmaps.dart @@ -29,10 +29,10 @@ class HeatmapsController extends GeometryController { return; } - final gmaps_visualization.HeatmapLayerOptions populationOptions = + final visualization.HeatmapLayerOptions heatmapOptions = _heatmapOptionsFromHeatmap(heatmap); - final gmaps_visualization.HeatmapLayer gmHeatmap = - gmaps_visualization.HeatmapLayer(populationOptions); + final visualization.HeatmapLayer gmHeatmap = + visualization.HeatmapLayer(heatmapOptions); gmHeatmap.map = googleMap; final HeatmapController controller = HeatmapController(heatmap: gmHeatmap); _heatmapIdToController[heatmap.heatmapId] = controller; From ead58b8a4eb40c9edb7105f7d992146626a299dd Mon Sep 17 00:00:00 2001 From: Rexios Date: Mon, 23 May 2022 17:34:16 -0400 Subject: [PATCH 42/94] Added license text to example/web/index.html --- .../google_maps_flutter/example/web/index.html | 3 +++ 1 file changed, 3 insertions(+) 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 33b3d26173ea..78e8d779cc77 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 @@ -1,4 +1,7 @@ +