@opengeoweb/sigmet-airmet 9.37.0 → 10.1.0

package/README.md

@@ -172,6 +172,6 @@ const StartGeometry: React.FC<StartGeometryProps> = ({
 
 3. After all is working add the unit tests and make sure typescript linting will pass again, as `ConfigurableFormFieldProps` makes sure you're not forgetting to pass the config.
 
-## Documentation
+### TypeScript Documentation
 
-https://opengeoweb.gitlab.io/opengeoweb/docs/sigmet-airmet/
+- [TypeScript Docs](https://opengeoweb.gitlab.io/opengeoweb/typescript-docs/sigmet-airmet/)

package/index.esm.js

@@ -5,16 +5,16 @@ 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, MapControls, MapViewLayer, useMapDrawTool, addFeatureProperties, rewindGeometry } from '@opengeoweb/webmap-react';
+import { defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, addSelectionTypeToGeoJSON, defaultPoint, addGeoJSONProperties, defaultBox, defaultPolygon, DRAWMODE, defaultDelete, getIcon, MapViewLayer, 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, LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, TimeSliderConnect, LegendConnect, LayerManagerConnect } from '@opengeoweb/core';
+import { CORE_NAMESPACE, coreTranslations, LegendConnect, MapViewConnect, 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';
 import { LayerType, webmapUtils } from '@opengeoweb/webmap';
 import { debounce } from 'lodash';
-import { useDispatch, useSelector, shallowEqual } from 'react-redux';
-import { mapSelectors, syncGroupsActions, mapStoreActions, defaultLayers, syncConstants } from '@opengeoweb/store';
 import { Box as Box$1 } from '@mui/system';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
 
@@ -1738,7 +1738,8 @@ var prepareFormValues = function prepareFormValues(product) {
     if (typeof value === 'object' && value !== null && value !== undefined) {
       var _ref2;
       var hasNaNValue = Object.keys(value).reduce(function (total, valKey) {
-        return !hasValue(String(value[valKey])) || total;
+        var keyValue = value[valKey];
+        return !hasValue(String(keyValue)) || total;
       }, false);
       return Object.assign({}, list, !hasNaNValue && (_ref2 = {}, _ref2[key] = value, _ref2));
     }
@@ -1997,6 +1998,22 @@ var getToolIcon = function getToolIcon(selectionType) {
   }
   return jsx(DrawFIRLand, {});
 };
+var useFormLayers = function useFormLayers(layers) {
+  var formLayers = layers.map(function (layer) {
+    return {
+      id: layer.id,
+      geoJSON: layer.geojson
+    };
+  }).filter(function (layer) {
+    return layer.geoJSON !== undefined;
+  });
+  var sourcePanelId = useSelector(function (store) {
+    return uiSelectors.getSourcePanelId(store, 'publicWarnings');
+  });
+  useUpdateSharedData({
+    formFeatures: formLayers
+  }, sourcePanelId);
+};
 
 var styles$1 = {
   radioInput: {
@@ -3127,9 +3144,9 @@ var SelectFIR = function SelectFIR(_ref) {
     locationIndicatorMWO = _getFirLocationDefaul.locationIndicatorMWO,
     firName = _getFirLocationDefaul.firName,
     firGeometry = _getFirLocationDefaul.firGeometry;
-  var onChangeLocationATSR = function onChangeLocationATSR(changeEvent) {
-    var value = changeEvent.target.value;
-    var valuesFromConfig = getFirLocationDefaultValues(productConfig, value);
+  var onChangeLocationATSR = function onChangeLocationATSR(event) {
+    var value = event.target.value; // MUI Select component's target has a `value` property
+    var valuesFromConfig = getFirLocationDefaultValues(productConfig, value); // Ensure value is treated as a string
     // Updates values from config
     setValue('locationIndicatorATSU', valuesFromConfig.locationIndicatorATSU);
     setValue('firName', valuesFromConfig.firName);
@@ -3150,7 +3167,7 @@ var SelectFIR = function SelectFIR(_ref) {
     // Trigger validation for fields dependent on FIR config
     var fieldnames = ['phenomenon', 'validDateStart', 'validDateEnd', 'movementSpeed', 'level.value', 'lowerLevel.value'];
     triggerValidations(fieldnames, getValues, trigger);
-    onChange(changeEvent, valuesFromConfig.phenomena);
+    onChange(event, valuesFromConfig.phenomena); // Pass the event and updated phenomena as arguments
   };
   return jsxs(ProductFormFieldLayout, {
     title: t('select-fir-title'),
@@ -3404,7 +3421,7 @@ var ValidFrom = function ValidFrom(_ref) {
 var getDefaultValidUntilValue = function getDefaultValidUntilValue(productConfig, phenomenon, fir, validFrom) {
   var maxHoursOfValidity = getMaxHoursOfValidity(phenomenon, fir || '', productConfig);
   // Set default validity to 2 hours for thunderstorms, otherwise use maxHoursOfValidity
-  var defaultHoursOfValidity = ['EMBD_TS', 'EMBD_TSGR', 'FRQ_TS', 'FRQ_TSGR', 'OBSC_TS', 'OBSC_TSGR', 'SQL_TSGR', 'ISOL_TS', 'ISOL_TSGR', 'OCNL_TS', 'OCNL_TSGR'].includes(phenomenon) ? 2 : maxHoursOfValidity;
+  var defaultHoursOfValidity = ['EMBD_TS', 'EMBD_TSGR', 'FRQ_TS', 'FRQ_TSGR', 'OBSC_TS', 'OBSC_TSGR', 'SQL_TS', 'SQL_TSGR', 'ISOL_TS', 'ISOL_TSGR', 'OCNL_TS', 'OCNL_TSGR'].includes(phenomenon) ? 2 : maxHoursOfValidity;
   // Use validFrom if provided, otherwise use current UTC time
   var baseDate = validFrom ? new Date(validFrom) : dateUtils.utc();
   var dateWithValidity = dateUtils.add(baseDate, {
@@ -4443,7 +4460,6 @@ var Tac = function Tac(_ref) {
   });
 };
 
-var source = 'app';
 var MapViewGeoJson = function MapViewGeoJson(_ref) {
   var initialBaseLayers = _ref.baseLayers,
     initialProjection = _ref.projection,
@@ -4454,7 +4470,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
   var firstMap = useSelector(function (store) {
     return mapSelectors.getFirstMap(store);
   }, shallowEqual);
-  var firstMapId = firstMap && firstMap.id ? firstMap.id : null;
+  var firstMapId = firstMap && firstMap.id ? firstMap.id : '';
   var mapLayers = useSelector(function (store) {
     return mapSelectors.getMapLayers(store, firstMapId);
   }, shallowEqual);
@@ -4478,13 +4494,13 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
           mapId: mapId
         });
       });
-      dispatch(mapStoreActions.setLayers({
+      dispatch(layerActions.setLayers({
         mapId: mapId,
         layers: layers
       }));
     }
     if (mapDimensions && mapDimensions.length) {
-      dispatch(mapStoreActions.mapChangeDimension({
+      dispatch(mapActions.mapChangeDimension({
         mapId: mapId,
         dimension: mapDimensions[0],
         origin: 'MapViewGeoJson'
@@ -4493,12 +4509,12 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
     var baseLayers = initialBaseLayers || [Object.assign({}, defaultLayers.overLayer, {
       id: "countryborders-" + mapId
     })];
-    dispatch(mapStoreActions.setBaseLayers({
+    dispatch(layerActions.setBaseLayers({
       mapId: mapId,
       layers: baseLayers
     }));
     var projection = initialProjection || srsAndBboxDefault;
-    dispatch(mapStoreActions.setBbox({
+    dispatch(mapActions.setBbox({
       mapId: mapId,
       bbox: projection.bbox,
       srs: projection.srs
@@ -4525,19 +4541,17 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
     },
     "data-testid": "MapView",
     ref: mapWindowRef,
-    children: [jsxs(MapControls, {
-      children: [jsx(LayerManagerMapButtonConnect, {
-        source: source,
-        mapId: mapId
-      }), jsx(LegendMapButtonConnect, {
-        source: source,
-        mapId: mapId
-      }), jsx(MultiDimensionSelectMapButtonsConnect, {
-        source: source,
-        mapId: mapId
-      })]
+    children: [jsx(LegendConnect, {
+      showMapId: true,
+      mapId: mapId
     }), jsx(MapViewConnect, {
       mapId: mapId,
+      controls: {
+        mapControlsPositionTop: 0,
+        layerManagerAndLegend: true,
+        zoomControls: true,
+        dimensionSelect: true
+      },
       children: geoJSONLayers.map(function (layer) {
         return jsx(MapViewLayer, Object.assign({}, layer), layer.id);
       })
@@ -4554,15 +4568,6 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
         mapId: mapId,
         mapWindowRef: mapWindowRef
       })
-    }), jsx(LegendConnect, {
-      showMapId: true,
-      mapId: mapId,
-      source: source
-    }), jsx(LayerManagerConnect, {
-      mapId: mapId,
-      bounds: "parent",
-      source: source,
-      isDocked: true
     })]
   });
 };
@@ -4860,7 +4865,7 @@ var fir_areas$1 = {
 			},
 			{
 				code: "SQL_TS",
-				description: "Squall line"
+				description: "Squall line thunderstorm(s)"
 			},
 			{
 				code: "SQL_TSGR",
@@ -6181,7 +6186,7 @@ var fir_areas$1 = {
 			},
 			{
 				code: "SQL_TS",
-				description: "Squall line"
+				description: "Squall line thunderstorm(s)"
 			},
 			{
 				code: "SQL_TSGR",
@@ -8115,6 +8120,7 @@ var SigmetForm = function SigmetForm(_ref) {
   }), Object.assign({}, getStartLayer('geoJSON', 'geojsonlayer-start'), {
     exitDrawModeCallback: onExitDrawMode
   }), getEndLayer('geoJSONIntersection', 'geojsonlayer-intersection-end'), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
+  useFormLayers(layers);
   var _useFormContext2 = useFormContext(),
     watch = _useFormContext2.watch,
     setValue = _useFormContext2.setValue,
@@ -8149,7 +8155,7 @@ var SigmetForm = function SigmetForm(_ref) {
     omitChange = _useConditionalFields.omitChange;
   var _useShortTestHelpers = useShortTestHelpers(),
     isShortTest = _useShortTestHelpers.isShortTest;
-  var onChangeFir = function onChangeFir(event, newPhenomenaList) {
+  var onChangeFir = function onChangeFir(newPhenomenaList, event) {
     var newFIRValue = event == null ? void 0 : event.target.value;
     var newFirGeoJSON = addFeatureProperties(getFir(productConfig, newFIRValue), featurePropsFIR);
     // delete shape
@@ -8212,7 +8218,9 @@ var SigmetForm = function SigmetForm(_ref) {
         productConfig: productConfig,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        onChange: onChangeFir
+        onChange: function onChange(event, newPhenomenaList) {
+          onChangeFir(newPhenomenaList || [], event);
+        }
       }), jsx(StartGeometry, {
         isReadOnly: isReadOnly,
         geoJSON: startGeoJSON,
@@ -8399,6 +8407,7 @@ var AirmetForm = function AirmetForm(_ref) {
   var layers = [getStartLayer('geoJSONIntersectionBounds', 'geojsonlayer-fir'), Object.assign({}, getStartLayer('geoJSON', 'geojsonlayer-start'), {
     exitDrawModeCallback: onExitDrawMode
   }), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
+  useFormLayers(layers);
   var _useFormContext2 = useFormContext(),
     watch = _useFormContext2.watch,
     setValue = _useFormContext2.setValue,
@@ -8434,7 +8443,7 @@ var AirmetForm = function AirmetForm(_ref) {
     hasSurfaceWind = _useConditionalFields.hasSurfaceWind,
     hasLevels = _useConditionalFields.hasLevels,
     hasCloudLevels = _useConditionalFields.hasCloudLevels;
-  var onChangeFir = function onChangeFir(event, newPhenomenaList) {
+  var onChangeFir = function onChangeFir(newPhenomenaList, event) {
     var newFIRValue = event == null ? void 0 : event.target.value;
     var newFirGeoJSON = addFeatureProperties(getFir(productConfig, newFIRValue), featurePropsFIR);
     // delete shape
@@ -8501,7 +8510,9 @@ var AirmetForm = function AirmetForm(_ref) {
         isReadOnly: isReadOnly,
         isDisabled: isDisabled,
         productConfig: productConfig,
-        onChange: onChangeFir
+        onChange: function onChange(event, newPhenomenaList) {
+          onChangeFir(newPhenomenaList || [], event);
+        }
       }), jsx(StartGeometry, {
         isReadOnly: isReadOnly,
         geoJSON: startGeoJSON,
@@ -12215,4 +12226,4 @@ ConnectedModuleWrapper) {
   }
 };
 
-export { AirmetComponentsLookUp, AirmetForm, AirmetType, CloudLevelUnits, ContentDialog, DEFAULT_MINIMUM_SURFACE_LEVEL, DEFAULT_MIN_MOVEMENT_SPEED, DEFAULT_MIN_VISIBILITY, DEFAULT_MIN_WIND_SPEED, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductAction, ProductFormDialog, ProductList, ProductListRow, ProductStatusDescription, SA_NAMESPACE, SigmetComponentsLookUp, SigmetForm, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createAirmetPostParameter, createApi$1 as createApi, createApi as createFakeApi, createSigmetPostParameter, extractUnitsToShow, firSelectionType, getActiveFIRArea, getAllFirAreas, getAllowedUnits, getBaseLayers, getConfirmationDialogButtonLabel, getConfirmationDialogCancelLabel, getConfirmationDialogContent, getConfirmationDialogTitle, getDefaultPhenomena, getDefaultValidityMinutesFromConfig, getDialogtitle, getDrawTools, getFieldLabel, getFir, getFirArea, getFirOptions, getHoursBeforeValidity, getLevelInFeet, getMaxCloudLevelValue, getMaxCloudLowerLevelValue, getMaxHoursOfValidity, getMaxLevelValue, getMaxMovementSpeedValue, getMaxPolygonPoints, getMaxVisibilityValue, getMaxWindSpeedValue, getMinCloudLevelValue, getMinCloudLowerLevelValue, getMinLevelValue, getMinMovementSpeedValue, getMinVisibilityValue, getMinWindSpeedValue, getOmitChangeFromConfig, getPhenomenon, getProductFormLifecycleButtons, getProductFormMode, getProductIssueDate, getProjection, getToolIcon, getValidFromDelayTimeMinutesFromConfig, hasMaxFeaturePoints, hasValue, isFir, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, isLevelLower, prepareFormValues, prepareProductValues, sigmetAirmetTranslations as saTranslations, sigmetConfig, triggerValidations, updateDrawToolsWithFir, useDelayedFormValues };
+export { AirmetComponentsLookUp, AirmetForm, AirmetType, CloudLevelUnits, ContentDialog, DEFAULT_MINIMUM_SURFACE_LEVEL, DEFAULT_MIN_MOVEMENT_SPEED, DEFAULT_MIN_VISIBILITY, DEFAULT_MIN_WIND_SPEED, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductAction, ProductFormDialog, ProductList, ProductListRow, ProductStatusDescription, SA_NAMESPACE, SigmetComponentsLookUp, SigmetForm, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createAirmetPostParameter, createApi$1 as createApi, createApi as createFakeApi, createSigmetPostParameter, extractUnitsToShow, firSelectionType, getActiveFIRArea, getAllFirAreas, getAllowedUnits, getBaseLayers, getConfirmationDialogButtonLabel, getConfirmationDialogCancelLabel, getConfirmationDialogContent, getConfirmationDialogTitle, getDefaultPhenomena, getDefaultValidityMinutesFromConfig, getDialogtitle, getDrawTools, getFieldLabel, getFir, getFirArea, getFirOptions, getHoursBeforeValidity, getLevelInFeet, getMaxCloudLevelValue, getMaxCloudLowerLevelValue, getMaxHoursOfValidity, getMaxLevelValue, getMaxMovementSpeedValue, getMaxPolygonPoints, getMaxVisibilityValue, getMaxWindSpeedValue, getMinCloudLevelValue, getMinCloudLowerLevelValue, getMinLevelValue, getMinMovementSpeedValue, getMinVisibilityValue, getMinWindSpeedValue, getOmitChangeFromConfig, getPhenomenon, getProductFormLifecycleButtons, getProductFormMode, getProductIssueDate, getProjection, getToolIcon, getValidFromDelayTimeMinutesFromConfig, hasMaxFeaturePoints, hasValue, isFir, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, isLevelLower, prepareFormValues, prepareProductValues, sigmetAirmetTranslations as saTranslations, sigmetConfig, triggerValidations, updateDrawToolsWithFir, useDelayedFormValues, useFormLayers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "9.37.0",
+  "version": "10.1.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/ProductForms/ProductFormFields/RadioButtonAndLabel.d.ts

@@ -4,6 +4,5 @@ export interface RadioButtonAndLabelProps {
     label: string;
     disabled?: boolean;
     checked?: boolean;
-    onChange?: (event: React.ChangeEvent, checked: boolean) => void;
 }
 export declare const RadioButtonAndLabel: React.FC<RadioButtonAndLabelProps>;

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 } from '@opengeoweb/webmap-react';
+import { DrawMode, MapViewLayerProps } 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,4 +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 {};