fix: Various bugs

 - Fixed build failure
 - Added anchor param to Annotation
 - Added missing comparison of Overlay coordinates, which caused
   Circles, Annotations, Polylines and Ploygons to not update correctly
   on coordinate changes.

Author: LuisThein

example/ios/Flutter/.last_build_id

@@ -1 +1 @@
-2c3d94e5130832c3a694663b4d51ce48
+591abfdc9d5f6fd539f4691920d32a90

example/ios/Flutter/flutter_export_environment.sh

@@ -9,7 +9,6 @@ export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
 export "FLUTTER_FRAMEWORK_DIR=/Users/luis/development/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
-export "DART_DEFINES=flutter.inspector.structuredErrors%3Dtrue"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"

example/lib/annotation_icons.dart

@@ -23,7 +23,7 @@ class AnnotationIconsBody extends StatefulWidget {
   State<StatefulWidget> createState() => AnnotationIconsBodyState();
 }
 
-const LatLng _kMapCenter = LatLng(52.4478, -3.5402);
+const LatLng _kMapCenter = LatLng(52.707755, -2.7540658);
 
 class AnnotationIconsBodyState extends State<AnnotationIconsBody> {
   AppleMapController controller;
@@ -43,7 +43,7 @@ class AnnotationIconsBodyState extends State<AnnotationIconsBody> {
             child: AppleMap(
               initialCameraPosition: const CameraPosition(
                 target: _kMapCenter,
-                zoom: 7,
+                zoom: 8,
               ),
               annotations: _createAnnotation(),
               onMapCreated: _onMapCreated,
@@ -58,6 +58,7 @@ class AnnotationIconsBodyState extends State<AnnotationIconsBody> {
     return <Annotation>[
       Annotation(
         annotationId: AnnotationId("annotation_1"),
+        anchor: Offset(0.5, -4),
         position: LatLng(52.707755, -2.7540658),
         icon: _annotationIcon,
       ),

example/pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.0"
+    version: "11.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.16"
+    version: "0.40.4"
   apple_maps_flutter:
     dependency: "direct dev"
     description:
@@ -70,7 +70,7 @@ packages:
       name: cli_util
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.2.0"
   clock:
     dependency: transitive
     description:
@@ -98,21 +98,14 @@ packages:
       name: coverage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.9"
+    version: "0.14.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.16.1"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -161,20 +154,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.14.0+3"
   http:
     dependency: transitive
     description:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0+4"
+    version: "0.12.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -188,21 +174,21 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   io:
     dependency: transitive
     description:
       name: io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.4"
   js:
     dependency: transitive
     description:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3-nullsafety.1"
+    version: "0.6.3-nullsafety.2"
   json_rpc_2:
     dependency: transitive
     description:
@@ -237,28 +223,28 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.6+3"
+    version: "0.9.7"
   node_interop:
     dependency: transitive
     description:
       name: node_interop
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.1.1"
   node_io:
     dependency: transitive
     description:
       name: node_io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1+2"
+    version: "1.1.1"
   node_preamble:
     dependency: transitive
     description:
       name: node_preamble
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.8"
+    version: "1.4.12"
   package_config:
     dependency: transitive
     description:
@@ -279,7 +265,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0-nullsafety.2"
   platform:
     dependency: transitive
     description:
@@ -293,7 +279,7 @@ packages:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0-nullsafety.1"
+    version: "1.5.0-nullsafety.2"
   process:
     dependency: transitive
     description:
@@ -314,7 +300,7 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.5"
+    version: "0.7.9"
   shelf_packages_handler:
     dependency: transitive
     description:
@@ -347,14 +333,14 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.2"
+    version: "2.1.0-nullsafety.3"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.10-nullsafety.1"
+    version: "0.10.10-nullsafety.2"
   source_span:
     dependency: transitive
     description:
@@ -438,7 +424,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "5.2.0"
   vm_service_client:
     dependency: transitive
     description:
@@ -452,7 +438,7 @@ packages:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+14"
+    version: "0.9.7+15"
   web_socket_channel:
     dependency: transitive
     description:
@@ -473,14 +459,14 @@ packages:
       name: webkit_inspection_protocol
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.0+1"
+    version: "0.7.3"
   yaml:
     dependency: transitive
     description:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
 sdks:
   dart: ">=2.10.0-110 <2.11.0"
   flutter: ">=1.10.0 <2.0.0"

ios/Classes/Annotations/AnnotationController.swift

@@ -47,7 +47,9 @@ class AnnotationController: NSObject {
         if annotation.icon.iconType != .MARKER {
             initInfoWindow(annotation: annotation, annotationView: annotationView!)
             if annotation.icon.iconType != .PIN {
-                annotationView!.centerOffset = CGPoint(x: 0, y: -annotationView!.frame.size.height / 2)
+                let x = (0.5 - annotation.anchor.x) * Double(annotationView!.frame.size.width)
+                let y = (0.5 - annotation.anchor.y) * Double(annotationView!.frame.size.height)
+                annotationView!.centerOffset = CGPoint(x: x, y: y)
             }
         }
         annotationView!.canShowCallout = true
@@ -111,7 +113,6 @@ class AnnotationController: NSObject {
     }
 
     private func initInfoWindow(annotation: FlutterAnnotation, annotationView: MKAnnotationView) {
-\(CGFloat(annotation.calloutOffset.y))")
         let x = self.getInfoWindowXOffset(annotationView: annotationView, annotation: annotation)
         let y = self.getInfoWindowYOffset(annotationView: annotationView, annotation: annotation)
         annotationView.calloutOffset = CGPoint(x: x, y: y)
@@ -190,14 +191,14 @@ class AnnotationController: NSObject {
         annotationView?.image = annotation.icon.image
         return annotationView!
     }
-    
+
     private func getInfoWindowXOffset(annotationView: MKAnnotationView, annotation: FlutterAnnotation) -> CGFloat {
         if annotation.icon.iconType == .PIN {
             return annotationView.frame.origin.x - (annotationView.frame.origin.x * CGFloat(annotation.calloutOffset.x))
         }
         return annotationView.frame.origin.x + (annotationView.frame.width * CGFloat(annotation.calloutOffset.x))
     }
-    
+
     private func getInfoWindowYOffset(annotationView: MKAnnotationView, annotation: FlutterAnnotation) -> CGFloat {
         return annotationView.frame.height * CGFloat(annotation.calloutOffset.y)
     }

ios/Classes/Annotations/FlutterAnnotation.swift

@@ -16,10 +16,11 @@ class FlutterAnnotation: NSObject, MKAnnotation {
     var infoWindowConsumesTapEvents: Bool = false
     var image: UIImage?
     var alpha: Double?
+    var anchor: Offset = Offset()
     var isDraggable: Bool?
     var wasDragged: Bool = false
     var isVisible: Bool? = true
-    var calloutOffset: CalloutOffset = CalloutOffset(x: 0, y: 0)
+    var calloutOffset: Offset = Offset()
     var icon: AnnotationIcon = AnnotationIcon.init()
 
     public init(fromDictionary annotationData: Dictionary<String, Any>, registrar: FlutterPluginRegistrar) {
@@ -37,12 +38,17 @@ class FlutterAnnotation: NSObject, MKAnnotation {
         if let alpha: Double = annotationData["alpha"] as? Double {
             self.alpha = alpha
         }
+        
+        if let anchorJSON: Array<Double> = annotationData["anchor"] as? Array<Double> {
+            self.anchor = Offset(from: anchorJSON)
+        }
+        
         if let iconData: Array<Any> = annotationData["icon"] as? Array<Any> {
             self.icon = FlutterAnnotation.getAnnotationIcon(iconData: iconData, registrar: registrar, annotationId: id)
         }
 
         if let calloutOffsetJSON = infoWindow["anchor"] as? Array<Double> {
-            self.calloutOffset = CalloutOffset(x: calloutOffsetJSON[0], y: calloutOffsetJSON[1])
+            self.calloutOffset = Offset(from: calloutOffsetJSON)
         }
     }
 
@@ -51,7 +57,7 @@ class FlutterAnnotation: NSObject, MKAnnotation {
         var icon: AnnotationIcon
         let iconType: IconType = iconTypeMap[iconData[0] as! String] ?? .PIN
         var scaleParam: CGFloat?
-       
+        
         if iconType == .CUSTOM_FROM_ASSET {
             let assetPath: String = iconData[1] as! String
             scaleParam = CGFloat(iconData[2] as? Double ?? 1.0)
@@ -65,17 +71,33 @@ class FlutterAnnotation: NSObject, MKAnnotation {
     }
 
     static func == (lhs: FlutterAnnotation, rhs: FlutterAnnotation) -> Bool {
-        return  lhs.id == rhs.id && lhs.title == rhs.title && lhs.subtitle == rhs.subtitle && lhs.image == rhs.image && lhs.alpha == rhs.alpha
-            && lhs.isDraggable == rhs.isDraggable && lhs.wasDragged == rhs.wasDragged && lhs.isVisible == rhs.isVisible && lhs.icon == rhs.icon
-            && lhs.coordinate.latitude == rhs.coordinate.latitude && lhs.coordinate.longitude == rhs.coordinate.longitude
+        return lhs.id == rhs.id && lhs.title == rhs.title && lhs.subtitle == rhs.subtitle && lhs.image == rhs.image && lhs.alpha == rhs.alpha && lhs.isDraggable == rhs.isDraggable && lhs.wasDragged == rhs.wasDragged && lhs.isVisible == rhs.isVisible && lhs.icon == rhs.icon && lhs.coordinate.latitude == rhs.coordinate.latitude && lhs.coordinate.longitude == rhs.coordinate.longitude && lhs.infoWindowConsumesTapEvents == rhs.infoWindowConsumesTapEvents && lhs.anchor == rhs.anchor && lhs.calloutOffset == rhs.calloutOffset && lhs.coordinate.latitude == rhs.coordinate.latitude && lhs.coordinate.longitude == rhs.coordinate.longitude
     }
 
     static func != (lhs: FlutterAnnotation, rhs: FlutterAnnotation) -> Bool {
         return !(lhs == rhs)
     }
 }
 
-struct CalloutOffset {
+struct Offset {
     let x: Double
     let y: Double
+    
+    public init(from json: Array<Double>) {
+        self.x = json[0]
+        self.y = json[1]
+    }
+    
+    public init() {
+        self.x = 0
+        self.y = 0
+    }
+    
+    static func == (lhs: Offset, rhs: Offset) -> Bool {
+        return lhs.x == rhs.x && lhs.y == rhs.y
+    }
+    
+    static func != (lhs: Offset, rhs: Offset) -> Bool {
+        return !(lhs == rhs)
+    }
 }

ios/Classes/Polygons/FlutterPolygon.swift

@@ -36,7 +36,7 @@ class FlutterPolygon: MKPolygon {
     }
 
     static func == (lhs: FlutterPolygon, rhs: FlutterPolygon) -> Bool {
-        return lhs.strokeColor == rhs.strokeColor && lhs.fillColor == rhs.fillColor && lhs.isConsumingTapEvents == rhs.isConsumingTapEvents && lhs.width ==  rhs.width && lhs.isVisible == rhs.isVisible && lhs.zIndex == rhs.zIndex
+        return lhs.strokeColor == rhs.strokeColor && lhs.fillColor == rhs.fillColor && lhs.isConsumingTapEvents == rhs.isConsumingTapEvents && lhs.width ==  rhs.width && lhs.isVisible == rhs.isVisible && lhs.zIndex == rhs.zIndex && lhs.coordinate.latitude == rhs.coordinate.latitude && lhs.coordinate.longitude == rhs.coordinate.longitude
     }
 
     static func != (lhs: FlutterPolygon, rhs: FlutterPolygon) -> Bool {

ios/Classes/Polylines/FlutterPolyline.swift

@@ -41,7 +41,7 @@ class FlutterPolyline: MKPolyline {
 
     static func == (lhs: FlutterPolyline, rhs: FlutterPolyline) -> Bool {
         return lhs.color == rhs.color && lhs.isConsumingTapEvents == rhs.isConsumingTapEvents && lhs.width ==  rhs.width
-            && lhs.isVisible == rhs.isVisible && lhs.capType == rhs.capType && lhs.pattern == rhs.pattern && lhs.lineJoin == rhs.lineJoin && rhs.zIndex == lhs.zIndex
+            && lhs.isVisible == rhs.isVisible && lhs.capType == rhs.capType && lhs.pattern == rhs.pattern && lhs.lineJoin == rhs.lineJoin && rhs.zIndex == lhs.zIndex && lhs.coordinate.latitude == rhs.coordinate.latitude && lhs.coordinate.longitude == rhs.coordinate.longitude
     }
 
     static func != (lhs: FlutterPolyline, rhs: FlutterPolyline) -> Bool {

ios/Classes/circles/FlutterCircle.swift

@@ -32,7 +32,7 @@ class FlutterCircle: MKCircle {
     }
 
     static func == (lhs: FlutterCircle, rhs: FlutterCircle) -> Bool {
-        return lhs.strokeColor == rhs.strokeColor && lhs.fillColor == rhs.fillColor && lhs.isConsumingTapEvents == rhs.isConsumingTapEvents && lhs.strokeWidth ==  rhs.strokeWidth && lhs.isVisible == rhs.isVisible && lhs.zIndex == rhs.zIndex
+        return lhs.strokeColor == rhs.strokeColor && lhs.fillColor == rhs.fillColor && lhs.isConsumingTapEvents == rhs.isConsumingTapEvents && lhs.strokeWidth ==  rhs.strokeWidth && lhs.isVisible == rhs.isVisible && lhs.zIndex == rhs.zIndex && lhs.coordinate.latitude == rhs.coordinate.latitude && lhs.coordinate.longitude == rhs.coordinate.longitude
     }
 
     static func != (lhs: FlutterCircle, rhs: FlutterCircle) -> Bool {