@opengeoweb/core 5.0.0 → 5.1.0

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

@@ -4,7 +4,6 @@ export { default as LayerManagerDescriptionRow } from './DescriptionRow/Descript
 export { default as LayerManagerLayerContainerRow } from './LayerContainerRow/LayerContainerRow';
 export { default as LayerManagerBaseLayerRow } from './BaseLayerRow/BaseLayerRow';
 export { default as LayerManagerConnect } from './LayerManagerConnect';
-export { default as DockedLayerManagerConnect } from './DockedLayerManagerConnect';
 export { default as LayerSelectConnect } from './LayerSelect/LayerSelectConnect';
 export { default as LayerManagerMapButtonConnect } from './LayerManagerMapButtonConnect';
 export { useFetchServices } from './useFetchServices';

package/src/lib/components/LayerManager/useFetchServices.d.ts

@@ -2,5 +2,5 @@ import { serviceTypes } from '../../store';
 import { NoIdService, UserAddedServices } from '../../utils/types';
 import { Service } from '../WMSLoader/services';
 export declare const getServicesToLoad: (services: NoIdService[]) => serviceTypes.InitialService[];
-export declare const useFetchServices: (dialogType: string, preloadedServices?: Service[] | undefined) => void;
+export declare const useFetchServices: (dialogType: string, preloadedServices?: Service[] | undefined, shouldDisableFetch?: boolean) => void;
 export declare const mergePresetsAndUserAddedServices: (presets: Service[], userAddedServices: UserAddedServices) => NoIdService[];

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

@@ -1,25 +1,7 @@
 import * as React from 'react';
 import { GeoJsonProperties, GeometryObject, Position } from 'geojson';
 import { WMJSMap } from '@opengeoweb/webmap';
-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.FeatureCollection;
-export declare type GeoJsonFeatureType = GeoJSON.Polygon | GeoJSON.MultiPoint | GeoJSON.Point | GeoJSON.LineString | GeoJSON.MultiPolygon;
-export declare type GeoJsonFeature = GeoJSON.Feature<GeoJsonFeatureType>;
-export declare type GeoFeatureStyle = {
-    stroke?: string;
-    fill?: string;
-    'stroke-width'?: number;
-    'stroke-opacity'?: number;
-    'fill-opacity'?: number;
-};
-export declare type Coordinate = {
-    x: number;
-    y: number;
-};
+import { GeoJsonFeatureType, GeoJsonFeature, GeoFeatureStyle, Coordinate } from './geojsonShapes';
 declare type DrawStyle = {
     x: number;
     y: number;

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

@@ -1,6 +1,12 @@
 import React from 'react';
+import { MapDrawToolOptions } from './useMapDrawTool';
 declare const _default: {
     title: string;
 };
 export default _default;
 export declare const MapDrawToolDemo: () => React.ReactElement;
+interface MapDrawToolIntersectDemoProps {
+    mapDrawOptions: MapDrawToolOptions;
+}
+export declare const MapDrawToolIntersectDemo: React.FC<MapDrawToolIntersectDemoProps>;
+export declare const MapDrawToolIntersectWithShapeDemo: () => React.ReactElement;

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

@@ -0,0 +1,19 @@
+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.FeatureCollection;
+export declare type GeoJsonFeatureType = GeoJSON.Polygon | GeoJSON.MultiPoint | GeoJSON.Point | GeoJSON.LineString | GeoJSON.MultiPolygon;
+export declare type GeoJsonFeature = GeoJSON.Feature<GeoJsonFeatureType>;
+export declare type GeoFeatureStyle = {
+    stroke?: string;
+    fill?: string;
+    'stroke-width'?: number;
+    'stroke-opacity'?: number;
+    'fill-opacity'?: number;
+};
+export declare type Coordinate = {
+    x: number;
+    y: number;
+};

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

@@ -1,3 +1,6 @@
 export * from './MapDraw';
 export { default as MapDrawContainer } from './MapDrawContainer';
 export * from './mapDrawUtils';
+export * from './geojsonShapes';
+export { useMapDrawTool, defaultPoint, defaultDelete, defaultPolygon, defaultBox, } from './useMapDrawTool';
+export type { EditMode, DrawMode } from './useMapDrawTool';

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

@@ -1,5 +1,5 @@
 import { Position } from 'geojson';
-import type { Coordinate, GeoJsonFeature } from './MapDraw';
+import { Coordinate, GeoJsonFeature } from './geojsonShapes';
 export declare type CheckHoverFeaturesResult = {
     coordinateIndexInFeature: number;
     featureIndex: number;
@@ -24,4 +24,33 @@ declare type DrawFunction = {
 };
 export declare const getDrawFunctionFromStore: (id: string) => DrawFunction['drawMethod'] | undefined;
 export declare const registerDrawFunction: (drawFunction?: DrawFunction['drawMethod']) => string;
+/**
+ * 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;
+/**
+ * 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, geoJSONProperties?: {
+    stroke: string;
+    'stroke-width': number;
+    'stroke-opacity': number;
+    fill: string;
+    'fill-opacity': number;
+}) => GeoJSON.FeatureCollection;
+/**
+ * Adds the intersectionStart and intersectionEnd properties to the GeoJSONS structure
+ * @param geoJSONs
+ * @returns GeoJSONS extend with intersections
+ */
+export declare const createInterSections: (geojson: GeoJSON.FeatureCollection, otherGeoJSON: GeoJSON.FeatureCollection, geoJSONproperties?: GeoJSON.GeoJsonProperties) => GeoJSON.FeatureCollection;
+export declare const getGeoJson: (geojson: GeoJSON.FeatureCollection, shouldAllowMultipleshapes: boolean) => GeoJSON.FeatureCollection;
+export declare const getFeatureCollection: (geoJSONFeature: GeoJSON.Feature | GeoJSON.FeatureCollection, shouldAllowMultipleshapes: boolean, geoJSONFeatureCollection?: GeoJSON.FeatureCollection) => GeoJSON.FeatureCollection;
 export {};

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

@@ -0,0 +1,8 @@
+import React from 'react';
+interface EditModeButtonProps {
+    isInEditMode: boolean;
+    onToggleEditMode: (isEditMode: boolean) => void;
+    drawMode: string;
+}
+declare const EditModeButtonField: React.FC<EditModeButtonProps>;
+export default EditModeButtonField;

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

@@ -0,0 +1,8 @@
+import React from 'react';
+interface FeatureLayersProps {
+    geojson: GeoJSON.FeatureCollection;
+    onChangeLayerIndex: (newIndex: number) => void;
+    activeFeatureLayerIndex: number;
+}
+declare const FeatureLayers: React.FC<FeatureLayersProps>;
+export default FeatureLayers;

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

@@ -0,0 +1,8 @@
+import React from 'react';
+interface GeoJSONTextFieldProps {
+    geoJSON: GeoJSON.FeatureCollection;
+    onChangeGeoJSON?: (geoJSON: GeoJSON.FeatureCollection) => void;
+    title?: string;
+}
+declare const GeoJSONTextField: React.FC<GeoJSONTextFieldProps>;
+export default GeoJSONTextField;

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

@@ -0,0 +1,11 @@
+import React from 'react';
+declare type IntersectionElement = {
+    geojson: GeoJSON.FeatureCollection;
+    title: string;
+};
+interface IntersectionSelectProps {
+    intersections: IntersectionElement[];
+    onChangeIntersection: (geojson: GeoJSON.FeatureCollection) => void;
+}
+declare const IntersectionSelect: React.FC<IntersectionSelectProps>;
+export default IntersectionSelect;

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

@@ -0,0 +1,10 @@
+import React from 'react';
+import { DrawModeExitCallback } from '../MapDraw';
+import { MapViewLayerProps } from '../../MapView/MapViewLayer';
+interface StoryLayoutProps {
+    layers: MapViewLayerProps[];
+    children: React.ReactElement;
+    onExitDrawMode: (reason: DrawModeExitCallback) => void;
+}
+declare const StoryLayout: React.FC<StoryLayoutProps>;
+export default StoryLayout;

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

@@ -0,0 +1,9 @@
+import React from 'react';
+import { EditMode } from '../useMapDrawTool';
+interface ToolButtonProps {
+    mode: EditMode;
+    isSelected: boolean;
+    onClick: () => void;
+}
+declare const ToolButton: React.FC<ToolButtonProps>;
+export default ToolButton;

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

@@ -6,3 +6,5 @@ export declare const simpleLineStringGeoJSON: GeoJSON.FeatureCollection;
 export declare const simpleBoxGeoJSON: GeoJSON.FeatureCollection;
 export declare const simpleFlightRouteLineStringGeoJSON: GeoJSON.FeatureCollection;
 export declare const simpleMultiPolygon: GeoJSON.FeatureCollection;
+export declare const intersectionFeatureNL: GeoJSON.Feature;
+export declare const intersectionFeatureBE: GeoJSON.Feature;

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

@@ -1,29 +1,31 @@
 import React from 'react';
 import { DRAWMODE } from './MapDraw';
-export declare const defaultStyleProperties: {
-    stroke: string;
-    'stroke-width': number;
-    'stroke-opacity': number;
-    fill: string;
-    'fill-opacity': number;
-};
+import type { MapViewLayerProps } from '../MapView/MapViewLayer';
+export declare const defaultStyleProperties: GeoJSON.GeoJsonProperties;
+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 emptyIntersectionShape: GeoJSON.FeatureCollection;
 export declare type DrawMode = DRAWMODE | 'DELETE' | '';
+declare type DrawLayerType = 'geoJSON' | 'geoJSONIntersection' | 'geoJSONIntersectionBounds';
 export declare type EditMode = {
+    id: string;
     value: DrawMode;
+    shape: GeoJSON.Feature | GeoJSON.FeatureCollection;
     title: string;
     icon: React.ReactElement;
-    shape: GeoJSON.Feature | GeoJSON.FeatureCollection;
-    id: string;
+    isSelectable: boolean;
 };
 interface MapDrawToolProps {
+    geoJSON: GeoJSON.FeatureCollection;
+    geoJSONIntersection?: GeoJSON.FeatureCollection;
+    geoJSONIntersectionBounds?: GeoJSON.FeatureCollection;
+    setGeoJSON: (geojson: GeoJSON.Feature | GeoJSON.FeatureCollection) => void;
+    setGeoJSONIntersectionBounds: (geojson: GeoJSON.Feature | GeoJSON.FeatureCollection) => void;
     editModes: EditMode[];
     changeDrawMode: (mode: DrawMode) => void;
     isInEditMode: boolean;
-    geojson: GeoJSON.FeatureCollection;
-    setGeojson: (geojson: GeoJSON.Feature | GeoJSON.FeatureCollection) => void;
     drawMode: string;
     setEditMode: (shouldEnable: boolean) => void;
     featureLayerIndex: number;
@@ -31,22 +33,72 @@ interface MapDrawToolProps {
     activeTool: string;
     changeActiveTool: (newMode: EditMode) => void;
     setActiveTool: (newToolId: string) => void;
+    layers: MapViewLayerProps[];
+    getLayer: (layerType: DrawLayerType, layerId: string) => MapViewLayerProps;
 }
 export interface MapDrawToolOptions {
     editModes?: EditMode[];
+    shouldAllowMultipleshapes?: boolean;
+    defaultGeoJSON?: GeoJSON.FeatureCollection;
+    defaultGeoJSONIntersection?: GeoJSON.FeatureCollection;
+    defaultGeoJSONIntersectionBounds?: GeoJSON.FeatureCollection;
+    defaultGeoJSONIntersectionProperties?: GeoJSON.GeoJsonProperties;
+    defaultActiveTool?: string;
 }
+export declare const defaultPoint: {
+    id: string;
+    value: DRAWMODE;
+    title: string;
+    icon: React.JSX.Element;
+    shape: import("geojson").Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    isSelectable: boolean;
+};
+export declare const defaultPolygon: {
+    id: string;
+    value: DRAWMODE;
+    title: string;
+    icon: React.JSX.Element;
+    shape: import("geojson").Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    isSelectable: boolean;
+};
+export declare const defaultBox: {
+    id: string;
+    value: DRAWMODE;
+    title: string;
+    icon: React.JSX.Element;
+    shape: import("geojson").Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    isSelectable: boolean;
+};
+export declare const defaultLineString: {
+    id: string;
+    value: DRAWMODE;
+    title: string;
+    icon: React.JSX.Element;
+    shape: import("geojson").Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    isSelectable: boolean;
+};
+export declare const defaultDelete: {
+    id: string;
+    value: "DELETE";
+    title: string;
+    icon: React.JSX.Element;
+    shape: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    isSelectable: boolean;
+};
 export declare const defaultModes: ({
     id: string;
     value: DRAWMODE;
     title: string;
     icon: React.JSX.Element;
     shape: import("geojson").Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    isSelectable: boolean;
 } | {
     id: string;
     value: "DELETE";
     title: string;
     icon: React.JSX.Element;
     shape: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    isSelectable: boolean;
 })[];
-export declare const useMapDrawTool: ({ editModes, }: MapDrawToolOptions) => MapDrawToolProps;
+export declare const useMapDrawTool: ({ editModes, shouldAllowMultipleshapes, defaultGeoJSON, defaultGeoJSONIntersection, defaultGeoJSONIntersectionBounds, defaultGeoJSONIntersectionProperties, defaultActiveTool, }: MapDrawToolOptions) => MapDrawToolProps;
 export {};

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { DrawModeExitCallback, FeatureEvent } from '../MapDraw';
-interface MapViewLayerProps {
+export interface MapViewLayerProps {
     id: string;
     onLayerReady?: (layer: any, webmap?: any) => void;
     geojson?: unknown;

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

@@ -1,3 +1,4 @@
 export { default as MapViewConnect } from './MapViewConnect';
 export { default as MapView } from './MapView';
 export { default as MapViewLayer } from './MapViewLayer';
+export type { MapViewLayerProps } from './MapViewLayer';