@opengeoweb/webmap-react 9.27.0 → 9.28.0

package/index.esm.js

@@ -10,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';
@@ -6030,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 ? [{
@@ -6142,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);
@@ -9897,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
@@ -9908,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();
       }
     };
@@ -9934,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;
@@ -12018,14 +12016,9 @@ const KNMIgeoservicesKlimaatAtlas = {
 };
 const KNMIgeoservicesHarmonie = {
   name: 'KNMIgeoservicesHarmonie',
-  url: 'https://geoservices.knmi.nl/wms?DATASET=HARM_N25&',
+  url: 'https://geoservices.knmi.nl/adagucserver?dataset=uwcw_ha43_dini_5p5km',
   id: 'KNMIgeoservicesKliKNMIgeoservicesHarmoniemaatAtlas'
 };
-const KNMIgeoservicesHarmonieMLService = {
-  name: 'KNMI Harmonie ML',
-  url: 'https://geoservices.knmi.nl/wms?DATASET=HARM_N25_ML&SERVICE=WMS&',
-  id: 'harmonieML'
-};
 const MetNorwayService = {
   name: 'MetNorwayService',
   url: 'https://wms-e1.geoweb.met.no/wms?',
@@ -12084,7 +12077,6 @@ var publicServices = /*#__PURE__*/Object.freeze({
   FMIopenwms: FMIopenwms,
   HeiGit: HeiGit,
   KNMIgeoservicesHarmonie: KNMIgeoservicesHarmonie,
-  KNMIgeoservicesHarmonieMLService: KNMIgeoservicesHarmonieMLService,
   KNMIgeoservicesKlimaatAtlas: KNMIgeoservicesKlimaatAtlas,
   KNMIgeoservicesObs: KNMIgeoservicesObs,
   KNMIgeoservicesRadar: KNMIgeoservicesRadar,
@@ -12246,7 +12238,7 @@ const harmonieWindPl = {
 };
 const harmonieAirTemperature = {
   service: KNMIgeoservicesHarmonie.url,
-  name: 'air_temperature__at_2m',
+  name: 'air_temperature_hagl',
   id: webmapUtils.generateLayerId(),
   layerType: LayerType.mapLayer,
   enabled: true
@@ -12260,7 +12252,7 @@ const harmoniePrecipitation = {
 };
 const harmoniePressure = {
   service: KNMIgeoservicesHarmonie.url,
-  name: 'air_pressure_at_sea_level',
+  name: 'air_pressure_at_mean_sea_level_hagl',
   id: webmapUtils.generateLayerId(),
   layerType: LayerType.mapLayer,
   enabled: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "9.27.0",
+  "version": "9.28.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {
@@ -14,12 +14,12 @@
     "@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",
     "i18next": "^23.11.5",
-    "@mui/material": "^5.16.0",
+    "@mui/material": "^6.1.1",
     "react-i18next": "^14.1.2"
   },
   "peerDependencies": {

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/layers/publicServices.d.ts

@@ -43,11 +43,6 @@ export declare const KNMIgeoservicesHarmonie: {
     url: string;
     id: string;
 };
-export declare const KNMIgeoservicesHarmonieMLService: {
-    name: string;
-    url: string;
-    id: string;
-};
 export declare const MetNorwayService: {
     name: string;
     url: string;