@opengeoweb/webmap-react 9.26.0 → 9.27.1

package/index.esm.js

@@ -1,7 +1,8 @@
+import { WEBMAP_NAMESPACE, webmapTranslations, legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, getPixelCoordFromLatLong, WMJSMAP_LONLAT_EPSGCODE, getLatLongFromPixelCoord, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, WMBBOX, getWMLayerById, WMJSMap, tilesettings } 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 { legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, getPixelCoordFromLatLong, WMJSMAP_LONLAT_EPSGCODE, getLatLongFromPixelCoord, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, WMBBOX, getWMLayerById, WMJSMap, tilesettings } from '@opengeoweb/webmap';
 import { CustomTooltip, CanvasComponent, ToolContainerDraggable, CustomIconButton, dateUtils, PROJECTION } from '@opengeoweb/shared';
 import i18n from 'i18next';
 import { initReactI18next, useTranslation } from 'react-i18next';
@@ -9,7 +10,7 @@ import { Paper, Box, Typography, Grid, TextField, FormControl, InputLabel, Selec
 import { Home, Add, Minus, List, Delete, Edit, DrawRegion, DrawPolygon, Location, DrawFIRLand, ArrowUp, Equalizer, DimensionsElevation, Link, LinkOff, Info, DimensionsOther, DimensionsRefTime, DimensionsTime } from '@opengeoweb/theme';
 import _, { cloneDeep } from 'lodash';
 import * as turf from '@turf/turf';
-import { polygonToLineString, booleanClockwise, rewind } from '@turf/turf';
+import { polygonToLine, booleanClockwise, rewind } from '@turf/turf';
 import proj4 from 'proj4';
 import { produce } from 'immer';
 import { debounce } from 'throttle-debounce';
@@ -1832,16 +1833,20 @@ i18n.use(initReactI18next).init({
   },
   resources: {
     en: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.en
+      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.en,
+      [WEBMAP_NAMESPACE]: webmapTranslations.en
     },
     fi: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.fi
+      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.fi,
+      [WEBMAP_NAMESPACE]: webmapTranslations.fi
     },
     no: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.no
+      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.no,
+      [WEBMAP_NAMESPACE]: webmapTranslations.no
     },
     nl: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.nl
+      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.nl,
+      [WEBMAP_NAMESPACE]: webmapTranslations.nl
     }
   }
 });
@@ -6025,7 +6030,7 @@ const intersectPolygonGeoJSONS = (a, b, geoJSONProperties = {
   };
   const simplifiedA = turf.simplify(featureA, options);
   const simplifiedB = turf.simplify(featureB, options);
-  const intersection = turf.intersect(simplifiedA, simplifiedB);
+  const intersection = turf.intersect(turf.featureCollection([simplifiedA, simplifiedB]));
   return addFeatureProperties({
     type: 'FeatureCollection',
     features: intersection === null ? [{
@@ -6137,7 +6142,7 @@ const rewindGeometry = geoJSON => {
       const {
         geometry
       } = geoJSON.features[0];
-      const lineString = polygonToLineString(geometry);
+      const lineString = polygonToLine(geometry);
       if (booleanClockwise(lineString.geometry.coordinates)) {
         // eslint-disable-next-line no-param-reassign
         geoJSONDraft.features[0].geometry = rewind(geoJSONDraft.features[0].geometry);
@@ -9892,10 +9897,7 @@ class ReactMapView extends React.Component {
       currentChildren: []
     };
     this.refetchTimer = null;
-    /**
-     * Last epoch time the map was visible in millisecs. Null if the map is currently visible.
-     */
-    this.lastVisible = null;
+    this.lastRefetched = null;
     this.handleVisibilityChange = () => {
       const {
         shouldAutoFetch
@@ -9903,14 +9905,14 @@ class ReactMapView extends React.Component {
       const autoFetchInterval = Number(shouldAutoFetch); // Default true -> 1 minute
       const autoFetchIntervalMilliSeconds = Math.abs(autoFetchInterval) * MINUTE_TO_MILLISECOND;
       if (document.visibilityState === 'visible') {
-        if (this.lastVisible &&
-        // skip if last visibility change was within 1 minute (or the autoFetchInterval)
-        new Date().getTime() - this.lastVisible > autoFetchIntervalMilliSeconds) {
+        if (this.lastRefetched &&
+        // skip if last refetch was within 1 minute (or the autoFetchInterval)
+        new Date().getTime() - this.lastRefetched > autoFetchIntervalMilliSeconds) {
           this.onStartRefetchTimer(true);
+        } else {
+          this.onStartRefetchTimer();
         }
-        this.lastVisible = null;
       } else {
-        this.lastVisible = new Date().getTime();
         this.clearRefetchTimer();
       }
     };
@@ -9929,6 +9931,7 @@ class ReactMapView extends React.Component {
       this.clearRefetchTimer();
       const autoFetchInterval = Number(shouldAutoFetch); // Default true -> 1 minute
       const refetch = () => {
+        this.lastRefetched = new Date().getTime();
         const {
           mapId
         } = this.props;
@@ -10274,7 +10277,8 @@ class ReactMapView extends React.Component {
       listeners,
       srs,
       bbox,
-      onMapPinChangeLocation
+      onMapPinChangeLocation,
+      shouldDisablePrefetching
     } = this.props;
     /* Check if we have something to mount IWMJSMap on */
     if (this.adagucWebMapJSRef.current === null) {
@@ -10288,6 +10292,7 @@ class ReactMapView extends React.Component {
       webmapUtils.unRegisterWMJSMap(mapId);
     }
     const wmjsMap = new WMJSMap(this.adagucWebMapJSRef.current);
+    wmjsMap.shouldPrefetch = !shouldDisablePrefetching;
     this.adaguc.currentChildren = [];
     this.adaguc.baseLayers = [];
     webmapUtils.registerWMJSMap(wmjsMap, mapId);
@@ -10829,6 +10834,7 @@ const MapView = _a => {
       children: jsx(ReactMapView, Object.assign({}, reactMapViewProps, {
         showLegend: false,
         displayTimeInMap: false,
+        shouldDisablePrefetching: props.shouldDisablePrefetching,
         onWMJSMount: id => {
           const webMapJS = webmapUtils.getWMJSMapById(id);
           if (!webMapJS) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "9.26.0",
+  "version": "9.27.1",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {
@@ -14,7 +14,7 @@
     "@opengeoweb/shared": "*",
     "lodash": "^4.17.21",
     "proj4": "^2.9.2",
-    "@turf/turf": "^6.5.0",
+    "@turf/turf": "^7.1.0",
     "immer": "^10.0.3",
     "react-resize-detector": "^9.1.0",
     "throttle-debounce": "^5.0.0",
@@ -23,7 +23,9 @@
     "react-i18next": "^14.1.2"
   },
   "peerDependencies": {
-    "react": "18"
+    "react": "18",
+    "@emotion/react": "*",
+    "@emotion/styled": "*"
   },
   "module": "./index.esm.js",
   "type": "module",

package/src/index.d.ts

@@ -1,3 +1,5 @@
+import { WEBMAP_NAMESPACE, webmapTranslations } from '@opengeoweb/webmap';
 import webmapReactTranslations from '../locales/webmap-react.json';
 export * from './lib';
 export { webmapReactTranslations };
+export { WEBMAP_NAMESPACE, webmapTranslations };

package/src/lib/components/MapDrawTool/utils.d.ts

@@ -1,5 +1,4 @@
-import { Feature } from '@turf/turf';
-import { FeatureCollection, GeoJsonProperties, Point } from 'geojson';
+import { Feature, FeatureCollection, GeoJsonProperties, Point } from 'geojson';
 import { Bbox } from '@opengeoweb/webmap';
 import { DrawMode, SelectionType } from './types';
 /**

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

@@ -22,10 +22,7 @@ export declare class ReactMapView extends React.Component<ReactMapViewProps, Rea
     adagucContainerRef: React.RefObject<HTMLDivElement>;
     adagucWebMapJSRef: React.RefObject<HTMLDivElement>;
     refetchTimer: NodeJS.Timeout | number | null;
-    /**
-     * Last epoch time the map was visible in millisecs. Null if the map is currently visible.
-     */
-    lastVisible: number | null;
+    lastRefetched: number | null;
     static defaultProps: {
         srs: "EPSG:3857";
         bbox: {

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

@@ -26,6 +26,7 @@ export interface ReactMapViewProps {
     showLayerInfo?: boolean;
     disableMapPin?: boolean;
     holdShiftToScroll?: boolean;
+    shouldDisablePrefetching?: boolean;
     onWMJSMount?: (mapId: string) => void;
     onWMJSUnMount?: (mapId: string) => void;
     onMapChangeDimension?: (payload: SetMapDimensionPayload) => void;