Skip to content

[google_maps_flutter_web] Add "My Location" Widget #3274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nploi wants to merge 19 commits into from
Closed

[google_maps_flutter_web] Add "My Location" Widget #3274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e5feca4
Recreating PR from flutter/plugins
nploi Feb 23, 2023
371f9d8
Merge branch 'main' into impl-my-location
nploi Feb 23, 2023
5c81676
Merge branch 'main' into impl-my-location
nploi Mar 8, 2023
9f1a2d7
Merge branch 'main' into impl-my-location
nploi Mar 8, 2023
cfce123
Merge branch 'main' into impl-my-location
nploi Apr 8, 2023
de42b71
Merge branch 'main' into impl-my-location
nploi Apr 13, 2023
8549765
Merge branch 'main' into impl-my-location
nploi Apr 23, 2023
d9c5831
Update CHANGELOG
nploi Apr 23, 2023
aeb68e0
Merge branch 'main' into impl-my-location
nploi May 2, 2023
6d4d8cf
Fix duplication marker & add last location known
nploi May 2, 2023
7220ed3
Improve my location
nploi May 2, 2023
d07ac62
Fix unit-test failed
nploi May 2, 2023
11b3934
Fix unit-test failed
nploi May 2, 2023
33bde26
Fix get current location
nploi May 2, 2023
3d204d6
Merge branch 'main' into impl-my-location
nploi May 2, 2023
c541f6a
Fix unit-test failed
nploi May 2, 2023
8cc72f5
Improve my location
nploi May 2, 2023
e336243
Merge branch 'impl-my-location' of https://github.com/nploi/packages …
nploi May 2, 2023
6363baf
Merge branch 'main' into impl-my-location
nploi May 22, 2023
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
Prev Previous commit
Next Next commit
Fix unit-test failed
  • Loading branch information
@nploi
nploi committed May 2, 2023
commit d07ac62e4ad89207db79e9d9fb2bdbe0e4046459
20 changes: 4 additions & 16 deletions ...flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ void main() {
myLocationEnabled: true,
myLocationButtonEnabled: true,
));

controller.debugSetOverrides(
createMap: (_, __) => map,
markers: markers,
Expand All @@ -516,8 +517,8 @@ void main() {
when(mockCoordinates.latitude).thenReturn(currentLocation.latitude);

when(mockGeolocation.getCurrentPosition(
timeout: const Duration(seconds: 30)))
.thenAnswer((_) async => mockGeoposition);
timeout: anyNamed('timeout'),
)).thenAnswer((_) async => mockGeoposition);

when(mockGeolocation.watchPosition()).thenAnswer((_) {
return Stream<MockGeoposition>.fromIterable(
Expand All @@ -526,19 +527,13 @@ void main() {

controller.init();

await Future<void>.delayed(const Duration(milliseconds: 50));

final Set<Marker> capturedMarkers =
verify(markers.addMarkers(captureAny)).captured[1] as Set<Marker>;

final gmaps.LatLng gmCenter = map.center!;

expect(controller.myLocationButton, isNotNull);
expect(capturedMarkers.length, 1);
expect(capturedMarkers.first.position, currentLocation);
expect(capturedMarkers.first.zIndex, 0.5);
expect(gmCenter.lat, currentLocation.latitude);
expect(gmCenter.lng, currentLocation.longitude);
});

testWidgets('initializes with my location only',
Expand Down Expand Up @@ -576,19 +571,13 @@ void main() {

controller.init();

await Future<void>.delayed(const Duration(milliseconds: 50));

final Set<Marker> capturedMarkers =
verify(markers.addMarkers(captureAny)).captured[1] as Set<Marker>;

final gmaps.LatLng gmCenter = map.center!;

expect(controller.myLocationButton, isNull);
expect(capturedMarkers.length, 1);
expect(capturedMarkers.first.position, currentLocation);
expect(capturedMarkers.first.zIndex, 0.5);
expect(gmCenter.lat, currentLocation.latitude);
expect(gmCenter.lng, currentLocation.longitude);
});
});

Expand All @@ -609,8 +598,7 @@ void main() {
geolocation: mockGeolocation,
);

when(mockGeolocation.getCurrentPosition(
timeout: const Duration(seconds: 30)))
when(mockGeolocation.getCurrentPosition(timeout: anyNamed('timeout')))
.thenAnswer(
(_) async => throw Exception('permission denied'),
);
Expand Down
4 changes: 3 additions & 1 deletion packages/google_maps_flutter/google_maps_flutter_web/lib/src/my_location.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ Future<void> _displayAndWatchMyLocation(MarkersController controller) async {

// Get current location
Future<LatLng> _getCurrentLocation() async {
final Geoposition location = await _geolocation.getCurrentPosition();
final Geoposition location = await _geolocation.getCurrentPosition(
timeout: const Duration(seconds: 5),
);
return LatLng(
location.coords?.latitude?.toDouble() ?? _nullLatLng.latitude,
location.coords?.longitude?.toDouble() ?? _nullLatLng.longitude,
Expand Down