v3.1.0 - Bump dependency versions + Max distance clustering

Author: bpillon

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.1.0
+
+- Bump dependency versions
+- Max distance clustering
+
 ## 3.0.0+1
 
 - Remove useless log

example/pubspec.yaml

@@ -14,14 +14,14 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
 
-  google_maps_flutter: ^2.0.6
-  google_maps_flutter_web: ^0.3.0+3
+  google_maps_flutter: ^2.5.2
+  google_maps_flutter_web: ^0.5.4+3
   google_maps_cluster_manager:
     path: ../
 

lib/src/cluster_item.dart

@@ -1,7 +1,7 @@
 import 'package:google_maps_cluster_manager/google_maps_cluster_manager.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
-abstract class ClusterItem {
+mixin ClusterItem {
   LatLng get location;
 
   String? _geohash;

lib/src/cluster_manager.dart

@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
@@ -128,18 +127,18 @@ class ClusterManager<T extends ClusterItem> {
     if (stopClusteringZoom != null && _zoom >= stopClusteringZoom!)
       return visibleItems.map((i) => Cluster<T>.fromItems([i])).toList();
 
+    List<Cluster<T>> markers;
+
     if (clusterAlgorithm == ClusterAlgorithm.GEOHASH ||
         visibleItems.length >= maxItemsForMaxDistAlgo) {
       int level = _findLevel(levels);
-      List<Cluster<T>> markers = _computeClusters(
-          visibleItems, List.empty(growable: true),
+      markers = _computeClusters(visibleItems, List.empty(growable: true),
           level: level);
-      return markers;
     } else {
-      List<Cluster<T>> markers =
-          _computeClustersWithMaxDist(visibleItems, _zoom);
-      return markers;
+      markers = _computeClustersWithMaxDist(visibleItems, _zoom);
     }
+
+    return markers;
   }
 
   LatLngBounds _inflateBounds(LatLngBounds bounds) {

lib/src/common.dart

@@ -1,24 +1,7 @@
 import 'dart:math';
-import 'dart:ui';
 
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
-import 'cluster.dart';
-
-const int _mio = 1000000;
-const int _thd = 1000;
-const double _PI = 3.141592653589793238;
-
-class _Tuple {
-  final LatLng pos1;
-  final LatLng pos2;
-
-  _Tuple(this.pos1, this.pos2);
-
-  bool operator ==(o) => o is _Tuple && pos1 == o.pos1 && pos2 == o.pos2;
-  int get hashCode => pos1.hashCode + pos2.hashCode;
-}
-
 class DistUtils {
 // Zoom-Level:
 // Level	# Tiles	Tile width
@@ -47,18 +30,18 @@ class DistUtils {
 // 18	68 719 476 736	0.001	0.596	1:2 thousand	some buildings, trees
 // 19	274 877 906 944	0.0005	0.298	1:1 thousand	local highway and crossing details
 // 20	1 099 511 627 776	0.00025	0.149	1:5 hundred	A mid-sized building
-  final Map<_Tuple, double> distCache = {};
+  final Map<(LatLng, LatLng), double> distCache = {};
 
   double getLatLonDist(LatLng point1, LatLng point2, int zoomLevel) {
-    if (distCache[_Tuple(point1, point2)] != null) {
-      return distCache[_Tuple(point1, point2)]!;
+    if (distCache[(point1, point2)] != null) {
+      return distCache[(point1, point2)]!;
     }
     double meterPerPixel = _getScalingFactor(zoomLevel);
     double dist = getDistanceFromLatLonInKm(point1.latitude, point1.longitude,
             point2.latitude, point2.longitude) /
-        (meterPerPixel / _thd);
+        (meterPerPixel / 1000);
     // print("dist is $x");
-    distCache[_Tuple(point1, point2)] = dist;
+    distCache[(point1, point2)] = dist;
     return dist;
   }
 
@@ -78,7 +61,7 @@ class DistUtils {
   }
 
   double _degreeToRadian(double degree) {
-    return degree * _PI / 180;
+    return degree * pi / 180;
   }
 
   double _getScalingFactor(int zoomLevel) {

lib/src/geohash.dart

@@ -80,7 +80,7 @@ class Geohash {
   ];
 
   /// Encode a latitude and longitude pair into a  geohash string.
-  static String encode(final LatLng latLng, {final int codeLength: 12}) {
+  static String encode(final LatLng latLng, {final int codeLength = 12}) {
     if (codeLength > 20 || (identical(1.0, 1) && codeLength > 12)) {
       //Javascript can only handle 32 bit ints reliably.
       throw ArgumentError(

lib/src/max_dist_clustering.dart

@@ -38,7 +38,6 @@ class MaxDistClustering<T extends ClusterItem> {
       changed = false;
       for (Cluster<T> c in _cluster) {
         _MinDistCluster<T>? minDistCluster = getClosestCluster(c, zoomLevel);
-        // print("mindistcluster ${minDistCluster?.dist}");
         if (minDistCluster == null || minDistCluster.dist > epsilon) continue;
         _cluster.add(Cluster.fromClusters(minDistCluster.cluster, c));
         _cluster.remove(c);

pubspec.yaml

@@ -1,17 +1,23 @@
 name: google_maps_cluster_manager
 description: Simple Flutter clustering library for Google Maps based on Geohash.
-version: 3.0.0+1
+version: 3.1.0
 homepage: https://github.com/bpillon/google_maps_cluster_manager
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
 
-  google_maps_flutter_platform_interface: ^2.1.0
+  google_maps_flutter_platform_interface: ^2.4.3
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
+
+topics:
+  - google-maps
+  - google-maps-flutter
+  - map
+  - cluster