@eeacms/volto-arcgis-block 0.1.380 → 0.1.381

package/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.1.381](https://github.com/eea/volto-arcgis-block/compare/0.1.380...0.1.381) - 20 August 2025
+
+#### :hammer_and_wrench: Others
+
+- (feat): extent from CDSE is applied and map escapes CDSE resolution warning. This push is clean and contains no console.log statements [Unai Bolivar - [`e909e39`](https://github.com/eea/volto-arcgis-block/commit/e909e390baa803b3785a4ab6f3ce5ff693bdaafb)]
+- (feat): changing values from CDSE service bbox parser to web mercator [Unai Bolivar - [`0973a7d`](https://github.com/eea/volto-arcgis-block/commit/0973a7de01f78c34b02577c8eadd4560046ae3fb)]
+- (feat): Getting the extents from layers fetched via CDSE OGC API to match the data viewer map status center extent [Unai Bolivar - [`e592a4e`](https://github.com/eea/volto-arcgis-block/commit/e592a4e7e7f488f1011dfb522ea063c2a20b4834)]
 ### [0.1.380](https://github.com/eea/volto-arcgis-block/compare/0.1.379...0.1.380) - 20 August 2025
 
 ### [0.1.379](https://github.com/eea/volto-arcgis-block/compare/0.1.378...0.1.379) - 11 August 2025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.380",
+  "version": "0.1.381",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/MapViewer.jsx

@@ -97,15 +97,6 @@ const MapViewerStateMonitor = ({ children, onUserStateChange }) => {
           prevCartStateRef.current.isLoggedIn !== currentUserState.isLoggedIn;
 
         if (hasUserIdChanged || hasLoggedInChanged) {
-          /* eslint-disable no-console */
-          console.log('[MapViewerStateMonitor] User state change detected:', {
-            previous: prevCartStateRef.current,
-            current: currentUserState,
-            userIdChanged: hasUserIdChanged,
-            loggedInChanged: hasLoggedInChanged,
-          });
-          /* eslint-enable no-console */
-
           // Notify parent component of state change
           if (onUserStateChange) {
             onUserStateChange(currentUserState, prevCartStateRef.current);
@@ -137,17 +128,6 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
   const populateSessionFromUserData = (userKey) => {
     const userData = localStorage.getItem(userKey);
     if (userData) {
-      /* eslint-disable no-console */
-      console.log(
-        `[UserStorageManager:${instanceId.current}] Restoring from localStorage:`,
-        {
-          key: userKey,
-          dataPreview:
-            userData.substring(0, 100) + (userData.length > 100 ? '...' : ''),
-          dataLength: userData.length,
-        },
-      );
-      /* eslint-enable no-console */
       const parsed = JSON.parse(userData);
       const userIdFromKey = (key) => key.replace(/^user_/, '');
       const hydratedFor = sessionStorage.getItem('mv_hydrated_for');
@@ -195,12 +175,6 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
 
       return true; // Indicate successful restoration
     } else {
-      /* eslint-disable no-console */
-      console.log(
-        `[UserStorageManager:${instanceId.current}] No data found for key:`,
-        userKey,
-      );
-      /* eslint-enable no-console */
       return false;
     }
   };
@@ -225,15 +199,6 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
   // Initialization effect - handles user state readiness
   useEffect(() => {
     if (userID !== undefined && isLoggedIn !== undefined) {
-      /* eslint-disable no-console */
-      console.log(
-        `[UserStorageManager:${instanceId.current}] User state initialized:`,
-        {
-          userID,
-          isLoggedIn,
-        },
-      );
-      /* eslint-enable no-console */
       setIsInitialized(true);
     }
   }, [userID, isLoggedIn]);
@@ -246,35 +211,12 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
 
     const lockKey = `storage_lock_${userID || 'anonymous'}`;
 
-    /* eslint-disable no-console */
-    console.log(
-      `[UserStorageManager:${instanceId.current}] Component mounting with state:`,
-      {
-        isLoggedIn,
-        userID,
-        storageManaged,
-        isInitialized,
-      },
-    );
-    /* eslint-enable no-console */
-
     // Acquire lock to prevent concurrent operations
     if (!acquireStorageLock(lockKey)) {
-      /* eslint-disable no-console */
-      console.log(
-        `[UserStorageManager:${instanceId.current}] Another instance is managing storage for this user`,
-      );
-      /* eslint-enable no-console */
       return;
     }
     try {
       if (isLoggedIn === true) {
-        /* eslint-disable no-console */
-        console.log(
-          `[UserStorageManager:${instanceId.current}] Detected signed-in user, processing storage...`,
-        );
-        /* eslint-enable no-console */
-
         if (
           userID &&
           userID !== null &&
@@ -285,26 +227,8 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
           const userData = localStorage.getItem(userKey);
           const anonymousData = localStorage.getItem('user_anonymous');
 
-          /* eslint-disable no-console */
-          console.log(
-            `[UserStorageManager:${instanceId.current}] Storage analysis:`,
-            {
-              userKey,
-              hasUserData: !!userData,
-              hasAnonymousData: !!anonymousData,
-              sessionEmpty: sessionStorage.length === 0,
-              sessionLength: sessionStorage.length,
-            },
-          );
-          /* eslint-enable no-console */
-
           // Migration and restoration logic for signed-in users
           if (!userData && anonymousData) {
-            /* eslint-disable no-console */
-            console.log(
-              `[UserStorageManager:${instanceId.current}] Migrating anonymous data to signed-in user`,
-            );
-            /* eslint-enable no-console */
             // Move anonymous data to the signed-in user's localStorage key
             localStorage.setItem(userKey, anonymousData);
             // Delete the anonymous key from localStorage
@@ -312,49 +236,18 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
             // Populate sessionStorage with the migrated data from localStorage
             populateSessionFromUserData(userKey);
           } else if (userData) {
-            /* eslint-disable no-console */
-            console.log(
-              `[UserStorageManager:${instanceId.current}] Found existing user data - restoring to session storage`,
-            );
-            /* eslint-enable no-console */
             // User has existing saved data - restore it to sessionStorage
             populateSessionFromUserData(userKey);
           } else {
-            /* eslint-disable no-console */
-            console.log(
-              `[UserStorageManager:${instanceId.current}] No saved user data found - preserving current session state`,
-            );
-            /* eslint-enable no-console */
           }
           setStorageManaged(true);
         } else {
-          /* eslint-disable no-console */
-          console.log(
-            `[UserStorageManager:${instanceId.current}] valid userID unavailable: userID is ${userID}`,
-          );
-          /* eslint-enable no-console */
         }
       } else if (isLoggedIn === false) {
-        /* eslint-disable no-console */
-        console.log(
-          `[UserStorageManager:${instanceId.current}] Detected anonymous user, processing storage...`,
-        );
-        /* eslint-enable no-console */
         // Handle anonymous user session - restore anonymous data if it exists
         const anonymousKey = 'user_anonymous';
         const anonymousData = localStorage.getItem(anonymousKey);
         if (anonymousData) {
-          /* eslint-disable no-console */
-          console.log(
-            `[UserStorageManager:${instanceId.current}] Restoring anonymous data to session storage:`,
-            {
-              dataPreview:
-                anonymousData.substring(0, 100) +
-                (anonymousData.length > 100 ? '...' : ''),
-              dataLength: anonymousData.length,
-            },
-          );
-          /* eslint-enable no-console */
           sessionStorage.clear();
           const parsed = JSON.parse(anonymousData);
           Object.keys(parsed).forEach((k) =>
@@ -366,25 +259,10 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
             ),
           );
           hasRestoredData.current = true;
-          /* eslint-disable no-console */
-          console.log(
-            `[UserStorageManager:${instanceId.current}] Anonymous data restored to sessionStorage`,
-          );
-          /* eslint-enable no-console */
         } else {
-          /* eslint-disable no-console */
-          console.log(
-            `[UserStorageManager:${instanceId.current}] No anonymous data found to restore`,
-          );
-          /* eslint-enable no-console */
         }
         setStorageManaged(true);
       } else {
-        /* eslint-disable no-console */
-        console.log(
-          `[UserStorageManager:${instanceId.current}] User state does not match any processing condition - skipping storage logic`,
-        );
-        /* eslint-enable no-console */
       }
 
       if (onStorageManaged) {
@@ -403,31 +281,13 @@ const UserStorageManager = ({ children, onStorageManaged }) => {
 
   // Data-reactive effect - ensures sessionStorage mirrors localStorage whenever userData changes
   // useEffect(() => {
-  //   /* eslint-disable no-console */
-  //   console.log(
-  //     `[UserStorageManager:${instanceId.current}] Data-reactive effect triggered:`,
-  //     {
-  //       storageManaged,
-  //       userKey: userKey,
-  //       hasUserData: !!userData,
-  //       userDataLength: userData ? userData.length : 0,
-  //     },
-  //   );
-  //   /* eslint-enable no-console */
+  //
 
   //   if (storageManaged && userKey && userData) {
-  //     /* eslint-disable no-console */
-  //     console.log(
-  //       `[UserStorageManager:${instanceId.current}] Re-syncing session storage with localStorage changes`,
-  //     );
-  //     /* eslint-enable no-console */
+  //
   //     populateSessionFromUserData(userKey);
   //   } else {
-  //     /* eslint-disable no-console */
-  //     console.log(
-  //       `[UserStorageManager:${instanceId.current}] Skipping data sync - conditions not met`,
-  //     );
-  //     /* eslint-enable no-console */
+  //
   //   }
   // }, [userData, userKey, storageManaged]);
 
@@ -504,14 +364,6 @@ class MapViewer extends React.Component {
 
   // Method to handle user state changes from the monitoring wrapper
   handleUserStateChange(newUserState, previousUserState) {
-    /* eslint-disable no-console */
-    console.log('[MapViewer] Handling user state change:', {
-      newUserState,
-      previousUserState,
-      currentState: this.state.currentUserState,
-    });
-    /* eslint-enable no-console */
-
     // Update current user state in component state
     this.setState({ currentUserState: newUserState });
 
@@ -522,27 +374,9 @@ class MapViewer extends React.Component {
   // Enhanced method to save session data to localStorage with instance tracking
   saveSessionToLocalStorage = () => {
     const { user_id, isLoggedIn } = this.context;
-    const instanceId = this.instanceId || 'unknown';
-
-    /* eslint-disable no-console */
-    console.log(`[MapViewer:${instanceId}] Saving session data:`, {
-      hasUserContext:
-        user_id !== undefined && user_id !== null && user_id !== '',
-      isLoggedIn,
-      userId:
-        user_id !== undefined && user_id !== null && user_id !== ''
-          ? user_id
-          : 'anonymous',
-      sessionStorageLength: sessionStorage.length,
-    });
-    /* eslint-enable no-console */
+    //const instanceId = this.instanceId || 'unknown';
 
     if (sessionStorage.length === 0) {
-      /* eslint-disable no-console */
-      console.log(
-        `[MapViewer:${instanceId}] Skipping data save - session storage is empty`,
-      );
-      /* eslint-enable no-console */
       return;
     }
 
@@ -555,19 +389,7 @@ class MapViewer extends React.Component {
 
       try {
         localStorage.setItem(key, JSON.stringify(data));
-        /* eslint-disable no-console */
-        console.log(
-          `[MapViewer:${instanceId}] Successfully saved data to localStorage key: ${key}`,
-        );
-        /* eslint-enable no-console */
-      } catch (error) {
-        /* eslint-disable no-console */
-        console.error(
-          `[MapViewer:${instanceId}] Error saving to localStorage key ${key}:`,
-          error,
-        );
-        /* eslint-enable no-console */
-      }
+      } catch (error) {}
     };
 
     // Save session data to appropriate localStorage key based on user state (always overwrite user key)
@@ -577,13 +399,6 @@ class MapViewer extends React.Component {
       user_id !== null &&
       user_id !== ''
     ) {
-      if (localStorage.getItem(`user_${user_id}`)) {
-        /* eslint-disable no-console */
-        console.log(
-          `[MapViewer:${instanceId}] User session data already exists in localStorage`,
-        );
-        /* eslint-enable no-console */
-      }
       saveToLocal(`user_${user_id}`);
     } else if (!isLoggedIn) {
       saveToLocal('user_anonymous');
@@ -593,24 +408,12 @@ class MapViewer extends React.Component {
 
   // Handle page unload events (navigation, refresh, close)
   handlePageUnload = (event) => {
-    /* eslint-disable no-console */
-    console.log(
-      `[MapViewer:${this.instanceId}] Page unload detected, saving session data`,
-    );
-    /* eslint-enable no-console */
-
     this.saveSessionToLocalStorage();
   };
 
   // Handle visibility changes (tab switches, window minimizing)
   handleVisibilityChange = () => {
     if (document.visibilityState === 'hidden') {
-      /* eslint-disable no-console */
-      console.log(
-        `[MapViewer:${this.instanceId}] Page hidden, saving session data`,
-      );
-      /* eslint-enable no-console */
-
       this.saveSessionToLocalStorage();
     }
   };
@@ -623,15 +426,6 @@ class MapViewer extends React.Component {
       isLoggedIn: prevIsLoggedIn,
     } = previousUserState;
 
-    /* eslint-disable no-console */
-    console.log('[MapViewer] Processing session state update:', {
-      userIdChanged: prevUserId !== newUserId,
-      loginStateChanged: prevIsLoggedIn !== newIsLoggedIn,
-      loginTransition: `${prevIsLoggedIn} -> ${newIsLoggedIn}`,
-      userIdTransition: `${prevUserId} -> ${newUserId}`,
-    });
-    /* eslint-enable no-console */
-
     // Handle login/logout transitions
     if (prevIsLoggedIn !== newIsLoggedIn) {
       if (newIsLoggedIn && !prevIsLoggedIn) {
@@ -651,18 +445,11 @@ class MapViewer extends React.Component {
 
   // Handle user login - restore saved session or preserve current session
   handleUserLogin(userId) {
-    /* eslint-disable no-console */
-    console.log('[MapViewer] User logged in:', userId);
-    /* eslint-enable no-console */
-
     // Check if user has saved data
     const userKey = `user_${userId}`;
     const userData = localStorage.getItem(userKey);
 
     if (userData) {
-      /* eslint-disable no-console */
-      console.log('[MapViewer] Restoring saved user session data');
-      /* eslint-enable no-console */
       // Restore user's saved session
       try {
         const parsed = JSON.parse(userData);
@@ -674,27 +461,14 @@ class MapViewer extends React.Component {
               : parsed[k],
           ),
         );
-      } catch (error) {
-        /* eslint-disable no-console */
-        console.error('[MapViewer] Error restoring user session:', error);
-        /* eslint-enable no-console */
-      }
+      } catch (error) {}
     } else {
-      /* eslint-disable no-console */
-      console.log(
-        '[MapViewer] No saved session found - preserving current session',
-      );
-      /* eslint-enable no-console */
       // No saved data - preserve current session state
     }
   }
 
   // Handle user logout - save current session to anonymous storage
   handleUserLogout(prevUserId) {
-    /* eslint-disable no-console */
-    console.log('[MapViewer] User logged out:', prevUserId);
-    /* eslint-enable no-console */
-
     // Save current session to anonymous storage
     const sessionContents = {};
     for (let i = 0; i < sessionStorage.length; i++) {
@@ -710,42 +484,16 @@ class MapViewer extends React.Component {
             `user_${prevUserId}`,
             JSON.stringify(sessionContents),
           );
-          /* eslint-disable no-console */
-          console.log(
-            '[MapViewer] Saved session to previous user key before logout',
-          );
-          /* eslint-enable no-console */
-        } catch (error) {
-          /* eslint-disable no-console */
-          console.error(
-            '[MapViewer] Error saving previous user session on logout:',
-            error,
-          );
-          /* eslint-enable no-console */
-        }
+        } catch (error) {}
       }
       try {
         localStorage.setItem('user_anonymous', JSON.stringify(sessionContents));
-        /* eslint-disable no-console */
-        console.log('[MapViewer] Saved session to anonymous storage');
-        /* eslint-enable no-console */
-      } catch (error) {
-        /* eslint-disable no-console */
-        console.error('[MapViewer] Error saving anonymous session:', error);
-        /* eslint-enable no-console */
-      }
+      } catch (error) {}
     }
   }
 
   // Handle user account switching
   handleUserSwitch(prevUserId, newUserId) {
-    /* eslint-disable no-console */
-    console.log('[MapViewer] User switched accounts:', {
-      prevUserId,
-      newUserId,
-    });
-    /* eslint-enable no-console */
-
     // Save current session to previous user's storage
     if (prevUserId) {
       const sessionContents = {};
@@ -760,20 +508,7 @@ class MapViewer extends React.Component {
             `user_${prevUserId}`,
             JSON.stringify(sessionContents),
           );
-          /* eslint-disable no-console */
-          console.log(
-            '[MapViewer] Saved session for previous user:',
-            prevUserId,
-          );
-          /* eslint-enable no-console */
-        } catch (error) {
-          /* eslint-disable no-console */
-          console.error(
-            '[MapViewer] Error saving previous user session:',
-            error,
-          );
-          /* eslint-enable no-console */
-        }
+        } catch (error) {}
       }
     }
 
@@ -950,26 +685,8 @@ class MapViewer extends React.Component {
       logo: false,
     });
 
-    /* eslint-disable no-console */
-    console.log(
-      `[MapViewer:${this.instanceId}] Attempting to recover map state from sessionStorage`,
-    );
-    /* eslint-enable no-console */
-
     mapStatus = this.recoverState();
 
-    /* eslint-disable no-console */
-    console.log(`[MapViewer:${this.instanceId}] Recovered mapStatus:`, {
-      isNull: mapStatus === null,
-      isUndefined: mapStatus === undefined,
-      type: typeof mapStatus,
-      hasZoom: mapStatus && mapStatus.zoom !== undefined,
-      hasCenter: mapStatus && mapStatus.center !== undefined,
-      entryCount: mapStatus ? Object.entries(mapStatus).length : 0,
-      mapStatus: mapStatus,
-    });
-    /* eslint-enable no-console */
-
     // Improved condition check to prevent false positives that overwrite restored data
     if (
       mapStatus === null ||
@@ -979,12 +696,6 @@ class MapViewer extends React.Component {
         mapStatus.center === undefined) ||
       (typeof mapStatus === 'object' && Object.entries(mapStatus).length === 0)
     ) {
-      /* eslint-disable no-console */
-      console.log(
-        `[MapViewer:${this.instanceId}] No valid map state found - initializing with default configuration`,
-      );
-      /* eslint-enable no-console */
-
       mapStatus = {};
       mapStatus.zoom = this.mapCfg.zoom;
       mapStatus.center = this.mapCfg.center;
@@ -993,11 +704,6 @@ class MapViewer extends React.Component {
       this.setZoomState(this.mapCfg.zoom);
       this.activeLayersHandler(this.mapCfg.activeLayers);
     } else {
-      /* eslint-disable no-console */
-      console.log(
-        `[MapViewer:${this.instanceId}] Using restored map state from sessionStorage`,
-      );
-      /* eslint-enable no-console */
     }
 
     this.view = new MapView({
@@ -1057,11 +763,6 @@ class MapViewer extends React.Component {
     this.props.MapViewerConfig(flattenToAppURL(this.props.url));
 
     // Add event listeners for page unload events to ensure data is saved
-    /* eslint-disable no-console */
-    console.log(
-      `[MapViewer:${this.instanceId}] Adding page unload event listeners`,
-    );
-    /* eslint-enable no-console */
 
     // beforeunload - most reliable for catching navigation away from page
     window.addEventListener('beforeunload', this.handlePageUnload);
@@ -1100,16 +801,6 @@ class MapViewer extends React.Component {
       prevUserState.user_id !== currentUserId ||
       prevUserState.isLoggedIn !== currentIsLoggedIn
     ) {
-      /* eslint-disable no-console */
-      console.log(
-        '[MapViewer] User state change detected in componentDidUpdate:',
-        {
-          previous: prevUserState,
-          current: { user_id: currentUserId, isLoggedIn: currentIsLoggedIn },
-        },
-      );
-      /* eslint-enable no-console */
-
       // Update component state to reflect new user state
       const newUserState = {
         user_id: currentUserId,
@@ -1123,11 +814,6 @@ class MapViewer extends React.Component {
   }
 
   componentWillUnmount() {
-    // Remove event listeners to prevent memory leaks
-    /* eslint-disable no-console */
-    console.log(`[MapViewer:${this.instanceId}] Removing event listeners`);
-    /* eslint-enable no-console */
-
     window.removeEventListener('beforeunload', this.handlePageUnload);
     window.removeEventListener('pagehide', this.handlePageUnload);
     document.removeEventListener(
@@ -1138,12 +824,6 @@ class MapViewer extends React.Component {
     // Save data using the extracted method
     this.saveSessionToLocalStorage();
 
-    /* eslint-disable no-console */
-    console.log(
-      `[MapViewer:${this.instanceId}] Clearing session storage and cleaning up view`,
-    );
-    /* eslint-enable no-console */
-
     if (this.view) {
       this.view.container = null;
       this.view.destroy();

package/src/components/MapViewer/MenuWidget.jsx

@@ -634,7 +634,6 @@ class MenuWidget extends React.Component {
             let promise = fetch(dataset.ViewService, { mode: 'no-cors' })
               .then((response) => {
                 if (!response.ok) {
-                  //console.error(`HTTP error, status = ${response.status}`);
                   return null;
                 }
                 return response.json();
@@ -645,9 +644,7 @@ class MenuWidget extends React.Component {
                   dataset.Layer = data.Layers;
                 }
               })
-              .catch((error) => {
-                //console.error(error);
-              });
+              .catch((error) => {});
             promises.push(promise);
           }
         });
@@ -2930,6 +2927,43 @@ class MenuWidget extends React.Component {
         this.map.reorder(nuts, this.map.layers.items.length + 1);
       }
       if (!userService) this.checkForHotspots(elem, productContainerId);
+      // Auto-fit extent once for OGC WMS layers on manual toggle
+      try {
+        const layer = this.layers[elem.id];
+        const viewService = layer?.ViewService || '';
+        if (
+          viewService &&
+          viewService.toLowerCase().includes('wms') &&
+          viewService.toLowerCase().includes('/ogc/') &&
+          !layer._ogcExtentApplied &&
+          !this.extentInitiated
+        ) {
+          let url;
+          const serviceLayer = this.state.wmsUserServiceLayers.find(
+            (l) => l.LayerId === elem.id,
+          );
+          if (!serviceLayer) {
+            this.findCheckedDataset(elem);
+            url = this.url;
+          } else {
+            url = serviceLayer.ViewService;
+          }
+          if (url) {
+            await this.getCapabilities(url, 'wms');
+            const BBoxes = this.parseBBOXCDSE(this.xml);
+            if (BBoxes && BBoxes['dataset']) {
+              const myExtent = new Extent({
+                xmin: BBoxes['dataset'].xmin,
+                ymin: BBoxes['dataset'].ymin,
+                xmax: BBoxes['dataset'].xmax,
+                ymax: BBoxes['dataset'].ymax,
+              });
+              this.view.goTo(myExtent);
+              layer._ogcExtentApplied = true;
+            }
+          }
+        }
+      } catch (e) {}
     } else {
       sessionStorage.removeItem('downloadButtonClicked');
       sessionStorage.removeItem('timeSliderTag');
@@ -3384,6 +3418,73 @@ class MenuWidget extends React.Component {
     return BBoxes;
   }
 
+  parseBBOXCDSE(xml) {
+    if (!xml || typeof xml.getElementsByTagName !== 'function') return {};
+    const all = Array.from(xml.getElementsByTagName('*'));
+    const isLayer = (n) => n && (n.localName || '').toLowerCase() === 'layer';
+    const layers = all.filter(isLayer);
+    if (!layers.length) return {};
+    const hasChildLayer = (el) => {
+      const cs = el ? el.children : null;
+      if (!cs) return false;
+      for (let i = 0; i < cs.length; i++) if (isLayer(cs[i])) return true;
+      return false;
+    };
+    const findDesc = (el, nameLower) => {
+      if (!el) return null;
+      const it = el.getElementsByTagName('*');
+      for (let i = 0; i < it.length; i++) {
+        const n = it[i];
+        if ((n.localName || '').toLowerCase() === nameLower) return n;
+      }
+      return null;
+    };
+    const leaves = layers.filter((n) => !hasChildLayer(n));
+    if (!leaves.length) return {};
+    const boxes = {};
+    const xs = [];
+    const ys = [];
+    for (let i = 0; i < leaves.length; i++) {
+      const leaf = leaves[i];
+      const nameEl = findDesc(leaf, 'name');
+      const name =
+        nameEl && nameEl.textContent ? nameEl.textContent.trim() : '';
+      if (!name) continue;
+      let bb = findDesc(leaf, 'boundingbox');
+      if (!bb) {
+        let p = leaf.parentElement;
+        while (p) {
+          if (isLayer(p)) {
+            const cand = findDesc(p, 'boundingbox');
+            if (cand) {
+              bb = cand;
+              break;
+            }
+          }
+          p = p.parentElement;
+        }
+      }
+      if (!bb) continue;
+      const w = parseFloat(bb.getAttribute('minx') || '');
+      const s = parseFloat(bb.getAttribute('miny') || '');
+      const e = parseFloat(bb.getAttribute('maxx') || '');
+      const n = parseFloat(bb.getAttribute('maxy') || '');
+      if (!isFinite(w) || !isFinite(s) || !isFinite(e) || !isFinite(n))
+        continue;
+      boxes[name] = { xmin: w, ymin: s, xmax: e, ymax: n };
+      xs.push(w, e);
+      ys.push(s, n);
+    }
+    if (!Object.keys(boxes).length) return {};
+    boxes.dataset = {
+      xmin: Math.min.apply(Math, xs),
+      ymin: Math.min.apply(Math, ys),
+      xmax: Math.max.apply(Math, xs),
+      ymax: Math.max.apply(Math, ys),
+    };
+    return boxes;
+  }
+
   parseBBOXWMS(xml) {
     const layerParentNode = xml.querySelectorAll('Layer');
     let layersChildren = Array.from(layerParentNode).filter(
@@ -3602,18 +3703,20 @@ class MenuWidget extends React.Component {
     const serviceLayer = this.state.wmsUserServiceLayers.find(
       (layer) => layer.LayerId === elem.id,
     );
-
     if (!serviceLayer) {
       this.findCheckedDataset(elem);
     } else {
       this.url = serviceLayer.ViewService;
     }
+    let isCDSE = this.url?.toLowerCase().includes('/ogc/') ? true : false;
     let BBoxes = {};
     if (this.url?.toLowerCase().endsWith('mapserver')) {
       BBoxes = await this.parseBBOXMAPSERVER(this.layers[elem.id]);
     } else if (this.url?.toLowerCase().includes('wms') || serviceLayer) {
       await this.getCapabilities(this.url, 'wms');
-      BBoxes = this.parseBBOXWMS(this.xml);
+      BBoxes = isCDSE
+        ? this.parseBBOXCDSE(this.xml)
+        : this.parseBBOXWMS(this.xml);
     } else if (this.url?.toLowerCase().includes('wmts')) {
       await this.getCapabilities(this.url, 'wmts');
       BBoxes = this.parseBBOXWMTS(this.xml);
@@ -3636,6 +3739,32 @@ class MenuWidget extends React.Component {
         // spatialReference: 4326 // by default wkid 4326
       });
     }
+    if (isCDSE) {
+      const maxMppAllowed = 23628.54;
+      const vw = this.view && this.view.width ? this.view.width : 0;
+      const vh = this.view && this.view.height ? this.view.height : 0;
+      let extentWM = myExtent;
+      try {
+        if (
+          !(
+            myExtent.spatialReference && myExtent.spatialReference.wkid === 3857
+          )
+        ) {
+          extentWM = WebMercatorUtils.geographicToWebMercator(myExtent);
+        }
+      } catch (e) {}
+      if (vw > 0 && vh > 0) {
+        const mppX = (extentWM.xmax - extentWM.xmin) / vw;
+        const mppY = (extentWM.ymax - extentWM.ymin) / vh;
+        const mpp = Math.max(mppX, mppY);
+        if (mpp > maxMppAllowed) {
+          const cx = (myExtent.xmin + myExtent.xmax) / 2;
+          const cy = (myExtent.ymin + myExtent.ymax) / 2;
+          this.view.goTo({ center: [cx, cy], zoom: 3 });
+          return;
+        }
+      }
+    }
     this.view.goTo(myExtent); //
   }
 
@@ -3694,7 +3823,10 @@ class MenuWidget extends React.Component {
       BBoxes = await this.parseBBOXMAPSERVER(this.layers[elem.id]);
     } else if (this.url?.toLowerCase().includes('wms') || serviceLayer) {
       await this.getCapabilities(this.url, 'wms');
-      BBoxes = this.parseBBOXWMS(this.xml);
+      if (this.url?.toLowerCase().includes('/ogc/')) {
+      } else {
+        BBoxes = this.parseBBOXWMS(this.xml);
+      }
     } else if (this.url?.toLowerCase().includes('wmts')) {
       await this.getCapabilities(this.url, 'wmts');
       BBoxes = this.parseBBOXWMTS(this.xml);