@eeacms/volto-arcgis-block 0.1.94 → 0.1.95

package/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.95](https://github.com/eea/volto-arcgis-block/compare/0.1.94...0.1.95) - 2 February 2023
+
+#### :hammer_and_wrench: Others
+
+- More filter fixes [masanchez85 - [`bda2ea7`](https://github.com/eea/volto-arcgis-block/commit/bda2ea7d062d33adfa7908f7b29f21b38b25b4b0)]
 ### [0.1.94](https://github.com/eea/volto-arcgis-block/compare/0.1.93...0.1.94) - 2 February 2023
 
 ### [0.1.93](https://github.com/eea/volto-arcgis-block/compare/0.1.92...0.1.93) - 2 February 2023

package/package.json

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

package/src/components/MapViewer/HotspotWidget.jsx

@@ -78,6 +78,17 @@ class HotspotWidget extends React.Component {
 
   handleApplyFilter(typeFilter) {
     if (this.props.selectedLayers) {
+      //Clear previous selections when apply a new filter
+      var currentLccLayer = Object.keys(this.props.selectedLayers).find((e) =>
+        e.includes('lcc_filter'),
+      );
+      if (currentLccLayer) delete this.props.selectedLayers[currentLccLayer];
+
+      var currentLcLayer = Object.keys(this.props.selectedLayers).find((e) =>
+        e.includes('lc_filter'),
+      );
+      if (currentLcLayer) delete this.props.selectedLayers[currentLcLayer];
+
       var currentLcckey = Object.keys(this.props.selectedLayers).find((e) =>
         e.includes('all_lcc'),
       );
@@ -115,29 +126,29 @@ class HotspotWidget extends React.Component {
         this.props.map.add(this.esriLayer_lcc);
         this.props.selectedLayers['lcc_filter'] = this.esriLayer_lcc;
         this.props.selectedLayers['lcc_filter'].visible = true;
-      } else {
-        /* var typeLegend =
-          document.getElementById('select-klc-highlights-lcc').value ===
-          'Dichotomous'
-            ? 'all_present_lc_a_pol'
-            : 'all_present_lc_b_pol'; */
-        var selectBoxHighlightsLc = document
-          .getElementById('select-klc-lcTime')
-          .value.match(/\d+/g)
-          .map(Number)[0];
-        if (this.esriLayer_lc !== null) {
-          //this.esriLayer_lc.sublayers.items[0].name = typeLegend;
-          this.esriLayer_lc.customLayerParameters['CQL_FILTER'] =
-            'klc_code LIKE ' +
-            "'" +
-            this.dataKlc_code +
-            "'" +
-            " AND in_pa = 'not_defined' AND date = " +
-            selectBoxHighlightsLc;
-          this.props.map.add(this.esriLayer_lc);
-          this.props.selectedLayers['lc_filter'] = this.esriLayer_lc;
-          this.props.selectedLayers['lc_filter'].visible = true;
-        }
+      }
+    } else {
+      /* var typeLegend =
+        document.getElementById('select-klc-highlights-lcc').value ===
+        'Dichotomous'
+          ? 'all_present_lc_a_pol'
+          : 'all_present_lc_b_pol'; */
+      var selectBoxHighlightsLc = document
+        .getElementById('select-klc-lcTime')
+        .value.match(/\d+/g)
+        .map(Number)[0];
+      if (this.esriLayer_lc !== null) {
+        //this.esriLayer_lc.sublayers.items[0].name = typeLegend;
+        this.esriLayer_lc.customLayerParameters['CQL_FILTER'] =
+          'klc_code LIKE ' +
+          "'" +
+          this.dataKlc_code +
+          "'" +
+          " AND in_pa = 'not_defined' AND date = " +
+          selectBoxHighlightsLc;
+        this.props.map.add(this.esriLayer_lc);
+        this.props.selectedLayers['lc_filter'] = this.esriLayer_lc;
+        this.props.selectedLayers['lc_filter'].visible = true;
       }
     }
   }
@@ -158,6 +169,11 @@ class HotspotWidget extends React.Component {
    */
   openMenu() {
     if (this.state.showMapMenu) {
+      if (this.dataJSONNames)
+        this.getKLCNames(
+          this.dataJSONNames,
+          this.dataJSONNames[0].node.klc_name,
+        );
       this.props.mapViewer.setActiveWidget();
       this.container.current.querySelector('.right-panel').style.display =
         'none';