@opengeoweb/cap 9.15.0 → 9.17.0

package/index.esm.js

@@ -2,16 +2,38 @@ import React from 'react';
 import { useApiContext, useApi, createNonAuthApiInstance, ApiProvider } from '@opengeoweb/api';
 import { Grid, Typography, Box, Card, CircularProgress } from '@mui/material';
 import { Box as Box$1 } from '@mui/system';
-import { dateUtils, AlertBanner, withEggs } from '@opengeoweb/shared';
-import { useTranslation } from 'react-i18next';
+import { dateUtils, AlertBanner } from '@opengeoweb/shared';
 import { useSelector, useDispatch } from 'react-redux';
 import { createEntityAdapter, createSlice, createSelector } from '@reduxjs/toolkit';
 import 'i18next';
+import { useTranslation } from 'react-i18next';
 import { ConfigurableMapConnect } from '@opengeoweb/core';
-import { mapSelectors, coreModuleConfig } from '@opengeoweb/store';
+import { mapSelectors } from '@opengeoweb/store';
 import { webmapUtils } from '@opengeoweb/webmap';
 import { MapViewLayer, MapWarningProperties } from '@opengeoweb/webmap-react';
-import { ThemeWrapper } from '@opengeoweb/theme';
+
+var en = {
+	"map-view-cap-error-title": "Something went wrong with loading the configuration file",
+	"warning-list-cap-alert-banner-title": "Note: Only map is affected by timeslider based filtering",
+	"warning-list-cap-error-title": "Something went wrong with loading the configuration file",
+	"warning-list-row-event": "Event",
+	"warning-list-row-severity": "Severity",
+	"warning-list-row-expires": "Expires",
+	"warning-list-row-not-expired": "(not expired)"
+};
+var fi = {
+	"map-view-cap-error-title": "🚧 ei käännetty",
+	"warning-list-cap-alert-banner-title": "🚧 ei käännetty",
+	"warning-list-cap-error-title": "🚧 ei käännetty",
+	"warning-list-row-event": "🚧 ei käännetty",
+	"warning-list-row-severity": "🚧 ei käännetty",
+	"warning-list-row-expires": "🚧 ei käännetty",
+	"warning-list-row-not-expired": "🚧 ei käännetty"
+};
+var capTrans = {
+	en: en,
+	fi: fi
+};
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1805,97 +1827,24 @@ const findEventIndexInLanguage = (languages, capWarningPresets, feedAddressFromP
   return languageIndex;
 };
 
-var DESCRIPTORS$2 = descriptors;
-var uncurryThis$8 = functionUncurryThis;
-var call$c = functionCall;
-var fails$9 = fails$k;
-var objectKeys = objectKeys$2;
-var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-var toObject$3 = toObject$6;
-var IndexedObject$1 = indexedObject;
-
-// eslint-disable-next-line es/no-object-assign -- safe
-var $assign = Object.assign;
-// eslint-disable-next-line es/no-object-defineproperty -- required for testing
-var defineProperty$1 = Object.defineProperty;
-var concat$1 = uncurryThis$8([].concat);
-
-// `Object.assign` method
-// https://tc39.es/ecma262/#sec-object.assign
-var objectAssign = !$assign || fails$9(function () {
-  // should have correct order of operations (Edge bug)
-  if (DESCRIPTORS$2 && $assign({ b: 1 }, $assign(defineProperty$1({}, 'a', {
-    enumerable: true,
-    get: function () {
-      defineProperty$1(this, 'b', {
-        value: 3,
-        enumerable: false
-      });
-    }
-  }), { b: 2 })).b !== 1) return true;
-  // should work with symbols and should have deterministic property order (V8 bug)
-  var A = {};
-  var B = {};
-  // eslint-disable-next-line es/no-symbol -- safe
-  var symbol = Symbol('assign detection');
-  var alphabet = 'abcdefghijklmnopqrst';
-  A[symbol] = 7;
-  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
-}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-  var T = toObject$3(target);
-  var argumentsLength = arguments.length;
-  var index = 1;
-  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-  var propertyIsEnumerable = propertyIsEnumerableModule.f;
-  while (argumentsLength > index) {
-    var S = IndexedObject$1(arguments[index++]);
-    var keys = getOwnPropertySymbols ? concat$1(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
-    var length = keys.length;
-    var j = 0;
-    var key;
-    while (length > j) {
-      key = keys[j++];
-      if (!DESCRIPTORS$2 || call$c(propertyIsEnumerable, S, key)) T[key] = S[key];
-    }
-  } return T;
-} : $assign;
-
-var $$c = _export;
-var assign = objectAssign;
-
-// `Object.assign` method
-// https://tc39.es/ecma262/#sec-object.assign
-// eslint-disable-next-line es/no-object-assign -- required for testing
-$$c({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-  assign: assign
-});
-
-var en = {
-	"map-view-cap-error-title": "Something went wrong with loading the configuration file",
-	"warning-list-cap-alert-banner-title": "Note: Only map is affected by timeslider based filtering",
-	"warning-list-cap-error-title": "Something went wrong with loading the configuration file",
-	"warning-list-row-event": "Event",
-	"warning-list-row-severity": "Severity",
-	"warning-list-row-expires": "Expires",
-	"warning-list-row-not-expired": "(not expired)"
-};
-var fi = {
-	"map-view-cap-error-title": "🚧 ei käännetty",
-	"warning-list-cap-alert-banner-title": "🚧 ei käännetty",
-	"warning-list-cap-error-title": "🚧 ei käännetty",
-	"warning-list-row-event": "🚧 ei käännetty",
-	"warning-list-row-severity": "🚧 ei käännetty",
-	"warning-list-row-expires": "🚧 ei käännetty",
-	"warning-list-row-not-expired": "🚧 ei käännetty"
-};
-var capTrans = {
-	en: en,
-	fi: fi
-};
-
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * */
 const CAP_NAMESPACE = 'cap';
+const useCapTranslation = () => useTranslation(CAP_NAMESPACE);
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1938,7 +1887,7 @@ const WarningListRowCap = ({
 }) => {
   const {
     t
-  } = useTranslation(CAP_NAMESPACE);
+  } = useCapTranslation();
   return /*#__PURE__*/React.createElement(Grid, {
     container: true,
     sx: {
@@ -2026,7 +1975,7 @@ const WarningListCap = ({
 }) => {
   const {
     t
-  } = useTranslation(CAP_NAMESPACE);
+  } = useCapTranslation();
   return /*#__PURE__*/React.createElement(Box, {
     sx: {
       width: '100%',
@@ -2120,7 +2069,7 @@ const WarningListCapConnectWrapper = ({
   } = useApiContext();
   const {
     t
-  } = useTranslation(CAP_NAMESPACE);
+  } = useCapTranslation();
   const {
     result: productConfig,
     isLoading: isConfigLoading,
@@ -2204,11 +2153,11 @@ var doesNotExceedSafeInteger$1 = function (it) {
   return it;
 };
 
-var uncurryThis$7 = functionUncurryThisClause;
+var uncurryThis$8 = functionUncurryThisClause;
 var aCallable$8 = aCallable$b;
 var NATIVE_BIND$1 = functionBindNative;
 
-var bind$5 = uncurryThis$7(uncurryThis$7.bind);
+var bind$5 = uncurryThis$8(uncurryThis$8.bind);
 
 // optional / simple context binding
 var functionBindContext = function (fn, that) {
@@ -2252,8 +2201,8 @@ var flattenIntoArray$1 = function (target, original, source, sourceLen, start, d
 
 var flattenIntoArray_1 = flattenIntoArray$1;
 
-var uncurryThis$6 = functionUncurryThis;
-var fails$8 = fails$k;
+var uncurryThis$7 = functionUncurryThis;
+var fails$9 = fails$k;
 var isCallable$6 = isCallable$l;
 var classof$3 = classof$7;
 var getBuiltIn$3 = getBuiltIn$7;
@@ -2262,7 +2211,7 @@ var inspectSource$1 = inspectSource$3;
 var noop = function () { /* empty */ };
 var construct = getBuiltIn$3('Reflect', 'construct');
 var constructorRegExp = /^\s*(?:class|function)\b/;
-var exec$1 = uncurryThis$6(constructorRegExp.exec);
+var exec$1 = uncurryThis$7(constructorRegExp.exec);
 var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
 var isConstructorModern = function isConstructor(argument) {
@@ -2296,7 +2245,7 @@ isConstructorLegacy.sham = true;
 
 // `IsConstructor` abstract operation
 // https://tc39.es/ecma262/#sec-isconstructor
-var isConstructor$2 = !construct || fails$8(function () {
+var isConstructor$2 = !construct || fails$9(function () {
   var called;
   return isConstructorModern(isConstructorModern.call)
     || !isConstructorModern(Object)
@@ -2335,18 +2284,18 @@ var arraySpeciesCreate$1 = function (originalArray, length) {
   return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
 };
 
-var $$b = _export;
+var $$c = _export;
 var flattenIntoArray = flattenIntoArray_1;
 var aCallable$7 = aCallable$b;
-var toObject$2 = toObject$6;
+var toObject$3 = toObject$6;
 var lengthOfArrayLike$2 = lengthOfArrayLike$5;
 var arraySpeciesCreate = arraySpeciesCreate$1;
 
 // `Array.prototype.flatMap` method
 // https://tc39.es/ecma262/#sec-array.prototype.flatmap
-$$b({ target: 'Array', proto: true }, {
+$$c({ target: 'Array', proto: true }, {
   flatMap: function flatMap(callbackfn /* , thisArg */) {
-    var O = toObject$2(this);
+    var O = toObject$3(this);
     var sourceLen = lengthOfArrayLike$2(O);
     var A;
     aCallable$7(callbackfn);
@@ -2356,20 +2305,20 @@ $$b({ target: 'Array', proto: true }, {
   }
 });
 
-var $$a = _export;
+var $$b = _export;
 var $includes = arrayIncludes.includes;
-var fails$7 = fails$k;
+var fails$8 = fails$k;
 var addToUnscopables$1 = addToUnscopables$3;
 
 // FF99+ bug
-var BROKEN_ON_SPARSE = fails$7(function () {
+var BROKEN_ON_SPARSE = fails$8(function () {
   // eslint-disable-next-line es/no-array-prototype-includes -- detection
   return !Array(1).includes();
 });
 
 // `Array.prototype.includes` method
 // https://tc39.es/ecma262/#sec-array.prototype.includes
-$$a({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+$$b({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
   includes: function includes(el /* , fromIndex = 0 */) {
     return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
   }
@@ -2379,8 +2328,8 @@ $$a({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
 addToUnscopables$1('includes');
 
 var aCallable$6 = aCallable$b;
-var toObject$1 = toObject$6;
-var IndexedObject = indexedObject;
+var toObject$2 = toObject$6;
+var IndexedObject$1 = indexedObject;
 var lengthOfArrayLike$1 = lengthOfArrayLike$5;
 
 var $TypeError$7 = TypeError;
@@ -2390,8 +2339,8 @@ var REDUCE_EMPTY = 'Reduce of empty array with no initial value';
 // `Array.prototype.{ reduce, reduceRight }` methods implementation
 var createMethod$1 = function (IS_RIGHT) {
   return function (that, callbackfn, argumentsLength, memo) {
-    var O = toObject$1(that);
-    var self = IndexedObject(O);
+    var O = toObject$2(that);
+    var self = IndexedObject$1(O);
     var length = lengthOfArrayLike$1(O);
     aCallable$6(callbackfn);
     if (length === 0 && argumentsLength < 2) throw new $TypeError$7(REDUCE_EMPTY);
@@ -2424,11 +2373,11 @@ var arrayReduce = {
   right: createMethod$1(true)
 };
 
-var fails$6 = fails$k;
+var fails$7 = fails$k;
 
 var arrayMethodIsStrict$1 = function (METHOD_NAME, argument) {
   var method = [][METHOD_NAME];
-  return !!method && fails$6(function () {
+  return !!method && fails$7(function () {
     // eslint-disable-next-line no-useless-call -- required for testing
     method.call(null, argument || function () { return 1; }, 1);
   });
@@ -2439,7 +2388,7 @@ var classof$2 = classofRaw$2;
 
 var engineIsNode = classof$2(global$a.process) === 'process';
 
-var $$9 = _export;
+var $$a = _export;
 var $reduce = arrayReduce.left;
 var arrayMethodIsStrict = arrayMethodIsStrict$1;
 var CHROME_VERSION = engineV8Version;
@@ -2452,7 +2401,7 @@ var FORCED = CHROME_BUG || !arrayMethodIsStrict('reduce');
 
 // `Array.prototype.reduce` method
 // https://tc39.es/ecma262/#sec-array.prototype.reduce
-$$9({ target: 'Array', proto: true, forced: FORCED }, {
+$$a({ target: 'Array', proto: true, forced: FORCED }, {
   reduce: function reduce(callbackfn /* , initialValue */) {
     var length = arguments.length;
     return $reduce(this, callbackfn, length, length > 1 ? arguments[1] : undefined);
@@ -2466,6 +2415,73 @@ var addToUnscopables = addToUnscopables$3;
 // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
 addToUnscopables('flatMap');
 
+var DESCRIPTORS$2 = descriptors;
+var uncurryThis$6 = functionUncurryThis;
+var call$c = functionCall;
+var fails$6 = fails$k;
+var objectKeys = objectKeys$2;
+var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
+var propertyIsEnumerableModule = objectPropertyIsEnumerable;
+var toObject$1 = toObject$6;
+var IndexedObject = indexedObject;
+
+// eslint-disable-next-line es/no-object-assign -- safe
+var $assign = Object.assign;
+// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+var defineProperty$1 = Object.defineProperty;
+var concat$1 = uncurryThis$6([].concat);
+
+// `Object.assign` method
+// https://tc39.es/ecma262/#sec-object.assign
+var objectAssign = !$assign || fails$6(function () {
+  // should have correct order of operations (Edge bug)
+  if (DESCRIPTORS$2 && $assign({ b: 1 }, $assign(defineProperty$1({}, 'a', {
+    enumerable: true,
+    get: function () {
+      defineProperty$1(this, 'b', {
+        value: 3,
+        enumerable: false
+      });
+    }
+  }), { b: 2 })).b !== 1) return true;
+  // should work with symbols and should have deterministic property order (V8 bug)
+  var A = {};
+  var B = {};
+  // eslint-disable-next-line es/no-symbol -- safe
+  var symbol = Symbol('assign detection');
+  var alphabet = 'abcdefghijklmnopqrst';
+  A[symbol] = 7;
+  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  var T = toObject$1(target);
+  var argumentsLength = arguments.length;
+  var index = 1;
+  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  while (argumentsLength > index) {
+    var S = IndexedObject(arguments[index++]);
+    var keys = getOwnPropertySymbols ? concat$1(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+    var length = keys.length;
+    var j = 0;
+    var key;
+    while (length > j) {
+      key = keys[j++];
+      if (!DESCRIPTORS$2 || call$c(propertyIsEnumerable, S, key)) T[key] = S[key];
+    }
+  } return T;
+} : $assign;
+
+var $$9 = _export;
+var assign = objectAssign;
+
+// `Object.assign` method
+// https://tc39.es/ecma262/#sec-object.assign
+// eslint-disable-next-line es/no-object-assign -- required for testing
+$$9({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  assign: assign
+});
+
 var makeBuiltIn = makeBuiltIn$3.exports;
 var defineProperty = objectDefineProperty;
 
@@ -4420,7 +4436,7 @@ const MapViewCapConnectWrapper = ({
   } = useApiContext();
   const {
     t
-  } = useTranslation(CAP_NAMESPACE);
+  } = useCapTranslation();
   const {
     result: capWarningPresets,
     isLoading: isConfigLoading,
@@ -4453,54 +4469,6 @@ const MapViewCapConnectWrapper = ({
   });
 };
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2022 - Finnish Meteorological Institute (FMI)
- * */
-const capModuleConfig = {
-  id: 'capStore-module',
-  reducersMap: {
-    capStore: reducer
-  }
-};
-
-const CapThemeWrapper = ({
-  theme,
-  children
-}) => /*#__PURE__*/React.createElement(ThemeWrapper, {
-  theme: theme
-}, children);
-withEggs([capModuleConfig, ...coreModuleConfig])(({
-  theme,
-  children
-}) => ( /*#__PURE__*/React.createElement(CapThemeWrapper, {
-  theme: theme
-}, children)));
-const CapTranslationsWrapper = ({
-  children
-}) => {
-  const {
-    i18n
-  } = useTranslation();
-  React.useEffect(() => {
-    i18n.addResourceBundle('en', CAP_NAMESPACE, capTrans.en);
-    i18n.addResourceBundle('fi', CAP_NAMESPACE, capTrans.fi);
-  }, [i18n]);
-  return children;
-};
-
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -4536,7 +4504,7 @@ const ComponentsLookUp = ({
   switch (componentType) {
     case 'CapWarningMap':
       {
-        return /*#__PURE__*/React.createElement(CapTranslationsWrapper, null, /*#__PURE__*/React.createElement(ApiProvider, {
+        return /*#__PURE__*/React.createElement(ApiProvider, {
           config: {
             baseURL: config.baseURL
           },
@@ -4547,22 +4515,45 @@ const ComponentsLookUp = ({
           srs: (_b = initialProps.mapPreset.proj) === null || _b === void 0 ? void 0 : _b.srs,
           layers: initialProps.mapPreset.layers,
           productConfigKey: productConfigKey
-        })));
+        }));
       }
     case 'CapWarningList':
       {
-        return /*#__PURE__*/React.createElement(CapTranslationsWrapper, null, /*#__PURE__*/React.createElement(ApiProvider, {
+        return /*#__PURE__*/React.createElement(ApiProvider, {
           config: {
             baseURL: config.baseURL
           },
           createApi: createApi
         }, /*#__PURE__*/React.createElement(WarningListCapConnectWrapper, {
           productConfigKey: productConfigKey
-        })));
+        }));
       }
     default:
       return null;
   }
 };
 
-export { ComponentsLookUp, capModuleConfig, reducer as capReducer };
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2022 - Finnish Meteorological Institute (FMI)
+ * */
+const capModuleConfig = {
+  id: 'capStore-module',
+  reducersMap: {
+    capStore: reducer
+  }
+};
+
+export { ComponentsLookUp, capModuleConfig, reducer as capReducer, capTrans };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/cap",
-  "version": "9.15.0",
+  "version": "9.17.0",
   "description": "GeoWeb Common Alerting Protocol (CAP) library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/index.d.ts

@@ -1 +1,3 @@
+import capTrans from '../locales/cap.json';
 export * from './lib';
+export { capTrans };

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

@@ -25,6 +25,5 @@ export interface CapStoreProviderProps extends ThemeProviderProps {
     store: Store;
 }
 export declare const CapThemeStoreProvider: React.FC<CapThemeStoreProviderProps>;
-export declare const CapTranslationsWrapper: React.FC<CapTranslationsWrapperProps>;
 export declare const CapI18nProvider: React.FC<CapTranslationsWrapperProps>;
 export {};

package/src/lib/utils/i18n.d.ts

@@ -1,2 +1,5 @@
+import i18n from 'i18next';
+import { UseTranslationResponse } from 'react-i18next';
 export declare const CAP_NAMESPACE = "cap";
 export declare const initCapTestI18n: () => void;
+export declare const useCapTranslation: () => UseTranslationResponse<typeof CAP_NAMESPACE, typeof i18n>;