feat: add built-in caching & tile loading cancellation support

example/lib/misc/tile_providers.dart

@@ -1,10 +1,15 @@
 import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart';
+import 'package:http/http.dart';
+import 'package:http/retry.dart';
+//import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart';
+
+final httpClient = RetryClient(Client());
 
 TileLayer get openStreetMapTileLayer => TileLayer(
       urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
       userAgentPackageName: 'dev.fleaflet.flutter_map.example',
       // Use the recommended flutter_map_cancellable_tile_provider package to
       // support the cancellation of loading tiles.
-      tileProvider: CancellableNetworkTileProvider(),
+      // TODO: change
+      tileProvider: NetworkTileProvider(httpClient: httpClient),
     );

example/lib/widgets/drawer/menu_drawer.dart

@@ -47,7 +47,13 @@ class MenuDrawer extends StatelessWidget {
     return Drawer(
       child: ListView(
         children: <Widget>[
-          DrawerHeader(
+          Container(
+            padding: const EdgeInsets.fromLTRB(16, 32, 16, 16)
+                .add(EdgeInsets.only(top: MediaQuery.paddingOf(context).top)),
+            margin: const EdgeInsets.only(bottom: 8),
+            decoration: BoxDecoration(
+              border: Border(bottom: Divider.createBorderSide(context)),
+            ),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -65,11 +71,12 @@ class MenuDrawer extends StatelessWidget {
                   textAlign: TextAlign.center,
                   style: TextStyle(fontSize: 14),
                 ),
+                const SizedBox(height: 8),
                 if (kIsWeb)
-                  const Text(
+                  Text(
                     _isWASM ? 'Running with WASM' : 'Running without WASM',
                     textAlign: TextAlign.center,
-                    style: TextStyle(fontSize: 14),
+                    style: Theme.of(context).textTheme.bodySmall,
                   ),
               ],
             ),

example/pubspec.lock

@@ -41,6 +41,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.6"
   dart_earcut:
     dependency: transitive
     description:
@@ -89,6 +97,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -255,6 +271,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.17"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -380,6 +420,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.1"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
@@ -500,8 +548,16 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.4"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.1"
   vector_math:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: vector_math
       sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"

example/pubspec.yaml

@@ -19,7 +19,6 @@ dependencies:
   proj4dart: ^2.1.0
   shared_preferences: ^2.3.4
   url_launcher: ^6.3.1
-  vector_math: ^2.1.4
 
 dependency_overrides:
   flutter_map:

lib/flutter_map.dart

@@ -43,11 +43,15 @@ export 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_display.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_image.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_layer.dart';
-export 'package:flutter_map/src/layer/tile_layer/tile_provider/asset_tile_provider.dart';
+export 'package:flutter_map/src/layer/tile_layer/tile_provider/asset/provider.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_provider/base_tile_provider.dart';
-export 'package:flutter_map/src/layer/tile_layer/tile_provider/file_providers/tile_provider_stub.dart'
-    if (dart.library.io) 'package:flutter_map/src/layer/tile_layer/tile_provider/file_providers/tile_provider_io.dart';
-export 'package:flutter_map/src/layer/tile_layer/tile_provider/network_tile_provider.dart';
+export 'package:flutter_map/src/layer/tile_layer/tile_provider/file/stub_tile_provider.dart'
+    if (dart.library.io) 'package:flutter_map/src/layer/tile_layer/tile_provider/file/native_tile_provider.dart';
+export 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/built_in/built_in_caching_provider.dart';
+export 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/caching_provider.dart';
+export 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/disabled/disabled_caching_provider.dart';
+export 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/tile_metadata.dart';
+export 'package:flutter_map/src/layer/tile_layer/tile_provider/network/tile_provider.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_update_event.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_update_transformer.dart';
 export 'package:flutter_map/src/map/camera/camera.dart';

lib/src/geo/latlng_bounds.dart

@@ -1,7 +1,7 @@
 import 'dart:math';
 
+import 'package:flutter_map/src/misc/deg_rad_conversions.dart';
 import 'package:latlong2/latlong.dart';
-import 'package:vector_math/vector_math_64.dart';
 
 /// Data structure representing rectangular bounding box constrained by its
 /// northwest and southeast corners

lib/src/gestures/map_interactive_viewer.dart

@@ -5,9 +5,9 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/misc/deg_rad_conversions.dart';
 import 'package:flutter_map/src/misc/extensions.dart';
 import 'package:latlong2/latlong.dart';
-import 'package:vector_math/vector_math_64.dart';
 
 part 'package:flutter_map/src/gestures/compound_animations.dart';
 

lib/src/layer/tile_layer/tile_layer.dart

@@ -362,20 +362,17 @@ class _TileLayerState extends State<TileLayer> with TickerProviderStateMixin {
       false && (kReleaseMode || kProfileMode) && !_unblockOpenStreetMapUrl;
   void _warnOpenStreetMapUrl() {
     if (!_isOpenStreetMapUrl || !kDebugMode || _unblockOpenStreetMapUrl) return;
-    Logger(printer: PrettyPrinter(methodCount: 0)).e(
+    Logger(printer: PrettyPrinter(methodCount: 0)).w(
       '''\x1B[1m\x1B[3mflutter_map\x1B[0m
 flutter_map wants to help keep map data available for everyone.
 We use the public OpenStreetMap tile servers in our code examples & demo app,
 but they are NOT free to use by everyone.
-In an upcoming non-major release, requests to 'tile.openstreetmap.org' or
-'tile.osm.org' will be blocked by default in release mode.
 Please review https://operations.osmfoundation.org/policies/tiles/ to see if
 your project is compliant with their Tile Usage Policy.
 For more information, see https://docs.fleaflet.dev/tile-servers/using-openstreetmap-direct.
 It describes in additional detail why we feel it is important to do this, how
-you can unblock the tile servers if your use-case is acceptable, the timeframes
-for this new policy, and how we're working to reduce requests without any extra
-work from you.''',
+you can disable this warning, the timeframes for this new policy, and how we're
+working to reduce requests without any extra work from you.''',
     );
   }
 

lib/src/layer/tile_layer/tile_provider/file_providers/tile_provider_stub.dart → lib/src/layer/tile_layer/tile_provider/file/stub_tile_provider.dart

@@ -21,5 +21,7 @@ class FileTileProvider extends TileProvider {
   @override
   ImageProvider getImage(TileCoordinates coordinates, TileLayer options) =>
       throw UnsupportedError(
-          'The current platform does not have access to IO (the local filesystem), and therefore does not support `FileTileProvider`');
+        'The current platform does not have access to IO (the local '
+        'filesystem), and therefore does not support `FileTileProvider`',
+      );
 }

lib/src/layer/tile_layer/tile_provider/network/caching/built_in/built_in_caching_provider.dart

@@ -0,0 +1,99 @@
+import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/built_in/impl/stub.dart'
+    if (dart.library.io) 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/built_in/impl/native/native.dart'
+    if (dart.library.js_interop) 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/built_in/impl/web/web.dart';
+
+/// Simple built-in map caching using an I/O storage mechanism, for native
+/// (non-web) platforms only
+///
+/// Stores tiles as files identified with keys, containing some metadata headers
+/// followed by the tile bytes, alongside a file used to track the size of the
+/// cache.
+///
+/// Usually uses HTTP headers to determine tile freshness, although
+/// `overrideFreshAge` can override this.
+///
+/// This is enabled by default in flutter_map, when using the
+/// [NetworkTileProvider] (or cancellable version).
+///
+/// For more information, see the online documentation.
+abstract interface class BuiltInMapCachingProvider
+    implements MapCachingProvider {
+  /// if a singleton instance exists, return it, otherwise create a new
+  /// singleton instance (and start asynchronously initialising it)
+  ///
+  /// If an instance already exists, the provided configuration will be ignored.
+  ///
+  /// See individual properties for more information about configuration.
+  factory BuiltInMapCachingProvider.getOrCreateInstance({
+    /// Path to the caching directory to use
+    ///
+    /// This must be accessible to the program.
+    ///
+    /// Defaults to a platform provided cache directory, which may be cleared by
+    /// the OS at any time.
+    String? cacheDirectory,
+
+    /// Preferred maximum size (in bytes) of the cache
+    ///
+    /// This is applied when the internal caching mechanism is created (on the
+    /// first tile load in the main memory space for the app). It is not an
+    /// absolute limit.
+    ///
+    /// Defaults to 1 GB. Set to `null` to disable.
+    int? maxCacheSize = 1_000_000_000,
+
+    /// Override the duration of time a tile is considered fresh for
+    ///
+    /// Defaults to `null`: use duration calculated from each tile's HTTP
+    /// headers.
+    Duration? overrideFreshAge,
+
+    /// Function to convert a tile URL to a key used in the cache
+    ///
+    /// This may be useful where parts of the URL are volatile or do not
+    /// represent the tile image, for example, API keys contained with the query
+    /// parameters.
+    ///
+    /// The resulting key should be unique to that tile URL. Keys must be usable
+    /// as filenames on all intended platform filesystems.
+    ///
+    /// Defaults to generating a UUID from the entire URL string.
+    String Function(String url)? cacheKeyGenerator,
+
+    /// Prevent any tiles from being added or updated
+    ///
+    /// Does not disable the size limiter if the cache size is larger than
+    /// `maxCacheSize`.
+    ///
+    /// Defaults to `false`.
+    bool readOnly = false,
+  }) {
+    assert(
+      maxCacheSize == null || maxCacheSize > 0,
+      '`maxCacheSize` must be greater than 0 or disabled',
+    );
+    assert(
+      overrideFreshAge == null || overrideFreshAge > Duration.zero,
+      '`overrideFreshAge` must be greater than 0 or disabled',
+    );
+    return _instance ??= BuiltInMapCachingProviderImpl.createAndInitialise(
+      cacheDirectory: cacheDirectory,
+      maxCacheSize: maxCacheSize,
+      overrideFreshAge: overrideFreshAge,
+      cacheKeyGenerator: cacheKeyGenerator,
+      readOnly: readOnly,
+    );
+  }
+
+  static BuiltInMapCachingProviderImpl? _instance;
+
+  /// Completes when the current instance has initialised and is ready to load
+  /// and write tiles
+  ///
+  /// Completes with `null` (synchronously & immediately) on web platforms,
+  /// where caching is unavailable.
+  ///
+  /// [isSupported] will be set to determine the current platform's support.
+  Future<void> get isInitialised;
+}