@opengeoweb/sigmet-airmet 1.3.0 → 2.1.0

package/lib/utils/KNMIlayers.d.ts

@@ -5,7 +5,6 @@ export declare const northSeaPlatforms: {
     format: string;
     layerType: mapTypes.LayerType;
     enabled: boolean;
-    id: string;
 };
 export declare const majorAirportsEHAA: {
     service: string;
@@ -13,5 +12,4 @@ export declare const majorAirportsEHAA: {
     format: string;
     layerType: mapTypes.LayerType;
     enabled: boolean;
-    id: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "1.3.0",
+  "version": "2.1.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,36 +13,36 @@
   "dependencies": {
     "react": "16.14.0",
     "@material-ui/core": "^4.11.0",
-    "@opengeoweb/theme": "1.3.0",
+    "@opengeoweb/theme": "2.1.0",
     "@material-ui/lab": "^4.0.0-alpha.56",
     "@material-ui/icons": "^4.9.1",
-    "@opengeoweb/core": "1.3.0",
+    "@opengeoweb/core": "2.1.0",
     "react-intl": "^5.17.5",
     "react-redux": "7.2.2",
-    "@opengeoweb/webmap": "1.3.0",
+    "@opengeoweb/webmap": "2.1.0",
     "moment": "^2.29.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-sortablejs": "^6.0.0",
-    "@opengeoweb/shared": "1.3.0",
+    "@opengeoweb/shared": "2.1.0",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
     "lodash": "^4.17.20",
-    "@opengeoweb/form-fields": "1.3.0",
+    "@opengeoweb/form-fields": "2.1.0",
     "react-hook-form": "^6.12.1",
     "@material-ui/pickers": "^3.2.10",
     "@date-io/moment": "^1.3.13",
     "moment-timezone": "^0.5.31",
     "axios": "^0.21.4",
-    "immer": "^9.0.6",
     "redux-dynamic-modules": "^5.2.0",
     "redux": "^4.0.4",
     "lodash.clonedeep": "^4.5.0",
+    "immer": "^9.0.6",
     "reselect": "^4.0.0",
     "redux-dynamic-modules-saga": "^5.2.0",
     "redux-saga": "^1.1.3",
     "@turf/turf": "^5.1.6",
-    "@opengeoweb/api": "1.3.0"
+    "@opengeoweb/api": "2.1.0"
   },
   "peerDependencies": {}
 }

package/sigmet-airmet.esm.js

@@ -8,7 +8,7 @@ import { ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormNumberField,
 import { useApiContext, useApi, createApiInstance } from '@opengeoweb/api';
 import produce, { produce as produce$1 } from 'immer';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
-import { mapTypes, generateLayerId, mapSelectors, generateMapId, generateTimesliderId, SyncGroups, mapActions, publicLayers, LayerManagerMapButtonConnect, MapViewConnect, MapViewLayer, TimeSliderConnect } from '@opengeoweb/core';
+import { mapTypes, mapSelectors, generateMapId, generateTimesliderId, SyncGroups, generateLayerId, mapActions, publicLayers, MapControls, LayerManagerMapButtonConnect, MapViewConnect, MapViewLayer, TimeSliderConnect } from '@opengeoweb/core';
 import * as turf from '@turf/turf';
 import { polygonToLineString, booleanClockwise, rewind } from '@turf/turf';
 import { useDraftFormHelpers, useIsMounted, StatusTag, AlertBanner, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, ConfirmationServiceProvider, usePoller } from '@opengeoweb/shared';
@@ -462,16 +462,14 @@ var northSeaPlatforms = {
   name: 'northseastations',
   format: 'image/png',
   layerType: mapTypes.LayerType.overLayer,
-  enabled: true,
-  id: generateLayerId()
+  enabled: true
 };
 var majorAirportsEHAA = {
   service: KNMIGeoWebSigmetAirmetOverlays.url,
   name: 'airports',
   format: 'image/png',
   layerType: mapTypes.LayerType.overLayer,
-  enabled: true,
-  id: generateLayerId()
+  enabled: true
 };
 
 /* *
@@ -602,14 +600,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
       height: '99%'
     },
     "data-testid": "MapView"
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      position: 'absolute',
-      left: '20px',
-      top: '20px',
-      zIndex: 50
-    }
-  }, /*#__PURE__*/React.createElement(LayerManagerMapButtonConnect, {
+  }, /*#__PURE__*/React.createElement(MapControls, null, /*#__PURE__*/React.createElement(LayerManagerMapButtonConnect, {
     source: "module",
     mapId: mapId
   })), /*#__PURE__*/React.createElement(MapViewConnect, {
@@ -5368,8 +5359,8 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var createApi = function createApi(url, appUrl, auth, setAuth, authTokenUrl) {
-  var axiosInstance = createApiInstance(url, appUrl, auth, setAuth, authTokenUrl);
+var createApi = function createApi(url, appUrl, auth, setAuth, authTokenUrl, authClientId) {
+  var axiosInstance = createApiInstance(url, appUrl, auth, setAuth, authTokenUrl, authClientId);
   return {
     // api data
     getSigmetList: function getSigmetList() {

package/sigmet-airmet.umd.js

@@ -472,16 +472,14 @@
       name: 'northseastations',
       format: 'image/png',
       layerType: core.mapTypes.LayerType.overLayer,
-      enabled: true,
-      id: core.generateLayerId()
+      enabled: true
     };
     var majorAirportsEHAA = {
       service: KNMIGeoWebSigmetAirmetOverlays.url,
       name: 'airports',
       format: 'image/png',
       layerType: core.mapTypes.LayerType.overLayer,
-      enabled: true,
-      id: core.generateLayerId()
+      enabled: true
     };
 
     var allowOneGeoJSONFeature = function allowOneGeoJSONFeature(mode, geojson) {
@@ -596,14 +594,7 @@
           height: '99%'
         },
         "data-testid": "MapView"
-      }, /*#__PURE__*/React__namespace.createElement("div", {
-        style: {
-          position: 'absolute',
-          left: '20px',
-          top: '20px',
-          zIndex: 50
-        }
-      }, /*#__PURE__*/React__namespace.createElement(core.LayerManagerMapButtonConnect, {
+      }, /*#__PURE__*/React__namespace.createElement(core.MapControls, null, /*#__PURE__*/React__namespace.createElement(core.LayerManagerMapButtonConnect, {
         source: "module",
         mapId: mapId
       })), /*#__PURE__*/React__namespace.createElement(core.MapViewConnect, {
@@ -5202,8 +5193,8 @@
       }));
     };
 
-    var createApi = function createApi(url, appUrl, auth, setAuth, authTokenUrl) {
-      var axiosInstance = api.createApiInstance(url, appUrl, auth, setAuth, authTokenUrl);
+    var createApi = function createApi(url, appUrl, auth, setAuth, authTokenUrl, authClientId) {
+      var axiosInstance = api.createApiInstance(url, appUrl, auth, setAuth, authTokenUrl, authClientId);
       return {
         // api data
         getSigmetList: function getSigmetList() {