Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[google_maps_flutter_web] Support for Holes in Polygons #3412

Merged
merged 13 commits into from
Jan 16, 2021
Merged

[google_maps_flutter_web] Support for Holes in Polygons #3412

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d509a3e
Merge remote-tracking branch 'upstream/master'
May 8, 2020
22eeb98
Merge remote-tracking branch 'upstream/master'
ABausG May 11, 2020
ec8a602
Merge remote-tracking branch 'upstream/master'
ABausG Nov 18, 2020
06b1973
Merge remote-tracking branch 'parent/master'
Jan 13, 2021
a2d607e
Support Holes in Polygon
Jan 13, 2021
6616ea3
Update Version & Changelog
Jan 13, 2021
c6293e5
Add to AUTHORS
Jan 13, 2021
ac6cabd
Formatting
Jan 13, 2021
50b4188
Add Test for initial geometry
Jan 14, 2021
dc20c00
Add Test for Poly.containsLocation
Jan 14, 2021
b3c8248
Merge remote-tracking branch 'parent/master' into maps-web-polygon-holes
Jan 14, 2021
e5e6c6b
Rename import
Jan 14, 2021
1cccc8c
Move Test
Jan 15, 2021
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
19 changes: 19 additions & 0 deletions ..._flutter/google_maps_flutter_web/test/test_driver/google_maps_controller_integration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,22 @@ void main() {
[43.354762, -5.850824],
],
},
{
'polygonId': 'polygon-2-with-holes',
'points': [
[43.355114, -5.851333],
[43.354797, -5.851860],
[43.354469, -5.851318],
[43.354762, -5.850824],
],
'holes': [
[
[41.354797, -6.851860],
[41.354469, -6.851318],
[41.354762, -6.850824],
]
]
},
],
'polylinesToAdd': [
{
Expand Down Expand Up @@ -202,6 +218,9 @@ void main() {
expect(capturedMarkers.first.infoWindow.snippet, 'snippet for test');
expect(capturedMarkers.first.infoWindow.title, 'title for test');
expect(capturedPolygons.first.polygonId.value, 'polygon-1');
expect(capturedPolygons.elementAt(1).polygonId.value,
'polygon-2-with-holes');
expect(capturedPolygons.elementAt(1).holes, isNot(null));
expect(capturedPolylines.first.polylineId.value, 'polyline-1');
});

Expand Down
26 changes: 26 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shape_integration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import 'dart:async';

import 'package:integration_test/integration_test.dart';
import 'package:google_maps/google_maps.dart' as gmaps;
import 'package:google_maps/google_maps_geometry.dart' as geometry;
import 'package:google_maps_flutter_web/google_maps_flutter_web.dart';
import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'
as platform;
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/mockito.dart';

Expand Down Expand Up @@ -87,6 +90,29 @@ void main() {
controller.update(options);
verify(polygon.options = options);
});

test('Polygon with hole has a hole', () {
final holedPolygon = platform.Polygon(
polygonId: platform.PolygonId('BermudaTriangle'),
points: [
platform.LatLng(25.774, -80.19),
platform.LatLng(18.466, -66.118),
platform.LatLng(32.321, -64.757),
],
holes: [
[
platform.LatLng(28.745, -70.579),
platform.LatLng(29.57, -67.514),
platform.LatLng(27.339, -66.668),
],
],
);
final controller = PolygonsController(stream: null)
..addPolygons({holedPolygon});
final gmapsPolygon = controller.polygons.values.first.polygon;
final pointInHole = gmaps.LatLng(28.632, -68.401);
expect(geometry.poly.containsLocation(pointInHole, gmapsPolygon), false);
});
});

group('PolylineController', () {
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_web/test/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<html>
<head>
<title>Browser Tests</title>
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY"></script>
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=geometry"></script>
</head>
<body>
<script src="main.dart.js"></script>
Expand Down