@opengeoweb/sigmet-airmet 5.2.1 → 6.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "5.2.1",
+  "version": "6.0.1",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,17 +14,19 @@
   "dependencies": {
     "@mui/material": "5.12.0",
     "@mui/system": "5.12.0",
-    "@opengeoweb/api": "5.2.1",
-    "@opengeoweb/authentication": "5.2.1",
-    "@opengeoweb/core": "5.2.1",
-    "@opengeoweb/form-fields": "5.2.1",
-    "@opengeoweb/shared": "5.2.1",
-    "@opengeoweb/theme": "5.2.1",
+    "@opengeoweb/api": "6.0.1",
+    "@opengeoweb/authentication": "6.0.1",
+    "@opengeoweb/core": "6.0.1",
+    "@opengeoweb/form-fields": "6.0.1",
+    "@opengeoweb/shared": "6.0.1",
+    "@opengeoweb/store": "6.0.1",
+    "@opengeoweb/theme": "6.0.1",
+    "@opengeoweb/webmap": "6.0.1",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
     "@reduxjs/toolkit": "1.9.5",
     "@turf/turf": "6.5.0",
-    "axios": "1.4.0",
+    "axios": "1.2.0",
     "immer": "9.0.21",
     "lodash": "4.17.21",
     "moment": "2.29.4",

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

@@ -1,18 +1,10 @@
 import * as React from 'react';
-import { mapTypes, layerTypes } from '@opengeoweb/core';
-import { FeatureCollection, Polygon } from 'geojson';
-import { MapDrawMode, MapGeoJSONS, SetMapDrawModes } from '../../types';
+import { mapTypes, layerTypes } from '@opengeoweb/store';
+import { MapViewLayerProps } from '@opengeoweb/core';
 export interface MapViewGeoJsonProps {
-    geoJSONs: MapGeoJSONS;
     baseLayers?: layerTypes.Layer[];
     projection?: mapTypes.MapPreset['proj'];
-    setLayerGeoJSONs?: (geoJSONs: MapGeoJSONS) => void;
-    layerDrawModes?: SetMapDrawModes;
-    drawMode?: SetMapDrawModes;
-    setDrawMode?: (drawMode: SetMapDrawModes) => void;
-    exitDrawModeCallbackStart?: () => void;
-    exitDrawModeCallbackEnd?: () => void;
+    geoJSONLayers: MapViewLayerProps[];
 }
-export declare const allowOneGeoJSONFeature: (mode: MapDrawMode, geojson: FeatureCollection<Polygon>) => FeatureCollection<Polygon>;
 declare const MapViewGeoJson: React.FC<MapViewGeoJsonProps>;
 export default MapViewGeoJson;

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

@@ -1,4 +1,3 @@
-import { GeoJSONTemplate } from '../../types';
 export declare const srsAndBboxDefault: {
     bbox: {
         left: number;
@@ -10,13 +9,7 @@ export declare const srsAndBboxDefault: {
 };
 export declare const simplePolygonGeoJSON: GeoJSON.FeatureCollection;
 export declare const simplePolygonGeoJSONHalfOfNL: GeoJSON.FeatureCollection;
-export declare const featurePropsStart: {
-    stroke: string;
-    'stroke-width': number;
-    'stroke-opacity': number;
-    fill: string;
-    'fill-opacity': number;
-};
+export declare const featurePropsStart: import("geojson").GeoJsonProperties;
 export declare const featurePropsEnd: {
     stroke: string;
     'stroke-width': number;
@@ -24,19 +17,13 @@ export declare const featurePropsEnd: {
     fill: string;
     'fill-opacity': number;
 };
-export declare const featurePropsIntersectionStart: {
-    stroke: string;
-    'stroke-width': number;
-    'stroke-opacity': number;
-    fill: string;
-    'fill-opacity': number;
-};
+export declare const featurePropsIntersectionStart: import("geojson").GeoJsonProperties;
 export declare const featurePropsIntersectionEnd: {
+    'fill-opacity': number;
     stroke: string;
     'stroke-width': number;
     'stroke-opacity': number;
     fill: string;
-    'fill-opacity': number;
 };
 export declare const featurePropsFIR: {
     stroke: string;
@@ -52,4 +39,3 @@ export declare const featurePropsUnStyled: {
     fill: string;
     'fill-opacity': number;
 };
-export declare const geoJSONTemplate: GeoJSONTemplate;

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

@@ -1,9 +1,9 @@
 import React from 'react';
-import { MapDrawMode, StartOrEndDrawing } from '../../../types';
+import { EditMode } from '@opengeoweb/core';
 interface DrawToolsProps {
-    type?: StartOrEndDrawing | '';
-    drawMode: MapDrawMode;
-    setDrawMode: (newMapDrawMode: MapDrawMode) => void;
+    activeTool: string;
+    tools: EditMode[];
+    onChangeTool: (newToolMode: EditMode) => void;
 }
 declare const DrawTools: React.FC<DrawToolsProps>;
 export default DrawTools;

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import { MapDrawMode, StartOrEndDrawing, SetMapDrawModes, MapGeoJSONS, ConfigurableFormFieldProps, ProductConfig } from '../../../types';
+import { EditMode } from '@opengeoweb/core';
+import { ConfigurableFormFieldProps, ProductConfig } from '../../../types';
 export declare const DEFAULT_ROUNDING_MOVEMENT_KT = 5;
 export declare const DEFAULT_ROUNDING_MOVEMENT_KMH = 10;
 export declare const getMovementStepValKTMessage: (value?: number) => string;
@@ -9,9 +10,11 @@ export declare const noIntersectionMessage = "The end position needs to be (part
 export declare const maximum6PointsMessage = "The end position drawing allows a maximum of 6 individual points";
 export declare const validateMovementSteps: (value: string, unit: string, productConfig: ProductConfig, selectedFIR: string) => boolean | string;
 interface ProgressProps extends ConfigurableFormFieldProps {
-    drawMode?: SetMapDrawModes;
-    geoJSONs?: MapGeoJSONS;
-    setDrawModeType?: (mapDrawMode: MapDrawMode, startOrEnd: StartOrEndDrawing) => void;
+    geoJSON?: GeoJSON.FeatureCollection;
+    geoJSONIntersection?: GeoJSON.FeatureCollection;
+    activeTool?: string;
+    tools?: EditMode[];
+    onChangeTool?: (newToolMode: EditMode) => void;
 }
 declare const Progress: React.FC<ProgressProps>;
 export default Progress;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { MapDrawMode, MapGeoJSONS, SetMapDrawModes, StartOrEndDrawing } from '../../../types';
+import { EditMode } from '@opengeoweb/core';
 export declare const coordinatesEmptyMessage = "A start position drawing is required";
 export declare const noIntersectionMessage = "The start position needs to be (partly) inside the FIR";
 export declare const maximum6PointsMessage = "The start position drawing allows a maximum of 6 individual points";
@@ -8,9 +8,11 @@ export declare const maxFeaturePointsMessage = "Intersection of the drawn polygo
 export declare const multiIntersectionsMessage = "The drawn polygon has multiple intersections with the FIR-boundary. The drawn polygon will be used for the TAC-code.";
 interface StartGeometryProps {
     isReadOnly?: boolean;
-    drawMode: SetMapDrawModes;
-    geoJSONs: MapGeoJSONS;
-    setDrawModeType: (mapDrawMode: MapDrawMode, startOrEnd: StartOrEndDrawing) => void;
+    geoJSON: GeoJSON.FeatureCollection;
+    geoJSONIntersection: GeoJSON.FeatureCollection | undefined;
+    activeTool: string;
+    tools: EditMode[];
+    onChangeTool: (newToolMode: EditMode) => void;
 }
 declare const StartGeometry: React.FC<StartGeometryProps>;
 export default StartGeometry;

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

@@ -1,9 +1,10 @@
 import React from 'react';
-import { MapViewGeoJsonProps } from '../MapViewGeoJson/MapViewGeoJson';
+import { MapViewLayerProps } from '@opengeoweb/core';
 import { ProductConfig } from '../../types';
-interface ProducFormLayoutProps extends MapViewGeoJsonProps {
+interface ProducFormLayoutProps {
     children: React.ReactNode;
     productConfig: ProductConfig;
+    geoJSONLayers: MapViewLayerProps[];
 }
 declare const ProductFormLayout: React.FC<ProducFormLayoutProps>;
 export default ProductFormLayout;

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

@@ -1,8 +1,10 @@
 import * as React from 'react';
+import { Feature } from '@turf/turf';
 import { FeatureCollection } from 'geojson';
 import { FieldValues, UseFormGetValues, UseFormTrigger } from 'react-hook-form';
-import { mapTypes } from '@opengeoweb/core';
-import { LevelUnits, ATSRLocation, ICAOLocation, ProductStatus, CancelSigmet, Sigmet, ProductCanbe, SigmetFromBackend, SigmetFromFrontend, ProductActions, Airmet, CancelAirmet, ProductConfig, Firareas, FIRConfigSigmet, AirmetFromBackend, AirmetFromFrontend, ProductType, AviationProduct, FIRLocationGeoJson, AirmetConfig, FIRConfigAirmet } from '../../types';
+import { layerTypes, mapTypes } from '@opengeoweb/store';
+import { EditMode } from '@opengeoweb/core';
+import { LevelUnits, ATSRLocation, ICAOLocation, ProductStatus, CancelSigmet, Sigmet, ProductCanbe, SigmetFromBackend, SigmetFromFrontend, ProductActions, Airmet, CancelAirmet, ProductConfig, Firareas, FIRConfigSigmet, AirmetFromBackend, AirmetFromFrontend, ProductType, AviationProduct, FIRLocationGeoJson, AirmetConfig, FIRConfigAirmet, StartOrEndDrawing } from '../../types';
 export declare const getHoursBeforeValidity: (phenomenon: string, fir: string, config: ProductConfig) => number;
 export declare const getMaxHoursOfValidity: (phenomenon: string, fir: string, config: ProductConfig) => number;
 export declare const getValidFromDelayTimeMinutesFromConfig: (config: ProductConfig) => number;
@@ -54,10 +56,14 @@ export declare const getFir: (productConfig: ProductConfig, firName?: string | u
 export declare const isFir: (geojson: GeoJSON.FeatureCollection) => boolean;
 export declare const rewindGeometry: (geoJSON: FeatureCollection) => FeatureCollection;
 export declare const getFieldLabel: (title: string, isDisabled: boolean, action?: string) => string;
-export declare const getBaseLayers: (productConfig: ProductConfig) => mapTypes.Layer[];
+export declare const getBaseLayers: (productConfig: ProductConfig) => layerTypes.Layer[];
 export declare const getMaxMovementSpeedValue: (unit: string, selectedFIR: string, productConfig: ProductConfig) => number | null;
 export declare const DEFAULT_MIN_MOVEMENT_SPEED = 0;
 export declare const getMinMovementSpeedValue: (unit: string, selectedFIR: string, productConfig: ProductConfig) => number;
 /** Trigger form validations for given list of field names if field has a value */
 export declare const triggerValidations: (fieldNames: string[], getValues: UseFormGetValues<FieldValues>, trigger: UseFormTrigger<FieldValues>) => void;
 export declare const getProjection: (productConfig: ProductConfig) => mapTypes.MapPreset['proj'];
+export declare const getShapeWithProperties: (shape: GeoJSON.Feature, properties: GeoJSON.GeoJsonProperties) => GeoJSON.Feature;
+export declare const firID = "drawtools-fir";
+export declare const getDrawTools: (type: StartOrEndDrawing, firShape: GeoJSON.FeatureCollection) => EditMode[];
+export declare const updateDrawToolsWithFir: (drawTools: EditMode[], newFirShape: GeoJSON.FeatureCollection) => EditMode[];

package/src/lib/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { mapTypes } from '@opengeoweb/core';
+import { mapTypes } from '@opengeoweb/store';
 export declare type ProductType = 'sigmet' | 'airmet';
 /**
  * The possible phenomena for the sigmet
@@ -299,34 +299,10 @@ export declare const isInstanceOfAirmet: (obj: Airmet | CancelAirmet) => obj is
 export declare const isInstanceOfCancelAirmet: (obj: AviationProduct) => obj is CancelAirmet;
 export declare const isInstanceOfSigmetOrAirmet: (obj: AviationProduct) => obj is Sigmet | Airmet;
 export declare const isInstanceOfCancelSigmetOrAirmet: (obj: AviationProduct) => obj is CancelSigmet | CancelAirmet;
-export declare enum MapDrawMode {
-    'POINT' = "POINT",
-    'BOX' = "BOX",
-    'POLYGON' = "POLYGON",
-    'FIR' = "FIR",
-    'DELETE' = "DELETE"
-}
 export declare enum StartOrEndDrawing {
     'start' = "start",
     'end' = "end"
 }
-export interface SetMapDrawModes {
-    start: MapDrawMode;
-    end: MapDrawMode;
-}
-export interface MapGeoJSONS {
-    start?: GeoJSON.FeatureCollection;
-    end?: GeoJSON.FeatureCollection;
-    intersectionStart?: GeoJSON.FeatureCollection;
-    intersectionEnd?: GeoJSON.FeatureCollection;
-    fir?: GeoJSON.FeatureCollection;
-}
-export interface GeoJSONTemplate {
-    POINT: MapGeoJSONS;
-    BOX: MapGeoJSONS;
-    POLYGON: MapGeoJSONS;
-    FIR: MapGeoJSONS;
-}
 export declare type FormMode = 'new' | 'edit' | 'view';
 export interface FormFieldProps {
     productType?: ProductType;

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

@@ -23,5 +23,6 @@ export declare const fakeBackendNestedError: AxiosError<{
     message: string;
 }>;
 export declare const fakeBackendDifferentError: AxiosError;
+export declare const testFir: GeoJSON.FeatureCollection;
 export declare const StoryWrapperFakeApiWithErrors: React.FC<StoryWrapperProps>;
 export {};

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

@@ -1,32 +0,0 @@
-import { SetMapDrawModes, MapGeoJSONS, MapDrawMode, StartOrEndDrawing, ProductConfig } from '../../types';
-/**
- * Adds properties to the first geojson feature based on the given property object.
- * It only extends or changes the properties which are defined in styleConfig,
- * all other properties in the geojson are left unchanged.
- * @param geojson
- * @param featureProperties
- */
-export declare const addFeatureProperties: (geojson: GeoJSON.FeatureCollection | undefined, featureProperties: GeoJSON.GeoJsonProperties) => GeoJSON.FeatureCollection;
-export declare const getInitialGeoJSONState: (productConfig: ProductConfig, currentSelectedFIR?: string | undefined, initialGeometry?: MapGeoJSONS | undefined) => MapGeoJSONS;
-export declare const useDrawMode: (productConfig: ProductConfig, initialGeometry?: MapGeoJSONS | undefined, currentSelectedFIR?: string | 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) | undefined) => void;
-};
-/**
- * Returns the intersection of two features. In case of a polygon, only the first feature is used.
- * @param a Feature A
- * @param b Feature B
- * @returns The intersection of the two features.
- */
-export declare const intersectGeoJSONS: (a: GeoJSON.FeatureCollection, b: GeoJSON.FeatureCollection) => GeoJSON.FeatureCollection;
-/**
- * Adds the intersectionStart and intersectionEnd properties to the GeoJSONS structure
- * @param geoJSONs
- * @returns GeoJSONS extend with intersections
- */
-export declare const createInterSections: (geoJSONs: MapGeoJSONS) => MapGeoJSONS;

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

@@ -1 +0,0 @@
-export {};