From 61154cde401bd705fe58ede6f5d67f737ef0712e Mon Sep 17 00:00:00 2001 From: JaffaKetchup Date: Sat, 2 Dec 2023 11:15:49 +0000 Subject: [PATCH] Revert #1731 --- example/lib/pages/animated_map_controller.dart | 1 + example/lib/pages/bundled_offline_map.dart | 1 + example/lib/pages/cancellable_tile_provider.dart | 1 + example/lib/pages/circle.dart | 1 + example/lib/pages/custom_crs/custom_crs.dart | 1 + example/lib/pages/epsg3413_crs.dart | 1 + example/lib/pages/epsg4326_crs.dart | 1 + example/lib/pages/fallback_url_page.dart | 1 + example/lib/pages/home.dart | 1 + example/lib/pages/interactive_test_page.dart | 1 + example/lib/pages/latlng_to_screen_point.dart | 1 + example/lib/pages/many_circles.dart | 1 + example/lib/pages/many_markers.dart | 1 + example/lib/pages/map_controller.dart | 1 + example/lib/pages/map_inside_listview.dart | 1 + example/lib/pages/markers.dart | 1 + example/lib/pages/moving_markers.dart | 1 + example/lib/pages/overlay_image.dart | 1 + example/lib/pages/polygon.dart | 1 + example/lib/pages/polyline.dart | 1 + example/lib/pages/reset_tile_layer.dart | 1 + example/lib/pages/retina.dart | 1 + example/lib/pages/scalebar_utils.dart | 2 +- example/lib/pages/screen_point_to_latlng.dart | 1 + example/lib/pages/secondary_tap.dart | 1 + example/lib/pages/sliding_map.dart | 1 + example/lib/pages/stateful_markers.dart | 1 + example/lib/pages/tile_builder.dart | 1 + example/lib/pages/tile_loading_error_handle.dart | 1 + example/lib/pages/wms_tile_layer.dart | 1 + example/lib/plugins/plugin_scalebar.dart | 1 + example/lib/plugins/plugin_zoombuttons.dart | 1 + example/pubspec.yaml | 1 + lib/flutter_map.dart | 1 - 34 files changed, 33 insertions(+), 2 deletions(-) diff --git a/example/lib/pages/animated_map_controller.dart b/example/lib/pages/animated_map_controller.dart index 313a3fbad..b4cc4fdb6 100644 --- a/example/lib/pages/animated_map_controller.dart +++ b/example/lib/pages/animated_map_controller.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class AnimatedMapControllerPage extends StatefulWidget { static const String route = '/map_controller_animated'; diff --git a/example/lib/pages/bundled_offline_map.dart b/example/lib/pages/bundled_offline_map.dart index e64ca9da1..dff0ebc34 100644 --- a/example/lib/pages/bundled_offline_map.dart +++ b/example/lib/pages/bundled_offline_map.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class BundledOfflineMapPage extends StatelessWidget { static const String route = '/bundled_offline_map'; diff --git a/example/lib/pages/cancellable_tile_provider.dart b/example/lib/pages/cancellable_tile_provider.dart index ec3de2fe8..aac67c461 100644 --- a/example/lib/pages/cancellable_tile_provider.dart +++ b/example/lib/pages/cancellable_tile_provider.dart @@ -3,6 +3,7 @@ import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; import 'package:flutter_map_example/widgets/notice_banner.dart'; +import 'package:latlong2/latlong.dart'; class CancellableTileProviderPage extends StatefulWidget { static const String route = '/cancellable_tile_provider_page'; diff --git a/example/lib/pages/circle.dart b/example/lib/pages/circle.dart index 4d98a03ee..ed9363b22 100644 --- a/example/lib/pages/circle.dart +++ b/example/lib/pages/circle.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class CirclePage extends StatelessWidget { static const String route = '/circle'; diff --git a/example/lib/pages/custom_crs/custom_crs.dart b/example/lib/pages/custom_crs/custom_crs.dart index 96d589cf8..9d7589e35 100644 --- a/example/lib/pages/custom_crs/custom_crs.dart +++ b/example/lib/pages/custom_crs/custom_crs.dart @@ -3,6 +3,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; import 'package:proj4dart/proj4dart.dart' as proj4; import 'package:url_launcher/url_launcher.dart'; diff --git a/example/lib/pages/epsg3413_crs.dart b/example/lib/pages/epsg3413_crs.dart index a3c31986d..b72fb1c36 100644 --- a/example/lib/pages/epsg3413_crs.dart +++ b/example/lib/pages/epsg3413_crs.dart @@ -3,6 +3,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; import 'package:proj4dart/proj4dart.dart' as proj4; import 'package:url_launcher/url_launcher.dart'; diff --git a/example/lib/pages/epsg4326_crs.dart b/example/lib/pages/epsg4326_crs.dart index 5b46d34db..76f088005 100644 --- a/example/lib/pages/epsg4326_crs.dart +++ b/example/lib/pages/epsg4326_crs.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class EPSG4326Page extends StatelessWidget { static const String route = '/crs_epsg4326'; diff --git a/example/lib/pages/fallback_url_page.dart b/example/lib/pages/fallback_url_page.dart index 893b34f54..49289772c 100644 --- a/example/lib/pages/fallback_url_page.dart +++ b/example/lib/pages/fallback_url_page.dart @@ -3,6 +3,7 @@ import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; import 'package:flutter_map_example/widgets/notice_banner.dart'; +import 'package:latlong2/latlong.dart'; class FallbackUrlPage extends StatelessWidget { static const String route = '/fallback_url'; diff --git a/example/lib/pages/home.dart b/example/lib/pages/home.dart index ba3e1fbe7..2cf3c2f0b 100644 --- a/example/lib/pages/home.dart +++ b/example/lib/pages/home.dart @@ -6,6 +6,7 @@ import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/floating_menu_button.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; import 'package:flutter_map_example/widgets/first_start_dialog.dart'; +import 'package:latlong2/latlong.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/example/lib/pages/interactive_test_page.dart b/example/lib/pages/interactive_test_page.dart index 69db1cb79..8c0cb518b 100644 --- a/example/lib/pages/interactive_test_page.dart +++ b/example/lib/pages/interactive_test_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class InteractiveFlagsPage extends StatefulWidget { static const String route = '/interactive_flags_page'; diff --git a/example/lib/pages/latlng_to_screen_point.dart b/example/lib/pages/latlng_to_screen_point.dart index eacdd994c..4b35f2920 100644 --- a/example/lib/pages/latlng_to_screen_point.dart +++ b/example/lib/pages/latlng_to_screen_point.dart @@ -5,6 +5,7 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class LatLngToScreenPointPage extends StatefulWidget { static const String route = '/latlng_to_screen_point'; diff --git a/example/lib/pages/many_circles.dart b/example/lib/pages/many_circles.dart index 93f48bb44..68ea62d8a 100644 --- a/example/lib/pages/many_circles.dart +++ b/example/lib/pages/many_circles.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; const maxCirclesCount = 20000; diff --git a/example/lib/pages/many_markers.dart b/example/lib/pages/many_markers.dart index 4c7aa6e08..5b19aa8fb 100644 --- a/example/lib/pages/many_markers.dart +++ b/example/lib/pages/many_markers.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; const maxMarkersCount = 20000; diff --git a/example/lib/pages/map_controller.dart b/example/lib/pages/map_controller.dart index 7f930b0a6..212305dab 100644 --- a/example/lib/pages/map_controller.dart +++ b/example/lib/pages/map_controller.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class MapControllerPage extends StatefulWidget { static const String route = 'map_controller'; diff --git a/example/lib/pages/map_inside_listview.dart b/example/lib/pages/map_inside_listview.dart index d57d10094..4720c847a 100644 --- a/example/lib/pages/map_inside_listview.dart +++ b/example/lib/pages/map_inside_listview.dart @@ -3,6 +3,7 @@ import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/plugins/zoombuttons_plugin_option.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class MapInsideListViewPage extends StatelessWidget { static const String route = '/map_inside_listview'; diff --git a/example/lib/pages/markers.dart b/example/lib/pages/markers.dart index d62caa16d..5431481d2 100644 --- a/example/lib/pages/markers.dart +++ b/example/lib/pages/markers.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class MarkerPage extends StatefulWidget { static const String route = '/markers'; diff --git a/example/lib/pages/moving_markers.dart b/example/lib/pages/moving_markers.dart index 5d80dedeb..e2f33263a 100644 --- a/example/lib/pages/moving_markers.dart +++ b/example/lib/pages/moving_markers.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class MovingMarkersPage extends StatefulWidget { static const String route = '/moving_markers'; diff --git a/example/lib/pages/overlay_image.dart b/example/lib/pages/overlay_image.dart index e79b3457a..761927b3c 100644 --- a/example/lib/pages/overlay_image.dart +++ b/example/lib/pages/overlay_image.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class OverlayImagePage extends StatelessWidget { static const String route = '/overlay_image'; diff --git a/example/lib/pages/polygon.dart b/example/lib/pages/polygon.dart index e16418ef4..d9a459657 100644 --- a/example/lib/pages/polygon.dart +++ b/example/lib/pages/polygon.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class PolygonPage extends StatelessWidget { static const String route = '/polygon'; diff --git a/example/lib/pages/polyline.dart b/example/lib/pages/polyline.dart index 9cecc5fb8..66aa35fce 100644 --- a/example/lib/pages/polyline.dart +++ b/example/lib/pages/polyline.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class PolylinePage extends StatefulWidget { static const String route = '/polyline'; diff --git a/example/lib/pages/reset_tile_layer.dart b/example/lib/pages/reset_tile_layer.dart index 3e80e5ea2..e30abb7eb 100644 --- a/example/lib/pages/reset_tile_layer.dart +++ b/example/lib/pages/reset_tile_layer.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class ResetTileLayerPage extends StatefulWidget { static const String route = '/reset_tilelayer'; diff --git a/example/lib/pages/retina.dart b/example/lib/pages/retina.dart index 75aa02dbb..eede4f5f0 100644 --- a/example/lib/pages/retina.dart +++ b/example/lib/pages/retina.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; import 'package:url_launcher/url_launcher.dart'; class RetinaPage extends StatefulWidget { diff --git a/example/lib/pages/scalebar_utils.dart b/example/lib/pages/scalebar_utils.dart index 97f57ef1c..420fc02d2 100644 --- a/example/lib/pages/scalebar_utils.dart +++ b/example/lib/pages/scalebar_utils.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'dart:ui'; -import 'package:flutter_map/flutter_map.dart'; +import 'package:latlong2/latlong.dart'; const double piOver180 = pi / 180.0; diff --git a/example/lib/pages/screen_point_to_latlng.dart b/example/lib/pages/screen_point_to_latlng.dart index b7b77884a..02d08ccb7 100644 --- a/example/lib/pages/screen_point_to_latlng.dart +++ b/example/lib/pages/screen_point_to_latlng.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class ScreenPointToLatLngPage extends StatefulWidget { static const String route = '/screen_point_to_latlng'; diff --git a/example/lib/pages/secondary_tap.dart b/example/lib/pages/secondary_tap.dart index 220b56f60..38a1db895 100644 --- a/example/lib/pages/secondary_tap.dart +++ b/example/lib/pages/secondary_tap.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class SecondaryTapPage extends StatelessWidget { const SecondaryTapPage({super.key}); diff --git a/example/lib/pages/sliding_map.dart b/example/lib/pages/sliding_map.dart index dcf6f8a5a..c15a32459 100644 --- a/example/lib/pages/sliding_map.dart +++ b/example/lib/pages/sliding_map.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class SlidingMapPage extends StatelessWidget { static const String route = '/sliding_map'; diff --git a/example/lib/pages/stateful_markers.dart b/example/lib/pages/stateful_markers.dart index 2c44f9dc5..da9a7d895 100644 --- a/example/lib/pages/stateful_markers.dart +++ b/example/lib/pages/stateful_markers.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class StatefulMarkersPage extends StatefulWidget { static const String route = '/stateful_markers'; diff --git a/example/lib/pages/tile_builder.dart b/example/lib/pages/tile_builder.dart index 88ada2901..25ddf4dc4 100644 --- a/example/lib/pages/tile_builder.dart +++ b/example/lib/pages/tile_builder.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class TileBuilderPage extends StatefulWidget { static const String route = '/tile_builder'; diff --git a/example/lib/pages/tile_loading_error_handle.dart b/example/lib/pages/tile_loading_error_handle.dart index a2a53cc42..4b328d0ea 100644 --- a/example/lib/pages/tile_loading_error_handle.dart +++ b/example/lib/pages/tile_loading_error_handle.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_cancellable_tile_provider/flutter_map_cancellable_tile_provider.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class TileLoadingErrorHandle extends StatefulWidget { static const String route = '/tile_loading_error_handle'; diff --git a/example/lib/pages/wms_tile_layer.dart b/example/lib/pages/wms_tile_layer.dart index 49f1a6e7e..484da0031 100644 --- a/example/lib/pages/wms_tile_layer.dart +++ b/example/lib/pages/wms_tile_layer.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; import 'package:url_launcher/url_launcher.dart'; class WMSLayerPage extends StatelessWidget { diff --git a/example/lib/plugins/plugin_scalebar.dart b/example/lib/plugins/plugin_scalebar.dart index 646675071..e16da8636 100644 --- a/example/lib/plugins/plugin_scalebar.dart +++ b/example/lib/plugins/plugin_scalebar.dart @@ -3,6 +3,7 @@ import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/pages/scale_layer_plugin_option.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class PluginScaleBar extends StatelessWidget { static const String route = '/plugin_scalebar'; diff --git a/example/lib/plugins/plugin_zoombuttons.dart b/example/lib/plugins/plugin_zoombuttons.dart index 12b5ff876..e273893d2 100644 --- a/example/lib/plugins/plugin_zoombuttons.dart +++ b/example/lib/plugins/plugin_zoombuttons.dart @@ -3,6 +3,7 @@ import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/misc/tile_providers.dart'; import 'package:flutter_map_example/plugins/zoombuttons_plugin_option.dart'; import 'package:flutter_map_example/widgets/drawer/menu_drawer.dart'; +import 'package:latlong2/latlong.dart'; class PluginZoomButtons extends StatelessWidget { static const String route = '/plugin_zoombuttons'; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 312a4bdab..b8a7b5425 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: sdk: flutter flutter_map: flutter_map_cancellable_tile_provider: + latlong2: ^0.9.0 proj4dart: ^2.1.0 url_launcher: ^6.1.14 shared_preferences: ^2.2.1 diff --git a/lib/flutter_map.dart b/lib/flutter_map.dart index 907eee917..aad7d80b8 100644 --- a/lib/flutter_map.dart +++ b/lib/flutter_map.dart @@ -60,4 +60,3 @@ export 'package:flutter_map/src/misc/center_zoom.dart'; export 'package:flutter_map/src/misc/move_and_rotate_result.dart'; export 'package:flutter_map/src/misc/point_extensions.dart'; export 'package:flutter_map/src/misc/position.dart'; -export 'package:latlong2/latlong.dart';