From 9e41304075d9a7989823af925e4a6c6aacc04717 Mon Sep 17 00:00:00 2001 From: Mathieu Broutin Date: Mon, 21 Sep 2020 16:18:47 +0200 Subject: [PATCH] feat(dependencies): replace latlong with maps_toolkit clean: remove debug file chore: fix format issues --- .../lib/pages/animated_map_controller.dart | 2 +- example/lib/pages/circle.dart | 2 +- example/lib/pages/custom_crs/custom_crs.dart | 2 +- example/lib/pages/esri.dart | 2 +- example/lib/pages/home.dart | 2 +- example/lib/pages/live_location.dart | 2 +- example/lib/pages/map_controller.dart | 2 +- example/lib/pages/marker_anchor.dart | 2 +- example/lib/pages/moving_markers.dart | 2 +- example/lib/pages/offline_map.dart | 2 +- example/lib/pages/offline_mbtiles_map.dart | 2 +- example/lib/pages/on_tap.dart | 2 +- example/lib/pages/overlay_image.dart | 2 +- example/lib/pages/plugin_api.dart | 2 +- example/lib/pages/plugin_scalebar.dart | 2 +- example/lib/pages/plugin_zoombuttons.dart | 2 +- example/lib/pages/polyline.dart | 2 +- example/lib/pages/scalebar_utils.dart | 4 ++-- example/lib/pages/sliding_map.dart | 2 +- example/lib/pages/tap_to_add.dart | 2 +- .../lib/pages/tile_loading_error_handle.dart | 2 +- example/lib/pages/widgets.dart | 2 +- example/lib/pages/wms_tile_layer.dart | 2 +- example/lib/test_app.dart | 2 +- lib/flutter_map.dart | 2 +- lib/src/core/center_zoom.dart | 2 +- lib/src/geo/angles.dart | 5 +++++ lib/src/geo/crs/crs.dart | 2 +- lib/src/geo/latlng_bounds.dart | 19 ++++++++++--------- lib/src/gestures/gestures.dart | 5 +++-- lib/src/gestures/latlng_tween.dart | 2 +- lib/src/layer/circle_layer.dart | 5 +++-- lib/src/layer/marker_layer.dart | 2 +- lib/src/layer/polygon_layer.dart | 2 +- lib/src/layer/polyline_layer.dart | 2 +- lib/src/layer/tile_layer.dart | 2 +- lib/src/map/flutter_map_state.dart | 4 ++-- lib/src/map/map.dart | 2 +- pubspec.yaml | 2 +- test/flutter_map_test.dart | 2 +- 40 files changed, 59 insertions(+), 51 deletions(-) create mode 100644 lib/src/geo/angles.dart diff --git a/example/lib/pages/animated_map_controller.dart b/example/lib/pages/animated_map_controller.dart index 91af3e95a..048b1ceb3 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:latlong/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 723776bf2..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:latlong/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 f37ab02d7..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:latlong/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 d316b0b88..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:latlong/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 ef4144314..b62b7c7b3 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:latlong/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 25666bc21..b70559ef5 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:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; import 'package:location/location.dart'; class LiveLocationPage extends StatefulWidget { diff --git a/example/lib/pages/map_controller.dart b/example/lib/pages/map_controller.dart index ba622c16b..7633e419f 100644 --- a/example/lib/pages/map_controller.dart +++ b/example/lib/pages/map_controller.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong/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 c92dc08fa..8c709cb21 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:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/moving_markers.dart b/example/lib/pages/moving_markers.dart index 8719d4e65..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:latlong/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 c2e75a496..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:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/offline_mbtiles_map.dart b/example/lib/pages/offline_mbtiles_map.dart index 7e62c4446..2974e1e33 100644 --- a/example/lib/pages/offline_mbtiles_map.dart +++ b/example/lib/pages/offline_mbtiles_map.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong/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 5e9dad0c2..aac05d664 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:latlong/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 38ce7615d..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:latlong/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 aba4062ce..4aaebe1c2 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:latlong/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 8e9959086..8b42abb4d 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:latlong/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 0928a1ceb..c1438b420 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:latlong/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 8fd1ee355..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:latlong/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 1f7b232e8..6f30f7e1d 100644 --- a/example/lib/pages/scalebar_utils.dart +++ b/example/lib/pages/scalebar_utils.dart @@ -1,7 +1,7 @@ import 'dart:math'; -import 'package:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; -const double piOver180 = PI / 180.0; +const double piOver180 = pi / 180.0; double toDegrees(double radians) { return radians / piOver180; } diff --git a/example/lib/pages/sliding_map.dart b/example/lib/pages/sliding_map.dart index 249578dd3..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:latlong/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 81ec190b0..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:latlong/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 bd1cebf89..f083a9cd6 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:latlong/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 327e5312b..bb81c5586 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:latlong/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 943651819..45a6d9813 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:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; import '../widgets/drawer.dart'; class WMSLayerPage extends StatelessWidget { diff --git a/example/lib/test_app.dart b/example/lib/test_app.dart index 86a0a2456..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:latlong/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 cc2254036..738fb3d38 100644 --- a/lib/flutter_map.dart +++ b/lib/flutter_map.dart @@ -9,7 +9,7 @@ import 'package:flutter_map/src/geo/crs/crs.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:latlong/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 a725d6fe8..78671ca32 100644 --- a/lib/src/core/center_zoom.dart +++ b/lib/src/core/center_zoom.dart @@ -1,4 +1,4 @@ -import 'package:latlong/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 ec0c6562b..cce2edf11 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:latlong/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 155350cb3..e6e07842b 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:latlong/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; + var x = toRadians(point.longitude); + var 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 56146d2a0..5bba40cfa 100644 --- a/lib/src/gestures/gestures.dart +++ b/lib/src/gestures/gestures.dart @@ -3,9 +3,10 @@ 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/latlng_tween.dart'; import 'package:flutter_map/src/map/map.dart'; -import 'package:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; import 'package:positioned_tap_detector/positioned_tap_detector.dart'; import 'package:vector_math/vector_math_64.dart'; @@ -88,7 +89,7 @@ abstract class MapGestureMixin extends State var distance = (Offset.zero & context.size).shortestSide; // correct fling direction with rotation - var v = Matrix4.rotationZ(-degToRadian(mapState.rotation)) * + var v = Matrix4.rotationZ(-toRadians(mapState.rotation)) * Vector4(direction.dx, direction.dy, 0, 0); direction = Offset(v.x, v.y); diff --git a/lib/src/gestures/latlng_tween.dart b/lib/src/gestures/latlng_tween.dart index f1e376b15..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:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; class LatLngTween extends Tween { LatLngTween({@required LatLng begin, @required LatLng end}) diff --git a/lib/src/layer/circle_layer.dart b/lib/src/layer/circle_layer.dart index 23b9b3474..422024834 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:latlong/latlong.dart' hide Path; // conflict with Path from UI +import 'package:maps_toolkit/maps_toolkit.dart'; class CircleLayerOptions extends LayerOptions { final List 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 748fb1fed..b797c3c9a 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:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; class MarkerLayerOptions extends LayerOptions { final List markers; diff --git a/lib/src/layer/polygon_layer.dart b/lib/src/layer/polygon_layer.dart index e0ab0eca9..f0365bc7e 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:latlong/latlong.dart' hide Path; // conflict with Path from UI +import 'package:maps_toolkit/maps_toolkit.dart'; class PolygonLayerOptions extends LayerOptions { final List polygons; diff --git a/lib/src/layer/polyline_layer.dart b/lib/src/layer/polyline_layer.dart index 1ac72d44c..be308b953 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:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; class PolylineLayerOptions extends LayerOptions { final List polylines; diff --git a/lib/src/layer/tile_layer.dart b/lib/src/layer/tile_layer.dart index 9739a4ec6..f7c3137ef 100644 --- a/lib/src/layer/tile_layer.dart +++ b/lib/src/layer/tile_layer.dart @@ -9,7 +9,7 @@ import 'package:flutter_map/src/core/util.dart' as util; import 'package:flutter_map/src/geo/crs/crs.dart'; import 'package:flutter_map/src/layer/tile_provider/tile_provider.dart'; import 'package:flutter_map/src/map/map.dart'; -import 'package:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; import 'package:tuple/tuple.dart'; import 'layer.dart'; diff --git a/lib/src/map/flutter_map_state.dart b/lib/src/map/flutter_map_state.dart index 86d4fb011..d1bbee140 100644 --- a/lib/src/map/flutter_map_state.dart +++ b/lib/src/map/flutter_map_state.dart @@ -5,12 +5,12 @@ import 'package:async/async.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map/src/core/point.dart'; +import 'package:flutter_map/src/geo/angles.dart'; import 'package:flutter_map/src/gestures/gestures.dart'; import 'package:flutter_map/src/layer/group_layer.dart'; import 'package:flutter_map/src/layer/overlay_image_layer.dart'; import 'package:flutter_map/src/map/map.dart'; import 'package:flutter_map/src/map/map_state_widget.dart'; -import 'package:latlong/latlong.dart'; import 'package:positioned_tap_detector/positioned_tap_detector.dart'; class FlutterMapState extends MapGestureMixin { @@ -82,7 +82,7 @@ class FlutterMapState extends MapGestureMixin { // only do the rotation maths if we have a rotation if (rotation != 0.0) { - angle = degToRadian(rotation); + angle = toRadians(rotation); final rangle90 = sin(_rad90 - angle).abs(); final sinangle = sin(angle).abs(); // to make sure that the whole screen is filled with the map after rotation diff --git a/lib/src/map/map.dart b/lib/src/map/map.dart index 7ba9f6e97..6c683b2c2 100644 --- a/lib/src/map/map.dart +++ b/lib/src/map/map.dart @@ -7,7 +7,7 @@ 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/map/map_state_widget.dart'; -import 'package:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; class MapControllerImpl implements MapController { final Completer _readyCompleter = Completer(); diff --git a/pubspec.yaml b/pubspec.yaml index c7fd1b029..582bcf273 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: flutter: sdk: flutter tuple: ^1.0.2 - latlong: ^0.6.1 + maps_toolkit: ^1.1.0+2 positioned_tap_detector: ^1.0.2 transparent_image: ^1.0.0 async: ^2.1.0 diff --git a/test/flutter_map_test.dart b/test/flutter_map_test.dart index 66504a57f..68e5c03a7 100644 --- a/test/flutter_map_test.dart +++ b/test/flutter_map_test.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:latlong/latlong.dart'; +import 'package:maps_toolkit/maps_toolkit.dart'; void main() { testWidgets('flutter_map', (tester) async {