Remove duplicate exports and make imports consistent

The plugin API no longer exports classes which flutter_map already
exports.

Imports within this package now import the actual classes they use
rather than the whole flutter_map library. Internal code should not
depend on the exported library definition.

lib/flutter_map.dart

@@ -26,6 +26,7 @@ export 'package:flutter_map/src/layer/tile_layer/tile_provider/file_providers/ti
 export 'package:flutter_map/src/layer/tile_layer/tile_provider/network_tile_provider.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_update_event.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_update_transformer.dart';
+export 'package:flutter_map/src/map/camera/camera.dart';
 export 'package:flutter_map/src/map/camera/camera_constraint.dart';
 export 'package:flutter_map/src/map/camera/camera_fit.dart';
 export 'package:flutter_map/src/map/map_controller.dart';

lib/plugin_api.dart

@@ -1,8 +1,5 @@
 library flutter_map.plugin_api;
 
 export 'package:flutter_map/flutter_map.dart';
-export 'package:flutter_map/src/map/camera/camera.dart';
-export 'package:flutter_map/src/map/map_controller.dart';
 export 'package:flutter_map/src/misc/private/bounds.dart';
-export 'package:flutter_map/src/misc/private/positioned_tap_detector_2.dart';
 export 'package:flutter_map/src/misc/private/util.dart';

lib/src/layer/attribution_layer/simple.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
 
 /// A simple, classic style, attribution widget, to be placed in
 /// [FlutterMap.nonRotatedChildren]

lib/src/layer/overlay_image_layer.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
 import 'package:flutter_map/src/map/camera/camera.dart';
 import 'package:flutter_map/src/misc/private/bounds.dart';
 import 'package:latlong2/latlong.dart';

lib/src/layer/polygon_layer.dart

@@ -1,7 +1,7 @@
 import 'dart:ui' as ui;
 
 import 'package:flutter/widgets.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
 import 'package:flutter_map/src/layer/label.dart';
 import 'package:flutter_map/src/map/camera/camera.dart';
 import 'package:latlong2/latlong.dart' hide Path; // conflict with Path from UI

lib/src/layer/tile_layer/tile_coordinates.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/misc/point.dart';
 
 class TileCoordinates extends CustomPoint<int> {
   final int z;

lib/src/layer/tile_layer/tile_provider/network_tile_provider.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/rendering.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_layer.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_provider/base_tile_provider.dart';
 import 'package:flutter_map/src/layer/tile_layer/tile_provider/network_image_provider.dart';
 import 'package:http/http.dart';
 import 'package:http/retry.dart';

lib/src/map/map_controller.dart

@@ -1,10 +1,16 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
+import 'package:flutter_map/src/gestures/map_events.dart';
 import 'package:flutter_map/src/map/camera/camera.dart';
+import 'package:flutter_map/src/map/camera/camera_fit.dart';
 import 'package:flutter_map/src/map/inherited_model.dart';
 import 'package:flutter_map/src/map/map_controller_impl.dart';
+import 'package:flutter_map/src/misc/center_zoom.dart';
+import 'package:flutter_map/src/misc/fit_bounds_options.dart';
+import 'package:flutter_map/src/misc/move_and_rotate_result.dart';
+import 'package:flutter_map/src/misc/point.dart';
 import 'package:latlong2/latlong.dart';
 
 /// Controller to programmatically interact with [FlutterMap], such as

lib/src/misc/position.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
 import 'package:latlong2/latlong.dart';
 
 class MapPosition {

test/flutter_map_controller_test.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
+import 'package:flutter_map/src/map/camera/camera_fit.dart';
+import 'package:flutter_map/src/map/map_controller.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 

test/layer/circle_layer_test.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/circle_layer.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 

test/layer/marker_layer_test.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/marker_layer.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 

test/layer/polygon_layer_test.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/polygon_layer.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 

test/layer/polyline_layer_test.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/polyline_layer.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 

test/test_utils/test_app.dart

@@ -1,7 +1,16 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/circle_layer.dart';
+import 'package:flutter_map/src/layer/marker_layer.dart';
+import 'package:flutter_map/src/layer/polygon_layer.dart';
+import 'package:flutter_map/src/layer/polyline_layer.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_layer.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_provider/base_tile_provider.dart';
+import 'package:flutter_map/src/map/map_controller.dart';
+import 'package:flutter_map/src/map/options.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:latlong2/latlong.dart';
 
 class TestApp extends StatelessWidget {