@opengeoweb/warnings 11.1.0 → 12.0.0

package/index.esm.js

@@ -2,14 +2,14 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useDispatch, useSelector } from 'react-redux';
 import { Polygons, Share, ExitDomain, Edit, Delete, DrawPolygon, Visibility, Add, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, breakpoints, Options, Close, ChevronDown, ChevronUp, Copy, Update, Success, Expire, Remove, ArrowUpCompact, ArrowDownCompact } from '@opengeoweb/theme';
 import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawingToolSelectors, layerSelectors, uiSelectors, drawingToolActions, layerActions, useSetupDialog, selectorMemoizationOptions, useUpdateSharedData, layersListener, drawingToolListener, layerReducer, uiReducer, drawingToolReducer } from '@opengeoweb/store';
-import { defaultPolygon, emptyGeoJSON, MapControlButton, getIcon, rewindGeometry, getGeoJSONPropertyValue, currentlySupportedDrawModes, defaultLayers, MapView, MapViewLayer, getFeatureExtent } from '@opengeoweb/webmap-react';
+import { defaultPolygon, emptyGeoJSON, MapControlButton, getIcon, rewindGeometry, getGeoJSONPropertyValue, currentlySupportedDrawModes, defaultLayers, viewUtils, OpenLayersMapView, MapControls, OpenLayersZoomControl, OpenLayersLayer, OpenLayersFeatureLayer, genericOpenLayersFeatureStyle } from '@opengeoweb/webmap-react';
 import { SHARED_NAMESPACE, useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, CustomToggleButton, Filter, FilterChip, FilterOption, StatusTag, LastUpdateTime, ErrorBoundary, isAxiosError } from '@opengeoweb/shared';
 import { createEntityAdapter, createSlice, createSelector, current, createListenerMiddleware, combineReducers, configureStore } from '@reduxjs/toolkit';
 import 'i18next';
 import { useTranslation } from 'react-i18next';
 import '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormSelect, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, useDraftFormHelpers, errorMessages, ReactHookFormDateTime, isXHoursBefore, isXHoursAfter, isEmpty } from '@opengeoweb/form-fields';
-import { LayerType, generateMapId, getWMJSMapById, getGeoCoordFromLatLong, WMBBOX } from '@opengeoweb/webmap';
+import { LayerType, generateMapId } from '@opengeoweb/webmap';
 import { airmetConfig, sigmetConfig, SigmetForm, isInstanceOfCancelSigmet, AirmetForm, isInstanceOfCancelAirmet, getDefaultValidUntilValue, getProductFormMode, ProductAction } from '@opengeoweb/sigmet-airmet';
 import { snackbarActions, snackbarTypes, snackbarListener, snackbarReducer } from '@opengeoweb/snackbar';
 import * as React from 'react';
@@ -9286,34 +9286,8 @@ var ValidUntil = function ValidUntil(_ref) {
   });
 };
 
-var zoomToFeature = function zoomToFeature(mapId, geojsonFeature) {
-  var webmapjs = getWMJSMapById(mapId);
-  if (!webmapjs || !geojsonFeature) {
-    return;
-  }
-  var bboxGeoJSON = getFeatureExtent(geojsonFeature);
-  var projectedCoordinateBoxBottomLeft = getGeoCoordFromLatLong(webmapjs, {
-    x: bboxGeoJSON.left,
-    y: bboxGeoJSON.bottom
-  });
-  var projectedCoordinateBoxTopRight = getGeoCoordFromLatLong(webmapjs, {
-    x: bboxGeoJSON.right,
-    y: bboxGeoJSON.top
-  });
-  if (projectedCoordinateBoxBottomLeft && projectedCoordinateBoxTopRight) {
-    var transformedExtent = new WMBBOX({
-      left: projectedCoordinateBoxBottomLeft.x,
-      bottom: projectedCoordinateBoxBottomLeft.y,
-      right: projectedCoordinateBoxTopRight.x,
-      top: projectedCoordinateBoxTopRight.y
-    });
-    webmapjs.zoomTo(transformedExtent);
-    webmapjs.zoomOut(2);
-    webmapjs.draw();
-  }
-};
 var WarningsMapView = function WarningsMapView(_ref) {
-  var _defaultMapPreset$lay, _defaultMapPreset$lay2;
+  var _defaultMapPreset$lay, _defaultMapPreset$lay2, _viewRef$current;
   var geojsonFeature = _ref.geojsonFeature,
     defaultMapPreset = _ref.defaultMapPreset,
     _ref$isSnapshot = _ref.isSnapshot,
@@ -9331,35 +9305,35 @@ var WarningsMapView = function WarningsMapView(_ref) {
     geojson: geojsonFeature,
     layerType: LayerType.featureLayer
   };
-  if (!defaultBbox) {
-    // Zoom to the geojson when the geojsonFeature is updated in an already mounted map component
-    zoomToFeature(mapId, geojsonFeature);
-  }
+  var viewRef = useRef(viewUtils.makeView());
+  React.useEffect(function () {
+    if (viewRef.current.getProjection().getCode() !== (defaultBbox == null ? void 0 : defaultBbox.srs)) {
+      viewRef.current = viewUtils.makeView(defaultBbox == null ? void 0 : defaultBbox.srs);
+    }
+    defaultBbox && defaultBbox.bbox ? viewUtils.setViewFromExtent(viewRef.current, defaultBbox == null ? void 0 : defaultBbox.bbox) : viewUtils.setViewFromFeature(viewRef.current, geojsonFeature);
+  }, [defaultBbox, geojsonFeature]);
   return jsx("div", {
     style: {
       height: '200px',
       width: '100%'
     },
-    children: jsxs(MapView, {
-      bbox: defaultBbox == null ? void 0 : defaultBbox.bbox,
-      srs: defaultBbox == null ? void 0 : defaultBbox.srs,
-      mapId: mapId,
-      showScaleBar: false,
-      onWMJSMount: function onWMJSMount(mapId) {
-        var webmapjs = getWMJSMapById(mapId);
-        if (!webmapjs) {
-          return;
-        }
-        webmapjs.hideMouseCursorProperties();
-        if (!defaultBbox) {
-          // Zoom to the geojson when the map is ready
-          zoomToFeature(mapId, geojsonFeature);
-        }
-      },
+    children: jsxs(OpenLayersMapView, {
+      view: viewRef.current,
       holdShiftToScroll: true,
-      children: [!isSnapshot && jsx(MapViewLayer, Object.assign({}, defaultBaseLayer, {
+      children: [jsx(MapControls, {
+        style: {
+          top: 0
+        },
+        children: jsx(OpenLayersZoomControl, {
+          homeExtent: (_viewRef$current = viewRef.current) == null ? void 0 : _viewRef$current.calculateExtent()
+        })
+      }), !isSnapshot && jsx(OpenLayersLayer, Object.assign({}, defaultBaseLayer, {
         id: mapId + "_baseLayer"
-      })), warningLayer.geojson && jsx(MapViewLayer, Object.assign({}, warningLayer)), !isSnapshot && jsx(MapViewLayer, Object.assign({}, defaultOverLayer, {
+      })), warningLayer.geojson && jsx(OpenLayersFeatureLayer, {
+        featureCollection: warningLayer.geojson,
+        style: genericOpenLayersFeatureStyle,
+        zIndex: 1000
+      }), !isSnapshot && jsx(OpenLayersLayer, Object.assign({}, defaultOverLayer, {
         id: mapId + "_overlayer"
       }))]
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "11.1.0",
+  "version": "12.0.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,34 +8,45 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "*",
-    "@opengeoweb/shared": "*",
-    "@opengeoweb/store": "*",
-    "@opengeoweb/webmap-react": "*",
-    "@tanstack/react-query": "^5.52.1",
-    "react-redux": "^8.1.3",
-    "@opengeoweb/theme": "*",
-    "@opengeoweb/form-fields": "*",
-    "react-hook-form": "^7.50.1",
-    "lodash": "^4.17.21",
+    "@emotion/react": "11.14.0",
+    "@emotion/styled": "11.14.0",
+    "@mui/material": "^6.1.1",
+    "@mui/system": "6.4.6",
+    "@mui/x-date-pickers": "7.27.1",
     "@reduxjs/toolkit": "^1.9.7",
-    "@opengeoweb/snackbar": "*",
-    "react-window": "^1.8.10",
-    "react-virtualized-auto-sizer": "^1.0.20",
+    "@sentry/react": "8.54.0",
+    "@storybook/core-events": "8.4.2",
+    "@storybook/preview-api": "8.4.2",
+    "@storybook/react": "8.4.2",
+    "@tanstack/query-core": "5.67.1",
+    "@tanstack/react-query": "^5.52.1",
+    "@testing-library/react": "16.0.1",
+    "@testing-library/user-event": "14.5.2",
+    "@turf/turf": "7.2.0",
     "axios": "^1.7.7",
-    "@opengeoweb/core": "*",
-    "@opengeoweb/webmap": "*",
-    "@opengeoweb/authentication": "*",
-    "@opengeoweb/sigmet-airmet": "*",
-    "react-i18next": "^15.1.1",
+    "date-fns": "4.1.0",
+    "dompurify": "3.2.4",
     "i18next": "^23.11.5",
-    "@mui/material": "^6.1.1",
-    "msw": "^2.7.3"
-  },
-  "peerDependencies": {
-    "react": "18",
-    "@emotion/react": "*",
-    "@emotion/styled": "*"
+    "immer": "10.1.1",
+    "jest-canvas-mock": "2.5.2",
+    "jest-date-mock": "1.0.10",
+    "lodash": "^4.17.21",
+    "msw": "^2.7.3",
+    "msw-storybook-addon": "2.0.4",
+    "ol": "^10.4.0",
+    "proj4": "2.15.0",
+    "re-resizable": "6.11.2",
+    "react": "18.3.1",
+    "react-draggable": "4.4.6",
+    "react-hook-form": "^7.50.1",
+    "react-i18next": "^15.1.1",
+    "react-redux": "^8.1.3",
+    "react-resize-detector": "9.1.1",
+    "react-router-dom": "6.23.1",
+    "react-sortablejs": "6.1.4",
+    "react-virtualized-auto-sizer": "^1.0.20",
+    "react-window": "^1.8.10",
+    "sortablejs": "1.15.2"
   },
   "module": "./index.esm.js",
   "type": "module",

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

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { FeatureCollection } from 'geojson';
 import { MapPreset } from '@opengeoweb/store';
-export declare const zoomToFeature: (mapId: string, geojsonFeature: FeatureCollection | undefined) => void;
 interface WarningsMapViewProps {
     geojsonFeature: FeatureCollection | undefined;
     defaultMapPreset?: MapPreset;