@opengeoweb/sigmet-airmet 11.1.0 → 12.0.0

package/index.esm.js

@@ -5,11 +5,11 @@ import { FormControlLabel, Radio, Grid2, Typography, Box, Button, Checkbox, Menu
 import { useFormContext } from 'react-hook-form';
 import { FORM_FIELDS_NAMESPACE, formFieldsTranslations, useDraftFormHelpers, ReactHookFormRadioGroup, hasValidGeometry, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, countIntersectionPoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, isValidGeoJsonCoordinates, hasIntersectionWithFIR, isXHoursBefore, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import { useApiContext, useApi, createApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
-import { defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, addSelectionTypeToGeoJSON, defaultPoint, addGeoJSONProperties, defaultBox, defaultPolygon, DRAWMODE, defaultDelete, getIcon, MapViewLayer, useMapDrawTool, addFeatureProperties, rewindGeometry } from '@opengeoweb/webmap-react';
+import { defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, addSelectionTypeToGeoJSON, defaultPoint, addGeoJSONProperties, defaultBox, defaultPolygon, DRAWMODE, defaultDelete, getIcon, OpenLayersFeatureLayer, genericOpenLayersFeatureStyle, OpenLayersMapDraw, useMapDrawTool, addFeatureProperties, rewindGeometry } from '@opengeoweb/webmap-react';
 import i18n from 'i18next';
 import { initReactI18next, useTranslation } from 'react-i18next';
 import { SHARED_NAMESPACE, sharedTranslations, PROJECTION, ToggleMenu, useIsMounted, dateUtils, CustomTooltip, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, AlertBanner, isAxiosError, getAxiosErrorMessage, StatusTag, usePoller, ErrorBoundary } from '@opengeoweb/shared';
-import { CORE_NAMESPACE, coreTranslations, LegendConnect, MapViewConnect, TimeSliderConnect } from '@opengeoweb/core';
+import { CORE_NAMESPACE, coreTranslations, LegendConnect, OlMapViewConnect, TimeSliderConnect } from '@opengeoweb/core';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
 import { uiSelectors, useUpdateSharedData, mapSelectors, syncGroupsActions, layerActions, mapActions, defaultLayers, syncConstants } from '@opengeoweb/store';
 import { DrawFIRLand, ChevronLeft, Edit, Success, Clock } from '@opengeoweb/theme';
@@ -4466,7 +4466,8 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
   var initialBaseLayers = _ref.baseLayers,
     initialProjection = _ref.projection,
     _ref$geoJSONLayers = _ref.geoJSONLayers,
-    geoJSONLayers = _ref$geoJSONLayers === void 0 ? [] : _ref$geoJSONLayers;
+    geoJSONLayers = _ref$geoJSONLayers === void 0 ? [] : _ref$geoJSONLayers,
+    children = _ref.children;
   var dispatch = useDispatch();
   var mapWindowRef = React.useRef(null);
   var firstMap = useSelector(function (store) {
@@ -4492,7 +4493,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
       // use maplayers, but change layerId and current mapId
       var layers = mapLayers.map(function (layer) {
         return Object.assign({}, layer, {
-          id: webmapUtils.generateLayerId(),
+          id: layer.id || webmapUtils.generateLayerId(),
           mapId: mapId
         });
       });
@@ -4546,7 +4547,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
     children: [jsx(LegendConnect, {
       showMapId: true,
       mapId: mapId
-    }), jsx(MapViewConnect, {
+    }), jsxs(OlMapViewConnect, {
       mapId: mapId,
       controls: {
         mapControlsPositionTop: 0,
@@ -4554,9 +4555,30 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
         zoomControls: true,
         dimensionSelect: true
       },
-      children: geoJSONLayers.map(function (layer) {
-        return jsx(MapViewLayer, Object.assign({}, layer), layer.id);
-      })
+      children: [children, geoJSONLayers.map(function (layer) {
+        return jsxs("div", {
+          "data-testid": "" + layer.id,
+          children: [jsx(OpenLayersFeatureLayer, {
+            featureCollection: !layer.isInEditMode ? layer.geojson : undefined,
+            style: genericOpenLayersFeatureStyle,
+            zIndex: 1000
+          }), jsx(OpenLayersMapDraw, {
+            viewOnlyStyle: genericOpenLayersFeatureStyle,
+            selectedFeatureIndex: layer.selectedFeatureIndex || 0,
+            geojson: layer.geojson,
+            drawMode: layer.drawMode,
+            isInEditMode: layer.isInEditMode || false,
+            updateGeojson: layer.updateGeojson,
+            exitDrawModeCallback: function exitDrawModeCallback(reason) {
+              try {
+                (layer == null ? void 0 : layer.exitDrawModeCallback) && (layer == null ? void 0 : layer.exitDrawModeCallback(reason));
+              } catch (e) {
+                window.console.trace(e);
+              }
+            }
+          })]
+        }, layer.id);
+      })]
     }), jsx("div", {
       style: {
         position: 'absolute',
@@ -4577,6 +4599,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
 var ProductFormLayout = function ProductFormLayout(_ref) {
   var _sx, _sx2, _sx3;
   var children = _ref.children,
+    mapChildren = _ref.mapChildren,
     productConfig = _ref.productConfig,
     _ref$geoJSONLayers = _ref.geoJSONLayers,
     geoJSONLayers = _ref$geoJSONLayers === void 0 ? [] : _ref$geoJSONLayers;
@@ -4607,7 +4630,8 @@ var ProductFormLayout = function ProductFormLayout(_ref) {
       children: jsx(MapViewGeoJson, {
         baseLayers: baseLayers,
         projection: projection,
-        geoJSONLayers: geoJSONLayers
+        geoJSONLayers: geoJSONLayers,
+        children: mapChildren
       })
     }), jsx(Grid2, {
       sx: (_sx3 = {
@@ -8099,16 +8123,15 @@ var SigmetForm = function SigmetForm(_ref) {
       onUpdateEndGeoJson(newTool.shape, newTool.shape);
     }
   };
-  var onExitDrawMode = function onExitDrawMode(reason, newGeoJSON) {
-    deactivateStartTool();
-    var _setStartGeoJSON = setStartGeoJSON(newGeoJSON),
+  var updateStartGeoJson = function updateStartGeoJson(geoJson) {
+    var _setStartGeoJSON = setStartGeoJSON(geoJson),
       newStartGeoJson = _setStartGeoJSON[0],
       newStartIntersection = _setStartGeoJSON[1];
     var newGeoStart = rewindGeometry(newStartGeoJson);
     var newGeoStartIntersect = rewindGeometry(newStartIntersection);
     onUpdateStartgeoJSON(newGeoStart, newGeoStartIntersect);
   };
-  var onExitDrawModeEnd = function onExitDrawModeEnd(reason, newGeoJSON) {
+  var updateEndGeoJson = function updateEndGeoJson(newGeoJSON) {
     deactivateEndTool();
     var _setEndGeoJSON = setEndGeoJSON(newGeoJSON),
       newEndGeoJson = _setEndGeoJSON[0],
@@ -8118,9 +8141,11 @@ var SigmetForm = function SigmetForm(_ref) {
     onUpdateEndGeoJson(newGeoEnd, newGeoEndIntersect);
   };
   var layers = [getStartLayer('geoJSONIntersectionBounds', 'geojsonlayer-fir'), Object.assign({}, getEndLayer('geoJSON', 'geojsonlayer-end'), {
-    exitDrawModeCallback: onExitDrawModeEnd
+    exitDrawModeCallback: deactivateEndTool,
+    updateGeojson: updateEndGeoJson
   }), Object.assign({}, getStartLayer('geoJSON', 'geojsonlayer-start'), {
-    exitDrawModeCallback: onExitDrawMode
+    exitDrawModeCallback: deactivateStartTool,
+    updateGeojson: updateStartGeoJson
   }), getEndLayer('geoJSONIntersection', 'geojsonlayer-intersection-end'), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
   useFormLayers(layers);
   var _useFormContext2 = useFormContext(),
@@ -8399,8 +8424,7 @@ var AirmetForm = function AirmetForm(_ref) {
       onUpdateStartgeoJSON(newTool.shape, newTool.shape);
     }
   };
-  var onExitDrawMode = function onExitDrawMode(reason, newGeoJSON) {
-    deactivateStartTool();
+  var updateStartGeoJson = function updateStartGeoJson(newGeoJSON) {
     var _setGeoJSON = setGeoJSON(newGeoJSON),
       newStartGeoJson = _setGeoJSON[0],
       newStartIntersection = _setGeoJSON[1];
@@ -8409,7 +8433,8 @@ var AirmetForm = function AirmetForm(_ref) {
     onUpdateStartgeoJSON(newGeoStart, newGeoStartIntersect);
   };
   var layers = [getStartLayer('geoJSONIntersectionBounds', 'geojsonlayer-fir'), Object.assign({}, getStartLayer('geoJSON', 'geojsonlayer-start'), {
-    exitDrawModeCallback: onExitDrawMode
+    exitDrawModeCallback: deactivateStartTool,
+    updateGeojson: updateStartGeoJson
   }), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
   useFormLayers(layers);
   var _useFormContext2 = useFormContext(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "11.1.0",
+  "version": "12.0.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,29 +8,44 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "*",
-    "@opengeoweb/shared": "*",
-    "@opengeoweb/theme": "*",
-    "@opengeoweb/store": "*",
-    "@opengeoweb/webmap": "*",
-    "@opengeoweb/webmap-react": "*",
-    "react-redux": "^8.1.3",
-    "@opengeoweb/core": "*",
-    "@opengeoweb/authentication": "*",
+    "@emotion/react": "11.14.0",
+    "@emotion/styled": "11.14.0",
+    "@mui/material": "^6.1.1",
     "@mui/system": "^6.1.1",
-    "@opengeoweb/form-fields": "*",
-    "react-hook-form": "^7.50.1",
-    "axios": "^1.7.7",
-    "lodash": "^4.17.21",
+    "@mui/x-date-pickers": "7.27.1",
     "@reduxjs/toolkit": "^1.9.7",
+    "@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.67.1",
+    "@testing-library/react": "16.0.1",
+    "@testing-library/user-event": "14.5.2",
+    "@turf/turf": "7.2.0",
+    "axios": "^1.7.7",
+    "date-fns": "4.1.0",
+    "dompurify": "3.2.4",
     "i18next": "^23.11.5",
-    "@mui/material": "^6.1.1",
-    "react-i18next": "^15.1.1"
-  },
-  "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-window": "1.8.10",
+    "sortablejs": "1.15.2"
   },
   "module": "./index.esm.js",
   "type": "module",

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

@@ -1,10 +1,11 @@
 import * as React from 'react';
 import { mapTypes, layerTypes } from '@opengeoweb/store';
-import { MapViewLayerProps } from '@opengeoweb/webmap-react';
+import { OpenLayersLayerProps } from '@opengeoweb/webmap-react';
 export interface MapViewGeoJsonProps {
     baseLayers?: layerTypes.Layer[];
     projection?: mapTypes.MapPreset['proj'];
-    geoJSONLayers: MapViewLayerProps[];
+    geoJSONLayers: OpenLayersLayerProps[];
+    children?: React.ReactNode;
 }
 declare const MapViewGeoJson: React.FC<MapViewGeoJsonProps>;
 export default MapViewGeoJson;

package/src/lib/components/MapViewGeoJson/MapViewGeoJson.stories.d.ts

@@ -7,3 +7,4 @@ export default _default;
 export declare const mapViewGeoJson: React.FC;
 export declare const mapViewAmsterdamFir: React.FC;
 export declare const mapViewIntersect: React.FC;
+export declare const mapViewIntersectOrig: React.FC;

package/src/lib/components/MapViewGeoJson/OrgMapViewGeoJson.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { mapTypes, layerTypes } from '@opengeoweb/store';
+import { MapViewLayerProps } from '@opengeoweb/webmap-react';
+export interface OrgMapViewGeoJsonProps {
+    baseLayers?: layerTypes.Layer[];
+    projection?: mapTypes.MapPreset['proj'];
+    geoJSONLayers: MapViewLayerProps[];
+}
+declare const OrgMapViewGeoJson: React.FC<OrgMapViewGeoJsonProps>;
+export default OrgMapViewGeoJson;

package/src/lib/components/ProductForms/ProductFormLayout.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
-import { MapViewLayerProps } from '@opengeoweb/webmap-react';
+import { OpenLayersLayerProps } from '@opengeoweb/webmap-react';
 import { ProductConfig } from '../../types';
 interface ProducFormLayoutProps {
     children: React.ReactNode;
+    mapChildren?: React.ReactNode;
     productConfig: ProductConfig;
-    geoJSONLayers: MapViewLayerProps[];
+    geoJSONLayers: OpenLayersLayerProps[];
 }
 declare const ProductFormLayout: React.FC<ProducFormLayoutProps>;
 export default ProductFormLayout;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { FieldValues, UseFormGetValues, UseFormTrigger } from 'react-hook-form';
 import { layerTypes, mapTypes } from '@opengeoweb/store';
-import { DrawMode, MapViewLayerProps } from '@opengeoweb/webmap-react';
+import { DrawMode, OpenLayersLayerProps } from '@opengeoweb/webmap-react';
 import { LevelUnits, ATSRLocation, ICAOLocation, ProductStatus, CancelSigmet, Sigmet, ProductCanbe, SigmetFromBackend, SigmetFromFrontend, ProductAction, Airmet, CancelAirmet, ProductConfig, Firareas, FIRConfigSigmet, AirmetFromBackend, AirmetFromFrontend, ProductType, AviationProduct, FIRLocationGeoJson, AirmetConfig, FIRConfigAirmet, StartOrEndDrawing, AviationPhenomenon } from '../../types';
 export declare const getDefaultPhenomena: (productConfig: ProductConfig, currentFir?: string) => {
     phenomena: AviationPhenomenon[];
@@ -77,5 +77,5 @@ export declare const firSelectionType = "fir";
 export declare const getDrawTools: (type: StartOrEndDrawing, firShape: GeoJSON.FeatureCollection) => DrawMode[];
 export declare const updateDrawToolsWithFir: (drawTools: DrawMode[], newFirShape: GeoJSON.FeatureCollection) => DrawMode[];
 export declare const getToolIcon: (selectionType: string) => React.ReactElement;
-export declare const useFormLayers: (layers: MapViewLayerProps[]) => void;
+export declare const useFormLayers: (layers: OpenLayersLayerProps[]) => void;
 export {};