@opengeoweb/store 9.35.0 → 9.35.1-spike-oltanstack.0

package/index.esm.js

@@ -1,4 +1,4 @@
-import { webmapUtils, parseISO8601IntervalToDateInterval, LayerType, getWMJSMapById, webmapTestSettings, WMLayer, getWMSRequests, handleDateUtilsISOString, isProjectionSupported, getCapabilities } from '@opengeoweb/webmap';
+import { webmapUtils, parseISO8601IntervalToDateInterval, LayerType, getWMJSMapById, webmapTestSettings, WMLayer, getWMSRequests, handleDateUtilsISOString, isProjectionSupported, queryWMSLayers } from '@opengeoweb/webmap';
 import { createAction, createSlice, createSelector, createListenerMiddleware, isAnyOf, createEntityAdapter } from '@reduxjs/toolkit';
 import { getGeoJson, moveFeature, createInterSections, getLastEmptyFeatureIndex, defaultLayers, addSelectionTypeToGeoJSON, getFeatureCollection, emptyGeoJSON, defaultIntersectionStyleProperties } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
@@ -3463,17 +3463,32 @@ var initialState$3 = {
       sourcesById: []
     }
   },
-  isTimeScrollingEnabled: false,
   linkedState: {
     links: {},
     sharedData: {}
-  }
+  },
+  isTimeScrollingEnabled: false
 };
 var slice$4 = createSlice({
   initialState: initialState$3,
   name: 'synchronizationGroupsReducer',
   reducers: {
-    changeLinkedMap: function changeLinkedMap(draft, action) {
+    /** Sets the links map.
+     *  This is used to override the links when changing workspaces.
+     * @param draft sync state
+     * @param {Record<string, string[]>} action.newLinks the new links object
+     */
+    setLinkedMap: function setLinkedMap(draft, action) {
+      var newLinks = action.payload.newLinks;
+      draft.linkedState.links = newLinks;
+    },
+    /** Updates the links map.
+     *  This is used to update the links when operating the link menu.
+     * @param draft sync state
+     * @param {string} action.panelId id of the panel updating it's links
+     * @param {string[]} action.mapIds the new linked maps
+     */
+    updateLinkedMap: function updateLinkedMap(draft, action) {
       var _action$payload = action.payload,
         panelId = _action$payload.panelId,
         mapIds = _action$payload.mapIds;
@@ -3490,11 +3505,18 @@ var slice$4 = createSlice({
       delete draft.linkedState.links[panelId];
       delete draft.linkedState.sharedData[panelId];
     },
-    syncGroupAddSource: function syncGroupAddSource(draft, action) {
+    setFeatureSelected: function setFeatureSelected(draft, action) {
       var _action$payload3 = action.payload,
-        id = _action$payload3.id,
-        payloadType = _action$payload3.type,
-        defaultPayload = _action$payload3.defaultPayload;
+        mapId = _action$payload3.mapId,
+        featureId = _action$payload3.featureId;
+      var sharedData = draft.linkedState.sharedData[mapId];
+      sharedData.selectedFeatureId = featureId;
+    },
+    syncGroupAddSource: function syncGroupAddSource(draft, action) {
+      var _action$payload4 = action.payload,
+        id = _action$payload4.id,
+        payloadType = _action$payload4.type,
+        defaultPayload = _action$payload4.defaultPayload;
       if (!draft.sources.byId[id]) {
         draft.sources.byId[id] = {
           types: payloadType,
@@ -3529,10 +3551,10 @@ var slice$4 = createSlice({
     },
     syncGroupAddTarget: function syncGroupAddTarget(draft, action) {
       var _synchronizationGroup;
-      var _action$payload4 = action.payload,
-        groupId = _action$payload4.groupId,
-        targetId = _action$payload4.targetId,
-        linked = _action$payload4.linked;
+      var _action$payload5 = action.payload,
+        groupId = _action$payload5.groupId,
+        targetId = _action$payload5.targetId,
+        linked = _action$payload5.linked;
       var synchronizationGroup = draft.groups.byId[groupId];
       if (!synchronizationGroup) {
         console.warn("SYNCGROUPS_ADD_TARGET: Group " + groupId + " does not exist.");
@@ -3556,9 +3578,9 @@ var slice$4 = createSlice({
       }
     },
     syncGroupRemoveTarget: function syncGroupRemoveTarget(draft, action) {
-      var _action$payload5 = action.payload,
-        groupId = _action$payload5.groupId,
-        targetId = _action$payload5.targetId;
+      var _action$payload6 = action.payload,
+        groupId = _action$payload6.groupId,
+        targetId = _action$payload6.targetId;
       if (!draft.groups.byId[groupId]) {
         return;
       }
@@ -3571,20 +3593,20 @@ var slice$4 = createSlice({
       });
     },
     syncGroupLinkTarget: function syncGroupLinkTarget(draft, action) {
-      var _action$payload6 = action.payload,
-        groupId = _action$payload6.groupId,
-        targetId = _action$payload6.targetId,
-        linked = _action$payload6.linked;
+      var _action$payload7 = action.payload,
+        groupId = _action$payload7.groupId,
+        targetId = _action$payload7.targetId,
+        linked = _action$payload7.linked;
       if (!draft.groups.byId[groupId] || !draft.groups.byId[groupId].targets.byId[targetId]) {
         return;
       }
       draft.groups.byId[groupId].targets.byId[targetId].linked = linked;
     },
     syncGroupAddGroup: function syncGroupAddGroup(draft, action) {
-      var _action$payload7 = action.payload,
-        groupId = _action$payload7.groupId,
-        type = _action$payload7.type,
-        title = _action$payload7.title;
+      var _action$payload8 = action.payload,
+        groupId = _action$payload8.groupId,
+        type = _action$payload8.type,
+        title = _action$payload8.title;
       if (draft.groups.byId[groupId]) {
         return;
       }
@@ -3632,10 +3654,10 @@ var slice$4 = createSlice({
   }
 });
 var setBboxOrTimeSync = function setBboxOrTimeSync(draft, action) {
-  var _action$payload8 = action.payload,
-    targets = _action$payload8.targets,
-    source = _action$payload8.source,
-    groups = _action$payload8.groups;
+  var _action$payload9 = action.payload,
+    targets = _action$payload9.targets,
+    source = _action$payload9.source,
+    groups = _action$payload9.groups;
   var getPayLoadKey = function getPayLoadKey(type) {
     switch (type) {
       case setTimeSync.type:
@@ -4131,27 +4153,87 @@ var getLinkedFeatureProviders = function getLinkedFeatureProviders(linkedState,
 var selectSharedData = createSelector([selectLinkedState, function (store, panelId) {
   return panelId;
 }], function (linkedState, panelId) {
-  return pick(linkedState.sharedData, [panelId]);
+  return pick(linkedState == null ? void 0 : linkedState.sharedData, [panelId]);
+});
+var selectLinkedPanelId = createSelector([selectLinkedState, function (_, mapViewId) {
+  return mapViewId;
+}], function (linkedState, mapViewId) {
+  if (!linkedState || !linkedState.links) {
+    return undefined;
+  }
+  // Find the panelId where mapView(s) is linked
+  var panelId = Object.keys(linkedState.links).find(function (panelId) {
+    var _linkedState$links$pa;
+    return (_linkedState$links$pa = linkedState.links[panelId]) == null ? void 0 : _linkedState$links$pa.includes(mapViewId);
+  });
+  return panelId;
+});
+var selectMapViewsForPanelId = createSelector([function (linkedState, panelId) {
+  return linkedState.links[panelId];
+}], function (mapViews) {
+  if (!mapViews) {
+    return undefined;
+  }
+  return mapViews;
 });
 var selectLinkedFeatures = createSelector([function (linkedState) {
   return linkedState;
 }, getLinkedFeatureProviders], function (linkedState, featureProviders) {
   var features = featureProviders.flatMap(function (providerId) {
     var _linkedState$sharedDa;
-    return (_linkedState$sharedDa = linkedState.sharedData[providerId]) == null ? void 0 : _linkedState$sharedDa.features;
+    return ((_linkedState$sharedDa = linkedState.sharedData[providerId]) == null ? void 0 : _linkedState$sharedDa.features) || [];
   }).filter(function (f) {
     return f !== undefined;
   });
   return features;
 });
+var getSelectedFeature = createSelector([
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+function (state, mapId) {
+  var _state$linkedState;
+  var sharedData = (_state$linkedState = state.linkedState) == null ? void 0 : _state$linkedState.sharedData[mapId];
+  var _ref = sharedData || {},
+    _ref$features = _ref.features,
+    features = _ref$features === void 0 ? [] : _ref$features,
+    selectedFeatureId = _ref.selectedFeatureId;
+  return {
+    features: features,
+    selectedFeatureId: selectedFeatureId
+  };
+}], function (_ref2) {
+  var features = _ref2.features,
+    selectedFeatureId = _ref2.selectedFeatureId;
+  if (!selectedFeatureId) {
+    return null;
+  }
+  // Find the feature by the selectedFeatureId
+  var selectedFeature = features[0].geoJSON.features.find(function (feature) {
+    return feature.id === selectedFeatureId;
+  });
+  if (selectedFeature && selectedFeature.geometry.type === 'Point') {
+    var _selectedFeature$prop, _selectedFeature$prop2;
+    var coordinates = selectedFeature.geometry.coordinates;
+    return {
+      lat: coordinates[1],
+      lon: coordinates[0],
+      id: selectedFeature.id,
+      serviceId: (_selectedFeature$prop = selectedFeature.properties) == null ? void 0 : _selectedFeature$prop.serviceId,
+      collectionId: (_selectedFeature$prop2 = selectedFeature.properties) == null ? void 0 : _selectedFeature$prop2.collectionId
+    };
+  }
+  return null;
+});
 
 var selectors$4 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   getLinkedFeatureProviders: getLinkedFeatureProviders,
   getLinkedMaps: getLinkedMaps,
+  getSelectedFeature: getSelectedFeature,
   getSynchronizationGroupStore: getSynchronizationGroupStore,
   getTime: getTime,
   selectLinkedFeatures: selectLinkedFeatures,
+  selectLinkedPanelId: selectLinkedPanelId,
+  selectMapViewsForPanelId: selectMapViewsForPanelId,
   selectSharedData: selectSharedData
 });
 
@@ -5016,8 +5098,8 @@ var getPinLocation = createSelector(getMapById, function (store) {
  * @param {string} mapId mapId: string - Id of the map
  * @returns {boolean} returnType: boolean
  */
-var getDisableMapPin = createSelector(getMapById, function (store) {
-  return store ? store.disableMapPin : false;
+var getDisableMapPin = createSelector([getMapById], function (map) {
+  return map == null ? void 0 : map.disableMapPin;
 }, selectorMemoizationOptions);
 /**
  * Returns the display map pin boolean for the current map
@@ -6738,7 +6820,7 @@ var fetchService = /*#__PURE__*/function () {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return getCapabilities.getLayersFlattenedFromService(service.serviceUrl);
+          return queryWMSLayers(service.serviceUrl);
         case 3:
           layers = _context.sent;
           listenerApi.dispatch(serviceActions.serviceSetLayers(Object.assign({}, service, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "9.35.0",
+  "version": "9.35.1-spike-oltanstack.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/store/generic/index.d.ts

@@ -2,9 +2,14 @@ export declare const genericActions: {
     initialSyncState: import("./synchronizationGroups/types").SynchronizationGroupState;
     setTime: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").SetTimePayload, string>;
     setBbox: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").SetBboxPayload, string>;
-    changeLinkedMap: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").ChangeLinkedMap, "synchronizationGroupsReducer/changeLinkedMap">;
+    setLinkedMap: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").SetLinkedMap, "synchronizationGroupsReducer/setLinkedMap">;
+    updateLinkedMap: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").UpdateLinkedMap, "synchronizationGroupsReducer/updateLinkedMap">;
     addSharedData: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").AddSharedData, "synchronizationGroupsReducer/addSharedData">;
     deleteSharedData: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").DeleteSharedData, "synchronizationGroupsReducer/deleteSharedData">;
+    setFeatureSelected: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+        mapId: string;
+        featureId: string;
+    }, "synchronizationGroupsReducer/setFeatureSelected">;
     syncGroupAddSource: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").SyncGroupsAddSourcePayload, "synchronizationGroupsReducer/syncGroupAddSource">;
     syncGroupRemoveSource: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").SyncGroupRemoveSourcePayload, "synchronizationGroupsReducer/syncGroupRemoveSource">;
     syncGroupAddTarget: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./synchronizationGroups/types").SyncGroupAddTargetPayload, "synchronizationGroupsReducer/syncGroupAddTarget">;

package/src/store/generic/selectors.d.ts

@@ -21,13 +21,46 @@ export declare const selectSharedData: ((state: any, panelId: string) => Pick<Re
 }> & {
     clearCache: () => void;
 };
-export declare const selectLinkedFeatures: ((state: any, mapId: string) => ({
+export declare const selectLinkedPanelId: ((state: any, mapViewId: string) => string | undefined) & import("reselect").OutputSelectorFields<(args_0: LinkedState, args_1: string) => string | undefined, {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
+export declare const selectMapViewsForPanelId: ((state: LinkedState, panelId: string) => string[] | undefined) & import("reselect").OutputSelectorFields<(args_0: string[]) => string[] | undefined, {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
+export declare const selectLinkedFeatures: ((state: any, mapId: string) => {
     id: string;
     geoJSON: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
-} | undefined)[]) & import("reselect").OutputSelectorFields<(args_0: LinkedState, args_1: string[]) => ({
+}[]) & import("reselect").OutputSelectorFields<(args_0: LinkedState, args_1: string[]) => {
     id: string;
     geoJSON: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
-} | undefined)[], {
+}[], {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
+export declare const getSelectedFeature: ((state: SynchronizationGroupState, mapId: string) => {
+    lat: number;
+    lon: number;
+    id: string;
+    serviceId: string;
+    collectionId: string;
+} | null) & import("reselect").OutputSelectorFields<(args_0: {
+    features: {
+        id: string;
+        geoJSON: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    }[];
+    selectedFeatureId: string | undefined;
+}) => {
+    lat: number;
+    lon: number;
+    id: string;
+    serviceId: string;
+    collectionId: string;
+} | null, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

package/src/store/generic/synchronizationGroups/reducer.d.ts

@@ -1,10 +1,26 @@
 import { PayloadAction, Draft } from '@reduxjs/toolkit';
-import { SynchronizationGroupState, SyncGroupAddTargetPayload, SyncGroupAddGroupPayload, SyncGroupRemoveTargetPayload, SyncGroupRemoveGroupPayload, SyncGroupSetViewStatePayload, SyncGroupLinkTargetPayload, SyncGroupRemoveSourcePayload, SyncGroupsAddSourcePayload, SyncGroupToggleIsTimeScrollingEnabled, ChangeLinkedMap, AddSharedData, DeleteSharedData } from './types';
+import { SynchronizationGroupState, SyncGroupAddTargetPayload, SyncGroupAddGroupPayload, SyncGroupRemoveTargetPayload, SyncGroupRemoveGroupPayload, SyncGroupSetViewStatePayload, SyncGroupLinkTargetPayload, SyncGroupRemoveSourcePayload, SyncGroupsAddSourcePayload, SyncGroupToggleIsTimeScrollingEnabled, UpdateLinkedMap, AddSharedData, DeleteSharedData, SetLinkedMap } from './types';
 export declare const initialState: SynchronizationGroupState;
 export declare const slice: import("@reduxjs/toolkit").Slice<SynchronizationGroupState, {
-    changeLinkedMap: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<ChangeLinkedMap>) => void;
+    /** Sets the links map.
+     *  This is used to override the links when changing workspaces.
+     * @param draft sync state
+     * @param {Record<string, string[]>} action.newLinks the new links object
+     */
+    setLinkedMap: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SetLinkedMap>) => void;
+    /** Updates the links map.
+     *  This is used to update the links when operating the link menu.
+     * @param draft sync state
+     * @param {string} action.panelId id of the panel updating it's links
+     * @param {string[]} action.mapIds the new linked maps
+     */
+    updateLinkedMap: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<UpdateLinkedMap>) => void;
     addSharedData: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<AddSharedData>) => void;
     deleteSharedData: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<DeleteSharedData>) => void;
+    setFeatureSelected: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<{
+        mapId: string;
+        featureId: string;
+    }>) => void;
     syncGroupAddSource: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SyncGroupsAddSourcePayload>) => void;
     syncGroupRemoveSource: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SyncGroupRemoveSourcePayload>) => void;
     syncGroupAddTarget: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SyncGroupAddTargetPayload>) => void;
@@ -18,9 +34,25 @@ export declare const slice: import("@reduxjs/toolkit").Slice<SynchronizationGrou
 }, "synchronizationGroupsReducer">;
 export declare const syncGroupAddGroup: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupAddGroupPayload, "synchronizationGroupsReducer/syncGroupAddGroup">, syncGroupAddSource: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupsAddSourcePayload, "synchronizationGroupsReducer/syncGroupAddSource">, syncGroupAddTarget: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupAddTargetPayload, "synchronizationGroupsReducer/syncGroupAddTarget">, syncGroupClear: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"synchronizationGroupsReducer/syncGroupClear">, syncGroupLinkTarget: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupLinkTargetPayload, "synchronizationGroupsReducer/syncGroupLinkTarget">, syncGroupRemoveGroup: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupRemoveGroupPayload, "synchronizationGroupsReducer/syncGroupRemoveGroup">, syncGroupRemoveSource: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupRemoveSourcePayload, "synchronizationGroupsReducer/syncGroupRemoveSource">, syncGroupRemoveTarget: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupRemoveTargetPayload, "synchronizationGroupsReducer/syncGroupRemoveTarget">, syncGroupSetViewState: import("@reduxjs/toolkit").ActionCreatorWithPayload<SyncGroupSetViewStatePayload, "synchronizationGroupsReducer/syncGroupSetViewState">;
 export declare const actions: import("@reduxjs/toolkit").CaseReducerActions<{
-    changeLinkedMap: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<ChangeLinkedMap>) => void;
+    /** Sets the links map.
+     *  This is used to override the links when changing workspaces.
+     * @param draft sync state
+     * @param {Record<string, string[]>} action.newLinks the new links object
+     */
+    setLinkedMap: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SetLinkedMap>) => void;
+    /** Updates the links map.
+     *  This is used to update the links when operating the link menu.
+     * @param draft sync state
+     * @param {string} action.panelId id of the panel updating it's links
+     * @param {string[]} action.mapIds the new linked maps
+     */
+    updateLinkedMap: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<UpdateLinkedMap>) => void;
     addSharedData: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<AddSharedData>) => void;
     deleteSharedData: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<DeleteSharedData>) => void;
+    setFeatureSelected: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<{
+        mapId: string;
+        featureId: string;
+    }>) => void;
     syncGroupAddSource: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SyncGroupsAddSourcePayload>) => void;
     syncGroupRemoveSource: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SyncGroupRemoveSourcePayload>) => void;
     syncGroupAddTarget: (draft: Draft<SynchronizationGroupState>, action: PayloadAction<SyncGroupAddTargetPayload>) => void;

package/src/store/generic/synchronizationGroups/types.d.ts

@@ -34,6 +34,7 @@ export interface PotentialData {
         id: string;
         geoJSON: GeoJSON.FeatureCollection;
     }[];
+    selectedFeatureId?: string;
 }
 export interface LinkedState {
     links: Record<string, string[]>;
@@ -57,8 +58,8 @@ export interface SynchronizationGroupState {
     sources: SynchronizationSources;
     groups: SynchronizationGroups;
     viewState: SyncGroupViewState;
-    isTimeScrollingEnabled: boolean;
     linkedState: LinkedState;
+    isTimeScrollingEnabled: boolean;
 }
 export interface SynchronizationGroupModuleState {
     syncronizationGroupStore?: SynchronizationGroupState;
@@ -103,6 +104,7 @@ export interface SyncGroupSetViewStatePayload {
 }
 export interface SyncGroupToggleIsTimeScrollingEnabled {
     isTimeScrollingEnabled: boolean;
+    origin?: Origin;
 }
 export declare const SyncGroupTypeList: string[];
 export declare enum SyncGroupActionOrigin {
@@ -112,7 +114,10 @@ export declare enum SyncGroupActionOrigin {
     add = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_ADDACTION",
     autoLayerId = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_AUTOLAYERIDACTION"
 }
-export interface ChangeLinkedMap {
+export interface SetLinkedMap {
+    newLinks: Record<string, string[]>;
+}
+export interface UpdateLinkedMap {
     panelId: string;
     mapIds: string[];
 }