Skip to content
This repository was archived by the owner on May 8, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/lib/geojson.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<GeoJsonPage> {
Expand Down
5 changes: 3 additions & 2 deletions example/lib/markers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -35,7 +36,7 @@ class _MarkersPageState extends State<MarkersPage> {
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);
}));
Expand Down
2 changes: 1 addition & 1 deletion example/lib/stateful_markers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion example/lib/tile_layer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<TileLayerPage> {
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
sdk: flutter
map_controller:
path: ../
provider: ^4.3.3
provider: ^5.0.0

dev_dependencies:
flutter_test:
Expand Down
7 changes: 3 additions & 4 deletions lib/src/controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
Expand All @@ -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),
));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/models.dart
Original file line number Diff line number Diff line change
@@ -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<String, dynamic>);
Expand Down
3 changes: 1 addition & 2 deletions lib/src/state/lines.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/src/state/map.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion lib/src/state/polygons.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
16 changes: 8 additions & 8 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
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"

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:
Expand Down