@opengeoweb/sigmet-airmet 19.2.0 → 19.4.0

package/dist/index.esm.js

@@ -6,8 +6,8 @@ import { Grid, Typography, FormControlLabel, Radio, Box, Checkbox, MenuItem, For
 import { useFormContext } from 'react-hook-form';
 import { FORM_FIELDS_NAMESPACE, useDraftFormHelpers, ReactHookFormRadioGroup, hasValidGeometry, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMin, isValidMax, isEmpty, ReactHookFormDateTime, countIntersectionPoints, hasMulitpleIntersections, ReactHookFormHiddenInput, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isMaximumOneDrawing, isXHoursBefore, isXHoursAfter, ReactHookFormTextField, DegreesMinutesField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
-import { uiSelectors, uiTypes, useUpdateSharedData, mapSelectors, syncGroupsActions, layerActions, mapActions, defaultLayers, syncConstants, uiActions, layerUtils, genericSelectors, drawingToolActions } from '@opengeoweb/store';
-import { FEATURE_DRAW_SECONDARY_FILL_COLOR, FEATURE_DRAW_SECONDARY_STROKE_COLOR, defaultIntersectionStyleProperties, defaultGeoJSONStyleProperties, addSelectionTypeToGeoJSON, DRAWMODE, defaultLocation, addGeoJSONProperties, defaultBox, defaultPolygon, defaultDelete, getIcon, addFeatureProperties, OpenLayersFeatureLayer, genericOpenLayersFeatureStyle, OpenLayersMapDraw, useMapDrawTool, rewindGeometry } from '@opengeoweb/webmap-react';
+import { uiSelectors, uiTypes, useUpdateFeatureSyncLayers, mapSelectors, syncGroupsActions, layerActions, mapActions, defaultLayers, syncConstants, uiActions, layerUtils, genericSelectors, drawingToolActions } from '@opengeoweb/store';
+import { FEATURE_DRAW_SECONDARY_FILL_COLOR, FEATURE_DRAW_SECONDARY_STROKE_COLOR, defaultIntersectionStyleProperties, defaultGeoJSONStyleProperties, addSelectionTypeToGeoJSON, DRAWMODE, defaultLocation, addGeoJSONProperties, defaultBox, defaultPolygon, defaultDelete, getIcon, OpenLayersFeatureLayer, genericOpenLayersFeatureStyle, OpenLayersMapDraw, useMapDrawTool, addFeatureProperties, rewindGeometry } from '@opengeoweb/webmap-react';
 import { useQueryClient, useMutation } from '@tanstack/react-query';
 import { getHeaders, handleResponse, useAuthenticationContext, useAuthQuery } from '@opengeoweb/api';
 import i18n from 'i18next';
@@ -5530,32 +5530,23 @@ var getToolIcon = function getToolIcon(selectionType) {
   }
   return jsx(DrawFIRLand, {});
 };
+var LINKED_FORM_LAYER_IDS = new Set(['geojsonlayer-fir', 'geojsonlayer-intersection-start', 'geojsonlayer-intersection-end']);
 var useFormLayers = function useFormLayers(layers) {
-  var formLayers = layers.map(function (layer) {
-    if (layer.isInEditMode) {
-      var geojson = addFeatureProperties(layer.geojson, {
-        inEditMode: true
-      });
-      return {
-        id: layer.id,
-        geoJSON: geojson
-      };
-    }
-    return {
-      id: layer.id,
-      geoJSON: layer.geojson
-    };
-  }).filter(function (layer) {
-    return layer.geoJSON !== undefined && layer.geoJSON !== null;
-  });
   var sourcePanelId = useSelector(function (store) {
     return uiSelectors.getSourcePanelId(store, uiTypes.DialogTypes.PublicWarnings);
   });
-  useUpdateSharedData({
-    formFeatures: formLayers
-  }, sourcePanelId, {
-    requireLinkedMaps: false
-  });
+  var linkedFormLayersById = React.useMemo(function () {
+    return layers.reduce(function (layersById, layer) {
+      var _Object$assign4;
+      if (!layer.id || !layer.geojson || !LINKED_FORM_LAYER_IDS.has(layer.id)) {
+        return layersById;
+      }
+      return Object.assign({}, layersById, (_Object$assign4 = {}, _Object$assign4[layer.id] = {
+        geojson: layer.geojson
+      }, _Object$assign4));
+    }, {});
+  }, [layers]);
+  useUpdateFeatureSyncLayers(linkedFormLayersById, sourcePanelId);
 };
 var getSequenceStyling = function getSequenceStyling(product, hasTac) {
   if (hasTac === void 0) {
@@ -8473,6 +8464,10 @@ var useGeoJSONHandling = function useGeoJSONHandling(_ref) {
   var linkedMaps = useSelector(function (store) {
     return genericSelectors.getLinkedMapIds(store, sourcePanelId);
   });
+  var layersById = useSelector(function (state) {
+    var _state$layers;
+    return ((_state$layers = state.layers) == null ? void 0 : _state$layers.byId) || {};
+  });
   var drawToolsDisabled = warningsDialogOpen ? linkedMaps.length === 0 : false;
   var reduxActiveStart = useSelector(function (state) {
     var _state$drawingtools;
@@ -8488,6 +8483,7 @@ var useGeoJSONHandling = function useGeoJSONHandling(_ref) {
     start: undefined,
     end: undefined
   });
+  var linkedMapsRef = useRef(linkedMaps);
   var registeredToolsRef = useRef({
     start: new Set(),
     end: new Set()
@@ -8522,6 +8518,71 @@ var useGeoJSONHandling = function useGeoJSONHandling(_ref) {
     handleToolDeactivation(prevActiveToolRef.current.end, activeEndDrawTool, storedEndGeoJSON, endGeoJSON, deactivateEndTool || function () {}, updateEndGeoJson || function () {});
     prevActiveToolRef.current.end = activeEndDrawTool;
   }, [activeEndDrawTool, storedEndGeoJSON, deactivateEndTool, updateEndGeoJson, endGeoJSON]);
+  useEffect(function () {
+    var removedMapIds = linkedMapsRef.current.filter(function (mapId) {
+      return !linkedMaps.includes(mapId);
+    });
+    removedMapIds.forEach(function (mapId) {
+      registeredToolsRef.current.start["delete"](mapId);
+      registeredToolsRef.current.end["delete"](mapId);
+    });
+    linkedMapsRef.current = linkedMaps;
+  }, [linkedMaps]);
+  var ensureActiveToolLayers = useCallback(function (type, activeTool, geoJSON, fallbackGeoJSON, editModes) {
+    if (!activeTool || linkedMaps.length === 0) {
+      return;
+    }
+    var drawToolId = "sigmet" + (type === 'start' ? 'Start' : 'End') + "Geometry";
+    var toolKey = type === 'start' ? 'start' : 'end';
+    var geoJSONToUse = geoJSON && geoJSON.features.length > 0 ? geoJSON : fallbackGeoJSON;
+    linkedMaps.forEach(function (mapId) {
+      var geometryLayerId = "drawLayer-" + drawToolId + "-" + mapId;
+      if (!registeredToolsRef.current[toolKey].has(mapId) || !layersById[geometryLayerId]) {
+        dispatch(layerActions.addLayer({
+          mapId: mapId,
+          layer: {
+            geojson: geoJSONToUse || {
+              type: 'FeatureCollection',
+              features: []
+            },
+            layerType: LayerType.featureLayer
+          },
+          layerId: geometryLayerId,
+          origin: 'PublicWarningsForm'
+        }));
+        registeredToolsRef.current[toolKey].add(mapId);
+      }
+    });
+    var activeMapId = linkedMaps[linkedMaps.length - 1];
+    if (!activeMapId) {
+      return;
+    }
+    var activeLayerId = "drawLayer-" + drawToolId + "-" + activeMapId;
+    dispatch(drawingToolActions.registerDrawTool({
+      drawToolId: drawToolId,
+      defaultDrawModes: editModes
+    }));
+    dispatch(drawingToolActions.updateGeoJSONLayerId({
+      drawToolId: drawToolId,
+      geoJSONLayerId: activeLayerId
+    }));
+    var activeDrawMode = editModes == null ? void 0 : editModes.find(function (drawMode) {
+      return drawMode.drawModeId === activeTool;
+    });
+    if (activeDrawMode != null && activeDrawMode.isSelectable) {
+      dispatch(layerActions.toggleFeatureMode({
+        layerId: activeLayerId,
+        isInEditMode: true,
+        drawMode: activeDrawMode.value
+      }));
+    }
+  }, [dispatch, layersById, linkedMaps]);
+  useEffect(function () {
+    ensureActiveToolLayers('start', activeStartDrawTool, storedGeoJSON, startGeoJSON, startEditModes);
+  }, [activeStartDrawTool, ensureActiveToolLayers, startEditModes, startGeoJSON, storedGeoJSON]);
+  useEffect(function () {
+    ensureActiveToolLayers('end', activeEndDrawTool, storedEndGeoJSON, endGeoJSON, endEditModes);
+  }, [activeEndDrawTool, endEditModes, endGeoJSON, ensureActiveToolLayers, storedEndGeoJSON]);
   var onChangeTool = useCallback(function (type, newTool, deactivateOtherTool, changeActiveTool, editModes) {
     deactivateOtherTool();
     changeActiveTool(newTool);
@@ -8797,7 +8858,8 @@ var SigmetForm = function SigmetForm(_ref) {
     exitDrawModeCallback: deactivateStartTool,
     updateGeojson: updateStartGeoJson
   }), getEndLayer('geoJSONIntersection', 'geojsonlayer-intersection-end'), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
-  useFormLayers(layers);
+  var linkedFormLayers = [getStartLayer('geoJSONIntersectionBounds', 'geojsonlayer-fir'), getEndLayer('geoJSONIntersection', 'geojsonlayer-intersection-end'), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
+  useFormLayers(linkedFormLayers);
   var _React$useState3 = React.useState(mode === 'view'),
     isDisabled = _React$useState3[0],
     setIsDisabled = _React$useState3[1];
@@ -9184,7 +9246,8 @@ var AirmetForm = function AirmetForm(_ref) {
     exitDrawModeCallback: deactivateStartTool,
     updateGeojson: updateStartGeoJson
   }), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
-  useFormLayers(layers);
+  var linkedFormLayers = [getStartLayer('geoJSONIntersectionBounds', 'geojsonlayer-fir'), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
+  useFormLayers(linkedFormLayers);
   var _React$useState3 = React.useState(mode === 'view'),
     isDisabled = _React$useState3[0],
     setIsDisabled = _React$useState3[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "19.2.0",
+  "version": "19.4.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -32,7 +32,7 @@
     "@mui/system": "^9.0.1",
     "@opengeoweb/form-fields": "*",
     "react-hook-form": "^7.50.1",
-    "axios": "^1.16.0",
+    "axios": "^1.18.0",
     "lodash": "^4.18.1",
     "@reduxjs/toolkit": "^2.6.1",
     "i18next": "^25.0.1",