@opengeoweb/core 2.1.3 → 2.1.4

package/lib/store/mapStore/map/selectors.d.ts

@@ -59,7 +59,7 @@ export declare const getLayerIds: import("reselect").OutputParametricSelector<Ap
  * @param {string} mapId mapId: string - Id of the map
  * @returns {array} returnType: array -  array containing all layer states for the map
  */
-export declare const getMapLayers: import("reselect").OutputParametricSelector<AppStore, string, Layer[], (res1: string[], res2: Record<string, Layer>) => Layer[]>;
+export declare const getMapLayers: import("reselect").OutputParametricSelector<AppStore, string, import("../types").ReduxLayer[], (res1: string[], res2: Record<string, import("../types").ReduxLayer>) => import("../types").ReduxLayer[]>;
 /**
  * Gets an array of baselayers ids for a map
  *
@@ -77,7 +77,7 @@ export declare const getMapBaseLayersIds: import("reselect").OutputParametricSel
  * @param {string} mapId mapId: string - Id of the map
  * @returns {array} returnType: array -  array containing all baselayers for the map
  */
-export declare const getMapBaseLayers: import("reselect").OutputParametricSelector<AppStore, string, Layer[], (res1: string[], res2: Record<string, Layer>) => Layer[]>;
+export declare const getMapBaseLayers: import("reselect").OutputParametricSelector<AppStore, string, import("../types").ReduxLayer[], (res1: string[], res2: Record<string, import("../types").ReduxLayer>) => import("../types").ReduxLayer[]>;
 /**
  * Gets and array of overLayers ids for a map
  *
@@ -95,7 +95,7 @@ export declare const getMapOverLayersIds: import("reselect").OutputParametricSel
  * @param {string} mapId mapId: string - Id of the map
  * @returns {array} returnType: array -  array containing all overLayers for the map
  */
-export declare const getMapOverLayers: import("reselect").OutputParametricSelector<AppStore, string, Layer[], (res1: string[], res2: Record<string, Layer>) => Layer[]>;
+export declare const getMapOverLayers: import("reselect").OutputParametricSelector<AppStore, string, import("../types").ReduxLayer[], (res1: string[], res2: Record<string, import("../types").ReduxLayer>) => import("../types").ReduxLayer[]>;
 /**
  * Gets map dimensions
  *
@@ -286,7 +286,7 @@ export declare const getMapIdFromLayerId: import("reselect").OutputParametricSel
  * @param {string} layerId layerId: string - Id of the layer
  * @returns {string} returnType: the layerId, or null if not found
  */
-export declare const getLayerIdByLayerName: import("reselect").OutputParametricSelector<AppStore, string, string, (res1: Layer[], res2: string) => string>;
+export declare const getLayerIdByLayerName: import("reselect").OutputParametricSelector<AppStore, string, string, (res1: import("../types").ReduxLayer[], res2: string) => string>;
 /**
  * Returns the layerIndex in the map for given layerId
  *
@@ -296,7 +296,7 @@ export declare const getLayerIdByLayerName: import("reselect").OutputParametricS
  * @param {string} layerId layerId: string - Id of the layer
  * @returns {number} returnType: index number or -1 if not found
  */
-export declare const getLayerIndexByLayerId: import("reselect").OutputParametricSelector<AppStore, string, number, (res1: Layer[], res2: string) => number>;
+export declare const getLayerIndexByLayerId: import("reselect").OutputParametricSelector<AppStore, string, number, (res1: import("../types").ReduxLayer[], res2: string) => number>;
 /**
  * Returns the Layer in the map for given layerIndex
  *
@@ -306,7 +306,7 @@ export declare const getLayerIndexByLayerId: import("reselect").OutputParametric
  * @param {number} layerIndex layerId: number - Index of the layer in the map
  * @returns {object} returnType: layer, or null if not found
  */
-export declare const getLayerByLayerIndex: import("reselect").OutputParametricSelector<AppStore, string, Layer, (res1: Layer[], res2: number) => Layer>;
+export declare const getLayerByLayerIndex: import("reselect").OutputParametricSelector<AppStore, string, Layer, (res1: import("../types").ReduxLayer[], res2: number) => Layer>;
 /**
  * Returns name of all unique dimensions present in all maps
  *

package/lib/store/mapStore/service/selectors.d.ts

@@ -1,5 +1,6 @@
+import { Style } from '@opengeoweb/webmap';
 import { AppStore } from '../../../types/types';
-import { ServiceState, ServiceLayer } from './types';
+import { ServiceState, ServiceLayer, Service } from './types';
 /**
  * Retrieves all serviceIds
  *
@@ -17,10 +18,39 @@ export declare const getServiceIds: import("reselect").OutputSelector<AppStore,
  */
 export declare const getServices: import("reselect").OutputSelector<AppStore, import("./types").Services, (res: ServiceState) => import("./types").Services>;
 /**
- * Gets map layers from servicename
+ * Gets the service object by its url
  *
- * Example: layers = getServices(store, 'serviceName')
+ * Example: service = getServiceByName(store, 'serviceName')
  * @param {object} store store: object - Store object
- * @returns {array} returnType: ServiceLayer[]
+ * @returns {Service} returnType: Service
  */
-export declare const getServiceLayersByName: (store: AppStore, serviceName: string) => ServiceLayer[];
+export declare const getServiceByName: import("reselect").OutputParametricSelector<any, any, Service, (res1: ServiceState, res2: string) => Service>;
+/**
+ * Gets the layer from the store using the serviceUrl and layerName
+ *
+ * Example: layers = getLayersFromService(store, 'https://geoservices.knmi.nl/...')
+ * @param {object} store store: object - object from which the layers state will be extracted
+ * @param {string}  serviceUrl serviceUrl: string - Url of the service where the layer belongs to
+ * @returns {arrayr} returnType: ServiceLayer[] - All layers within the service object.
+ */
+export declare const getLayersFromService: import("reselect").OutputParametricSelector<any, any, ServiceLayer[], (res: Service) => ServiceLayer[]>;
+/**
+ * Gets the layer from the store using the serviceUrl and layerName
+ *
+ * Example: layer = getLayerFromService(store, 'https://geoservices.knmi.nl/...', 'radar')
+ * @param {object} store store: object - The application store
+ * @param {string}  serviceUrl serviceUrl: string - Url of the service where the layer belongs to
+ * @param {string}  layerName layerName: string - Name of the layer in the service
+ * @returns {ServiceLayer} returnType: ServiceLayer - The layer from the service object.
+ */
+export declare const getLayerFromService: import("reselect").OutputParametricSelector<AppStore, string, ServiceLayer, (res1: ServiceLayer[], res2: string, res3: string) => ServiceLayer>;
+/**
+ * Gets the layers stylelist from the servicestore using the serviceUrl and layerName
+ *
+ * Example: layerStyles = getLayerStyles(store, layerService, layerName);
+ * @param {object} store store: object - store from which the layers state will be extracted
+ * @param {string}  serviceUrl serviceUrl: string - Url of the service where the layer belongs to
+ * @param {string}  layerName layerName: string - Name of the layer in the service
+ * @returns {array} returnType: Style[] - array containing layer styles
+ */
+export declare const getLayerStyles: import("reselect").OutputParametricSelector<AppStore, string, Style[], (res: ServiceLayer) => Style[]>;

package/lib/store/mapStore/service/types.d.ts

@@ -1,4 +1,6 @@
+import { Style } from '@opengeoweb/webmap';
 import { Action } from 'redux';
+import type { UpdateLayerInfo } from '../types';
 import { MAP_SERVICES_SET_LAYERS } from './constants';
 export interface Services {
     [key: string]: Service;
@@ -7,6 +9,7 @@ export interface Service {
     id?: string;
     name?: string;
     service?: string;
+    active?: boolean;
     layers?: ServiceLayer[];
 }
 /**
@@ -19,6 +22,7 @@ export interface ServiceLayer {
     path: string;
     abstract?: string;
     keywords?: string[];
+    styles?: Style[];
 }
 export interface ServiceState {
     byId: Services;
@@ -34,5 +38,5 @@ interface SetLayersForService extends Action {
     type: typeof MAP_SERVICES_SET_LAYERS;
     payload: SetLayersForServicePayload;
 }
-export declare type ServiceActions = SetLayersForService;
+export declare type ServiceActions = SetLayersForService | UpdateLayerInfo;
 export {};

package/lib/storybookUtils/HelperComponents.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Layer } from '../store/mapStore/layers/types';
-export declare const useStyles: (props?: any) => import("@material-ui/styles").ClassNameMap<"content" | "root" | "title" | "chips">;
+export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"content" | "title" | "root" | "chips">;
 declare type ExampleLayer = {
     title: string;
     layers: Layer[];

package/lib/storybookUtils/storyComponents/MapDrawGeoJSON.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const useDrawPolyStoryStyles: (props?: any) => import("@material-ui/styles").ClassNameMap<"MapDrawGeoJSONContainer" | "MapDrawGeoJSONMapContainer" | "MapDrawGeoJSONControlsContainer" | "MapDrawGeoJSONTextAreaContainer" | "MapDrawGeoJSONTextArea">;
+export declare const useDrawPolyStoryStyles: (props?: any) => import("@mui/styles").ClassNameMap<"MapDrawGeoJSONContainer" | "MapDrawGeoJSONMapContainer" | "MapDrawGeoJSONControlsContainer" | "MapDrawGeoJSONTextAreaContainer" | "MapDrawGeoJSONTextArea">;
 export declare const useGeoJSON: () => {
     editModes: {
         key: string;
@@ -16,9 +16,9 @@ export declare const useGeoJSON: () => {
     changeDrawMode: (mode: string) => void;
     setEditMode: (on: boolean) => void;
 };
-declare const _default: React.ComponentType<Pick<{
-    classes: import("@material-ui/styles").ClassNameMap<string>;
-} & {
+declare const _default: React.JSXElementConstructor<Omit<{
+    classes: import("@mui/styles").ClassNameMap<string>;
+} & Record<string, unknown> & {
     children?: React.ReactNode;
-}, "children"> & import("@material-ui/core").StyledComponentProps<string> & Record<string, unknown>>;
+}, string> & import("@mui/styles").StyledComponentProps<string> & Record<string, unknown>>;
 export default _default;

package/lib/storybookUtils/storyComponents/MapDrawGeoJSONStyles.d.ts

@@ -1,3 +1,4 @@
-import { StyleRulesCallback, Theme } from '@material-ui/core';
+import { Theme } from '@mui/material';
+import { StyleRulesCallback } from '@mui/styles';
 declare const mapDrawGeoJSONStyles: StyleRulesCallback<Theme, Record<string, unknown>>;
 export default mapDrawGeoJSONStyles;

package/lib/utils/defaultTestSettings.d.ts

@@ -1,4 +1,4 @@
-import { WMLayer } from '@opengeoweb/webmap';
+import { Style, WMLayer } from '@opengeoweb/webmap';
 import { Service } from '../components/WMSLoader/services';
 import { LayerType } from '../store/mapStore/types';
 export declare const defaultReduxLayerRadarColor: {
@@ -41,6 +41,8 @@ export declare const defaultReduxLayerRadarKNMI: {
 };
 export declare const WmdefaultReduxLayerRadarKNMI: WMLayer;
 export declare const makeGeoservicesRadarLayer: () => WMLayer;
+export declare const styleListForRADNL25PCPCMLayer: Style[];
+export declare const styleListForRADNLOPERR25PCPRRL3KNMILayer: Style[];
 export declare const defaultReduxServices: {
     'https://testservice': {
         id: string;
@@ -53,6 +55,15 @@ export declare const defaultReduxServices: {
             path: string;
             keywords: any[];
             abstract: string;
+            styles?: undefined;
+        } | {
+            name: string;
+            text: string;
+            leaf: boolean;
+            path: string;
+            keywords: any[];
+            abstract: string;
+            styles: Style[];
         } | {
             name: string;
             text: string;
@@ -60,6 +71,7 @@ export declare const defaultReduxServices: {
             path: string;
             keywords: any[];
             abstract?: undefined;
+            styles?: undefined;
         })[];
     };
 };

package/package.json

@@ -1,39 +1,38 @@
 {
   "name": "@opengeoweb/core",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
-  "main": "./core.umd.js",
-  "module": "./core.esm.js",
+  "main": "./index.umd.js",
+  "module": "./index.esm.js",
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "react": "16.14.0",
-    "@opengeoweb/theme": "2.1.3",
-    "@material-ui/core": "^4.11.0",
-    "@material-ui/lab": "^4.0.0-alpha.56",
-    "@material-ui/icons": "^4.9.1",
+    "react": "^17.0.2",
+    "@opengeoweb/theme": "2.1.4",
+    "@mui/material": "^5.2.8",
+    "@mui/styles": "^5.2.3",
+    "@mui/icons-material": "^5.2.5",
     "react-redux": "7.2.2",
     "moment": "^2.29.0",
     "react-intl": "^5.17.5",
-    "@opengeoweb/webmap": "2.1.3",
+    "@opengeoweb/webmap": "2.1.4",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-sortablejs": "^6.0.0",
-    "@opengeoweb/shared": "2.1.3",
+    "@opengeoweb/shared": "2.1.4",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
     "lodash": "^4.17.20",
-    "@opengeoweb/form-fields": "2.1.3",
+    "@opengeoweb/form-fields": "2.1.4",
     "react-hook-form": "^6.12.1",
-    "@material-ui/pickers": "^3.2.10",
     "moment-timezone": "^0.5.31",
-    "@date-io/moment": "^1.3.13",
-    "axios": "^0.21.4",
+    "@mui/lab": "^5.0.0-alpha.64",
+    "axios": "^0.25.0",
     "redux-dynamic-modules": "^5.2.0",
     "redux": "^4.0.4",
     "lodash.clonedeep": "^4.5.0",