@opengeoweb/webmap 2.2.1 → 2.4.1

package/index.esm.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 import proj4 from 'proj4';
-import { debounce } from 'throttle-debounce';
+import { debounce, throttle } from 'throttle-debounce';
 
 function _typeof(obj) {
   "@babel/helpers - typeof";
@@ -3575,6 +3575,7 @@ var MapPin = /*#__PURE__*/function () {
     this.geoPosX = null;
     this.geoPosY = null;
     this.displayMapPin = true;
+    this.disableMapPin = false;
 
     this.redrawMap = function () {
       _this._map.draw();
@@ -3595,6 +3596,8 @@ var MapPin = /*#__PURE__*/function () {
       var x = _x;
       var y = _y;
       if (!x || !y) return;
+      if (_this.disableMapPin && !_bbox) return; // we still want to update the pin position when the bbox changes.
+
       _this.x = parseInt(x, 10);
       _this.y = parseInt(y, 10);
       _this.exactX = parseFloat(x);
@@ -3619,6 +3622,12 @@ var MapPin = /*#__PURE__*/function () {
       _this.setMapPin(newpos.x, newpos.y);
     };
 
+    this.toggleDisableMapPin = function () {
+      _this.disableMapPin = !_this.disableMapPin;
+
+      _this.redrawMap();
+    };
+
     this.showMapPin = function () {
       _this.displayMapPin = true;
 
@@ -3638,7 +3647,7 @@ var MapPin = /*#__PURE__*/function () {
     key: "drawMarker",
     value: function drawMarker(ctx) {
       if (isDefined(this.x) && isDefined(this.y)) {
-        WMDrawMarker(ctx, this.x, this.y, '#051039');
+        WMDrawMarker(ctx, this.x, this.y, this.disableMapPin ? '#808080' : '#051039');
       }
     }
   }]);
@@ -3804,6 +3813,8 @@ var buildWMSGetMapRequest = function buildWMSGetMapRequest(map, layer) {
 
 var SCALE_DELAY = 10;
 var ZOOMED_CALLBACK_DELAY = 500;
+var THROTTLE_WAIT_TIME = 300;
+var THROTTLE_NO_TRAILING = true;
 
 var WMFlyToBBox = function WMFlyToBBox(wmMap) {
   var _this = this;
@@ -3906,6 +3917,14 @@ var WMFlyToBBox = function WMFlyToBBox(wmMap) {
     }
   };
 
+  this.startZoomThrottled = throttle(THROTTLE_WAIT_TIME, THROTTLE_NO_TRAILING, function (currentbox, newbox) {
+    return _this.flyZoomToBBOXStartZoom(currentbox, newbox);
+  });
+
+  this.flyZoomToBBOXStartZoomThrottled = function (currentbox, newbox) {
+    _this.startZoomThrottled(currentbox, newbox);
+  };
+
   this.wmMap = wmMap;
   this.flyZoomToBBOXTimerFuncReadyDebounced = debounce(ZOOMED_CALLBACK_DELAY, this.flyZoomToBBOXTimerFuncReadyDebounced);
   this.flyZoomToBBOXDebounced = debounce(SCALE_DELAY, this.flyZoomToBBOXTimerFunc);
@@ -5203,7 +5222,6 @@ var WMJSMap = /*#__PURE__*/function () {
       this.mainElement.style.width = "".concat(this.width, "px");
       this.mainElement.style.height = "".concat(this.height, "px");
       this.setBBOX(this.resizeBBOX);
-      this.mapPin.repositionMapPin();
       this.showBoundingBox();
       this.divBuffer.resize(this.getWidth().toString(), this.getHeight().toString());
       this.repositionLegendGraphic();
@@ -5662,7 +5680,12 @@ var WMJSMap = /*#__PURE__*/function () {
       this.mouseWheelEventBBOXNew.right = newRight;
       this.mouseWheelEventBBOXNew.top = newTop;
       this.mouseWheelBusy = 0;
-      this.wMFlyToBBox.flyZoomToBBOXStartZoom(this.mouseWheelEventBBOXCurrent, this.mouseWheelEventBBOXNew);
+
+      if (Math.abs(delta) < 4) {
+        this.wMFlyToBBox.flyZoomToBBOXStartZoomThrottled(this.mouseWheelEventBBOXCurrent, this.mouseWheelEventBBOXNew);
+      } else {
+        this.wMFlyToBBox.flyZoomToBBOXStartZoom(this.mouseWheelEventBBOXCurrent, this.mouseWheelEventBBOXNew);
+      }
     }
   }, {
     key: "destroy",
@@ -6800,6 +6823,7 @@ var WMJSMap = /*#__PURE__*/function () {
 
       this.updateBBOX.setBBOX(this.bbox);
       this.drawnBBOX.setBBOX(this.bbox);
+      this.mapPin.repositionMapPin(this.bbox);
       /* Undo part */
 
       if (this.DoRedo === 0 && this.DoUndo === 0) {

package/index.umd.js

@@ -3620,6 +3620,7 @@
       this.geoPosX = null;
       this.geoPosY = null;
       this.displayMapPin = true;
+      this.disableMapPin = false;
 
       this.redrawMap = function () {
         _this._map.draw();
@@ -3640,6 +3641,8 @@
         var x = _x;
         var y = _y;
         if (!x || !y) return;
+        if (_this.disableMapPin && !_bbox) return; // we still want to update the pin position when the bbox changes.
+
         _this.x = parseInt(x, 10);
         _this.y = parseInt(y, 10);
         _this.exactX = parseFloat(x);
@@ -3664,6 +3667,12 @@
         _this.setMapPin(newpos.x, newpos.y);
       };
 
+      this.toggleDisableMapPin = function () {
+        _this.disableMapPin = !_this.disableMapPin;
+
+        _this.redrawMap();
+      };
+
       this.showMapPin = function () {
         _this.displayMapPin = true;
 
@@ -3681,7 +3690,7 @@
 
     MapPin.prototype.drawMarker = function (ctx) {
       if (isDefined(this.x) && isDefined(this.y)) {
-        WMDrawMarker(ctx, this.x, this.y, '#051039');
+        WMDrawMarker(ctx, this.x, this.y, this.disableMapPin ? '#808080' : '#051039');
       }
     };
 
@@ -3856,6 +3865,8 @@
    * */
   var SCALE_DELAY = 10;
   var ZOOMED_CALLBACK_DELAY = 500;
+  var THROTTLE_WAIT_TIME = 300;
+  var THROTTLE_NO_TRAILING = true;
 
   var WMFlyToBBox =
   /** @class */
@@ -3959,6 +3970,14 @@
         }
       };
 
+      this.startZoomThrottled = throttleDebounce.throttle(THROTTLE_WAIT_TIME, THROTTLE_NO_TRAILING, function (currentbox, newbox) {
+        return _this.flyZoomToBBOXStartZoom(currentbox, newbox);
+      });
+
+      this.flyZoomToBBOXStartZoomThrottled = function (currentbox, newbox) {
+        _this.startZoomThrottled(currentbox, newbox);
+      };
+
       this.wmMap = wmMap;
       this.flyZoomToBBOXTimerFuncReadyDebounced = throttleDebounce.debounce(ZOOMED_CALLBACK_DELAY, this.flyZoomToBBOXTimerFuncReadyDebounced);
       this.flyZoomToBBOXDebounced = throttleDebounce.debounce(SCALE_DELAY, this.flyZoomToBBOXTimerFunc);
@@ -5211,7 +5230,6 @@
       this.mainElement.style.width = this.width + "px";
       this.mainElement.style.height = this.height + "px";
       this.setBBOX(this.resizeBBOX);
-      this.mapPin.repositionMapPin();
       this.showBoundingBox();
       this.divBuffer.resize(this.getWidth().toString(), this.getHeight().toString());
       this.repositionLegendGraphic();
@@ -5650,7 +5668,12 @@
       this.mouseWheelEventBBOXNew.right = newRight;
       this.mouseWheelEventBBOXNew.top = newTop;
       this.mouseWheelBusy = 0;
-      this.wMFlyToBBox.flyZoomToBBOXStartZoom(this.mouseWheelEventBBOXCurrent, this.mouseWheelEventBBOXNew);
+
+      if (Math.abs(delta) < 4) {
+        this.wMFlyToBBox.flyZoomToBBOXStartZoomThrottled(this.mouseWheelEventBBOXCurrent, this.mouseWheelEventBBOXNew);
+      } else {
+        this.wMFlyToBBox.flyZoomToBBOXStartZoom(this.mouseWheelEventBBOXCurrent, this.mouseWheelEventBBOXNew);
+      }
     };
 
     WMJSMap.prototype.destroy = function () {
@@ -6749,6 +6772,7 @@
 
       this.updateBBOX.setBBOX(this.bbox);
       this.drawnBBOX.setBBOX(this.bbox);
+      this.mapPin.repositionMapPin(this.bbox);
       /* Undo part */
 
       if (this.DoRedo === 0 && this.DoUndo === 0) {

package/lib/components/WMFlyToBBox.d.ts

@@ -19,4 +19,6 @@ export default class WMFlyToBBox {
     resetBBoxTimer: () => void;
     flyZoomToBBOXStop: () => void;
     flyZoomToBBOXStartZoom: (currentbox: WMBBOX, newbox: WMBBOX) => void;
+    startZoomThrottled: any;
+    flyZoomToBBOXStartZoomThrottled: (currentbox: WMBBOX, newbox: WMBBOX) => void;
 }

package/lib/components/WMMapPin.d.ts

@@ -9,15 +9,17 @@ declare class MapPin {
     private geoPosX;
     private geoPosY;
     displayMapPin: boolean;
+    disableMapPin: boolean;
     constructor(_map: WMJSMap);
     redrawMap: () => void;
     drawMarker(ctx: CanvasRenderingContext2D): void;
-    repositionMapPin: (_bbox?: WMBBOX) => void;
+    repositionMapPin: (_bbox: WMBBOX) => void;
     setMapPin: (_x: number, _y: number, _bbox?: WMBBOX) => void;
     positionMapPinByLatLon: (coord: {
         x: number;
         y: number;
     }) => void;
+    toggleDisableMapPin: () => void;
     showMapPin: () => void;
     hideMapPin: () => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "2.2.1",
+  "version": "2.4.1",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {