@opengeoweb/webmap-react 9.19.0 → 9.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "9.19.0",
+  "version": "9.20.1",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {
@@ -28,4 +28,4 @@
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js"
-}
+}

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { GeoJsonProperties, GeometryObject, Position } from 'geojson';
+import { FeatureCollection, GeoJsonProperties, GeometryObject, Position } from 'geojson';
 import { GeoJsonFeatureType, GeoJsonFeature, GeoFeatureStyle, Coordinate } from './geojsonShapes';
 interface DrawStyle {
     x: number;
@@ -26,7 +26,7 @@ export interface MapDrawProps {
     geojson: GeoJSON.FeatureCollection;
     drawMode: string;
     deletePolygonCallback?: string;
-    exitDrawModeCallback: (reason: DrawModeExitCallback) => void;
+    exitDrawModeCallback: (reason: DrawModeExitCallback, newGeoJSON?: GeoJSON.FeatureCollection) => void;
     isInEditMode: boolean;
     isInDeleteMode: boolean;
     selectedFeatureIndex: number;
@@ -75,7 +75,7 @@ export default class MapDraw extends React.PureComponent<MapDrawProps> {
     somethingWasDragged: string;
     mouseIsOverVertexNr: SNAPPEDFEATURE | VERTEX | number;
     selectedEdge: EDGE;
-    geojson: GeoJSON.FeatureCollection;
+    geojson: FeatureCollection;
     listenersInitialized: boolean;
     mouseGeoCoord: Coordinate;
     snappedGeoCoords: Coordinate;
@@ -106,9 +106,9 @@ export default class MapDraw extends React.PureComponent<MapDrawProps> {
     handleKeyDown(event: KeyboardEvent): void;
     handleNewFeatureIndex(): void;
     handleDrawMode(_drawMode: string): void;
-    getPixelCoordFromGeoCoord(featureCoords: Position[]): Coordinate[];
     handleGeoJSONUpdate: (newGeoJSON: GeoJSON.FeatureCollection) => void;
     handleExitDrawMode: (reason?: DrawModeExitCallback) => void;
+    getSelectedFeature: () => GeoJsonFeature;
     hoverVertex(feature: GeoJsonFeature, mouseX: number, mouseY: number): void;
     mouseMove(event: InputEvent): boolean;
     triggerMouseDownTimer(event: InputEvent): void | boolean;
@@ -135,8 +135,6 @@ export default class MapDraw extends React.PureComponent<MapDrawProps> {
     validateFeature(feature: GeoJsonFeature): void;
     validatePolys(fixPolys: boolean): void;
     beforeDraw(ctx: CanvasRenderingContext2D): void;
-    distance(a: Coordinate, b: Coordinate): number;
-    isBetween(a: Coordinate, c: Coordinate, b: Coordinate): boolean;
     checkDist(coord: Coordinate, polygonIndex: SNAPPEDFEATURE | number, mouseX: number, mouseY: number): boolean;
     hoverEdge(geometry: GeoJsonFeatureType, mouseX: number, mouseY: number): {
         selectedEdge: EDGE | number;
@@ -148,7 +146,6 @@ export default class MapDraw extends React.PureComponent<MapDrawProps> {
     drawMarker(ctx: CanvasRenderingContext2D, _coord: Coordinate, selected: boolean, middle: boolean, isInEditMode: boolean, featureProperties: GeoFeatureStyle): void | DrawStyle;
     drawLine(ctx: CanvasRenderingContext2D, XYCoords: Coordinate[], featureIndex: number, lineStringIndex: number): void | DrawStyle;
     drawPolygon(ctx: CanvasRenderingContext2D, XYCoords: Coordinate[], featureIndex: number, polygonIndex: number): void | DrawStyle;
-    convertGeoCoordsToScreenCoords(featureCoords: Position[]): Coordinate[];
     initializeFeatureCoordinates(feature: GeoJsonFeature, type: string): GeoJsonFeature;
     checkIfFeatureIsBox(feature: GeoJsonFeature): boolean;
     featureHasChanged(text: string): void;

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

@@ -12,7 +12,7 @@ export interface FeatureLayer {
     onHoverFeature?: (feature: FeatureEvent) => void;
     onClickFeature?: (feature: FeatureEvent) => void;
     updateGeojson?: (feature: GeometryObject, reason: string) => void;
-    exitDrawModeCallback?: (reason: DrawModeExitCallback) => void;
+    exitDrawModeCallback?: (reason: DrawModeExitCallback, newGeoJSON?: GeoJSON.FeatureCollection) => void;
     selectedFeatureIndex?: string;
 }
 interface MapDrawContainerProps {

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

@@ -4,7 +4,8 @@ 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.FeatureCollection;
+export declare const lineString: GeoJSON.Feature<GeoJSON.LineString>;
+export declare const lineStringCollection: GeoJSON.FeatureCollection;
 export type GeoJsonFeatureType = GeoJSON.Polygon | GeoJSON.MultiPoint | GeoJSON.Point | GeoJSON.LineString | GeoJSON.MultiPolygon;
 export type GeoJsonFeature = GeoJSON.Feature<GeoJsonFeatureType>;
 export interface GeoFeatureStyle {

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

@@ -1,3 +1,4 @@
+import proj4, { InterfaceProjection } from 'proj4';
 import { Position } from 'geojson';
 import { Coordinate, GeoJsonFeature } from './geojsonShapes';
 export type CheckHoverFeaturesResult = {
@@ -5,7 +6,15 @@ export type CheckHoverFeaturesResult = {
     featureIndex: number;
     feature: GeoJsonFeature;
 } | null;
+export type ProjectorCache = Record<string, InterfaceProjection>;
+export declare const Proj4js: typeof proj4;
+export declare const projectorCache: ProjectorCache;
+export declare const getProj4: (projection: string | proj4.InterfaceProjection) => InterfaceProjection;
 export declare const distance: (a: Coordinate, b: Coordinate) => number;
+export declare const isBetween: (a: Coordinate, c: Coordinate, b: Coordinate) => boolean;
+export declare const convertGeoCoordsToScreenCoords: (featureCoords: Position[], mapId: string) => Coordinate[];
+export declare const getPixelCoordFromGeoCoord: (featureCoords: Position[], mapId: string) => Coordinate[];
+export declare const findClosestCoords: (positions: Coordinate[], mouseX: number, mouseY: number) => number[];
 export declare const checkHoverFeatures: (geojson: GeoJSON.FeatureCollection, mouseX: number, mouseY: number, convertGeoCoordsToScreenCoords: (featureCoords: Position[]) => Coordinate[], ignoreCoordinateIndexInFeature?: boolean) => CheckHoverFeaturesResult;
 export interface MapDrawDrawFunctionArgs {
     context: CanvasRenderingContext2D;

package/src/lib/components/MapDraw/storyComponents/storyUtils.d.ts

@@ -1,3 +1,4 @@
+import { FeatureCollection } from 'geojson';
 export declare const drawPolyStoryStyles: {
     MapDrawGeoJSONContainer: {
         display: string;

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

@@ -12,7 +12,7 @@ export interface MapDrawToolProps {
     geoJSON: GeoJSON.FeatureCollection;
     geoJSONIntersection?: GeoJSON.FeatureCollection;
     geoJSONIntersectionBounds?: GeoJSON.FeatureCollection;
-    setGeoJSON: (geojson: GeoJSON.Feature | GeoJSON.FeatureCollection, reason?: string) => void;
+    setGeoJSON: (geojson: GeoJSON.Feature | GeoJSON.FeatureCollection, reason?: string) => GeoJSON.FeatureCollection[];
     setGeoJSONIntersectionBounds: (geojson: GeoJSON.FeatureCollection) => void;
     drawModes: DrawMode[];
     changeDrawMode: (mode: DrawModeValue) => void;

package/src/lib/components/MapView/MapViewLayer.d.ts

@@ -8,7 +8,7 @@ export interface MapViewLayerProps extends LayerFoundation {
     isInEditMode?: boolean;
     drawMode?: string;
     updateGeojson?: (geoJson: GeoJSON.FeatureCollection, reason: string) => void;
-    exitDrawModeCallback?: (reason: DrawModeExitCallback) => void;
+    exitDrawModeCallback?: (reason: DrawModeExitCallback, newGeoJSON?: GeoJSON.FeatureCollection) => void;
     selectedFeatureIndex?: number;
     onClickFeature?: (event?: FeatureEvent) => void;
     onHoverFeature?: (event: FeatureEvent) => void;