Upgrade to sound null-safety

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/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;
@@ -108,17 +108,15 @@ class MarkerRotatePageState extends State<MarkerRotatePage> {
           children: [
             Padding(
               padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
-              child:
-                  Text('Markers can be counter rotated to the map rotation.'),
+              child: Text('Markers can be counter rotated to the map rotation.'),
             ),
             Padding(
               padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
               child: Wrap(
                 children: <Widget>[
                   MaterialButton(
                     onPressed: _setRotateMarkerLayerOptions,
-                    child:
-                        Text('Set by LayerOptions: $rotateMarkerLayerOptions'),
+                    child: Text('Set by LayerOptions: $rotateMarkerLayerOptions'),
                   ),
                   MaterialButton(
                     onPressed: _setRotateMarkerLondon,
@@ -143,9 +141,7 @@ class MarkerRotatePageState extends State<MarkerRotatePage> {
                 ),
                 layers: [
                   TileLayerOptions(
-                      urlTemplate:
-                          'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                      subdomains: ['a', 'b', 'c']),
+                      urlTemplate: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', subdomains: ['a', 'b', 'c']),
                   MarkerLayerOptions(
                     rotate: rotateMarkerLayerOptions,
                     markers: markers,

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!])
                 ],
               ),
             ),

example/lib/pages/plugin_api.dart

@@ -46,9 +46,9 @@ class PluginPage extends StatelessWidget {
 class MyCustomPluginOptions extends LayerOptions {
   final String text;
   MyCustomPluginOptions({
-    Key key,
+    Key? key,
     this.text = '',
-    Stream<Null> rebuild,
+    Stream<Null>? rebuild,
   }) : super(key: key, rebuild: rebuild);
 }
 

example/lib/pages/scale_layer_plugin_option.dart

@@ -8,18 +8,18 @@ import 'package:flutter_map/plugin_api.dart';
 import './scalebar_utils.dart' as util;
 
 class ScaleLayerPluginOption extends LayerOptions {
-  TextStyle textStyle;
+  TextStyle? textStyle;
   Color lineColor;
   double lineWidth;
-  final EdgeInsets padding;
+  final EdgeInsets? padding;
 
   ScaleLayerPluginOption({
-    Key key,
+    Key? key,
     this.textStyle,
     this.lineColor = Colors.white,
     this.lineWidth = 2,
     this.padding,
-    Stream<Null> rebuild,
+    Stream<Null>? rebuild,
   }) : super(key: key, rebuild: rebuild);
 }
 
@@ -84,7 +84,7 @@ class ScaleLayer extends StatelessWidget {
     var displayDistance = distance > 999
         ? '${(distance / 1000).toStringAsFixed(0)} km'
         : '${distance.toStringAsFixed(0)} m';
-    double width = (end.x - start.x);
+    var width = (end.x - (start.x as double));
 
     return CustomPaint(
       painter: ScalePainter(
@@ -103,36 +103,38 @@ class ScalePainter extends CustomPainter {
   ScalePainter(this.width, this.text,
       {this.padding, this.textStyle, this.lineWidth, this.lineColor});
   final double width;
-  final EdgeInsets padding;
+  final EdgeInsets? padding;
   final String text;
-  TextStyle textStyle;
-  double lineWidth;
-  Color lineColor;
+  TextStyle? textStyle;
+  double? lineWidth;
+  Color? lineColor;
 
   @override
   void paint(ui.Canvas canvas, ui.Size size) {
     final paint = Paint()
-      ..color = lineColor
+      ..color = lineColor!
       ..strokeCap = StrokeCap.square
-      ..strokeWidth = lineWidth;
+      ..strokeWidth = lineWidth!;
 
     var sizeForStartEnd = 4;
-    var paddingLeft = padding == null ? 0 : padding.left + sizeForStartEnd / 2;
-    var paddingTop = padding == null ? 0 : padding.top;
+    var paddingLeft = padding == null ? 0 : padding!.left + sizeForStartEnd / 2;
+    var paddingTop = padding == null ? 0 : padding!.top;
 
     var textSpan = TextSpan(style: textStyle, text: text);
     var textPainter =
         TextPainter(text: textSpan, textDirection: TextDirection.ltr)..layout();
-    textPainter.paint(canvas,
-        Offset(width / 2 - textPainter.width / 2 + paddingLeft, paddingTop));
+    textPainter.paint(
+        canvas,
+        Offset(width / 2 - textPainter.width / 2 + paddingLeft,
+            paddingTop as double));
     paddingTop += textPainter.height;
-    var p1 = Offset(paddingLeft, sizeForStartEnd + paddingTop);
+    var p1 = Offset(paddingLeft as double, sizeForStartEnd + paddingTop);
     var p2 = Offset(paddingLeft + width, sizeForStartEnd + paddingTop);
     // draw start line
     canvas.drawLine(Offset(paddingLeft, paddingTop),
         Offset(paddingLeft, sizeForStartEnd + paddingTop), paint);
     // draw middle line
-    var middleX = width / 2 + paddingLeft - lineWidth / 2;
+    var middleX = width / 2 + paddingLeft - lineWidth! / 2;
     canvas.drawLine(Offset(middleX, paddingTop + sizeForStartEnd / 2),
         Offset(middleX, sizeForStartEnd + paddingTop), paint);
     // draw end line