Random Fixes Everywhere

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.13.0] - xx/xx/2021
+This version has support for sound null safety. For this purpose, some inactive packages were exchanged with active forks.
+
+- Sound null safety migration (#851, #870)
+  - requires flutter version 2.0.0 or higher
+  - latlong is replaced with latlong2
+
+Thanks to escamoteur, ThexXTURBOXx, Sata51, tazik561, kengu, passsy, Ahmed-gubara and johnpryan for this release!
+
 ## [0.12.0] - 3/16/2021
 TileLayerOptions now takes some additional options, templateFunction,
 tileBuilder, tilesContainerBuilder, and evictErrorTileStrategy

README.md

@@ -286,6 +286,6 @@ Note that there is also `FileTileProvider()`, which you can use to load tiles fr
 
 For the latest roadmap, please see the [Issue Tracker]
 
-[Leaflet]: http://leafletjs.com/
+[Leaflet]: https://leafletjs.com/
 [Mapbox]: https://www.mapbox.com/
 [Issue Tracker]: https://github.com/johnpryan/flutter_map/issues

analysis_options.yaml

@@ -36,6 +36,7 @@ linter:
     - prefer_null_aware_operators
     - prefer_single_quotes
     - prefer_typing_uninitialized_variables
+    - sort_pub_dependencies
     - test_types_in_equals
     - throw_in_finally
     - unnecessary_brace_in_string_interps

example/pubspec.yaml

@@ -21,19 +21,19 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  flutter:
-    sdk: flutter
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
+  flutter:
+    sdk: flutter
   flutter_map:
     path: ../
   location: ^4.1.1
 
 dev_dependencies:
-  pedantic: ^1.11.0
   flutter_test:
     sdk: flutter
+  pedantic: ^1.11.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

lib/src/core/bounds.dart

@@ -31,7 +31,7 @@ class Bounds<T extends num> {
     );
   }
 
-  /// This [Bounds] cental point.
+  /// This [Bounds] central point.
   CustomPoint<double> getCenter() {
     //TODO should this be a getter?
     return CustomPoint<double>(

lib/src/gestures/gestures.dart

@@ -2,13 +2,13 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
+import 'package:flutter/physics.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/gestures/interactive_flag.dart';
 import 'package:flutter_map/src/gestures/latlng_tween.dart';
 import 'package:flutter_map/src/map/map.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:positioned_tap_detector_2/positioned_tap_detector_2.dart';
-import 'package:flutter/physics.dart';
 
 abstract class MapGestureMixin extends State<FlutterMap>
     with TickerProviderStateMixin {

lib/src/layer/polyline_layer.dart

@@ -50,6 +50,7 @@ class Polyline {
 
 class PolylineLayerWidget extends StatelessWidget {
   final PolylineLayerOptions options;
+
   PolylineLayerWidget({Key? key, required this.options}) : super(key: key);
 
   @override

lib/src/layer/tile_layer.dart

@@ -146,7 +146,7 @@ class TileLayerOptions extends LayerOptions {
   /// Tile image to show in place of the tile that failed to load.
   final ImageProvider? errorImage;
 
-  /// Static informations that should replace placeholders in the [urlTemplate].
+  /// Static information that should replace placeholders in the [urlTemplate].
   /// Applying API keys is a good example on how to use this parameter.
   ///
   /// Example:
@@ -333,7 +333,7 @@ class WMSTileLayerOptions {
   /// Version of the WMS service to use
   final String version;
 
-  /// tile transperency flag
+  /// tile transparency flag
   final bool transparent;
 
   // TODO find a way to implicit pass of current map [Crs]
@@ -1205,7 +1205,7 @@ class Tile implements Comparable<Tile> {
       : animationController!.value;
 
   // callback when tile is ready / error occurred
-  // it maybe be null forinstance when download aborted
+  // it maybe be null for instance when download aborted
   TileReady? tileReady;
   ImageInfo? imageInfo;
   ImageStream? _imageStream;

pubspec.yaml

@@ -1,30 +1,30 @@
 name: flutter_map
-description: A Dart implementation of Leaflet for Flutter apps
-version: 0.12.0
-repository: https://github.com/johnpryan/flutter_map
+description: A Dart implementation of Leaflet to provide a Map widget for Flutter apps
+version: 0.13.0
+repository: https://github.com/fleaflet/flutter_map
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
-  flutter: ">=2.0.0"
+  flutter: '>=2.0.0'
 
 dependencies:
+  async: ^2.1.0
+  collection: ^1.15.0
   flutter:
     sdk: flutter
-  tuple: ^2.0.0
+  flutter_image: ^4.0.1
   intl: ^0.17.0
   latlong2: ^0.8.0
   positioned_tap_detector_2: ^1.0.0
+  proj4dart: ^2.0.0
   transparent_image: ^2.0.0
-  async: ^2.1.0
-  flutter_image: ^4.0.1
+  tuple: ^2.0.0
   vector_math: ^2.1.0
-  proj4dart: ^2.0.0
-  collection: ^1.15.0
 
 dev_dependencies:
-  pedantic: ^1.11.0
-  location: ^4.1.1
   flutter_test:
     sdk: flutter
-  test: ^1.16.5
-  mockito: ^5.0.2
+  location: ^4.1.1
+  mockito: ^5.0.2
+  pedantic: ^1.11.0
+  test: ^1.16.5