@opengeoweb/core 10.2.0 → 10.2.1-spike-ol.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "10.2.0",
+  "version": "10.2.1-spike-ol.1",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -19,6 +19,7 @@
     "axios": "^1.7.7",
     "@opengeoweb/layer-select": "*",
     "lodash": "^4.17.21",
+    "ol": "^10.4.0",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.1",
     "@mui/system": "^6.1.1",
@@ -30,8 +31,8 @@
     "dompurify": "^3.0.6",
     "@mui/material": "^6.1.1",
     "@sentry/react": "^8.34.0",
-    "@tanstack/react-query": "^5.62.7",
     "@opengeoweb/authentication": "*",
+    "@tanstack/react-query": "^5.62.7",
     "@opengeoweb/api": "*",
     "msw": "^1.3.3"
   },

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

@@ -21,7 +21,7 @@ export interface ConfigurableMapConnectProps {
     tileServerSettings?: TileServerSettings;
     autoUpdateLayerId?: string;
     autoTimeStepLayerId?: string;
-    bbox?: mapTypes.Bbox;
+    initialBbox?: mapTypes.Bbox;
     srs?: string;
     dimensions?: mapTypes.Dimension[];
     animationPayload?: mapTypes.AnimationPayloadType;
@@ -43,5 +43,6 @@ export interface ConfigurableMapConnectProps {
     children?: React.ReactNode;
     mapControls?: React.ReactNode;
     shouldDisablePrefetching?: boolean;
+    useOl?: boolean;
 }
 export declare const ConfigurableMapConnect: React.FC<ConfigurableMapConnectProps>;

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

@@ -1,4 +1,6 @@
 import { layerTypes } from '@opengeoweb/store';
+import { IWMJSMap } from '@opengeoweb/webmap';
+import { MapLocation } from '@opengeoweb/webmap-react';
 export interface GFIResult {
     data: string;
     isLoading: boolean;
@@ -8,10 +10,11 @@ export interface GFILayer {
     url: string;
     title: string;
 }
+export declare const getFeatureInfoUrl: (layer: layerTypes.Layer, wmjsMap: IWMJSMap | undefined, mapPinLocation: MapLocation | null) => string | undefined;
 /**
  * Make a list of GFI Layers to display.
  * @param layers
  * @param mapId
  * @returns
  */
-export declare const getLayersToUpdate: (layers: layerTypes.Layer[], mapId: string) => GFILayer[];
+export declare const getLayersToUpdate: (mapPinLocation: MapLocation | null, layers: layerTypes.Layer[], mapId: string) => GFILayer[];

package/src/lib/components/MapDrawToolRedux/OpenLayersFeatureLayerConnect.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { layerTypes } from '@opengeoweb/store';
+import { StyleLike } from 'ol/style/Style';
+import { HoverSelect } from '@opengeoweb/webmap-react';
+interface OpenLayersFeatureLayerConnectProps {
+    layer: layerTypes.FeatureLayer;
+    layerId?: string;
+    zIndex: number;
+    style: StyleLike;
+    hoverSelect?: HoverSelect;
+}
+export declare const OpenLayersFeatureLayerConnect: React.FC<OpenLayersFeatureLayerConnectProps>;
+export {};

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
+import { Bbox } from '@opengeoweb/webmap';
 import { MapViewProps } from '@opengeoweb/webmap-react';
-export interface MapControls {
+export interface MapControlsProps {
     mapControlsPositionTop?: number;
     search?: boolean;
     zoomControls?: boolean;
@@ -13,11 +14,12 @@ export interface MapControls {
 export interface MapViewConnectProps extends MapViewProps {
     mapId: string;
     displayTimeInMap?: boolean;
-    controls?: MapControls;
+    controls?: MapControlsProps;
     showScaleBar?: boolean;
     children?: React.ReactNode;
     showLayerInfo?: boolean;
     passiveMap?: boolean;
+    initialBbox?: Bbox;
 }
 export declare const ORIGIN_REACTMAPVIEWCONNECT_ONMAPCHANGEDIMENSION = "ORIGIN_REACTMAPVIEWCONNECT_ONMAPCHANGEDIMENSION";
 export declare const ORIGIN_REACTMAPVIEWCONNECT_ONUPDATELAYERINFO = "ORIGIN_REACTMAPVIEWCONNECT_ONUPDATELAYERINFO";

package/src/lib/components/MapViewConnect/OlMapViewConnect.d.ts

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { MapViewConnectProps } from './MapViewConnect';
+/**
+ * Connected component used to display the map and selected layers.
+ * Includes options to disable the map controls and legend.
+ *
+ * Expects the following props:
+ * @param {string} mapId mapId: string - Id of the map
+ * @param {object} [controls.zoomControls] **optional** controls: object - toggle the map controls, zoomControls defaults to true
+ * @param {boolean} [displayTimeInMap] **optional** displayTimeInMap: boolean, toggles the mapTime, defaults to true
+ * @param {boolean} [showScaleBar] **optional** showScaleBar: boolean, toggles the scaleBar, defaults to true
+ * @example
+ * ```<MapViewConnect mapId={mapId} controls={{ zoomControls: false }} displayTimeInMap={false} showScaleBar={false}/>```
+ */
+declare const OlMapViewConnect: React.FC<MapViewConnectProps>;
+export default OlMapViewConnect;

package/src/lib/components/MapViewConnect/OlMapViewLayerConnect.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export interface OlMapViewLayerConnectProps {
+    layerId: string | undefined;
+    mapId: string;
+    zIndex: number;
+    debugMode: boolean;
+}
+export declare const OlMapViewLayerConnect: (layerProps: OlMapViewLayerConnectProps) => React.ReactElement | null;

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

@@ -1 +1,2 @@
 export { default as MapViewConnect } from './MapViewConnect';
+export { default as OlMapViewConnect } from './OlMapViewConnect';

package/src/lib/components/MapViewConnect/olMapUtils.d.ts

@@ -0,0 +1,5 @@
+import { TimeSliderStartCenterEndTime } from '@opengeoweb/store';
+import { Dimension } from '@opengeoweb/webmap';
+import { OnInitializeLayerProps, TimeContextType, UpdateLayerInfoPayload } from '@opengeoweb/webmap-react';
+export declare const makePrefetchTimeSpan: (timeSliderStartCenterEndTime: TimeSliderStartCenterEndTime, animationStartTime: string | undefined, animationEndTime: string | undefined, isAnimating: boolean) => TimeContextType;
+export declare const makeLayerInfoPayload: (payload: OnInitializeLayerProps, mapDimensions: Dimension[], mapId: string) => UpdateLayerInfoPayload;

package/src/lib/components/MapViewConnect/olMapUtils.spec.d.ts

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

package/src/lib/components/MapViewConnect/useGetOpenlayersView.d.ts

@@ -0,0 +1,9 @@
+import { CoreAppStore } from '@opengeoweb/store';
+import { Store } from '@reduxjs/toolkit';
+import { View } from 'ol';
+interface UseGetOpenLayersViewValue {
+    view?: View;
+    name?: string;
+}
+export declare const useGetOpenlayersView: (mapId: string, store: Store<CoreAppStore>) => UseGetOpenLayersViewValue;
+export {};

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

@@ -4,7 +4,7 @@ export interface LocationDetail {
     source: string;
     lat: number;
     lon: number;
-    geometry?: GeoJSON.GeoJSON;
+    geometry?: GeoJSON.Feature;
 }
 export interface LocationListResult {
     id: string;

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

@@ -1,6 +1,8 @@
 import { MapDrawDrawFunctionArgs } from '@opengeoweb/webmap-react';
+import { GeoJsonProperties } from 'geojson';
 import { LocationDetail } from './types';
 export declare const myLocationDrawFunction: (args: MapDrawDrawFunctionArgs) => void;
 export declare const selectedLocationDrawFunction: (args: MapDrawDrawFunctionArgs) => void;
+export declare const geometryStyling: GeoJsonProperties;
 export declare const hoverDrawFunction: (args: MapDrawDrawFunctionArgs) => void;
 export declare const useDrawOnMap: (mapId: string, drawFunction: (args: MapDrawDrawFunctionArgs) => void) => [(location?: LocationDetail) => void];

package/src/lib/components/SyncGroups/SimpleTimeSliderConnect.d.ts

@@ -11,8 +11,8 @@ export declare const SimpleTimeSliderConnect: import("react-redux").ConnectedCom
     id: string;
     timeValue?: string | null | undefined;
     setTime?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("dist/libs/store/src/store/generic/types").SetTimePayload, string> | undefined;
-    syncGroupAddSource?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("dist/libs/store/src/store/generic/synchronizationGroups/types").SyncGroupsAddSourcePayload, "synchronizationGroupsReducer/syncGroupAddSource"> | undefined;
-    syncGroupRemoveSource?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("dist/libs/store/src/store/generic/synchronizationGroups/types").SyncGroupRemoveSourcePayload, "synchronizationGroupsReducer/syncGroupRemoveSource"> | undefined;
+    syncGroupAddSource?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("dist/libs/store/src/store/generic/syncGroups/types").SyncGroupsAddSourcePayload, "synchronizationGroupsReducer/syncGroupAddSource"> | undefined;
+    syncGroupRemoveSource?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("dist/libs/store/src/store/generic/syncGroups/types").SyncGroupRemoveSourcePayload, "synchronizationGroupsReducer/syncGroupRemoveSource"> | undefined;
     context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").AnyAction>> | undefined;
     store?: import("redux").Store<any, import("redux").AnyAction> | undefined;
 }>;

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

@@ -5,7 +5,7 @@ interface TimeSliderConnectProps {
     sourceId: string;
     mapId: string;
     isAlwaysVisible?: boolean;
-    mapWindowRef?: React.MutableRefObject<null>;
+    mapWindowRef?: React.MutableRefObject<HTMLElement | null>;
 }
 export declare const TimeSliderConnect: React.FC<TimeSliderConnectProps>;
 export {};

package/src/lib/components/TimeSliderConnect/TimeSliderLegendConnect.d.ts

@@ -5,6 +5,10 @@ interface TimeSliderLegendConnectProps {
     unfilteredSelectedTime: number;
     setUnfilteredSelectedTime: (unfilteredSelectedTime: number) => void;
     mapWindowRef?: React.MutableRefObject<HTMLElement | null>;
+    adjustSelectedTimeOnWheel?: ({ event, deltaY, }: {
+        event: WheelEvent | KeyboardEvent;
+        deltaY: number;
+    }) => void;
 }
 export declare const TimeSliderLegendConnect: React.FC<TimeSliderLegendConnectProps>;
 export {};

package/src/lib/utils/location-api/fakeApi.d.ts

@@ -22,19 +22,49 @@ export declare const fakeLocationDetailList: ({
             type: string;
             coordinates: number[];
         };
+        properties?: undefined;
     };
 } | {
+    id: string;
+    name: string;
+    source: string;
     lat: number;
     lon: number;
-    source: string;
+    geometry: {
+        type: string;
+        properties: {};
+        geometry: {
+            type: string;
+            coordinates: number[][];
+        };
+    };
+} | {
     id: string;
     name: string;
+    source: string;
+    lat: number;
+    lon: number;
     geometry: {
         type: string;
         geometry: {
             type: string;
             coordinates: number[][][];
         };
+        properties: {};
+    };
+} | {
+    id: string;
+    name: string;
+    source: string;
+    lat: number;
+    lon: number;
+    geometry: {
+        type: string;
+        geometry: {
+            type: string;
+            coordinates: number[][][][];
+        };
+        properties: {};
     };
 })[];
 export declare const locationApiEndpoints: import("msw").RestHandler<import("msw").MockedRequest<import("msw").DefaultBodyType>>[];

package/src/lib/utils/location-api/hooks.d.ts

@@ -1,9 +1,4 @@
 import { UseQueryResult } from '@tanstack/react-query';
 import { LocationDetail, LocationListResult } from '../../components/Search/types';
 export declare const useLocationList: (search: string) => UseQueryResult<LocationListResult[]>;
-interface DetailProps {
-    id: string;
-    source: string;
-}
-export declare const useLocationDetail: ({ id, source, }: DetailProps) => UseQueryResult<LocationDetail>;
-export {};
+export declare const useLocationDetail: (id?: string, source?: string) => UseQueryResult<LocationDetail>;