@opengeoweb/core 9.0.0 → 9.1.0

package/index.esm.js

@@ -1,16 +1,16 @@
 import * as React from 'react';
-import React__default, { useState, forwardRef, useContext, useEffect, useLayoutEffect, useRef } from 'react';
+import React__default, { useState, forwardRef, useContext, useRef, useEffect, useLayoutEffect } from 'react';
 import { Grid, Box as Box$2, MenuItem, Typography, useTheme as useTheme$2, Button, Popper, ListItemText, ListItemIcon, FormControl, InputLabel, Paper, List, ListItemButton, CircularProgress, ListSubheader, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, InputAdornment, DialogActions, LinearProgress, styled as styled$1, Slider, Checkbox, Card, IconButton, Select, CardContent, RadioGroup, FormControlLabel, Radio, ToggleButtonGroup, ToggleButton, Divider, Tooltip, ButtonGroup } from '@mui/material';
 import { CustomIconButton, TooltipSelect, AlertIcon, useControlledTooltip, CustomTooltip, tooltipContainerStyles, sliderHeaderStyle, CustomSlider, ToggleMenu, AlertBanner, CustomAccordion, calculateStartSize, ToolContainerDraggable, dateUtils, withEggs } from '@opengeoweb/shared';
 import { LayerSelectButtonConnect, LayerInfoButton, LayerInfoButtonConnect, getUserAddedServices, layerSelectConfig } from '@opengeoweb/layer-select';
-import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, Copy, None, FastForward, AutoUpdateActive, Both, Visibility, VisibilityOff, Delete, DragHandle as DragHandle$1, Cached, Add, MapAdd, WorldMapProjection, Layers, Equalizer, DimensionsElevation, Link, LinkOff, List as List$1, ExitDomain, Info, Search, Close, ChevronDown, ChevronUp, StepForward, StepBackward, Pause, Play, Options, ThemeWrapper, lightTheme } from '@opengeoweb/theme';
+import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, Copy, None, FastForward, AutoUpdateActive, Both, Visibility, VisibilityOff, Delete, DragHandle as DragHandle$1, Cached, Add, MapAdd, WorldMapProjection, Layers, Equalizer, DimensionsElevation, Link, LinkOff, List as List$1, ExitDomain, Info, Search, MyLocation, Close, ChevronDown, ChevronUp, StepForward, StepBackward, Pause, Play, Options, ThemeWrapper, lightTheme } from '@opengeoweb/theme';
 import { useDispatch, useSelector, connect, Provider } from 'react-redux';
 import { ReactSortable } from 'react-sortablejs';
 import { layerTypes, layerUtils, layerActions, layerSelectors, serviceSelectors, serviceActions, mapSelectors, mapActions, mapEnums, mapConstants, filterLayers, uiSelectors, uiTypes, useSetupDialog, uiActions, drawtoolSelectors, genericActions, syncConstants, defaultLayers, mapStoreActions, getSingularDrawtoolDrawLayerId, syncGroupsSelectors, syncGroupsSelector, coreModuleConfig, routerUtils, routerModuleConfig, appModuleConfig, appActions } from '@opengeoweb/store';
 import { WMGetServiceFromStore, getCapabilities, webmapUtils, LayerType, handleMomentISOString, WMLayer } from '@opengeoweb/webmap';
 import { jsx } from 'react/jsx-runtime';
 import _, { isEqual, range } from 'lodash';
-import { MapControlButton, ZoomControls, MapView, MapViewLayer, LegendDialog, SearchDialog, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
+import { MapControlButton, ZoomControls, MapView, MapViewLayer, LegendDialog, registerDrawFunction, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
 import { TIME_SLIDER_LEGEND_HEIGHT, TimeSliderConnect, TimeSliderClockConnect, speedFactors } from '@opengeoweb/timeslider';
 import axios from 'axios';
 import { useDebounce } from '@opengeoweb/api';
@@ -11365,19 +11365,31 @@ var filterServices = function filterServices(presetArray) {
   var services = hasValidServices ? validServices : undefined;
   return services;
 };
+var filterTimeSeriesServices = function filterTimeSeriesServices(presetArray) {
+  var hasServices = presetArray && Array.isArray(presetArray) && presetArray.length > 0;
+  var validServices = hasServices ? presetArray.filter(function (preset) {
+    return isValidService(preset);
+  }) : null;
+  var hasValidServices = validServices && validServices.length > 0;
+  var services = hasValidServices ? validServices : undefined;
+  return services;
+};
 var filterMapPresets = function filterMapPresets(initialAppPreset) {
   var preset = initialAppPreset && initialAppPreset.preset || {};
   var layers = preset.layers,
     services = preset.services,
-    baseServices = preset.baseServices;
+    baseServices = preset.baseServices,
+    timeSeriesServices = preset.timeSeriesServices;
   var _ref = layers ? filterLayers.filterLayers(layers, filterLayers.parseLayer) : filterLayers.createEmtpyFilteredList(undefined),
     baseLayers = _ref.baseLayers,
     mapLayers = _ref.mapLayers;
   var filterredServices = services ? filterServices(services) : undefined;
   var filteredBaseServices = baseServices ? filterServices(baseServices) : undefined;
+  var filteredTimeSeriesServices = timeSeriesServices ? filterTimeSeriesServices(timeSeriesServices) : undefined;
   var filteredPreset = {
     services: filterredServices,
     baseServices: filteredBaseServices,
+    timeSeriesServices: filteredTimeSeriesServices,
     baseLayers: baseLayers,
     mapLayers: mapLayers
   };
@@ -11388,6 +11400,32 @@ var preset = {
 	presetType: "mapPreset",
 	presetId: "mapPreset-1",
 	presetName: "Layer manager preset",
+	timeSeriesServices: [
+		{
+			name: "KNMI",
+			url: "https://gw-edr-dev-add-cfn-t3.pub.dev.knmi.cloud/edr",
+			id: "knmi",
+			description: "KNMI EDR",
+			type: "EDR",
+			scope: "system"
+		},
+		{
+			name: "FMI",
+			url: "https://opendata.fmi.fi/edr",
+			id: "fmi",
+			description: "FMI EDR",
+			type: "EDR",
+			scope: "system"
+		},
+		{
+			name: "MET Norway",
+			url: "https://interpol-b.met.no",
+			id: "METNorway",
+			description: "MET Norway EDR",
+			type: "EDR",
+			scope: "system"
+		}
+	],
 	services: [
 		{
 			name: "KNMIgeoservicesRadar",
@@ -15707,10 +15745,178 @@ var SearchControlButtonConnect = function SearchControlButtonConnect(_ref) {
   return /*#__PURE__*/React__default.createElement(MapControlButton, {
     onClick: openSearchDialog,
     title: "Search",
-    "aria-label": "Map search"
+    "aria-label": "Map search",
+    isActive: isOpenInStore
   }, /*#__PURE__*/React__default.createElement(Search, null));
 };
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * */
+var MY_LOCATION = 'MyLocation';
+var locationOptions = {
+  enableHighAccuracy: true,
+  timeout: 5000,
+  maximumAge: 0
+};
+var circleDrawFunction = function circleDrawFunction(args) {
+  var fillColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '#88F';
+  var radius = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 12;
+  var ctx = args.context,
+    coord = args.coord;
+  ctx.strokeStyle = '#000';
+  ctx.fillStyle = fillColor || '#88F';
+  ctx.lineWidth = 1;
+  ctx.beginPath();
+  ctx.arc(coord.x, coord.y, radius || 10, 0, 2 * Math.PI);
+  ctx.fill();
+  ctx.stroke();
+  ctx.fillStyle = '#000';
+  ctx.beginPath();
+  ctx.arc(coord.x, coord.y, 2, 0, 2 * Math.PI);
+  ctx.fill();
+};
+var MyMapLocation = function MyMapLocation(_ref) {
+  var mapId = _ref.mapId;
+  var dispatch = useDispatch();
+  var layers = useSelector(function (store) {
+    return layerSelectors.getLayers(store);
+  });
+  var layerLocation = layers.find(function (layer) {
+    var _a;
+    if (layer.geojson && layer.geojson.features[0] && layer.geojson.features[0].properties && ((_a = layer.geojson.features[0].properties) === null || _a === void 0 ? void 0 : _a.name)) {
+      if (layer.geojson.features[0].properties.name === MY_LOCATION) {
+        return layer;
+      }
+    }
+    return undefined;
+  });
+  var layerLocationId = (layerLocation === null || layerLocation === void 0 ? void 0 : layerLocation.id) || '';
+  var circleDrawFunctionId = useRef(registerDrawFunction(circleDrawFunction));
+  var handleLocationClick = function handleLocationClick() {
+    if (mapId && layerLocationId !== '') {
+      dispatch(layerActions.layerDelete({
+        mapId: mapId,
+        layerIndex: 0,
+        layerId: layerLocationId
+      }));
+    } else if (navigator.geolocation && mapId && layerLocationId === '' && circleDrawFunctionId) {
+      navigator.geolocation.getCurrentPosition(function (success) {
+        var _success$coords = success.coords,
+          latitude = _success$coords.latitude,
+          longitude = _success$coords.longitude;
+        var geojson = {
+          type: 'FeatureCollection',
+          features: [{
+            type: 'Feature',
+            properties: {
+              name: MY_LOCATION,
+              drawFunctionId: circleDrawFunctionId.current
+            },
+            geometry: {
+              type: 'Point',
+              coordinates: [longitude, latitude]
+            }
+          }]
+        };
+        var layerId = webmapUtils.generateLayerId();
+        dispatch(layerActions.addLayer({
+          mapId: mapId,
+          layer: {
+            geojson: geojson,
+            layerType: LayerType.featureLayer
+          },
+          layerId: layerId,
+          origin: MY_LOCATION
+        }));
+        var wmjsMap = webmapUtils.getWMJSMapById(mapId);
+        if (!wmjsMap) {
+          return;
+        }
+        wmjsMap.zoomToLayer(wmjsMap.getActiveLayer());
+      }, function (error) {
+        console.warn("Geolocation error: ".concat(error.message));
+      }, locationOptions);
+    }
+  };
+  return /*#__PURE__*/React__default.createElement(CustomIconButton, {
+    title: "Find my location",
+    "aria-label": MY_LOCATION,
+    onClick: handleLocationClick,
+    isSelected: layerLocationId !== '',
+    size: "large"
+  }, /*#__PURE__*/React__default.createElement(MyLocation, null));
+};
+
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * */
+var SearchDialog = function SearchDialog(_ref) {
+  var isOpen = _ref.isOpen,
+    onClose = _ref.onClose,
+    _ref$mapId = _ref.mapId,
+    mapId = _ref$mapId === void 0 ? '' : _ref$mapId;
+  return isOpen && mapId ? /*#__PURE__*/React__default.createElement(Box$1, {
+    sx: {
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'center',
+      position: 'absolute',
+      pointerEvents: 'all',
+      zIndex: 999,
+      left: 50,
+      top: 15,
+      borderBottom: '1px solid grey',
+      backgroundColor: function backgroundColor(theme) {
+        return theme.palette.background.paper;
+      }
+    }
+  }, /*#__PURE__*/React__default.createElement(MyMapLocation, {
+    mapId: mapId
+  }), /*#__PURE__*/React__default.createElement(TextField, {
+    id: "dummy-search-field",
+    label: "Search",
+    variant: "filled",
+    InputProps: {
+      disableUnderline: true,
+      endAdornment: /*#__PURE__*/React__default.createElement(InputAdornment, {
+        position: "end"
+      }, /*#__PURE__*/React__default.createElement(CustomIconButton, {
+        tooltipTitle: "Close",
+        edge: "end",
+        onClick: onClose,
+        size: "large"
+      }, /*#__PURE__*/React__default.createElement(Close, null)))
+    }
+  })) : null;
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15735,7 +15941,8 @@ var SearchControlConnect = function SearchControlConnect(_ref) {
     onCloseDialog = _useSetupDialog.onCloseDialog;
   return /*#__PURE__*/React__default.createElement(SearchDialog, {
     isOpen: isDialogOpen,
-    onClose: onCloseDialog
+    onClose: onCloseDialog,
+    mapId: mapId
   });
 };
 
@@ -16727,13 +16934,22 @@ var reformatFinnishDateString = function reformatFinnishDateString(dateString) {
 };
 /**
  * Marks UTC time with Z after hh:mm or hh.mm or appends UTC to the end of the date string
+ * If two matches of time are found, the second one is marked
  */
 var shortUTCTime = function shortUTCTime(dateString) {
-  var result = dateString.replace(/(\d[:.]\d{2})/, '$1Z');
-  if (result === dateString) {
+  var timeRegex = /(\d[:.]\d{2})/g;
+  var match = dateString.match(timeRegex);
+  if (!match) {
     return "".concat(dateString, " UTC");
   }
-  return result;
+  var _match = _slicedToArray(match, 2),
+    first = _match[0],
+    second = _match[1];
+  if (second) {
+    var secondIndex = dateString.lastIndexOf(second);
+    return "".concat(dateString.substring(0, secondIndex)).concat(second, "Z").concat(dateString.substring(secondIndex + second.length));
+  }
+  return dateString.replace(first, "".concat(first, "Z"));
 };
 var getMonthChanges = function getMonthChanges(startDate, endDate) {
   var result = [];
@@ -19519,4 +19735,4 @@ var AppWrapperConnect = withEggs([appModuleConfig])(function (_ref) {
   return children;
 });
 
-export { AppWrapperConnect, ConfigurableMapConnect, CoreThemeProvider, CoreThemeStoreProvider, HarmonieTempAndPrecipPreset, LayerManager, BaseLayerRow as LayerManagerBaseLayerRow, LayerManagerConnect, DescriptionRow as LayerManagerDescriptionRow, HeaderOptions as LayerManagerHeaderOptions, LayerContainerRow as LayerManagerLayerContainerRow, LayerManagerMapButtonConnect, LegendConnect, LegendMapButtonConnect, MapViewConnect, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, RouterWrapperConnect, SyncGroupViewerConnect, TimeSliderLite, TimeSliderLiteConnect, TimeSliderLiteOptionsMenu, timeSliderLiteUtils as TimeSliderLiteUtils, ZoomControlConnect, componentsLookUp, defaultBbox, defaultConfigurations, filterMapPresets, filterServices, testLayers, useFetchServices };
+export { AppWrapperConnect, ConfigurableMapConnect, CoreThemeProvider, CoreThemeStoreProvider, HarmonieTempAndPrecipPreset, LayerManager, BaseLayerRow as LayerManagerBaseLayerRow, LayerManagerConnect, DescriptionRow as LayerManagerDescriptionRow, HeaderOptions as LayerManagerHeaderOptions, LayerContainerRow as LayerManagerLayerContainerRow, LayerManagerMapButtonConnect, LegendConnect, LegendMapButtonConnect, MapViewConnect, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, MyMapLocation, RouterWrapperConnect, SearchControlButtonConnect, SearchControlConnect, SearchDialog, SyncGroupViewerConnect, TimeSliderLite, TimeSliderLiteConnect, TimeSliderLiteOptionsMenu, timeSliderLiteUtils as TimeSliderLiteUtils, ZoomControlConnect, componentsLookUp, defaultBbox, defaultConfigurations, filterMapPresets, filterServices, filterTimeSeriesServices, testLayers, useFetchServices };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "9.0.0",
+  "version": "9.1.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/MapDrawToolRedux/MapDrawToolReduxMultipleDrawTools.stories.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const MultipleDrawToolsDemo: () => React.ReactElement;

package/src/lib/components/Search/MyMapLocation.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export interface MyMapLocationProps {
+    mapId: string | undefined;
+}
+export declare const MY_LOCATION = "MyLocation";
+export declare const MyMapLocation: React.FC<MyMapLocationProps>;

package/src/lib/components/Search/MyMapLocation.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/src/lib/components/Search/SearchDialog.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+export interface SearchDialogProps {
+    isOpen: boolean;
+    onClose: () => void;
+    mapId?: string;
+}
+export declare const SearchDialog: React.FC<SearchDialogProps>;

package/src/lib/components/Search/index.d.ts

@@ -1,2 +1,4 @@
 export { SearchControlButtonConnect } from './SearchControlButtonConnect';
 export { SearchControlConnect } from './SearchControlConnect';
+export { SearchDialog } from './SearchDialog';
+export { MyMapLocation } from './MyMapLocation';

package/src/lib/components/TimeSliderLite/timeSliderLiteUtils.d.ts

@@ -21,6 +21,7 @@ export declare const SEVEN_DAYS_IN_SECONDS: number;
 export declare const reformatFinnishDateString: (dateString: string) => string;
 /**
  * Marks UTC time with Z after hh:mm or hh.mm or appends UTC to the end of the date string
+ * If two matches of time are found, the second one is marked
  */
 export declare const shortUTCTime: (dateString: string) => string;
 export declare const getMonthChanges: (startDate: Date, endDate: Date) => number[];

package/src/lib/index.d.ts

@@ -16,4 +16,5 @@ export * from './utils/jsonPresetFilter';
 export * as defaultConfigurations from './utils/defaultConfigurations';
 export * from './components/Providers/Providers';
 export * from './components/RouterWrapper';
+export * from './components/Search';
 export * from './components/AppWrapper';

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

@@ -1,14 +1,17 @@
 import { layerSelectTypes } from '@opengeoweb/layer-select';
+import { TimeSeriesService } from '@opengeoweb/shared';
 import { filterLayers, layerTypes } from '@opengeoweb/store';
 interface FilteredMapPresets extends filterLayers.FilteredLayerList {
     services?: layerSelectTypes.LayerSelectService[];
     baseServices?: layerSelectTypes.LayerSelectService[];
+    timeSeriesServices?: TimeSeriesService[];
 }
 export interface InitialAppPresetProps {
     presetType?: string;
     presetId?: string;
     presetName?: string;
     services?: layerSelectTypes.LayerSelectService[];
+    timeSeriesServices?: TimeSeriesService[];
     baseServices?: layerSelectTypes.LayerSelectService[];
     layers?: layerTypes.Layer[];
     baseLayers?: layerTypes.Layer[];
@@ -17,5 +20,6 @@ export interface InitialAppPreset {
     preset: InitialAppPresetProps;
 }
 export declare const filterServices: (presetArray: layerSelectTypes.LayerSelectService[]) => layerSelectTypes.LayerSelectService[];
+export declare const filterTimeSeriesServices: (presetArray: TimeSeriesService[]) => TimeSeriesService[];
 export declare const filterMapPresets: (initialAppPreset: InitialAppPreset) => FilteredMapPresets;
 export {};