diff --git a/example/lib/pages/animated_map_controller.dart b/example/lib/pages/animated_map_controller.dart
index f18074cb0..ff1dea038 100644
--- a/example/lib/pages/animated_map_controller.dart
+++ b/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';
 
diff --git a/example/lib/pages/circle.dart b/example/lib/pages/circle.dart
index 01eb386c7..046d9e97f 100644
--- a/example/lib/pages/circle.dart
+++ b/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';
 
diff --git a/example/lib/pages/custom_crs/custom_crs.dart b/example/lib/pages/custom_crs/custom_crs.dart
index 95dc14189..be1c10d0f 100644
--- a/example/lib/pages/custom_crs/custom_crs.dart
+++ b/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';
diff --git a/example/lib/pages/esri.dart b/example/lib/pages/esri.dart
index 7976e133e..a87ddf91b 100644
--- a/example/lib/pages/esri.dart
+++ b/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';
 
diff --git a/example/lib/pages/home.dart b/example/lib/pages/home.dart
index 9e4146ed3..bcd4a5f91 100644
--- a/example/lib/pages/home.dart
+++ b/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';
 
diff --git a/example/lib/pages/interactive_test_page.dart b/example/lib/pages/interactive_test_page.dart
index c3c684de4..fc582eabd 100644
--- a/example/lib/pages/interactive_test_page.dart
+++ b/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';
 
diff --git a/example/lib/pages/live_location.dart b/example/lib/pages/live_location.dart
index e5d14b017..1e118f694 100644
--- a/example/lib/pages/live_location.dart
+++ b/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';
diff --git a/example/lib/pages/many_markers.dart b/example/lib/pages/many_markers.dart
index 0b1fc4fd5..80bd64afb 100644
--- a/example/lib/pages/many_markers.dart
+++ b/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';
 
diff --git a/example/lib/pages/map_controller.dart b/example/lib/pages/map_controller.dart
index 676b642ee..72826468b 100644
--- a/example/lib/pages/map_controller.dart
+++ b/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';
diff --git a/example/lib/pages/marker_anchor.dart b/example/lib/pages/marker_anchor.dart
index e59435561..319e6da3e 100644
--- a/example/lib/pages/marker_anchor.dart
+++ b/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';
 
diff --git a/example/lib/pages/marker_rotate.dart b/example/lib/pages/marker_rotate.dart
index 95cc72ced..dfec7bc11 100644
--- a/example/lib/pages/marker_rotate.dart
+++ b/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 {
diff --git a/example/lib/pages/moving_markers.dart b/example/lib/pages/moving_markers.dart
index c561db011..7cc15c6f4 100644
--- a/example/lib/pages/moving_markers.dart
+++ b/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';
 
diff --git a/example/lib/pages/offline_map.dart b/example/lib/pages/offline_map.dart
index 868bde97d..30cb7be60 100644
--- a/example/lib/pages/offline_map.dart
+++ b/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';
 
diff --git a/example/lib/pages/on_tap.dart b/example/lib/pages/on_tap.dart
index 8aba3db83..aab7fb550 100644
--- a/example/lib/pages/on_tap.dart
+++ b/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';
 
diff --git a/example/lib/pages/overlay_image.dart b/example/lib/pages/overlay_image.dart
index 79816db2b..643d22e28 100644
--- a/example/lib/pages/overlay_image.dart
+++ b/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';
 
diff --git a/example/lib/pages/plugin_api.dart b/example/lib/pages/plugin_api.dart
index da894a06b..ab34556b0 100644
--- a/example/lib/pages/plugin_api.dart
+++ b/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';
 
diff --git a/example/lib/pages/plugin_scalebar.dart b/example/lib/pages/plugin_scalebar.dart
index 2780456b6..640b7af15 100644
--- a/example/lib/pages/plugin_scalebar.dart
+++ b/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';
diff --git a/example/lib/pages/plugin_zoombuttons.dart b/example/lib/pages/plugin_zoombuttons.dart
index e2b24686b..80d459f55 100644
--- a/example/lib/pages/plugin_zoombuttons.dart
+++ b/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';
diff --git a/example/lib/pages/polyline.dart b/example/lib/pages/polyline.dart
index 5d17a336b..126492a6e 100644
--- a/example/lib/pages/polyline.dart
+++ b/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';
 
diff --git a/example/lib/pages/scalebar_utils.dart b/example/lib/pages/scalebar_utils.dart
index 204232445..6f30f7e1d 100644
--- a/example/lib/pages/scalebar_utils.dart
+++ b/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) {
diff --git a/example/lib/pages/sliding_map.dart b/example/lib/pages/sliding_map.dart
index d9286803c..8540a6453 100644
--- a/example/lib/pages/sliding_map.dart
+++ b/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';
 
diff --git a/example/lib/pages/stateful_markers.dart b/example/lib/pages/stateful_markers.dart
index d7fedb762..5f6920a3f 100644
--- a/example/lib/pages/stateful_markers.dart
+++ b/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';
 
diff --git a/example/lib/pages/tap_to_add.dart b/example/lib/pages/tap_to_add.dart
index 0cfbdd0ac..d5394c6d0 100644
--- a/example/lib/pages/tap_to_add.dart
+++ b/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';
 
diff --git a/example/lib/pages/tile_builder_example.dart b/example/lib/pages/tile_builder_example.dart
index 44cf6d2ca..3f248f818 100644
--- a/example/lib/pages/tile_builder_example.dart
+++ b/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';
 
diff --git a/example/lib/pages/tile_loading_error_handle.dart b/example/lib/pages/tile_loading_error_handle.dart
index 9ff249af9..6f3e7523a 100644
--- a/example/lib/pages/tile_loading_error_handle.dart
+++ b/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';
 
diff --git a/example/lib/pages/widgets.dart b/example/lib/pages/widgets.dart
index 0c7da07f7..9a7fcb282 100644
--- a/example/lib/pages/widgets.dart
+++ b/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';
diff --git a/example/lib/pages/wms_tile_layer.dart b/example/lib/pages/wms_tile_layer.dart
index 480103f7e..b2dbd1869 100644
--- a/example/lib/pages/wms_tile_layer.dart
+++ b/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';
 
diff --git a/example/lib/test_app.dart b/example/lib/test_app.dart
index 830cb98b9..eb561ca6d 100644
--- a/example/lib/test_app.dart
+++ b/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());
diff --git a/lib/flutter_map.dart b/lib/flutter_map.dart
index 25939818c..0e4308517 100644
--- a/lib/flutter_map.dart
+++ b/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';
diff --git a/lib/src/core/center_zoom.dart b/lib/src/core/center_zoom.dart
index 334abf8dc..78671ca32 100644
--- a/lib/src/core/center_zoom.dart
+++ b/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;
diff --git a/lib/src/geo/angles.dart b/lib/src/geo/angles.dart
new file mode 100644
index 000000000..45fc2214e
--- /dev/null
+++ b/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);
diff --git a/lib/src/geo/crs/crs.dart b/lib/src/geo/crs/crs.dart
index e66e14de9..605a77a59 100644
--- a/lib/src/geo/crs/crs.dart
+++ b/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';
diff --git a/lib/src/geo/latlng_bounds.dart b/lib/src/geo/latlng_bounds.dart
index ad3983411..37bb9e839 100644
--- a/lib/src/geo/latlng_bounds.dart
+++ b/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));
     }
   }
 
diff --git a/lib/src/gestures/gestures.dart b/lib/src/gestures/gestures.dart
index 2b116b2d6..a1cd0787b 100644
--- a/lib/src/gestures/gestures.dart
+++ b/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)) {
diff --git a/lib/src/gestures/latlng_tween.dart b/lib/src/gestures/latlng_tween.dart
index e815b1b1c..79b0cdaed 100644
--- a/lib/src/gestures/latlng_tween.dart
+++ b/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})
diff --git a/lib/src/gestures/map_events.dart b/lib/src/gestures/map_events.dart
index 656ce8ee2..78dfbed65 100644
--- a/lib/src/gestures/map_events.dart
+++ b/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,
diff --git a/lib/src/layer/circle_layer.dart b/lib/src/layer/circle_layer.dart
index 7bebde3dc..5cfd8a454 100644
--- a/lib/src/layer/circle_layer.dart
+++ b/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();
diff --git a/lib/src/layer/marker_layer.dart b/lib/src/layer/marker_layer.dart
index 3b97b75df..ff83c5663 100644
--- a/lib/src/layer/marker_layer.dart
+++ b/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;
diff --git a/lib/src/layer/polygon_layer.dart b/lib/src/layer/polygon_layer.dart
index f46956b81..23ba522fb 100644
--- a/lib/src/layer/polygon_layer.dart
+++ b/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;
diff --git a/lib/src/layer/polyline_layer.dart b/lib/src/layer/polyline_layer.dart
index 30c68bc03..19bc366d9 100644
--- a/lib/src/layer/polyline_layer.dart
+++ b/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;
diff --git a/lib/src/layer/tile_layer.dart b/lib/src/layer/tile_layer.dart
index 7b52f289a..46f4a57c6 100644
--- a/lib/src/layer/tile_layer.dart
+++ b/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';
diff --git a/lib/src/map/map.dart b/lib/src/map/map.dart
index b8f534d27..c634e17ee 100644
--- a/lib/src/map/map.dart
+++ b/lib/src/map/map.dart
@@ -6,8 +6,9 @@ import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/src/core/bounds.dart';
 import 'package:flutter_map/src/core/center_zoom.dart';
 import 'package:flutter_map/src/core/point.dart';
+import 'package:flutter_map/src/geo/angles.dart';
 import 'package:flutter_map/src/map/map_state_widget.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 
 class MapControllerImpl implements MapController {
   final Completer<Null> _readyCompleter = Completer<Null>();
@@ -90,7 +91,7 @@ class MapState {
 
   set rotation(double rotation) {
     _rotation = rotation;
-    _rotationRad = degToRadian(rotation);
+    _rotationRad = toRadians(rotation);
   }
 
   double get rotationRad => _rotationRad;
@@ -103,7 +104,7 @@ class MapState {
 
   MapState(this.options, this.onRotationChanged, this._mapEventSink)
       : _rotation = options.rotation,
-        _rotationRad = degToRadian(options.rotation),
+        _rotationRad = toRadians(options.rotation),
         _zoom = options.zoom,
         _onMoveSink = StreamController.broadcast();
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 357f1fe05..5195cef4b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   tuple: ^1.0.2
-  latlong2: ^0.8.0
+  maps_toolkit: ^1.1.0+2
   positioned_tap_detector_2: ^1.0.0
   transparent_image: ^1.0.0
   async: ^2.1.0
diff --git a/test/flutter_map_test.dart b/test/flutter_map_test.dart
index 1d7920157..507eb51ef 100644
--- a/test/flutter_map_test.dart
+++ b/test/flutter_map_test.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:latlong2/latlong.dart';
+import 'package:maps_toolkit/maps_toolkit.dart';
 import 'package:mockito/mockito.dart';
 
 class MockHttpClientResponse extends Mock implements HttpClientResponse {