Added ability to place polygons

LuisThein · LuisThein · commit 1c40094c4cc4 · 2020-03-11T16:22:06.000+01:00
diff --git a/lib/platform_maps_flutter.dart b/lib/platform_maps_flutter.dart
@@ -1,4 +1,4 @@
-library flutter_platform_maps;
+library platform_maps_flutter;
 
 import 'dart:io';
 
@@ -16,6 +16,7 @@ part 'src/platform_maps.dart';
 part 'src/location.dart';
 part 'src/marker.dart';
 part 'src/polyline.dart';
+part 'src/polygon.dart';
 part 'src/cap.dart';
 part 'src/joint_type.dart';
 part 'src/pattern_item.dart';
diff --git a/lib/src/bitmap.dart b/lib/src/bitmap.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// Defines a bitmap image. For a marker, this class can be used to set the
 /// image of the marker icon. For a ground overlay, it can be used to set the
diff --git a/lib/src/camera.dart b/lib/src/camera.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// The position of the map "camera", the view point from which the world is
 /// shown in the map view. Aggregates the camera's [target] geographical
diff --git a/lib/src/cap.dart b/lib/src/cap.dart
@@ -1,5 +1,5 @@
 // Copyright 2019 The Chromium Authors. All rights reserved.
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 enum Cap {
   buttCap,
diff --git a/lib/src/controller.dart b/lib/src/controller.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 class PlatformMapController {
   appleMaps.AppleMapController appleController;
diff --git a/lib/src/joint_type.dart b/lib/src/joint_type.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// Joint types for [Polyline].
 @immutable
diff --git a/lib/src/location.dart b/lib/src/location.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// A pair of latitude and longitude coordinates, stored as degrees.
 class LatLng {
diff --git a/lib/src/marker.dart b/lib/src/marker.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// Text labels for a [Marker] info window.
 class InfoWindow {
diff --git a/lib/src/pattern_item.dart b/lib/src/pattern_item.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// Item used in the stroke pattern for a Polyline.
 @immutable
diff --git a/lib/src/platform_maps.dart b/lib/src/platform_maps.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 typedef void MapCreatedCallback(PlatformMapController controller);
 
@@ -22,6 +22,7 @@ class PlatformMap extends StatefulWidget {
     this.myLocationButtonEnabled = false,
     this.markers,
     this.polylines,
+    this.polygons,
     this.onCameraMoveStarted,
     this.onCameraMove,
     this.onCameraIdle,
@@ -68,6 +69,9 @@ class PlatformMap extends StatefulWidget {
   /// Polylines to be placed on the map.
   final Set<Polyline> polylines;
 
+  /// Polygons to be placed on the map.
+  final Set<Polygon> polygons;
+
   /// Called when the camera starts moving.
   ///
   /// This can be initiated by the following:
@@ -168,6 +172,9 @@ class _PlatformMapState extends State<PlatformMap> {
         polylines: widget.polylines != null
             ? Polyline.toGoogleMapsPolylines(widget.polylines)
             : widget.polylines,
+        polygons: widget.polygons != null
+            ? Polygon.toGoogleMapsPolygonSet(widget.polygons)
+            : widget.polygons,
         gestureRecognizers: widget.gestureRecognizers,
         onCameraIdle: widget.onCameraIdle,
         myLocationButtonEnabled: widget.myLocationButtonEnabled,
@@ -199,6 +206,9 @@ class _PlatformMapState extends State<PlatformMap> {
         polylines: widget.polylines != null
             ? Polyline.toAppleMapsPolylines(widget.polylines)
             : widget.polylines,
+        polygons: widget.polygons != null
+            ? Polygon.toAppleMapsPolygonSet(widget.polygons)
+            : widget.polygons,
         gestureRecognizers: widget.gestureRecognizers,
         onCameraIdle: widget.onCameraIdle,
         myLocationButtonEnabled: widget.myLocationButtonEnabled,
diff --git a/lib/src/polygon.dart b/lib/src/polygon.dart
@@ -0,0 +1,165 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of platform_maps_flutter;
+
+/// Uniquely identifies a [Polygon] among [PlatformMap] polygons.
+///
+/// This does not have to be globally unique, only unique among the list.
+@immutable
+class PolygonId {
+  /// Creates an immutable identifier for a [Polygon].
+  PolygonId(this.value) : assert(value != null);
+
+  /// value of the [PolygonId].
+  final String value;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final PolygonId typedOther = other;
+    return value == typedOther.value;
+  }
+
+  @override
+  int get hashCode => value.hashCode;
+
+  @override
+  String toString() {
+    return 'PolygonId{value: $value}';
+  }
+}
+
+/// Draws a polygon through geographical locations on the map.
+@immutable
+class Polygon {
+  /// Creates an immutable representation of a polygon through geographical locations on the map.
+  const Polygon({
+    @required this.polygonId,
+    this.consumeTapEvents = false,
+    this.fillColor = Colors.black,
+    this.points = const <LatLng>[],
+    this.strokeColor = Colors.black,
+    this.strokeWidth = 10,
+    this.visible = true,
+    this.onTap,
+  });
+
+  /// Uniquely identifies a [Polygon].
+  final PolygonId polygonId;
+
+  /// True if the [Polygon] consumes tap events.
+  ///
+  /// If this is false, [onTap] callback will not be triggered.
+  final bool consumeTapEvents;
+
+  /// Fill color in ARGB format, the same format used by Color. The default value is black (0xff000000).
+  final Color fillColor;
+
+  /// The vertices of the polygon to be drawn.
+  ///
+  /// Line segments are drawn between consecutive points. A polygon is not closed by
+  /// default; to form a closed polygon, the start and end points must be the same.
+  final List<LatLng> points;
+
+  /// True if the marker is visible.
+  final bool visible;
+
+  /// Line color in ARGB format, the same format used by Color. The default value is black (0xff000000).
+  final Color strokeColor;
+
+  /// Width of the polygon, used to define the width of the line to be drawn.
+  ///
+  /// The width is constant and independent of the camera's zoom level.
+  /// The default value is 10.
+  final int strokeWidth;
+
+  /// Callbacks to receive tap events for polygon placed on this map.
+  final VoidCallback onTap;
+
+  /// Creates a new [Polygon] object whose values are the same as this instance,
+  /// unless overwritten by the specified parameters.
+  Polygon copyWith({
+    bool consumeTapEventsParam,
+    List<LatLng> pointsParam,
+    Color strokeColorParam,
+    Color fillColorParam,
+    int strokeWidthParam,
+    bool visibleParam,
+    VoidCallback onTapParam,
+  }) {
+    return Polygon(
+      polygonId: polygonId,
+      consumeTapEvents: consumeTapEventsParam ?? consumeTapEvents,
+      points: pointsParam ?? points,
+      strokeColor: strokeColorParam ?? strokeColor,
+      fillColor: fillColorParam ?? fillColor,
+      strokeWidth: strokeWidthParam ?? strokeWidth,
+      visible: visibleParam ?? visible,
+      onTap: onTapParam ?? onTap,
+    );
+  }
+
+  /// Creates a new [Polygon] object whose values are the same as this instance.
+  Polygon clone() {
+    return copyWith(pointsParam: List<LatLng>.of(points));
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    final Polygon typedOther = other;
+    return polygonId == typedOther.polygonId &&
+        consumeTapEvents == typedOther.consumeTapEvents &&
+        fillColor == typedOther.fillColor &&
+        listEquals(points, typedOther.points) &&
+        visible == typedOther.visible &&
+        strokeColor == typedOther.strokeColor &&
+        strokeWidth == typedOther.strokeWidth &&
+        onTap == typedOther.onTap;
+  }
+
+  @override
+  int get hashCode => polygonId.hashCode;
+
+  static Set<googleMaps.Polygon> toGoogleMapsPolygonSet(Set<Polygon> polygons) {
+    List<googleMaps.Polygon> _polygons = List<googleMaps.Polygon>();
+    for (Polygon polygon in polygons) {
+      _polygons.add(polygon.googleMapsPolygon);
+    }
+    return Set.from(_polygons);
+  }
+
+  static Set<appleMaps.Polygon> toAppleMapsPolygonSet(Set<Polygon> polygons) {
+    List<appleMaps.Polygon> _polygons = List<appleMaps.Polygon>();
+    for (Polygon polygon in polygons) {
+      _polygons.add(polygon.appleMapsPolygon);
+    }
+    return Set.from(_polygons);
+  }
+
+  googleMaps.Polygon get googleMapsPolygon => googleMaps.Polygon(
+        polygonId: googleMaps.PolygonId(this.polygonId.value),
+        consumeTapEvents: this.consumeTapEvents,
+        fillColor: this.fillColor,
+        onTap: this.onTap,
+        points: LatLng.googleMapsLatLngsFromList(this.points),
+        strokeColor: this.strokeColor,
+        strokeWidth: this.strokeWidth,
+        visible: this.visible,
+      );
+
+  appleMaps.Polygon get appleMapsPolygon => appleMaps.Polygon(
+        polygonId: appleMaps.PolygonId(this.polygonId.value),
+        consumeTapEvents: this.consumeTapEvents,
+        fillColor: this.fillColor,
+        onTap: this.onTap,
+        points: LatLng.appleMapsLatLngsFromList(this.points),
+        strokeColor: this.strokeColor,
+        strokeWidth: this.strokeWidth,
+        visible: this.visible,
+      );
+}
diff --git a/lib/src/polyline.dart b/lib/src/polyline.dart
@@ -1,4 +1,4 @@
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// Uniquely identifies a [Polyline] among [AppleMap] polylines.
 ///
diff --git a/lib/src/ui.dart b/lib/src/ui.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of flutter_platform_maps;
+part of platform_maps_flutter;
 
 /// Type of map tiles to display.
 enum MapType {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-part of flutter_platform_maps;`
	`1`	`+part of platform_maps_flutter;`
`2`	`2`
`3`	`3`	`/// Defines a bitmap image. For a marker, this class can be used to set the`
`4`	`4`	`/// image of the marker icon. For a ground overlay, it can be used to set the`