react-map4d-map 1.0.2 → 1.0.3

package/dist/components/MFMap.d.ts

@@ -1,12 +1,32 @@
 import React from 'react';
 export declare function addLibrary(url: string, id: string): HTMLScriptElement | null;
+interface MapOptions {
+    center?: any;
+    zoom?: number;
+    minZoom?: number;
+    maxZoom?: number;
+    maxNativeZoom?: number;
+    geolocate?: boolean;
+    tilt?: number;
+    bearing?: number;
+    controls?: boolean;
+    mapType?: any;
+    controlOptions?: any;
+    restrictionBounds?: any;
+    shouldChangeMapMode?: Function;
+    cooperativeGestures?: boolean;
+}
 interface MapProps {
     mapid?: string;
-    options: map4d.MapOptions;
+    options: MapOptions;
     version: string;
     accessKey: string;
     environment?: "dev" | "test" | undefined | null;
-    onMapReady: (map: map4d.Map, key?: string) => void;
+    onMapReady: (map: any, key?: string) => void;
+    onClickLocation?: (args: any) => void;
+    onRightClickLocation?: (args: any) => void;
+    onCameraChanging?: (args: any) => void;
+    onTilesLoaded?: (args: any) => void;
 }
 declare class MFMap extends React.Component<MapProps, any> {
     mapKey: string;
@@ -15,9 +35,7 @@ declare class MFMap extends React.Component<MapProps, any> {
     mapRef: map4d.Map;
     scriptElement: any;
     url: string | null;
-    eventClickMarker: any;
-    eventRightClickMarker: any;
-    eventDragEndMarker: any;
+    events: any[];
     constructor(props: MapProps);
     setMapDomRef(e: any): void;
     componentWillUnmount(): void;

package/dist/components/MFMarker.d.ts

@@ -14,7 +14,7 @@ interface MarkerProps extends map4d.MarkerOptions {
     draggable?: boolean;
     iconView?: string | Node;
     userInteractionEnabled?: boolean;
-    map?: map4d.Map;
+    map?: any;
     onClick: (marker: any) => void;
     onCreated: (marker: any) => void;
     onRightClick: (marker: any) => void;

package/dist/enum/mapEventEnum.d.ts

@@ -1,5 +1,7 @@
 export declare const enum MapEventEnum {
     click = "click",
     rightClick = "rightClick",
-    dragEnd = "dragEnd"
+    dragEnd = "dragEnd",
+    cameraChanging = "cameraChanging",
+    tilesLoaded = "tilesLoaded"
 }

package/dist/index.js

@@ -765,6 +765,7 @@ var MFMap = /*#__PURE__*/function (_React$Component) {
     var _this;
 
     _this = _React$Component.call(this, props) || this;
+    _this.events = [];
     _this.state = {
       map: null
     };
@@ -785,7 +786,7 @@ var MFMap = /*#__PURE__*/function (_React$Component) {
   };
 
   _proto.destroy = function destroy() {
-    var _this$eventClickMarke, _this$eventRightClick, _this$eventDragEndMar, _this$mapRef;
+    var _this$events, _this$mapRef;
 
     delete window[this.callback];
 
@@ -793,55 +794,103 @@ var MFMap = /*#__PURE__*/function (_React$Component) {
       this.scriptElement.remove();
     }
 
-    (_this$eventClickMarke = this.eventClickMarker) === null || _this$eventClickMarke === void 0 ? void 0 : _this$eventClickMarke.remove();
-    (_this$eventRightClick = this.eventRightClickMarker) === null || _this$eventRightClick === void 0 ? void 0 : _this$eventRightClick.remove();
-    (_this$eventDragEndMar = this.eventDragEndMarker) === null || _this$eventDragEndMar === void 0 ? void 0 : _this$eventDragEndMar.remove();
+    (_this$events = this.events) === null || _this$events === void 0 ? void 0 : _this$events.forEach(function (t) {
+      t === null || t === void 0 ? void 0 : t.remove();
+    });
     ((_this$mapRef = this.mapRef) === null || _this$mapRef === void 0 ? void 0 : _this$mapRef.destroy) && this.mapRef.destroy();
     this.url = null;
   };
 
   _proto.registerEvent = function registerEvent() {
-    var _this$mapRef2, _this$mapRef3, _this$mapRef4;
+    var _this$mapRef2,
+        _this$mapRef3,
+        _this$mapRef4,
+        _this2 = this;
 
-    this.eventClickMarker = (_this$mapRef2 = this.mapRef) === null || _this$mapRef2 === void 0 ? void 0 : _this$mapRef2.addListener("click", function (args) {
+    var eventClickMarker = (_this$mapRef2 = this.mapRef) === null || _this$mapRef2 === void 0 ? void 0 : _this$mapRef2.addListener("click", function (args) {
       var _args$marker, _args$marker2;
 
       ((_args$marker = args.marker) === null || _args$marker === void 0 ? void 0 : _args$marker.onClick) && ((_args$marker2 = args.marker) === null || _args$marker2 === void 0 ? void 0 : _args$marker2.onClick());
     }, {
       marker: true
     });
-    this.eventRightClickMarker = (_this$mapRef3 = this.mapRef) === null || _this$mapRef3 === void 0 ? void 0 : _this$mapRef3.addListener("rightClick", function (args) {
+    var eventRightClickMarker = (_this$mapRef3 = this.mapRef) === null || _this$mapRef3 === void 0 ? void 0 : _this$mapRef3.addListener("rightClick", function (args) {
       var _args$marker3, _args$marker4;
 
       ((_args$marker3 = args.marker) === null || _args$marker3 === void 0 ? void 0 : _args$marker3.onRightClick) && ((_args$marker4 = args.marker) === null || _args$marker4 === void 0 ? void 0 : _args$marker4.onRightClick());
     }, {
       marker: true
     });
-    this.eventDragEndMarker = (_this$mapRef4 = this.mapRef) === null || _this$mapRef4 === void 0 ? void 0 : _this$mapRef4.addListener("dragEnd", function (args) {
+    var eventDragEndMarker = (_this$mapRef4 = this.mapRef) === null || _this$mapRef4 === void 0 ? void 0 : _this$mapRef4.addListener("dragEnd", function (args) {
       var _args$marker5, _args$marker6;
 
       ((_args$marker5 = args.marker) === null || _args$marker5 === void 0 ? void 0 : _args$marker5.onDragEnd) && ((_args$marker6 = args.marker) === null || _args$marker6 === void 0 ? void 0 : _args$marker6.onDragEnd());
     }, {
       marker: true
     });
+    this.events.push([eventClickMarker, eventRightClickMarker, eventDragEndMarker]);
+
+    if (this.props.onClickLocation) {
+      var _this$mapRef5;
+
+      var onClickLocation = (_this$mapRef5 = this.mapRef) === null || _this$mapRef5 === void 0 ? void 0 : _this$mapRef5.addListener("click", function (args) {
+        _this2.props.onClickLocation && _this2.props.onClickLocation(args);
+      }, {
+        location: true
+      });
+      this.events.push(onClickLocation);
+    }
+
+    if (this.props.onRightClickLocation) {
+      var _this$mapRef6;
+
+      var onRightClickLocation = (_this$mapRef6 = this.mapRef) === null || _this$mapRef6 === void 0 ? void 0 : _this$mapRef6.addListener("rightClick", function (args) {
+        _this2.props.onRightClickLocation && _this2.props.onRightClickLocation(args);
+      }, {
+        location: true
+      });
+      this.events.push(onRightClickLocation);
+    }
+
+    if (this.props.onTilesLoaded) {
+      var _this$mapRef7;
+
+      var onTilesLoaded = (_this$mapRef7 = this.mapRef) === null || _this$mapRef7 === void 0 ? void 0 : _this$mapRef7.addListener("tilesLoaded", function (args) {
+        _this2.props.onTilesLoaded && _this2.props.onTilesLoaded(args);
+      }, {
+        location: true
+      });
+      this.events.push(onTilesLoaded);
+    }
+
+    if (this.props.onCameraChanging) {
+      var _this$mapRef8;
+
+      var onCameraChanging = (_this$mapRef8 = this.mapRef) === null || _this$mapRef8 === void 0 ? void 0 : _this$mapRef8.addListener("cameraChanging", function (args) {
+        _this2.props.onCameraChanging && _this2.props.onCameraChanging(args);
+      }, {
+        location: true
+      });
+      this.events.push(onCameraChanging);
+    }
   };
 
   _proto.createCallback = function createCallback() {
-    var _this2 = this;
+    var _this3 = this;
 
     window[this.callback] = function () {
-      if (_this2.mapDomRef) {
-        var options = _this2.props.options;
-        _this2.mapRef = new window.map4d.Map(_this2.mapDomRef, options);
+      if (_this3.mapDomRef) {
+        var options = _this3.props.options;
+        _this3.mapRef = new window.map4d.Map(_this3.mapDomRef, options);
 
-        if (_this2.props.onMapReady) {
-          _this2.props.onMapReady(_this2.mapRef, _this2.mapKey);
+        if (_this3.props.onMapReady) {
+          _this3.props.onMapReady(_this3.mapRef, _this3.mapKey);
         }
 
-        _this2.registerEvent();
+        _this3.registerEvent();
 
-        _this2.setState({
-          map: _this2.mapRef
+        _this3.setState({
+          map: _this3.mapRef
         });
       } else {
         console.error("MFMap: map element is NOT found");