@eeacms/volto-arcgis-block 0.1.363 → 0.1.365

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.365](https://github.com/eea/volto-arcgis-block/compare/0.1.364...0.1.365) - 28 May 2025
+
+### [0.1.364](https://github.com/eea/volto-arcgis-block/compare/0.1.363...0.1.364) - 28 May 2025
+
 ### [0.1.363](https://github.com/eea/volto-arcgis-block/compare/0.1.362...0.1.363) - 26 May 2025
 
 ### [0.1.362](https://github.com/eea/volto-arcgis-block/compare/0.1.361...0.1.362) - 21 May 2025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.363",
+  "version": "0.1.365",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",
@@ -60,14 +60,14 @@
   },
   "dependencies": {
     "@eeacms/volto-clms-utils": "^0.1.13",
+    "@eeacms/volto-taxonomy": "5.1.0",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
     "esri-loader": "3.4.0",
     "highcharts": "^9.3.2",
     "highcharts-react-official": "^3.1.0",
-    "react-datepicker": "4.15.0",
-    "@eeacms/volto-taxonomy": "5.1.0"
+    "react-datepicker": "4.15.0"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",

package/src/components/MapViewer/AreaWidget.jsx

@@ -268,32 +268,44 @@ class AreaWidget extends React.Component {
     }, {});
   }
 
-  createDefinitionExpressionObject(params) {
-    if (!params || Object.keys(params).length === 0) return null;
-    return Object.entries(params)
-      .map(([k, v]) => {
-        if (typeof v === 'string' && v.includes(',')) {
-          const values = v.split(',').map((val) => `'${val.trim()}'`);
-          if (values.length > 2) {
-            return `${k} in (${values.join(', ')})`;
-          } else {
-            return values.map((val) => `${k}=${val}`).join(' OR ');
-          }
-        } else {
-          return `${k}='${v}'`;
-        }
-      })
-      .join(' AND ');
-  }
+  // createDefinitionExpressionObject(params) {
+  //   if (!params || Object.keys(params).length === 0) return null;
+  //   return Object.entries(params)
+  //     .map(([k, v]) => {
+  //       if (typeof v === 'string' && v.includes(',')) {
+  //         const values = v.split(',').map((val) => `'${val.trim()}'`);
+  //         if (values.length > 2) {
+  //           return `${k} in (${values.join(', ')})`;
+  //         } else {
+  //           return values.map((val) => `${k}=${val}`).join(' OR ');
+  //         }
+  //       } else {
+  //         return `${k}='${v}'`;
+  //       }
+  //     })
+  //     .join(' AND ');
+  // }
+
+  createFeatureLayer(id, baseUrl, level, customParameters) {
+    // Extract relevant properties from customParameters (queryParams)
+    const {
+      outFields,
+      returnGeometry,
+      returnTrueCurves,
+      sqlFormat,
+      featureEncoding,
+    } = customParameters;
 
-  createFeatureLayer(id, baseUrl, level, definitionExpression) {
     return new FeatureLayer({
       id: id,
       url: baseUrl,
       layerId: level,
-      outFields: ['*'],
+      outFields: outFields || ['*'],
       popupEnabled: false,
-      definitionExpression: definitionExpression,
+      returnGeometry: returnGeometry || false,
+      returnTrueCurves: returnTrueCurves || false,
+      sqlFormat: sqlFormat || 'none',
+      featureEncoding: featureEncoding || 'esriDefault',
     });
   }
 
@@ -303,14 +315,9 @@ class AreaWidget extends React.Component {
       'flex';
     const { baseUrl, queryString } = this.getNutsUrlChunks(this.nutsUrl);
     const params = this.getNutsParams(queryString);
-    const definitionExpression = this.createDefinitionExpressionObject(params);
+    // const definitionExpression = this.createDefinitionExpressionObject(params);
     levels.forEach((level) => {
-      const layer = this.createFeatureLayer(
-        id,
-        baseUrl,
-        level,
-        definitionExpression,
-      );
+      const layer = this.createFeatureLayer(id, baseUrl, level, params);
       this.nutsGroupLayer.add(layer);
       let index = this.getHighestIndex();
       this.props.map.reorder(this.nutsGroupLayer, index + 1);

package/src/components/MapViewer/MenuWidget.jsx

@@ -4000,7 +4000,7 @@ class MenuWidget extends React.Component {
         if (elem.id === layerId) {
           this.timeLayers[elem.id] = ['fas', 'stop'];
           if (
-            this.visibleLayers[elem.id] &&
+            !this.visibleLayers[elem.id] ||
             this.visibleLayers[elem.id][1] === 'eye-slash'
           ) {
             this.layers[elem.id].visible = true;
@@ -4398,7 +4398,7 @@ class MenuWidget extends React.Component {
       this.findCheckedDataset(elem);
     }
     if (
-      this.visibleLayers[elem.id] &&
+      !this.visibleLayers[elem.id] ||
       this.visibleLayers[elem.id][1] === 'eye'
     ) {
       this.layers[elem.id].visible = false;