@opengeoweb/sigmet-airmet 9.25.2 → 9.26.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';
@@ -2315,6 +2315,7 @@ var StartOrEndDrawing;
  *
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 const styles$2 = {
   label: {
@@ -2521,6 +2522,7 @@ const ProductFormFieldLayout = _a => {
  *
  * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 const useShortTestHelpers = () => {
   const {
@@ -2888,7 +2890,7 @@ const srsAndBboxDefault = {
     top: 11688874,
     bottom: 5930186
   },
-  srs: 'EPSG:3857'
+  srs: PROJECTION.EPSG_3857.value
 };
 const featurePropsStart = defaultGeoJSONStyleProperties;
 const featurePropsEnd = {
@@ -4327,7 +4329,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
@@ -4684,7 +4686,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,
@@ -5700,11 +5702,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",
@@ -5714,21 +5733,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))
+    }))
   }));
 };
 
@@ -5767,7 +5789,8 @@ const IssuedAt = ({
 
 const Tac = ({
   tac,
-  children
+  children,
+  product
 }) => {
   return jsx(ProductFormFieldLayout, Object.assign({
     title: "TAC",
@@ -5780,7 +5803,8 @@ const Tac = ({
       xs: 12
     }, {
       children: [jsx(ProductFormTAC, {
-        tac: tac
+        tac: tac,
+        product: product
       }), children]
     }))
   }));
@@ -9966,6 +9990,7 @@ const validateAirmet = airmetConfig => {
  *
  * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 const sigmetConfig = sigmetDefaultConfig;
 const airmetConfig = airmetDefaultConfig;
@@ -9999,7 +10024,8 @@ const SigmetForm = ({
   initialCancelSigmet: _initialCancelSigmet = null,
   showMap: _showMap = true,
   productConfig: _productConfig = sigmetConfig,
-  setDialogActionsDisabled
+  setDialogActionsDisabled,
+  product
 }) => {
   const {
     t
@@ -10248,7 +10274,8 @@ const SigmetForm = ({
       date: getProductIssueDate(_initialSigmet, _initialCancelSigmet),
       isReadOnly: isReadOnly
     }), jsxs(Tac, Object.assign({
-      tac: tac
+      tac: tac,
+      product: product
     }, {
       children: [jsx(ReactHookFormHiddenInput, {
         name: "sequence",
@@ -10331,7 +10358,8 @@ const AirmetForm = ({
   initialAirmet: _initialAirmet = null,
   initialCancelAirmet: _initialCancelAirmet = null,
   showMap: _showMap = true,
-  productConfig: _productConfig = airmetConfig
+  productConfig: _productConfig = airmetConfig,
+  product
 }) => {
   const {
     api
@@ -10521,7 +10549,8 @@ const AirmetForm = ({
       isReadOnly: isReadOnly,
       date: getProductIssueDate(_initialAirmet, _initialCancelAirmet)
     }), jsxs(Tac, Object.assign({
-      tac: tac
+      tac: tac,
+      product: product
     }, {
       children: [jsx(ReactHookFormHiddenInput, {
         name: "sequence",
@@ -11303,13 +11332,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,
@@ -12698,6 +12729,7 @@ $({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, {
  *
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 const fakeAirmetList = [{
   creationDate: '2020-09-17T12:00:00Z',
@@ -13699,6 +13731,7 @@ const fakeAirmetList = [{
  *
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 // TODO: [Loes Cornelis] Replace with correct strucutre and in JSON format - not js object
 const fakeSigmetList = [{

package/package.json

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

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/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;