Merge branch 'main' of https://github.com/LouisRaverdy/flutter-maplibre-gl

Author: LouisRaverdy

maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java

@@ -935,6 +935,24 @@ public void onError(@NonNull String message) {
               });
           break;
         }
+      case "map#clearAmbientCache":
+      {
+        OfflineManager fileSource = OfflineManager.Companion.getInstance(context);
+
+        fileSource.clearAmbientCache(
+                new OfflineManager.FileSourceCallback() {
+                  @Override
+                  public void onSuccess() {
+                    result.success(null);
+                  }
+
+                  @Override
+                  public void onError(@NonNull String message) {
+                    result.error("MAPBOX CACHE ERROR", message, null);
+                  }
+                });
+        break;
+      }
       case "source#addGeoJson":
         {
           final String sourceId = call.argument("sourceId");

maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapController.swift

@@ -158,6 +158,15 @@ class MapLibreMapController: NSObject, FlutterPlatformView, MLNMapViewDelegate,
                     result(nil)
                 }
             }
+        case "map#clearAmbientCache":
+            MLNOfflineStorage.shared.clearAmbientCache {
+                error in
+                if let error = error {
+                    result(error)
+                } else {
+                    result(nil)
+                }
+            }
         case "map#updateMyLocationTrackingMode":
             guard let arguments = methodCall.arguments as? [String: Any] else { return }
             if let myLocationTrackingMode = arguments["mode"] as? UInt,

maplibre_gl/lib/src/controller.dart

@@ -1112,6 +1112,10 @@ class MapLibreMapController extends ChangeNotifier {
     return _maplibrePlatform.invalidateAmbientCache();
   }
 
+  Future clearAmbientCache() async {
+    return _maplibrePlatform.clearAmbientCache();
+  }
+
   /// Get last my location
   ///
   /// Return last latlng, nullable

maplibre_gl_platform_interface/lib/src/location.dart

@@ -84,6 +84,26 @@ class LatLngBounds {
     return <dynamic>[southwest.toJson(), northeast.toJson()];
   }
 
+  /// Determines whether a given geographical point (`LatLng`) is within the
+  /// bounds defined by two other geographical points: `southwest` (lower-left corner)
+  /// and `northeast` (upper-right corner).
+  ///
+  bool contains(LatLng point) {
+    final isLatitudeInBounds = point.latitude >= southwest.latitude &&
+        point.latitude <= northeast.latitude;
+
+    final bool isLongitudeInBounds;
+
+    if (southwest.longitude <= northeast.longitude) {
+      isLongitudeInBounds = point.longitude >= southwest.longitude &&
+          point.longitude <= northeast.longitude;
+    } else {
+      isLongitudeInBounds = point.longitude >= southwest.longitude ||
+          point.longitude <= northeast.longitude;
+    }
+    return isLatitudeInBounds && isLongitudeInBounds;
+  }
+
   @visibleForTesting
   static LatLngBounds? fromList(dynamic json) {
     if (json == null) {

maplibre_gl_platform_interface/lib/src/maplibre_gl_platform_interface.dart

@@ -74,6 +74,7 @@ abstract class MapLibrePlatform {
   Future<List> querySourceFeatures(
       String sourceId, String? sourceLayerId, List<Object>? filter);
   Future invalidateAmbientCache();
+  Future clearAmbientCache();
   Future<LatLng?> requestMyLocationLatLng();
 
   Future<LatLngBounds> getVisibleRegion();

maplibre_gl_platform_interface/lib/src/method_channel_maplibre_gl.dart

@@ -323,6 +323,16 @@ class MapLibreMethodChannel extends MapLibrePlatform {
     }
   }
 
+  @override
+  Future clearAmbientCache() async {
+    try {
+      await _channel.invokeMethod('map#clearAmbientCache');
+      return null;
+    } on PlatformException catch (e) {
+      return Future.error(e);
+    }
+  }
+
   @override
   Future<LatLng> requestMyLocationLatLng() async {
     try {

maplibre_gl_web/lib/src/maplibre_web_gl_platform.dart

@@ -355,6 +355,11 @@ class MapLibreMapController extends MapLibrePlatform
     print('Offline storage not available in web');
   }
 
+  @override
+  Future clearAmbientCache() async {
+    print('Offline storage not available in web');
+  }
+
   @override
   Future<LatLng?> requestMyLocationLatLng() async {
     return _myLastLocation;