@opengeoweb/sigmet-airmet 10.0.0 → 10.1.0

package/index.esm.js

@@ -5,13 +5,13 @@ 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, mapStoreActions, defaultLayers, syncConstants } from '@opengeoweb/store';
+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';
@@ -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));
     }
@@ -3143,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);
@@ -3166,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'),
@@ -4459,7 +4460,6 @@ var Tac = function Tac(_ref) {
   });
 };
 
-var source = 'app';
 var MapViewGeoJson = function MapViewGeoJson(_ref) {
   var initialBaseLayers = _ref.baseLayers,
     initialProjection = _ref.projection,
@@ -4470,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);
@@ -4494,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'
@@ -4509,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
@@ -4541,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);
       })
@@ -4570,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
     })]
   });
 };
@@ -8166,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
@@ -8229,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,
@@ -8452,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
@@ -8519,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "10.0.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>;