@opengeoweb/webmap-react 9.34.0 → 9.35.0

package/index.esm.js

@@ -1,9 +1,9 @@
-import { legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, getPixelCoordFromLatLong, WMJSMAP_LONLAT_EPSGCODE, getLatLongFromPixelCoord, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, WMBBOX, getWMLayerById, WMJSMap, tilesettings } from '@opengeoweb/webmap';
+import { legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, getPixelCoordFromLatLong, WMJSMAP_LONLAT_EPSGCODE, getLatLongFromPixelCoord, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, tilesettings, WMBBOX, getWMLayerById, WMJSMap } from '@opengeoweb/webmap';
 export { WEBMAP_NAMESPACE, webmapTranslations } from '@opengeoweb/webmap';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default, { useRef, useState, useEffect } from 'react';
-import { CustomTooltip, CanvasComponent, ToolContainerDraggable, CustomIconButton, dateUtils, PROJECTION } from '@opengeoweb/shared';
+import { CustomTooltip, CanvasComponent, useWheelStopPropagation, ToolContainerDraggable, CustomIconButton, dateUtils, PROJECTION } from '@opengeoweb/shared';
 import 'i18next';
 import { useTranslation } from 'react-i18next';
 import { Paper, Box, Typography, Grid2, TextField, FormControl, InputLabel, Select, MenuItem, Icon as Icon$1, FormLabel, Switch, styled, Slider } from '@mui/material';
@@ -981,6 +981,7 @@ var LegendDialog = function LegendDialog(_ref) {
     source = _ref$source === void 0 ? 'app' : _ref$source;
   var _useWebmapReactTransl = useWebmapReactTranslation(),
     t = _useWebmapReactTransl.t;
+  var stopWheelEventPropagationRef = useWheelStopPropagation();
   return jsx(ToolContainerDraggable, {
     startPosition: {
       right: 20,
@@ -1001,6 +1002,7 @@ var LegendDialog = function LegendDialog(_ref) {
         padding: 0.5
       },
       children: layers && layers.length > 0 ? jsx(Box, {
+        ref: stopWheelEventPropagationRef,
         "data-testid": "LegendList",
         sx: {
           display: 'flex',
@@ -6939,6 +6941,7 @@ var ReactMapView = /*#__PURE__*/function (_React$Component) {
     _this.state = {
       adagucInitialised: false
     };
+    _this.tileServerSettings = props.tileServerSettings || ReactMapView.defaultProps.tileServerSettings;
     _this.resize = _this.resize.bind(_this);
     _this.handleWindowResize = _this.handleWindowResize.bind(_this);
     _this.drawDebounced = debounce(_this.drawDebounced, 600);
@@ -7072,7 +7075,15 @@ var ReactMapView = /*#__PURE__*/function (_React$Component) {
         return;
       }
       var mapId = props.mapId,
-        children = props.children;
+        children = props.children,
+        isTimeScrollingEnabled = props.isTimeScrollingEnabled;
+      if (isTimeScrollingEnabled) {
+        var _wmjsMap = webmapUtils.getWMJSMapById(mapId);
+        _wmjsMap === null || _wmjsMap === void 0 || _wmjsMap.detachWheelEvent();
+      } else {
+        var _wmjsMap2 = webmapUtils.getWMJSMapById(mapId);
+        _wmjsMap2 === null || _wmjsMap2 === void 0 || _wmjsMap2.attachWheelEvent();
+      }
       if (prevProps && prevProps.mapId !== props.mapId) {
         console.warn('MapId has changed on an already mounted map!');
         var prevWMJSMap = webmapUtils.getWMJSMapById(prevProps.mapId);
@@ -7319,7 +7330,7 @@ var ReactMapView = /*#__PURE__*/function (_React$Component) {
       if (srs) {
         wmjsMap.setProjection(srs, new WMBBOX(bbox));
       }
-      wmjsMap.setWMTileRendererTileSettings(tilesettings);
+      wmjsMap.setWMTileRendererTileSettings(this.tileServerSettings || tilesettings);
       if (listeners) {
         listeners.forEach(function (listener) {
           wmjsMap.addListener(listener.name, function (data) {
@@ -7490,6 +7501,7 @@ ReactMapView.defaultProps = {
   shouldAutoFetch: true,
   displayMapPin: false,
   disableMapPin: false,
+  tileServerSettings: tilesettings,
   onWMJSMount: function onWMJSMount() {},
   onWMJSUnMount: function onWMJSUnMount() {},
   onMapChangeDimension: function onMapChangeDimension() {
@@ -7760,7 +7772,7 @@ var drawLayerName = function drawLayerName(ctx, bbox, offsetX, offsetY, width, h
 // Re-enable the previousely disabled eslint rule
 /* eslint-enable no-param-reassign */
 
-var _excluded$1 = ["children", "controls", "displayTimeInMap", "onWMJSMount"];
+var _excluded$1 = ["children", "controls", "displayTimeInMap", "onWMJSMount", "isTimeScrollingEnabled"];
 var MapView = function MapView(_ref) {
   var children = _ref.children,
     _ref$controls = _ref.controls,
@@ -7770,6 +7782,7 @@ var MapView = function MapView(_ref) {
     _ref$displayTimeInMap = _ref.displayTimeInMap,
     displayTimeInMap = _ref$displayTimeInMap === void 0 ? true : _ref$displayTimeInMap,
     _onWMJSMount = _ref.onWMJSMount,
+    isTimeScrollingEnabled = _ref.isTimeScrollingEnabled,
     props = _objectWithoutProperties(_ref, _excluded$1);
   var dimensions = props.dimensions,
     mapIdProp = props.mapId;
@@ -7795,7 +7808,8 @@ var MapView = function MapView(_ref) {
     }
   }, [width, height]);
   var reactMapViewProps = _objectSpread2(_objectSpread2({}, props), {}, {
-    mapId: mapId
+    mapId: mapId,
+    isTimeScrollingEnabled: isTimeScrollingEnabled
   });
   return jsxs(Box, {
     ref: ref,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "9.34.0",
+  "version": "9.35.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/MapView/MapView.d.ts

@@ -4,5 +4,6 @@ export interface MapViewProps extends ReactMapViewProps {
     controls?: {
         zoomControls?: boolean;
     };
+    isTimeScrollingEnabled?: boolean;
 }
 export declare const MapView: React.FC<MapViewProps>;

package/src/lib/components/ReactMapView/ReactMapView.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as React from 'react';
-import { IWMJSMap, WMLayer, WMBBOX } from '@opengeoweb/webmap';
+import { IWMJSMap, WMLayer, WMBBOX, TileServerSettings } from '@opengeoweb/webmap';
 import { ReactMapViewProps } from './types';
 import type { MapViewLayerProps } from '../MapView';
 export declare const ORIGIN_REACTMAPVIEW_ONMAPCHANGEDIMENSION = "ORIGIN_REACTMAPVIEW_ONMAPCHANGEDIMENSION";
@@ -21,6 +21,7 @@ export declare class ReactMapView extends React.Component<ReactMapViewProps, Rea
     adaguc: AdagucObjectProp;
     adagucContainerRef: React.RefObject<HTMLDivElement>;
     adagucWebMapJSRef: React.RefObject<HTMLDivElement>;
+    tileServerSettings: TileServerSettings;
     refetchTimer: NodeJS.Timeout | number | null;
     lastRefetched: number | null;
     static defaultProps: {
@@ -34,6 +35,7 @@ export declare class ReactMapView extends React.Component<ReactMapViewProps, Rea
         shouldAutoFetch: boolean;
         displayMapPin: boolean;
         disableMapPin: boolean;
+        tileServerSettings: TileServerSettings;
         onWMJSMount: () => void;
         onWMJSUnMount: () => void;
         onMapChangeDimension: () => void;

package/src/lib/components/ReactMapView/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { Bbox, Dimension, IWMJSMap } from '@opengeoweb/webmap';
+import { Bbox, Dimension, IWMJSMap, TileServerSettings } from '@opengeoweb/webmap';
 import { TFunction } from 'i18next';
 export interface ReactMapViewProps {
     listeners?: {
@@ -8,6 +8,7 @@ export interface ReactMapViewProps {
         keep: boolean;
         callbackfunction: (webMap: IWMJSMap, value: string) => void;
     }[];
+    isTimeScrollingEnabled?: boolean;
     srs?: string;
     bbox?: Bbox;
     children?: React.ReactNode;
@@ -15,6 +16,7 @@ export interface ReactMapViewProps {
     activeLayerId?: string;
     showScaleBar?: boolean;
     showLegend?: boolean;
+    tileServerSettings?: TileServerSettings;
     passiveMap?: boolean;
     displayTimeInMap?: boolean;
     animationDelay?: number;