7.3.11 (#103)

Author: LuisReyes98

.fvmrc

@@ -1,4 +1,4 @@
 {
-  "flutter": "3.32.1",
+  "flutter": "3.32.8",
   "flavors": {}
 }

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.3.11
+- Removed dependency on `flutter_map_cancellable_tile_provider` due to deprecation
+- Updated `flutter_map` to `8.2.1` and updated `ThemedTileLayer` accordingly
+
 ## 7.3.10
 - Rework `ThemedSelectInput` to support `canUnselect`, `returnNullOnClose` and `autoClose`
 

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

example/pubspec.lock

@@ -81,6 +81,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  dart_polylabel2:
+    dependency: transitive
+    description:
+      name: dart_polylabel2
+      sha256: "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   dio:
     dependency: transitive
     description:
@@ -137,6 +145,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "10.1.9"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   flex_color_picker:
     dependency: transitive
     description:
@@ -186,10 +202,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_map
-      sha256: f7d0379477274f323c3f3bc12d369a2b42eb86d1e7bd2970ae1ea3cff782449a
+      sha256: df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.1"
+    version: "8.2.1"
   flutter_map_animations:
     dependency: "direct main"
     description:
@@ -198,14 +214,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.0"
-  flutter_map_cancellable_tile_provider:
-    dependency: transitive
-    description:
-      name: flutter_map_cancellable_tile_provider
-      sha256: "801760c104a3cfd9268cda7c9b1241223247e8182613a7e060ef4ffc0d825ac8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -276,10 +284,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.5.0"
   http_parser:
     dependency: transitive
     description:
@@ -350,7 +358,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "7.3.9"
+    version: "7.3.10"
   leak_tracker:
     dependency: transitive
     description:
@@ -631,14 +639,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.10.2+1"
-  polylabel:
-    dependency: transitive
-    description:
-      name: polylabel
-      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   proj4dart:
     dependency: transitive
     description:
@@ -740,6 +740,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:
@@ -876,6 +884,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.1"
   vector_graphics:
     dependency: transitive
     description:

lib/src/map/map.dart

@@ -3,28 +3,25 @@ library;
 import 'dart:async';
 
 import 'package:collection/collection.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart';
+// import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart';
 import 'package:latlong2/latlong.dart';
+import 'package:layrz_icons/layrz_icons.dart';
 import 'package:layrz_models/layrz_models.dart' hide Point;
 import 'package:layrz_theme/layrz_theme.dart';
-import 'package:layrz_icons/layrz_icons.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:dio/dio.dart';
-
-// Layers
-part 'src/layers/tile.dart';
-part 'src/layers/toolbar.dart';
 
 // General
 part 'src/button.dart';
-part 'src/helpers.dart';
 part 'src/constants.dart';
-
+// Dialogs
+part 'src/dialogs/change_layer.dart';
 // Events
 part 'src/events/controller.dart';
 part 'src/events/events.dart';
-
-// Dialogs
-part 'src/dialogs/change_layer.dart';
+part 'src/helpers.dart';
+// Layers
+part 'src/layers/tile.dart';
+part 'src/layers/toolbar.dart';

lib/src/map/src/layers/tile.dart

@@ -10,7 +10,15 @@ class ThemedTileLayer extends StatefulWidget {
   /// [maxZoom] is the maximum zoom level for the map.
   final double maxZoom;
 
-  /// [isCancellable] is a flag to indicate whether the map can be cancelled or not.
+  /// [isCancellable] is a flag to indicate whether the map http request can be cancelled or not.
+  /// Defaults to `true`. It is recommended to enable this functionality, unless
+  /// you suspect it is causing problems.
+  /// Whether to abort HTTP requests for tiles that will no longer be displayed.
+  ///
+  /// For example, tiles may be pruned from an intermediate zoom level during a
+  /// user's fast zoom. When disabled, the request for each tile that has been
+  /// pruned still needs to complete and be processed. When enabled, those
+  /// tiles' requests can be aborted before they are fully loaded.
   final bool isCancellable;
 
   /// [controller] defines the `ThemedMapController` to listen some events from other widgets.
@@ -334,9 +342,13 @@ class _ThemedTileLayerState extends State<ThemedTileLayer> {
       maxZoom: widget.maxZoom,
       minNativeZoom: widget.minZoom.toInt(),
       maxNativeZoom: widget.maxZoom.toInt(),
-      tileProvider: widget.isCancellable
-          ? CancellableNetworkTileProvider(headers: headers)
-          : NetworkTileProvider(headers: headers),
+      tileProvider: NetworkTileProvider(
+        headers: headers,
+
+        /// Setting for the previous CancellableNetworkTileProvider
+        abortObsoleteRequests: widget.isCancellable,
+      ),
+
       keepBuffer: buffer,
       panBuffer: buffer,
     );

pubspec.yaml

@@ -1,6 +1,6 @@
 name: layrz_theme
 description: Layrz standard styling library for Flutter. Widget library following the Material Design 3 guidelines, with a focus on reliavility and functionality.
-version: "7.3.10"
+version: "7.3.11"
 homepage: https://theme.layrz.com
 repository: https://github.com/goldenm-software/layrz_theme
 
@@ -40,8 +40,7 @@ dependencies:
   two_dimensional_scrollables: ^0.3.4
   sync_scroll_controller: ^1.0.1
   web: ^1.1.0
-  flutter_map: ^8.1.1
-  flutter_map_cancellable_tile_provider: ^3.1.0
+  flutter_map: ^8.2.1
   flutter_highlight: ^0.7.0
   highlight: ^0.7.0
   code_text_field: ^1.1.0