@eeacms/volto-arcgis-block 0.1.274 → 0.1.276

package/CHANGELOG.md

@@ -4,7 +4,15 @@ 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.274](https://github.com/eea/volto-arcgis-block/compare/0.1.273...0.1.274) - 11 April 2024
+### [0.1.276](https://github.com/eea/volto-arcgis-block/compare/0.1.275...0.1.276) - 23 April 2024
+
+### [0.1.275](https://github.com/eea/volto-arcgis-block/compare/0.1.274...0.1.275) - 19 April 2024
+
+#### :hammer_and_wrench: Others
+
+- CLMS-3157 (feat): improve graphic color and transparency [Unai Bolivar - [`4f02a02`](https://github.com/eea/volto-arcgis-block/commit/4f02a02eda72f9b663e1694b79d003234bc71895)]
+- CLMS-3157 (bug): committing current work on graphics. Incomplete ticket. [Unai Bolivar - [`45e7d04`](https://github.com/eea/volto-arcgis-block/commit/45e7d041aed301c28ed1f3ab23de6db61a1e17a8)]
+### [0.1.274](https://github.com/eea/volto-arcgis-block/compare/0.1.273...0.1.274) - 12 April 2024
 
 ### [0.1.273](https://github.com/eea/volto-arcgis-block/compare/0.1.272...0.1.273) - 11 April 2024
 

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -367,19 +367,19 @@ class AreaWidget extends React.Component {
       .then((response) => {
         if (response.data && response.data.featureCollection) {
           //Check for more than a single feature
-          if (this.checkFeatureCount(response.data.featureCollection) === false)
-            return;
+          let featureCollection = response.data.featureCollection;
+          if (this.checkFeatureCount(featureCollection) === false) return;
 
           //Check that attributes and geometry are not null or undefined
           if (
-            response.data.featureCollection.layers[0].featureSet.features[0]
-              .attributes === null ||
-            response.data.featureCollection.layers[0].featureSet.features[0]
-              .attributes === undefined ||
-            response.data.featureCollection.layers[0].featureSet.features[0]
-              .geometry === null ||
-            response.data.featureCollection.layers[0].featureSet.features[0]
-              .geometry === undefined
+            featureCollection.layers[0].featureSet.features[0].attributes ===
+              null ||
+            featureCollection.layers[0].featureSet.features[0].attributes ===
+              undefined ||
+            featureCollection.layers[0].featureSet.features[0].geometry ===
+              null ||
+            featureCollection.layers[0].featureSet.features[0].geometry ===
+              undefined
           ) {
             this.setState({
               showInfoPopup: true,
@@ -389,7 +389,7 @@ class AreaWidget extends React.Component {
           }
 
           //Create a feature layer from the feature collection
-          this.addFeatureCollectionToMap(response.data.featureCollection);
+          this.addFeatureCollectionToMap(featureCollection);
         } else {
           //console.error('Unexpected response structure:', response);
         }
@@ -417,28 +417,29 @@ class AreaWidget extends React.Component {
   // see the 'Feature Collection in Local Storage' sample for an example of how to work with local storage
   addFeatureCollectionToMap(featureCollection) {
     let sourceGraphics = [];
-    //const symbol = new SimpleFillSymbol({
-    //  //type: 'simple-fill',
-    //  color: [255, 255, 255, 0.5],
-    //  outline: {
-    //    color: [0, 0, 0],
-    //    width: 1,
-    //  },
-    //});
 
     //Create a graphic for each feature in the feature collection
 
     const layers = featureCollection.layers.map((layer) => {
       const graphics = layer.featureSet.features.map((feature) => {
-        //feature.symbol = symbol;
-        return Graphic.fromJSON(feature);
+        const polygonSymbol = {
+          type: 'simple-fill', // autocasts as new SimpleFillSymbol()
+          color: [234, 168, 72, 0.8],
+          outline: {
+            // autocasts as new SimpleLineSymbol()
+            color: '#000000',
+            width: 0.1,
+          },
+        };
+        let graphic = Graphic.fromJSON(feature);
+        graphic.symbol = polygonSymbol;
+        return graphic;
       });
       sourceGraphics = sourceGraphics.concat(graphics);
 
       // Create a feature layer from the feature collection fields and gaphics
 
       const featureLayer = new FeatureLayer({
-        //        id: 9,
         objectIdField: 'FID',
         source: graphics,
         legendEnabled: false,
@@ -1244,7 +1245,7 @@ class AreaWidget extends React.Component {
                         <FontAwesomeIcon icon={['fas', 'info-circle']} />
                       </span>
                       <div className="drawRectanglePopup-text">
-                        Invalid Shapefile: missing or incomplete shp file.
+                        Invalid file format, or incomplete shapefile.
                       </div>
                     </>
                   )}

package/src/components/MapViewer/MenuWidget.jsx

@@ -487,7 +487,7 @@ class MenuWidget extends React.Component {
     this.compCfg.forEach((component) => {
       component.Products.forEach((product) => {
         product.Datasets.forEach((dataset) => {
-          if (dataset.ViewService.endsWith('file')) {
+          if (dataset.ViewService?.endsWith('file')) {
             let promise = fetch(dataset.ViewService, { mode: 'no-cors' })
               .then((response) => {
                 if (!response.ok) {
@@ -955,18 +955,18 @@ class MenuWidget extends React.Component {
       // dont show the product if all of its datasets has the auxiliary service as its ViewService URL
       //CLMS-1756
       //don´t show the product if MarkAsDownloadableNoServiceToVisualize is true
-      const isAuxiliary = (dataset) =>
-        dataset.MarkAsDownloadableNoServiceToVisualize;
-      if (!component.Products[i].Datasets.every(isAuxiliary)) {
-        products.push(
-          this.metodProcessProduct(
-            component.Products[i],
-            index,
-            inheritedIndexComponent,
-          ),
-        );
-        index++;
-      }
+      // const isAuxiliary = (dataset) =>
+      //   dataset.MarkAsDownloadableNoServiceToVisualize;
+      // if (!component.Products[i].Datasets.every(isAuxiliary)) {
+      products.push(
+        this.metodProcessProduct(
+          component.Products[i],
+          index,
+          inheritedIndexComponent,
+        ),
+      );
+      index++;
+      //}
     }
     let style = this.props.download ? { display: 'none' } : {};
 
@@ -1033,17 +1033,17 @@ class MenuWidget extends React.Component {
       }
 
       // CLMS-1545
-      if (!product.Datasets[i].MarkAsDownloadableNoServiceToVisualize) {
-        datasets.push(
-          this.metodProcessDataset(
-            product.Datasets[i],
-            index,
-            inheritedIndexProduct,
-            checkProduct,
-          ),
-        );
-        index++;
-      }
+      //if (!product.Datasets[i].MarkAsDownloadableNoServiceToVisualize) {
+      datasets.push(
+        this.metodProcessDataset(
+          product.Datasets[i],
+          index,
+          inheritedIndexProduct,
+          checkProduct,
+        ),
+      );
+      index++;
+      //}
     }
 
     // Empty vector, add the first dataset
@@ -1204,7 +1204,7 @@ class MenuWidget extends React.Component {
     }
 
     // TMS
-    if (dataset.ViewService.endsWith('file')) {
+    if (dataset.ViewService?.endsWith('file')) {
       let tmsLayerIndex = 0;
 
       dataset.Layer.forEach((layer, sublayerIndex) => {
@@ -1546,8 +1546,8 @@ class MenuWidget extends React.Component {
     if (
       !this.layers.hasOwnProperty(layer.LayerId + '_' + inheritedIndexLayer)
     ) {
-      if (viewService.toLowerCase().includes('wms')) {
-        viewService = viewService.endsWith('?')
+      if (viewService?.toLowerCase().includes('wms')) {
+        viewService = viewService?.endsWith('?')
           ? viewService
           : viewService + '?';
         this.layers[layer.LayerId + '_' + inheritedIndexLayer] = new WMSLayer({
@@ -1577,9 +1577,9 @@ class MenuWidget extends React.Component {
           ProductId: ProductId,
           ViewService: viewService,
         });
-      } else if (viewService.toLowerCase().includes('wmts')) {
+      } else if (viewService?.toLowerCase().includes('wmts')) {
         this.layers[layer.LayerId + '_' + inheritedIndexLayer] = new WMTSLayer({
-          url: viewService.endsWith('?') ? viewService : viewService + '?',
+          url: viewService?.endsWith('?') ? viewService : viewService + '?',
           //id: layer.LayerId,
           title: '',
           _wmtsTitle: layer.Title, // CLMS-1105
@@ -1603,7 +1603,7 @@ class MenuWidget extends React.Component {
         ] = new FeatureLayer({
           url:
             viewService +
-            (viewService.endsWith('/') ? '' : '/') +
+            (viewService?.endsWith('/') ? '' : '/') +
             layer.LayerId,
           id: layer.LayerId,
           title: layer.Title,
@@ -2044,8 +2044,8 @@ class MenuWidget extends React.Component {
     this.checkInfoWidget();
     // toggle custom legend for WMTS and TMS
     if (
-      this.layers[elem.id].ViewService.toLowerCase().includes('wmts') ||
-      this.layers[elem.id].ViewService.toLowerCase().endsWith('file')
+      this.layers[elem.id].ViewService?.toLowerCase().includes('wmts') ||
+      this.layers[elem.id].ViewService?.toLowerCase().endsWith('file')
     ) {
       this.toggleCustomLegendItem(this.layers[elem.id]);
     }