@opengeoweb/core 2.2.1 → 2.3.0

package/index.umd.js

@@ -73,6 +73,7 @@
   var WEBMAP_SET_TIME_SLIDER_SECONDS_PER_PX = 'WEBMAP_SET_TIME_SLIDER_SECONDS_PER_PX';
   var WEBMAP_SET_TIME_SLIDER_DATA_SCALE_TO_SECONDS_PER_PX = 'WEBMAP_SET_TIME_SLIDER_DATA_SCALE_TO_SECONDS_PER_PX';
   var WEBMAP_SET_PIN = 'WEBMAP_SET_PIN';
+  var WEBMAP_DISABLE_PIN = 'WEBMAP_DISABLE_PIN';
 
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
@@ -381,6 +382,19 @@
       payload: payload
     };
   };
+  /**
+   * Sets the diable map pin boolean
+   *
+   * Example: setMapPinLocation({ mapId: 'mapId1', diableMapPin: true })
+   * @param {object} payload object with mapId: string, diableMapPin: boolean
+   */
+
+  var setDisableMapPin = function setDisableMapPin(payload) {
+    return {
+      type: WEBMAP_DISABLE_PIN,
+      payload: payload
+    };
+  };
 
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
@@ -757,6 +771,7 @@
     setTimeSliderSecondsPerPx: setTimeSliderSecondsPerPx,
     setTimeSliderDataScaleToSecondsPerPx: setTimeSliderDataScaleToSecondsPerPx,
     setMapPinLocation: setMapPinLocation,
+    setDisableMapPin: setDisableMapPin,
     setLayers: setLayers,
     setBaseLayers: setBaseLayers,
     addBaseLayer: addBaseLayer,
@@ -2502,7 +2517,7 @@
   /**
    * Returns the mapPinLocation for the current map
    *
-   * Example getAllUniqueDimensions(store);
+   * Example getPinLocation(store);
    * @param {object} store store: object - store object
    * @param {string} mapId mapId: string - Id of the map
    * @returns {object} returnType: latitude and longitude of pin
@@ -2511,6 +2526,18 @@
   var getPinLocation = reselect.createSelector(getMapById, function (store) {
     return store ? store.mapPinLocation : undefined;
   }, selectorMemoizationOptions);
+  /**
+   * Returns the disable map pin boolean for the current map
+   *
+   * Example getDisableMapPin(store);
+   * @param {object} store store: object - store object
+   * @param {string} mapId mapId: string - Id of the map
+   * @returns {boolean} returnType: boolean or undefined
+   */
+
+  var getDisableMapPin = reselect.createSelector(getMapById, function (store) {
+    return store ? store.disableMapPin : undefined;
+  });
 
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
@@ -2662,7 +2689,7 @@
    * Copyright 2020 - Finnish Meteorological Institute (FMI)
    * */
 
-  var selectors = /*#__PURE__*/Object.freeze({
+  var selectors$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     getMapById: getMapById,
     getAllMapIds: getAllMapIds,
@@ -2700,6 +2727,7 @@
     getLayerByLayerIndex: getLayerByLayerIndex,
     getAllUniqueDimensions: getAllUniqueDimensions,
     getPinLocation: getPinLocation,
+    getDisableMapPin: getDisableMapPin,
     getLayerById: getLayerById,
     getLayersById: getLayersById,
     getLayersIds: getLayersIds,
@@ -2768,6 +2796,7 @@
     WEBMAP_SET_TIME_SLIDER_SECONDS_PER_PX: WEBMAP_SET_TIME_SLIDER_SECONDS_PER_PX,
     WEBMAP_SET_TIME_SLIDER_DATA_SCALE_TO_SECONDS_PER_PX: WEBMAP_SET_TIME_SLIDER_DATA_SCALE_TO_SECONDS_PER_PX,
     WEBMAP_SET_PIN: WEBMAP_SET_PIN,
+    WEBMAP_DISABLE_PIN: WEBMAP_DISABLE_PIN,
     WEBMAP_LAYER_CHANGE_OPACITY: WEBMAP_LAYER_CHANGE_OPACITY,
     WEBMAP_LAYER_CHANGE_NAME: WEBMAP_LAYER_CHANGE_NAME,
     WEBMAP_LAYER_CHANGE_STYLE: WEBMAP_LAYER_CHANGE_STYLE,
@@ -2901,6 +2930,130 @@
     orderDialog: orderDialog
   });
 
+  /* *
+   * 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 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+   * Copyright 2021 - Finnish Meteorological Institute (FMI)
+   * */
+  /**
+   * Gets the active map Id and wether a dialog is open or closed
+   *
+   * Example: getDialogDetailsByType(store, 'legend')
+   * @param {object} store store object from which the ui state wll be extracted
+   * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
+   * @returns {array} [string, boolean] first element gives the active map id, second element whether the dialog is open
+   */
+
+  var getDialogDetailsByType = function getDialogDetailsByType(store, dialogType) {
+    if (store && store.ui && store.ui.dialogs && store.ui.dialogs[dialogType]) {
+      return store.ui.dialogs[dialogType];
+    }
+
+    return null;
+  };
+  /**
+   * For a given ui component: gets wether the dialog is open or closed
+   *
+   * @param {object} store store object from which the ui state wll be extracted
+   * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
+   * @returns {boolean} returnType: boolean
+   */
+
+  var getisDialogOpen = reselect.createSelector(getDialogDetailsByType, function (details) {
+    if (details) {
+      return details.isOpen;
+    }
+
+    return false;
+  });
+  /**
+   *For a given ui component: gets the active map Id
+   *
+   * @param {object} store store object from which the ui state wll be extracted
+   * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
+   * @returns {string} returnType: string - the active map id
+   */
+
+  var getDialogMapId = reselect.createSelector(getDialogDetailsByType, function (details) {
+    if (details) {
+      return details.activeMapId;
+    }
+
+    return '';
+  });
+  /**
+   *For a given ui component: gets the order of visible dialog
+   *
+   * @param {object} store store object from which the ui state wll be extracted
+   * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
+   * @returns {number} the higher the order number the higher the zIndex
+   */
+
+  var getDialogOrder = reselect.createSelector(function (store, dialogType) {
+    if (store && store.ui && store.ui.order) {
+      var order = store.ui.order;
+      var visibleOrder = order.filter(function (orderedDialogType) {
+        return store.ui.dialogs[orderedDialogType].isOpen;
+      });
+
+      if (!visibleOrder.includes(dialogType)) {
+        return 0;
+      }
+
+      return visibleOrder.length - visibleOrder.indexOf(dialogType);
+    }
+
+    return 0;
+  }, function (order) {
+    return order;
+  });
+  /**
+   *For a given ui component: returns if ordered on top
+   *
+   * @param {object} store store object from which the ui state wll be extracted
+   * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
+   * @returns {boolean}
+   */
+
+  var getDialogIsOrderedOnTop = reselect.createSelector(function (store, dialogType) {
+    if (store && store.ui && store.ui.order) {
+      var order = store.ui.order;
+      return order.includes(dialogType) && order.indexOf(dialogType) === 0;
+    }
+
+    return false;
+  }, function (isOrderedOnTop) {
+    return isOrderedOnTop;
+  });
+  var getDialogSource = reselect.createSelector(getDialogDetailsByType, function (details) {
+    if (details && details.source) {
+      return details.source;
+    }
+
+    return 'app';
+  });
+
+  var selectors = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    getDialogDetailsByType: getDialogDetailsByType,
+    getisDialogOpen: getisDialogOpen,
+    getDialogMapId: getDialogMapId,
+    getDialogOrder: getDialogOrder,
+    getDialogIsOrderedOnTop: getDialogIsOrderedOnTop,
+    getDialogSource: getDialogSource
+  });
+
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
@@ -5143,7 +5296,7 @@
    * Copyright 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2020 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$I = makeStyles__default["default"](function (theme) {
+  var useStyles$B = makeStyles__default["default"](function (theme) {
     return {
       select: {
         '& ul': {
@@ -5186,20 +5339,22 @@
         currentIndex = _c === void 0 ? -1 : _c,
         _d = _a.onChangeMouseWheel,
         onChangeMouseWheel = _d === void 0 ? function () {} : _d,
-        props = __rest(_a, ["tooltip", "list", "currentIndex", "onChangeMouseWheel"]);
+        _e = _a.requiresCtrlToChange,
+        requiresCtrlToChange = _e === void 0 ? false : _e,
+        props = __rest(_a, ["tooltip", "list", "currentIndex", "onChangeMouseWheel", "requiresCtrlToChange"]);
 
     props.disableUnderline;
         var otherProps = __rest(props, ["disableUnderline"]);
 
-    var _e = __read(React__namespace.useState(false), 2),
-        selectOpen = _e[0],
-        setSelectOpen = _e[1];
-
     var _f = __read(React__namespace.useState(false), 2),
-        tooltipOpen = _f[0],
-        setTooltipOpen = _f[1];
+        selectOpen = _f[0],
+        setSelectOpen = _f[1];
 
-    var classes = useStyles$I();
+    var _g = __read(React__namespace.useState(false), 2),
+        tooltipOpen = _g[0],
+        setTooltipOpen = _g[1];
+
+    var classes = useStyles$B();
 
     var preventDefault = function preventDefault(event) {
       event.preventDefault();
@@ -5215,11 +5370,14 @@
       });
     }, []);
     var onWheel = React__namespace.useCallback(function (event) {
-      if (selectOpen) return;
-      var direction = event.deltaY < 0 ? 1 : -1;
-      var newValue = list[Math.min(Math.max(currentIndex - direction, 0), list.length - 1)];
-      onChangeMouseWheel(newValue);
-    }, [selectOpen, currentIndex, list, onChangeMouseWheel]);
+      if (requiresCtrlToChange && (event.ctrlKey || event.metaKey) || !requiresCtrlToChange) {
+        disableScroll();
+        if (selectOpen) return;
+        var direction = event.deltaY < 0 ? 1 : -1;
+        var newValue = list[Math.min(Math.max(currentIndex - direction, 0), list.length - 1)];
+        onChangeMouseWheel(newValue);
+      } else enableScroll();
+    }, [selectOpen, currentIndex, list, onChangeMouseWheel, enableScroll, disableScroll, requiresCtrlToChange]);
     var onOpen = React__namespace.useCallback(function () {
       setSelectOpen(true);
       setTooltipOpen(false);
@@ -5228,17 +5386,23 @@
       setSelectOpen(false);
     }, []);
     var onMouseEnter = React__namespace.useCallback(function () {
-      disableScroll();
+      if (!requiresCtrlToChange) {
+        disableScroll();
+      }
+
       if (!selectOpen) setTooltipOpen(true);
-    }, [selectOpen, disableScroll]);
+    }, [selectOpen, disableScroll, requiresCtrlToChange]);
     var onMouseLeave = React__namespace.useCallback(function () {
       enableScroll();
       setTooltipOpen(false);
     }, [enableScroll]);
     var onFocus = React__namespace.useCallback(function () {
-      disableScroll();
+      if (!requiresCtrlToChange) {
+        disableScroll();
+      }
+
       setTooltipOpen(true);
-    }, [disableScroll]);
+    }, [disableScroll, requiresCtrlToChange]);
     var onBlur = React__namespace.useCallback(function () {
       enableScroll();
       setTooltipOpen(false);
@@ -5450,120 +5614,6 @@
     }
   };
 
-  /* *
-   * 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 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-   * Copyright 2021 - Finnish Meteorological Institute (FMI)
-   * */
-  /**
-   * Gets the active map Id and wether a dialog is open or closed
-   *
-   * Example: getDialogDetailsByType(store, 'legend')
-   * @param {object} store store object from which the ui state wll be extracted
-   * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
-   * @returns {array} [string, boolean] first element gives the active map id, second element whether the dialog is open
-   */
-
-  var getDialogDetailsByType = function getDialogDetailsByType(store, dialogType) {
-    if (store && store.ui && store.ui.dialogs && store.ui.dialogs[dialogType]) {
-      return store.ui.dialogs[dialogType];
-    }
-
-    return null;
-  };
-  /**
-   * For a given ui component: gets wether the dialog is open or closed
-   *
-   * @param {object} store store object from which the ui state wll be extracted
-   * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
-   * @returns {boolean} returnType: boolean
-   */
-
-  var getisDialogOpen = reselect.createSelector(getDialogDetailsByType, function (details) {
-    if (details) {
-      return details.isOpen;
-    }
-
-    return false;
-  });
-  /**
-   *For a given ui component: gets the active map Id
-   *
-   * @param {object} store store object from which the ui state wll be extracted
-   * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
-   * @returns {string} returnType: string - the active map id
-   */
-
-  var getDialogMapId = reselect.createSelector(getDialogDetailsByType, function (details) {
-    if (details) {
-      return details.activeMapId;
-    }
-
-    return '';
-  });
-  /**
-   *For a given ui component: gets the order of visible dialog
-   *
-   * @param {object} store store object from which the ui state wll be extracted
-   * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
-   * @returns {number} the higher the order number the higher the zIndex
-   */
-
-  var getDialogOrder = reselect.createSelector(function (store, dialogType) {
-    if (store && store.ui && store.ui.order) {
-      var order = store.ui.order;
-      var visibleOrder = order.filter(function (orderedDialogType) {
-        return store.ui.dialogs[orderedDialogType].isOpen;
-      });
-
-      if (!visibleOrder.includes(dialogType)) {
-        return 0;
-      }
-
-      return visibleOrder.length - visibleOrder.indexOf(dialogType);
-    }
-
-    return 0;
-  }, function (order) {
-    return order;
-  });
-  /**
-   *For a given ui component: returns if ordered on top
-   *
-   * @param {object} store store object from which the ui state wll be extracted
-   * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
-   * @returns {boolean}
-   */
-
-  var getDialogIsOrderedOnTop = reselect.createSelector(function (store, dialogType) {
-    if (store && store.ui && store.ui.order) {
-      var order = store.ui.order;
-      return order.includes(dialogType) && order.indexOf(dialogType) === 0;
-    }
-
-    return false;
-  }, function (isOrderedOnTop) {
-    return isOrderedOnTop;
-  });
-  var getDialogSource = reselect.createSelector(getDialogDetailsByType, function (details) {
-    if (details && details.source) {
-      return details.source;
-    }
-
-    return 'app';
-  });
-
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
@@ -6373,6 +6423,21 @@
           });
         }
 
+      case WEBMAP_DISABLE_PIN:
+        {
+          var _1 = action.payload,
+              mapId_29 = _1.mapId,
+              disableMapPin_1 = _1.disableMapPin;
+
+          if (!state.byId[mapId_29]) {
+            return state;
+          }
+
+          return produce.produce(state, function (draft) {
+            draft.byId[mapId_29].disableMapPin = disableMapPin_1;
+          });
+        }
+
       case GENERIC_SYNC_SETLAYERACTIONS:
         {
           /*
@@ -6381,9 +6446,9 @@
            * These targets can be used as payloads in new Layer actions.
            * These actions are here handled via the layer reducer, as it is the same logic
            */
-          var _1 = action.payload,
-              targets = _1.targets,
-              source_1 = _1.source;
+          var _2 = action.payload,
+              targets = _2.targets,
+              source_1 = _2.source;
           return targets.reduce(function (prevState, target) {
             var action = {
               payload: target,
@@ -8071,7 +8136,7 @@
   		},
   		{
   			name: "ECMWF",
-  			url: "https://apps.ecmwf.int/wms/?token=public",
+  			url: "https://eccharts.ecmwf.int/wms/?token=public",
   			id: "ecmwf"
   		},
   		{
@@ -8190,7 +8255,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$H = makeStyles__default["default"]({
+  var useStyles$A = makeStyles__default["default"]({
     buttonDiv: {
       position: 'relative'
     },
@@ -8226,7 +8291,7 @@
         handleClose = _a.handleClose,
         _e = _a.layerType,
         layerType = _e === void 0 ? LayerType.mapLayer : _e;
-    var classes = useStyles$H();
+    var classes = useStyles$A();
 
     var _f = __read(React__namespace.useState(''), 2),
         serviceURL = _f[0],
@@ -8341,7 +8406,6 @@
     }, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
       "data-testid": "add-service",
       onClick: handleAddServiceURL,
-      color: "primary",
       disabled: loading,
       size: "large"
     }, /*#__PURE__*/React__namespace.createElement(iconsMaterial.Add, null)), loading && /*#__PURE__*/React__namespace.createElement(material.CircularProgress, {
@@ -8391,26 +8455,23 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$G = makeStyles__default["default"](function (theme) {
-    return {
-      buttonDiv: {
-        position: 'relative'
-      },
-      loadingButton: {
-        position: 'absolute',
-        top: 7,
-        left: 7,
-        zIndex: 1
-      },
-      button: {
-        width: '24px',
-        height: '24px',
-        margin: '6px 0px 0px 10px',
-        color: theme.palette.geowebColors.typographyAndIcons.buttonIconTertiaryFlat,
-        borderRadius: '15%'
-      }
-    };
-  });
+  var styles = {
+    buttonDiv: {
+      position: 'relative'
+    },
+    loadingButton: {
+      position: 'absolute',
+      top: 7,
+      left: 7,
+      zIndex: 1
+    },
+    button: {
+      width: '24px',
+      height: '24px',
+      margin: '6px 0px 0px 10px',
+      borderRadius: '15%'
+    }
+  };
 
   var AddLayersButton = function AddLayersButton(_a) {
     var onClickService = _a.onClickService,
@@ -8426,7 +8487,6 @@
         _f = _a.shouldFocus,
         shouldFocus = _f === void 0 ? false : _f;
     var ref = React__namespace.useRef(null);
-    var classes = useStyles$G();
 
     var _g = __read(React__namespace.useState(false), 2),
         open = _g[0],
@@ -8446,7 +8506,7 @@
       title: tooltip
     }, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
       onClick: handleClose,
-      className: classes.button,
+      sx: styles.button,
       disableRipple: true,
       "data-testid": "addLayersButton",
       ref: ref,
@@ -8551,24 +8611,18 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$F = makeStyles__default["default"](function (theme) {
-    return {
-      button: {
-        width: '24px',
-        height: '24px',
-        margin: '6px 0px 0px 10px',
-        color: theme.palette.geowebColors.typographyAndIcons.buttonIconTertiaryFlat,
-        borderRadius: '15%'
-      }
-    };
-  });
+  var style$2 = {
+    width: '24px',
+    height: '24px',
+    margin: '6px 0px 0px 10px',
+    borderRadius: '15%'
+  };
 
   var LayerSelectButtonConnect = function LayerSelectButtonConnect(_a) {
     var mapId = _a.mapId,
         _b = _a.source,
         source = _b === void 0 ? 'app' : _b;
     var dispatch = reactRedux.useDispatch();
-    var classes = useStyles$F();
     var currentActiveMapId = reactRedux.useSelector(function (store) {
       return getDialogMapId(store, 'layerSelect');
     });
@@ -8587,7 +8641,7 @@
       title: "Layer Select"
     }, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
       onClick: openLayerSelectDialog,
-      className: classes.button,
+      sx: style$2,
       id: "layerSelectButton",
       "data-testid": "layerSelectButton",
       disableRipple: true,
@@ -8611,7 +8665,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$E = makeStyles__default["default"]({
+  var useStyles$z = makeStyles__default["default"]({
     row: {
       height: '32px'
     },
@@ -8635,7 +8689,7 @@
         layerManagerWidth = _a.layerManagerWidth,
         _e = _a.layerSelect,
         layerSelect = _e === void 0 ? false : _e;
-    var classes = useStyles$E();
+    var classes = useStyles$z();
     var columnSizes = layerManagerWidth === LayerManagerWidth.sm ? LayerManagerColumnsSmall() : LayerManagerColumnsLarge();
     return /*#__PURE__*/React__namespace.createElement(material.Grid, {
       container: true,
@@ -8728,7 +8782,7 @@
         '& .MuiSvgIcon-root': {
           transition: 'none',
           fill: function fill(isEnabled) {
-            return isEnabled ? theme.palette.geowebColors.layerManager.tableRowDefaultIcon.rgba : theme.palette.geowebColors.layerManager.tableRowDisabledIcon.rgba;
+            return isEnabled ? theme.palette.geowebColors.buttons.flat["default"].color : theme.palette.geowebColors.buttons.flat.disabled.color;
           }
         },
         '&>div': {
@@ -8909,7 +8963,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$D = makeStyles__default["default"](function (theme) {
+  var useStyles$y = makeStyles__default["default"](function (theme) {
     return createStyles__default["default"]({
       button: {
         height: 28,
@@ -8918,20 +8972,22 @@
         marginTop: 2,
         color: function color(_a) {
           var isActive = _a.isActive,
+              isAccessible = _a.isAccessible,
               isEnabled = _a.isEnabled;
-          var _b = theme.palette.geowebColors.layerManager,
-              tableRowDefaultIcon = _b.tableRowDefaultIcon,
-              tableRowDisabledIcon = _b.tableRowDisabledIcon;
 
           if (!isEnabled) {
-            return tableRowDisabledIcon.fill;
+            return theme.palette.geowebColors.buttons.flat.disabled.color;
+          }
+
+          if (isAccessible) {
+            return theme.palette.geowebColors.greys.accessible;
           }
 
           if (isActive) {
             return theme.palette.common.white;
           }
 
-          return tableRowDefaultIcon.rgba;
+          return theme.palette.geowebColors.buttons.flat["default"].color;
         },
         backgroundColor: function backgroundColor(_a) {
           var isActive = _a.isActive;
@@ -8940,7 +8996,7 @@
         '&:focus': {
           backgroundColor: function backgroundColor(_a) {
             var isActive = _a.isActive;
-            return isActive ? theme.palette.geowebColors.buttons.primary.mouseOver.fill : theme.palette.geowebColors.layerManager.tableRowMouseover.rgba;
+            return isActive ? theme.palette.geowebColors.buttons.primary.mouseOver.fill : theme.palette.geowebColors.buttons.flat.mouseOver.fill;
           },
           outline: theme.palette.geowebColors.buttons.focusDefault.outline,
           borderRadius: 0
@@ -8948,7 +9004,7 @@
         '&:hover': {
           backgroundColor: function backgroundColor(_a) {
             var isActive = _a.isActive;
-            return isActive ? theme.palette.geowebColors.buttons.primary.mouseOver.fill : theme.palette.geowebColors.layerManager.tableRowMouseover.rgba;
+            return isActive ? theme.palette.geowebColors.buttons.primary.mouseOver.fill : theme.palette.geowebColors.buttons.flat.mouseOver.fill;
           }
         }
       },
@@ -8969,11 +9025,15 @@
         isEnabled = _e === void 0 ? true : _e,
         icon = _a.icon,
         testId = _a.testId,
-        props = __rest(_a, ["tooltipTitle", "onClick", "isActive", "isEnabled", "icon", "testId"]);
+        _f = _a.isAccessible,
+        isAccessible = _f === void 0 ? false : _f,
+        className = _a.className,
+        props = __rest(_a, ["tooltipTitle", "onClick", "isActive", "isEnabled", "icon", "testId", "isAccessible", "className"]);
 
-    var classes = useStyles$D({
+    var classes = useStyles$y({
       isActive: isActive,
-      isEnabled: isEnabled
+      isEnabled: isEnabled,
+      isAccessible: isAccessible
     });
 
     var handleClick = function handleClick(event) {
@@ -8990,7 +9050,7 @@
       size: "small",
       onClick: handleClick,
       "data-testid": testId,
-      className: classes.button,
+      className: classes.button + " " + className,
       disableFocusRipple: true
     }, props), icon));
   };
@@ -9011,7 +9071,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$C = makeStyles__default["default"](function (theme) {
+  var useStyles$x = makeStyles__default["default"](function (theme) {
     return createStyles__default["default"]({
       checkbox: {
         color: 'inherit',
@@ -9034,7 +9094,7 @@
     var isEnabled = _a.isEnabled,
         title = _a.title,
         onChangeEnableLayer = _a.onChangeEnableLayer;
-    var classes = useStyles$C(isEnabled);
+    var classes = useStyles$x(isEnabled);
 
     var onClick = function onClick() {
       onChangeEnableLayer(!isEnabled);
@@ -9090,7 +9150,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$B = makeStyles__default["default"](function (theme) {
+  var useStyles$w = makeStyles__default["default"](function (theme) {
     return createStyles__default["default"]({
       dropdownEmpty: {
         paddingLeft: 8,
@@ -9106,6 +9166,33 @@
     });
   });
 
+  var getRenderLayersValues = function getRenderLayersValues(layerName, layers) {
+    var serviceLayer = layers.find(function (l) {
+      return l.name === layerName;
+    });
+
+    if (!serviceLayer && layerName) {
+      return {
+        currentValue: layerName,
+        currentIndex: layers.length,
+        extendedLayers: __spreadArray(__spreadArray([], __read(layers)), [{
+          name: layerName,
+          text: layerName,
+          leaf: true,
+          path: []
+        }])
+      };
+    }
+
+    return {
+      currentValue: (serviceLayer === null || serviceLayer === void 0 ? void 0 : serviceLayer.name) || '',
+      currentIndex: layers.findIndex(function (l) {
+        return l.name === (serviceLayer === null || serviceLayer === void 0 ? void 0 : serviceLayer.name);
+      }),
+      extendedLayers: layers
+    };
+  };
+
   var RenderLayers = function RenderLayers(_a) {
     var onChangeLayerName = _a.onChangeLayerName,
         layerName = _a.layerName,
@@ -9113,7 +9200,7 @@
         layers = _b === void 0 ? [] : _b,
         _c = _a.isEnabled,
         isEnabled = _c === void 0 ? true : _c;
-    var classes = useStyles$B();
+    var classes = useStyles$w();
     var containerClass = useTooltipContainerStyles(isEnabled);
 
     if (!layers || !layers.length) {
@@ -9125,24 +9212,21 @@
       }, "No service available"));
     }
 
-    var filteredLayers = layers.filter(function (l) {
-      return l.name === layerName;
-    });
-    var currentValue = filteredLayers.length === 1 && filteredLayers[0].name ? filteredLayers[0].name : '';
-
     var selectLayer = function selectLayer(event) {
       event.stopPropagation();
       onChangeLayerName(event.target.value);
     };
 
-    var list = layers.map(function (layer) {
+    var _d = getRenderLayersValues(layerName, layers),
+        currentIndex = _d.currentIndex,
+        currentValue = _d.currentValue,
+        extendedLayers = _d.extendedLayers;
+
+    var list = extendedLayers.map(function (layer) {
       return {
         value: layer.name
       };
     });
-    var currentIndex = layers.findIndex(function (layer) {
-      return currentValue === layer.name;
-    });
     return /*#__PURE__*/React__namespace.createElement(TooltipSelect, {
       disableUnderline: true,
       tooltip: "Select a layer",
@@ -9158,10 +9242,11 @@
       onChange: selectLayer,
       onChangeMouseWheel: function onChangeMouseWheel(e) {
         return onChangeLayerName(e.value);
-      }
+      },
+      requiresCtrlToChange: true
     }, /*#__PURE__*/React__namespace.createElement(material.MenuItem, {
       disabled: true
-    }, "Select layer"), layers.map(function (layerFromServiceLayers) {
+    }, "Select layer"), extendedLayers.map(function (layerFromServiceLayers) {
       return /*#__PURE__*/React__namespace.createElement(material.MenuItem, {
         key: layerFromServiceLayers.name,
         value: layerFromServiceLayers.name,
@@ -9186,7 +9271,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$A = makeStyles__default["default"](function (theme) {
+  var useStyles$v = makeStyles__default["default"](function (theme) {
     return {
       opacityDiv: {
         height: 'calc(100% - 5px)',
@@ -9247,7 +9332,7 @@
         onLayerChangeOpacity = _a.onLayerChangeOpacity,
         _b = _a.isEnabled,
         isEnabled = _b === void 0 ? true : _b;
-    var classes = useStyles$A();
+    var classes = useStyles$v();
     var sliderClasses = shared.sliderStyles();
     var containerClass = useTooltipContainerStyles(isEnabled);
 
@@ -9273,11 +9358,17 @@
       });
     }, []);
     var onWheel = React__namespace.useCallback(function (event) {
-      var multiplier = event.altKey ? 10 : 1;
-      var direction = event.deltaY > 0 ? 0.01 * multiplier : -0.01 * multiplier;
-      var newValue = Math.min(Math.max(currentOpacity - direction, 0), 1);
-      onLayerChangeOpacity(newValue);
-    }, [currentOpacity, onLayerChangeOpacity]);
+      if (event.ctrlKey || event.metaKey) {
+        disableScroll();
+        var multiplier = event.altKey ? 10 : 1;
+        var direction = event.deltaY > 0 ? 0.01 * multiplier : -0.01 * multiplier;
+        var newValue_1 = Math.min(Math.max(currentOpacity - direction, 0), 1); // Kind of "one frame debouncer", meant to dampen too fast slider movement
+
+        window.requestAnimationFrame(function () {
+          onLayerChangeOpacity(newValue_1);
+        });
+      } else enableScroll();
+    }, [currentOpacity, onLayerChangeOpacity, disableScroll, enableScroll]);
     var onClickButton = React__namespace.useCallback(function () {
       setOpen(!open);
     }, [open]);
@@ -9287,17 +9378,15 @@
       }
     }, [open]);
     var onMouseEnter = React__namespace.useCallback(function () {
-      disableScroll();
       if (!open) setTooltipOpen(true);
-    }, [open, disableScroll]);
+    }, [open]);
     var onMouseLeave = React__namespace.useCallback(function () {
       enableScroll();
       setTooltipOpen(false);
     }, [enableScroll]);
     var onFocus = React__namespace.useCallback(function () {
-      disableScroll();
       setTooltipOpen(true);
-    }, [disableScroll]);
+    }, []);
     var onBlur = React__namespace.useCallback(function () {
       enableScroll();
       setTooltipOpen(false);
@@ -9337,53 +9426,8 @@
         event.stopPropagation();
         onLayerChangeOpacity(newValue);
       },
-      onKeyDown: onKeyDown
-    })) : null);
-  };
-
-  /* *
-   * 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 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-   * Copyright 2021 - Finnish Meteorological Institute (FMI)
-   * */
-  var useStyles$z = makeStyles__default["default"](function (theme) {
-    return createStyles__default["default"]({
-      icon: {
-        minWidth: 32,
-        color: theme.palette.geowebColors.layerManager.tableRowDefaultIcon.rgba
-      },
-      text: {
-        fontSize: 16,
-        color: theme.palette.geowebColors.layerManager.tableRowDefaultText.rgba
-      }
-    });
-  });
-
-  var MenuItemButton = function MenuItemButton(_a) {
-    var title = _a.title,
-        tooltipTitle = _a.tooltipTitle,
-        icon = _a.icon;
-    var classes = useStyles$z();
-    return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(material.ListItemIcon, {
-      className: classes.icon + " icon"
-    }, icon), /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
-      title: tooltipTitle,
-      placement: "top"
-    }, /*#__PURE__*/React__namespace.createElement(material.Typography, {
-      className: classes.text,
-      variant: "inherit"
-    }, title)));
+      onKeyDown: onKeyDown
+    })) : null);
   };
 
   /* *
@@ -9402,70 +9446,39 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$y = makeStyles__default["default"](function (theme) {
-    return {
-      menu: {
-        backgroundColor: theme.palette.geowebColors.background.surface,
-        '& li:hover': {
-          backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
-        }
-      }
-    };
-  });
+  var CopyIcon = /*#__PURE__*/React__namespace.createElement(material.SvgIcon, null, /*#__PURE__*/React__namespace.createElement("path", {
+    d: "M8 7v2H6a1 1 0 0 0-.993.883L5 10v9a1 1 0 0 0 .883.993L6 20h6a1 1 0 0 0 .993-.883L13 19h2v1.6a1.4 1.4 0 0 1-1.263 1.394l-.135.006H4.399a1.4 1.4 0 0 1-1.393-1.265L3 20.6V8.4a1.4 1.4 0 0 1 1.264-1.394L4.4 7H8zm7.584-5v2H12a1 1 0 0 0-.993.883L11 5v9a1 1 0 0 0 .883.993L12 15h6a1 1 0 0 0 .993-.883L19 14V7.42h2v8.18a1.4 1.4 0 0 1-1.263 1.394l-.135.006h-9.203a1.4 1.4 0 0 1-1.393-1.265L9 15.6V3.4a1.4 1.4 0 0 1 1.264-1.394L10.4 2h5.185zM17 2l4 4h-2.5c-.777 0-1.42-.598-1.493-1.357L17 4.499V2z"
+  }));
 
   var LayerManagerMenuButton = function LayerManagerMenuButton(_a) {
-    var tooltipTitle = _a.tooltipTitle,
-        mapId = _a.mapId,
+    var mapId = _a.mapId,
         layerId = _a.layerId,
-        onLayerDuplicate = _a.onLayerDuplicate,
-        _b = _a.isEnabled,
-        isEnabled = _b === void 0 ? true : _b;
-    var classes = useStyles$y();
-
-    var _c = __read(React__namespace.useState(null), 2),
-        anchorEl = _c[0],
-        setAnchorEl = _c[1];
-
-    var handleClick = function handleClick(event) {
-      setAnchorEl(event.currentTarget);
-    };
-
-    var handleClose = function handleClose() {
-      setAnchorEl(null);
-    };
+        onLayerDuplicate = _a.onLayerDuplicate;
 
     var onClickDuplicate = function onClickDuplicate() {
       onLayerDuplicate({
         mapId: mapId,
         layerId: layerId
       });
-      handleClose();
     };
 
-    return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(LayerManagerButton, {
-      tooltipTitle: tooltipTitle,
-      onClick: handleClick,
-      icon: /*#__PURE__*/React__namespace.createElement(iconsMaterial.MoreVert, null),
-      testId: "openMenuButton",
-      isEnabled: isEnabled
-    }), /*#__PURE__*/React__namespace.createElement(material.Menu, {
-      anchorEl: anchorEl,
-      keepMounted: true,
-      open: Boolean(anchorEl),
-      onClose: handleClose,
-      PaperProps: {
-        className: classes.menu
-      }
-    }, /*#__PURE__*/React__namespace.createElement(material.MenuItem, {
-      "data-testid": "duplicateLayerButton",
-      onClick: onClickDuplicate
-    }, /*#__PURE__*/React__namespace.createElement(MenuItemButton, {
-      title: "Duplicate layer",
-      tooltipTitle: "Duplicate layer",
-      icon: /*#__PURE__*/React__namespace.createElement(iconsMaterial.FileCopy, {
-        fontSize: "small"
-      })
-    }))));
+    return /*#__PURE__*/React__namespace.createElement(shared.ToggleMenu, {
+      buttonTestId: "openMenuButton",
+      buttonSx: {
+        margin: '4px 2px',
+        '&.MuiButtonBase-root': {
+          backgroundColor: 'transparent',
+          color: 'geowebColors.greys.accessible'
+        }
+      },
+      menuPosition: "bottom",
+      menuItems: [{
+        text: 'Duplicate layer',
+        action: onClickDuplicate,
+        icon: CopyIcon
+      }],
+      tooltipTitle: "Open menu"
+    });
   };
 
   var RenderStyles = function RenderStyles(_a) {
@@ -9517,7 +9530,8 @@
       onChange: selectStyle,
       onChangeMouseWheel: function onChangeMouseWheel(e) {
         return onChangeLayerStyle(e.value);
-      }
+      },
+      requiresCtrlToChange: true
     }, /*#__PURE__*/React__namespace.createElement(material.MenuItem, {
       disabled: true
     }, "Select style"), styles.map(function (styleFromlayer) {
@@ -9544,7 +9558,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$x = makeStyles__default["default"](function () {
+  var useStyles$u = makeStyles__default["default"](function () {
     return createStyles__default["default"]({
       icon: {
         width: 20,
@@ -9558,7 +9572,7 @@
         onClickDelete = _a.onClickDelete,
         _b = _a.isEnabled,
         isEnabled = _b === void 0 ? true : _b;
-    var classes = useStyles$x();
+    var classes = useStyles$u();
     return /*#__PURE__*/React__namespace.createElement(LayerManagerButton, {
       tooltipTitle: tooltipTitle,
       onClick: onClickDelete,
@@ -9586,30 +9600,17 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$w = makeStyles__default["default"](function (theme) {
+  var useStyles$t = makeStyles__default["default"](function (theme) {
     return createStyles__default["default"]({
-      icon: {
-        width: 18,
-        height: 18,
-        marginTop: 4
-      },
       svgIcon: {
         fill: function fill(_a) {
-          var isActive = _a.isActive,
-              isEnabled = _a.isEnabled;
-          var _b = theme.palette.geowebColors.layerManager,
-              tableRowDefaultIcon = _b.tableRowDefaultIcon,
-              tableRowDisabledIcon = _b.tableRowDisabledIcon;
+          var isActive = _a.isActive;
 
           if (isActive) {
             return theme.palette.common.white;
           }
 
-          if (!isEnabled) {
-            return tableRowDisabledIcon.fill;
-          }
-
-          return tableRowDefaultIcon.rgba;
+          return theme.palette.geowebColors.buttons.flat["default"].color;
         }
       }
     });
@@ -9623,14 +9624,18 @@
         isActive = _c === void 0 ? false : _c,
         _d = _a.isEnabled,
         isEnabled = _d === void 0 ? true : _d;
-    var classes = useStyles$w({
+    var classes = useStyles$t({
       isActive: isActive,
       isEnabled: isEnabled
     });
 
     var Icon = function Icon() {
       return /*#__PURE__*/React__namespace.createElement(material.SvgIcon, {
-        className: classes.icon
+        sx: {
+          width: '18px',
+          height: '18px',
+          marginTop: '4px'
+        }
       }, /*#__PURE__*/React__namespace.createElement("g", {
         id: "Concept-3",
         stroke: "none",
@@ -9672,7 +9677,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$v = makeStyles__default["default"](function (theme) {
+  var useStyles$s = makeStyles__default["default"](function (theme) {
     return createStyles__default["default"]({
       row: {
         background: function background(isEnabled) {
@@ -9724,7 +9729,7 @@
         layerActiveLayout = _a.layerActiveLayout,
         layerManagerWidth = _a.layerManagerWidth,
         dragHandle = _a.dragHandle;
-    var classes = useStyles$v(isEnabled);
+    var classes = useStyles$s(isEnabled);
     var columnSizes = layerManagerWidth === LayerManagerWidth.sm ? LayerManagerColumnsSmall() : LayerManagerColumnsLarge();
 
     var onClickRow = function onClickRow() {
@@ -9817,7 +9822,6 @@
         });
       }
     }), layerMenuLayout || /*#__PURE__*/React__default["default"].createElement(LayerManagerMenuButton, {
-      tooltipTitle: "Open Menu",
       mapId: mapId,
       layerId: layerId,
       onLayerDuplicate: onLayerDuplicate
@@ -10145,11 +10149,7 @@
         origin: 'MenuButtonConnect'
       }));
     }, [dispatch]);
-    var isLayerEnabled = reactRedux.useSelector(function (store) {
-      return getLayerEnabled(store, layerId);
-    });
     return /*#__PURE__*/React__namespace.createElement(LayerManagerMenuButton, {
-      tooltipTitle: "Open Menu",
       layerId: layerId,
       mapId: mapId,
       onLayerDuplicate: function onLayerDuplicate() {
@@ -10158,8 +10158,7 @@
           mapId: mapId,
           layer: layer
         });
-      },
-      isEnabled: isLayerEnabled
+      }
     });
   };
 
@@ -10306,22 +10305,6 @@
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
   var TOOLTIP_TITLE = 'Drag a layer up or down';
-  var useStyles$u = makeStyles__default["default"](function (theme) {
-    return {
-      dragHandle: {
-        cursor: 'grab',
-        backgroundColor: 'inherit',
-        '&:hover': {
-          backgroundColor: 'inherit'
-        },
-        height: 32,
-        color: function color(_a) {
-          var isDisabled = _a.isDisabled;
-          return isDisabled ? theme.palette.geowebColors.layerManager.tableRowDefaultIcon.rgba : theme.palette.geowebColors.layerManager.tableRowDisabledIcon.fill;
-        }
-      }
-    };
-  });
 
   var DragHandle = function DragHandle(_a) {
     var _b = _a.isDisabled,
@@ -10330,20 +10313,26 @@
         index = _c === void 0 ? undefined : _c,
         _d = _a.hideTooltip,
         hideTooltip = _d === void 0 ? false : _d;
-    var classes = useStyles$u({
-      isDisabled: isDisabled
-    });
     var tooltipTitle = hideTooltip ? '' : TOOLTIP_TITLE;
     return /*#__PURE__*/React__default["default"].createElement(LayerManagerButton, {
       tooltipTitle: tooltipTitle,
       icon: /*#__PURE__*/React__default["default"].createElement(iconsMaterial.DragIndicator, null),
       testId: "dragHandle" + (index !== undefined ? "-" + index : ''),
-      className: classes.dragHandle + " handle",
+      className: "handle",
       tabIndex: -1,
       isEnabled: !isDisabled,
       disableFocusRipple: true,
       disableTouchRipple: true,
-      disabled: isDisabled
+      disabled: isDisabled,
+      isAccessible: true,
+      sx: {
+        cursor: 'grab',
+        '&:hover': {
+          backgroundColor: 'inherit!important'
+        },
+        marginLeft: '3px',
+        marginRight: '3px'
+      }
     });
   };
 
@@ -10363,7 +10352,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$t = makeStyles__default["default"](function () {
+  var useStyles$r = makeStyles__default["default"](function () {
     return {
       layerRows: {
         width: '100%',
@@ -10429,7 +10418,7 @@
 
     var isSorting = activeDragIndex !== null;
     var isDragDisabled = layerIds.length === 1;
-    var classes = useStyles$t(isSorting);
+    var classes = useStyles$r(isSorting);
     return /*#__PURE__*/React__namespace.createElement(material.Grid, {
       container: true,
       item: true,
@@ -10639,7 +10628,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$s = makeStyles__default["default"]({
+  var useStyles$q = makeStyles__default["default"]({
     layerRow: {
       width: '100%',
       height: '36px'
@@ -10662,7 +10651,7 @@
         layerManagerWidth = _a.layerManagerWidth,
         _d = _a.tooltip,
         tooltip = _d === void 0 ? '' : _d;
-    var classes = useStyles$s();
+    var classes = useStyles$q();
     var columnSizes = layerManagerWidth === LayerManagerWidth.sm ? LayerManagerColumnsSmall() : LayerManagerColumnsLarge();
     return /*#__PURE__*/React__namespace.createElement(material.Grid, {
       container: true,
@@ -10707,7 +10696,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$r = makeStyles__default["default"]({
+  var useStyles$p = makeStyles__default["default"]({
     layerRowContainer: {
       position: 'relative',
       width: '100%',
@@ -10742,7 +10731,7 @@
         layerSelect = _e === void 0 ? false : _e,
         _f = _a.showAddLayersTooltip,
         showAddLayersTooltip = _f === void 0 ? true : _f;
-    var classes = useStyles$r();
+    var classes = useStyles$p();
 
     var _g = __read(React__namespace.useState(LayerManagerWidth.lg), 2),
         layerManagerWidth = _g[0],
@@ -10798,80 +10787,6 @@
     }))));
   };
 
-  /* *
-   * 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 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-   * Copyright 2021 - Finnish Meteorological Institute (FMI)
-   * */
-
-  var CustomToggleButton = function CustomToggleButton(_a) {
-    var _b = _a.variant,
-        variant = _b === void 0 ? 'primary' : _b,
-        _c = _a.value,
-        value = _c === void 0 ? 0 : _c,
-        props = __rest(_a, ["variant", "value"]);
-
-    return /*#__PURE__*/React__namespace.createElement(material.ToggleButton, __assign({
-      className: variant,
-      value: value
-    }, props));
-  };
-
-  /* *
-   * 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 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-   * Copyright 2021 - Finnish Meteorological Institute (FMI)
-   * */
-
-  var ToolButton = function ToolButton(_a) {
-    var active = _a.active,
-        _b = _a.width,
-        width = _b === void 0 ? '24px' : _b,
-        _c = _a.height,
-        height = _c === void 0 ? '24px' : _c,
-        children = _a.children,
-        _d = _a.value,
-        value = _d === void 0 ? 0 : _d,
-        _e = _a.sx,
-        sx = _e === void 0 ? {} : _e,
-        props = __rest(_a, ["active", "width", "height", "children", "value", "sx"]);
-
-    return /*#__PURE__*/React__namespace.createElement(CustomToggleButton, __assign({
-      variant: "tool",
-      disableRipple: true,
-      selected: active,
-      value: value,
-      sx: __assign({
-        width: width + "!important",
-        height: height + "!important",
-        textTransform: 'none!important',
-        padding: '11px!important'
-      }, sx)
-    }, props), children);
-  };
-
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
@@ -10908,7 +10823,7 @@
         source: source
       }));
     }, [currentActiveMapId, dispatch, isOpenInStore, mapId, source]);
-    return /*#__PURE__*/React__namespace.createElement(ToolButton, {
+    return /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
       onClick: openFilterResultsDialog,
       active: isOpenInStore,
       id: "keywordFilterButton",
@@ -11487,13 +11402,6 @@
   var isURL = function isURL(string) {
     return /^https?:\/\//.test(string);
   };
-  var useStyles$q = makeStyles__default["default"](function (theme) {
-    return {
-      iconButton: {
-        color: theme.palette.geowebColors.typographyAndIcons.buttonIconTertiaryFlat
-      }
-    };
-  });
   var clearIconPath = 'M12,2 C17.5228475,2 22,6.4771525 22,12 C22,17.5228475 17.5228475,22 12,22 C6.4771525,22 2,17.5228475 2,12 C2,6.4771525 6.4771525,2 12,2 Z M15.44426,7.26697571 L12.0002861,10.7110482 L8.55573996,7.26697571 C8.19978253,6.9110081 7.62292549,6.9110081 7.26696807,7.26697571 C6.91101064,7.62294331 6.91101064,8.19981687 7.26696807,8.55578447 L10.7115142,11.9998569 L7.26696807,15.4445017 C6.91101064,15.8004693 6.91101064,16.3767705 7.26696807,16.7333104 C7.44494678,16.910722 7.67843653,17 7.91192629,17 C8.14484377,17 8.37776125,16.910722 8.55573996,16.7333104 L12.0002861,13.289238 L15.44426,16.7333104 C15.6222388,16.910722 15.8551562,17 16.088646,17 C16.3221357,17 16.5550532,16.910722 16.7330319,16.7333104 C17.0889894,16.3767705 17.0889894,15.8004693 16.7330319,15.4445017 L13.289058,11.9998569 L16.7330319,8.55578447 C17.0889894,8.19981687 17.0889894,7.62294331 16.7330319,7.26697571 C16.3770745,6.9110081 15.8002175,6.9110081 15.44426,7.26697571 Z';
   var clearIcon = /*#__PURE__*/React__default["default"].createElement(material.SvgIcon, {
     style: {
@@ -11525,7 +11433,6 @@
         isPopupOpen = _b[0],
         setPopupOpen = _b[1];
 
-    var classes = useStyles$q();
     React__default["default"].useEffect(function () {
       if (isPopupOpen === false) {
         onClickClear();
@@ -11536,7 +11443,6 @@
       title: "Clear",
       placement: "top"
     }, /*#__PURE__*/React__default["default"].createElement(material.IconButton, {
-      className: classes.iconButton,
       edge: "end",
       onClick: function onClick() {
         onClickClear();
@@ -11565,7 +11471,6 @@
       title: "Search",
       placement: "top"
     }, /*#__PURE__*/React__default["default"].createElement(material.IconButton, {
-      className: classes.iconButton,
       edge: "end",
       size: "large"
     }, searchIcon));
@@ -11664,6 +11569,50 @@
     });
   };
 
+  /* *
+   * 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)
+   * */
+
+  var LayerAddRemoveButton = function LayerAddRemoveButton(_a) {
+    var layer = _a.layer,
+        layerIndex = _a.layerIndex,
+        serviceId = _a.serviceId,
+        addLayer = _a.addLayer,
+        deleteLayer = _a.deleteLayer,
+        mapLayers = _a.mapLayers;
+    var foundLayer = mapLayers.find(function (lr) {
+      return lr.name === layer.name && lr.service === serviceId;
+    });
+    return /*#__PURE__*/React__namespace.createElement(shared.CustomToggleButton, {
+      "data-testid": "layerAddRemoveButton-" + layer.name,
+      onClick: function onClick() {
+        !foundLayer ? addLayer({
+          serviceURL: serviceId,
+          layerName: layer.name
+        }) : deleteLayer({
+          layerId: foundLayer.id,
+          layerIndex: layerIndex
+        });
+      },
+      selected: !!foundLayer,
+      variant: "tool",
+      fullWidth: true
+    }, !foundLayer ? 'Add' : 'Remove');
+  };
+
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
@@ -11718,35 +11667,35 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$p = makeStyles__default["default"](function (theme) {
+  var useStyles$o = makeStyles__default["default"](function (theme) {
     return {
       layerRow: {
-        background: theme.palette.geowebColors.background.surface,
+        background: theme.palette.geowebColors.cards.cardContainer,
         padding: '8px 0px 8px 12px',
         marginBottom: '4px',
         height: '64px',
-        border: "solid 1px " + theme.palette.geowebColors.cards.cardContainerBorder
+        border: "solid 1px " + theme.palette.geowebColors.cards.cardContainerBorder,
+        display: 'grid',
+        gridTemplateColumns: '1fr 0.1fr',
+        gridGap: '20px'
       },
       layerText: {
         fontSize: '12px',
         fontWeight: 500,
         overflow: 'clip',
         height: '20px',
-        textOverflow: 'ellipsis',
-        whiteSpace: 'nowrap'
+        textOverflow: 'ellipsis'
       },
       layerName: {
         fontSize: '12px',
         height: '24px',
-        maxWidth: '100%',
         overflow: 'clip',
         "float": 'left',
         paddingTop: '6px',
-        textOverflow: 'ellipsis',
         whiteSpace: 'nowrap'
       },
       layerNameMaxWidth: {
-        maxWidth: '196px'
+        maxWidth: '270px'
       },
       layerAbstract: {
         fontSize: '10px',
@@ -11757,6 +11706,11 @@
       resultCount: {
         marginBottom: '4px',
         fontSize: '12px'
+      },
+      layerButton: {
+        marginRight: '8px',
+        marginTop: '4px',
+        width: '80px'
       }
     };
   });
@@ -11765,10 +11719,13 @@
     var services = _a.services,
         serviceIds = _a.serviceIds,
         layerSelectHeight = _a.layerSelectHeight,
+        addLayer = _a.addLayer,
+        deleteLayer = _a.deleteLayer,
         searchString = _a.searchString,
+        mapLayers = _a.mapLayers,
         keywordIds = _a.keywordIds,
         allKeywordsActive = _a.allKeywordsActive;
-    var classes = useStyles$p();
+    var classes = useStyles$o();
 
     var _b = __read(React__namespace.useState(0), 2),
         numberOfLayers = _b[0],
@@ -11789,12 +11746,14 @@
         overflow: 'auto'
       }
     }, serviceIds.map(function (serviceId) {
-      return filterLayersFromService(serviceId, services, keywordIds, allKeywordsActive, searchString).map(function (layer) {
+      return filterLayersFromService(serviceId, services, keywordIds, allKeywordsActive, searchString).map(function (layer, layerIndex) {
         return /*#__PURE__*/React__namespace.createElement("div", {
+          key: serviceId + "-" + layer.name + "-" + layer.text
+        }, /*#__PURE__*/React__namespace.createElement("div", {
           key: serviceId + "-" + layer.name,
           className: classes.layerRow,
           "data-testid": "layerListLayerRow"
-        }, /*#__PURE__*/React__namespace.createElement("div", {
+        }, /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("div", {
           className: classes.layerText
         }, layer.text), /*#__PURE__*/React__namespace.createElement("div", null, layer["abstract"] ? /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement("div", {
           className: classes.layerName + " " + classes.layerNameMaxWidth
@@ -11803,7 +11762,16 @@
           "data-testid": "layerAbstract"
         }, layer["abstract"])) : /*#__PURE__*/React__namespace.createElement("div", {
           className: classes.layerName
-        }, layer.name)));
+        }, layer.name))), /*#__PURE__*/React__namespace.createElement("div", {
+          className: classes.layerButton
+        }, /*#__PURE__*/React__namespace.createElement(LayerAddRemoveButton, {
+          layer: layer,
+          layerIndex: layerIndex,
+          serviceId: serviceId,
+          addLayer: addLayer,
+          deleteLayer: deleteLayer,
+          mapLayers: mapLayers
+        }))));
       });
     })));
   };
@@ -11826,13 +11794,57 @@
    * */
 
   var LayerListConnect = function LayerListConnect(_a) {
-    var layerSelectHeight = _a.layerSelectHeight;
+    var mapId = _a.mapId,
+        layerSelectHeight = _a.layerSelectHeight;
     var services = reactRedux.useSelector(function (store) {
       return getServices(store);
     });
+    var dispatch = reactRedux.useDispatch();
     var enabledServiceIds = reactRedux.useSelector(function (store) {
       return getEnabledServiceIds(store);
     });
+    var mapLayers = reactRedux.useSelector(function (store) {
+      return getMapLayers(store, mapId);
+    });
+
+    var addLayer$1 = function addLayer(_a) {
+      var serviceURL = _a.serviceURL,
+          layerName = _a.layerName;
+      var layer = {
+        service: serviceURL,
+        name: layerName,
+        id: generateLayerId(),
+        layerType: webmap.LayerType.mapLayer
+      };
+      addMapLayer({
+        mapId: mapId,
+        layerId: layer.id,
+        layer: layer,
+        origin: 'LayerListConnect'
+      });
+    };
+
+    var addMapLayer = React__namespace.useCallback(function (_a) {
+      var layerId = _a.layerId,
+          layer = _a.layer,
+          origin = _a.origin;
+      return dispatch(addLayer({
+        mapId: mapId,
+        layerId: layerId,
+        layer: layer,
+        origin: origin
+      }));
+    }, [dispatch, mapId]);
+    var deleteLayer = React__namespace.useCallback(function (_a) {
+      var layerId = _a.layerId,
+          layerIndex = _a.layerIndex;
+      return dispatch(layerDelete({
+        mapId: mapId,
+        layerId: layerId,
+        layerIndex: layerIndex,
+        origin: 'LayerListConnect'
+      }));
+    }, [dispatch, mapId]);
     var checkedKeywordIds = reactRedux.useSelector(function (store) {
       return getCheckedKeywordIds(store);
     });
@@ -11846,9 +11858,12 @@
       services: services,
       serviceIds: enabledServiceIds,
       layerSelectHeight: layerSelectHeight,
+      addLayer: addLayer$1,
+      deleteLayer: deleteLayer,
       keywordIds: checkedKeywordIds,
       allKeywordsActive: allKeywordsActive,
-      searchString: searchString
+      searchString: searchString,
+      mapLayers: mapLayers
     });
   };
 
@@ -11884,7 +11899,7 @@
         service = _a.service,
         isEnabled = _a.isEnabled,
         toggleChip = _a.toggleChip;
-    return /*#__PURE__*/React__namespace.createElement(CustomToggleButton, {
+    return /*#__PURE__*/React__namespace.createElement(shared.CustomToggleButton, {
       variant: "boxed",
       selected: isEnabled,
       tabIndex: 0,
@@ -11980,7 +11995,7 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$o = makeStyles__default["default"](function (theme) {
+  var useStyles$n = makeStyles__default["default"](function (theme) {
     return createStyles__default["default"]({
       serviceChips: {
         width: '100%',
@@ -12052,7 +12067,7 @@
     var ref = React__namespace.useRef(null);
     var scrollSpeed = 5;
     var maxWidthValue = ref && ref.current && ref.current.scrollWidth && ref.current.scrollWidth >= layerSelectWidth - margin && ref.current.scrollWidth || layerSelectWidth - 50;
-    var classes = useStyles$o({
+    var classes = useStyles$n({
       margin: margin,
       maxWidthValue: maxWidthValue
     });
@@ -12182,7 +12197,7 @@
    * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2022 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$n = makeStyles__default["default"](function (theme) {
+  var useStyles$m = makeStyles__default["default"](function (theme) {
     return createStyles__default["default"]({
       servicesContainer: {
         width: '300px',
@@ -12238,7 +12253,7 @@
         mapStoreRemoveService = _a.mapStoreRemoveService,
         _b = _a.layers,
         layers = _b === void 0 ? [] : _b;
-    var classes = useStyles$n();
+    var classes = useStyles$m();
 
     var _c = __read(React__namespace.useState(false), 2),
         addServiceisOpen = _c[0],
@@ -12255,6 +12270,8 @@
     var isDisabled = function isDisabled(service) {
       return layers.some(function (layer) {
         return layer.service && layer.service.includes(service);
+      }) || preloadedDefaultMapServices.some(function (defaultMapService) {
+        return defaultMapService.url && defaultMapService.url.includes(service);
       });
     };
 
@@ -12284,14 +12301,15 @@
         }
       }, /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
         title: "Edit Service"
-      }, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
+      }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
+        disabled: isDisabled(service.service),
         "data-testid": "openEditServiceButton",
         size: "large"
       }, /*#__PURE__*/React__namespace.createElement(material.SvgIcon, null, /*#__PURE__*/React__namespace.createElement("g", null, /*#__PURE__*/React__namespace.createElement("path", {
         d: "m8.332 17.09-.005.001-2.652.604.956-2.542.001-.001.001-.001.857-.744 1.69 1.945-.848.738zm.71.815L20.932 7.577 17.823 4 5.933 14.329l-.01.008.005.005L4.173 19l4.857-1.09-.004-.02.019.02-.002-.005z",
         fill: classes.iconFill,
         fillRule: "evenodd"
-      }))))), /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
+      })))))), /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
         title: "Delete Service"
       }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
         size: "large",
@@ -12378,48 +12396,12 @@
    * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
    * Copyright 2021 - Finnish Meteorological Institute (FMI)
    * */
-  var useStyles$m = makeStyles__default["default"](function (theme) {
-    return createStyles__default["default"]({
-      servicesContainer: {
-        position: 'fixed',
-        top: '140px',
-        right: '-72px',
-        backgroundColor: theme.palette.geowebColors.background.surface,
-        boxShadow: theme.shadows[6]
-      },
-      servicesText: {
-        paddingTop: '12px',
-        paddingLeft: '12px'
-      }
-    });
-  });
 
   var ServiceOptionsButton = function ServiceOptionsButton() {
-    var classes = useStyles$m();
-
-    var _a = __read(React__namespace.useState(false), 2),
-        containerOpen = _a[0],
-        setContainerOpen = _a[1];
-
-    var toggleContainer = function toggleContainer() {
-      setContainerOpen(!containerOpen);
-    };
-
-    return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(ToolButton, {
-      onClick: toggleContainer,
-      active: containerOpen,
-      "data-testid": "serviceOptionsButton",
-      variant: "tool"
-    }, /*#__PURE__*/React__namespace.createElement(material.SvgIcon, {
-      viewBox: "0 0 24 24",
-      xmlns: "http://www.w3.org/2000/svg"
-    }, /*#__PURE__*/React__namespace.createElement("g", null, /*#__PURE__*/React__namespace.createElement("path", {
-      d: "M12 16c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm0-2c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm0-6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z",
-      fillRule: "evenodd"
-    })))), containerOpen ? /*#__PURE__*/React__namespace.createElement(material.Box, {
-      className: classes.servicesContainer,
-      "data-testid": "ServiceOptionsDialogContainer"
-    }, /*#__PURE__*/React__namespace.createElement(ServiceOptionsDialogConnect, null)) : null);
+    return /*#__PURE__*/React__namespace.createElement(shared.ToggleMenu, {
+      buttonTestId: "serviceOptionsButton",
+      menuPosition: "bottom"
+    }, /*#__PURE__*/React__namespace.createElement(ServiceOptionsDialogConnect, null));
   };
 
   /* *
@@ -12526,6 +12508,7 @@
     })), /*#__PURE__*/React__namespace.createElement("div", {
       className: classes.layerSelectContainer
     }, /*#__PURE__*/React__namespace.createElement(LayerListConnect, {
+      mapId: mapId,
       layerSelectHeight: height
     })));
   };
@@ -13209,7 +13192,7 @@
         isActive = _c === void 0 ? false : _c,
         props = __rest(_a, ["onClick", "children", "title", "placement", "isActive"]);
 
-    return /*#__PURE__*/React__namespace.createElement(ToolButton, __assign({
+    return /*#__PURE__*/React__namespace.createElement(shared.ToolButton, __assign({
       onClick: onClick,
       active: isActive
     }, props), /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
@@ -14120,7 +14103,7 @@
       title: autoUpdateButton.title
     }, /*#__PURE__*/React__namespace.createElement("span", {
       "data-testid": "autoUpdateButtonTooltip"
-    }, /*#__PURE__*/React__namespace.createElement(ToolButton, {
+    }, /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
       active: isAutoUpdating,
       disabled: disabled,
       onClick: function onClick() {
@@ -14184,7 +14167,7 @@
     var loopButtonPath = isLooping ? svgLoopOffPath : svgLoopPath;
     return /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
       title: loopButtonPath.title
-    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(ToolButton, {
+    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
       onClick: function onClick() {
         return onToggleLoop();
       },
@@ -14296,7 +14279,7 @@
       className: classes.speedButtonDiv
     }, /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
       title: "Speed"
-    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(ToolButton, {
+    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
       onClick: onClickButton,
       active: true,
       "data-testid": "speedButton"
@@ -14588,7 +14571,7 @@
       className: classes.timeStepDiv
     }, /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
       title: "Time step"
-    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(ToolButton, {
+    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
       active: true,
       onClick: onClickButton,
       "data-testid": "timeStepButton",
@@ -14694,7 +14677,7 @@
     var id = open ? 'simple-popover' : undefined;
     return /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
       title: "Options"
-    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(ToolButton, {
+    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
       onClick: onClickButton,
       "data-testid": "optionsMenuButton",
       active: open
@@ -14783,7 +14766,7 @@
     var playButtonPath = isAnimating ? pausePath : playPath;
     return /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
       title: playButtonPath.title
-    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(ToolButton, {
+    }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
       onClick: onTogglePlay,
       disabled: isDisabled,
       "data-testid": "playButton",
@@ -15961,6 +15944,12 @@
 
   var NEEDLE_HANDLE_WIDTH = 10;
   var LEFT_MOUSE_BTN = 1;
+  var THROTTLE_WAIT_TIME = 500; // [ms]
+
+  var THROTTLE_OPTIONS = {
+    trailing: false // Invoke function when called, but not more than once every <THROTTLE_WAIT_TIME>.
+
+  };
 
   var TimeSliderLegend = function TimeSliderLegend(_a) {
     var centerTime = _a.centerTime,
@@ -16025,7 +16014,21 @@
       setNewRoundedTime(x, centerTime, width, secondsPerPx, timeStep, dataStartTime, dataEndTime, onSetNewDate);
     };
 
-    var theme = material.useTheme();
+    var theme = material.useTheme(); // eslint-disable-next-line react-hooks/exhaustive-deps
+
+    var throttledZoom = React__namespace.useCallback(_.throttle(function (newSecondsPerPx, newCenterTime) {
+      onZoom(newSecondsPerPx, newCenterTime);
+    }, THROTTLE_WAIT_TIME, THROTTLE_OPTIONS), []);
+
+    var zoom = function zoom(deltaY, deltaX, canvasWidth, mouseX) {
+      if (!onZoom) return;
+      var direction = deltaY || deltaX;
+      var newSecondsPerPx = getNextSecondsPerPxValue(Math.sign(direction), secondsPerPx, dataScaleToSecondsPerPx);
+      var mouseTime = pixelToTimestamp(mouseX, centerTime, canvasWidth, secondsPerPx);
+      var newCenterTime = getNewCenterOfFixedPointZoom(mouseTime, secondsPerPx, newSecondsPerPx, centerTime);
+      throttledZoom(newSecondsPerPx, newCenterTime);
+    };
+
     return /*#__PURE__*/React__namespace.createElement("div", {
       className: classes.timeSliderLegend,
       "data-testid": "timeSliderLegend"
@@ -16057,12 +16060,7 @@
             deltaX = _a.deltaX,
             canvasWidth = _a.canvasWidth,
             mouseX = _a.mouseX;
-        if (!onZoom) return;
-        var direction = deltaY || deltaX;
-        var newSecondsPerPx = getNextSecondsPerPxValue(Math.sign(direction), secondsPerPx, dataScaleToSecondsPerPx);
-        var mouseTime = pixelToTimestamp(mouseX, centerTime, canvasWidth, secondsPerPx);
-        var newCenterTime = getNewCenterOfFixedPointZoom(mouseTime, secondsPerPx, newSecondsPerPx, centerTime);
-        onZoom(newSecondsPerPx, newCenterTime);
+        zoom(deltaY, deltaX, canvasWidth, mouseX);
       },
       onMouseDown: function onMouseDown(x, y, width) {
         setDragged(false);
@@ -17826,7 +17824,7 @@
   };
   var ECMWFPublicService = {
     name: 'ECMWF',
-    url: 'https://apps.ecmwf.int/wms/?token=public',
+    url: 'https://eccharts.ecmwf.int/wms/?token=public',
     id: 'ecmwf'
   };
   var MeteoCanada = {
@@ -21214,6 +21212,14 @@
           });
         }
       }
+      /* Set disable map pin */
+
+
+      if (!prevProps || prevProps.disableMapPin !== props.disableMapPin) {
+        if (!(props.disableMapPin === undefined)) {
+          this.adaguc.webMapJS.getMapPin().toggleDisableMapPin();
+        }
+      }
       /* Change the animation delay */
 
 
@@ -21857,6 +21863,9 @@
     var mapPinLocation = reactRedux.useSelector(function (store) {
       return getPinLocation(store, mapId);
     });
+    var disableMapPin = reactRedux.useSelector(function (store) {
+      return getDisableMapPin(store, mapId);
+    });
     var dispatch = reactRedux.useDispatch();
     var map = getWMJSMapById(mapId);
     var mapChangeDimension$1 = React__namespace.useCallback(function (mapDimensionPayload) {
@@ -21928,6 +21937,7 @@
       activeLayerId: activeLayerId,
       animationDelay: animationDelay,
       displayMapPin: displayMapPin,
+      disableMapPin: disableMapPin,
       onMapChangeDimension: function onMapChangeDimension(mapDimensionPayload) {
         if (mapDimensionPayload && mapDimensionPayload.dimension && mapDimensionPayload.dimension.name && mapDimensionPayload.dimension.name === 'time') {
           setTime$1({
@@ -22562,7 +22572,9 @@
         _k = _a.shouldShowZoomControls,
         shouldShowZoomControls = _k === void 0 ? false : _k,
         _l = _a.displayMapPin,
-        displayMapPin = _l === void 0 ? false : _l;
+        displayMapPin = _l === void 0 ? false : _l,
+        toggleTimestepAuto$1 = _a.toggleTimestepAuto,
+        setTimestep = _a.setTimestep;
     var classes = useStyles$4();
     var dispatch = reactRedux.useDispatch();
     var mapId = React__default["default"].useRef(id || generateMapId()).current;
@@ -22633,6 +22645,22 @@
             timestepAuto: false
           }));
         }
+      } // Set timestep auto based on preset
+
+
+      if (toggleTimestepAuto$1 !== undefined && shouldAnimate !== true) {
+        dispatch(toggleTimestepAuto({
+          mapId: mapId,
+          timestepAuto: toggleTimestepAuto$1
+        }));
+      } // Set timestep value based on preset
+
+
+      if (setTimestep !== undefined && shouldAnimate !== true) {
+        dispatch(setTimeStep({
+          mapId: mapId,
+          timeStep: setTimestep
+        }));
       } // eslint-disable-next-line react-hooks/exhaustive-deps
 
     }, []);
@@ -23011,7 +23039,11 @@
         _h = _a.animationPayload,
         animationPayload = _h === void 0 ? undefined : _h,
         _j = _a.displayMapPin,
-        displayMapPin = _j === void 0 ? false : _j;
+        displayMapPin = _j === void 0 ? false : _j,
+        _k = _a.showTimeSlider,
+        showTimeSlider = _k === void 0 ? true : _k,
+        toggleTimestepAuto = _a.toggleTimestepAuto,
+        setTimestep = _a.setTimestep;
     var classes = useStyles$2();
     return /*#__PURE__*/React__default["default"].createElement("div", {
       className: classes.mapSliderConnect,
@@ -23020,7 +23052,7 @@
       className: classes.zoomControls
     }, /*#__PURE__*/React__default["default"].createElement(ZoomControlConnect, {
       mapId: id
-    })), /*#__PURE__*/React__default["default"].createElement("div", {
+    })), showTimeSlider && /*#__PURE__*/React__default["default"].createElement("div", {
       className: classes.timeSlider
     }, /*#__PURE__*/React__default["default"].createElement(TimeSliderConnect, {
       mapId: id,
@@ -23038,7 +23070,9 @@
       shouldAnimate: shouldAnimate,
       animationPayload: animationPayload,
       shouldShowZoomControls: shouldShowZoomControls,
-      displayMapPin: displayMapPin
+      displayMapPin: displayMapPin,
+      toggleTimestepAuto: toggleTimestepAuto,
+      setTimestep: setTimestep
     }));
   };
 
@@ -23260,11 +23294,7 @@
           return removeGroup(groupObject.id);
         },
         size: "large"
-      }, index === 0 ? /*#__PURE__*/React__namespace.createElement(iconsMaterial.Add, {
-        className: classes.iconColor
-      }) : /*#__PURE__*/React__namespace.createElement(iconsMaterial.DeleteForever, {
-        className: classes.iconColor
-      })))), /*#__PURE__*/React__namespace.createElement(SyncGroupListItem, {
+      }, index === 0 ? /*#__PURE__*/React__namespace.createElement(iconsMaterial.Add, null) : /*#__PURE__*/React__namespace.createElement(iconsMaterial.DeleteForever, null)))), /*#__PURE__*/React__namespace.createElement(SyncGroupListItem, {
         viewStateData: viewStateData,
         groupId: groupObject.id,
         selected: groupObject.selected,
@@ -23290,9 +23320,6 @@
         backgroundColor: theme.palette.geowebColors.syncGroups.drawerOpen.fill,
         boxShadow: 'inset 0px 7px 7px -7px, inset 0px -7px 7px -7px',
         color: '#000000'
-      },
-      iconColor: {
-        color: theme.palette.geowebColors.typographyAndIcons.buttonIconTertiaryFlat
       }
     });
   });
@@ -23851,7 +23878,8 @@
   exports.makeMapPreset = makeMapPreset;
   exports.mapActions = actions$3;
   exports.mapConstants = constants$1;
-  exports.mapSelectors = selectors;
+  exports.mapModuleConfig = moduleConfig;
+  exports.mapSelectors = selectors$1;
   exports.mapTypes = types$2;
   exports.mapUtils = utils;
   exports.publicLayers = publicLayers;
@@ -23863,6 +23891,8 @@
   exports.synchronizationGroupModuleConfig = synchronizationGroupConfig;
   exports.testLayers = testLayers;
   exports.uiActions = actions$2;
+  exports.uiModuleConfig = uiModuleConfig;
+  exports.uiSelectors = selectors;
   exports.uiTypes = types$1;
   exports.useStyles = useStyles$3;