@opengeoweb/sigmet-airmet 4.6.1 → 4.7.0

package/index.esm.js

@@ -12,7 +12,7 @@ import { Location, DrawRegion, DrawPolygon, DrawFIRLand, Delete, ChevronLeft, Ed
 import moment from 'moment';
 import { debounce } from 'lodash';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
-import { mapTypes, mapSelectors, generateMapId, generateTimesliderId, SyncGroups, generateLayerId, mapActions, publicLayers, MapControls, LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, MapViewLayer, TimeSliderConnect, LegendConnect } from '@opengeoweb/core';
+import { mapTypes, mapSelectors, generateMapId, generateTimesliderId, SyncGroups, generateLayerId, mapActions, publicLayers, MapControls, LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, MapViewLayer, TimeSliderConnect, LegendConnect, DockedLayerManagerConnect } from '@opengeoweb/core';
 
 function _typeof(obj) {
   "@babel/helpers - typeof";
@@ -259,7 +259,8 @@ var features = [
 			FIRname: "AMSTERDAM FIR",
 			StateCode: "NLD",
 			centlat: 52.8618788,
-			ICAOCODE: "EHAA"
+			ICAOCODE: "EHAA",
+			selectionType: "fir"
 		}
 	}
 ];
@@ -650,9 +651,7 @@ var addFeatureProperties = function addFeatureProperties(geojson, featurePropert
   });
 };
 
-var useDrawMode = function useDrawMode() {
-  var initialGeometry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-
+var useDrawMode = function useDrawMode(initialGeometry) {
   var getInitialLayerDrawModes = function getInitialLayerDrawModes(startorEnd) {
     return initialGeometry && initialGeometry[startorEnd] ? getDrawModeFromSelectionType(initialGeometry[startorEnd].features[0].properties.selectionType) : null;
   };
@@ -681,10 +680,10 @@ var useDrawMode = function useDrawMode() {
 
   var _React$useState5 = React.useState(function () {
     return {
-      start: addFeatureProperties(initialGeometry && initialGeometry.start, featurePropsStart),
-      end: addFeatureProperties(initialGeometry && initialGeometry.end, featurePropsEnd),
-      intersectionStart: addFeatureProperties(initialGeometry && initialGeometry.intersectionStart, featurePropsIntersectionStart),
-      intersectionEnd: addFeatureProperties(initialGeometry && initialGeometry.intersectionEnd, featurePropsIntersectionEnd),
+      start: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.start, featurePropsStart),
+      end: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.end, featurePropsEnd),
+      intersectionStart: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.intersectionStart, featurePropsIntersectionStart),
+      intersectionEnd: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.intersectionEnd, featurePropsIntersectionEnd),
       fir: addFeatureProperties(getFir(), featurePropsFIR)
     };
   }),
@@ -1733,9 +1732,7 @@ var Levels = function Levels(_ref) {
   var isDisabled = _ref.isDisabled,
       isReadOnly = _ref.isReadOnly,
       _ref$onChange = _ref.onChange,
-      _onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange,
+      _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
       productType = _ref.productType;
 
   var _useFormContext = useFormContext(),
@@ -2235,15 +2232,13 @@ var ObservationForecastTime = function ObservationForecastTime(_ref) {
       isReadOnly = _ref.isReadOnly,
       helperText = _ref.helperText,
       _ref$onChange = _ref.onChange,
-      onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange;
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
 
   var _useFormContext = useFormContext(),
       watch = _useFormContext.watch;
 
   var label = getFieldLabel('Date and time', isReadOnly);
-  return (!isReadOnly || watch('observationOrForecastTime') !== null) && /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
+  return !isReadOnly || watch('observationOrForecastTime') !== null ? /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
     title: "At"
   }, /*#__PURE__*/React__default.createElement(ReactHookFormDateTime, {
     disablePast: watch('isObservationOrForecast') === 'FCST',
@@ -2266,7 +2261,7 @@ var ObservationForecastTime = function ObservationForecastTime(_ref) {
     helperText: helperText,
     onChange: onChange,
     sx: styles$2.helperText
-  }));
+  })) : null;
 };
 
 var Phenomenon = function Phenomenon(_ref) {
@@ -2274,9 +2269,7 @@ var Phenomenon = function Phenomenon(_ref) {
       isDisabled = _ref.isDisabled,
       isReadOnly = _ref.isReadOnly,
       _ref$onChange = _ref.onChange,
-      _onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange;
+      _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
 
   var _useFormContext = useFormContext(),
       getValues = _useFormContext.getValues,
@@ -2361,7 +2354,7 @@ var StartGeometry = function StartGeometry(_ref) {
   var _useDraftFormHelpers = useDraftFormHelpers(),
       isDraft = _useDraftFormHelpers.isDraft;
 
-  return !isReadOnly && /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
+  return !isReadOnly ? /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
     title: "Start position",
     sx: styles$2.drawSection,
     "data-testid": "startGeometry"
@@ -2403,7 +2396,7 @@ var StartGeometry = function StartGeometry(_ref) {
     }
   }), /*#__PURE__*/React__default.createElement(ReactHookFormHiddenInput, {
     name: "startGeometryIntersect"
-  }));
+  })) : null;
 };
 
 /* *
@@ -2477,9 +2470,7 @@ var Progress = function Progress(_ref) {
       geoJSONs = _ref.geoJSONs,
       setDrawModeType = _ref.setDrawModeType,
       _ref$onChange = _ref.onChange,
-      _onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange;
+      _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
 
   var _useFormContext = useFormContext(),
       watch = _useFormContext.watch,
@@ -2832,9 +2823,7 @@ var ValidFrom = function ValidFrom(_ref) {
       isDisabled = _ref.isDisabled,
       isReadOnly = _ref.isReadOnly,
       _ref$onChange = _ref.onChange,
-      _onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange;
+      _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
 
   var _useFormContext = useFormContext(),
       getValues = _useFormContext.getValues,
@@ -2910,9 +2899,7 @@ var ValidUntil = function ValidUntil(_ref) {
       isDisabled = _ref.isDisabled,
       isReadOnly = _ref.isReadOnly,
       _ref$onChange = _ref.onChange,
-      _onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange;
+      _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
 
   var _useFormContext = useFormContext(),
       getValues = _useFormContext.getValues,
@@ -3103,9 +3090,7 @@ var SurfaceVisibility = function SurfaceVisibility(_ref) {
   var isDisabled = _ref.isDisabled,
       isReadOnly = _ref.isReadOnly,
       _ref$onChange = _ref.onChange,
-      _onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange;
+      _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
 
   var _useDraftFormHelpers = useDraftFormHelpers(),
       isRequired = _useDraftFormHelpers.isRequired;
@@ -3367,9 +3352,7 @@ var CloudLevels = function CloudLevels(_ref) {
   var isDisabled = _ref.isDisabled,
       isReadOnly = _ref.isReadOnly,
       _ref$onChange = _ref.onChange,
-      _onChange = _ref$onChange === void 0 ? function () {
-    return null;
-  } : _ref$onChange;
+      _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
 
   var _useFormContext = useFormContext(),
       watch = _useFormContext.watch,
@@ -4058,6 +4041,10 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
   })), /*#__PURE__*/React.createElement(LegendConnect, {
     showMapId: true,
     mapId: mapId
+  }), /*#__PURE__*/React.createElement(DockedLayerManagerConnect, {
+    mapId: mapId,
+    bounds: "parent",
+    source: "module"
   }));
 };
 
@@ -4145,7 +4132,7 @@ var SigmetForm = function SigmetForm(_ref) {
     end: initialSigmet.endGeometry,
     intersectionStart: initialSigmet.startGeometryIntersect,
     intersectionEnd: initialSigmet.endGeometryIntersect
-  } : null;
+  } : undefined;
 
   var _useDrawMode = useDrawMode(initialGeometry),
       drawMode = _useDrawMode.drawMode,
@@ -4358,7 +4345,7 @@ var AirmetForm = function AirmetForm(_ref) {
   var initialGeometry = initialAirmet && !isCancelAirmet ? {
     start: initialAirmet.startGeometry,
     intersectionStart: initialAirmet.startGeometryIntersect
-  } : null;
+  } : undefined;
 
   var _useDrawMode = useDrawMode(initialGeometry),
       drawMode = _useDrawMode.drawMode,
@@ -4626,9 +4613,7 @@ var getActiveStatus = function getActiveStatus(product) {
   });
 };
 
-var getStatusTagList = function getStatusTagList(product) {
-  var cancelsSeqId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
+var getStatusTagList = function getStatusTagList(product, cancelsSeqId) {
   if (cancelsSeqId !== null) {
     return /*#__PURE__*/React__default.createElement(StatusTag, {
       content: "cancels ".concat(cancelsSeqId),
@@ -5261,10 +5246,10 @@ var prepareProductValues = function prepareProductValues(product, productType) {
   // Ensure there is a valid start/end date
   if (!isInstanceOfCancelSigmetOrAirmet(product) && (!product.validDateStart || !product.validDateEnd)) {
     var defaultHoursValid = getDefaultHoursValid(productType);
-    return Object.assign({
+    return Object.assign(Object.assign({}, product), {
       validDateStart: moment.utc().add(VALID_FROM_TIME_DELAY_IN_MINUTES, 'minutes').format('YYYY-MM-DDTHH:mm:ss[Z]'),
       validDateEnd: moment.utc().add(defaultHoursValid, 'hour').add(VALID_FROM_TIME_DELAY_IN_MINUTES, 'minutes').format('YYYY-MM-DDTHH:mm:ss[Z]')
-    }, product);
+    });
   }
 
   return product;

package/index.umd.js

@@ -275,7 +275,8 @@
     			FIRname: "AMSTERDAM FIR",
     			StateCode: "NLD",
     			centlat: 52.8618788,
-    			ICAOCODE: "EHAA"
+    			ICAOCODE: "EHAA",
+    			selectionType: "fir"
     		}
     	}
     ];
@@ -667,10 +668,6 @@
     };
 
     var useDrawMode = function useDrawMode(initialGeometry) {
-      if (initialGeometry === void 0) {
-        initialGeometry = null;
-      }
-
       var getInitialLayerDrawModes = function getInitialLayerDrawModes(startorEnd) {
         return initialGeometry && initialGeometry[startorEnd] ? getDrawModeFromSelectionType(initialGeometry[startorEnd].features[0].properties.selectionType) : null;
       };
@@ -697,10 +694,10 @@
 
       var _c = __read(React__namespace.useState(function () {
         return {
-          start: addFeatureProperties(initialGeometry && initialGeometry.start, featurePropsStart),
-          end: addFeatureProperties(initialGeometry && initialGeometry.end, featurePropsEnd),
-          intersectionStart: addFeatureProperties(initialGeometry && initialGeometry.intersectionStart, featurePropsIntersectionStart),
-          intersectionEnd: addFeatureProperties(initialGeometry && initialGeometry.intersectionEnd, featurePropsIntersectionEnd),
+          start: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.start, featurePropsStart),
+          end: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.end, featurePropsEnd),
+          intersectionStart: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.intersectionStart, featurePropsIntersectionStart),
+          intersectionEnd: addFeatureProperties(initialGeometry === null || initialGeometry === void 0 ? void 0 : initialGeometry.intersectionEnd, featurePropsIntersectionEnd),
           fir: addFeatureProperties(getFir(), featurePropsFIR)
         };
       }), 2),
@@ -1733,9 +1730,7 @@
       var isDisabled = _a.isDisabled,
           isReadOnly = _a.isReadOnly,
           _b = _a.onChange,
-          _onChange = _b === void 0 ? function () {
-        return null;
-      } : _b,
+          _onChange = _b === void 0 ? function () {} : _b,
           productType = _a.productType;
 
       var _c = reactHookForm.useFormContext(),
@@ -2213,12 +2208,10 @@
           isReadOnly = _a.isReadOnly,
           helperText = _a.helperText,
           _b = _a.onChange,
-          onChange = _b === void 0 ? function () {
-        return null;
-      } : _b;
+          onChange = _b === void 0 ? function () {} : _b;
       var watch = reactHookForm.useFormContext().watch;
       var label = getFieldLabel('Date and time', isReadOnly);
-      return (!isReadOnly || watch('observationOrForecastTime') !== null) && /*#__PURE__*/React__default["default"].createElement(ProductFormFieldLayout, {
+      return !isReadOnly || watch('observationOrForecastTime') !== null ? /*#__PURE__*/React__default["default"].createElement(ProductFormFieldLayout, {
         title: "At"
       }, /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormDateTime, {
         disablePast: watch('isObservationOrForecast') === 'FCST',
@@ -2241,7 +2234,7 @@
         helperText: helperText,
         onChange: onChange,
         sx: styles$2.helperText
-      }));
+      })) : null;
     };
 
     var Phenomenon = function Phenomenon(_a) {
@@ -2249,9 +2242,7 @@
           isDisabled = _a.isDisabled,
           isReadOnly = _a.isReadOnly,
           _b = _a.onChange,
-          _onChange = _b === void 0 ? function () {
-        return null;
-      } : _b;
+          _onChange = _b === void 0 ? function () {} : _b;
 
       var _c = reactHookForm.useFormContext(),
           getValues = _c.getValues,
@@ -2334,7 +2325,7 @@
           watch = _c.watch;
 
       var isDraft = shared.useDraftFormHelpers().isDraft;
-      return !isReadOnly && /*#__PURE__*/React__default["default"].createElement(ProductFormFieldLayout, {
+      return !isReadOnly ? /*#__PURE__*/React__default["default"].createElement(ProductFormFieldLayout, {
         title: "Start position",
         sx: styles$2.drawSection,
         "data-testid": "startGeometry"
@@ -2376,7 +2367,7 @@
         }
       }), /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormHiddenInput, {
         name: "startGeometryIntersect"
-      }));
+      })) : null;
     };
 
     /* *
@@ -2450,9 +2441,7 @@
           geoJSONs = _a.geoJSONs,
           setDrawModeType = _a.setDrawModeType,
           _d = _a.onChange,
-          _onChange = _d === void 0 ? function () {
-        return null;
-      } : _d;
+          _onChange = _d === void 0 ? function () {} : _d;
 
       var _e = reactHookForm.useFormContext(),
           watch = _e.watch,
@@ -2791,9 +2780,7 @@
           isDisabled = _a.isDisabled,
           isReadOnly = _a.isReadOnly,
           _b = _a.onChange,
-          _onChange = _b === void 0 ? function () {
-        return null;
-      } : _b;
+          _onChange = _b === void 0 ? function () {} : _b;
 
       var _c = reactHookForm.useFormContext(),
           getValues = _c.getValues,
@@ -2867,9 +2854,7 @@
           isDisabled = _a.isDisabled,
           isReadOnly = _a.isReadOnly,
           _b = _a.onChange,
-          _onChange = _b === void 0 ? function () {
-        return null;
-      } : _b;
+          _onChange = _b === void 0 ? function () {} : _b;
 
       var _c = reactHookForm.useFormContext(),
           getValues = _c.getValues,
@@ -3041,9 +3026,7 @@
       var isDisabled = _a.isDisabled,
           isReadOnly = _a.isReadOnly,
           _b = _a.onChange,
-          _onChange = _b === void 0 ? function () {
-        return null;
-      } : _b;
+          _onChange = _b === void 0 ? function () {} : _b;
 
       var isRequired = shared.useDraftFormHelpers().isRequired;
       var visibilityLabel = getFieldLabel('Visibility', isReadOnly);
@@ -3297,9 +3280,7 @@
       var isDisabled = _a.isDisabled,
           isReadOnly = _a.isReadOnly,
           _b = _a.onChange,
-          _onChange = _b === void 0 ? function () {
-        return null;
-      } : _b;
+          _onChange = _b === void 0 ? function () {} : _b;
 
       var _c = reactHookForm.useFormContext(),
           watch = _c.watch,
@@ -3949,6 +3930,10 @@
       })), /*#__PURE__*/React__namespace.createElement(core.LegendConnect, {
         showMapId: true,
         mapId: mapId
+      }), /*#__PURE__*/React__namespace.createElement(core.DockedLayerManagerConnect, {
+        mapId: mapId,
+        bounds: "parent",
+        source: "module"
       }));
     };
 
@@ -4034,7 +4019,7 @@
         end: initialSigmet.endGeometry,
         intersectionStart: initialSigmet.startGeometryIntersect,
         intersectionEnd: initialSigmet.endGeometryIntersect
-      } : null;
+      } : undefined;
 
       var _j = useDrawMode(initialGeometry),
           drawMode = _j.drawMode,
@@ -4243,7 +4228,7 @@
       var initialGeometry = initialAirmet && !isCancelAirmet ? {
         start: initialAirmet.startGeometry,
         intersectionStart: initialAirmet.startGeometryIntersect
-      } : null;
+      } : undefined;
 
       var _j = useDrawMode(initialGeometry),
           drawMode = _j.drawMode,
@@ -4530,10 +4515,6 @@
     };
 
     var getStatusTagList = function getStatusTagList(product, cancelsSeqId) {
-      if (cancelsSeqId === void 0) {
-        cancelsSeqId = null;
-      }
-
       if (cancelsSeqId !== null) {
         return /*#__PURE__*/React__default["default"].createElement(shared.StatusTag, {
           content: "cancels " + cancelsSeqId,
@@ -5138,10 +5119,10 @@
       // Ensure there is a valid start/end date
       if (!isInstanceOfCancelSigmetOrAirmet(product) && (!product.validDateStart || !product.validDateEnd)) {
         var defaultHoursValid = getDefaultHoursValid(productType);
-        return __assign({
+        return __assign(__assign({}, product), {
           validDateStart: moment__default["default"].utc().add(VALID_FROM_TIME_DELAY_IN_MINUTES, 'minutes').format('YYYY-MM-DDTHH:mm:ss[Z]'),
           validDateEnd: moment__default["default"].utc().add(defaultHoursValid, 'hour').add(VALID_FROM_TIME_DELAY_IN_MINUTES, 'minutes').format('YYYY-MM-DDTHH:mm:ss[Z]')
-        }, product);
+        });
       }
 
       return product;

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

@@ -1,12 +1,12 @@
 import { SetMapDrawModes, MapGeoJSONS, MapDrawMode, StartOrEndDrawing } from '../../types';
-export declare const useDrawMode: (initialGeometry?: any) => {
+export declare const useDrawMode: (initialGeometry?: MapGeoJSONS | undefined) => {
     geoJSONs: MapGeoJSONS;
     setLayerGeoJSONs: (geoJSONs: MapGeoJSONS) => void;
     layerDrawModes: SetMapDrawModes;
     setLayersDrawModes: (layerDrawModes: SetMapDrawModes) => void;
     drawMode: SetMapDrawModes;
     setDrawMode: (drawMode: SetMapDrawModes) => void;
-    setDrawModeType: (mapDrawMode: MapDrawMode, startOrEnd: StartOrEndDrawing, updateCallback?: (mapGeoJSONS: MapGeoJSONS) => void) => void;
+    setDrawModeType: (mapDrawMode: MapDrawMode, startOrEnd: StartOrEndDrawing, updateCallback?: ((mapGeoJSONS: MapGeoJSONS) => void) | undefined) => void;
 };
 /**
  * Returns the intersection of two features. In case of a polygon, only the first feature is used.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "4.6.1",
+  "version": "4.7.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,23 +14,24 @@
     "react": "^17.0.2",
     "react-redux": "^8.0.4",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/shared": "4.6.1",
-    "@opengeoweb/theme": "4.6.1",
+    "@opengeoweb/shared": "4.7.0",
+    "@opengeoweb/theme": "4.7.0",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",
-    "@opengeoweb/form-fields": "4.6.1",
+    "@opengeoweb/form-fields": "4.7.0",
     "react-hook-form": "^6.12.1",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
     "@mui/x-date-pickers": "^5.0.4",
     "lodash": "^4.17.20",
     "axios": "^0.25.0",
-    "@opengeoweb/core": "4.6.1",
-    "@opengeoweb/webmap": "4.6.1",
+    "date-fns": "^2.29.3",
+    "@opengeoweb/core": "4.7.0",
+    "@opengeoweb/webmap": "4.7.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "@opengeoweb/api": "4.6.1",
+    "@opengeoweb/api": "4.7.0",
     "react-intl": "^5.17.5",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.0",