feat: mapClick event available the N way

Author: farfromrefug

src/mapbox.android.ts

@@ -259,7 +259,7 @@ export class MapboxView extends MapboxViewBase {
         }
 
         if (!this.nativeMapView && ((this.config && this.config.accessToken) || (this.settings && this.settings.accessToken))) {
-            this.mapbox = new Mapbox();
+            this.mapbox = new Mapbox(this);
             // the NativeScript contentview class extends from Observable to provide the notify method
             // which is the glue that joins this code with whatever callbacks are set in the Mapbox XML
             // tag describing the map.
@@ -429,8 +429,8 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
 
     _markerIconDownloadCache = [];
 
-    constructor() {
-        super();
+    constructor(view) {
+        super(view);
 
         if (Trace.isEnabled()) {
             CLog(CLogTypes.info, 'constructor(): building new Mapbox object.');
@@ -448,11 +448,6 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
      */
     setMapboxViewInstance(mapboxViewInstance: any): void {}
 
-    /**
-     * not used
-     */
-    setMapboxMapInstance(mapboxMapInstance: any): void {}
-
     /**
      * show the map programmatically.
      *
@@ -981,13 +976,15 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
             CLog(CLogTypes.info, 'Mapbox:checkForClickEvent(): got click event with point:', JSON.stringify(point));
         }
 
-        this.eventCallbacks['click'].forEach((eventListener) => {
-            this.queryRenderedFeatures({ point, layers: [eventListener.id] }).then((response) => {
-                if (response.length > 0) {
-                    eventListener.callback(response);
-                }
+        this.eventCallbacks['click'] &&
+            this.eventCallbacks['click'].forEach((eventListener) => {
+                this.queryRenderedFeatures({ point, layers: [eventListener.id] }).then((response) => {
+                    if (response.length > 0) {
+                        eventListener.callback(response);
+                    }
+                });
             });
-        });
+        this.view && this.view.notify({ eventName: 'mapClick', object: this.view, point });
 
         return false;
     }

src/mapbox.common.ts

@@ -550,8 +550,6 @@ export interface MapboxCommonApi {
 export interface MapboxApi {
     setMapboxViewInstance(mapboxNativeViewInstance: any): void;
 
-    setMapboxMapInstance(mapboxNativeMapInstance: any): void;
-
     initEventHandlerShim(settings: any, mapboxNativeViewInstance: any): void;
 
     onMapEvent(eventName, id, callback, nativeMapView?): void;
@@ -690,6 +688,7 @@ export interface MapboxApi {
 // ------------------------------------------------------------
 
 export abstract class MapboxCommon implements MapboxCommonApi {
+    constructor(public view?: MapboxViewCommonBase) {}
     public static defaults = {
         style: MapStyle.STREETS.toString(),
         mapStyle: MapStyle.STREETS.toString(),

src/mapbox.ios.ts

@@ -308,7 +308,7 @@ export class MapboxView extends MapboxViewBase {
         }
 
         if (!this.nativeMapView) {
-            this.mapbox = new Mapbox();
+            this.mapbox = new Mapbox(this);
 
             if (Trace.isEnabled()) {
                 CLog(CLogTypes.info, 'initMap(): after new Mapbox()');
@@ -690,22 +690,12 @@ export class CustomUserLocationAnnotationView extends MGLUserLocationAnnotationV
 export class Mapbox extends MapboxCommon implements MapboxApi {
     // reference to the native mapbox API
 
-    private _mapboxMapInstance: any;
     private _mapboxViewInstance: any;
 
     private eventCallbacks: { [key: string]: any[] } = {};
 
     private userLocationRenderMode: string;
 
-    /**
-     * set the mapboxMapInstance
-     *
-     * @see MapboxView::initMap()
-     */
-    setMapboxMapInstance(mapboxMapInstance: any) {
-        this._mapboxMapInstance = mapboxMapInstance;
-    }
-
     /**
      * set the mapboxViewInstance
      *
@@ -773,6 +763,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                         console.error('click error ', eventListener.id, err);
                     });
             });
+        this.view && this.view.notify({ eventName: 'mapClick', object: this.view, point });
 
         return false;
     }