Feature #727 | Replace latlong with maps_toolkit

example/lib/pages/animated_map_controller.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/circle.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/custom_crs/custom_crs.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/plugin_api.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 import 'package:proj4dart/proj4dart.dart' as proj4;
 
 import '../../widgets/drawer.dart';

example/lib/pages/esri.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/home.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/interactive_test_page.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/live_location.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 import 'package:location/location.dart';
 
 import '../widgets/drawer.dart';

example/lib/pages/many_markers.dart

@@ -2,7 +2,7 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/map_controller.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 import 'package:location/location.dart';
 
 import '../widgets/drawer.dart';

example/lib/pages/marker_anchor.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/marker_rotate.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
-
+import 'package:maps_toolkit/maps_toolkit.dart';
 import '../widgets/drawer.dart';
 
 class MarkerRotatePage extends StatefulWidget {

example/lib/pages/moving_markers.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/offline_map.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/on_tap.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/overlay_image.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/plugin_api.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/plugin_scalebar.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 import 'scale_layer_plugin_option.dart';

example/lib/pages/plugin_zoombuttons.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 import 'zoombuttons_plugin_option.dart';

example/lib/pages/polyline.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/scalebar_utils.dart

@@ -1,5 +1,5 @@
 import 'dart:math';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 const double piOver180 = pi / 180.0;
 double toDegrees(double radians) {

example/lib/pages/sliding_map.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/stateful_markers.dart

@@ -2,7 +2,7 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/tap_to_add.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/tile_builder_example.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/tile_loading_error_handle.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/pages/widgets.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../pages/zoombuttons_plugin_option.dart';
 import '../widgets/drawer.dart';

example/lib/pages/wms_tile_layer.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 import '../widgets/drawer.dart';
 

example/lib/test_app.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 void main() {
   runApp(TestApp());

lib/flutter_map.dart

@@ -12,7 +12,7 @@ import 'package:flutter_map/src/gestures/multi_finger_gesture.dart';
 import 'package:flutter_map/src/map/flutter_map_state.dart';
 import 'package:flutter_map/src/map/map.dart';
 import 'package:flutter_map/src/plugins/plugin.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 export 'package:flutter_map/src/core/point.dart';
 export 'package:flutter_map/src/geo/crs/crs.dart';

lib/src/core/center_zoom.dart

@@ -1,4 +1,4 @@
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class CenterZoom {
   final LatLng center;

lib/src/geo/angles.dart

@@ -0,0 +1,5 @@
+import 'dart:math';
+
+num toRadians(num degrees) => degrees / 180.0 * pi;
+
+num toDegrees(num rad) => rad * (180.0 / pi);

lib/src/geo/crs/crs.dart

@@ -2,7 +2,7 @@ import 'dart:math' as math;
 
 import 'package:flutter_map/src/core/bounds.dart';
 import 'package:flutter_map/src/core/point.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 import 'package:meta/meta.dart';
 import 'package:proj4dart/proj4dart.dart' as proj4;
 import 'package:tuple/tuple.dart';

lib/src/geo/latlng_bounds.dart

@@ -1,5 +1,6 @@
 import 'dart:math' as math;
-import 'package:latlong2/latlong.dart';
+import 'package:flutter_map/src/geo/angles.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class LatLngBounds {
   LatLng _sw;
@@ -18,8 +19,8 @@ class LatLngBounds {
       num maxY;
 
       for (var point in points) {
-        num x = point.longitudeInRad;
-        num y = point.latitudeInRad;
+        num x = toRadians(point.longitude);
+        num y = toRadians(point.latitude);
 
         if (minX == null || minX > x) {
           minX = x;
@@ -38,8 +39,8 @@ class LatLngBounds {
         }
       }
 
-      _sw = LatLng(radianToDeg(minY), radianToDeg(minX));
-      _ne = LatLng(radianToDeg(maxY), radianToDeg(maxX));
+      _sw = LatLng(toDegrees(minY), toDegrees(minX));
+      _ne = LatLng(toDegrees(maxY), toDegrees(maxX));
     }
   }
 
@@ -59,10 +60,10 @@ class LatLngBounds {
       _sw = LatLng(sw2.latitude, sw2.longitude);
       _ne = LatLng(ne2.latitude, ne2.longitude);
     } else {
-      _sw.latitude = math.min(sw2.latitude, _sw.latitude);
-      _sw.longitude = math.min(sw2.longitude, _sw.longitude);
-      _ne.latitude = math.max(ne2.latitude, _ne.latitude);
-      _ne.longitude = math.max(ne2.longitude, _ne.longitude);
+      _sw = LatLng(math.min(sw2.latitude, _sw.latitude),
+          math.min(sw2.longitude, _sw.longitude));
+      _ne = LatLng(math.max(ne2.latitude, _ne.latitude),
+          math.max(ne2.longitude, _ne.longitude));
     }
   }
 

lib/src/gestures/gestures.dart

@@ -3,10 +3,11 @@ import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/angles.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:maps_toolkit/maps_toolkit.dart';
 import 'package:positioned_tap_detector_2/positioned_tap_detector_2.dart';
 import 'package:flutter/physics.dart';
 
@@ -241,7 +242,7 @@ abstract class MapGestureMixin extends State<FlutterMap>
     final flags = options.interactiveFlags;
     final focalOffset = details.localFocalPoint;
 
-    final currentRotation = radianToDeg(details.rotation);
+    final currentRotation = toDegrees(details.rotation);
 
     if (_dragMode) {
       if (InteractiveFlag.hasFlag(flags, InteractiveFlag.drag)) {

lib/src/gestures/latlng_tween.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/animation.dart';
 import 'package:flutter/foundation.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class LatLngTween extends Tween<LatLng> {
   LatLngTween({@required LatLng begin, @required LatLng end})

lib/src/gestures/map_events.dart

@@ -1,4 +1,4 @@
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 enum MapEventSource {
   mapController,

lib/src/layer/circle_layer.dart

@@ -3,7 +3,7 @@ import 'dart:ui';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/map/map.dart';
-import 'package:latlong2/latlong.dart' hide Path;
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class CircleLayerOptions extends LayerOptions {
   final List<CircleMarker> circles;
@@ -74,7 +74,8 @@ class CircleLayer extends StatelessWidget {
           circle.offset = Offset(pos.x.toDouble(), pos.y.toDouble());
 
           if (circle.useRadiusInMeter) {
-            var r = Distance().offset(circle.point, circle.radius, 180);
+            var r =
+                SphericalUtil.computeOffset(circle.point, circle.radius, 180);
             var rpos = map.project(r);
             rpos = rpos.multiplyBy(map.getZoomScale(map.zoom, map.zoom)) -
                 map.getPixelOrigin();

lib/src/layer/marker_layer.dart

@@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/core/bounds.dart';
 import 'package:flutter_map/src/map/map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class MarkerLayerOptions extends LayerOptions {
   final List<Marker> markers;

lib/src/layer/polygon_layer.dart

@@ -4,7 +4,7 @@ import 'dart:ui';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/map/map.dart';
-import 'package:latlong2/latlong.dart' hide Path; // conflict with Path from UI
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class PolygonLayerOptions extends LayerOptions {
   final List<Polygon> polygons;

lib/src/layer/polyline_layer.dart

@@ -4,7 +4,7 @@ import 'dart:ui' as ui;
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/map/map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class PolylineLayerOptions extends LayerOptions {
   final List<Polyline> polylines;

lib/src/layer/tile_layer.dart

@@ -11,7 +11,7 @@ import 'package:flutter_map/src/geo/crs/crs.dart';
 import 'package:flutter_map/src/layer/tile_builder/tile_builder.dart';
 import 'package:flutter_map/src/layer/tile_provider/tile_provider.dart';
 import 'package:flutter_map/src/map/map.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 import 'package:tuple/tuple.dart';
 
 import 'layer.dart';