@opengeoweb/webmap-react 14.2.2 → 14.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "14.2.2",
+  "version": "14.4.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {
@@ -8,9 +8,9 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/webmap": "14.2.2",
-    "@opengeoweb/theme": "14.2.2",
-    "@opengeoweb/shared": "14.2.2",
+    "@opengeoweb/webmap": "14.4.0",
+    "@opengeoweb/theme": "14.4.0",
+    "@opengeoweb/shared": "14.4.0",
     "lodash": "^4.17.21",
     "ol": "^10.4.0",
     "proj4": "^2.9.2",

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

@@ -0,0 +1,4 @@
+export interface MapMeasureInterface {
+    lineColor?: string;
+}
+export declare const MapMeasure: React.FC;

package/src/lib/components/MapMeasure/index.d.ts

@@ -0,0 +1 @@
+export * from './MapMeasure';

package/src/lib/components/OpenLayers/OlColors.d.ts

@@ -0,0 +1,5 @@
+export declare const FEATURE_DRAW_FILL_COLOR_TRANSPARENT = "#186DFF18";
+export declare const FEATURE_DRAW_FILL_COLOR = "#186DFF";
+export declare const FEATURE_DRAW_STROKE_COLOR = "#186DFF";
+export declare const FEATURE_DRAW_SECONDARY_FILL_COLOR = "#6e1e91";
+export declare const FEATURE_DRAW_SECONDARY_STROKE_COLOR = "#6e1e91";

package/src/lib/components/OpenLayers/OlStyles.d.ts

@@ -1,10 +1,11 @@
 import { ColorLike } from 'ol/colorlike';
 import { FeatureLike } from 'ol/Feature';
+import { Polygon } from 'ol/geom';
 import { Circle, Fill, Stroke } from 'ol/style';
 import Style, { StyleFunction, StyleLike } from 'ol/style/Style';
 import { Coordinate } from 'ol/coordinate';
-import { LineCoordType } from 'ol/interaction/Draw';
-import { DrawModeValue } from '../MapDrawTool';
+import { LineCoordType, GeometryFunction } from 'ol/interaction/Draw';
+import { DrawModeValue } from './draw/types';
 export declare enum MapFeatureClass {
     MyLocation = "MyLocation",
     GenericMarker = "GenericMarker",
@@ -20,10 +21,8 @@ export declare const FEATURE_FILL_SELECTED: Fill;
 export declare const FEATURE_STROKE_SELECTED: Stroke;
 export declare const FEATURE_VERTICE_IMAGE: Circle;
 export declare const FEATURE_VERTICE_HANDLE_IMAGE: Circle;
-export declare const ICON_LOCATIONMARKER: Style;
-export declare const ICON_LOCATIONMARKER_SELECTED: Style;
-export declare const ICON_LOCATIONMARKER_MODIFY: Style;
 export declare const FEATURE_VERTICES_EDIT_HANDLES: Style;
+export declare const getFeaturePointStyle: (fillColor?: string, fillOpacity?: number) => Style;
 export declare const textLabelStyle: (text: string) => Style;
 export declare const multiPolygonLabelStyle: (text: string) => Style;
 export declare const multiLineStringLabelStyle: (text: string) => Style;
@@ -31,5 +30,7 @@ export declare const geowebColorToOpenLayersColor: (color: string, opacity?: str
 export declare const inlineFeatureStyle: (feature: FeatureLike) => Style[];
 export declare const genericOpenLayersFeatureStyle: StyleFunction;
 export declare const catmullRomSpline: (points: LineCoordType, numPoints?: number) => Coordinate[];
+export declare const createBoxBasedOnModifiedVertex: (modifiedGeometry: Polygon, originalGeometry: Polygon) => Polygon;
+export declare const createOval: () => GeometryFunction;
 export declare const drawStyles: Record<DrawModeValue, StyleLike>;
 export declare const modifyStyles: Record<DrawModeValue, Style[] | StyleLike>;

package/src/lib/components/OpenLayers/OpenLayersMapView.Measure.stories.d.ts

@@ -0,0 +1,6 @@
+import type { Meta, StoryObj } from '@storybook/react-webpack5';
+import { OpenLayersMapView } from '.';
+declare const meta: Meta<typeof OpenLayersMapView>;
+export default meta;
+type Story = StoryObj<typeof OpenLayersMapView>;
+export declare const MapViewMeasure: Story;

package/src/lib/components/OpenLayers/draw/OpenLayersMapDraw.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { StyleLike } from 'ol/style/Style';
-import { DrawModeValue } from '../../MapDrawTool';
-import { DrawModeExitCallback } from './types';
+import { DrawModeExitCallback, DrawModeValue } from './types';
 export interface OpenLayersMapDrawProps {
     geojson: GeoJSON.FeatureCollection;
     drawMode?: DrawModeValue;

package/src/lib/components/OpenLayers/draw/OpenLayersMapDraw.stories.d.ts

@@ -1,10 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react-webpack5';
-import { useMapDrawTool } from '../../MapDrawTool';
+import { useMapDrawTool } from '.';
 declare const meta: Meta<typeof useMapDrawTool>;
 export default meta;
 type Story = StoryObj<typeof useMapDrawTool>;
-export declare const OlBasicMapDrawTool: Story;
-export declare const OlBasicMapDrawToolShape: Story;
-export declare const OlBasicMapDrawToolWithMultipleShapes: Story;
-export declare const OlBasicMapDrawToolWithMultipleShapesValues: Story;
-export declare const OlBasicMapDrawToolWithSmoothLines: Story;
+export declare const OlMapDrawTool: Story;
+export declare const OlMapDrawToolCustomShapes: Story;
+export declare const OlMapDrawToolDrawMultipleShapes: Story;

package/src/lib/components/{MapDraw → OpenLayers/draw}/geojsonShapes.d.ts

@@ -3,7 +3,6 @@ export declare const emptyGeoJSON: GeoJSON.FeatureCollection;
 export declare const featurePoint: GeoJSON.Feature<GeoJSON.Point>;
 export declare const featureMultiPoint: GeoJSON.Feature<GeoJSON.MultiPoint>;
 export declare const featurePolygon: GeoJSON.Feature<GeoJSON.Polygon>;
-export declare const featureBox: GeoJSON.Feature<GeoJSON.Polygon>;
 export declare const lineString: GeoJSON.Feature<GeoJSON.LineString>;
 export declare const lineStringCollection: GeoJSON.FeatureCollection;
 export interface GeoFeatureStyle {

package/src/lib/components/OpenLayers/draw/index.d.ts

@@ -1,2 +1,11 @@
 export * from './OpenLayersMapDraw';
 export * from './types';
+export { useMapDrawTool, defaultPoint, defaultDelete, defaultPolygon, defaultBox, defaultLocation, defaultIntersectionStyleProperties, defaultSmoothLine, defaultCircle, defaultFreehandLine, defaultLineString, defaultOval, defaultSquare, getIcon, currentlySupportedDrawModes, defaultModes, } from './useMapDrawTool';
+export type { MapDrawToolOptions } from './useMapDrawTool';
+export * from './utils';
+export * from './storyExamplesMapDrawTool';
+export * from './storyExamplesMapDrawToolIntersection';
+export * from './storyExamplesMapDrawToolMultipleDrawTools';
+export * from './geojsonShapes';
+export * from './mapDrawUtils';
+export * from './storyComponents';

package/src/lib/components/{MapDraw → OpenLayers/draw}/mapDrawUtils.d.ts

@@ -1,6 +1,5 @@
-import proj4, { InterfaceProjection } from 'proj4';
-export type ProjectorCache = Record<string, InterfaceProjection>;
-export declare const Proj4js: typeof proj4;
+import proj4, { InterfaceProjection, Converter } from 'proj4';
+export type ProjectorCache = Record<string, InterfaceProjection | Converter>;
 export declare const projectorCache: ProjectorCache;
 export declare const getProj4: (projection: string | proj4.InterfaceProjection) => InterfaceProjection;
 export declare const NEW_LINESTRING_CREATED = "new point in LineString created";

package/src/lib/components/{MapDraw → OpenLayers/draw}/storyComponents/StoryLayout.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { DrawModeExitCallback } from '../../OpenLayers';
-import { OpenLayersLayerProps } from '../../OpenLayers/layers';
+import { DrawModeExitCallback } from '../..';
+import { OpenLayersLayerProps } from '../../layers';
 interface StoryLayoutProps {
     layers: OpenLayersLayerProps[];
     children: React.ReactElement;

package/src/lib/components/{MapDraw → OpenLayers/draw}/storyComponents/ToolButton.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DrawMode } from '../../MapDrawTool';
+import { DrawMode } from '..';
 interface ToolButtonProps {
     mode: DrawMode;
     isSelected: boolean;

package/src/lib/components/{MapDrawTool → OpenLayers/draw}/storyExamplesMapDrawTool.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { SelectionType } from './types';
 import { MapDrawToolOptions } from './useMapDrawTool';
+import { SelectionType } from './types';
 export declare const opacityOptions: string[];
 export declare const fillOptions: any[];
 export declare const strokeWidthOptions: string[];
@@ -8,4 +8,3 @@ export declare const getToolIcon: (selectionType: SelectionType) => React.ReactE
 export declare const basicExampleDrawOptions: MapDrawToolOptions;
 export declare const basicExampleMultipleShapeDrawOptions: MapDrawToolOptions;
 export declare const basicExampleMultipleShapeWithValuesDrawOptions: MapDrawToolOptions;
-export declare const basicExampleSmoothLineOptions: MapDrawToolOptions;

package/src/lib/components/OpenLayers/draw/types.d.ts

@@ -1,10 +1,16 @@
+import { Feature, Polygon, MultiPolygon } from 'geojson';
 export declare enum DRAWMODE {
     POLYGON = "POLYGON",
     BOX = "BOX",
     MULTIPOINT = "MULTIPOINT",
     POINT = "POINT",
     LINESTRING = "LINESTRING",
-    SMOOTHLINE = "SMOOTHLINE"
+    SMOOTHLINE = "SMOOTHLINE",
+    CIRCLE = "CIRCLE",
+    SQUARE = "SQUARE",
+    OVAL = "OVAL",
+    LOCATION = "LOCATION",
+    FREEHANDLINE = "FREEHANDLINE"
 }
 export interface FeatureEvent {
     coordinateIndexInFeature: number;
@@ -19,3 +25,17 @@ export interface FeatureEvent {
     feature: GeoJSON.Feature;
 }
 export type DrawModeExitCallback = 'escaped' | 'doubleClicked' | 'clickedNearStartingPoint';
+export type DrawModeValue = DRAWMODE | 'DELETE' | '';
+type DefaultSelectionTypes = 'poly' | 'point' | 'box' | 'linestring';
+export type SelectionType = DefaultSelectionTypes | string;
+export interface DrawMode {
+    drawModeId: string;
+    value: DrawModeValue;
+    shape: GeoJSON.Feature | GeoJSON.FeatureCollection;
+    title: string;
+    isSelectable: boolean;
+    selectionType: SelectionType;
+}
+export type ProjectFn = (feat: Feature<Polygon | MultiPolygon>) => Feature<Polygon | MultiPolygon>;
+export type UnprojectFn = (feat: Feature<Polygon | MultiPolygon>) => Feature<Polygon | MultiPolygon>;
+export {};

package/src/lib/components/{MapDrawTool → OpenLayers/draw}/useMapDrawTool.d.ts

@@ -1,11 +1,10 @@
 import React from 'react';
 import { DrawMode, DrawModeValue, SelectionType } from './types';
-import { OpenLayersLayerProps } from '../OpenLayers/layers';
+import { OpenLayersLayerProps } from '../layers';
 export declare const defaultIntersectionStyleProperties: GeoJSON.GeoJsonProperties;
 export declare const emptyLineString: GeoJSON.Feature;
 export declare const emptyPoint: GeoJSON.Feature;
 export declare const emptyPolygon: GeoJSON.Feature;
-export declare const emptyBox: GeoJSON.Feature;
 export declare const emptyIntersectionShape: GeoJSON.FeatureCollection;
 type DrawLayerType = 'geoJSON' | 'geoJSONIntersection' | 'geoJSONIntersectionBounds';
 export interface MapDrawToolProps {
@@ -48,6 +47,12 @@ export declare const defaultPolygon: DrawMode;
 export declare const defaultBox: DrawMode;
 export declare const defaultLineString: DrawMode;
 export declare const defaultDelete: DrawMode;
+export declare const defaultCircle: DrawMode;
+export declare const defaultSquare: DrawMode;
+export declare const defaultFreehandLine: DrawMode;
+export declare const defaultOval: DrawMode;
+export declare const defaultLocation: DrawMode;
+export declare const defaultSmoothLine: DrawMode;
 export declare const defaultModes: DrawMode[];
 export declare const currentlySupportedDrawModes: DrawMode[];
 export declare const useMapDrawTool: ({ defaultDrawModes, shouldAllowMultipleShapes, defaultGeoJSON, defaultGeoJSONIntersection, defaultGeoJSONIntersectionBounds, defaultGeoJSONIntersectionProperties, geoJSONLayerId, geoJSONIntersectionLayerId, geoJSONIntersectionBoundsLayerId, projection, }: MapDrawToolOptions) => MapDrawToolProps;

package/src/lib/components/{MapDrawTool → OpenLayers/draw}/utils.d.ts

@@ -66,3 +66,4 @@ export declare const rewindGeometry: (geoJSON: FeatureCollection) => FeatureColl
 export declare const addGeoJSONProperties: (geoJSON: GeoJSON.Feature | GeoJSON.FeatureCollection, newProperties: GeoJsonProperties) => GeoJSON.Feature | GeoJSON.FeatureCollection;
 export declare const addSelectionTypeToGeoJSON: (geoJSON: GeoJSON.Feature | GeoJSON.FeatureCollection, selectionType: SelectionType) => GeoJSON.Feature | GeoJSON.FeatureCollection;
 export declare const getFeatureExtent: (geoJSON: GeoJSON.Feature | GeoJSON.FeatureCollection) => Bbox;
+export declare const getDrawModeIdFromSelectionType: (selectionType: string, drawModes: DrawMode[]) => string;

package/src/lib/components/OpenLayers/draw/utils.spec.d.ts

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

package/src/lib/components/OpenLayers/index.d.ts

@@ -9,5 +9,6 @@ export * from './controls';
 export * from './draw';
 export * from './styles/useIconStyle';
 export * from './OlStyles';
+export * from './OlColors';
 export * from './tools';
 export * from './layers';

package/src/lib/components/OpenLayers/layers/OpenLayersLayer.d.ts

@@ -17,4 +17,4 @@ export interface OpenLayersLayerProps extends LayerFoundation {
     onHoverFeature?: (event: FeatureEvent) => void;
     tileServerSettings?: TileServerSettings;
 }
-export declare const OpenLayersLayer: (layerProps: OpenLayersLayerProps) => React.ReactElement;
+export declare const OpenLayersLayer: (layerProps: OpenLayersLayerProps) => React.ReactElement | null;

package/src/lib/components/OpenLayers/utils/setMapCenter.d.ts

@@ -1,2 +1,2 @@
 import { Map } from 'ol';
-export declare const setMapCenter: (map: Map, lon: number, lat: number) => void;
+export declare const setMapCenter: (map: Map, lon: number, lat: number, zoomLevel?: number) => void;

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

@@ -1,9 +1,8 @@
 export * from './Legend';
-export * from './MapDraw';
-export * from './MapDrawTool';
 export * from './MapTime';
 export * from './MapControls';
 export * from './MapWarning';
 export * from './MapDimensionSelect';
 export * from './LayerInfo';
 export * from './OpenLayers';
+export * from './MapMeasure';

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

@@ -2,6 +2,6 @@ import i18n, { Namespace } from 'i18next';
 import { UseTranslationResponse } from 'react-i18next';
 export declare const WEBMAP_REACT_NAMESPACE = "webmapreact";
 export declare const initWebmapReactTestI18n: () => void;
-export declare const translateKeyOutsideComponents: (key: string, params?: Record<string, string | number> | undefined, ns?: string) => string;
+export declare const translateInTestsAndStories: (key: string, params?: Record<string, string | number> | undefined, ns?: string) => string;
 export declare const useWebmapReactTranslation: (ns?: Namespace) => UseTranslationResponse<typeof ns, typeof i18n>;
 export { i18n };

package/src/lib/components/MapDraw/index.d.ts

@@ -1,3 +0,0 @@
-export * from './mapDrawUtils';
-export * from './geojsonShapes';
-export * from './storyComponents';

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

@@ -1,9 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react-webpack5';
-import { useMapDrawTool } from './useMapDrawTool';
-declare const meta: Meta<typeof useMapDrawTool>;
-export default meta;
-type Story = StoryObj<typeof useMapDrawTool>;
-export declare const BasicMapDrawTool: Story;
-export declare const BasicMapDrawToolShape: Story;
-export declare const BasicMapDrawToolWithMultipleShapes: Story;
-export declare const BasicMapDrawToolWithMultipleShapesValues: Story;

package/src/lib/components/MapDrawTool/MapDrawToolMultipleDrawTools.stories.d.ts

@@ -1,6 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react-webpack5';
-import { useMapDrawTool } from './useMapDrawTool';
-declare const meta: Meta<typeof useMapDrawTool>;
-export default meta;
-type Story = StoryObj<typeof useMapDrawTool>;
-export declare const MultipleDrawToolsDemo: Story;

package/src/lib/components/MapDrawTool/index.d.ts

@@ -1,7 +0,0 @@
-export * from './types';
-export { useMapDrawTool, defaultPoint, defaultDelete, defaultPolygon, defaultBox, defaultIntersectionStyleProperties, getIcon, currentlySupportedDrawModes, defaultModes, } from './useMapDrawTool';
-export type { MapDrawToolOptions } from './useMapDrawTool';
-export * from './utils';
-export * from './storyExamplesMapDrawTool';
-export * from './storyExamplesMapDrawToolIntersection';
-export * from './storyExamplesMapDrawToolMultipleDrawTools';

package/src/lib/components/MapDrawTool/types.d.ts

@@ -1,16 +0,0 @@
-import { Feature, Polygon, MultiPolygon } from 'geojson';
-import { DRAWMODE } from '../OpenLayers/draw/types';
-export type DrawModeValue = DRAWMODE | 'DELETE' | '';
-type DefaultSelectionTypes = 'poly' | 'point' | 'box' | 'linestring';
-export type SelectionType = DefaultSelectionTypes | string;
-export interface DrawMode {
-    drawModeId: string;
-    value: DrawModeValue;
-    shape: GeoJSON.Feature | GeoJSON.FeatureCollection;
-    title: string;
-    isSelectable: boolean;
-    selectionType: SelectionType;
-}
-export type ProjectFn = (feat: Feature<Polygon | MultiPolygon>) => Feature<Polygon | MultiPolygon>;
-export type UnprojectFn = (feat: Feature<Polygon | MultiPolygon>) => Feature<Polygon | MultiPolygon>;
-export {};