@opengeoweb/webmap-react 9.32.1 → 9.33.1-spike-ol.3

package/index.esm.js

@@ -1,11 +1,11 @@
-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';
+import { 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 { CustomTooltip, CanvasComponent, ToolContainerDraggable, CustomIconButton, dateUtils, PROJECTION } from '@opengeoweb/shared';
-import i18n from 'i18next';
-import { initReactI18next, useTranslation } from 'react-i18next';
+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';
 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, debounce, isEqual } from 'lodash';
@@ -71,18 +71,18 @@ var fi = {
 	"webmap-react-identifier": "Tunniste",
 	"webmap-react-no-layers": "Ei karttatasoja",
 	"webmap-react-legend": "Selite",
-	"webmap-react-title": "Titteli",
+	"webmap-react-title": "Otsikko",
 	"webmap-react-name": "Nimi",
 	"webmap-react-service": "Palvelu",
 	"webmap-react-abstract": "Tiivistelmä",
-	"webmap-react-dimensions": "Dimensiot",
+	"webmap-react-dimensions": "Ulottuvuudet",
 	"webmap-react-styles": "Tyylit",
 	"webmap-react-bounding-box": "Rajaava-alue",
 	"webmap-react-groups": "Ryhmät",
 	"webmap-react-keywords": "Avainsanat",
-	"webmap-react-zoom-reset": "Resetoi zoom",
-	"webmap-react-zoom-in": "Zoomaa sisään",
-	"webmap-react-zoom-out": "Zoomaa ulos",
+	"webmap-react-zoom-reset": "Palauta zoomaustaso",
+	"webmap-react-zoom-in": "Lähennä",
+	"webmap-react-zoom-out": "Loitonna",
 	"webmap-react-show": "Näytä",
 	"webmap-react-click-disconnect": "Irroita karttataso napsauttamalla",
 	"webmap-react-click-connect": "Yhdistä karttataso napsauttamalla",
@@ -1829,31 +1829,6 @@ $$h({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }
 });
 
 const WEBMAP_REACT_NAMESPACE = 'webmapreact';
-void i18n.use(initReactI18next).init({
-  lng: 'en',
-  ns: WEBMAP_REACT_NAMESPACE,
-  interpolation: {
-    escapeValue: false
-  },
-  resources: {
-    en: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.en,
-      [WEBMAP_NAMESPACE]: webmapTranslations.en
-    },
-    fi: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.fi,
-      [WEBMAP_NAMESPACE]: webmapTranslations.fi
-    },
-    no: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.no,
-      [WEBMAP_NAMESPACE]: webmapTranslations.no
-    },
-    nl: {
-      [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.nl,
-      [WEBMAP_NAMESPACE]: webmapTranslations.nl
-    }
-  }
-});
 const useWebmapReactTranslation = () => useTranslation(WEBMAP_REACT_NAMESPACE);
 
 const LegendLayout = ({
@@ -9845,15 +9820,11 @@ 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.lastRefetched &&
-        // skip if last refetch was within 1 minute (or the autoFetchInterval)
-        new Date().getTime() - this.lastRefetched > autoFetchIntervalMilliSeconds) {
+        // Check if the last refetch time is not set or if the time since the last refetch exceeds the interval
+        if (!this.lastRefetched || new Date().getTime() - this.lastRefetched > autoFetchIntervalMilliSeconds) {
+          // Refetch immediately and restart the timer
           this.onStartRefetchTimer(true);
-        } else {
-          this.onStartRefetchTimer();
         }
-      } else {
-        this.clearRefetchTimer();
       }
     };
     /**
@@ -9871,31 +9842,36 @@ 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;
-        const wmjsMap = webmapUtils.getWMJSMapById(mapId);
-        const layers = wmjsMap == null ? void 0 : wmjsMap.getLayers();
-        layers == null || layers.forEach(layer => {
-          if (layer.enabled !== false) {
-            parseWMJSLayer(layer, true).then(wmLayer => {
-              const {
-                props
-              } = this;
-              const {
-                mapId,
-                onUpdateLayerInformation
-              } = props;
-              const layerInfo = getLayerUpdateInfo(wmLayer, mapId);
-              onUpdateLayerInformation && onUpdateLayerInformation(layerInfo);
-            }).catch(e => {
-              console.error(e);
-            });
-          }
-        });
+        const isVisible = document.visibilityState === 'visible';
+        if (isVisible) {
+          this.lastRefetched = new Date().getTime();
+          const {
+            mapId
+          } = this.props;
+          const wmjsMap = webmapUtils.getWMJSMapById(mapId);
+          const layers = wmjsMap == null ? void 0 : wmjsMap.getLayers();
+          layers == null || layers.forEach(layer => {
+            if (layer.enabled !== false) {
+              parseWMJSLayer(layer, true).then(wmLayer => {
+                const {
+                  props
+                } = this;
+                const {
+                  mapId,
+                  onUpdateLayerInformation
+                } = props;
+                const layerInfo = getLayerUpdateInfo(wmLayer, mapId);
+                onUpdateLayerInformation && onUpdateLayerInformation(layerInfo);
+              }).catch(e => {
+                console.error(e);
+              });
+            }
+          });
+        }
       };
-      this.refetchTimer = setInterval(refetch, Math.abs(autoFetchInterval) * MINUTE_TO_MILLISECOND);
+      if (autoFetchInterval > 0) {
+        this.refetchTimer = setInterval(refetch, Math.abs(autoFetchInterval) * MINUTE_TO_MILLISECOND);
+      }
       if (force) {
         refetch();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "9.32.1",
+  "version": "9.33.1-spike-ol.3",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/utils/i18n.d.ts

@@ -1,6 +1,7 @@
 import i18n from 'i18next';
 import { UseTranslationResponse } from 'react-i18next';
 export declare const WEBMAP_REACT_NAMESPACE = "webmapreact";
+export declare const initWebmapReactTestI18n: () => void;
 export declare const translateKeyOutsideComponents: (key: string, params?: Record<string, string | number> | undefined) => string;
 export declare const useWebmapReactTranslation: () => UseTranslationResponse<typeof WEBMAP_REACT_NAMESPACE, typeof i18n>;
 export { i18n };