From fdad46d2dc5fa444f425a19684deded86e2b4e67 Mon Sep 17 00:00:00 2001 From: Guillaume Roux Date: Mon, 13 Nov 2023 09:48:02 +0100 Subject: [PATCH] feat: export latlng2 --- example/lib/pages/animated_map_controller.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.dart | 1 - example/lib/pages/fallback_url_network_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/offline_map.dart | 1 - example/lib/pages/overlay_image.dart | 1 - example/lib/pages/plugin_scalebar.dart | 1 - example/lib/pages/plugin_zoombuttons.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/pubspec.yaml | 1 - lib/flutter_map.dart | 1 + test/layer/tile_layer/tile_bounds/tile_bounds_test.dart | 3 ++- 36 files changed, 4 insertions(+), 35 deletions(-) diff --git a/example/lib/pages/animated_map_controller.dart b/example/lib/pages/animated_map_controller.dart index c99ecb828..87941572b 100644 --- a/example/lib/pages/animated_map_controller.dart +++ b/example/lib/pages/animated_map_controller.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; class AnimatedMapControllerPage extends StatefulWidget { static const String route = '/map_controller_animated'; diff --git a/example/lib/pages/cancellable_tile_provider.dart b/example/lib/pages/cancellable_tile_provider.dart index 5a6382c33..2f5cabcd7 100644 --- a/example/lib/pages/cancellable_tile_provider.dart +++ b/example/lib/pages/cancellable_tile_provider.dart @@ -2,7 +2,6 @@ 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.dart'; -import 'package:latlong2/latlong.dart'; class CancellableTileProviderPage extends StatelessWidget { static const String route = '/cancellable_tile_provider_page'; diff --git a/example/lib/pages/circle.dart b/example/lib/pages/circle.dart index d818fac9b..827a878d5 100644 --- a/example/lib/pages/circle.dart +++ b/example/lib/pages/circle.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 ae8e2f602..96ce33200 100644 --- a/example/lib/pages/custom_crs/custom_crs.dart +++ b/example/lib/pages/custom_crs/custom_crs.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 e8e744232..648999b8d 100644 --- a/example/lib/pages/epsg3413_crs.dart +++ b/example/lib/pages/epsg3413_crs.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 5e543b301..30eb12695 100644 --- a/example/lib/pages/epsg4326_crs.dart +++ b/example/lib/pages/epsg4326_crs.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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.dart b/example/lib/pages/fallback_url.dart index 11fd6e8e9..5831e4382 100644 --- a/example/lib/pages/fallback_url.dart +++ b/example/lib/pages/fallback_url.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; class FallbackUrlPage extends StatelessWidget { final String route; diff --git a/example/lib/pages/fallback_url_network_page.dart b/example/lib/pages/fallback_url_network_page.dart index 464827ac9..0461694a5 100644 --- a/example/lib/pages/fallback_url_network_page.dart +++ b/example/lib/pages/fallback_url_network_page.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/pages/fallback_url.dart'; -import 'package:latlong2/latlong.dart'; class FallbackUrlNetworkPage extends StatelessWidget { static const String route = '/fallback_url_network'; diff --git a/example/lib/pages/home.dart b/example/lib/pages/home.dart index 25c5cf533..bb72cf7e0 100644 --- a/example/lib/pages/home.dart +++ b/example/lib/pages/home.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer.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 3dada1045..a15c2103a 100644 --- a/example/lib/pages/interactive_test_page.dart +++ b/example/lib/pages/interactive_test_page.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 08bcc9be5..6d91d985d 100644 --- a/example/lib/pages/latlng_to_screen_point.dart +++ b/example/lib/pages/latlng_to_screen_point.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 a465713f8..b0ab6789a 100644 --- a/example/lib/pages/many_circles.dart +++ b/example/lib/pages/many_circles.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 c2d77b1b7..4ffc8495e 100644 --- a/example/lib/pages/many_markers.dart +++ b/example/lib/pages/many_markers.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 e72aa3abc..3380c45a0 100644 --- a/example/lib/pages/map_controller.dart +++ b/example/lib/pages/map_controller.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 36716d25a..2915115f0 100644 --- a/example/lib/pages/map_inside_listview.dart +++ b/example/lib/pages/map_inside_listview.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/pages/zoombuttons_plugin_option.dart'; import 'package:flutter_map_example/widgets/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 e6648d7b8..a19df6d71 100644 --- a/example/lib/pages/markers.dart +++ b/example/lib/pages/markers.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 eb4d93ce4..edb7eeeac 100644 --- a/example/lib/pages/moving_markers.dart +++ b/example/lib/pages/moving_markers.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; class MovingMarkersPage extends StatefulWidget { static const String route = '/moving_markers'; diff --git a/example/lib/pages/offline_map.dart b/example/lib/pages/offline_map.dart index 89d6e5a2b..07691c247 100644 --- a/example/lib/pages/offline_map.dart +++ b/example/lib/pages/offline_map.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; class OfflineMapPage extends StatelessWidget { static const String route = '/offline_map'; diff --git a/example/lib/pages/overlay_image.dart b/example/lib/pages/overlay_image.dart index 127153d1d..65f3912e2 100644 --- a/example/lib/pages/overlay_image.dart +++ b/example/lib/pages/overlay_image.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; class OverlayImagePage extends StatelessWidget { static const String route = '/overlay_image'; diff --git a/example/lib/pages/plugin_scalebar.dart b/example/lib/pages/plugin_scalebar.dart index 03640e8ad..d9b494879 100644 --- a/example/lib/pages/plugin_scalebar.dart +++ b/example/lib/pages/plugin_scalebar.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/pages/scale_layer_plugin_option.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; class PluginScaleBar extends StatelessWidget { static const String route = '/plugin_scalebar'; diff --git a/example/lib/pages/plugin_zoombuttons.dart b/example/lib/pages/plugin_zoombuttons.dart index 21d38e831..b2fc8c48d 100644 --- a/example/lib/pages/plugin_zoombuttons.dart +++ b/example/lib/pages/plugin_zoombuttons.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/pages/zoombuttons_plugin_option.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; class PluginZoomButtons extends StatelessWidget { static const String route = '/plugin_zoombuttons'; diff --git a/example/lib/pages/polygon.dart b/example/lib/pages/polygon.dart index 891647f5b..03e33a40c 100644 --- a/example/lib/pages/polygon.dart +++ b/example/lib/pages/polygon.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 5acc40753..299c36cb3 100644 --- a/example/lib/pages/polyline.dart +++ b/example/lib/pages/polyline.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 6ab2124d7..d558af384 100644 --- a/example/lib/pages/reset_tile_layer.dart +++ b/example/lib/pages/reset_tile_layer.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 c5035707a..60e6da39f 100644 --- a/example/lib/pages/retina.dart +++ b/example/lib/pages/retina.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 a6510ac66..d46bf11cf 100644 --- a/example/lib/pages/scalebar_utils.dart +++ b/example/lib/pages/scalebar_utils.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:latlong2/latlong.dart'; +import 'package:flutter_map/flutter_map.dart'; const double piOver180 = pi / 180.0; double toDegrees(double radians) { diff --git a/example/lib/pages/screen_point_to_latlng.dart b/example/lib/pages/screen_point_to_latlng.dart index 22e06ed45..b960b4d8a 100644 --- a/example/lib/pages/screen_point_to_latlng.dart +++ b/example/lib/pages/screen_point_to_latlng.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 f0a9273d7..4c5be3589 100644 --- a/example/lib/pages/secondary_tap.dart +++ b/example/lib/pages/secondary_tap.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 69ff0d870..9a53a14e2 100644 --- a/example/lib/pages/sliding_map.dart +++ b/example/lib/pages/sliding_map.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 d1f0c7765..a22b9ab83 100644 --- a/example/lib/pages/stateful_markers.dart +++ b/example/lib/pages/stateful_markers.dart @@ -3,7 +3,6 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 d582b3981..12ba8d995 100644 --- a/example/lib/pages/tile_builder.dart +++ b/example/lib/pages/tile_builder.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 577b12704..228a03169 100644 --- a/example/lib/pages/tile_loading_error_handle.dart +++ b/example/lib/pages/tile_loading_error_handle.dart @@ -4,7 +4,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/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 36a274e3c..dc70e1a56 100644 --- a/example/lib/pages/wms_tile_layer.dart +++ b/example/lib/pages/wms_tile_layer.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_example/widgets/drawer.dart'; -import 'package:latlong2/latlong.dart'; import 'package:url_launcher/url_launcher.dart'; class WMSLayerPage extends StatelessWidget { diff --git a/example/pubspec.yaml b/example/pubspec.yaml index efda6e8c0..e13c6355c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -12,7 +12,6 @@ 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 56474a837..67de437e9 100644 --- a/lib/flutter_map.dart +++ b/lib/flutter_map.dart @@ -61,3 +61,4 @@ export 'package:flutter_map/src/misc/fit_bounds_options.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'; diff --git a/test/layer/tile_layer/tile_bounds/tile_bounds_test.dart b/test/layer/tile_layer/tile_bounds/tile_bounds_test.dart index 5eeede06b..c782f1794 100644 --- a/test/layer/tile_layer/tile_bounds/tile_bounds_test.dart +++ b/test/layer/tile_layer/tile_bounds/tile_bounds_test.dart @@ -1,6 +1,7 @@ import 'dart:math'; -import 'package:flutter_map/flutter_map.dart'; +import 'package:flutter_map/src/geo/crs.dart'; +import 'package:flutter_map/src/geo/latlng_bounds.dart'; import 'package:flutter_map/src/layer/tile_layer/tile_bounds/tile_bounds.dart'; import 'package:flutter_map/src/layer/tile_layer/tile_bounds/tile_bounds_at_zoom.dart'; import 'package:flutter_map/src/layer/tile_layer/tile_range.dart';