diff --git a/example/lib/geojson.dart b/example/lib/geojson.dart index 3e27719..7148999 100644 --- a/example/lib/geojson.dart +++ b/example/lib/geojson.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:pedantic/pedantic.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import 'package:map_controller/map_controller.dart'; class _GeoJsonPageState extends State { diff --git a/example/lib/markers.dart b/example/lib/markers.dart index 64c1f8c..5a291ba 100644 --- a/example/lib/markers.dart +++ b/example/lib/markers.dart @@ -2,7 +2,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong/latlong.dart'; +// import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import 'package:map_controller/map_controller.dart'; class Place { @@ -35,7 +36,7 @@ class _MarkersPageState extends State { statefulMapController.addMarker( name: place.name, marker: Marker( - point: place.point, + point: LatLng(place.point.latitude, place.point.longitude), builder: (BuildContext context) { return const Icon(Icons.location_on); })); diff --git a/example/lib/stateful_markers.dart b/example/lib/stateful_markers.dart index 4400632..339a6c4 100644 --- a/example/lib/stateful_markers.dart +++ b/example/lib/stateful_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 'package:map_controller/map_controller.dart'; class Place { diff --git a/example/lib/tile_layer.dart b/example/lib/tile_layer.dart index e330a11..0163e40 100644 --- a/example/lib/tile_layer.dart +++ b/example/lib/tile_layer.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:map_controller/map_controller.dart'; class _TileLayerPageState extends State { diff --git a/example/pubspec.yaml b/example/pubspec.yaml index ec85e74..3114e09 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: sdk: flutter map_controller: path: ../ - provider: ^4.3.3 + provider: ^5.0.0 dev_dependencies: flutter_test: diff --git a/lib/src/controller.dart b/lib/src/controller.dart index 0e493b3..29d31c2 100644 --- a/lib/src/controller.dart +++ b/lib/src/controller.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:geojson/geojson.dart'; import 'package:geopoint/geopoint.dart'; -import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import 'package:map_controller/src/exceptions.dart'; import 'package:pedantic/pedantic.dart'; import 'package:rxdart/rxdart.dart'; @@ -247,8 +247,7 @@ class StatefulMapController { unawaited(addMarker( name: point.name, marker: Marker( - point: - LatLng(point.geoPoint.latitude, point.geoPoint.longitude), + point: point.geoPoint.point, builder: (BuildContext context) => markerIcon), )); break; @@ -258,7 +257,7 @@ class StatefulMapController { unawaited(addMarker( name: geoPoint.name, marker: Marker( - point: LatLng(geoPoint.latitude, geoPoint.longitude), + point: geoPoint.point, builder: (BuildContext context) => markerIcon), )); } diff --git a/lib/src/models.dart b/lib/src/models.dart index 5a8dd27..75418d7 100644 --- a/lib/src/models.dart +++ b/lib/src/models.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; typedef StatefulMarkerBuidler = Widget Function( BuildContext, Map); diff --git a/lib/src/state/lines.dart b/lib/src/state/lines.dart index 05056d5..2218aba 100644 --- a/lib/src/state/lines.dart +++ b/lib/src/state/lines.dart @@ -3,8 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:geojson/geojson.dart'; import 'package:geopoint/geopoint.dart'; -import 'package:latlong/latlong.dart'; - +import 'package:latlong2/latlong.dart'; import '../models.dart'; /// State of the lines on the map diff --git a/lib/src/state/map.dart b/lib/src/state/map.dart index a91ff29..97b2f75 100644 --- a/lib/src/state/map.dart +++ b/lib/src/state/map.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import '../models.dart'; diff --git a/lib/src/state/polygons.dart b/lib/src/state/polygons.dart index ef58520..25edbee 100644 --- a/lib/src/state/polygons.dart +++ b/lib/src/state/polygons.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong/latlong.dart'; +import 'package:latlong2/latlong.dart'; import 'package:geojson/geojson.dart'; import 'package:geopoint/geopoint.dart'; import '../models.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index baae51e..9dfde16 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: map_controller description: A map controller for Flutter map. Manage markers, lines and polygons. homepage: https://github.com/synw/map_controller -version: 0.9.0 +version: 1.0.0 environment: sdk: ">=2.7.0 <3.0.0" @@ -9,13 +9,13 @@ environment: dependencies: flutter: sdk: flutter - extra_pedantic: ^1.2.0 - flutter_map: ^0.11.0 - geojson: ^0.10.0 - geopoint: ^0.8.0 - latlong: ^0.6.1 - pedantic: ^1.9.2 - rxdart: ^0.25.0 + extra_pedantic: ^1.5.0 + flutter_map: ^0.13.1 + geojson: ^1.0.0 + geopoint: ^1.0.0 + pedantic: ^1.11.1 + rxdart: ^0.27.1 + dev_dependencies: flutter_test: