@opengeoweb/core 2.2.1 → 2.4.1

package/index.esm.js

@@ -1,16 +1,16 @@
 import { createSelector } from 'reselect';
 import moment from 'moment';
-import _, { isEqual, debounce } from 'lodash';
+import _, { isEqual, debounce, throttle } from 'lodash';
 import * as React from 'react';
 import React__default, { useState, Component, useRef, useEffect } from 'react';
 import produce, { produce as produce$1 } from 'immer';
 import { takeLatest, put, select, call, takeEvery } from 'redux-saga/effects';
-import { WMGetServiceFromStore, getMapImageStore, WMBBOX, debug, DebugType, WMJSMap, WMLayer, legendImageStore, WMImageEventType, getLegendGraphicURLForLayer } from '@opengeoweb/webmap';
-import { Tooltip, Select, Grid, InputLabel, IconButton, Paper, Box, Typography, CircularProgress, List, ListSubheader, ListItem, ListItemText, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Button, MenuItem, Checkbox, SvgIcon, ListItemIcon, Menu, FormControl, ToggleButton, InputAdornment, ListItemSecondaryAction, Switch, Slider, FormControlLabel, Popover, useMediaQuery, useTheme, SliderThumb } from '@mui/material';
-import makeStyles from '@mui/styles/makeStyles';
+import { WMGetServiceFromStore, LayerType as LayerType$1, getMapImageStore, WMBBOX, debug, DebugType, WMJSMap, WMLayer, legendImageStore, WMImageEventType, getLegendGraphicURLForLayer } from '@opengeoweb/webmap';
+import { Tooltip, Select, Grid, InputLabel, IconButton, Paper, Box, Typography, CircularProgress, List, ListSubheader, ListItem, ListItemText, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Button, MenuItem, SvgIcon, FormControl, InputAdornment, ListItemSecondaryAction, ListItemIcon, Checkbox, Switch, Slider, FormControlLabel, Popover, useMediaQuery, useTheme, SliderThumb } from '@mui/material';
 import { connect, useDispatch, useSelector, Provider } from 'react-redux';
-import { sliderStyles, CustomSlider, ToolContainerDraggable, useIsMounted } from '@opengeoweb/shared';
-import { Cached, Add, MoreVert, FileCopy, Delete, DragIndicator, Close, ChevronLeft, ChevronRight, Link, LinkOff, DeleteForever } from '@mui/icons-material';
+import makeStyles from '@mui/styles/makeStyles';
+import { sliderStyles, CustomSlider, ToggleMenu, ManagerButton, EnableButton, AlertBanner, ManagerDeleteButton, ToolContainerDraggable, ToolButton, CustomToggleButton, useIsMounted } from '@opengeoweb/shared';
+import { Cached, Add, DragIndicator, Close, ChevronLeft, ChevronRight, Link, LinkOff, MoreVert, DeleteForever } from '@mui/icons-material';
 import { Sortable, ReactSortable } from 'react-sortablejs';
 import createStyles from '@mui/styles/createStyles';
 import withStyles from '@mui/styles/withStyles';
@@ -59,6 +59,7 @@ var WEBMAP_SET_TIME_SLIDER_CENTER_TIME = 'WEBMAP_SET_TIME_SLIDER_CENTER_TIME';
 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");
@@ -367,6 +368,19 @@ var setMapPinLocation = function setMapPinLocation(payload) {
     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");
@@ -743,6 +757,7 @@ var actions$3 = /*#__PURE__*/Object.freeze({
   setTimeSliderSecondsPerPx: setTimeSliderSecondsPerPx,
   setTimeSliderDataScaleToSecondsPerPx: setTimeSliderDataScaleToSecondsPerPx,
   setMapPinLocation: setMapPinLocation,
+  setDisableMapPin: setDisableMapPin,
   setLayers: setLayers,
   setBaseLayers: setBaseLayers,
   addBaseLayer: addBaseLayer,
@@ -1278,6 +1293,103 @@ var getAvailableBaseLayersForMap = createSelector(layerStore, function (_store,
   return [];
 }, selectorMemoizationOptions);
 
+/* *
+ * 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 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2020 - Finnish Meteorological Institute (FMI)
+ * */
+
+/* Action constants for sources */
+var SYNCGROUPS_ADD_SOURCE = 'SYNCGROUPS_ADD_SOURCE';
+var SYNCGROUPS_REMOVE_SOURCE = 'SYNCGROUPS_REMOVE_SOURCE';
+/* Action constants for groups */
+
+var SYNCGROUPS_TOGGLE_LINK_TARGET = 'SYNCGROUPS_TOGGLE_LINK_TARGET';
+var SYNCGROUPS_ADD_TARGET = 'SYNCGROUPS_ADD_TARGET';
+var SYNCGROUPS_REMOVE_TARGET = 'SYNCGROUPS_REMOVE_TARGET';
+var SYNCGROUPS_ADD_GROUP = 'SYNCGROUPS_ADD_GROUP';
+var SYNCGROUPS_REMOVE_GROUP = 'SYNCGROUPS_REMOVE_GROUP';
+var SYNCGROUPS_CLEAR = 'SYNCGROUPS_CLEAR';
+/* Type constants */
+
+var SYNCGROUPS_TYPE_SETTIME = 'SYNCGROUPS_TYPE_SETTIME';
+var SYNCGROUPS_TYPE_SETBBOX = 'SYNCGROUPS_TYPE_SETBBOX';
+var SYNCGROUPS_TYPE_SETLAYERACTIONS = 'SYNCGROUPS_TYPE_SETLAYERACTIONS';
+var SYNCGROUPS_SET_VIEW_STATE = 'SYNCGROUPS_SET_VIEW_STATE';
+
+var constants$1 = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  SYNCGROUPS_ADD_SOURCE: SYNCGROUPS_ADD_SOURCE,
+  SYNCGROUPS_REMOVE_SOURCE: SYNCGROUPS_REMOVE_SOURCE,
+  SYNCGROUPS_TOGGLE_LINK_TARGET: SYNCGROUPS_TOGGLE_LINK_TARGET,
+  SYNCGROUPS_ADD_TARGET: SYNCGROUPS_ADD_TARGET,
+  SYNCGROUPS_REMOVE_TARGET: SYNCGROUPS_REMOVE_TARGET,
+  SYNCGROUPS_ADD_GROUP: SYNCGROUPS_ADD_GROUP,
+  SYNCGROUPS_REMOVE_GROUP: SYNCGROUPS_REMOVE_GROUP,
+  SYNCGROUPS_CLEAR: SYNCGROUPS_CLEAR,
+  SYNCGROUPS_TYPE_SETTIME: SYNCGROUPS_TYPE_SETTIME,
+  SYNCGROUPS_TYPE_SETBBOX: SYNCGROUPS_TYPE_SETBBOX,
+  SYNCGROUPS_TYPE_SETLAYERACTIONS: SYNCGROUPS_TYPE_SETLAYERACTIONS,
+  SYNCGROUPS_SET_VIEW_STATE: SYNCGROUPS_SET_VIEW_STATE
+});
+
+/* *
+ * 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 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2020 - Finnish Meteorological Institute (FMI)
+ * */
+
+var synchronizationGroupStore = function synchronizationGroupStore(store) {
+  return store && store.syncronizationGroupStore ? store.syncronizationGroupStore : null;
+};
+
+var getSynchronizationGroupStore = createSelector(synchronizationGroupStore, function (store) {
+  return store;
+});
+/**
+ * Returns the synchronization source by id
+ * @param store The app store
+ * @param id The source id to find
+ */
+
+var getSyncSourceBySourceId = function getSyncSourceBySourceId(state, id) {
+  if (state && state.sources) {
+    var sources = state.sources;
+
+    if (sources.byId[id]) {
+      return sources.byId[id];
+    }
+  }
+
+  return null;
+};
+
+var getTime = createSelector(getSyncSourceBySourceId, function (store) {
+  return store && store.payloadByType && store.payloadByType[SYNCGROUPS_TYPE_SETTIME] ? store.payloadByType[SYNCGROUPS_TYPE_SETTIME].value : null;
+});
+
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
@@ -2346,6 +2458,34 @@ var getBbox = createSelector(getMapById, function (store) {
 var isAnimating = createSelector(getMapById, function (store) {
   return store ? store.isAnimating : false;
 });
+/**
+ * Gets if any linked map is animating
+ *
+ * Example: linkedMapIsAnimating = linkedMapAnimationInfo(store, 'mapid_1')
+ * @param {object} store store: object - store object
+ * @param {string} mapId mapId: string - Id of the map
+ * @returns {object} returnType: object - object containing isAnimating boolean and id string
+ */
+
+var linkedMapAnimationInfo = createSelector(function (store, mapId) {
+  var animationInfo = {
+    isAnimating: isAnimating(store, mapId),
+    id: mapId
+  };
+  getSynchronizationGroupStore(store).groups.allIds.forEach(function (groupId) {
+    if (getSynchronizationGroupStore(store).groups.byId[groupId].targets.byId[animationInfo.id] && getSynchronizationGroupStore(store).groups.byId[groupId].targets.byId[animationInfo.id].linked) {
+      getSynchronizationGroupStore(store).groups.byId[groupId].targets.allIds.forEach(function (id) {
+        if (isAnimating(store, id) === true) {
+          animationInfo.isAnimating = true;
+          animationInfo.id = id;
+        }
+      });
+    }
+  });
+  return animationInfo;
+}, function (animationInfo) {
+  return animationInfo;
+});
 /**
  * Gets start time of animation
  *
@@ -2615,7 +2755,7 @@ var getAllUniqueDimensions = createSelector(getAllMapIds, function (store) {
 /**
  * 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
@@ -2624,6 +2764,18 @@ var getAllUniqueDimensions = createSelector(getAllMapIds, function (store) {
 var getPinLocation = 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 = createSelector(getMapById, function (store) {
+  return store ? store.disableMapPin : undefined;
+});
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -2775,7 +2927,7 @@ var getServicesInArray = createSelector(servicesStore, function (store) {
  * Copyright 2020 - Finnish Meteorological Institute (FMI)
  * */
 
-var selectors = /*#__PURE__*/Object.freeze({
+var selectors$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   getMapById: getMapById,
   getAllMapIds: getAllMapIds,
@@ -2793,6 +2945,7 @@ var selectors = /*#__PURE__*/Object.freeze({
   getSrs: getSrs,
   getBbox: getBbox,
   isAnimating: isAnimating,
+  linkedMapAnimationInfo: linkedMapAnimationInfo,
   getAnimationStartTime: getAnimationStartTime,
   getAnimationEndTime: getAnimationEndTime,
   isAutoUpdating: isAutoUpdating,
@@ -2813,6 +2966,7 @@ var selectors = /*#__PURE__*/Object.freeze({
   getLayerByLayerIndex: getLayerByLayerIndex,
   getAllUniqueDimensions: getAllUniqueDimensions,
   getPinLocation: getPinLocation,
+  getDisableMapPin: getDisableMapPin,
   getLayerById: getLayerById,
   getLayersById: getLayersById,
   getLayersIds: getLayersIds,
@@ -2857,7 +3011,7 @@ var selectors = /*#__PURE__*/Object.freeze({
  * Copyright 2020 - Finnish Meteorological Institute (FMI)
  * */
 
-var constants$1 = /*#__PURE__*/Object.freeze({
+var constants = /*#__PURE__*/Object.freeze({
   __proto__: null,
   WEBMAP_REGISTER_MAP: WEBMAP_REGISTER_MAP,
   WEBMAP_UNREGISTER_MAP: WEBMAP_UNREGISTER_MAP,
@@ -2881,6 +3035,7 @@ var constants$1 = /*#__PURE__*/Object.freeze({
   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,
@@ -3014,6 +3169,130 @@ var actions$2 = /*#__PURE__*/Object.freeze({
   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 = 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 = 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 = 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 = 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 = 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.
@@ -3070,56 +3349,7 @@ var GENERIC_SETBBOX = 'GENERIC_SETBBOX';
  * Copyright 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2020 - Finnish Meteorological Institute (FMI)
  * */
-
-/* Action constants for sources */
-var SYNCGROUPS_ADD_SOURCE = 'SYNCGROUPS_ADD_SOURCE';
-var SYNCGROUPS_REMOVE_SOURCE = 'SYNCGROUPS_REMOVE_SOURCE';
-/* Action constants for groups */
-
-var SYNCGROUPS_TOGGLE_LINK_TARGET = 'SYNCGROUPS_TOGGLE_LINK_TARGET';
-var SYNCGROUPS_ADD_TARGET = 'SYNCGROUPS_ADD_TARGET';
-var SYNCGROUPS_REMOVE_TARGET = 'SYNCGROUPS_REMOVE_TARGET';
-var SYNCGROUPS_ADD_GROUP = 'SYNCGROUPS_ADD_GROUP';
-var SYNCGROUPS_REMOVE_GROUP = 'SYNCGROUPS_REMOVE_GROUP';
-var SYNCGROUPS_CLEAR = 'SYNCGROUPS_CLEAR';
-/* Type constants */
-
-var SYNCGROUPS_TYPE_SETTIME = 'SYNCGROUPS_TYPE_SETTIME';
-var SYNCGROUPS_TYPE_SETBBOX = 'SYNCGROUPS_TYPE_SETBBOX';
-var SYNCGROUPS_TYPE_SETLAYERACTIONS = 'SYNCGROUPS_TYPE_SETLAYERACTIONS';
-
-var constants = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  SYNCGROUPS_ADD_SOURCE: SYNCGROUPS_ADD_SOURCE,
-  SYNCGROUPS_REMOVE_SOURCE: SYNCGROUPS_REMOVE_SOURCE,
-  SYNCGROUPS_TOGGLE_LINK_TARGET: SYNCGROUPS_TOGGLE_LINK_TARGET,
-  SYNCGROUPS_ADD_TARGET: SYNCGROUPS_ADD_TARGET,
-  SYNCGROUPS_REMOVE_TARGET: SYNCGROUPS_REMOVE_TARGET,
-  SYNCGROUPS_ADD_GROUP: SYNCGROUPS_ADD_GROUP,
-  SYNCGROUPS_REMOVE_GROUP: SYNCGROUPS_REMOVE_GROUP,
-  SYNCGROUPS_CLEAR: SYNCGROUPS_CLEAR,
-  SYNCGROUPS_TYPE_SETTIME: SYNCGROUPS_TYPE_SETTIME,
-  SYNCGROUPS_TYPE_SETBBOX: SYNCGROUPS_TYPE_SETBBOX,
-  SYNCGROUPS_TYPE_SETLAYERACTIONS: SYNCGROUPS_TYPE_SETLAYERACTIONS
-});
-
-/* *
- * 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 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2020 - Finnish Meteorological Institute (FMI)
- * */
-/* Actions for sources */
+/* Actions for sources */
 
 /**
  * Add a source component to the sources list.
@@ -3248,6 +3478,12 @@ var syncGroupClear = function syncGroupClear() {
     type: SYNCGROUPS_CLEAR
   };
 };
+var syncGroupSetViewState = function syncGroupSetViewState(payload) {
+  return {
+    type: SYNCGROUPS_SET_VIEW_STATE,
+    payload: payload
+  };
+};
 
 var actions$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -3258,7 +3494,8 @@ var actions$1 = /*#__PURE__*/Object.freeze({
   syncGroupLinkTarget: syncGroupLinkTarget,
   syncGroupAddGroup: syncGroupAddGroup,
   syncGroupRemoveGroup: syncGroupRemoveGroup,
-  syncGroupClear: syncGroupClear
+  syncGroupClear: syncGroupClear,
+  syncGroupSetViewState: syncGroupSetViewState
 });
 
 /* *
@@ -3328,7 +3565,8 @@ var actions = /*#__PURE__*/Object.freeze({
   syncGroupLinkTarget: syncGroupLinkTarget,
   syncGroupAddGroup: syncGroupAddGroup,
   syncGroupRemoveGroup: syncGroupRemoveGroup,
-  syncGroupClear: syncGroupClear
+  syncGroupClear: syncGroupClear,
+  syncGroupSetViewState: syncGroupSetViewState
 });
 
 /*! *****************************************************************************
@@ -3966,6 +4204,20 @@ var initialState$4 = {
   groups: {
     byId: {},
     allIds: []
+  },
+  viewState: {
+    timeslider: {
+      groups: [],
+      sourcesById: []
+    },
+    zoompane: {
+      groups: [],
+      sourcesById: []
+    },
+    level: {
+      groups: [],
+      sourcesById: []
+    }
   }
 };
 var reducer$4 = function reducer() {
@@ -4185,6 +4437,12 @@ var reducer$4 = function reducer() {
     case SYNCGROUPS_CLEAR:
       return initialState$4;
 
+    case SYNCGROUPS_SET_VIEW_STATE:
+      return produce(state, function (draft) {
+        var viewState = action.payload.viewState;
+        draft.viewState = viewState;
+      });
+
     default:
       return state;
   }
@@ -4296,6 +4554,9 @@ var getTargetGroups = function getTargetGroups(state, payload, actionType) {
   }, []);
   return groups;
 };
+var syncGroupGetViewState = createSelector(syncGroupStore, function (store) {
+  return store.viewState;
+});
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -4666,7 +4927,7 @@ var _marked$4 = /*#__PURE__*/regeneratorRuntime.mark(setTimeSaga),
     _marked2$4 = /*#__PURE__*/regeneratorRuntime.mark(setBBoxSaga),
     _marked3$4 = /*#__PURE__*/regeneratorRuntime.mark(layerActionsSaga),
     _marked4$2 = /*#__PURE__*/regeneratorRuntime.mark(addLayerActionsSaga),
-    _marked5$1 = /*#__PURE__*/regeneratorRuntime.mark(deleteLayerActionsSaga),
+    _marked5$2 = /*#__PURE__*/regeneratorRuntime.mark(deleteLayerActionsSaga),
     _marked6$1 = /*#__PURE__*/regeneratorRuntime.mark(moveLayerActionsSaga),
     _marked7$1 = /*#__PURE__*/regeneratorRuntime.mark(setActiveLayerIdActionsSaga),
     _marked8 = /*#__PURE__*/regeneratorRuntime.mark(mapBaseLayerActionsSaga),
@@ -4848,7 +5109,7 @@ function deleteLayerActionsSaga(_ref5) {
           return _context5.stop();
       }
     }
-  }, _marked5$1);
+  }, _marked5$2);
 }
 function moveLayerActionsSaga(_ref6) {
   var payload, type, targets;
@@ -5012,10 +5273,110 @@ function rootSaga$4() {
   }, _marked9);
 }
 
+/* *
+ * 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 emptyState = {
+  timeslider: {
+    groups: [],
+    sourcesById: []
+  },
+  zoompane: {
+    groups: [],
+    sourcesById: []
+  },
+  level: {
+    groups: [],
+    sourcesById: []
+  }
+};
+var groupTypes = [{
+  title: 'Timeslider',
+  syncType: 'SYNCGROUPS_TYPE_SETTIME',
+  groupType: 'timeslider'
+}, {
+  title: 'Zoompane',
+  syncType: 'SYNCGROUPS_TYPE_SETBBOX',
+  groupType: 'zoompane'
+}];
+/*
+    _____ Creates viewState  _____
+      - Runs Each time viewState is created:
+      - Fill arrays inside initialState with objects containing new values from Redux
+*/
+
+var createSyncGroupViewState = function createSyncGroupViewState(groups, sources) {
+  var initialState = produce(emptyState, function (draft) {
+    /*
+      _____ 1. Fill groups _____
+        1. Goes through all groups by ID
+        2. Collects original timeslider or zoompane values into an array
+        3. Sorts and adds selected sources to ViewState based on ID type
+    */
+    Object.keys(groups.byId).forEach(function (id) {
+      var _a;
+
+      var groupType = (_a = groupTypes.find(function (object) {
+        return object.syncType === groups.byId[id].type;
+      })) === null || _a === void 0 ? void 0 : _a.groupType;
+
+      if (groupType) {
+        draft[groupType].groups.push({
+          id: id,
+          selected: groups.byId[id].targets.allIds
+        });
+      }
+    });
+    /*
+      _____ 2. Fill sourcesById _____
+        1. Loop though sources and add source to each group type
+    */
+
+    Object.keys(sources.byId).forEach(function (id) {
+      groupTypes.forEach(function (_ref) {
+        var syncType = _ref.syncType,
+            groupType = _ref.groupType;
+
+        if (sources.byId[id].types.includes(syncType)) {
+          draft[groupType].sourcesById.push({
+            id: id,
+            name: id
+          });
+        }
+      });
+    });
+  });
+  return initialState;
+};
+
+var groups = function groups(store) {
+  return store.syncronizationGroupStore.groups;
+};
+
+var sources = function sources(store) {
+  return store.syncronizationGroupStore.sources;
+};
+
+var createSyncGroupViewStateSelector = createSelector(groups, sources, createSyncGroupViewState);
+
 var _marked$3 = /*#__PURE__*/regeneratorRuntime.mark(updateSourceValueWhenLinkingComponentToGroupSaga),
     _marked2$3 = /*#__PURE__*/regeneratorRuntime.mark(addGroupTargetSaga),
     _marked3$3 = /*#__PURE__*/regeneratorRuntime.mark(linkGroupTargetSaga),
-    _marked4$1 = /*#__PURE__*/regeneratorRuntime.mark(rootSaga$3);
+    _marked4$1 = /*#__PURE__*/regeneratorRuntime.mark(updateViewStateSaga),
+    _marked5$1 = /*#__PURE__*/regeneratorRuntime.mark(rootSaga$3);
 function updateSourceValueWhenLinkingComponentToGroupSaga(groupId, targetToUpdate) {
   var group;
   return regeneratorRuntime.wrap(function updateSourceValueWhenLinkingComponentToGroupSaga$(_context) {
@@ -5132,25 +5493,76 @@ function linkGroupTargetSaga(_ref2) {
     }
   }, _marked3$3);
 }
-
-function rootSaga$3() {
-  return regeneratorRuntime.wrap(function rootSaga$(_context4) {
+function updateViewStateSaga() {
+  var viewState;
+  return regeneratorRuntime.wrap(function updateViewStateSaga$(_context4) {
     while (1) {
       switch (_context4.prev = _context4.next) {
         case 0:
           _context4.next = 2;
+          return select(createSyncGroupViewStateSelector);
+
+        case 2:
+          viewState = _context4.sent;
+          _context4.next = 5;
+          return put(syncGroupSetViewState({
+            viewState: viewState
+          }));
+
+        case 5:
+        case "end":
+          return _context4.stop();
+      }
+    }
+  }, _marked4$1);
+}
+
+function rootSaga$3() {
+  return regeneratorRuntime.wrap(function rootSaga$(_context5) {
+    while (1) {
+      switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
           return takeLatest(SYNCGROUPS_ADD_TARGET, addGroupTargetSaga);
 
         case 2:
-          _context4.next = 4;
+          _context5.next = 4;
           return takeLatest(SYNCGROUPS_TOGGLE_LINK_TARGET, linkGroupTargetSaga);
 
         case 4:
+          _context5.next = 6;
+          return takeLatest(SYNCGROUPS_ADD_GROUP, updateViewStateSaga);
+
+        case 6:
+          _context5.next = 8;
+          return takeLatest(SYNCGROUPS_REMOVE_GROUP, updateViewStateSaga);
+
+        case 8:
+          _context5.next = 10;
+          return takeLatest(SYNCGROUPS_ADD_SOURCE, updateViewStateSaga);
+
+        case 10:
+          _context5.next = 12;
+          return takeLatest(SYNCGROUPS_REMOVE_SOURCE, updateViewStateSaga);
+
+        case 12:
+          _context5.next = 14;
+          return takeLatest(SYNCGROUPS_ADD_TARGET, updateViewStateSaga);
+
+        case 14:
+          _context5.next = 16;
+          return takeLatest(SYNCGROUPS_REMOVE_TARGET, updateViewStateSaga);
+
+        case 16:
+          _context5.next = 18;
+          return takeLatest(SYNCGROUPS_TOGGLE_LINK_TARGET, updateViewStateSaga);
+
+        case 18:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
     }
-  }, _marked4$1);
+  }, _marked5$1);
 }
 
 /* *
@@ -5177,41 +5589,6 @@ var synchronizationGroupConfig = {
   sagas: [rootSaga$4, rootSaga$3]
 };
 
-var useStyles$I = makeStyles(function (theme) {
-  return {
-    select: {
-      '& ul': {
-        backgroundColor: theme.palette.geowebColors.background.surface
-      },
-      '& li': {
-        fontSize: 16,
-        padding: 12,
-        '&:hover': {
-          backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
-        },
-        '&.Mui-selected': {
-          color: theme.palette.common.white,
-          backgroundColor: theme.palette.geowebColors.buttons.primary.active.fill,
-          boxShadow: "none",
-          '&:hover': {
-            color: theme.palette.common.white,
-            backgroundColor: theme.palette.geowebColors.buttons.primary.mouseOver.fill
-          }
-        },
-        '&:after': {
-          background: 'none!important'
-        },
-        // (optional) header
-        '&.Mui-disabled': {
-          fontSize: 12,
-          opacity: 0.67,
-          padding: '0 12px'
-        }
-      }
-    }
-  };
-});
-
 var TooltipSelect = function TooltipSelect(_a) {
   var tooltip = _a.tooltip,
       _a$list = _a.list,
@@ -5220,7 +5597,9 @@ var TooltipSelect = function TooltipSelect(_a) {
       currentIndex = _a$currentIndex === void 0 ? -1 : _a$currentIndex,
       _a$onChangeMouseWheel = _a.onChangeMouseWheel,
       onChangeMouseWheel = _a$onChangeMouseWheel === void 0 ? function () {} : _a$onChangeMouseWheel,
-      props = __rest(_a, ["tooltip", "list", "currentIndex", "onChangeMouseWheel"]);
+      _a$requiresCtrlToChan = _a.requiresCtrlToChange,
+      requiresCtrlToChange = _a$requiresCtrlToChan === void 0 ? false : _a$requiresCtrlToChan,
+      props = __rest(_a, ["tooltip", "list", "currentIndex", "onChangeMouseWheel", "requiresCtrlToChange"]);
 
   props.disableUnderline;
       var otherProps = __rest(props, ["disableUnderline"]);
@@ -5235,8 +5614,6 @@ var TooltipSelect = function TooltipSelect(_a) {
       tooltipOpen = _React$useState4[0],
       setTooltipOpen = _React$useState4[1];
 
-  var classes = useStyles$I();
-
   var preventDefault = function preventDefault(event) {
     event.preventDefault();
     event.stopPropagation();
@@ -5251,11 +5628,14 @@ var TooltipSelect = function TooltipSelect(_a) {
     });
   }, []);
   var onWheel = React.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.useCallback(function () {
     setSelectOpen(true);
     setTooltipOpen(false);
@@ -5264,17 +5644,23 @@ var TooltipSelect = function TooltipSelect(_a) {
     setSelectOpen(false);
   }, []);
   var onMouseEnter = React.useCallback(function () {
-    disableScroll();
+    if (!requiresCtrlToChange) {
+      disableScroll();
+    }
+
     if (!selectOpen) setTooltipOpen(true);
-  }, [selectOpen, disableScroll]);
+  }, [selectOpen, disableScroll, requiresCtrlToChange]);
   var onMouseLeave = React.useCallback(function () {
     enableScroll();
     setTooltipOpen(false);
   }, [enableScroll]);
   var onFocus = React.useCallback(function () {
-    disableScroll();
+    if (!requiresCtrlToChange) {
+      disableScroll();
+    }
+
     setTooltipOpen(true);
-  }, [disableScroll]);
+  }, [disableScroll, requiresCtrlToChange]);
   var onBlur = React.useCallback(function () {
     enableScroll();
     setTooltipOpen(false);
@@ -5292,8 +5678,46 @@ var TooltipSelect = function TooltipSelect(_a) {
     onBlur: onBlur,
     onWheel: onWheel,
     MenuProps: {
-      classes: {
-        paper: classes.select
+      BackdropProps: {
+        sx: {
+          '&.MuiBackdrop-root': {
+            backgroundColor: 'transparent'
+          }
+        }
+      },
+      sx: {
+        '& ul': {
+          backgroundColor: 'geowebColors.background.surface'
+        },
+        '& li': {
+          fontSize: '16px',
+          padding: '12px',
+          '&:hover': {
+            backgroundColor: 'geowebColors.buttons.tool.mouseOver.fill'
+          },
+          '&.Mui-selected': {
+            color: 'geowebColors.buttons.tool.active.color',
+            backgroundColor: 'geowebColors.buttons.tool.active.fill',
+            boxShadow: "none",
+            '&:hover': {
+              backgroundColor: 'geowebColors.buttons.tool.activeMouseOver.fill'
+            },
+            '&:focus': {
+              backgroundColor: 'geowebColors.buttons.tool.activeMouseOver.fill'
+            }
+          },
+          '&:after': {
+            background: 'none!important'
+          },
+          '&.Mui-disabled': {
+            fontSize: '12px',
+            opacity: 0.67,
+            padding: '0px 12px',
+            '&.MuiMenuItem-root': {
+              minHeight: '30px!important'
+            }
+          }
+        }
       }
     }
   }, otherProps)));
@@ -5342,7 +5766,7 @@ var types = /*#__PURE__*/Object.freeze({
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
   actions: actions$1,
-  constants: constants,
+  constants: constants$1,
   types: types,
   initialState: initialState$4
 });
@@ -5454,132 +5878,18 @@ var reducer$3 = function reducer() {
         });
       }
 
-    case UI_ORDER_DIALOG:
-      {
-        var _type4 = action.payload.type;
-        return produce$1(state, function (draft) {
-          draft.order = moveToTop(state.order, _type4);
-        });
-      }
-
-    default:
-      return state;
-  }
-};
-
-/* *
- * 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 = 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 = 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 = 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 = createSelector(function (store, dialogType) {
-  if (store && store.ui && store.ui.order) {
-    var order = store.ui.order;
-    return order.includes(dialogType) && order.indexOf(dialogType) === 0;
-  }
+    case UI_ORDER_DIALOG:
+      {
+        var _type4 = action.payload.type;
+        return produce$1(state, function (draft) {
+          draft.order = moveToTop(state.order, _type4);
+        });
+      }
 
-  return false;
-}, function (isOrderedOnTop) {
-  return isOrderedOnTop;
-});
-var getDialogSource = createSelector(getDialogDetailsByType, function (details) {
-  if (details && details.source) {
-    return details.source;
+    default:
+      return state;
   }
-
-  return 'app';
-});
+};
 
 var _marked$2 = /*#__PURE__*/regeneratorRuntime.mark(registerMapUISaga),
     _marked2$2 = /*#__PURE__*/regeneratorRuntime.mark(unregisterUIMapSaga),
@@ -6341,6 +6651,21 @@ var reducer$2 = function reducer() {
         });
       }
 
+    case WEBMAP_DISABLE_PIN:
+      {
+        var _action$payload26 = action.payload,
+            _mapId28 = _action$payload26.mapId,
+            disableMapPin = _action$payload26.disableMapPin;
+
+        if (!state.byId[_mapId28]) {
+          return state;
+        }
+
+        return produce$1(state, function (draft) {
+          draft.byId[_mapId28].disableMapPin = disableMapPin;
+        });
+      }
+
     case GENERIC_SYNC_SETLAYERACTIONS:
       {
         /*
@@ -6349,9 +6674,9 @@ var reducer$2 = function reducer() {
          * 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 _action$payload26 = action.payload,
-            targets = _action$payload26.targets,
-            source = _action$payload26.source;
+        var _action$payload27 = action.payload,
+            targets = _action$payload27.targets,
+            source = _action$payload27.source;
         return targets.reduce(function (prevState, target) {
           var action = {
             payload: target,
@@ -7897,7 +8222,7 @@ var preset = {
 		},
 		{
 			name: "ECMWF",
-			url: "https://apps.ecmwf.int/wms/?token=public",
+			url: "https://eccharts.ecmwf.int/wms/?token=public",
 			id: "ecmwf"
 		},
 		{
@@ -8000,7 +8325,7 @@ var defaultConfigurations = /*#__PURE__*/Object.freeze({
   preloadedDefaultMapServices: preloadedDefaultMapServices
 });
 
-var useStyles$H = makeStyles({
+var useStyles$w = makeStyles({
   buttonDiv: {
     position: 'relative'
   },
@@ -8036,7 +8361,7 @@ var AddLayersPopup = function AddLayersPopup(_ref) {
       handleClose = _ref.handleClose,
       _ref$layerType = _ref.layerType,
       layerType = _ref$layerType === void 0 ? LayerType.mapLayer : _ref$layerType;
-  var classes = useStyles$H();
+  var classes = useStyles$w();
 
   var _React$useState = React.useState(''),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -8156,7 +8481,6 @@ var AddLayersPopup = function AddLayersPopup(_ref) {
   }, /*#__PURE__*/React.createElement(IconButton, {
     "data-testid": "add-service",
     onClick: handleAddServiceURL,
-    color: "primary",
     disabled: loading,
     size: "large"
   }, /*#__PURE__*/React.createElement(Add, null)), loading && /*#__PURE__*/React.createElement(CircularProgress, {
@@ -8190,26 +8514,23 @@ var AddLayersPopup = function AddLayersPopup(_ref) {
   }, "Close")));
 };
 
-var useStyles$G = makeStyles(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$1 = {
+  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(_ref) {
   var onClickService = _ref.onClickService,
@@ -8225,7 +8546,6 @@ var AddLayersButton = function AddLayersButton(_ref) {
       _ref$shouldFocus = _ref.shouldFocus,
       shouldFocus = _ref$shouldFocus === void 0 ? false : _ref$shouldFocus;
   var ref = React.useRef(null);
-  var classes = useStyles$G();
 
   var _React$useState = React.useState(false),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -8246,7 +8566,7 @@ var AddLayersButton = function AddLayersButton(_ref) {
     title: tooltip
   }, /*#__PURE__*/React.createElement(IconButton, {
     onClick: handleClose,
-    className: classes.button,
+    sx: styles$1.button,
     disableRipple: true,
     "data-testid": "addLayersButton",
     ref: ref,
@@ -8300,6 +8620,9 @@ var LayerManagerColumnsLarge = makeStyles({
   column6: {
     width: iconButtonSize * 2,
     display: 'inline-flex'
+  },
+  columns35: {
+    width: "calc((100% - ".concat(iconButtonSize * totalButtons, "px) * 0.75)")
   }
 });
 var LayerManagerColumnsSmall = makeStyles({
@@ -8321,6 +8644,9 @@ var LayerManagerColumnsSmall = makeStyles({
   column6: {
     width: iconButtonSize * 2,
     display: 'inline-flex'
+  },
+  columns35: {
+    display: 'none'
   }
 });
 var LayerManagerWidth;
@@ -8351,24 +8677,18 @@ var widthToWidthClass = function widthToWidthClass(w) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var useStyles$F = makeStyles(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(_ref) {
   var mapId = _ref.mapId,
       _ref$source = _ref.source,
       source = _ref$source === void 0 ? 'app' : _ref$source;
   var dispatch = useDispatch();
-  var classes = useStyles$F();
   var currentActiveMapId = useSelector(function (store) {
     return getDialogMapId(store, 'layerSelect');
   });
@@ -8387,7 +8707,7 @@ var LayerSelectButtonConnect = function LayerSelectButtonConnect(_ref) {
     title: "Layer Select"
   }, /*#__PURE__*/React.createElement(IconButton, {
     onClick: openLayerSelectDialog,
-    className: classes.button,
+    sx: style$2,
     id: "layerSelectButton",
     "data-testid": "layerSelectButton",
     disableRipple: true,
@@ -8411,7 +8731,7 @@ var LayerSelectButtonConnect = function LayerSelectButtonConnect(_ref) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var useStyles$E = makeStyles({
+var useStyles$v = makeStyles({
   row: {
     height: '32px'
   },
@@ -8435,7 +8755,7 @@ var DescriptionRow = function DescriptionRow(_ref) {
       layerManagerWidth = _ref.layerManagerWidth,
       _ref$layerSelect = _ref.layerSelect,
       layerSelect = _ref$layerSelect === void 0 ? false : _ref$layerSelect;
-  var classes = useStyles$E();
+  var classes = useStyles$v();
   var columnSizes = layerManagerWidth === LayerManagerWidth.sm ? LayerManagerColumnsSmall() : LayerManagerColumnsLarge();
   return /*#__PURE__*/React.createElement(Grid, {
     container: true,
@@ -8512,23 +8832,23 @@ var useTooltipContainerStyles = makeStyles(function (theme) {
         borderColor: 'transparent!important'
       },
       '&:hover .MuiSelect-select': {
-        backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
+        backgroundColor: theme.palette.geowebColors.buttons.tool.mouseOver.fill
       },
       '&.Mui-focused .MuiSelect-select': {
         outline: theme.palette.geowebColors.buttons.focusDefault.outline,
-        backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
+        backgroundColor: theme.palette.geowebColors.buttons.tool.mouseOver.fill
       },
       '&:hover&.MuiButton-root': {
-        backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
+        backgroundColor: theme.palette.geowebColors.buttons.tool.mouseOver.fill
       },
       '&:focus&.MuiButton-root': {
         outline: theme.palette.geowebColors.buttons.focusDefault.outline,
-        backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
+        backgroundColor: theme.palette.geowebColors.buttons.tool.mouseOver.fill
       },
       '& .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': {
@@ -8643,7 +8963,7 @@ var DimensionSelect = function DimensionSelect(_ref) {
     }
   }, /*#__PURE__*/React.createElement(MenuItem, {
     disabled: true
-  }, "Select dimension"), layerDimensions.map(function (dimension) {
+  }, "Dimension"), layerDimensions.map(function (dimension) {
     return /*#__PURE__*/React.createElement(MenuItem, {
       key: dimension.name,
       value: dimension.name
@@ -8669,7 +8989,7 @@ var DimensionSelect = function DimensionSelect(_ref) {
     }
   }, /*#__PURE__*/React.createElement(MenuItem, {
     disabled: true
-  }, "Select dimension value. (", valuesToDisplay.length, " options)"), valuesToDisplay.map(function (dimValue) {
+  }, "Dimension value (", valuesToDisplay.length, " options)"), valuesToDisplay.map(function (dimValue) {
     return /*#__PURE__*/React.createElement(MenuItem, {
       key: dimValue,
       value: dimValue
@@ -8677,204 +8997,7 @@ var DimensionSelect = function DimensionSelect(_ref) {
   }))));
 };
 
-/* *
- * 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$D = makeStyles(function (theme) {
-  return createStyles({
-    button: {
-      height: 28,
-      width: 28,
-      borderRadius: 5,
-      marginTop: 2,
-      color: function color(_ref) {
-        var isActive = _ref.isActive,
-            isEnabled = _ref.isEnabled;
-        var _theme$palette$geoweb = theme.palette.geowebColors.layerManager,
-            tableRowDefaultIcon = _theme$palette$geoweb.tableRowDefaultIcon,
-            tableRowDisabledIcon = _theme$palette$geoweb.tableRowDisabledIcon;
-
-        if (!isEnabled) {
-          return tableRowDisabledIcon.fill;
-        }
-
-        if (isActive) {
-          return theme.palette.common.white;
-        }
-
-        return tableRowDefaultIcon.rgba;
-      },
-      backgroundColor: function backgroundColor(_ref2) {
-        var isActive = _ref2.isActive;
-        return isActive ? theme.palette.geowebColors.buttons.primary.active.fill : 'inherit';
-      },
-      '&:focus': {
-        backgroundColor: function backgroundColor(_ref3) {
-          var isActive = _ref3.isActive;
-          return isActive ? theme.palette.geowebColors.buttons.primary.mouseOver.fill : theme.palette.geowebColors.layerManager.tableRowMouseover.rgba;
-        },
-        outline: theme.palette.geowebColors.buttons.focusDefault.outline,
-        borderRadius: 0
-      },
-      '&:hover': {
-        backgroundColor: function backgroundColor(_ref4) {
-          var isActive = _ref4.isActive;
-          return isActive ? theme.palette.geowebColors.buttons.primary.mouseOver.fill : theme.palette.geowebColors.layerManager.tableRowMouseover.rgba;
-        }
-      }
-    },
-    popper: {
-      pointerEvents: 'none'
-    }
-  });
-});
-
-var LayerManagerButton = function LayerManagerButton(_a) {
-  var _a$tooltipTitle = _a.tooltipTitle,
-      tooltipTitle = _a$tooltipTitle === void 0 ? '' : _a$tooltipTitle,
-      _a$onClick = _a.onClick,
-      onClick = _a$onClick === void 0 ? function () {} : _a$onClick,
-      _a$isActive = _a.isActive,
-      isActive = _a$isActive === void 0 ? false : _a$isActive,
-      _a$isEnabled = _a.isEnabled,
-      isEnabled = _a$isEnabled === void 0 ? true : _a$isEnabled,
-      icon = _a.icon,
-      testId = _a.testId,
-      props = __rest(_a, ["tooltipTitle", "onClick", "isActive", "isEnabled", "icon", "testId"]);
-
-  var classes = useStyles$D({
-    isActive: isActive,
-    isEnabled: isEnabled
-  });
-
-  var handleClick = function handleClick(event) {
-    onClick(event);
-  };
-
-  return /*#__PURE__*/React.createElement(Tooltip, {
-    title: tooltipTitle,
-    placement: "top",
-    classes: {
-      popper: classes.popper
-    }
-  }, /*#__PURE__*/React.createElement(IconButton, Object.assign({
-    size: "small",
-    onClick: handleClick,
-    "data-testid": testId,
-    className: classes.button,
-    disableFocusRipple: true
-  }, props), icon));
-};
-
-/* *
- * 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$C = makeStyles(function (theme) {
-  return createStyles({
-    checkbox: {
-      color: 'inherit',
-      padding: 4,
-      borderRadius: 5,
-      '&.Mui-focusVisible': {
-        backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
-      },
-      '&:hover': {
-        backgroundColor: 'transparent!important'
-      },
-      '&.Mui-checked': {
-        color: 'inherit'
-      }
-    }
-  });
-});
-
-var EnableLayer = function EnableLayer(_ref) {
-  var isEnabled = _ref.isEnabled,
-      title = _ref.title,
-      onChangeEnableLayer = _ref.onChangeEnableLayer;
-  var classes = useStyles$C(isEnabled);
-
-  var onClick = function onClick() {
-    onChangeEnableLayer(!isEnabled);
-  };
-
-  var visibilityIcon = /*#__PURE__*/React.createElement(SvgIcon, null, /*#__PURE__*/React.createElement("rect", {
-    width: 24,
-    height: 24,
-    fill: "transparent"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M14.4980749,15.8618431 C15.8661433,15.0851043 16.779689,13.6936347 16.779689,12.1014551 C16.779689,10.5092755 15.8661433,9.11870594 14.4980749,8.34106705 C17.6257313,9.18620931 19.3529176,11.4300215 19.8092405,12.1014551 C19.3529176,12.7719886 17.6266313,15.0167008 14.4980749,15.8618431 L14.4980749,15.8618431 Z M4.18985949,12.1014551 C4.64618231,11.4300215 6.37336867,9.18710936 9.49922496,8.3419671 C8.13295665,9.11870594 7.21851093,10.5101755 7.21851093,12.1014551 C7.21851093,13.6936347 8.13295665,15.0842042 9.49922496,15.8618431 C6.37336867,15.0167008 4.64618231,12.7728886 4.18985949,12.1014551 L4.18985949,12.1014551 Z M11.99955,13.8583429 C10.9950998,13.8583429 10.180559,13.0717036 10.180559,12.1014551 C10.180559,11.1312066 10.9950998,10.3445672 11.99955,10.3445672 C13.0031002,10.3445672 13.8176409,11.1312066 13.8176409,12.1014551 C13.8176409,13.0717036 13.0031002,13.8583429 11.99955,13.8583429 L11.99955,13.8583429 Z M20.7983899,11.7666383 C20.6813841,11.5713286 17.8696435,7 11.99955,7 C6.12945647,7 3.31681584,11.5713286 3.19980999,11.7666383 L3,12.1014551 L3.19980999,12.4362718 C3.31681584,12.6306815 6.12945647,17.2020101 11.99955,17.2020101 C17.8696435,17.2020101 20.6813841,12.6306815 20.7983899,12.4362718 L21,12.1014551 L20.7983899,11.7666383 Z"
-  }));
-  var visibilityOffIcon = /*#__PURE__*/React.createElement(SvgIcon, {
-    style: {
-      marginTop: 2
-    }
-  }, /*#__PURE__*/React.createElement("rect", {
-    width: 24,
-    height: 24,
-    fill: "transparent"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M12 15.309c-.755 0-1.45-.088-2.092-.236l.798-.797c.41.124.844.192 1.294.192 2.453 0 4.442-1.988 4.442-4.44 0-.495-.085-.907-.234-1.255l.03-.03c1.72.906 2.781 2.167 3.218 2.766-.724.992-3.151 3.8-7.456 3.8zm-7.456-3.8c.442-.607 1.522-1.89 3.276-2.796-.166.36-.261.79-.261 1.315 0 1.228.499 2.34 1.305 3.144l-1.102 1.104c-1.72-.906-2.78-2.169-3.218-2.767zm5.646-3.524c.818 0 1.482.665 1.482 1.483 0 .818-.664 1.481-1.482 1.481s-1.482-.663-1.482-1.481c0-.818.664-1.483 1.482-1.483zm10.608 3.19c-.073-.125-1.245-2.026-3.603-3.388l2.009-2.01c.406-.406.406-1.065 0-1.473-.407-.405-1.066-.405-1.473 0l-2.58 2.582c-.93-.295-1.98-.478-3.151-.478-5.87 0-8.681 4.57-8.798 4.766L3 11.51l.202.335c.073.124 1.244 2.025 3.603 3.387l-2.009 2.01c-.406.406-.406 1.065 0 1.472.204.203.47.305.737.305.266 0 .532-.102.736-.305l2.58-2.58c.93.293 1.98.476 3.151.476 5.87 0 8.681-4.57 8.798-4.765l.202-.335-.202-.335z"
-  }));
-  return /*#__PURE__*/React.createElement(LayerManagerButton, {
-    tooltipTitle: title,
-    onClick: onClick,
-    icon: /*#__PURE__*/React.createElement(Checkbox, {
-      className: classes.checkbox,
-      icon: visibilityOffIcon,
-      checkedIcon: visibilityIcon,
-      checked: isEnabled,
-      disableFocusRipple: true,
-      tabIndex: -1
-    }),
-    testId: "enableLayer",
-    isEnabled: isEnabled
-  });
-};
-
-/* *
- * 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$B = makeStyles(function (theme) {
+var useStyles$u = makeStyles(function (theme) {
   return createStyles({
     dropdownEmpty: {
       paddingLeft: 8,
@@ -8890,6 +9013,33 @@ var useStyles$B = makeStyles(function (theme) {
   });
 });
 
+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: [].concat(_toConsumableArray(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(_ref) {
   var onChangeLayerName = _ref.onChangeLayerName,
       layerName = _ref.layerName,
@@ -8897,7 +9047,7 @@ var RenderLayers = function RenderLayers(_ref) {
       layers = _ref$layers === void 0 ? [] : _ref$layers,
       _ref$isEnabled = _ref.isEnabled,
       isEnabled = _ref$isEnabled === void 0 ? true : _ref$isEnabled;
-  var classes = useStyles$B();
+  var classes = useStyles$u();
   var containerClass = useTooltipContainerStyles(isEnabled);
 
   if (!layers || !layers.length) {
@@ -8909,24 +9059,21 @@ var RenderLayers = function RenderLayers(_ref) {
     }, "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 _getRenderLayersValue = getRenderLayersValues(layerName, layers),
+      currentIndex = _getRenderLayersValue.currentIndex,
+      currentValue = _getRenderLayersValue.currentValue,
+      extendedLayers = _getRenderLayersValue.extendedLayers;
+
+  var list = extendedLayers.map(function (layer) {
     return {
       value: layer.name
     };
   });
-  var currentIndex = layers.findIndex(function (layer) {
-    return currentValue === layer.name;
-  });
   return /*#__PURE__*/React.createElement(TooltipSelect, {
     disableUnderline: true,
     tooltip: "Select a layer",
@@ -8942,10 +9089,11 @@ var RenderLayers = function RenderLayers(_ref) {
     onChange: selectLayer,
     onChangeMouseWheel: function onChangeMouseWheel(e) {
       return onChangeLayerName(e.value);
-    }
+    },
+    requiresCtrlToChange: true
   }, /*#__PURE__*/React.createElement(MenuItem, {
     disabled: true
-  }, "Select layer"), layers.map(function (layerFromServiceLayers) {
+  }, "Layer"), extendedLayers.map(function (layerFromServiceLayers) {
     return /*#__PURE__*/React.createElement(MenuItem, {
       key: layerFromServiceLayers.name,
       value: layerFromServiceLayers.name,
@@ -8954,7 +9102,7 @@ var RenderLayers = function RenderLayers(_ref) {
   }));
 };
 
-var useStyles$A = makeStyles(function (theme) {
+var useStyles$t = makeStyles(function (theme) {
   return {
     opacityDiv: {
       height: 'calc(100% - 5px)',
@@ -8977,7 +9125,7 @@ var useStyles$A = makeStyles(function (theme) {
       position: 'fixed',
       top: '-5px',
       boxSizing: 'initial',
-      zIndex: 1,
+      zIndex: 2,
       boxShadow: theme.shadows[8]
     }
   };
@@ -9015,7 +9163,7 @@ var OpacitySelect = function OpacitySelect(_ref) {
       onLayerChangeOpacity = _ref.onLayerChangeOpacity,
       _ref$isEnabled = _ref.isEnabled,
       isEnabled = _ref$isEnabled === void 0 ? true : _ref$isEnabled;
-  var classes = useStyles$A();
+  var classes = useStyles$t();
   var sliderClasses = sliderStyles();
   var containerClass = useTooltipContainerStyles(isEnabled);
 
@@ -9043,11 +9191,17 @@ var OpacitySelect = function OpacitySelect(_ref) {
     });
   }, []);
   var onWheel = React.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 = 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);
+      });
+    } else enableScroll();
+  }, [currentOpacity, onLayerChangeOpacity, disableScroll, enableScroll]);
   var onClickButton = React.useCallback(function () {
     setOpen(!open);
   }, [open]);
@@ -9057,17 +9211,15 @@ var OpacitySelect = function OpacitySelect(_ref) {
     }
   }, [open]);
   var onMouseEnter = React.useCallback(function () {
-    disableScroll();
     if (!open) setTooltipOpen(true);
-  }, [open, disableScroll]);
+  }, [open]);
   var onMouseLeave = React.useCallback(function () {
     enableScroll();
     setTooltipOpen(false);
   }, [enableScroll]);
   var onFocus = React.useCallback(function () {
-    disableScroll();
     setTooltipOpen(true);
-  }, [disableScroll]);
+  }, []);
   var onBlur = React.useCallback(function () {
     enableScroll();
     setTooltipOpen(false);
@@ -9127,100 +9279,39 @@ var OpacitySelect = function OpacitySelect(_ref) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var useStyles$z = makeStyles(function (theme) {
-  return createStyles({
-    icon: {
-      minWidth: 32,
-      color: theme.palette.geowebColors.layerManager.tableRowDefaultIcon.rgba
-    },
-    text: {
-      fontSize: 16,
-      color: theme.palette.geowebColors.layerManager.tableRowDefaultText.rgba
-    }
-  });
-});
-
-var MenuItemButton = function MenuItemButton(_ref) {
-  var title = _ref.title,
-      tooltipTitle = _ref.tooltipTitle,
-      icon = _ref.icon;
-  var classes = useStyles$z();
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ListItemIcon, {
-    className: "".concat(classes.icon, " icon")
-  }, icon), /*#__PURE__*/React.createElement(Tooltip, {
-    title: tooltipTitle,
-    placement: "top"
-  }, /*#__PURE__*/React.createElement(Typography, {
-    className: classes.text,
-    variant: "inherit"
-  }, title)));
-};
-
-var useStyles$y = makeStyles(function (theme) {
-  return {
-    menu: {
-      backgroundColor: theme.palette.geowebColors.background.surface,
-      '& li:hover': {
-        backgroundColor: theme.palette.geowebColors.layerManager.tableRowMouseover.rgba
-      }
-    }
-  };
-});
+var CopyIcon = /*#__PURE__*/React.createElement(SvgIcon, null, /*#__PURE__*/React.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(_ref) {
-  var tooltipTitle = _ref.tooltipTitle,
-      mapId = _ref.mapId,
-      layerId = _ref.layerId,
-      onLayerDuplicate = _ref.onLayerDuplicate,
-      _ref$isEnabled = _ref.isEnabled,
-      isEnabled = _ref$isEnabled === void 0 ? true : _ref$isEnabled;
-  var classes = useStyles$y();
-
-  var _React$useState = React.useState(null),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      anchorEl = _React$useState2[0],
-      setAnchorEl = _React$useState2[1];
-
-  var handleClick = function handleClick(event) {
-    setAnchorEl(event.currentTarget);
-  };
-
-  var handleClose = function handleClose() {
-    setAnchorEl(null);
-  };
+  var mapId = _ref.mapId,
+      layerId = _ref.layerId,
+      onLayerDuplicate = _ref.onLayerDuplicate;
 
   var onClickDuplicate = function onClickDuplicate() {
     onLayerDuplicate({
       mapId: mapId,
       layerId: layerId
     });
-    handleClose();
   };
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LayerManagerButton, {
-    tooltipTitle: tooltipTitle,
-    onClick: handleClick,
-    icon: /*#__PURE__*/React.createElement(MoreVert, null),
-    testId: "openMenuButton",
-    isEnabled: isEnabled
-  }), /*#__PURE__*/React.createElement(Menu, {
-    anchorEl: anchorEl,
-    keepMounted: true,
-    open: Boolean(anchorEl),
-    onClose: handleClose,
-    PaperProps: {
-      className: classes.menu
-    }
-  }, /*#__PURE__*/React.createElement(MenuItem, {
-    "data-testid": "duplicateLayerButton",
-    onClick: onClickDuplicate
-  }, /*#__PURE__*/React.createElement(MenuItemButton, {
-    title: "Duplicate layer",
-    tooltipTitle: "Duplicate layer",
-    icon: /*#__PURE__*/React.createElement(FileCopy, {
-      fontSize: "small"
-    })
-  }))));
+  return /*#__PURE__*/React.createElement(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(_ref) {
@@ -9272,10 +9363,11 @@ var RenderStyles = function RenderStyles(_ref) {
     onChange: selectStyle,
     onChangeMouseWheel: function onChangeMouseWheel(e) {
       return onChangeLayerStyle(e.value);
-    }
+    },
+    requiresCtrlToChange: true
   }, /*#__PURE__*/React.createElement(MenuItem, {
     disabled: true
-  }, "Select style"), styles.map(function (styleFromlayer) {
+  }, "Style"), styles.map(function (styleFromlayer) {
     return /*#__PURE__*/React.createElement(MenuItem, {
       key: styleFromlayer.name,
       value: styleFromlayer.name
@@ -9299,72 +9391,22 @@ var RenderStyles = function RenderStyles(_ref) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var useStyles$x = makeStyles(function () {
-  return createStyles({
-    icon: {
-      width: 20,
-      height: 20
-    }
-  });
-});
-
-var DeleteButton = function DeleteButton(_ref) {
-  var tooltipTitle = _ref.tooltipTitle,
-      onClickDelete = _ref.onClickDelete,
-      _ref$isEnabled = _ref.isEnabled,
-      isEnabled = _ref$isEnabled === void 0 ? true : _ref$isEnabled;
-  var classes = useStyles$x();
-  return /*#__PURE__*/React.createElement(LayerManagerButton, {
-    tooltipTitle: tooltipTitle,
-    onClick: onClickDelete,
-    icon: /*#__PURE__*/React.createElement(Delete, {
-      className: classes.icon
-    }),
-    testId: "deleteButton",
-    isEnabled: isEnabled
-  });
-};
-
-/* *
- * 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$w = makeStyles(function (theme) {
+var useStyles$s = makeStyles(function (theme) {
   return createStyles({
-    icon: {
-      width: 18,
-      height: 18,
-      marginTop: 4
-    },
     svgIcon: {
       fill: function fill(_ref) {
         var isActive = _ref.isActive,
             isEnabled = _ref.isEnabled;
-        var _theme$palette$geoweb = theme.palette.geowebColors.layerManager,
-            tableRowDefaultIcon = _theme$palette$geoweb.tableRowDefaultIcon,
-            tableRowDisabledIcon = _theme$palette$geoweb.tableRowDisabledIcon;
 
         if (isActive) {
           return theme.palette.common.white;
         }
 
-        if (!isEnabled) {
-          return tableRowDisabledIcon.fill;
+        if (isEnabled) {
+          return theme.palette.geowebColors.buttons.flat["default"].color;
         }
 
-        return tableRowDefaultIcon.rgba;
+        return theme.palette.geowebColors.buttons.flat.disabled.color;
       }
     }
   });
@@ -9378,14 +9420,18 @@ var ActivateLayer = function ActivateLayer(_ref2) {
       isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
       _ref2$isEnabled = _ref2.isEnabled,
       isEnabled = _ref2$isEnabled === void 0 ? true : _ref2$isEnabled;
-  var classes = useStyles$w({
+  var classes = useStyles$s({
     isActive: isActive,
     isEnabled: isEnabled
   });
 
   var Icon = function Icon() {
     return /*#__PURE__*/React.createElement(SvgIcon, {
-      className: classes.icon
+      sx: {
+        width: '18px',
+        height: '18px',
+        marginTop: '4px'
+      }
     }, /*#__PURE__*/React.createElement("g", {
       id: "Concept-3",
       stroke: "none",
@@ -9402,7 +9448,7 @@ var ActivateLayer = function ActivateLayer(_ref2) {
     }))));
   };
 
-  return /*#__PURE__*/React.createElement(LayerManagerButton, {
+  return /*#__PURE__*/React.createElement(ManagerButton, {
     tooltipTitle: tooltipTitle,
     onClick: onClickActivate,
     icon: /*#__PURE__*/React.createElement(Icon, null),
@@ -9427,7 +9473,7 @@ var ActivateLayer = function ActivateLayer(_ref2) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var useStyles$v = makeStyles(function (theme) {
+var useStyles$r = makeStyles(function (theme) {
   return createStyles({
     row: {
       background: function background(isEnabled) {
@@ -9461,6 +9507,8 @@ var LayerRow = function LayerRow(_ref) {
   } : _ref$onLayerRowClick,
       _ref$isEnabled = _ref.isEnabled,
       isEnabled = _ref$isEnabled === void 0 ? true : _ref$isEnabled,
+      _ref$isLayerMissing = _ref.isLayerMissing,
+      isLayerMissing = _ref$isLayerMissing === void 0 ? false : _ref$isLayerMissing,
       onLayerEnable = _ref.onLayerEnable,
       onLayerChangeName = _ref.onLayerChangeName,
       onLayerChangeStyle = _ref.onLayerChangeStyle,
@@ -9478,7 +9526,7 @@ var LayerRow = function LayerRow(_ref) {
       layerActiveLayout = _ref.layerActiveLayout,
       layerManagerWidth = _ref.layerManagerWidth,
       dragHandle = _ref.dragHandle;
-  var classes = useStyles$v(isEnabled);
+  var classes = useStyles$r(isEnabled);
   var columnSizes = layerManagerWidth === LayerManagerWidth.sm ? LayerManagerColumnsSmall() : LayerManagerColumnsLarge();
 
   var onClickRow = function onClickRow() {
@@ -9493,7 +9541,7 @@ var LayerRow = function LayerRow(_ref) {
   }, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     className: columnSizes.column1
-  }, dragHandle, layerEnableLayout || /*#__PURE__*/React__default.createElement(EnableLayer, {
+  }, dragHandle, layerEnableLayout || /*#__PURE__*/React__default.createElement(EnableButton, {
     isEnabled: layer.enabled,
     title: layer.name,
     onChangeEnableLayer: function onChangeEnableLayer() {
@@ -9516,7 +9564,13 @@ var LayerRow = function LayerRow(_ref) {
         name: name
       });
     }
-  })), /*#__PURE__*/React__default.createElement(Grid, {
+  })), isLayerMissing ? /*#__PURE__*/React__default.createElement(Grid, {
+    item: true,
+    className: "".concat(columnSizes.columns35)
+  }, /*#__PURE__*/React__default.createElement(AlertBanner, {
+    title: "This layer could not be loaded: does not exist on the server.",
+    isCompact: true
+  })) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     className: "".concat(columnSizes.column3)
   }, layerStylesLayout || /*#__PURE__*/React__default.createElement(RenderStyles, {
@@ -9559,10 +9613,10 @@ var LayerRow = function LayerRow(_ref) {
         dimension: dimension
       });
     }
-  })), /*#__PURE__*/React__default.createElement(Grid, {
+  }))), /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     className: columnSizes.column6
-  }, layerDeleteLayout || /*#__PURE__*/React__default.createElement(DeleteButton, {
+  }, layerDeleteLayout || /*#__PURE__*/React__default.createElement(ManagerDeleteButton, {
     tooltipTitle: "Remove layer",
     onClickDelete: function onClickDelete() {
       onLayerDelete({
@@ -9571,7 +9625,6 @@ var LayerRow = function LayerRow(_ref) {
       });
     }
   }), layerMenuLayout || /*#__PURE__*/React__default.createElement(LayerManagerMenuButton, {
-    tooltipTitle: "Open Menu",
     mapId: mapId,
     layerId: layerId,
     onLayerDuplicate: onLayerDuplicate
@@ -9613,7 +9666,7 @@ var DeleteLayerConnect = function DeleteLayerConnect(_ref) {
   var isLayerEnabled = useSelector(function (store) {
     return getLayerEnabled(store, layerId);
   });
-  return /*#__PURE__*/React.createElement(DeleteButton, {
+  return /*#__PURE__*/React.createElement(ManagerDeleteButton, {
     tooltipTitle: "Remove layer",
     onClickDelete: function onClickDelete() {
       layerDelete$1({
@@ -9657,7 +9710,7 @@ var EnableLayerConnect = function EnableLayerConnect(_ref) {
       enabled: enabled
     }));
   }, [dispatch]);
-  return /*#__PURE__*/React.createElement(EnableLayer, {
+  return /*#__PURE__*/React.createElement(EnableButton, {
     isEnabled: isEnabled,
     title: "Toggle this layer's visibility",
     onChangeEnableLayer: function onChangeEnableLayer(enable) {
@@ -9899,11 +9952,7 @@ var LayerManagerMenuButtonConnect = function LayerManagerMenuButtonConnect(_ref)
       origin: 'MenuButtonConnect'
     }));
   }, [dispatch]);
-  var isLayerEnabled = useSelector(function (store) {
-    return getLayerEnabled(store, layerId);
-  });
   return /*#__PURE__*/React.createElement(LayerManagerMenuButton, {
-    tooltipTitle: "Open Menu",
     layerId: layerId,
     mapId: mapId,
     onLayerDuplicate: function onLayerDuplicate() {
@@ -9912,8 +9961,7 @@ var LayerManagerMenuButtonConnect = function LayerManagerMenuButtonConnect(_ref)
         mapId: mapId,
         layer: layer
       });
-    },
-    isEnabled: isLayerEnabled
+    }
   });
 };
 
@@ -10006,10 +10054,23 @@ var LayerRowConnect = function LayerRowConnect(_ref) {
   var isEnabled = useSelector(function (store) {
     return getLayerEnabled(store, layerId);
   });
+  var layerName = useSelector(function (store) {
+    return getLayerName(store, layerId);
+  });
+  var layerService = useSelector(function (store) {
+    return getLayerService(store, layerId);
+  });
+  var layers = useSelector(function (store) {
+    return getLayersFromService$1(store, layerService);
+  });
+  var isLayerMissing = layers && layers.length > 0 && !layers.some(function (l) {
+    return l.name === layerName;
+  });
   return /*#__PURE__*/React.createElement(LayerRow, {
     isEnabled: isEnabled,
     mapId: mapId,
     layerId: layerId,
+    isLayerMissing: isLayerMissing,
     layerEnableLayout: /*#__PURE__*/React.createElement(EnableLayerConnect, {
       layerId: layerId
     }),
@@ -10060,48 +10121,38 @@ var LayerRowConnect = function LayerRowConnect(_ref) {
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
 var TOOLTIP_TITLE = 'Drag a layer up or down';
-var useStyles$u = makeStyles(function (theme) {
-  return {
-    dragHandle: {
-      cursor: 'grab',
-      backgroundColor: 'inherit',
-      '&:hover': {
-        backgroundColor: 'inherit'
-      },
-      height: 32,
-      color: function color(_ref) {
-        var isDisabled = _ref.isDisabled;
-        return isDisabled ? theme.palette.geowebColors.layerManager.tableRowDefaultIcon.rgba : theme.palette.geowebColors.layerManager.tableRowDisabledIcon.fill;
-      }
-    }
-  };
-});
 
-var DragHandle = function DragHandle(_ref2) {
-  var _ref2$isDisabled = _ref2.isDisabled,
-      isDisabled = _ref2$isDisabled === void 0 ? false : _ref2$isDisabled,
-      _ref2$index = _ref2.index,
-      index = _ref2$index === void 0 ? undefined : _ref2$index,
-      _ref2$hideTooltip = _ref2.hideTooltip,
-      hideTooltip = _ref2$hideTooltip === void 0 ? false : _ref2$hideTooltip;
-  var classes = useStyles$u({
-    isDisabled: isDisabled
-  });
+var DragHandle = function DragHandle(_ref) {
+  var _ref$isDisabled = _ref.isDisabled,
+      isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
+      _ref$index = _ref.index,
+      index = _ref$index === void 0 ? undefined : _ref$index,
+      _ref$hideTooltip = _ref.hideTooltip,
+      hideTooltip = _ref$hideTooltip === void 0 ? false : _ref$hideTooltip;
   var tooltipTitle = hideTooltip ? '' : TOOLTIP_TITLE;
-  return /*#__PURE__*/React__default.createElement(LayerManagerButton, {
+  return /*#__PURE__*/React__default.createElement(ManagerButton, {
     tooltipTitle: tooltipTitle,
     icon: /*#__PURE__*/React__default.createElement(DragIndicator, null),
     testId: "dragHandle".concat(index !== undefined ? "-".concat(index) : ''),
-    className: "".concat(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'
+    }
   });
 };
 
-var useStyles$t = makeStyles(function () {
+var useStyles$q = makeStyles(function () {
   return {
     layerRows: {
       width: '100%',
@@ -10168,7 +10219,7 @@ var LayerContainerRow = function LayerContainerRow(_ref) {
 
   var isSorting = activeDragIndex !== null;
   var isDragDisabled = layerIds.length === 1;
-  var classes = useStyles$t(isSorting);
+  var classes = useStyles$q(isSorting);
   return /*#__PURE__*/React.createElement(Grid, {
     container: true,
     item: true,
@@ -10266,7 +10317,7 @@ var BaseLayers = function BaseLayers(_ref) {
     }
   }, /*#__PURE__*/React.createElement(MenuItem, {
     disabled: true
-  }, "Select base layer"), availableBaseLayers.map(function (baseLayer) {
+  }, "Base layer"), availableBaseLayers.map(function (baseLayer) {
     return /*#__PURE__*/React.createElement(MenuItem, {
       key: baseLayer.id,
       value: baseLayer.id
@@ -10378,7 +10429,7 @@ var BaseLayersConnect = function BaseLayersConnect(_ref) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var useStyles$s = makeStyles({
+var useStyles$p = makeStyles({
   layerRow: {
     width: '100%',
     height: '36px'
@@ -10401,7 +10452,7 @@ var BaseLayerRow = function BaseLayerRow(_ref) {
       layerManagerWidth = _ref.layerManagerWidth,
       _ref$tooltip = _ref.tooltip,
       tooltip = _ref$tooltip === void 0 ? '' : _ref$tooltip;
-  var classes = useStyles$s();
+  var classes = useStyles$p();
   var columnSizes = layerManagerWidth === LayerManagerWidth.sm ? LayerManagerColumnsSmall() : LayerManagerColumnsLarge();
   return /*#__PURE__*/React.createElement(Grid, {
     container: true,
@@ -10430,7 +10481,7 @@ var BaseLayerRow = function BaseLayerRow(_ref) {
   })));
 };
 
-var useStyles$r = makeStyles({
+var useStyles$o = makeStyles({
   layerRowContainer: {
     position: 'relative',
     width: '100%',
@@ -10465,7 +10516,7 @@ var LayerManager = function LayerManager(_ref) {
       layerSelect = _ref$layerSelect === void 0 ? false : _ref$layerSelect,
       _ref$showAddLayersToo = _ref.showAddLayersTooltip,
       showAddLayersTooltip = _ref$showAddLayersToo === void 0 ? true : _ref$showAddLayersToo;
-  var classes = useStyles$r();
+  var classes = useStyles$o();
 
   var _React$useState = React.useState(LayerManagerWidth.lg),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -10522,80 +10573,6 @@ var LayerManager = function LayerManager(_ref) {
   }))));
 };
 
-/* *
- * 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 _a$variant = _a.variant,
-      variant = _a$variant === void 0 ? 'primary' : _a$variant,
-      _a$value = _a.value,
-      value = _a$value === void 0 ? 0 : _a$value,
-      props = __rest(_a, ["variant", "value"]);
-
-  return /*#__PURE__*/React.createElement(ToggleButton, Object.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,
-      _a$width = _a.width,
-      width = _a$width === void 0 ? '24px' : _a$width,
-      _a$height = _a.height,
-      height = _a$height === void 0 ? '24px' : _a$height,
-      children = _a.children,
-      _a$value = _a.value,
-      value = _a$value === void 0 ? 0 : _a$value,
-      _a$sx = _a.sx,
-      sx = _a$sx === void 0 ? {} : _a$sx,
-      props = __rest(_a, ["active", "width", "height", "children", "value", "sx"]);
-
-  return /*#__PURE__*/React.createElement(CustomToggleButton, Object.assign({
-    variant: "tool",
-    disableRipple: true,
-    selected: active,
-    value: value,
-    sx: Object.assign({
-      width: "".concat(width, "!important"),
-      height: "".concat(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.
@@ -11177,13 +11154,6 @@ var ServicePopupConnect = function ServicePopupConnect(_ref) {
 var isURL = function isURL(string) {
   return /^https?:\/\//.test(string);
 };
-var useStyles$q = makeStyles(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.createElement(SvgIcon, {
   style: {
@@ -11216,7 +11186,6 @@ var SearchFieldButtonContainer = function SearchFieldButtonContainer(_ref) {
       isPopupOpen = _React$useState2[0],
       setPopupOpen = _React$useState2[1];
 
-  var classes = useStyles$q();
   React__default.useEffect(function () {
     if (isPopupOpen === false) {
       onClickClear();
@@ -11227,7 +11196,6 @@ var SearchFieldButtonContainer = function SearchFieldButtonContainer(_ref) {
     title: "Clear",
     placement: "top"
   }, /*#__PURE__*/React__default.createElement(IconButton, {
-    className: classes.iconButton,
     edge: "end",
     onClick: function onClick() {
       onClickClear();
@@ -11256,7 +11224,6 @@ var SearchFieldButtonContainer = function SearchFieldButtonContainer(_ref) {
     title: "Search",
     placement: "top"
   }, /*#__PURE__*/React__default.createElement(IconButton, {
-    className: classes.iconButton,
     edge: "end",
     size: "large"
   }, searchIcon));
@@ -11339,6 +11306,50 @@ var SearchFieldConnect = function SearchFieldConnect() {
   });
 };
 
+/* *
+ * 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(_ref) {
+  var layer = _ref.layer,
+      layerIndex = _ref.layerIndex,
+      serviceId = _ref.serviceId,
+      addLayer = _ref.addLayer,
+      deleteLayer = _ref.deleteLayer,
+      mapLayers = _ref.mapLayers;
+  var foundLayer = mapLayers.find(function (lr) {
+    return lr.name === layer.name && lr.service === serviceId;
+  });
+  return /*#__PURE__*/React.createElement(CustomToggleButton, {
+    "data-testid": "layerAddRemoveButton-".concat(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.
@@ -11377,35 +11388,35 @@ var filterLayersFromService = function filterLayersFromService(serviceId, servic
   });
 };
 
-var useStyles$p = makeStyles(function (theme) {
+var useStyles$n = makeStyles(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 ".concat(theme.palette.geowebColors.cards.cardContainerBorder)
+      border: "solid 1px ".concat(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',
@@ -11416,6 +11427,11 @@ var useStyles$p = makeStyles(function (theme) {
     resultCount: {
       marginBottom: '4px',
       fontSize: '12px'
+    },
+    layerButton: {
+      marginRight: '8px',
+      marginTop: '4px',
+      width: '80px'
     }
   };
 });
@@ -11424,10 +11440,13 @@ var LayerList = function LayerList(_ref) {
   var services = _ref.services,
       serviceIds = _ref.serviceIds,
       layerSelectHeight = _ref.layerSelectHeight,
+      addLayer = _ref.addLayer,
+      deleteLayer = _ref.deleteLayer,
       searchString = _ref.searchString,
+      mapLayers = _ref.mapLayers,
       keywordIds = _ref.keywordIds,
       allKeywordsActive = _ref.allKeywordsActive;
-  var classes = useStyles$p();
+  var classes = useStyles$n();
 
   var _React$useState = React.useState(0),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -11449,12 +11468,14 @@ var LayerList = function LayerList(_ref) {
       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.createElement("div", {
+        key: "".concat(serviceId, "-").concat(layer.name, "-").concat(layer.text)
+      }, /*#__PURE__*/React.createElement("div", {
         key: "".concat(serviceId, "-").concat(layer.name),
         className: classes.layerRow,
         "data-testid": "layerListLayerRow"
-      }, /*#__PURE__*/React.createElement("div", {
+      }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
         className: classes.layerText
       }, layer.text), /*#__PURE__*/React.createElement("div", null, layer["abstract"] ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: "".concat(classes.layerName, " ").concat(classes.layerNameMaxWidth)
@@ -11463,7 +11484,16 @@ var LayerList = function LayerList(_ref) {
         "data-testid": "layerAbstract"
       }, layer["abstract"])) : /*#__PURE__*/React.createElement("div", {
         className: classes.layerName
-      }, layer.name)));
+      }, layer.name))), /*#__PURE__*/React.createElement("div", {
+        className: classes.layerButton
+      }, /*#__PURE__*/React.createElement(LayerAddRemoveButton, {
+        layer: layer,
+        layerIndex: layerIndex,
+        serviceId: serviceId,
+        addLayer: addLayer,
+        deleteLayer: deleteLayer,
+        mapLayers: mapLayers
+      }))));
     });
   })));
 };
@@ -11486,13 +11516,57 @@ var LayerList = function LayerList(_ref) {
  * */
 
 var LayerListConnect = function LayerListConnect(_ref) {
-  var layerSelectHeight = _ref.layerSelectHeight;
+  var mapId = _ref.mapId,
+      layerSelectHeight = _ref.layerSelectHeight;
   var services = useSelector(function (store) {
     return getServices(store);
   });
+  var dispatch = useDispatch();
   var enabledServiceIds = useSelector(function (store) {
     return getEnabledServiceIds(store);
   });
+  var mapLayers = useSelector(function (store) {
+    return getMapLayers(store, mapId);
+  });
+
+  var addLayer$1 = function addLayer(_ref2) {
+    var serviceURL = _ref2.serviceURL,
+        layerName = _ref2.layerName;
+    var layer = {
+      service: serviceURL,
+      name: layerName,
+      id: generateLayerId(),
+      layerType: LayerType$1.mapLayer
+    };
+    addMapLayer({
+      mapId: mapId,
+      layerId: layer.id,
+      layer: layer,
+      origin: 'LayerListConnect'
+    });
+  };
+
+  var addMapLayer = React.useCallback(function (_ref3) {
+    var layerId = _ref3.layerId,
+        layer = _ref3.layer,
+        origin = _ref3.origin;
+    return dispatch(addLayer({
+      mapId: mapId,
+      layerId: layerId,
+      layer: layer,
+      origin: origin
+    }));
+  }, [dispatch, mapId]);
+  var deleteLayer = React.useCallback(function (_ref4) {
+    var layerId = _ref4.layerId,
+        layerIndex = _ref4.layerIndex;
+    return dispatch(layerDelete({
+      mapId: mapId,
+      layerId: layerId,
+      layerIndex: layerIndex,
+      origin: 'LayerListConnect'
+    }));
+  }, [dispatch, mapId]);
   var checkedKeywordIds = useSelector(function (store) {
     return getCheckedKeywordIds(store);
   });
@@ -11506,9 +11580,12 @@ var LayerListConnect = function LayerListConnect(_ref) {
     services: services,
     serviceIds: enabledServiceIds,
     layerSelectHeight: layerSelectHeight,
+    addLayer: addLayer$1,
+    deleteLayer: deleteLayer,
     keywordIds: checkedKeywordIds,
     allKeywordsActive: allKeywordsActive,
-    searchString: searchString
+    searchString: searchString,
+    mapLayers: mapLayers
   });
 };
 
@@ -11624,7 +11701,7 @@ var ServiceChipConnect = function ServiceChipConnect(_ref) {
   });
 };
 
-var useStyles$o = makeStyles(function (theme) {
+var useStyles$m = makeStyles(function (theme) {
   return createStyles({
     serviceChips: {
       width: '100%',
@@ -11648,7 +11725,7 @@ var useStyles$o = makeStyles(function (theme) {
       fontSize: '0.875rem'
     },
     scrollArrowLeft: {
-      width: '120px',
+      width: '100px',
       marginBottom: '-12px',
       height: '34px',
       backgroundImage: "linear-gradient(to left, rgba(0, 0, 0, 0), ".concat(theme.palette.geowebColors.background.surfaceApp, " 51%)"),
@@ -11656,7 +11733,10 @@ var useStyles$o = makeStyles(function (theme) {
       marginRight: '-120px',
       "float": 'left',
       zIndex: 1,
-      position: 'relative'
+      position: 'relative',
+      '&:hover': {
+        color: theme.palette.geowebColors.buttons.tertiary.activeMouseOver.color
+      }
     },
     serviceList: {
       height: '32px',
@@ -11665,13 +11745,16 @@ var useStyles$o = makeStyles(function (theme) {
       overflow: 'hidden'
     },
     scrollArrowRight: {
-      width: '120px',
+      width: '100px',
       marginBottom: '-12px',
       height: '34px',
       backgroundImage: "linear-gradient(to right, rgba(0, 0, 0, 0), ".concat(theme.palette.geowebColors.background.surfaceApp, " 51%)"),
       right: '0px',
       position: 'fixed',
-      cursor: 'pointer'
+      cursor: 'pointer',
+      '&:hover': {
+        color: theme.palette.geowebColors.buttons.tertiary.activeMouseOver.color
+      }
     }
   });
 });
@@ -11699,7 +11782,7 @@ var ServiceList = function ServiceList(_ref4) {
   var ref = React.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$m({
     margin: margin,
     maxWidthValue: maxWidthValue
   });
@@ -11813,63 +11896,49 @@ var ServiceListConnect = function ServiceListConnect(_ref) {
   });
 };
 
-var useStyles$n = makeStyles(function (theme) {
-  return createStyles({
-    servicesContainer: {
-      width: '300px',
-      maxHeight: '380px',
-      top: '140px',
-      backgroundColor: theme.palette.geowebColors.background.surface,
-      boxShadow: theme.shadows[6],
-      overflow: 'auto'
-    },
-    header: {
-      position: 'sticky',
-      top: 0,
-      fontSize: theme.typography.fontSize,
-      padding: '12px',
-      backgroundColor: theme.palette.geowebColors.background.surface,
-      zIndex: 100
-    },
-    footer: {
-      display: 'flex',
-      justifyContent: 'center',
-      alignItems: 'center',
-      position: 'sticky',
-      bottom: 0,
-      backgroundColor: theme.palette.geowebColors.background.surface,
-      zIndex: 100
-    },
-    iconFill: {
-      color: theme.palette.geowebColors.typographyAndIcons.icon
-    },
-    button: {
-      margin: '16px',
-      width: '80%',
-      fontSize: '12px',
-      textTransform: 'none'
-    },
-    text: {
-      paddingTop: '3px',
-      fontSize: '12px',
-      fontFamily: theme.typography.fontFamily,
-      fontWeight: theme.typography.fontWeightRegular,
-      textTransform: 'none',
-      color: '#575f7a'
-    },
-    icon: {
-      width: '24px',
-      height: '24px'
-    }
-  });
-});
+var styles = {
+  servicesContainer: {
+    width: '300px',
+    maxHeight: '380px',
+    top: '140px',
+    backgroundColor: 'geowebColors.background.surface',
+    boxShadow: 6,
+    overflow: 'auto'
+  },
+  header: {
+    position: 'sticky',
+    top: 0,
+    fontSize: 'default',
+    padding: '12px',
+    backgroundColor: 'geowebColors.background.surface',
+    zIndex: 100
+  },
+  footer: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    position: 'sticky',
+    bottom: 0,
+    backgroundColor: 'geowebColors.background.surface',
+    zIndex: 100
+  },
+  button: {
+    margin: '16px',
+    width: '80%',
+    fontSize: '12px',
+    textTransform: 'none'
+  },
+  icon: {
+    width: '24px',
+    height: '24px'
+  }
+};
 
 var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
   var services = _ref.services,
       mapStoreRemoveService = _ref.mapStoreRemoveService,
       _ref$layers = _ref.layers,
       layers = _ref$layers === void 0 ? [] : _ref$layers;
-  var classes = useStyles$n();
 
   var _React$useState = React.useState(false),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -11887,15 +11956,17 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
   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);
     });
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Box, {
-    className: classes.servicesContainer,
+    sx: styles.servicesContainer,
     "data-testid": "ServiceDialog"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classes.header
-  }, " Services"), /*#__PURE__*/React.createElement(List, {
+  }, /*#__PURE__*/React.createElement(Box, {
+    sx: styles.header
+  }, "Services"), /*#__PURE__*/React.createElement(List, {
     disablePadding: true
   }, services.map(function (service) {
     return /*#__PURE__*/React.createElement(ListItem, {
@@ -11916,14 +11987,14 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
       }
     }, /*#__PURE__*/React.createElement(Tooltip, {
       title: "Edit Service"
-    }, /*#__PURE__*/React.createElement(IconButton, {
+    }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(IconButton, {
+      disabled: isDisabled(service.service),
       "data-testid": "openEditServiceButton",
       size: "large"
     }, /*#__PURE__*/React.createElement(SvgIcon, null, /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.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.createElement(Tooltip, {
+    })))))), /*#__PURE__*/React.createElement(Tooltip, {
       title: "Delete Service"
     }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(IconButton, {
       size: "large",
@@ -11934,18 +12005,17 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
       "data-testid": "removeServiceButton"
     }, /*#__PURE__*/React.createElement(SvgIcon, null, /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("path", {
       d: "M17.504 8.228c.588 0 1.027.48.973 1.066l-.876 9.64A1.197 1.197 0 0 1 16.434 20H8.41c-.59 0-1.115-.48-1.167-1.066l-.877-9.64a.962.962 0 0 1 .973-1.066zm-2.115 1.228a.82.82 0 0 0-.819.82v7.674a.818.818 0 0 0 1.638 0v-7.675a.819.819 0 0 0-.819-.819zm-2.968 0a.819.819 0 0 0-.819.82v7.674a.818.818 0 1 0 1.638 0v-7.675a.82.82 0 0 0-.82-.819zm-2.968 0a.819.819 0 0 0-.818.82v7.674a.818.818 0 1 0 1.637 0v-7.675a.82.82 0 0 0-.82-.819zM13.432 4c.21 0 .404.168.436.376l.107.758 3.256-.01a1.606 1.606 0 0 1 1.61 1.6l.001.535-12.841.038L6 6.76a1.605 1.605 0 0 1 1.6-1.61l3.262-.008.103-.758a.454.454 0 0 1 .434-.38z",
-      fill: classes.iconFill,
       fillRule: "evenodd"
     }))))))));
-  })), /*#__PURE__*/React.createElement("div", {
-    className: classes.footer
+  })), /*#__PURE__*/React.createElement(Box, {
+    sx: styles.footer
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: openAddService,
     "data-testid": "openAddServiceButton",
-    className: classes.button,
+    sx: styles.button,
     variant: "tertiary",
     startIcon: /*#__PURE__*/React.createElement(SvgIcon, {
-      className: classes.icon
+      sx: styles.icon
     }, /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("path", {
       d: "M13.647 13.647h6.82a1.276 1.276 0 1 0 0-2.552h-6.82v-6.82a1.276 1.276 0 1 0-2.552 0v6.82h-6.82a1.276 1.276 0 1 0 0 2.552h6.82v6.82a1.274 1.274 0 0 0 1.276 1.275c.705 0 1.276-.571 1.276-1.276v-6.82z",
       fillRule: "evenodd"
@@ -11994,49 +12064,28 @@ var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect() {
   });
 };
 
-var useStyles$m = makeStyles(function (theme) {
-  return createStyles({
-    servicesContainer: {
-      position: 'fixed',
-      top: '140px',
-      right: '-72px',
-      backgroundColor: theme.palette.geowebColors.background.surface,
-      boxShadow: theme.shadows[6]
-    },
-    servicesText: {
-      paddingTop: '12px',
-      paddingLeft: '12px'
-    }
-  });
-});
+/* *
+ * 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 ServiceOptionsButton = function ServiceOptionsButton() {
-  var classes = useStyles$m();
-
-  var _React$useState = React.useState(false),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      containerOpen = _React$useState2[0],
-      setContainerOpen = _React$useState2[1];
-
-  var toggleContainer = function toggleContainer() {
-    setContainerOpen(!containerOpen);
-  };
-
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ToolButton, {
-    onClick: toggleContainer,
-    active: containerOpen,
-    "data-testid": "serviceOptionsButton",
-    variant: "tool"
-  }, /*#__PURE__*/React.createElement(SvgIcon, {
-    viewBox: "0 0 24 24",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.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.createElement(Box, {
-    className: classes.servicesContainer,
-    "data-testid": "ServiceOptionsDialogContainer"
-  }, /*#__PURE__*/React.createElement(ServiceOptionsDialogConnect, null)) : null);
+  return /*#__PURE__*/React.createElement(ToggleMenu, {
+    buttonTestId: "serviceOptionsButton",
+    menuPosition: "bottom"
+  }, /*#__PURE__*/React.createElement(ServiceOptionsDialogConnect, null));
 };
 
 var useStyles$l = makeStyles({
@@ -12129,6 +12178,7 @@ var LayerSelect = function LayerSelect(_ref) {
   })), /*#__PURE__*/React.createElement("div", {
     className: classes.layerSelectContainer
   }, /*#__PURE__*/React.createElement(LayerListConnect, {
+    mapId: mapId,
     layerSelectHeight: height
   })));
 };
@@ -14965,13 +15015,15 @@ var isColorIntervalEven = function isColorIntervalEven(scale, timestep) {
   }
 };
 
-var drawBackground = function drawBackground(context, theme, visibleTimeStart, visibleTimeEnd, canvasWidth, height, scale) {
+var drawBackground = function drawBackground(context, theme, visibleTimeStart, visibleTimeEnd, animationStartPx, animationEndPx, canvasWidth, height, scale) {
   var ctx = context;
   var _theme$palette$geoweb7 = theme.palette.geowebColors.timeSlider,
       timelineTimelineSurface = _theme$palette$geoweb7.timelineTimelineSurface,
       timelineNightTime = _theme$palette$geoweb7.timelineNightTime;
   ctx.fillStyle = timelineTimelineSurface.fill;
   ctx.fillRect(0, 0, canvasWidth, height);
+  ctx.fillStyle = theme.palette.geowebColors.timeSlider.timelineSelectionBackground.rgba;
+  ctx.fillRect(animationStartPx, 0, Math.max(animationEndPx - animationStartPx, 0), height);
   var colorChangeUnit = getColorChangeTimestepUnit(scale);
 
   var _getCustomRoundedStar = getCustomRoundedStartAndEnd(visibleTimeStart, visibleTimeEnd, colorChangeUnit),
@@ -15070,7 +15122,7 @@ var drawTimeScale = function drawTimeScale(context, theme, visibleTimeStart, vis
   drawLeftSideDateText(ctx, theme, dateText, height);
 };
 
-var renderTimeSliderLegend = function renderTimeSliderLegend(context, theme, canvasWidth, height, centerTime, secondsPerPx, dataScaleToSecondsPerPx, selectedTimeUnix, scale, currentTimeUnix) {
+var renderTimeSliderLegend = function renderTimeSliderLegend(context, theme, canvasWidth, height, centerTime, secondsPerPx, dataScaleToSecondsPerPx, selectedTimeUnix, scale, currentTimeUnix, animationStartTime, animationEndTime) {
   var ctx = context;
 
   var _map3 = [0, canvasWidth].map(function (px) {
@@ -15080,7 +15132,14 @@ var renderTimeSliderLegend = function renderTimeSliderLegend(context, theme, can
       visibleTimeStart = _map4[0],
       visibleTimeEnd = _map4[1];
 
-  drawBackground(ctx, theme, visibleTimeStart, visibleTimeEnd, canvasWidth, height, scale);
+  var _map5 = [animationStartTime, animationEndTime].map(function (time) {
+    return timestampToPixel(time, centerTime, canvasWidth, secondsPerPx);
+  }),
+      _map6 = _slicedToArray(_map5, 2),
+      animationStartPx = _map6[0],
+      animationEndPx = _map6[1];
+
+  drawBackground(ctx, theme, visibleTimeStart, visibleTimeEnd, animationStartPx, animationEndPx, canvasWidth, height, scale);
   drawTimeScale(ctx, theme, visibleTimeStart, visibleTimeEnd, canvasWidth, height, scale, dataScaleToSecondsPerPx);
   drawNeedle(ctx, theme, canvasWidth, height, visibleTimeStart, visibleTimeEnd, selectedTimeUnix);
   drawCurrentTime(ctx, theme, canvasWidth, height, visibleTimeStart, visibleTimeEnd, currentTimeUnix);
@@ -15483,6 +15542,12 @@ var getNextSecondsPerPxValue = function getNextSecondsPerPxValue(direction, oldS
 
 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(_ref) {
   var centerTime = _ref.centerTime,
@@ -15495,6 +15560,8 @@ var TimeSliderLegend = function TimeSliderLegend(_ref) {
       currentTime = _ref.currentTime,
       dataStartTime = _ref.dataStartTime,
       dataEndTime = _ref.dataEndTime,
+      animationStartTime = _ref.animationStartTime,
+      animationEndTime = _ref.animationEndTime,
       isTimeSliderHoverOn = _ref.isTimeSliderHoverOn,
       timeStep = _ref.timeStep,
       onSetNewDate = _ref.onSetNewDate,
@@ -15522,6 +15589,20 @@ var TimeSliderLegend = function TimeSliderLegend(_ref) {
       isNewSelectionTimeRequested = _React$useState6[0],
       setNewSelectionTimeRequested = _React$useState6[1];
 
+  var _React$useState7 = React.useState(animationStartTime && moment.utc(animationStartTime).unix()),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      localAnimationStartTime = _React$useState8[0],
+      setLocalAnimationStartTime = _React$useState8[1];
+
+  var _React$useState9 = React.useState(animationEndTime && moment.utc(animationEndTime).unix()),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      localAnimationEndTime = _React$useState10[0],
+      setLocalAnimationEndTime = _React$useState10[1];
+
+  React.useEffect(function () {
+    setLocalAnimationStartTime(animationStartTime && moment.utc(animationStartTime).unix());
+    setLocalAnimationEndTime(animationEndTime && moment.utc(animationEndTime).unix());
+  }, [animationStartTime, animationEndTime]);
   React.useEffect(function () {
     var handleKeyDown = function handleKeyDown(event) {
       if (event.key === 'Home') {
@@ -15551,7 +15632,21 @@ var TimeSliderLegend = function TimeSliderLegend(_ref) {
     setNewRoundedTime(x, centerTime, width, secondsPerPx, timeStep, dataStartTime, dataEndTime, onSetNewDate);
   };
 
-  var theme = useTheme();
+  var theme = useTheme(); // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  var throttledZoom = React.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.createElement("div", {
     className: classes.timeSliderLegend,
     "data-testid": "timeSliderLegend"
@@ -15583,12 +15678,7 @@ var TimeSliderLegend = function TimeSliderLegend(_ref) {
           deltaX = _ref2.deltaX,
           canvasWidth = _ref2.canvasWidth,
           mouseX = _ref2.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);
@@ -15610,7 +15700,7 @@ var TimeSliderLegend = function TimeSliderLegend(_ref) {
       }
     },
     onRenderCanvas: function onRenderCanvas(ctx, width, height) {
-      renderTimeSliderLegend(ctx, theme, width, height, centerTime, secondsPerPx, dataScaleToSecondsPerPx, selectedTime, scale, currentTime);
+      renderTimeSliderLegend(ctx, theme, width, height, centerTime, secondsPerPx, dataScaleToSecondsPerPx, selectedTime, scale, currentTime, localAnimationStartTime, localAnimationEndTime);
     }
   }));
 };
@@ -15902,6 +15992,9 @@ var drawPlayerLoopIcon = function drawPlayerLoopIcon(ctx, x, y, theme) {
   var svgIconPath = new Path2D('M8.843 1.029c-.56 0-.814.362-.814.699 0 .179.065.36.19.54l3.06 4.34c.065.093.14.171.221.234v8.373c-.082.064-.156.142-.22.234L8.219 19.79c-.125.18-.19.361-.19.54 0 .337.255.699.814.699h6.373c.56 0 .813-.361.813-.7 0-.178-.064-.36-.19-.538l-3.06-4.343c-.08-.112-.174-.204-.278-.273V6.883c.104-.069.199-.16.278-.273l3.06-4.343c.126-.179.19-.36.19-.539 0-.338-.254-.7-.813-.7z');
   ctx.fillStyle = playerTimeMarkers.fill;
   ctx.fill(svgIconPath);
+  ctx.strokeStyle = theme.palette.geowebColors.timeSlider.playerNeedlePlayer.rgba;
+  ctx.lineWidth = 1;
+  ctx.stroke(svgIconPath);
   ctx.restore();
 };
 
@@ -16678,10 +16771,10 @@ var OptionsMenuButtonConnect = function OptionsMenuButtonConnect(_ref) {
 var animationIntervalDefault = 5;
 var connectRedux$3 = connect(function (store, props) {
   return {
-    isAnimating: isAnimating(store, props.mapId),
     animationStartTime: getAnimationStartTime(store, props.mapId),
     animationEndTime: getAnimationEndTime(store, props.mapId),
-    timeStep: getMapTimeStep(store, props.mapId)
+    timeStep: getMapTimeStep(store, props.mapId),
+    linkedMapAnimationInfo: linkedMapAnimationInfo(store, props.mapId)
   };
 }, {
   mapStartAnimation: mapStartAnimation,
@@ -16689,19 +16782,19 @@ var connectRedux$3 = connect(function (store, props) {
 });
 var PlayButtonConnect = connectRedux$3(function (_ref) {
   var mapId = _ref.mapId,
-      isAnimating = _ref.isAnimating,
       animationStartTime = _ref.animationStartTime,
       animationEndTime = _ref.animationEndTime,
       isDisabled = _ref.isDisabled,
       timeStep = _ref.timeStep,
+      linkedMapAnimationInfo = _ref.linkedMapAnimationInfo,
       mapStartAnimation = _ref.mapStartAnimation,
       mapStopAnimation = _ref.mapStopAnimation;
   var animationInterval = timeStep || animationIntervalDefault;
 
   var onTogglePlay = function onTogglePlay() {
-    if (isAnimating) {
+    if (linkedMapAnimationInfo.isAnimating) {
       mapStopAnimation({
-        mapId: mapId
+        mapId: linkedMapAnimationInfo.id
       });
     } else {
       mapStartAnimation({
@@ -16714,7 +16807,7 @@ var PlayButtonConnect = connectRedux$3(function (_ref) {
   };
 
   return /*#__PURE__*/React__default.createElement(PlayButton, {
-    isAnimating: isAnimating,
+    isAnimating: linkedMapAnimationInfo.isAnimating,
     isDisabled: isDisabled,
     onTogglePlayButton: function onTogglePlayButton() {
       onTogglePlay();
@@ -16771,52 +16864,6 @@ var TimeSliderButtonsConnect = function TimeSliderButtonsConnect(_ref) {
   });
 };
 
-/* *
- * 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 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2020 - Finnish Meteorological Institute (FMI)
- * */
-
-var synchronizationGroupStore = function synchronizationGroupStore(store) {
-  return store && store.syncronizationGroupStore ? store.syncronizationGroupStore : null;
-};
-
-var getSynchronizationGroupStore = createSelector(synchronizationGroupStore, function (store) {
-  return store;
-});
-/**
- * Returns the synchronization source by id
- * @param store The app store
- * @param id The source id to find
- */
-
-var getSyncSourceBySourceId = function getSyncSourceBySourceId(state, id) {
-  if (state && state.sources) {
-    var sources = state.sources;
-
-    if (sources.byId[id]) {
-      return sources.byId[id];
-    }
-  }
-
-  return null;
-};
-
-var getTime = createSelector(getSyncSourceBySourceId, function (store) {
-  return store && store.payloadByType && store.payloadByType[SYNCGROUPS_TYPE_SETTIME] ? store.payloadByType[SYNCGROUPS_TYPE_SETTIME].value : null;
-});
-
 var connectRedux$2 = connect(function (store, props) {
   return {
     layers: getMapLayers(store, props.mapId),
@@ -16828,7 +16875,9 @@ var connectRedux$2 = connect(function (store, props) {
     isAnimating: isAnimating(store, props.mapId),
     timeStep: getMapTimeStep(store, props.mapId),
     isTimeSliderHoverOn: isTimeSliderHoverOn(store, props.mapId),
-    timeValue: getTime(getSynchronizationGroupStore(store), props.sourceId)
+    timeValue: getTime(getSynchronizationGroupStore(store), props.sourceId),
+    animationStartTime: getAnimationStartTime(store, props.mapId),
+    animationEndTime: getAnimationEndTime(store, props.mapId)
   };
 }, {
   stopMapAnimation: mapStopAnimation,
@@ -16851,6 +16900,8 @@ var TimeSliderLegendConnect = function TimeSliderLegendConnect(_ref) {
       isAnimating = _ref.isAnimating,
       timeStep = _ref.timeStep,
       isTimeSliderHoverOn = _ref.isTimeSliderHoverOn,
+      animationStartTime = _ref.animationStartTime,
+      animationEndTime = _ref.animationEndTime,
       stopMapAnimation = _ref.stopMapAnimation,
       setTime = _ref.setTime,
       syncGroupAddSource = _ref.syncGroupAddSource,
@@ -16889,6 +16940,8 @@ var TimeSliderLegendConnect = function TimeSliderLegendConnect(_ref) {
     isTimeSliderHoverOn: isTimeSliderHoverOn,
     dataStartTime: dataStartTime,
     dataEndTime: dataEndTime,
+    animationStartTime: animationStartTime,
+    animationEndTime: animationEndTime,
     timeStep: timeStep,
     onSetNewDate: function onSetNewDate(newDate) {
       if (isAnimating) {
@@ -17312,7 +17365,7 @@ var eumetviewEUMETSAT = {
 };
 var ECMWFPublicService = {
   name: 'ECMWF',
-  url: 'https://apps.ecmwf.int/wms/?token=public',
+  url: 'https://eccharts.ecmwf.int/wms/?token=public',
   id: 'ecmwf'
 };
 var MeteoCanada = {
@@ -20742,6 +20795,14 @@ var ReactMapView = /*#__PURE__*/function (_React$Component) {
           });
         }
       }
+      /* Set disable map pin */
+
+
+      if (!prevProps || prevProps.disableMapPin !== props.disableMapPin) {
+        if (!(props.disableMapPin === undefined)) {
+          this.adaguc.webMapJS.getMapPin().toggleDisableMapPin();
+        }
+      }
       /* Change the animation delay */
 
 
@@ -21410,6 +21471,9 @@ var MapViewConnect = function MapViewConnect(_a) {
   var mapPinLocation = useSelector(function (store) {
     return getPinLocation(store, mapId);
   });
+  var disableMapPin = useSelector(function (store) {
+    return getDisableMapPin(store, mapId);
+  });
   var dispatch = useDispatch();
   var map = getWMJSMapById(mapId);
   var mapChangeDimension$1 = React.useCallback(function (mapDimensionPayload) {
@@ -21481,6 +21545,7 @@ var MapViewConnect = function MapViewConnect(_a) {
     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({
@@ -22086,7 +22151,9 @@ var ConfigurableConnectedMap = function ConfigurableConnectedMap(_ref) {
       _ref$shouldShowZoomCo = _ref.shouldShowZoomControls,
       shouldShowZoomControls = _ref$shouldShowZoomCo === void 0 ? false : _ref$shouldShowZoomCo,
       _ref$displayMapPin = _ref.displayMapPin,
-      displayMapPin = _ref$displayMapPin === void 0 ? false : _ref$displayMapPin;
+      displayMapPin = _ref$displayMapPin === void 0 ? false : _ref$displayMapPin,
+      toggleTimestepAuto$1 = _ref.toggleTimestepAuto,
+      setTimestep = _ref.setTimestep;
   var classes = useStyles$4();
   var dispatch = useDispatch();
   var mapId = React__default.useRef(id || generateMapId()).current;
@@ -22155,6 +22222,22 @@ var ConfigurableConnectedMap = function ConfigurableConnectedMap(_ref) {
           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
 
   }, []);
@@ -22501,7 +22584,11 @@ var ConfigurableMapWithSliderConnect = function ConfigurableMapWithSliderConnect
       _ref$animationPayload = _ref.animationPayload,
       animationPayload = _ref$animationPayload === void 0 ? undefined : _ref$animationPayload,
       _ref$displayMapPin = _ref.displayMapPin,
-      displayMapPin = _ref$displayMapPin === void 0 ? false : _ref$displayMapPin;
+      displayMapPin = _ref$displayMapPin === void 0 ? false : _ref$displayMapPin,
+      _ref$showTimeSlider = _ref.showTimeSlider,
+      showTimeSlider = _ref$showTimeSlider === void 0 ? true : _ref$showTimeSlider,
+      toggleTimestepAuto = _ref.toggleTimestepAuto,
+      setTimestep = _ref.setTimestep;
   var classes = useStyles$2();
   return /*#__PURE__*/React__default.createElement("div", {
     className: classes.mapSliderConnect,
@@ -22510,7 +22597,7 @@ var ConfigurableMapWithSliderConnect = function ConfigurableMapWithSliderConnect
     className: classes.zoomControls
   }, /*#__PURE__*/React__default.createElement(ZoomControlConnect, {
     mapId: id
-  })), /*#__PURE__*/React__default.createElement("div", {
+  })), showTimeSlider && /*#__PURE__*/React__default.createElement("div", {
     className: classes.timeSlider
   }, /*#__PURE__*/React__default.createElement(TimeSliderConnect, {
     mapId: id,
@@ -22528,7 +22615,9 @@ var ConfigurableMapWithSliderConnect = function ConfigurableMapWithSliderConnect
     shouldAnimate: shouldAnimate,
     animationPayload: animationPayload,
     shouldShowZoomControls: shouldShowZoomControls,
-    displayMapPin: displayMapPin
+    displayMapPin: displayMapPin,
+    toggleTimestepAuto: toggleTimestepAuto,
+    setTimestep: setTimestep
   }));
 };
 
@@ -22747,11 +22836,7 @@ var SyncGroupList = function SyncGroupList(_ref) {
         return removeGroup(groupObject.id);
       },
       size: "large"
-    }, index === 0 ? /*#__PURE__*/React.createElement(Add, {
-      className: classes.iconColor
-    }) : /*#__PURE__*/React.createElement(DeleteForever, {
-      className: classes.iconColor
-    })))), /*#__PURE__*/React.createElement(SyncGroupListItem, {
+    }, index === 0 ? /*#__PURE__*/React.createElement(Add, null) : /*#__PURE__*/React.createElement(DeleteForever, null)))), /*#__PURE__*/React.createElement(SyncGroupListItem, {
       viewStateData: viewStateData,
       groupId: groupObject.id,
       selected: groupObject.selected,
@@ -22777,110 +22862,10 @@ var useStyles = makeStyles(function (theme) {
       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
     }
   });
 });
 
-/* *
- * 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 emptyState = {
-  timeslider: {
-    groups: [],
-    sourcesById: []
-  },
-  zoompane: {
-    groups: [],
-    sourcesById: []
-  },
-  level: {
-    groups: [],
-    sourcesById: []
-  }
-};
-var groupTypes = [{
-  title: 'Timeslider',
-  syncType: 'SYNCGROUPS_TYPE_SETTIME',
-  groupType: 'timeslider'
-}, {
-  title: 'Zoompane',
-  syncType: 'SYNCGROUPS_TYPE_SETBBOX',
-  groupType: 'zoompane'
-}];
-/*
-    _____ Creates viewState  _____
-      - Runs Each time viewState is created:
-      - Fill arrays inside initialState with objects containing new values from Redux
-*/
-
-var createSyncGroupViewState = function createSyncGroupViewState(syncState) {
-  var initialState = produce(emptyState, function (draft) {
-    /*
-      _____ 1. Fill groups _____
-        1. Goes through all groups by ID
-        2. Collects original timeslider or zoompane values into an array
-        3. Sorts and adds selected sources to ViewState based on ID type
-    */
-    Object.keys(syncState.groups.byId).forEach(function (id) {
-      var _a;
-
-      var groupType = (_a = groupTypes.find(function (object) {
-        return object.syncType === syncState.groups.byId[id].type;
-      })) === null || _a === void 0 ? void 0 : _a.groupType;
-
-      if (groupType) {
-        draft[groupType].groups.push({
-          id: id,
-          selected: syncState.groups.byId[id].targets.allIds
-        });
-      }
-    });
-    /*
-      _____ 2. Fill sourcesById _____
-        1. Loop though sources and add source to each group type
-    */
-
-    Object.keys(syncState.sources.byId).forEach(function (id) {
-      groupTypes.forEach(function (_ref) {
-        var syncType = _ref.syncType,
-            groupType = _ref.groupType;
-
-        if (syncState.sources.byId[id].types.includes(syncType)) {
-          draft[groupType].sourcesById.push({
-            id: id,
-            name: id
-          });
-        }
-      });
-    });
-  });
-  return initialState;
-}; // TODO
-// Improve selector to reduce unnecessary re-rendering
-// https://gitlab.com/opengeoweb/opengeoweb/-/issues/1333
-
-var syncState = function syncState(store) {
-  return store.syncronizationGroupStore;
-};
-
-var createSyncGroupViewStateSelector = createSelector(syncState, createSyncGroupViewState);
-
 var SyncGroupViewer = function SyncGroupViewer(_ref) {
   var onClose = _ref.onClose,
       isOpen = _ref.isOpen,
@@ -22888,7 +22873,10 @@ var SyncGroupViewer = function SyncGroupViewer(_ref) {
       syncGroupAddTarget = _ref.syncGroupAddTarget,
       syncGroupRemoveTarget = _ref.syncGroupRemoveTarget,
       syncGroupAddGroup = _ref.syncGroupAddGroup,
-      syncGroupRemoveGroup = _ref.syncGroupRemoveGroup;
+      syncGroupRemoveGroup = _ref.syncGroupRemoveGroup,
+      onMouseDown = _ref.onMouseDown,
+      _ref$order = _ref.order,
+      order = _ref$order === void 0 ? 0 : _ref$order;
 
   /*
       _____ Handle Toggle _____
@@ -22989,7 +22977,9 @@ var SyncGroupViewer = function SyncGroupViewer(_ref) {
     headerSize: "medium",
     isOpen: isOpen,
     onClose: onClose,
-    "data-testid": "syncGroupViewer"
+    "data-testid": "syncGroupViewer",
+    onMouseDown: onMouseDown,
+    order: order
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SyncGroupList, {
     viewStateData: syncGroupViewState.zoompane,
     title: "ZoomPane",
@@ -23045,14 +23035,12 @@ var SyncGroupViewer = function SyncGroupViewer(_ref) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var SyncGroupViewerConnect = function SyncGroupViewerConnect(_ref) {
-  var onClose = _ref.onClose,
-      isOpen = _ref.isOpen;
+var SyncGroupViewerConnect = function SyncGroupViewerConnect() {
   var dispatch = useDispatch(); // TODO
   // Improve the selector to prevent re-renders
   // For example dusting anination syncgroups should not re-render
 
-  var viewState = useSelector(createSyncGroupViewStateSelector);
+  var viewState = useSelector(syncGroupGetViewState);
   var syncGroupAddGroup$1 = React.useCallback(function (payload) {
     return dispatch(syncGroupAddGroup(payload));
   }, [dispatch]);
@@ -23065,14 +23053,55 @@ var SyncGroupViewerConnect = function SyncGroupViewerConnect(_ref) {
   var syncGroupRemoveTarget$1 = React.useCallback(function (payload) {
     return dispatch(syncGroupRemoveTarget(payload));
   }, [dispatch]);
+  var isOpenInStore = useSelector(function (store) {
+    return getisDialogOpen(store, 'syncGroups');
+  });
+  var onClose = React.useCallback(function () {
+    return dispatch(setToggleOpenDialog({
+      type: 'syncGroups',
+      setOpen: false
+    }));
+  }, [dispatch]);
+  var uiOrder = useSelector(function (store) {
+    return getDialogOrder(store, 'syncGroups');
+  });
+  var uiIsOrderedOnTop = useSelector(function (store) {
+    return getDialogIsOrderedOnTop(store, 'syncGroups');
+  });
+  var registerDialog$1 = React.useCallback(function () {
+    return dispatch(registerDialog({
+      type: 'syncGroups',
+      setOpen: false
+    }));
+  }, [dispatch]);
+  var unregisterDialog$1 = React.useCallback(function () {
+    return dispatch(unregisterDialog({
+      type: 'syncGroups'
+    }));
+  }, [dispatch]);
+  var onOrderDialog = React.useCallback(function () {
+    if (!uiIsOrderedOnTop) {
+      dispatch(orderDialog({
+        type: 'syncGroups'
+      }));
+    }
+  }, [dispatch, uiIsOrderedOnTop]);
+  React.useEffect(function () {
+    registerDialog$1();
+    return function () {
+      unregisterDialog$1();
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return /*#__PURE__*/React.createElement(SyncGroupViewer, {
     onClose: onClose,
-    isOpen: isOpen,
+    isOpen: isOpenInStore,
     syncGroupViewState: viewState,
     syncGroupAddTarget: syncGroupAddTarget$1,
     syncGroupRemoveTarget: syncGroupRemoveTarget$1,
     syncGroupAddGroup: syncGroupAddGroup$1,
-    syncGroupRemoveGroup: syncGroupRemoveGroup$1
+    syncGroupRemoveGroup: syncGroupRemoveGroup$1,
+    order: uiOrder,
+    onMouseDown: onOrderDialog
   });
 };
 
@@ -23264,4 +23293,4 @@ var CoreThemeStoreProvider = function CoreThemeStoreProvider(_ref2) {
   }, children)));
 };
 
-export { ConfigurableConnectedMap, ConfigurableMapWithSliderConnect, CoreThemeProvider, CoreThemeStoreProvider, HarmRefTimePreset, HarmonieTempAndPrecipPreset, LayerManagerConnect, LayerManagerMapButtonConnect, Legend, LegendConnect, LegendMapButtonConnect, MapControls, MapView, MapViewConnect, MapViewLayer, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, ReactMapView, ReactMapViewLayer, SyncGroupViewerConnect, index as SyncGroups, TimeSliderConnect, TooltipSelect, ZoomControlConnect, ZoomControls, componentsLookUp, coreModuleConfig, dateFormat, defaultConfigurations, filterBaseLayers, filterBbox, filterDimensions, filterMapLayers, filterMapPresets, filterNonTimeDimensions, filterServices, filterSrs, generateLayerId, generateMapId, generateTimesliderId, getFirstTimeStepForLayerId, getInitialPresets, getLastTimeStepForLayerId, getNextTimeStepForLayerId, getPreviousTimeStepForLayerId, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSTimeDimensionForLayerId, getWMLayerById, reducer$6 as layerReducer, makeMapPreset, actions$3 as mapActions, constants$1 as mapConstants, selectors as mapSelectors, types$2 as mapTypes, utils as mapUtils, publicLayers, publicServices, registerWMJSMap, registerWMLayer, store, actions as syncGroupActions, synchronizationGroupConfig as synchronizationGroupModuleConfig, testLayers, actions$2 as uiActions, types$1 as uiTypes, useStyles$3 as useStyles };
+export { ConfigurableConnectedMap, ConfigurableMapWithSliderConnect, CoreThemeProvider, CoreThemeStoreProvider, HarmRefTimePreset, HarmonieTempAndPrecipPreset, LayerManagerConnect, LayerManagerMapButtonConnect, Legend, LegendConnect, LegendMapButtonConnect, MapControls, MapView, MapViewConnect, MapViewLayer, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, ReactMapView, ReactMapViewLayer, SyncGroupViewerConnect, index as SyncGroups, TimeSliderConnect, TooltipSelect, ZoomControlConnect, ZoomControls, componentsLookUp, coreModuleConfig, dateFormat, defaultConfigurations, filterBaseLayers, filterBbox, filterDimensions, filterMapLayers, filterMapPresets, filterNonTimeDimensions, filterServices, filterSrs, generateLayerId, generateMapId, generateTimesliderId, getFirstTimeStepForLayerId, getInitialPresets, getLastTimeStepForLayerId, getNextTimeStepForLayerId, getPreviousTimeStepForLayerId, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSTimeDimensionForLayerId, getWMLayerById, reducer$6 as layerReducer, makeMapPreset, actions$3 as mapActions, constants as mapConstants, moduleConfig as mapModuleConfig, selectors$1 as mapSelectors, types$2 as mapTypes, utils as mapUtils, publicLayers, publicServices, registerWMJSMap, registerWMLayer, store, actions as syncGroupActions, synchronizationGroupConfig as synchronizationGroupModuleConfig, testLayers, actions$2 as uiActions, uiModuleConfig, selectors as uiSelectors, types$1 as uiTypes, useStyles$3 as useStyles };