From 841e2ef0729f3b84a4947ab3686e488e658a8617 Mon Sep 17 00:00:00 2001 From: Pascal Welsch Date: Fri, 26 Mar 2021 12:26:41 +0100 Subject: [PATCH] Replace latlong with latlong2 --- example/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/interactive_test_page.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/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 +- example/lib/pages/tile_builder_example.dart | 2 +- example/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/crs/crs.dart | 2 +- lib/src/geo/latlng_bounds.dart | 2 +- lib/src/gestures/gestures.dart | 2 +- lib/src/gestures/latlng_tween.dart | 2 +- lib/src/gestures/map_events.dart | 2 +- lib/src/layer/circle_layer.dart | 2 +- 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/map.dart | 2 +- pubspec.yaml | 2 +- test/flutter_map_test.dart | 2 +- 40 files changed, 41 insertions(+), 41 deletions(-) diff --git a/example/lib/pages/animated_map_controller.dart b/example/lib/pages/animated_map_controller.dart index e5d9eab46..f18074cb0 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/circle.dart b/example/lib/pages/circle.dart index 723776bf2..01eb386c7 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:latlong2/latlong.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..95dc14189 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:latlong2/latlong.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..7976e133e 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/home.dart b/example/lib/pages/home.dart index 621a3fbc3..9e4146ed3 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/interactive_test_page.dart b/example/lib/pages/interactive_test_page.dart index f76af65c9..c3c684de4 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:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/live_location.dart b/example/lib/pages/live_location.dart index 707208aa6..e5d14b017 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:latlong2/latlong.dart'; import 'package:location/location.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/map_controller.dart b/example/lib/pages/map_controller.dart index b21f360c3..676b642ee 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:latlong/latlong.dart'; +import 'package:latlong2/latlong.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 522abf71a..e59435561 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/moving_markers.dart b/example/lib/pages/moving_markers.dart index 8719d4e65..c561db011 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/offline_map.dart b/example/lib/pages/offline_map.dart index c2e75a496..868bde97d 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/on_tap.dart b/example/lib/pages/on_tap.dart index 557a7b7a7..8aba3db83 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/overlay_image.dart b/example/lib/pages/overlay_image.dart index 38ce7615d..79816db2b 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/plugin_api.dart b/example/lib/pages/plugin_api.dart index 50af71834..da894a06b 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/plugin_scalebar.dart b/example/lib/pages/plugin_scalebar.dart index cfcb8c2e6..2780456b6 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:latlong2/latlong.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 e48886668..e2b24686b 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:latlong2/latlong.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..5d17a336b 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/scalebar_utils.dart b/example/lib/pages/scalebar_utils.dart index 1f7b232e8..204232445 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:latlong2/latlong.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..d9286803c 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:latlong2/latlong.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..0cfbdd0ac 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/tile_builder_example.dart b/example/lib/pages/tile_builder_example.dart index 2dc974440..44cf6d2ca 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:latlong/latlong.dart'; +import 'package:latlong2/latlong.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 85d39ad39..9ff249af9 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/pages/widgets.dart b/example/lib/pages/widgets.dart index a72d7f23f..0c7da07f7 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:latlong2/latlong.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 70bf91130..480103f7e 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:latlong2/latlong.dart'; import '../widgets/drawer.dart'; diff --git a/example/lib/test_app.dart b/example/lib/test_app.dart index 86a0a2456..830cb98b9 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:latlong2/latlong.dart'; void main() { runApp(TestApp()); diff --git a/lib/flutter_map.dart b/lib/flutter_map.dart index d6bf937e0..6b0f17e36 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:latlong/latlong.dart'; +import 'package:latlong2/latlong.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..334abf8dc 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:latlong2/latlong.dart'; class CenterZoom { final LatLng center; diff --git a/lib/src/geo/crs/crs.dart b/lib/src/geo/crs/crs.dart index 024f779e4..e66e14de9 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:latlong2/latlong.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 143366755..ad3983411 100644 --- a/lib/src/geo/latlng_bounds.dart +++ b/lib/src/geo/latlng_bounds.dart @@ -1,5 +1,5 @@ import 'dart:math' as math; -import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; class LatLngBounds { LatLng _sw; diff --git a/lib/src/gestures/gestures.dart b/lib/src/gestures/gestures.dart index d491efc6d..30cf88d53 100644 --- a/lib/src/gestures/gestures.dart +++ b/lib/src/gestures/gestures.dart @@ -6,7 +6,7 @@ import 'package:flutter_map/flutter_map.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:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import 'package:positioned_tap_detector_2/positioned_tap_detector_2.dart'; abstract class MapGestureMixin extends State diff --git a/lib/src/gestures/latlng_tween.dart b/lib/src/gestures/latlng_tween.dart index f1e376b15..e815b1b1c 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:latlong2/latlong.dart'; class LatLngTween extends Tween { LatLngTween({@required LatLng begin, @required LatLng end}) diff --git a/lib/src/gestures/map_events.dart b/lib/src/gestures/map_events.dart index 3ab472844..656ce8ee2 100644 --- a/lib/src/gestures/map_events.dart +++ b/lib/src/gestures/map_events.dart @@ -1,4 +1,4 @@ -import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; enum MapEventSource { mapController, diff --git a/lib/src/layer/circle_layer.dart b/lib/src/layer/circle_layer.dart index 0f79d95f0..7bebde3dc 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; +import 'package:latlong2/latlong.dart' hide Path; class CircleLayerOptions extends LayerOptions { final List circles; diff --git a/lib/src/layer/marker_layer.dart b/lib/src/layer/marker_layer.dart index c23978fab..af95be987 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:latlong2/latlong.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 40739677e..f46956b81 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:latlong2/latlong.dart' hide Path; // conflict with Path from UI class PolygonLayerOptions extends LayerOptions { final List polygons; diff --git a/lib/src/layer/polyline_layer.dart b/lib/src/layer/polyline_layer.dart index b5d286bae..8ab7ff5de 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:latlong2/latlong.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 8033578ce..fbbb3c0e4 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:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import 'package:tuple/tuple.dart'; import 'layer.dart'; diff --git a/lib/src/map/map.dart b/lib/src/map/map.dart index a9c01bf50..b8f534d27 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:latlong2/latlong.dart'; class MapControllerImpl implements MapController { final Completer _readyCompleter = Completer(); diff --git a/pubspec.yaml b/pubspec.yaml index 473f541e3..357f1fe05 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter: sdk: flutter tuple: ^1.0.2 - latlong: ^0.6.1 + latlong2: ^0.8.0 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 81a9d2118..1d7920157 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:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import 'package:mockito/mockito.dart'; class MockHttpClientResponse extends Mock implements HttpClientResponse {