@eeacms/volto-arcgis-block 0.1.247 → 0.1.249

package/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.249](https://github.com/eea/volto-arcgis-block/compare/0.1.248...0.1.249) - 15 January 2024
+
+### [0.1.248](https://github.com/eea/volto-arcgis-block/compare/0.1.247...0.1.248) - 12 January 2024
+
 ### [0.1.247](https://github.com/eea/volto-arcgis-block/compare/0.1.246...0.1.247) - 10 January 2024
 
 ### [0.1.246](https://github.com/eea/volto-arcgis-block/compare/0.1.245...0.1.246) - 10 January 2024

package/package.json

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

package/src/components/MapViewer/BookmarkWidget.jsx

@@ -162,8 +162,8 @@ class BookmarkWidget extends React.Component {
           check.forEach((layer) => {
             opacity.push(this.layers[layer].opacity);
             if (
-              visibleLayers[check] &&
-              visibleLayers[check][1] === 'eye-slash'
+              visibleLayers[layer] &&
+              visibleLayers[layer][1] === 'eye-slash'
             ) {
               visible.push(false);
             } else {
@@ -178,16 +178,22 @@ class BookmarkWidget extends React.Component {
             activeLayers: {},
             filteredLayers: {},
           };
-          Object.keys(this.props.hotspotData.activeLayers).forEach((key) => {
-            hotspotFilters.activeLayers[key] = null;
-          });
-          Object.keys(this.props.hotspotData.filteredLayers).forEach((key) => {
-            hotspotFilters.filteredLayers[
-              key
-            ] = this.props.hotspotData.filteredLayers[
-              key
-            ].customLayerParameters['CQL_FILTER'];
-          });
+          if (this.props.hotspotData && this.props.hotspotData.activeLayers) {
+            Object.keys(this.props.hotspotData.activeLayers).forEach((key) => {
+              hotspotFilters.activeLayers[key] = null;
+            });
+          }
+          if (this.props.hotspotData && this.props.hotspotData.filteredLayers) {
+            Object.keys(this.props.hotspotData.filteredLayers).forEach(
+              (key) => {
+                hotspotFilters.filteredLayers[
+                  key
+                ] = this.props.hotspotData.filteredLayers[
+                  key
+                ].customLayerParameters['CQL_FILTER'];
+              },
+            );
+          }
           this.sessionBookmarkHotspot.push(hotspotFilters);
         } else if (e.removed[0]) {
           for (let index = 0; index < this.sessionBookmarks.length; index++) {
@@ -255,7 +261,7 @@ class BookmarkWidget extends React.Component {
         let visible = [];
         check.forEach((layer) => {
           opacity.push(this.layers[layer].opacity);
-          if (visibleLayers[check] && visibleLayers[check][1] === 'eye-slash') {
+          if (visibleLayers[layer] && visibleLayers[layer][1] === 'eye-slash') {
             visible.push(false);
           } else {
             visible.push(true);
@@ -265,16 +271,20 @@ class BookmarkWidget extends React.Component {
           activeLayers: {},
           filteredLayers: {},
         };
-        Object.keys(this.props.hotspotData.activeLayers).forEach((key) => {
-          hotspotFilters.activeLayers[key] = null;
-        });
-        Object.keys(this.props.hotspotData.filteredLayers).forEach((key) => {
-          hotspotFilters.filteredLayers[
-            key
-          ] = this.props.hotspotData.filteredLayers[key].customLayerParameters[
-            'CQL_FILTER'
-          ];
-        });
+        if (this.props.hotspotData && this.props.hotspotData.activeLayers) {
+          Object.keys(this.props.hotspotData.activeLayers).forEach((key) => {
+            hotspotFilters.activeLayers[key] = null;
+          });
+        }
+        if (this.props.hotspotData && this.props.hotspotData.activeLayers) {
+          Object.keys(this.props.hotspotData.filteredLayers).forEach((key) => {
+            hotspotFilters.filteredLayers[
+              key
+            ] = this.props.hotspotData.filteredLayers[
+              key
+            ].customLayerParameters['CQL_FILTER'];
+          });
+        }
         for (let index = 0; index < this.sessionBookmarks.length; index++) {
           if (e.bookmark === this.sessionBookmarks[index]) {
             this.sessionBookmarks[index] = e.bookmark;

package/src/components/MapViewer/HotspotWidget.jsx

@@ -856,9 +856,12 @@ class HotspotWidget extends React.Component {
     this.getBBoxData();
     this.props.view.when(() => {
       this.props.view.map.layers.on('change', () => {
-        let bookmarkHotspotFilter = JSON.parse(
-          localStorage.getItem('bookmarkHotspotFilter'),
-        );
+        let bookmarkHotspotFilter = null;
+        if (localStorage.getItem('bookmarkHotspotFilter')) {
+          bookmarkHotspotFilter = JSON.parse(
+            localStorage.getItem('bookmarkHotspotFilter'),
+          );
+        }
         if (
           bookmarkHotspotFilter !== null &&
           this.props.view.map.layers.items[0] !== 'bookmark'

package/src/components/MapViewer/TimesliderWidget.jsx

@@ -465,8 +465,8 @@ class TimesliderWidget extends React.Component {
     document.querySelector(
       '.esri-ui-bottom-right.esri-ui-corner',
     ).style.pointerEvents = 'auto';
-    this.drag.x = e.screenX - e.currentTarget.getBoundingClientRect().left;
-    this.drag.y = e.screenY - e.currentTarget.getBoundingClientRect().top;
+    this.drag.x = e.screenX - e.currentTarget.getBoundingClientRect().right;
+    this.drag.y = e.screenY - e.currentTarget.getBoundingClientRect().bottom;
   }
 
   onDragOver(e) {
@@ -474,17 +474,17 @@ class TimesliderWidget extends React.Component {
   }
 
   onDrop(e) {
-    let left =
-      e.screenX -
+    let right =
       this.drag.x -
-      e.currentTarget.getBoundingClientRect().left +
+      e.screenX +
+      e.currentTarget.getBoundingClientRect().right +
       'px';
-    let top =
-      e.screenY -
+    let bottom =
       this.drag.y -
-      e.currentTarget.getBoundingClientRect().top +
+      e.screenY +
+      e.currentTarget.getBoundingClientRect().bottom +
       'px';
-    this.setState({ styles: { left: left, top: top } });
+    this.setState({ styles: { right: right, bottom: bottom } });
     this.drag.frame.style.visibility = 'hidden';
     document.querySelector(
       '.esri-ui-bottom-right.esri-ui-corner',