@opengeoweb/core 9.25.3 → 9.27.0

package/index.esm.js

@@ -2,12 +2,12 @@ import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default, { useState, useCallback, useRef } from 'react';
 import { Grid, Box, MenuItem, Typography, useTheme, Popper, Fade, Tooltip, styled, LinearProgress, FormControl, InputLabel, Paper, List, ListItemButton, ListItemText, CircularProgress, ListSubheader, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, InputAdornment, DialogActions, Button, circularProgressClasses, ListItemIcon, Checkbox } from '@mui/material';
-import { SHARED_NAMESPACE, sharedTranslations, CustomIconButton, TooltipSelect, AlertIcon, sliderHeaderStyle, CustomSlider, ToggleMenu, CustomTooltip, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, calculateStartSize, ToolContainerDraggable, useDebounce, dateUtils, withEggs, ErrorBoundary } from '@opengeoweb/shared';
+import { SHARED_NAMESPACE, sharedTranslations, CustomIconButton, TooltipSelect, AlertIcon, sliderHeaderStyle, CustomSlider, ToggleMenu, CustomTooltip, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, PROJECTION, calculateStartSize, ToolContainerDraggable, useDebounce, dateUtils, withEggs, ErrorBoundary } from '@opengeoweb/shared';
 import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, LayersAdd, CloudLoading, Copy, None, FastForward, AutoUpdateActive, Both, Visibility, VisibilityOff, Delete, DragHandle as DragHandle$1, Cached, Add, MapAdd, WorldMapProjection, Layers, ExitDomain, Info, Search, Exclamation, MyLocation, Close, ThemeWrapper, lightTheme } from '@opengeoweb/theme';
 import i18n from 'i18next';
 import { useTranslation, initReactI18next, I18nextProvider } from 'react-i18next';
-import { TIMESLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, TIME_SLIDER_LEGEND_HEIGHT, SpeedButton, TimeStepButton, AnimationLengthButton, AnimationLength, TimeSpanButton, marks as marks$1, secondsPerPxFromCanvasWidth, getNewCenterOfFixedPointZoom, OptionsMenuButton, PlayButton, defaultTimeStep, BackwardForwardStepButton, AutoUpdateButton, NowButton, handleSetNowEvent, TimeSliderButtons, TimeSliderCurrentTimeBox, TimeSliderLegend, TimeSlider, onsetNewDateDebounced, getFilteredTime, ControlButtons, OptionsMenu, TimeSliderClock } from '@opengeoweb/timeslider';
-import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, ZoomControls, MapView, MapViewLayer, LegendDialog, LegendButton, registerDrawFunction, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
+import { TIMESLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, TIME_SLIDER_LEGEND_HEIGHT, SpeedButton, TimeStepButton, AnimationLengthButton, AnimationLength, TimeSpanButton, secondsPerPxFromCanvasWidth, getNewCenterOfFixedPointZoom, OptionsMenuButton, PlayButton, defaultTimeStep, BackwardForwardStepButton, AutoUpdateButton, NowButton, handleSetNowEvent, TimeSliderButtons, TimeSliderCurrentTimeBox, TimeSliderLegend, TimeSlider, onsetNewDateDebounced, getFilteredTime, ControlButtons, OptionsMenu, TimeSliderClock } from '@opengeoweb/timeslider';
+import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations, WEBMAP_NAMESPACE, webmapTranslations, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, ZoomControls, MapView, MapViewLayer, LegendDialog, LegendButton, registerDrawFunction, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
 import { useDispatch, useSelector, connect, useStore, Provider } from 'react-redux';
 import { ReactSortable } from 'react-sortablejs';
 import Sortable from 'sortablejs';
@@ -1964,24 +1964,28 @@ const initCoreReactI18n = () => {
       en: {
         [CORE_NAMESPACE]: coreTranslations.en,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.en,
+        [WEBMAP_NAMESPACE]: webmapTranslations.en,
         [SHARED_NAMESPACE]: sharedTranslations.en,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.en
       },
       fi: {
         [CORE_NAMESPACE]: coreTranslations.fi,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.fi,
+        [WEBMAP_NAMESPACE]: webmapTranslations.fi,
         [SHARED_NAMESPACE]: sharedTranslations.fi,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.fi
       },
       no: {
         [CORE_NAMESPACE]: coreTranslations.no,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.no,
+        [WEBMAP_NAMESPACE]: webmapTranslations.no,
         [SHARED_NAMESPACE]: sharedTranslations.no,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.no
       },
       nl: {
         [CORE_NAMESPACE]: coreTranslations.nl,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.nl,
+        [WEBMAP_NAMESPACE]: webmapTranslations.nl,
         [SHARED_NAMESPACE]: sharedTranslations.nl,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.nl
       }
@@ -6490,79 +6494,63 @@ const HeaderOptionsConnect = ({
   });
 };
 
-const availableProjections = [{
-  name: 'Europe Mercator',
-  value: 'EPSG:3857',
+const availableProjections = [Object.assign(Object.assign({}, PROJECTION.EPSG_3857), {
   bbox: {
     left: -1342329.1465696818,
     bottom: 3920707.9160590963,
     right: 4520696.671030318,
     top: 11588870.593609098
   }
-}, {
-  name: 'Northern Hemisphere North Pole',
-  value: 'EPSG:3575',
+}), Object.assign(Object.assign({}, PROJECTION.EPSG_3575), {
   bbox: {
     left: -6974291.292427451,
     bottom: -4143517.10430627,
     right: 7160410.554092634,
     top: 3403105.194804561
   }
-}, {
-  name: 'Sea Ice Polar Stereographic North',
-  value: 'EPSG:3411',
+}), Object.assign(Object.assign({}, PROJECTION.EPSG_3411), {
   bbox: {
     left: -8586591.790921725,
     bottom: -6905418.5308475215,
     right: 11520691.230089426,
     top: 3830009.2177224844
   }
-}, {
-  name: 'Sea Ice Polar Stereographic South',
-  value: 'EPSG:3412',
+}), Object.assign(Object.assign({}, PROJECTION.EPSG_3412), {
   bbox: {
     left: -23805428.64174738,
     bottom: -13538921.571034307,
     right: 24880766.607377376,
     top: 12454999.681458568
   }
-}, {
-  name: 'Europe Polar Stereographic',
-  value: 'EPSG:32661',
+}), Object.assign(Object.assign({}, PROJECTION.EPSG_32661), {
   bbox: {
     left: -3078812.468202346,
     bottom: -5551735.866551964,
     right: 9359725.15673533,
     top: 1089291.7566655697
   }
-}, {
-  name: 'Europe Robinson',
-  value: 'EPSG:54030',
+}), Object.assign(Object.assign({}, PROJECTION.EPSG_54030), {
   bbox: {
     left: -2020532.0269369134,
     bottom: 4102671.9257380506,
     right: 3149912.1784659545,
     top: 6863210.489656053
   }
-}, {
-  name: 'The Netherlands (28992)',
-  value: 'EPSG:28992',
+}), Object.assign(Object.assign({}, PROJECTION.EPSG_28992), {
   bbox: {
     left: -875225.6439854703,
     bottom: -36779.36485252716,
     right: 1356591.6745628114,
     top: 1154804.4779891823
   }
-}, {
-  name: 'ETRS89 / TM35FIN(E,N) -- Finland',
-  value: 'EPSG:3067',
+}), Object.assign(Object.assign({}, PROJECTION.EPSG_3067), {
   bbox: {
     left: -1197402.0,
     bottom: 6439686.0,
     right: 2090705,
     top: 7975202
   }
-}];
+})];
 const ProjectionSelect = ({
   currentProjection,
   onChangeProjection
@@ -8871,7 +8859,7 @@ const TimeStepButtonConnect = ({
     onChangeTimeStep: onSetTimeStep,
     disabled: isAnimating,
     onToggleTimestepAuto: onToggleTimestepAuto,
-    isTimestepAuto: Boolean(isTimestepAuto) && Boolean(timeStepFromLayer),
+    isTimestepAuto: isTimestepAuto && Boolean(timeStepFromLayer),
     timeStepFromLayer: timeStepFromLayer
   });
 };
@@ -8934,9 +8922,11 @@ const TimeSpanButtonConnect = ({
       origin: mapEnums.MapActionOrigin.map
     }));
   }, [dispatch, isTimeSpanAuto, mapId]);
-  const onChangeTimeSliderSpan = newSliderValue => {
-    const newValue = newSliderValue ? Math.round(newSliderValue) : 0;
-    const spanInSeconds = marks$1.find(el => el.value === newValue).value;
+  const onChangeTimeSliderSpan = valueInMinutes => {
+    if (isTimeSpanAuto) {
+      onToggleTimeSpanAuto();
+    }
+    const spanInSeconds = valueInMinutes * 60;
     const timeSliderWidth = mapSelectors.getMapTimeSliderWidth(store.getState(), mapId);
     const selectedTime = mapSelectors.getSelectedTime(store.getState(), mapId);
     const secondsPerPx = mapSelectors.getMapTimeSliderSecondsPerPx(store.getState(), mapId);
@@ -8958,12 +8948,6 @@ const TimeSpanButtonConnect = ({
       }));
     }
   };
-  const onMenuItemClick = markValue => {
-    if (isTimeSpanAuto) {
-      onToggleTimeSpanAuto();
-    }
-    onChangeTimeSliderSpan(markValue);
-  };
   const onToggleTimeSpan = () => {
     if (isTimeSpanAuto) {
       return;
@@ -8971,11 +8955,10 @@ const TimeSpanButtonConnect = ({
     onToggleTimeSpanAuto();
   };
   return jsx(TimeSpanButton, {
-    timeSliderSpan: timeSliderSpan,
+    timeSliderSpan: timeSliderSpan / 60,
     disabled: isAnimating,
     onChangeSliderValue: onChangeTimeSliderSpan,
     onToggleTimeSpan: onToggleTimeSpan,
-    onMenuItemClick: onMenuItemClick,
     isTimeSpanAuto: Boolean(isTimeSpanAuto) && Boolean(timeStepFromLayer),
     layerHasTimeStep: Boolean(timeStepFromLayer)
   });
@@ -9583,7 +9566,7 @@ const titleStyle = theme => ({
   userSelect: 'none'
 });
 const defaultBbox = {
-  srs: 'EPSG:3857',
+  srs: PROJECTION.EPSG_3857.value,
   bbox: {
     left: 58703.6377,
     bottom: 6408480.4514,
@@ -9618,9 +9601,10 @@ const ConfigurableMapConnect = _a => {
       shouldDisplayDrawControls = false,
       displaySearchButtonInMap = false,
       mapControls,
-      children
+      children,
+      shouldDisablePrefetching
     } = _a,
-    props = __rest(_a, ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "shouldAutoFetch", "bbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "displaySearchButtonInMap", "mapControls", "children"]);
+    props = __rest(_a, ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "shouldAutoFetch", "bbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "displaySearchButtonInMap", "mapControls", "children", "shouldDisablePrefetching"]);
   const dispatch = useDispatch();
   const mapId = React__default.useRef(id || webmapUtils.generateMapId()).current;
   React__default.useEffect(() => {
@@ -9735,7 +9719,8 @@ const ConfigurableMapConnect = _a => {
         displayTimeInMap: displayTimeInMap,
         showScaleBar: false,
         shouldAutoFetch: shouldAutoFetch,
-        mapId: mapId
+        mapId: mapId,
+        shouldDisablePrefetching: shouldDisablePrefetching
       }, {
         children: children
       })), multiLegend && jsx(LegendConnect, {
@@ -9755,7 +9740,7 @@ const ConfigurableMapConnect = _a => {
         isDocked: true
       })]
     }));
-  }, [children, disableTimeSlider, displayDimensionSelectButtonInMap, displayGetFeatureInfoButtonInMap, displayLayerManagerAndLegendButtonInMap, displaySearchButtonInMap, displayTimeInMap, id, mapControls, mapControlsPositionTop, mapId, multiLegend, showClock, shouldAutoFetch, title]);
+  }, [children, disableTimeSlider, displayDimensionSelectButtonInMap, displayGetFeatureInfoButtonInMap, displayLayerManagerAndLegendButtonInMap, displaySearchButtonInMap, displayTimeInMap, id, mapControls, mapControlsPositionTop, mapId, multiLegend, showClock, shouldAutoFetch, title, shouldDisablePrefetching]);
 };
 
 var uncurryThis$1 = functionUncurryThis;
@@ -10040,7 +10025,8 @@ const MultiMapViewConnect = ({
           showTimeSlider: false,
           disableTimeSlider: true,
           showClock: false,
-          multiLegend: _multiLegend
+          multiLegend: _multiLegend,
+          shouldDisablePrefetching: map.componentType === 'MultiMap'
         })
       }), mapId);
     })]
@@ -10092,7 +10078,8 @@ const makeMapPreset = (timeIncrement, uniqueId, referenceTime, layers, syncGroup
       right: 1215891.3289626688,
       top: 7540256.313079321
     },
-    srs: 'EPSG:3857',
+    srs: PROJECTION.EPSG_3857.value,
+    componentType: 'MultiMap',
     layers: layers.map((layer, index) => Object.assign(Object.assign({}, layer), {
       id: `${uniqueId}-${index}`,
       dimensions: [{
@@ -10183,7 +10170,8 @@ const HarmonieTempAndPrecipPreset = ({
         right: 1428345.8183648037,
         top: 7438773.776232235
       },
-      srs: 'EPSG:3857',
+      srs: PROJECTION.EPSG_3857.value,
+      componentType: 'MultiMap',
       layers: [Object.assign(Object.assign({}, layer), {
         id: uniqueId,
         dimensions: [{
@@ -10272,7 +10260,8 @@ const componentsLookUp = ({
               autoUpdateLayerId,
               autoTimeStepLayerId,
               bbox: (_b = (_a = mapPreset[0]) === null || _a === void 0 ? void 0 : _a.proj) === null || _b === void 0 ? void 0 : _b.bbox,
-              srs: (_d = (_c = mapPreset[0]) === null || _c === void 0 ? void 0 : _c.proj) === null || _d === void 0 ? void 0 : _d.srs
+              srs: (_d = (_c = mapPreset[0]) === null || _c === void 0 ? void 0 : _c.proj) === null || _d === void 0 ? void 0 : _d.srs,
+              componentType: 'MultiMap'
             };
           }),
           "data-testid": "coreMultiMapViewConnect"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "9.25.3",
+  "version": "9.27.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -32,7 +32,9 @@
     "@sentry/react": "^7.109.0"
   },
   "peerDependencies": {
-    "react": "18"
+    "react": "18",
+    "@emotion/react": "*",
+    "@emotion/styled": "*"
   },
   "module": "./index.esm.js",
   "type": "module",

package/src/lib/components/ComponentsLookUp/componentsLookUp.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { mapTypes } from '@opengeoweb/store';
+import { PlotPreset, TimeSeriesService } from '@opengeoweb/shared';
 import { InitialHarmTempAndPrecipProps } from '../MultiMapViewConnect/HarmoniePresets';
 import { ModelRunIntervalProps } from '../MultiMapViewConnect/ModelRunInterval';
 interface InitialMultiMapProps {
@@ -20,7 +21,11 @@ export interface InitialMapProps {
     shouldDisplayDrawControls?: boolean;
     displaySearchButtonInMap?: boolean;
 }
-export type InitialProps = InitialMapProps | InitialMultiMapProps | InitialHarmTempAndPrecipProps | ModelRunIntervalProps | mapTypes.MapPresetInitialProps | InitialSliderProps;
+export interface InitialTimeSeriesProps {
+    plotPreset: PlotPreset;
+    services: TimeSeriesService[];
+}
+export type InitialProps = InitialMapProps | InitialMultiMapProps | InitialHarmTempAndPrecipProps | ModelRunIntervalProps | mapTypes.MapPresetInitialProps | InitialSliderProps | InitialTimeSeriesProps;
 /**
  * The lookup table is for registering your own components with the workspace.
  * @param payload

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mapTypes, layerTypes } from '@opengeoweb/store';
 export declare const defaultBbox: {
-    srs: string;
+    srs: "EPSG:3857";
     bbox: {
         left: number;
         bottom: number;
@@ -40,5 +40,6 @@ export interface ConfigurableMapConnectProps {
     displaySearchButtonInMap?: boolean;
     children?: React.ReactNode;
     mapControls?: React.ReactNode;
+    shouldDisablePrefetching?: boolean;
 }
 export declare const ConfigurableMapConnect: React.FC<ConfigurableMapConnectProps>;

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

@@ -13,6 +13,7 @@ export interface MultiMapPreset {
     displayLayerManagerAndLegendButtonInMap?: boolean;
     displayDimensionSelectButtonInMap?: boolean;
     syncGroupsIds?: string[];
+    componentType?: string;
 }
 export interface MultiMapViewProps {
     rows: number;

package/src/lib/components/MultiMapViewConnect/storyUtils/mapPresets.d.ts

@@ -15,7 +15,7 @@ export declare const mapPresetRadar: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetObsTA: {
@@ -32,7 +32,7 @@ export declare const mapPresetObsTA: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetObsWind: {
@@ -49,7 +49,7 @@ export declare const mapPresetObsWind: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetObsPP: {
@@ -66,7 +66,7 @@ export declare const mapPresetObsPP: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetObsRH: {
@@ -83,7 +83,7 @@ export declare const mapPresetObsRH: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetObsQG: {
@@ -100,7 +100,7 @@ export declare const mapPresetObsQG: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetEumetsat: {
@@ -118,7 +118,7 @@ export declare const mapPresetEumetsat: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetHarmoniePrecipitationFlux: {
@@ -136,7 +136,7 @@ export declare const mapPresetHarmoniePrecipitationFlux: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetHarmonieTemperature2m: {
@@ -154,7 +154,7 @@ export declare const mapPresetHarmonieTemperature2m: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };
 export declare const mapPresetHarmoniePressureMSL: {
@@ -172,6 +172,6 @@ export declare const mapPresetHarmoniePressureMSL: {
             right: number;
             top: number;
         };
-        srs: string;
+        srs: "EPSG:3857";
     };
 };