Merge pull request #329 from georgaberg/polygon-holes

feat: support for holes in polygons Closes #324

Author: dapriett

src/map-view-common.ts

@@ -503,6 +503,7 @@ export abstract class PolygonBase extends ShapeBase implements Polygon {
     public shape: string = 'polygon';
     public _map: any;
     public _points: Array<PositionBase>;
+    public _holes: Array<Array<PositionBase>>;
     public strokeWidth: number;
     public strokeColor: Color;
     public fillColor: Color;
@@ -534,7 +535,36 @@ export abstract class PolygonBase extends ShapeBase implements Polygon {
         return this._points.slice();
     }
 
+    addHole(hole: PositionBase[]): void {
+        this._holes.push(hole);
+        this.reloadHoles();
+    }
+
+    addHoles(holes: PositionBase[][]): void {
+        this._holes = this._holes.concat(holes);
+        this.reloadHoles();
+    }
+
+    removeHole(hole: PositionBase[]): void {
+        var index = this._holes.indexOf(hole);
+        if (index > -1) {
+            this._holes.splice(index, 1);
+            this.reloadHoles();
+        }
+    }
+
+    removeAllHoles(): void {
+        this._holes.length = 0;
+        this.reloadHoles();
+    }
+
+    getHoles(): Array<Array<PositionBase>> {
+        return this._holes.slice();
+    }
+
     public abstract reloadPoints(): void;
+
+    public abstract reloadHoles(): void;
 }
 
 export class CircleBase extends ShapeBase implements Circle {

src/map-view.android.ts

@@ -417,6 +417,7 @@ export class MapView extends MapViewBase {
 
     addPolygon(shape: Polygon) {
         shape.loadPoints();
+        shape.loadHoles();
         shape.android = this.gMap.addPolygon(shape.android);
         this._shapes.push(shape);
     }
@@ -985,6 +986,7 @@ export class Polygon extends PolygonBase {
         super();
         this.android = new com.google.android.gms.maps.model.PolygonOptions();
         this._points = [];
+        this._holes = [];
     }
 
     get clickable() {
@@ -1031,6 +1033,18 @@ export class Polygon extends PolygonBase {
         }
     }
 
+    loadHoles(): void {
+        if (!this._isReal) {
+            this._holes.forEach((hole: Position[]) => {
+                var points = new java.util.ArrayList();
+                hole.forEach((point: Position) => {
+                    points.add(point.android);
+                });
+                this._android.addHole(points);
+            });
+        }
+    }
+
     reloadPoints(): void {
         if (this._isReal) {
             var points = new java.util.ArrayList();
@@ -1041,6 +1055,20 @@ export class Polygon extends PolygonBase {
         }
     }
 
+    reloadHoles(): void {
+        if (this._isReal) {
+            var holes = new java.util.ArrayList();
+            this._holes.forEach((hole) => {
+                var points = new java.util.ArrayList();
+                hole.forEach((point) => {
+                    points.add(point.android);
+                });
+                holes.add(points);
+            });
+            this._android.setHoles(holes);
+        }
+    }
+
     get strokeWidth() {
         return this._android.getStrokeWidth();
     }

src/map-view.d.ts

@@ -196,7 +196,12 @@ export class Polygon extends Shape {
     public addPoints(shapes: Position[]): void;
     public removePoint(shape: Position): void;
     public removeAllPoints(): void;
+    public addHole(hole: Position[]): void;
+    public addHoles(hole: Position[][]): void;
+    public removeHole(hole: Position[]): void;
+    public removeAllHoles(): void;
     public getPoints(): Array<Position>;
+    public getHoles(): Array<Array<Position>>;
 }
 
 export class Circle extends Shape {

src/map-view.ios.ts

@@ -812,6 +812,7 @@ export class Polygon extends PolygonBase {
         super();
         this._ios = GMSPolygon.new();
         this._points = [];
+        this._holes = [];
     }
 
     get clickable() {
@@ -830,20 +831,34 @@ export class Polygon extends PolygonBase {
         this._ios.zIndex = value;
     }
 
-
-
     loadPoints(): void {
         var points = GMSMutablePath.new();
-        this._points.forEach(function (point) {
+        this._points.forEach((point: Position) => {
             points.addCoordinate(point.ios);
-        }.bind(this));
+        });
         this._ios.path = points;
     }
 
+    loadHoles(): void {
+        var holes = [];
+        this._holes.forEach((hole: Position[]) => {
+            var points = GMSMutablePath.new();
+            hole.forEach((point: Position) => {
+                points.addCoordinate(point.ios);
+            });
+            holes.push(points);
+        });
+        this._ios.holes = holes;
+    }
+
     reloadPoints(): void {
         this.loadPoints();
     }
 
+    reloadHoles(): void {
+        this.loadHoles();
+    }
+
     get strokeWidth() {
         return this._ios.strokeWidth;
     }