Upgrade to sound null-safety

CHANGELOG.md

@@ -1,3 +1,14 @@
+## [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
+- Remove the package flutter_image and add http instead (#894)
+  - http has to be version 0.13.2 or higher for this package (#894)
+
+Thanks to escamoteur, ThexXTURBOXx, Sata51, tazik561, kengu, passsy, Ahmed-gubara, johnpryan and josxha 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/ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

example/ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

example/lib/main.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_map_example/pages/network_tile_provider.dart';
 
 import './pages/animated_map_controller.dart';
 import './pages/circle.dart';
@@ -40,6 +41,7 @@ class MyApp extends StatelessWidget {
       ),
       home: HomePage(),
       routes: <String, WidgetBuilder>{
+        NetworkTileProviderPage.route: (context) => NetworkTileProviderPage(),
         WidgetsPage.route: (context) => WidgetsPage(),
         TapToAddPage.route: (context) => TapToAddPage(),
         EsriPage.route: (context) => EsriPage(),

example/lib/pages/animated_map_controller.dart

@@ -29,7 +29,7 @@ class AnimatedMapControllerPageState extends State<AnimatedMapControllerPage>
   static LatLng paris = LatLng(48.8566, 2.3522);
   static LatLng dublin = LatLng(53.3498, -6.2603);
 
-  MapController mapController;
+  late MapController mapController;
 
   @override
   void initState() {

example/lib/pages/custom_crs/custom_crs.dart

@@ -14,30 +14,31 @@ class CustomCrsPage extends StatefulWidget {
 }
 
 class _CustomCrsPageState extends State<CustomCrsPage> {
-  Proj4Crs epsg3413CRS;
+  late Proj4Crs epsg3413CRS;
 
-  double maxZoom;
+  double? maxZoom;
 
   // Define start center
   proj4.Point point = proj4.Point(x: 65.05166470332148, y: -19.171744826394896);
 
   String initText = 'Map centered to';
 
-  proj4.Projection epsg4326;
+  late proj4.Projection epsg4326;
 
-  proj4.Projection epsg3413;
+  late proj4.Projection epsg3413;
 
   @override
   void initState() {
     super.initState();
 
     // EPSG:4326 is a predefined projection ships with proj4dart
-    epsg4326 = proj4.Projection('EPSG:4326');
+    epsg4326 = proj4.Projection.get('EPSG:4326')!;
 
     // EPSG:3413 is a user-defined projection from a valid Proj4 definition string
     // From: http://epsg.io/3413, proj definition: http://epsg.io/3413.proj4
     // Find Projection by name or define it if not exists
-    epsg3413 = proj4.Projection('EPSG:3413') ??
+    // TODO the warning here will go away as soon as proj4 is migrated to null safety
+    epsg3413 = proj4.Projection.get('EPSG:3413') ??
         proj4.Projection.add('EPSG:3413',
             '+proj=stere +lat_0=90 +lat_ts=70 +lon_0=-45 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs');
 

example/lib/pages/interactive_test_page.dart

@@ -16,12 +16,12 @@ class InteractiveTestPage extends StatefulWidget {
 }
 
 class _InteractiveTestPageState extends State<InteractiveTestPage> {
-  MapController mapController;
+  late MapController mapController;
 
   // Enable pinchZoom and doubleTapZoomBy by default
   int flags = InteractiveFlag.pinchZoom | InteractiveFlag.doubleTapZoom;
 
-  StreamSubscription<MapEvent> subscription;
+  late StreamSubscription<MapEvent> subscription;
 
   @override
   void initState() {
@@ -159,7 +159,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
                     }
 
                     return Text(
-                      'Current event: ${snapshot.data.runtimeType}\nSource: ${snapshot.data.source}',
+                      'Current event: ${snapshot.data.runtimeType}\nSource: ${snapshot.data!.source}',
                       textAlign: TextAlign.center,
                     );
                   },

example/lib/pages/live_location.dart

@@ -14,13 +14,13 @@ class LiveLocationPage extends StatefulWidget {
 }
 
 class _LiveLocationPageState extends State<LiveLocationPage> {
-  LocationData _currentLocation;
-  MapController _mapController;
+  LocationData? _currentLocation;
+  late MapController _mapController;
 
   bool _liveUpdate = false;
   bool _permission = false;
 
-  String _serviceError = '';
+  String? _serviceError = '';
 
   var interActiveFlags = InteractiveFlag.all;
 
@@ -35,11 +35,11 @@ class _LiveLocationPageState extends State<LiveLocationPage> {
 
   void initLocationService() async {
     await _locationService.changeSettings(
-      accuracy: LocationAccuracy.HIGH,
+      accuracy: LocationAccuracy.high,
       interval: 1000,
     );
 
-    LocationData location;
+    LocationData? location;
     bool serviceEnabled;
     bool serviceRequestResult;
 
@@ -48,13 +48,12 @@ class _LiveLocationPageState extends State<LiveLocationPage> {
 
       if (serviceEnabled) {
         var permission = await _locationService.requestPermission();
-        _permission = permission == PermissionStatus.GRANTED;
+        _permission = permission == PermissionStatus.granted;
 
         if (_permission) {
           location = await _locationService.getLocation();
           _currentLocation = location;
-          _locationService
-              .onLocationChanged()
+          _locationService.onLocationChanged
               .listen((LocationData result) async {
             if (mounted) {
               setState(() {
@@ -63,8 +62,8 @@ class _LiveLocationPageState extends State<LiveLocationPage> {
                 // If Live Update is enabled, move map center
                 if (_liveUpdate) {
                   _mapController.move(
-                      LatLng(_currentLocation.latitude,
-                          _currentLocation.longitude),
+                      LatLng(_currentLocation!.latitude!,
+                          _currentLocation!.longitude!),
                       _mapController.zoom);
                 }
               });
@@ -97,7 +96,7 @@ class _LiveLocationPageState extends State<LiveLocationPage> {
     // by default or store previous location value to show.
     if (_currentLocation != null) {
       currentLatLng =
-          LatLng(_currentLocation.latitude, _currentLocation.longitude);
+          LatLng(_currentLocation!.latitude!, _currentLocation!.longitude!);
     } else {
       currentLatLng = LatLng(0, 0);
     }
@@ -125,7 +124,7 @@ class _LiveLocationPageState extends State<LiveLocationPage> {
           children: [
             Padding(
               padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
-              child: _serviceError.isEmpty
+              child: _serviceError!.isEmpty
                   ? Text('This is a map that is showing '
                       '(${currentLatLng.latitude}, ${currentLatLng.longitude}).')
                   : Text(

example/lib/pages/map_controller.dart

@@ -21,7 +21,7 @@ class MapControllerPageState extends State<MapControllerPage> {
   static LatLng paris = LatLng(48.8566, 2.3522);
   static LatLng dublin = LatLng(53.3498, -6.2603);
 
-  MapController mapController;
+  late MapController mapController;
   double rotation = 0.0;
 
   @override
@@ -119,7 +119,7 @@ class MapControllerPageState extends State<MapControllerPage> {
                   Builder(builder: (BuildContext context) {
                     return MaterialButton(
                       onPressed: () {
-                        final bounds = mapController.bounds;
+                        final bounds = mapController.bounds!;
 
                         ScaffoldMessenger.of(context).showSnackBar(SnackBar(
                           content: Text(
@@ -178,8 +178,8 @@ class MapControllerPageState extends State<MapControllerPage> {
 
 class CurrentLocation extends StatefulWidget {
   const CurrentLocation({
-    Key key,
-    @required this.mapController,
+    Key? key,
+    required this.mapController,
   }) : super(key: key);
 
   final MapController mapController;
@@ -192,7 +192,7 @@ class _CurrentLocationState extends State<CurrentLocation> {
   int _eventKey = 0;
 
   var icon = Icons.gps_not_fixed;
-  StreamSubscription<MapEvent> mapEventSubscription;
+  late StreamSubscription<MapEvent> mapEventSubscription;
 
   @override
   void initState() {
@@ -229,7 +229,7 @@ class _CurrentLocationState extends State<CurrentLocation> {
     try {
       var currentLocation = await location.getLocation();
       var moved = widget.mapController.move(
-        LatLng(currentLocation.latitude, currentLocation.longitude),
+        LatLng(currentLocation.latitude!, currentLocation.longitude!),
         18,
         id: _eventKey.toString(),
       );

example/lib/pages/marker_anchor.dart

@@ -13,7 +13,7 @@ class MarkerAnchorPage extends StatefulWidget {
 }
 
 class MarkerAnchorPageState extends State<MarkerAnchorPage> {
-  AnchorPos anchorPos;
+  late AnchorPos anchorPos;
 
   @override
   void initState() {

example/lib/pages/marker_rotate.dart

@@ -13,9 +13,9 @@ class MarkerRotatePage extends StatefulWidget {
 }
 
 class MarkerRotatePageState extends State<MarkerRotatePage> {
-  bool rotateMarkerLondon;
-  bool rotateMarkerDublin;
-  bool rotateMarkerParis;
+  bool? rotateMarkerLondon;
+  bool? rotateMarkerDublin;
+  bool? rotateMarkerParis;
   bool rotateMarkerLayerOptions = false;
 
   @override
@@ -33,7 +33,7 @@ class MarkerRotatePageState extends State<MarkerRotatePage> {
     setState(() {
       if (rotateMarkerLondon == null) {
         rotateMarkerLondon = true;
-      } else if (rotateMarkerLondon) {
+      } else if (rotateMarkerLondon != null) {
         rotateMarkerLondon = false;
       } else {
         rotateMarkerLondon = null;
@@ -45,7 +45,7 @@ class MarkerRotatePageState extends State<MarkerRotatePage> {
     setState(() {
       if (rotateMarkerDublin == null) {
         rotateMarkerDublin = true;
-      } else if (rotateMarkerDublin) {
+      } else if (rotateMarkerDublin != null) {
         rotateMarkerDublin = false;
       } else {
         rotateMarkerDublin = null;
@@ -57,7 +57,7 @@ class MarkerRotatePageState extends State<MarkerRotatePage> {
     setState(() {
       if (rotateMarkerParis == null) {
         rotateMarkerParis = true;
-      } else if (rotateMarkerParis) {
+      } else if (rotateMarkerParis != null) {
         rotateMarkerParis = false;
       } else {
         rotateMarkerParis = null;

example/lib/pages/moving_markers.dart

@@ -16,8 +16,8 @@ class MovingMarkersPage extends StatefulWidget {
 }
 
 class _MovingMarkersPageState extends State<MovingMarkersPage> {
-  Marker _marker;
-  Timer _timer;
+  Marker? _marker;
+  late Timer _timer;
   int _markerIndex = 0;
 
   @override
@@ -62,7 +62,7 @@ class _MovingMarkersPageState extends State<MovingMarkersPage> {
                       urlTemplate:
                           'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
                       subdomains: ['a', 'b', 'c']),
-                  MarkerLayerOptions(markers: <Marker>[_marker])
+                  MarkerLayerOptions(markers: [_marker!])
                 ],
               ),
             ),