@opengeoweb/sigmet-airmet 12.5.0 → 12.7.0

package/index.esm.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { createApiInstance, useApiContext, useApi, ApiProvider, createFakeApiInstance } from '@opengeoweb/api';
-import { PROJECTION, useIsMounted, dateUtils, CustomTooltip, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, CustomDialog, AlertBanner, isAxiosError, getAxiosErrorMessage, StatusTag, usePoller, ErrorBoundary } from '@opengeoweb/shared';
+import { PROJECTION, useIsMounted, dateUtils, CustomTooltip, usePrevious, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, CustomDialog, AlertBanner, isAxiosError, getAxiosErrorMessage, StatusTag, usePoller, ErrorBoundary } from '@opengeoweb/shared';
 import { Box as Box$1 } from '@mui/system';
 import * as React from 'react';
 import React__default, { useRef, useEffect, useCallback } from 'react';
@@ -133,7 +133,7 @@ var en = {
 	"levels-upper-level-label": "Upper level",
 	"unit-label": "Unit",
 	"levels-lower-level-label": "Lower level",
-	"levels-tops-label": "Tops",
+	"levels-tops-label": "Top",
 	progress: "Progress",
 	"surface-visibility": "Visibility",
 	"surface-visibility-cause": "Cause",
@@ -383,7 +383,7 @@ var no = {
 	"levels-upper-level-label": "Øvre nivå",
 	"unit-label": "Enhet",
 	"levels-lower-level-label": "Nedre nivå",
-	"levels-tops-label": "Topper",
+	"levels-tops-label": "Topp",
 	progress: "Framgang",
 	"surface-visibility": "Sikt",
 	"surface-visibility-cause": "Grunn",
@@ -4850,6 +4850,17 @@ var hasMaxFeaturePoints = function hasMaxFeaturePoints(geojson, maxPoints) {
   }
   return false;
 };
+// Uses same logic as the backend
+// https://gitlab.com/opengeoweb/avi-msgconverter/geoweb-knmi-avi-messageservices/-/blob/master/src/main/java/nl/knmi/geoweb/backend/product/sigmetairmet/SigmetAirmetUtils.java?ref_type=heads#L440
+function getTacGeometry(_ref) {
+  var startGeometry = _ref.startGeometry,
+    startGeometryIntersect = _ref.startGeometryIntersect,
+    maxPoints = _ref.maxPoints;
+  if (startGeometryIntersect && startGeometryIntersect.features.length > 0 && !hasMaxFeaturePoints(startGeometryIntersect, maxPoints)) {
+    return startGeometryIntersect;
+  }
+  return startGeometry;
+}
 var DEFAULT_MINIMUM_SURFACE_LEVEL = 0;
 var getMinCloudLevelValue = function getMinCloudLevelValue(unit, selectedFIR, productConfig) {
   // Use first FIR in list if no FIR selected
@@ -4997,13 +5008,13 @@ var getProductFormMode = function getProductFormMode(canBeOptions, productListIt
   }
   return canBeOptions.includes('PUBLISHED') ? 'edit' : 'view';
 };
-var getLifecycleActions = function getLifecycleActions(_ref) {
-  var canBe = _ref.canBe,
-    onButtonPress = _ref.onButtonPress,
-    productType = _ref.productType,
-    _ref$areActionsDisabl = _ref.areActionsDisabled,
-    areActionsDisabled = _ref$areActionsDisabl === void 0 ? false : _ref$areActionsDisabl,
-    t = _ref.t;
+var getLifecycleActions = function getLifecycleActions(_ref2) {
+  var canBe = _ref2.canBe,
+    onButtonPress = _ref2.onButtonPress,
+    productType = _ref2.productType,
+    _ref2$areActionsDisab = _ref2.areActionsDisabled,
+    areActionsDisabled = _ref2$areActionsDisab === void 0 ? false : _ref2$areActionsDisab,
+    t = _ref2.t;
   var hasDiscardButton = canBe.includes('DISCARDED');
   var onDiscard = function onDiscard() {
     return onButtonPress(ProductAction.DISCARD);
@@ -5055,7 +5066,7 @@ var hasValue = function hasValue(value) {
 };
 var prepareFormValues = function prepareFormValues(product) {
   return Object.keys(product).reduce(function (list, key) {
-    var _ref3;
+    var _ref4;
     var value = product[key];
     // remove hidden form values
     if (key === 'IS_DRAFT') {
@@ -5075,14 +5086,14 @@ var prepareFormValues = function prepareFormValues(product) {
     }
     // check if nested object has value
     if (typeof value === 'object' && value !== null && value !== undefined) {
-      var _ref2;
+      var _ref3;
       var hasNaNValue = Object.keys(value).reduce(function (total, valKey) {
         var keyValue = value[valKey];
         return !hasValue(String(keyValue)) || total;
       }, false);
-      return Object.assign({}, list, !hasNaNValue && (_ref2 = {}, _ref2[key] = value, _ref2));
+      return Object.assign({}, list, !hasNaNValue && (_ref3 = {}, _ref3[key] = value, _ref3));
     }
-    return Object.assign({}, list, hasValue(value) && (_ref3 = {}, _ref3[key] = value, _ref3));
+    return Object.assign({}, list, hasValue(value) && (_ref4 = {}, _ref4[key] = value, _ref4));
   }, {});
 };
 var createSigmetPostParameter = function createSigmetPostParameter(sigmetToPost, newStatus, previousUuid) {
@@ -5469,12 +5480,17 @@ var _validateLevelUnitCombinations = function validateLevelUnitCombinations(t, l
   }
   return true;
 };
+var tsPhenomena = new Set(['EMBD_TS', 'EMBD_TSGR', 'FRQ_TS', 'FRQ_TSGR', 'OBSC_TS', 'OBSC_TSGR', 'SQL_TS', 'SQL_TSGR', 'ISOL_TS', 'ISOL_TSGR', 'OCNL_TS', 'OCNL_TSGR']);
+var isTSPhenomenon = function isTSPhenomenon(phenomenon) {
+  return !!phenomenon && tsPhenomena.has(phenomenon);
+};
 var Levels = function Levels(_ref) {
   var isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
     _ref$onChange = _ref.onChange,
     _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
-    productConfig = _ref.productConfig;
+    productConfig = _ref.productConfig,
+    productType = _ref.productType;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   var _useFormContext = useFormContext(),
@@ -5495,6 +5511,37 @@ var Levels = function Levels(_ref) {
   var levelInfoMode = watch('levelInfoMode');
   var isRadioactiveCloud = watch('phenomenon') === 'RDOACT_CLD';
   var fieldsDisabled = isDisabled || isShortTest() || isRadioactiveCloud;
+  var phenomenon = watch('phenomenon');
+  var isTS = isTSPhenomenon(phenomenon);
+  var isSigmetTS = productType === 'sigmet' && isTS;
+  var prevPhenomenon = usePrevious(phenomenon);
+  React__default.useEffect(function () {
+    if (productType !== 'sigmet') {
+      return;
+    }
+    if (isSigmetTS) {
+      if (levelInfoMode === 'AT') {
+        setValue('levelInfoMode', 'TOPS', {
+          shouldDirty: true
+        });
+      } else if (levelInfoMode === 'ABV') {
+        setValue('levelInfoMode', 'TOPS_ABV', {
+          shouldDirty: true
+        });
+      }
+    }
+    if (!isTS && tsPhenomena.has(prevPhenomenon || '')) {
+      if (levelInfoMode === 'TOPS') {
+        setValue('levelInfoMode', 'AT', {
+          shouldDirty: true
+        });
+      } else if (levelInfoMode === 'TOPS_ABV') {
+        setValue('levelInfoMode', 'ABV', {
+          shouldDirty: true
+        });
+      }
+    }
+  }, [isSigmetTS, isTS, levelInfoMode, setValue, prevPhenomenon, productType]);
   var getFIRValue = function getFIRValue() {
     return getValues('locationIndicatorATSR');
   };
@@ -5554,12 +5601,15 @@ var Levels = function Levels(_ref) {
             control: jsx(Checkbox, {
               checked: levelInfoMode === 'TOPS',
               onChange: function onChange() {
-                setValue('levelInfoMode', getValues('levelInfoMode') === 'AT' ? 'TOPS' : 'AT', {
+                if (isSigmetTS) {
+                  return;
+                }
+                setValue('levelInfoMode', levelInfoMode === 'AT' ? 'TOPS' : 'AT', {
                   shouldDirty: true
                 });
               },
               color: "secondary",
-              disabled: isDisabled
+              disabled: isDisabled || isSigmetTS
             }),
             "data-testid": "levels-TOPS",
             label: t('levels-tops-label')
@@ -5870,11 +5920,14 @@ var Levels = function Levels(_ref) {
             control: jsx(Checkbox, {
               checked: levelInfoMode === 'TOPS_ABV',
               onChange: function onChange() {
-                setValue('levelInfoMode', getValues('levelInfoMode') === 'ABV' ? 'TOPS_ABV' : 'ABV', {
+                if (isSigmetTS) {
+                  return;
+                }
+                setValue('levelInfoMode', levelInfoMode === 'ABV' ? 'TOPS_ABV' : 'ABV', {
                   shouldDirty: true
                 });
               },
-              disabled: isDisabled
+              disabled: isDisabled || isSigmetTS
             }),
             label: t('levels-tops-label'),
             "data-testid": "levels-TOPS_ABV"
@@ -10655,7 +10708,7 @@ var fakeSigmetList = [{
     change: 'WKN',
     type: 'NORMAL',
     status: 'DRAFT',
-    levelInfoMode: 'AT',
+    levelInfoMode: 'TOPS',
     level: {
       value: 1000,
       unit: 'FT'
@@ -11297,6 +11350,74 @@ var fakeSigmetList = [{
       }]
     }
   }
+}, {
+  creationDate: dateUtils.getCurrentTimeAsString(),
+  canbe: ['CANCELLED'],
+  sigmet: {
+    uuid: '41d4dd4f-82bb-4944-a8f5-f8623329123dc',
+    phenomenon: 'EMBD_TS',
+    sequence: '10',
+    issueDate: '2020-09-17T12:00:00Z',
+    validDateStart: dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
+      hours: 1
+    })),
+    validDateEnd: dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
+      hours: 2
+    })),
+    firName: 'AMSTERDAM FIR',
+    locationIndicatorATSU: 'EHAA',
+    locationIndicatorATSR: 'EHAA',
+    locationIndicatorMWO: 'EHDB',
+    isObservationOrForecast: 'OBS',
+    observationOrForecastTime: dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
+      hours: 1
+    })),
+    movementType: 'STATIONARY',
+    change: 'WKN',
+    type: 'NORMAL',
+    status: 'PUBLISHED',
+    levelInfoMode: 'BETW',
+    vaSigmetVolcanoName: 'EYJAFJALLAJOKULL',
+    vaSigmetVolcanoCoordinates: {
+      latitude: 63.62,
+      longitude: -19.61
+    },
+    level: {
+      value: 2000,
+      unit: 'FT'
+    },
+    lowerLevel: {
+      value: 1000,
+      unit: 'FT'
+    },
+    firGeometry: getFir(sigmetConfig),
+    startGeometry: {
+      type: 'FeatureCollection',
+      features: [{
+        type: 'Feature',
+        properties: {
+          selectionType: 'poly'
+        },
+        geometry: {
+          type: 'Polygon',
+          coordinates: [[[4.799062887514267, 54.04327723979929], [6.006227982070749, 53.64012115183787], [4.6168492883359304, 53.32840097044425], [4.799062887514267, 54.04327723979929]]]
+        }
+      }]
+    },
+    startGeometryIntersect: {
+      type: 'FeatureCollection',
+      features: [{
+        type: 'Feature',
+        properties: {
+          selectionType: 'poly'
+        },
+        geometry: {
+          type: 'Polygon',
+          coordinates: [[[4.799062887514267, 54.04327723979929], [5.006227982070749, 54.03012115183787], [6.006227982070749, 53.64012115183787], [4.6168492883359304, 53.32840097044425], [4.799062887514267, 54.04327723979929]]]
+        }
+      }]
+    }
+  }
 }];
 ({
   sigmet: {
@@ -11837,4 +11958,4 @@ var createApi = function createApi() {
   return getApiRoutes(createFakeApiInstance());
 };
 
-export { AirmetComponentsLookUp, AirmetForm, AirmetType, CancelSigmetVolcanicMovements, CloudLevelUnits, DEFAULT_MINIMUM_SURFACE_LEVEL, DEFAULT_MIN_MOVEMENT_SPEED, DEFAULT_MIN_VISIBILITY, DEFAULT_MIN_WIND_SPEED, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductAction, ProductFormDialog, Wrapper as ProductFormDialogContent, ProductList, ProductListRow, ProductStatusDescription, SA_NAMESPACE, SigmetComponentsLookUp, SigmetForm, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createAirmetPostParameter, createApi$1 as createApi, createApi as createFakeApi, createSigmetPostParameter, extractUnitsToShow, fakeAirmetList, fakeSigmetList, firSelectionType, getActiveFIRArea, getAllFirAreas, getAllowedUnits, getBaseLayers, getConfirmationDialogButtonLabel, getConfirmationDialogCancelLabel, getConfirmationDialogContent, getConfirmationDialogTitle, getDefaultPhenomena, getDefaultValidUntilValue, getDefaultValidityMinutesFromConfig, getDialogtitle, getDrawTools, getFieldLabel, getFir, getFirArea, getFirOptions, getHoursBeforeValidity, getLevelInFeet, getLifecycleActions, getMaxCloudLevelValue, getMaxCloudLowerLevelValue, getMaxHoursOfValidity, getMaxLevelValue, getMaxMovementSpeedValue, getMaxPolygonPoints, getMaxVisibilityValue, getMaxWindSpeedValue, getMinCloudLevelValue, getMinCloudLowerLevelValue, getMinLevelValue, getMinMovementSpeedValue, getMinVisibilityValue, getMinWindSpeedValue, getOmitChangeFromConfig, getPhenomenon, getProductFormMode, getProductIssueDate, getProjection, getToolIcon, getValidFromDelayTimeMinutesFromConfig, hasMaxFeaturePoints, hasValue, isFir, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, isLevelLower, isVAPhenomenon, prepareCancelSigmet, prepareFormValues, prepareProductValues, sigmetAirmetTranslations as saTranslations, sigmetConfig, triggerValidations, updateDrawToolsWithFir, useDelayedFormValues, useFormLayers, useShortTestHelpers };
+export { AirmetComponentsLookUp, AirmetForm, AirmetType, CancelSigmetVolcanicMovements, CloudLevelUnits, DEFAULT_MINIMUM_SURFACE_LEVEL, DEFAULT_MIN_MOVEMENT_SPEED, DEFAULT_MIN_VISIBILITY, DEFAULT_MIN_WIND_SPEED, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductAction, ProductFormDialog, Wrapper as ProductFormDialogContent, ProductList, ProductListRow, ProductStatusDescription, SA_NAMESPACE, SigmetComponentsLookUp, SigmetForm, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createAirmetPostParameter, createApi$1 as createApi, createApi as createFakeApi, createSigmetPostParameter, extractUnitsToShow, fakeAirmetList, fakeSigmetList, firSelectionType, getActiveFIRArea, getAllFirAreas, getAllowedUnits, getBaseLayers, getConfirmationDialogButtonLabel, getConfirmationDialogCancelLabel, getConfirmationDialogContent, getConfirmationDialogTitle, getDefaultPhenomena, getDefaultValidFromValue, getDefaultValidUntilValue, getDefaultValidityMinutesFromConfig, getDialogtitle, getDrawTools, getFieldLabel, getFir, getFirArea, getFirOptions, getHoursBeforeValidity, getLevelInFeet, getLifecycleActions, getMaxCloudLevelValue, getMaxCloudLowerLevelValue, getMaxHoursOfValidity, getMaxLevelValue, getMaxMovementSpeedValue, getMaxPolygonPoints, getMaxVisibilityValue, getMaxWindSpeedValue, getMinCloudLevelValue, getMinCloudLowerLevelValue, getMinLevelValue, getMinMovementSpeedValue, getMinVisibilityValue, getMinWindSpeedValue, getOmitChangeFromConfig, getPhenomenon, getProductFormMode, getProductIssueDate, getProjection, getTacGeometry, getToolIcon, getValidFromDelayTimeMinutesFromConfig, getValidFromXHoursBeforeMessage, hasMaxFeaturePoints, hasValue, isFir, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, isLevelLower, isVAPhenomenon, prepareCancelSigmet, prepareFormValues, prepareProductValues, sigmetAirmetTranslations as saTranslations, sigmetConfig, triggerValidations, updateDrawToolsWithFir, useDelayedFormValues, useFormLayers, useShortTestHelpers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "12.5.0",
+  "version": "12.7.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,17 +8,17 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.5.0",
-    "@opengeoweb/shared": "12.5.0",
-    "@opengeoweb/theme": "12.5.0",
-    "@opengeoweb/store": "12.5.0",
-    "@opengeoweb/webmap": "12.5.0",
-    "@opengeoweb/webmap-react": "12.5.0",
+    "@opengeoweb/api": "12.7.0",
+    "@opengeoweb/shared": "12.7.0",
+    "@opengeoweb/theme": "12.7.0",
+    "@opengeoweb/store": "12.7.0",
+    "@opengeoweb/webmap": "12.7.0",
+    "@opengeoweb/webmap-react": "12.7.0",
     "react-redux": "^9.2.0",
-    "@opengeoweb/core": "12.5.0",
-    "@opengeoweb/authentication": "12.5.0",
+    "@opengeoweb/core": "12.7.0",
+    "@opengeoweb/authentication": "12.7.0",
     "@mui/system": "^7.0.1",
-    "@opengeoweb/form-fields": "12.5.0",
+    "@opengeoweb/form-fields": "12.7.0",
     "react-hook-form": "^7.50.1",
     "axios": "^1.7.7",
     "lodash": "^4.17.21",

package/src/index.d.ts

@@ -5,6 +5,7 @@ export * from './lib/components/MetInfoWrapper';
 export * from './lib/components/ProductForms';
 export * from './lib/components/ProductForms/ProductFormDialog';
 export * from './lib/components/ProductForms/ProductFormDialogContent';
+export * from './lib/components/ProductForms/ProductFormFields/ValidFrom';
 export * from './lib/components/ProductForms/ProductFormFields/ValidUntil';
 export * from './lib/components/ProductForms/SigmetForm/SigmetCancelVolcanicMovements';
 export * from './lib/components/ProductForms/utils';

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

@@ -7,4 +7,3 @@ 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/ProductForms/ProductFormFields/Levels.d.ts

@@ -10,5 +10,7 @@ export declare const getLevelInvalidStepsForMUnitMessage: (t: TFunction, value?:
 export declare const getInvalidUnitMessage: (t: TFunction) => string;
 export declare const validateLevels: (t: TFunction, value: string, unit: string, productConfig: ProductConfig, selectedFIR: string) => boolean | string;
 export declare const validateLevelUnitCombinations: (t: TFunction, levelUnit: string, lowerLevelUnit: string) => boolean | string;
+export declare const tsPhenomena: Set<string>;
+export declare const isTSPhenomenon: (phenomenon?: string) => boolean;
 declare const Levels: React.FC<ConfigurableFormFieldProps>;
 export default Levels;

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

@@ -17,6 +17,11 @@ export declare const getFirArea: (selectedFIR: string, productConfig: ProductCon
 export declare const getActiveFIRArea: (selectedFIR: string, productConfig: ProductConfig) => FIRConfigSigmet | FIRConfigAirmet;
 export declare const getMaxPolygonPoints: (selectedFIR: string, productConfig: ProductConfig) => number;
 export declare const hasMaxFeaturePoints: (geojson: GeoJSON.FeatureCollection, maxPoints: number) => boolean;
+export declare function getTacGeometry({ startGeometry, startGeometryIntersect, maxPoints, }: {
+    startGeometry: GeoJSON.FeatureCollection;
+    startGeometryIntersect?: GeoJSON.FeatureCollection;
+    maxPoints: number;
+}): GeoJSON.FeatureCollection;
 export declare const DEFAULT_MINIMUM_SURFACE_LEVEL = 0;
 export declare const getMinCloudLevelValue: (unit: string, selectedFIR: string, productConfig: AirmetConfig) => number;
 export declare const getMinCloudLowerLevelValue: (unit: string, selectedFIR: string, productConfig: AirmetConfig) => number;

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

@@ -1,10 +0,0 @@
-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;