@opengeoweb/sigmet-airmet 9.25.3 → 9.27.0

package/index.esm.js

@@ -8,7 +8,7 @@ import { useApiContext, useApi, createApiInstance, createNonAuthApiInstance, cre
 import { defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, defaultPoint, addGeoJSONProperties, defaultBox, defaultPolygon, DRAWMODE, addSelectionTypeToGeoJSON, defaultDelete, getIcon, MapControls, MapViewLayer, useMapDrawTool, addFeatureProperties, rewindGeometry } from '@opengeoweb/webmap-react';
 import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
-import { dateUtils, ToggleMenu, CustomTooltip, useIsMounted, StatusTag, AlertBanner, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
+import { PROJECTION, dateUtils, ToggleMenu, CustomTooltip, useIsMounted, StatusTag, AlertBanner, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
 import { LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, TimeSliderConnect, LegendConnect, LayerManagerConnect } from '@opengeoweb/core';
 import { DrawFIRLand, ChevronLeft, Edit, Success, Clock } from '@opengeoweb/theme';
 import { LayerType, webmapUtils } from '@opengeoweb/webmap';
@@ -2890,7 +2890,7 @@ const srsAndBboxDefault = {
     top: 11688874,
     bottom: 5930186
   },
-  srs: 'EPSG:3857'
+  srs: PROJECTION.EPSG_3857.value
 };
 const featurePropsStart = defaultGeoJSONStyleProperties;
 const featurePropsEnd = {
@@ -2957,9 +2957,6 @@ const getMaxHoursOfValidity = (phenomenon, fir, config) => {
 const getValidFromDelayTimeMinutesFromConfig = config => {
   return config.valid_from_delay_minutes;
 };
-const getDefaultValidityMinutesFromConfig = config => {
-  return config.default_validity_minutes;
-};
 const getOmitChangeFromConfig = config => {
   return config.omit_change_va_and_rdoact_cloud === true;
 };
@@ -4329,7 +4326,7 @@ const Progress = ({
   const intersectingPolygonPointsTotal = interceptionGeometry && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
   const showMaxFeaturePointsWarning = intersectionPointCount > 7 && hasMaxFeaturePoints(geoJSONIntersection, maxPoints) && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   const showMoreThan6PointsWarning = totalDrawnPoints > 7 && intersectionPointCount < 1 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
-  const showIntersectionAbove6PointsWarning = intersectingPolygonPointsTotal > 7 && intersectionPointCount > 6 && maxPoints > 7 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
+  const showIntersectionAbove6PointsWarning = intersectingPolygonPointsTotal > 7 && intersectionPointCount > 1 && maxPoints > 7 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   return jsx(ProductFormFieldLayout, Object.assign({
     title: t('progress'),
     sx: styles$2.containerItem
@@ -4686,7 +4683,7 @@ const StartGeometry = ({
   const intersectingPolygonPointsTotal = interceptionGeometry && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
   const showMaxFeaturePointsWarning = intersectionPointCount > 7 && hasMaxFeaturePoints(geoJSONIntersection, maxPoints) && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   const showMoreThan6PointsWarning = totalDrawnPoints > 7 && intersectionPointCount < 1 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
-  const showIntersectionAbove6PointsWarning = intersectingPolygonPointsTotal > 7 && intersectionPointCount > 6 && maxPoints > 7 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
+  const showIntersectionAbove6PointsWarning = intersectingPolygonPointsTotal > 7 && intersectionPointCount > 1 && maxPoints > 7 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   return !_isReadOnly ? jsxs(ProductFormFieldLayout, Object.assign({
     title: t('start-position'),
     sx: styles$2.drawSection,
@@ -4798,9 +4795,16 @@ const getValidFromXHoursBeforeMessage = hours => translateKeyOutsideComponents('
 });
 const getDefaultValidFromValue = productConfig => {
   const validFromDelayTimeMinutes = getValidFromDelayTimeMinutesFromConfig(productConfig);
-  return dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
+  const dateWithDelay = dateUtils.add(dateUtils.utc(), {
     minutes: validFromDelayTimeMinutes
-  }));
+  });
+  const minutes = dateWithDelay.getUTCMinutes();
+  // Calculate the minutes needed to round up to the next half hour
+  const extraMinutes = minutes <= 30 ? 30 - minutes : 60 - minutes;
+  const roundedDate = dateUtils.add(dateWithDelay, {
+    minutes: extraMinutes
+  });
+  return dateUtils.dateToString(roundedDate);
 };
 const ValidFrom = ({
   productConfig,
@@ -4849,12 +4853,16 @@ const ValidFrom = ({
   }));
 };
 
-const getDefaultValidUntilValue = productConfig => {
-  const defaultValidityMinutes = getDefaultValidityMinutesFromConfig(productConfig);
-  const validFromDelayTimeMinutes = getValidFromDelayTimeMinutesFromConfig(productConfig);
-  return dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
-    minutes: defaultValidityMinutes + validFromDelayTimeMinutes
-  }));
+const getDefaultValidUntilValue = (productConfig, phenomenon, fir, validFrom) => {
+  const maxHoursOfValidity = getMaxHoursOfValidity(phenomenon, fir || '', productConfig);
+  // Set default validity to 2 hours for thunderstorms, otherwise use maxHoursOfValidity
+  const 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;
+  // Use validFrom if provided, otherwise use current UTC time
+  const baseDate = validFrom ? new Date(validFrom) : dateUtils.utc();
+  const dateWithValidity = dateUtils.add(baseDate, {
+    hours: defaultHoursOfValidity
+  });
+  return dateUtils.dateToString(dateWithValidity);
 };
 const ValidUntil = ({
   productConfig,
@@ -4867,13 +4875,33 @@ const ValidUntil = ({
   } = useSigmetAirmetTranslation();
   const {
     getValues,
-    trigger
+    trigger,
+    watch,
+    setValue
   } = useFormContext();
   const {
     isRequired
   } = useDraftFormHelpers();
   const dateAndTime = t('date-and-time');
   const label = getFieldLabel(dateAndTime, isReadOnly);
+  const [defaultValidUntilValue, setDefaultValidUntilValue] = React__default.useState(getDefaultValidUntilValue(productConfig, getValues('phenomenon'), getValues('locationIndicatorATSR'), getValues('validDateStart')));
+  const phenomenon = watch('phenomenon');
+  const locationIndicatorATSR = watch('locationIndicatorATSR');
+  const validFrom = watch('validDateStart');
+  React__default.useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    const updateValues = () => {
+      const newDefaultValidUntilValue = getDefaultValidUntilValue(productConfig, phenomenon, locationIndicatorATSR, validFrom);
+      if (newDefaultValidUntilValue !== defaultValidUntilValue) {
+        setDefaultValidUntilValue(newDefaultValidUntilValue);
+        setValue('validDateEnd', newDefaultValidUntilValue, {
+          shouldValidate: false
+        });
+        trigger('validDateEnd');
+      }
+    };
+    updateValues();
+  }, [phenomenon, locationIndicatorATSR, validFrom, setValue, productConfig, trigger, defaultValidUntilValue]);
   return jsx(ProductFormFieldLayout, Object.assign({
     title: t('valid-until')
   }, {
@@ -4881,14 +4909,12 @@ const ValidUntil = ({
       disablePast: true,
       name: "validDateEnd",
       label: label,
-      defaultNullValue: getDefaultValidUntilValue(productConfig),
+      defaultNullValue: defaultValidUntilValue,
       rules: {
         validate: {
           isRequired,
           isValidDate: dateUtils.isValidIsoDateString,
-          // Validity end has to be after validity start
           isAfter: value => value ? dateUtils.isAfter(value, getValues('validDateStart')) || t('valid-until-time') : true,
-          // Validity end can be no more than 4 hours after validity start (6 for VA/TC SIGMET)
           isXHoursAfter: value => isXHoursAfter(value, getValues('validDateStart'), getMaxHoursOfValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig)) || t('valid-until-time-error', {
             hours: getMaxHoursOfValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig)
           })
@@ -4897,11 +4923,13 @@ const ValidUntil = ({
       disabled: isDisabled,
       isReadOnly: isReadOnly,
       onChange: () => {
+        // Trigger validation after any change
         triggerValidations(['validDateStart', 'observationOrForecastTime'], getValues, trigger);
         _onChange();
       },
+      "data-testid": "valid-until",
       sx: styles$2.helperText
-    })
+    }, defaultValidUntilValue)
   }));
 };
 
@@ -5702,11 +5730,28 @@ const useTAC = (initialProduct, getTAC, hasErrors = () => false, omitChange) =>
   };
   return [TAC, delayedQuery];
 };
+const getSequenceStyling = (product, hasTac = false) => {
+  if (hasTac && !product || product && product.status === 'DRAFT') {
+    return {
+      fontWeight: 'lighter',
+      color: 'geowebColors.typographyAndIcons.inactiveText'
+    };
+  }
+  return {};
+};
 const ProductFormTAC = ({
-  tac
+  tac,
+  product
 }) => {
+  var _a;
+  const {
+    t
+  } = useSigmetAirmetTranslation();
+  const noTAC = t('tac-missing-data');
   const tacLines = tac.split('\n');
-  const hasTac = tacLines.length && tacLines.toString() !== noTAC;
+  const hasTac = tacLines.length > 0 && tac !== noTAC;
+  const sequenceNumberInTac = hasTac ? (_a = tacLines[0].split(' ')[2]) !== null && _a !== void 0 ? _a : null : null;
+  const sequenceStyle = getSequenceStyling(product, hasTac);
   return jsx(Typography, Object.assign({
     variant: "body2",
     component: "div",
@@ -5716,21 +5761,24 @@ const ProductFormTAC = ({
     },
     "data-testid": "productform-tac-message"
   }, {
-    children: tacLines.map(line => jsx(Box, Object.assign({
+    children: jsx(Box, Object.assign({
       component: "p",
       sx: {
         margin: 0,
-        fontSize: hasTac ? '1.125rem' : '1rem',
+        fontSize: '1.125rem',
         fontWeight: 'normal',
-        fontStretch: 'normal',
-        fontStyle: 'normal',
         lineHeight: 1.56,
         letterSpacing: '0.5px'
       },
       "data-testid": "productform-tac-message-line"
     }, {
-      children: line
-    }), line))
+      children: tac.split(' ').map((word, index) => jsx(Box, Object.assign({
+        component: "span",
+        sx: hasTac && word === sequenceNumberInTac ? sequenceStyle : {}
+      }, {
+        children: word + (index < tac.split(' ').length - 1 ? ' ' : '')
+      }), index))
+    }))
   }));
 };
 
@@ -5769,7 +5817,8 @@ const IssuedAt = ({
 
 const Tac = ({
   tac,
-  children
+  children,
+  product
 }) => {
   return jsx(ProductFormFieldLayout, Object.assign({
     title: "TAC",
@@ -5782,7 +5831,8 @@ const Tac = ({
       xs: 12
     }, {
       children: [jsx(ProductFormTAC, {
-        tac: tac
+        tac: tac,
+        product: product
       }), children]
     }))
   }));
@@ -10002,7 +10052,8 @@ const SigmetForm = ({
   initialCancelSigmet: _initialCancelSigmet = null,
   showMap: _showMap = true,
   productConfig: _productConfig = sigmetConfig,
-  setDialogActionsDisabled
+  setDialogActionsDisabled,
+  product
 }) => {
   const {
     t
@@ -10251,7 +10302,8 @@ const SigmetForm = ({
       date: getProductIssueDate(_initialSigmet, _initialCancelSigmet),
       isReadOnly: isReadOnly
     }), jsxs(Tac, Object.assign({
-      tac: tac
+      tac: tac,
+      product: product
     }, {
       children: [jsx(ReactHookFormHiddenInput, {
         name: "sequence",
@@ -10334,7 +10386,8 @@ const AirmetForm = ({
   initialAirmet: _initialAirmet = null,
   initialCancelAirmet: _initialCancelAirmet = null,
   showMap: _showMap = true,
-  productConfig: _productConfig = airmetConfig
+  productConfig: _productConfig = airmetConfig,
+  product
 }) => {
   const {
     api
@@ -10524,7 +10577,8 @@ const AirmetForm = ({
       isReadOnly: isReadOnly,
       date: getProductIssueDate(_initialAirmet, _initialCancelAirmet)
     }), jsxs(Tac, Object.assign({
-      tac: tac
+      tac: tac,
+      product: product
     }, {
       children: [jsx(ReactHookFormHiddenInput, {
         name: "sequence",
@@ -11306,13 +11360,15 @@ const ProductFormDialogContent = ({
       initialSigmet: product !== null && !isInstanceOfCancelSigmet(product) ? product : null,
       initialCancelSigmet: product !== null && isInstanceOfCancelSigmet(product) ? product : null,
       productConfig: productConfig,
-      setDialogActionsDisabled: setDialogActionsDisabled
+      setDialogActionsDisabled: setDialogActionsDisabled,
+      product: product
     }) : jsx(AirmetForm, {
       mode: mode,
       isCancelAirmet: product !== null && isInstanceOfCancelAirmet(product),
       initialAirmet: product !== null && !isInstanceOfCancelAirmet(product) ? product : null,
       initialCancelAirmet: product !== null && isInstanceOfCancelAirmet(product) ? product : null,
-      productConfig: productConfig
+      productConfig: productConfig,
+      product: product
     }), jsx(DraftFieldHelper, {}), jsx(Backdrop, Object.assign({
       "data-testid": "loader",
       open: showLoader,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "9.25.3",
+  "version": "9.27.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -30,7 +30,9 @@
     "react-i18next": "^14.1.2"
   },
   "peerDependencies": {
-    "react": "18"
+    "react": "18",
+    "@emotion/react": "*",
+    "@emotion/styled": "*"
   },
   "module": "./index.esm.js",
   "type": "module",

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

@@ -5,7 +5,7 @@ export declare const srsAndBboxDefault: {
         top: number;
         bottom: number;
     };
-    srs: string;
+    srs: "EPSG:3857";
 };
 export declare const simplePolygonGeoJSON: GeoJSON.FeatureCollection;
 export declare const simplePolygonGeoJSONHalfOfNL: GeoJSON.FeatureCollection;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormMode, Airmet, CancelAirmet, ProductConfig } from '../../../types';
+import { FormMode, Airmet, CancelAirmet, ProductConfig, AviationProduct } from '../../../types';
 export interface AirmetFormProps {
     mode: FormMode;
     isCancelAirmet?: boolean;
@@ -7,6 +7,7 @@ export interface AirmetFormProps {
     initialCancelAirmet?: CancelAirmet;
     showMap?: boolean;
     productConfig?: ProductConfig;
+    product?: AviationProduct;
 }
 declare const AirmetForm: React.FC<AirmetFormProps>;
 export default AirmetForm;

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

@@ -1,7 +1,9 @@
 import React from 'react';
+import { AviationProduct } from '../../../types';
 interface TacProps {
     tac: string;
     children: React.ReactNode;
+    product?: AviationProduct;
 }
 declare const Tac: React.FC<TacProps>;
 export default Tac;

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

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ConfigurableFormFieldProps, ProductConfig } from '../../../types';
-export declare const getDefaultValidUntilValue: (productConfig: ProductConfig) => string;
+export declare const getDefaultValidUntilValue: (productConfig: ProductConfig, phenomenon?: string, fir?: string, validFrom?: string) => string;
 declare const ValidUntil: React.FC<ConfigurableFormFieldProps>;
 export default ValidUntil;

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

@@ -11,6 +11,14 @@ export declare const useTAC: (initialProduct: AviationProduct, getTAC: (product:
 }>, hasErrors?: () => boolean, omitChange?: boolean) => [string, any];
 interface ProductFormTACProps {
     tac: string;
+    product?: AviationProduct;
 }
+export declare const getSequenceStyling: (product?: ProductFormTACProps['product'], hasTac?: boolean) => {
+    fontWeight: string;
+    color: string;
+} | {
+    fontWeight?: undefined;
+    color?: undefined;
+};
 declare const ProductFormTAC: React.FC<ProductFormTACProps>;
 export default ProductFormTAC;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CancelSigmet, Sigmet, FormMode, ProductConfig } from '../../../types';
+import { CancelSigmet, Sigmet, FormMode, ProductConfig, AviationProduct } from '../../../types';
 export interface SigmetFormProps {
     mode: FormMode;
     isCancelSigmet?: boolean;
@@ -8,6 +8,7 @@ export interface SigmetFormProps {
     showMap?: boolean;
     productConfig?: ProductConfig;
     setDialogActionsDisabled?: (disabled: boolean) => void;
+    product?: AviationProduct;
 }
 declare const SigmetForm: React.FC<SigmetFormProps>;
 export default SigmetForm;