Merge branch 'main' into addLocationEngine

maplibre · Oct 8, 2024 · a47403d · a47403d
2 parents 8990daf + 5a3daa2
commit a47403d
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 0 deletions.
diff --git a/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java b/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java
@@ -938,6 +938,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");

diff --git a/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapController.swift b/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,

diff --git a/maplibre_gl/lib/src/controller.dart b/maplibre_gl/lib/src/controller.dart
@@ -1111,6 +1111,10 @@ class MapLibreMapController extends ChangeNotifier {
     return _maplibrePlatform.invalidateAmbientCache();
   }
 
+  Future clearAmbientCache() async {
+    return _maplibrePlatform.clearAmbientCache();
+  }
+
   /// Get last my location
   ///
   /// Return last latlng, nullable

diff --git a/maplibre_gl_platform_interface/lib/src/maplibre_gl_platform_interface.dart b/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();

diff --git a/maplibre_gl_platform_interface/lib/src/method_channel_maplibre_gl.dart b/maplibre_gl_platform_interface/lib/src/method_channel_maplibre_gl.dart
@@ -321,6 +321,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 {

diff --git a/maplibre_gl_web/lib/src/maplibre_web_gl_platform.dart b/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;