@opengeoweb/core 12.7.0 → 12.8.0

package/index.esm.js

@@ -7,7 +7,7 @@ import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWin
 import i18n from 'i18next';
 import { useTranslation, I18nextProvider } from 'react-i18next';
 import { TIMESLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, SpeedButton, TimeStepButton, AnimationLengthButton, AnimationLength, TimeSpanButton, secondsPerPxFromCanvasWidth, getNewCenterOfFixedPointZoom, OptionsMenuButton, PlayButton, defaultTimeStep, BackwardForwardStepButton, AutoUpdateButton, NowButton, handleSetNowEvent, TimeSliderButtons, TimeSliderCurrentTimeBox, TimeSliderLegend, onsetNewDateDebounced, defaultSecondsPerPx, moveSelectedTimePx, TimeSlider, getFilteredTime, ControlButtons, OptionsMenu, TimeSliderClock } from '@opengeoweb/timeslider';
-import { webmapReactTranslations, WEBMAP_REACT_NAMESPACE, webmapTranslations, WEBMAP_NAMESPACE, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, LegendDialog, LegendButton, MapContext, emptyGeoJSON, registerDrawFunction, MapFeatureClass, setMapCenter, OpenLayersFeatureLayer, OpenLayersMapDraw, getIsInsideAcceptanceTime, OpenLayersLayer, useSetIntervalWhenVisible, openLayersGetMapImageStore, TimeContext, OpenLayersMapView, WMSLayer, genericOpenLayersFeatureStyle, OpenLayersGetFeatureInfo, MapControls, OpenLayersZoomControl, getLayerUpdateInfo, publicLayers } from '@opengeoweb/webmap-react';
+import { webmapReactTranslations, WEBMAP_REACT_NAMESPACE, webmapTranslations, WEBMAP_NAMESPACE, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, LegendDialog, LegendButton, MapContext, emptyGeoJSON, MapFeatureClass, setMapCenter, OpenLayersFeatureLayer, OpenLayersMapDraw, getIsInsideAcceptanceTime, OpenLayersLayer, useSetIntervalWhenVisible, openLayersGetMapImageStore, TimeContext, OpenLayersMapView, WMSLayer, genericOpenLayersFeatureStyle, OpenLayersGetFeatureInfo, MapControls, OpenLayersZoomControl, getLayerUpdateInfo, publicLayers } from '@opengeoweb/webmap-react';
 import { useDispatch, useSelector, connect, useStore, Provider } from 'react-redux';
 import { ReactSortable } from 'react-sortablejs';
 import Sortable from 'sortablejs';
@@ -2480,7 +2480,7 @@ var LayerRow = styled(LayerRowUnstyled)(function (_ref9) {
       backgroundColor: isEnabled ? theme.palette.geowebColors.layerManager.tableRowDefaultCardContainer.fill : theme.palette.geowebColors.layerManager.tableRowDisabledCardContainer.fill,
       border: '1px solid',
       borderColor: isEnabled ? theme.palette.geowebColors.layerManager.tableRowDefaultCardContainer.borderColor : theme.palette.geowebColors.layerManager.tableRowDisabledCardContainer.borderColor,
-      borderRadius: 1 * theme.shape.borderRadius,
+      borderRadius: theme.shape.borderRadius,
       marginBottom: theme.spacing(0.25),
       minHeight: '32px'
     }
@@ -3016,7 +3016,8 @@ var ActivateLayerConnect = function ActivateLayerConnect(_ref) {
     } else if (thisLayerHasAutoTimestep) {
       dispatch(mapActions.setAutoTimestepLayerId({
         mapId: mapId,
-        autoTimestepLayerId: undefined
+        autoTimestepLayerId: undefined,
+        origin: mapEnums.MapActionOrigin.map
       }));
       if (isTimestepAuto) {
         dispatch(mapActions.toggleTimestepAuto({
@@ -3039,7 +3040,8 @@ var ActivateLayerConnect = function ActivateLayerConnect(_ref) {
     } else if (thisLayerHasAutoUpdate) {
       dispatch(mapActions.setAutoUpdateLayerId({
         mapId: mapId,
-        autoUpdateLayerId: undefined
+        autoUpdateLayerId: undefined,
+        origin: mapEnums.MapActionOrigin.map
       }));
     }
   }
@@ -3055,7 +3057,8 @@ var ActivateLayerConnect = function ActivateLayerConnect(_ref) {
   function handleAutoUpdateClick() {
     dispatch(mapActions.setAutoUpdateLayerId({
       mapId: mapId,
-      autoUpdateLayerId: layerId
+      autoUpdateLayerId: layerId,
+      origin: mapEnums.MapActionOrigin.map
     }));
     if (thisLayerHasAutoTimestep) {
       dispatch(mapActions.setAutoTimestepLayerId({
@@ -3086,7 +3089,8 @@ var ActivateLayerConnect = function ActivateLayerConnect(_ref) {
   function handleAutoTimestepClick() {
     dispatch(mapActions.setAutoTimestepLayerId({
       mapId: mapId,
-      autoTimestepLayerId: layerId
+      autoTimestepLayerId: layerId,
+      origin: mapEnums.MapActionOrigin.map
     }));
     if (thisLayerHasAutoUpdate) {
       dispatch(mapActions.setAutoUpdateLayerId({
@@ -7123,43 +7127,6 @@ var LocationSearch = function LocationSearch(_ref) {
  * Copyright 2025 - Finnish Meteorological Institute (FMI)
  * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var myLocationDrawFunction = function myLocationDrawFunction(args) {
-  var ctx = args.context,
-    coord = args.coord;
-  // Draw outer circle
-  ctx.strokeStyle = '#fff';
-  ctx.fillStyle = '#fff';
-  ctx.shadowColor = '#00000080';
-  ctx.shadowBlur = 4;
-  ctx.beginPath();
-  ctx.arc(coord.x, coord.y, 14, 0, 2 * Math.PI);
-  ctx.fill();
-  ctx.shadowBlur = 0;
-  // Draw inner circle
-  ctx.fillStyle = '#186dff';
-  ctx.beginPath();
-  ctx.arc(coord.x, coord.y, 10, 0, 2 * Math.PI);
-  ctx.fill();
-};
-var selectedLocationDrawFunction = function selectedLocationDrawFunction(args) {
-  var ctx = args.context,
-    coord = args.coord;
-  ctx.strokeStyle = '#051039';
-  ctx.fillStyle = '#051039';
-  ctx.beginPath();
-  var topRadius = 7;
-  var topHeight = 2 * topRadius;
-  ctx.arc(coord.x, coord.y - topHeight, topRadius, Math.PI, Math.PI * 2);
-  ctx.bezierCurveTo(coord.x + topRadius, coord.y - topHeight, coord.x + topRadius / 1.6, coord.y - topRadius, coord.x, coord.y);
-  ctx.bezierCurveTo(coord.x, coord.y, coord.x - topRadius / 1.6, coord.y - topRadius, coord.x - topRadius, coord.y - topHeight);
-  ctx.stroke();
-  ctx.fill();
-  /* Fill center circle */
-  ctx.fillStyle = '#FFF';
-  ctx.beginPath();
-  ctx.arc(coord.x, coord.y - topHeight, topRadius / 2.5, Math.PI * 2, 0);
-  ctx.fill();
-};
 var geometryStyling = {
   fill: '#FF7800',
   'fill-opacity': 0.25,
@@ -7167,7 +7134,7 @@ var geometryStyling = {
   'stroke-opacity': 1,
   'stroke-width': 4
 };
-var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass, t) {
+var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(location, mapFeatureClass, t) {
   var _location$geometry;
   var collection = {
     type: 'FeatureCollection',
@@ -7177,7 +7144,6 @@ var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(loc
   var geometry = Object.assign({}, location.geometry, {
     properties: Object.assign({}, geometryStyling, {
       name: name,
-      hoverDrawFunctionId: hoverDrawFunctionId,
       mapFeatureClass: mapFeatureClass,
       showNameOnHover: true
     })
@@ -7186,8 +7152,6 @@ var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(loc
     type: 'Feature',
     properties: {
       name: name,
-      drawFunctionId: drawFunctionId,
-      hoverDrawFunctionId: hoverDrawFunctionId,
       mapFeatureClass: mapFeatureClass,
       showNameOnHover: true
     },
@@ -7206,53 +7170,7 @@ var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(loc
   }
   return collection;
 };
-var fitText = function fitText(ctx, text, x, y, lineheight) {
-  var lines = text.split('\n');
-  for (var i = 0; i < lines.length; i += 1) {
-    ctx.fillText(lines[i], x, y + i * lineheight);
-  }
-};
-var roundRect = function roundRect(ctx, w, h, x, y, radius) {
-  if (radius === void 0) {
-    radius = 2;
-  }
-  var r = x + w;
-  var b = y + h;
-  ctx.beginPath();
-  ctx.moveTo(x + radius, y);
-  ctx.lineTo(r - radius, y);
-  ctx.quadraticCurveTo(r, y, r, y + radius);
-  ctx.lineTo(r, y + h - radius);
-  ctx.quadraticCurveTo(r, b, r - radius, b);
-  ctx.lineTo(x + radius, b);
-  ctx.quadraticCurveTo(x, b, x, b - radius);
-  ctx.lineTo(x, y + radius);
-  ctx.quadraticCurveTo(x, y, x + radius, y);
-  ctx.stroke();
-  ctx.fill();
-};
-var hoverDrawFunction = function hoverDrawFunction(args) {
-  var ctx = args.context,
-    coord = args.coord,
-    feature = args.feature;
-  var fontSize = 16;
-  var padding = 20;
-  // eslint-disable-next-line no-param-reassign
-  ctx.font = fontSize + "px Roboto";
-  var x = coord.x,
-    y = coord.y;
-  ctx.strokeStyle = '#000';
-  ctx.fillStyle = '#000';
-  roundRect(ctx, ctx.measureText(feature.properties.name).width + padding, fontSize + padding, x - padding * 0.5 - ctx.measureText(feature.properties.name).width * 0.5, y + padding);
-  // eslint-disable-next-line no-param-reassign
-  ctx.fillStyle = '#FFF';
-  // eslint-disable-next-line no-param-reassign
-  ctx.textAlign = 'left';
-  if (feature && feature.properties) {
-    fitText(ctx, feature.properties.name, x - ctx.measureText(feature.properties.name).width * 0.5, y + padding * 2, fontSize);
-  }
-};
-var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
+var useDrawOnMap = function useDrawOnMap(mapId) {
   var dispatch = useDispatch();
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
@@ -7283,16 +7201,14 @@ var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
       }));
     }
   }, [dispatch, layerId, mapId, shouldAddLayer]);
-  var drawFunctionId = React__default.useRef(registerDrawFunction(drawFunction)).current;
-  var hoverDrawFunctionId = React__default.useRef(registerDrawFunction(hoverDrawFunction)).current;
   var updateGeoJSON = React__default.useCallback(function (location) {
     var mapFeatureClass = (location == null ? void 0 : location.source) === 'MyMapLocation' ? MapFeatureClass.MyLocation : MapFeatureClass.GenericMarker;
-    var geojson = location ? makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass, t) : emptyGeoJSON;
+    var geojson = location ? makeGeoJSONFeatureFromLocation(location, mapFeatureClass, t) : emptyGeoJSON;
     dispatch(layerActions.updateFeature({
       layerId: layerId,
       geojson: geojson
     }));
-  }, [dispatch, drawFunctionId, hoverDrawFunctionId, layerId, t]);
+  }, [dispatch, layerId, t]);
   var zoomToFeature = React__default.useCallback(function (location) {
     if (map) {
       setMapCenter(map, location.lon, location.lat);
@@ -7313,9 +7229,9 @@ var LocationSearchConnect = function LocationSearchConnect(_ref) {
   var dialogType = uiTypes.DialogTypes.Search + "-" + mapId;
   var _useSetupDialog = useSetupDialog(dialogType),
     isDialogOpen = _useSetupDialog.isDialogOpen;
-  var _useDrawOnMap = useDrawOnMap(mapId, selectedLocationDrawFunction),
+  var _useDrawOnMap = useDrawOnMap(mapId),
     updateMapPin = _useDrawOnMap[0];
-  var _useDrawOnMap2 = useDrawOnMap(mapId, myLocationDrawFunction),
+  var _useDrawOnMap2 = useDrawOnMap(mapId),
     updateMyLocation = _useDrawOnMap2[0];
   var mapLayers = useSelector(function (store) {
     return layerSelectors.getLayersByMapId(store, mapId);
@@ -7699,7 +7615,9 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
   }, [warningDialogFeatures]);
   var linkedFeaturesFromState = useSelector(function (store) {
     var _store$syncGroups;
-    return genericSelectors.selectLinkedFeatures((_store$syncGroups = store.syncGroups) == null ? void 0 : _store$syncGroups.linkedState, mapId);
+    return genericSelectors.selectLinkedFeatures((_store$syncGroups = store.syncGroups) == null ? void 0 : _store$syncGroups.linkedState, {
+      mapId: mapId
+    });
   });
   var filteredLinkedFeaturesFromState = React.useMemo(function () {
     return linkedFeaturesFromState.filter(function (feature) {
@@ -7708,7 +7626,9 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
   }, [linkedFeaturesFromState, warningDialogOriginalIds]);
   var linkedFormFeaturesFromState = useSelector(function (store) {
     var _store$syncGroups2;
-    return genericSelectors.selectLinkedFormFeatures((_store$syncGroups2 = store.syncGroups) == null ? void 0 : _store$syncGroups2.linkedState, mapId);
+    return genericSelectors.selectLinkedFormFeatures((_store$syncGroups2 = store.syncGroups) == null ? void 0 : _store$syncGroups2.linkedState, {
+      mapId: mapId
+    });
   });
   var linkedFeatures = React.useMemo(function () {
     return {
@@ -7809,9 +7729,10 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
         selectedFeatureId: selectedFeatureId
       }
     }));
-    selectedMapIds.forEach(function (mapId) {
+    var linkedMapIds = selectedMapIds.length > 0 ? selectedMapIds : [mapId];
+    linkedMapIds.forEach(function (id) {
       dispatch(mapActions.setMapPinLocation({
-        mapId: mapId,
+        mapId: id,
         mapPinLocation: mapPinLocation
       }));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "12.7.0",
+  "version": "12.8.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,22 +8,22 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "12.7.0",
+    "@opengeoweb/shared": "12.8.0",
     "react-redux": "^9.2.0",
-    "@opengeoweb/store": "12.7.0",
-    "@opengeoweb/timeslider": "12.7.0",
+    "@opengeoweb/store": "12.8.0",
+    "@opengeoweb/timeslider": "12.8.0",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/webmap-react": "12.7.0",
-    "@opengeoweb/webmap": "12.7.0",
-    "@opengeoweb/theme": "12.7.0",
+    "@opengeoweb/webmap-react": "12.8.0",
+    "@opengeoweb/webmap": "12.8.0",
+    "@opengeoweb/theme": "12.8.0",
     "axios": "^1.7.7",
-    "@opengeoweb/layer-select": "12.7.0",
+    "@opengeoweb/layer-select": "12.8.0",
     "lodash": "^4.17.21",
     "ol": "^10.4.0",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.1",
     "@mui/system": "^7.0.1",
-    "@opengeoweb/snackbar": "12.7.0",
+    "@opengeoweb/snackbar": "12.8.0",
     "react-router-dom": "^6.21.0",
     "react-draggable": "^4.4.6",
     "i18next": "^25.0.1",
@@ -32,7 +32,8 @@
     "@mui/material": "^7.0.1",
     "@sentry/react": "^8.34.0",
     "@tanstack/react-query": "^5.69.2",
-    "@opengeoweb/api": "12.7.0"
+    "@opengeoweb/api": "12.8.0",
+    "@types/geojson": "^7946.0.14"
   },
   "peerDependencies": {
     "react": "18",
@@ -42,5 +43,5 @@
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js",
-  "types": "./index.esm.d.ts"
+  "types": "./index.d.ts"
 }

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

@@ -1,8 +1,4 @@
-import { MapDrawDrawFunctionArgs } from '@opengeoweb/webmap-react';
 import { GeoJsonProperties } from 'geojson';
 import { LocationDetail } from './types';
-export declare const myLocationDrawFunction: (args: MapDrawDrawFunctionArgs) => void;
-export declare const selectedLocationDrawFunction: (args: MapDrawDrawFunctionArgs) => void;
 export declare const geometryStyling: GeoJsonProperties;
-export declare const hoverDrawFunction: (args: MapDrawDrawFunctionArgs) => void;
-export declare const useDrawOnMap: (mapId: string, drawFunction: (args: MapDrawDrawFunctionArgs) => void) => [(location?: LocationDetail) => void];
+export declare const useDrawOnMap: (mapId: string) => [(location?: LocationDetail) => void];

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

@@ -6,7 +6,7 @@ export declare const mapPresetRadar: {
         enabled: boolean;
         style: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
     }[];
     proj: {
         bbox: {
@@ -23,7 +23,7 @@ export declare const mapPresetObsTA: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
     }[];
     proj: {
         bbox: {
@@ -40,7 +40,7 @@ export declare const mapPresetObsWind: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
     }[];
     proj: {
         bbox: {
@@ -57,7 +57,7 @@ export declare const mapPresetObsPP: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
     }[];
     proj: {
         bbox: {
@@ -74,7 +74,7 @@ export declare const mapPresetObsRH: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
     }[];
     proj: {
         bbox: {
@@ -91,7 +91,7 @@ export declare const mapPresetObsQG: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
     }[];
     proj: {
         bbox: {
@@ -109,7 +109,7 @@ export declare const mapPresetEumetsat: {
         name: string;
         enabled: boolean;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
     }[];
     proj: {
         bbox: {
@@ -126,7 +126,7 @@ export declare const mapPresetHarmoniePrecipitationFlux: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
         enabled: boolean;
     }[];
     proj: {
@@ -144,7 +144,7 @@ export declare const mapPresetHarmonieTemperature2m: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
         enabled: boolean;
     }[];
     proj: {
@@ -162,7 +162,7 @@ export declare const mapPresetHarmoniePressureMSL: {
         service: string;
         name: string;
         id: string;
-        layerType: import("dist/libs/webmap/src").LayerType;
+        layerType: import("@opengeoweb/webmap").LayerType;
         enabled: boolean;
     }[];
     proj: {