Merge pull request #395 from TwistedTamarin/master

Extended safecheks for IOS | Android

src/map-view-common.ts

@@ -282,6 +282,7 @@ export abstract class MapViewBase extends View implements MapView {
     public abstract clear(): void;
 
     public removeAllPolylines() {
+        if(!this._shapes) return null;
         this._shapes.forEach(shape => {
             if (shape.shape === 'polyline') {
                 this.removeShape(shape);
@@ -290,6 +291,7 @@ export abstract class MapViewBase extends View implements MapView {
     }
 
     public removeAllPolygons() {
+        if(!this._shapes) return null;
         this._shapes.forEach(shape => {
             if (shape.shape === 'polygon') {
                 this.removeShape(shape);
@@ -298,6 +300,7 @@ export abstract class MapViewBase extends View implements MapView {
     }
 
     public removeAllCircles() {
+        if(!this._shapes) return null;
         this._shapes.forEach(shape => {
             if (shape.shape === 'circle') {
                 this.removeShape(shape);

src/map-view.android.ts

@@ -420,15 +420,15 @@ export class MapView extends MapViewBase {
     }
 
     addMarker(...markers: Marker[]) {
-        if(!this.gMap) 
-            return;
+        if(!markers || !this._markers || !this.gMap) return null;
         markers.forEach(marker => {
             marker.android = this.gMap.addMarker(marker.android);
             this._markers.push(marker);
         });
     }
 
     removeMarker(...markers: Marker[]) {
+        if(!markers || !this._markers || !this.gMap) return null;
         markers.forEach(marker => {
             this._unloadInfoWindowContent(marker);
             marker.android.remove();
@@ -437,8 +437,7 @@ export class MapView extends MapViewBase {
     }
 
     removeAllMarkers() {
-        if(!this._markers || !this._markers.length)
-            return;
+        if(!this._markers || !this.gMap || !this._markers.length) return null;
         this._markers.forEach(marker => {
             this._unloadInfoWindowContent(marker);
             marker.android.remove();
@@ -447,54 +446,62 @@ export class MapView extends MapViewBase {
     }
 
     findMarker(callback: (marker: Marker) => boolean): Marker {
+        if(!this._markers) return null;
         return this._markers.find(callback);
     }
 
     addPolyline(shape: Polyline) {
+        if(!this.gMap) return null;
         shape.loadPoints();
         shape.android = this.gMap.addPolyline(shape.android);
         this._shapes.push(shape);
     }
 
     addPolygon(shape: Polygon) {
+        if(!this.gMap) return null;
         shape.loadPoints();
         shape.loadHoles();
         shape.android = this.gMap.addPolygon(shape.android);
         this._shapes.push(shape);
     }
 
     addCircle(shape: Circle) {
+        if(!this._shapes || !this.gMap) return null;
         shape.android = this.gMap.addCircle(shape.android);
         this._shapes.push(shape);
     }
 
     removeShape(shape: ShapeBase) {
+        if(!this._shapes) return null;
         shape.android.remove();
         this._shapes.splice(this._shapes.indexOf(shape), 1);
     }
 
     removeAllShapes() {
+        if(!this._shapes) return null;
         this._shapes.forEach(shape => {
             shape.android.remove();
         });
         this._shapes = [];
     }
 
-    clear() {
-        this._markers = [];
-        this._shapes = [];
-        this.gMap.clear();
-    }
-
     setStyle(style: StyleBase): boolean {
+        if(!this.gMap) return null;
         let styleOptions = new com.google.android.gms.maps.model.MapStyleOptions(JSON.stringify(style));
         return this.gMap.setMapStyle(styleOptions);
     }
 
     findShape(callback: (shape: ShapeBase) => boolean): ShapeBase {
+        if(!this._shapes) return null;
         return this._shapes.find(callback);
     }
 
+    clear() {
+        this._markers = [];
+        this._shapes = [];
+        this.gMap.clear();
+    }
+
 }
 
 export class UISettings extends UISettingsBase {

src/map-view.ios.ts

@@ -374,13 +374,15 @@ export class MapView extends MapViewBase {
     }
 
     addMarker(...markers: Marker[]) {
+        if(!markers || !this._markers || !this.gMap) return null;
         markers.forEach(marker => {
             marker.ios.map = this.gMap;
             this._markers.push(marker);
         });
     }
 
     removeMarker(...markers: Marker[]) {
+        if(!markers || !this._markers || !this.gMap) return null;
         markers.forEach(marker => {
             this._unloadInfoWindowContent(marker);
             marker.ios.map = null;
@@ -389,6 +391,7 @@ export class MapView extends MapViewBase {
     }
 
     removeAllMarkers() {
+        if(!this._markers) return null;
         this._markers.forEach(marker => {
             this._unloadInfoWindowContent(marker);
             marker.ios.map = null;
@@ -397,38 +400,45 @@ export class MapView extends MapViewBase {
     }
 
     findMarker(callback: (marker: Marker) => boolean): Marker {
+        if(!this._markers) return null;
         return this._markers.find(callback);
     }
 
     addPolyline(shape: Polyline) {
+        if(!this._shapes) return null;
         shape.loadPoints();
         shape.ios.map = this.gMap;
         this._shapes.push(shape);
     }
 
     addPolygon(shape: Polygon) {
+        if(!this._shapes) return null;
         shape.ios.map = this.gMap;
         this._shapes.push(shape);
     }
 
     addCircle(shape: Circle) {
+        if(!this._shapes) return null;
         shape.ios.map = this.gMap;
         this._shapes.push(shape);
     }
 
     removeShape(shape: ShapeBase) {
+        if(!this._shapes) return null;
         shape.ios.map = null;
         this._shapes.splice(this._shapes.indexOf(shape), 1);
     }
 
     removeAllShapes() {
+        if(!this._shapes) return null;
         this._shapes.forEach(shape => {
             shape.ios.map = null;
         });
         this._shapes = [];
     }
 
     findShape(callback: (shape: ShapeBase) => boolean): ShapeBase {
+        if(!this._shapes) return null;
         return this._shapes.find(callback);
     }