@opengeoweb/sigmet-airmet 9.20.2 → 9.22.0

package/index.esm.js

@@ -3,7 +3,7 @@ import * as React from 'react';
 import React__default from 'react';
 import { FormControlLabel, Radio, Grid, Typography, Box, Button, Checkbox, MenuItem, FormHelperText, useTheme, Dialog, DialogTitle, DialogContent, Card, LinearProgress, List, ListItemButton, Backdrop, CircularProgress } from '@mui/material';
 import { useFormContext } from 'react-hook-form';
-import { useDraftFormHelpers, ReactHookFormRadioGroup, hasValidGeometry, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
+import { useDraftFormHelpers, ReactHookFormRadioGroup, hasValidGeometry, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, countIntersectionPoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import { useApiContext, useApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
 import { defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, defaultPoint, addGeoJSONProperties, defaultBox, defaultPolygon, DRAWMODE, addSelectionTypeToGeoJSON, defaultDelete, getIcon, MapControls, MapViewLayer, useMapDrawTool, addFeatureProperties, rewindGeometry } from '@opengeoweb/webmap-react';
 import { dateUtils, ToggleMenu, CustomTooltip, useIsMounted, StatusTag, AlertBanner, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
@@ -15,6 +15,8 @@ import { mapSelectors, syncGroupsActions, mapStoreActions, defaultLayers, syncCo
 import { LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, TimeSliderConnect, LegendConnect, LayerManagerConnect } from '@opengeoweb/core';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
 import { Box as Box$1 } from '@mui/system';
+import 'i18next';
+import 'react-i18next';
 
 var en = {
 	"sigmet-airmet": "sigmet"
@@ -28,7 +30,7 @@ var no = {
 var nl = {
 	"sigmet-airmet": "sigmet"
 };
-var sigmetAirmet = {
+var sigmetAirmetTranslations = {
 	en: en,
 	fi: fi,
 	no: no,
@@ -3696,6 +3698,7 @@ const StartGeometry = ({
   geoJSONIntersection,
   productConfig
 }) => {
+  var _a, _b;
   const {
     formState: {
       errors
@@ -3710,9 +3713,25 @@ const StartGeometry = ({
     isShortTest
   } = useShortTestHelpers();
   const getFIRValue = () => getValues('locationIndicatorATSR');
+  // Max points the FIR allows for a polygon
   const maxPoints = getMaxPolygonPoints(getFIRValue(), productConfig);
+  // Intersections with FIR
+  const intersectionPointCount = countIntersectionPoints(geoJSON, geoJSONIntersection);
+  const drawnGeometry = (_a = geoJSON === null || geoJSON === void 0 ? void 0 : geoJSON.features[0]) === null || _a === void 0 ? void 0 : _a.geometry;
+  const interceptionGeometry = (_b = geoJSONIntersection === null || geoJSONIntersection === void 0 ? void 0 : geoJSONIntersection.features[0]) === null || _b === void 0 ? void 0 : _b.geometry;
+  // Total points in the user drawn polygon
+  const totalDrawnPoints = drawnGeometry && drawnGeometry.coordinates[0] ? drawnGeometry.coordinates[0].length : 0;
+  // Total points in the intersection polygon
+  const intersectingPolygonPointsTotal = interceptionGeometry && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
   const maximumPointsMessage = `The start position drawing allows a maximum of ${maxPoints - 1} individual points`;
-  const showMaxFeaturePointsWarning = hasMaxFeaturePoints(geoJSONIntersection, 7) && !activeTool && !errors.startGeometry && !isFir(geoJSON);
+  const moreThan6PointsMessage = `The start/end position drawing has exceeded 6 individual points. The TAC has a total of ${totalDrawnPoints} points. If possible, reduce the number of points.`;
+  const intersectionAbove6PointsMessage = `The start/end position of the intersected polygon has 
+  ${intersectingPolygonPointsTotal} points, 
+  and the intersection of the drawn polygon with the FIR-boundary has exceeded 6 individual points.
+  Check if the TAC in the preview corresponds to the intended area.`;
+  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);
   return !_isReadOnly ? jsxs(ProductFormFieldLayout, Object.assign({
     title: "Start position",
     sx: styles$2.drawSection,
@@ -3738,6 +3757,16 @@ const StartGeometry = ({
       variant: "filled"
     }, {
       children: maxFeaturePointsMessage
+    })), /* non-blocking warnings */
+    showMoreThan6PointsWarning && jsx(FormHelperText, Object.assign({
+      variant: "filled"
+    }, {
+      children: moreThan6PointsMessage
+    })), /* non-blocking warnings */
+    showIntersectionAbove6PointsWarning && jsx(FormHelperText, Object.assign({
+      variant: "filled"
+    }, {
+      children: intersectionAbove6PointsMessage
     })), hasMulitpleIntersections(geoJSONIntersection) && !activeTool && !errors.startGeometry && !isFir(geoJSON) && jsx(FormHelperText, Object.assign({
       variant: "filled"
     }, {
@@ -3796,6 +3825,7 @@ const Progress = ({
   geoJSON,
   geoJSONIntersection
 }) => {
+  var _a, _b;
   const {
     watch,
     getValues,
@@ -3833,8 +3863,25 @@ const Progress = ({
   const isVolcanicCloud = watch('phenomenon') === 'VA_CLD';
   const isShortTestOrRdoact = isShortTest() || isRadioactiveCloud;
   const fieldsDisabled = _isDisabled || isShortTestOrRdoact;
+  // Max points the FIR allows for a polygon
   const maxPoints = getMaxPolygonPoints(getFIRValue(), productConfig);
+  // Intersections with FIR
+  const intersectionPointCount = countIntersectionPoints(geoJSON, geoJSONIntersection);
+  const drawnGeometry = (_a = geoJSON === null || geoJSON === void 0 ? void 0 : geoJSON.features[0]) === null || _a === void 0 ? void 0 : _a.geometry;
+  const interceptionGeometry = (_b = geoJSONIntersection === null || geoJSONIntersection === void 0 ? void 0 : geoJSONIntersection.features[0]) === null || _b === void 0 ? void 0 : _b.geometry;
+  // Total points in the user drawn polygon
+  const totalDrawnPoints = drawnGeometry && drawnGeometry.coordinates[0] ? drawnGeometry.coordinates[0].length : 0;
+  // Total points in the intersection polygon
+  const intersectingPolygonPointsTotal = interceptionGeometry && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
   const maximumPointsMessage = `The end position drawing allows a maximum of ${maxPoints - 1} individual points`;
+  const moreThan6PointsMessage = `The start/end position drawing has exceeded 6 individual points. The TAC has a total of ${totalDrawnPoints} points. If possible, reduce the number of points.`;
+  const intersectionAbove6PointsMessage = `The start/end position of the intersected polygon has 
+  ${intersectingPolygonPointsTotal} points, 
+  and the intersection of the drawn polygon with the FIR-boundary has exceeded 6 individual points.
+  Check if the TAC in the preview corresponds to the intended area.`;
+  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);
   return jsx(ProductFormFieldLayout, Object.assign({
     title: "Progress",
     sx: styles$2.containerItem
@@ -4005,10 +4052,20 @@ const Progress = ({
           }, {
             children: errors.endGeometry.message
           })), /* non-blocking warnings */
-          hasMaxFeaturePoints(geoJSONIntersection, 7) && !activeTool && !errors.endGeometry && !isFir(geoJSON) && jsx(FormHelperText, Object.assign({
+          showMaxFeaturePointsWarning && jsx(FormHelperText, Object.assign({
             variant: "filled"
           }, {
             children: maxFeaturePointsMessage
+          })), /* non-blocking warnings */
+          showMoreThan6PointsWarning && jsx(FormHelperText, Object.assign({
+            variant: "filled"
+          }, {
+            children: moreThan6PointsMessage
+          })), /* non-blocking warnings */
+          showIntersectionAbove6PointsWarning && jsx(FormHelperText, Object.assign({
+            variant: "filled"
+          }, {
+            children: intersectionAbove6PointsMessage
           })), hasMulitpleIntersections(geoJSONIntersection) && !activeTool && !errors.endGeometry && !isFir(geoJSON) && jsx(FormHelperText, Object.assign({
             variant: "filled"
           }, {
@@ -14539,4 +14596,6 @@ ConnectedModuleWrapper = null) => {
   }
 };
 
-export { AirmetComponentsLookUp, AirmetForm, AirmetPhenomena, AirmetType, CloudLevelUnits, ContentDialog, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductList, ProductListRow, ProductStatusDescription, SigmetComponentsLookUp, SigmetForm, SigmetPhenomena, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createApi$1 as createApi, createApi as createFakeApi, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, sigmetAirmet as saTranslations, sigmetConfig };
+const SA_NAMESPACE = 'sigmetairmet';
+
+export { AirmetComponentsLookUp, AirmetForm, AirmetPhenomena, AirmetType, CloudLevelUnits, ContentDialog, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductList, ProductListRow, ProductStatusDescription, SA_NAMESPACE, SigmetComponentsLookUp, SigmetForm, SigmetPhenomena, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createApi$1 as createApi, createApi as createFakeApi, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, sigmetAirmetTranslations as saTranslations, sigmetConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "9.20.2",
+  "version": "9.22.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -10,7 +10,7 @@
   "dependencies": {
     "@opengeoweb/api": "*",
     "@opengeoweb/shared": "*",
-    "@mui/material": "~5.15.11",
+    "@mui/material": "^5.16.0",
     "@opengeoweb/theme": "*",
     "@opengeoweb/store": "*",
     "@opengeoweb/webmap": "*",
@@ -26,8 +26,8 @@
     "@redux-eggs/redux-toolkit": "^2.2.0",
     "@redux-eggs/saga-extension": "^2.2.0",
     "@reduxjs/toolkit": "^1.9.7",
-    "i18next": "^23.7.11",
-    "react-i18next": "^13.5.0"
+    "i18next": "^23.11.5",
+    "react-i18next": "^14.1.2"
   },
   "peerDependencies": {
     "react": "18"

package/src/index.d.ts

@@ -9,4 +9,5 @@ export { createApi as createFakeApi } from './lib/utils/fakeApi';
 export { sigmetConfig, airmetConfig } from './lib/utils/config';
 export * from './lib/types';
 export * from './lib/components/ComponentsLookUp';
+export { SA_NAMESPACE } from './lib/utils/i18n';
 export { saTranslations };

package/src/lib/utils/i18n.d.ts

@@ -1,2 +1,3 @@
 export declare const SA_NAMESPACE = "sigmetairmet";
 export declare const initSigmetAirmetI18n: () => void;
+export declare const translateKeyOutsideComponents: (key: string, params?: Record<string, string | number> | undefined) => string;