CLMS-3171-3170 (bug): missing or incomplete shapefiles show up as err…

…or message in popup
eea · Apr 10, 2024 · 35eec0c · 35eec0c
1 parent bfc6e19
commit 35eec0c
Showing 1 changed file with 39 additions and 1 deletion.
diff --git a/src/components/MapViewer/AreaWidget.jsx b/src/components/MapViewer/AreaWidget.jsx
@@ -366,6 +366,23 @@ class AreaWidget extends React.Component {
           //Check for more than a single feature
           if (this.checkFeatureCount(response.data.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
+          ) {
+            this.setState({
+              showInfoPopup: true,
+              infoPopupType: 'invalidShapefile',
+            });
+            return;
+          }
           //Create a feature layer from the feature collection
           this.addFeatureCollectionToMap(response.data.featureCollection);
           //console.log(data);
@@ -375,7 +392,18 @@ class AreaWidget extends React.Component {
         }
       })
       .catch((error) => {
-        //console.error('Failed to generate feature collection:', error);
+        if (
+          error &&
+          error.details.httpStatus === 400 &&
+          error.message === 'Invalid Shapefile: missing shp file.'
+        ) {
+          this.setState({
+            showInfoPopup: true,
+            infoPopupType: 'invalidShapefile',
+          });
+        } else {
+          // Handle other errors
+        }
       });
   }
   // add the feature collection to the map and zoom to the feature collection extent
@@ -1244,6 +1272,16 @@ class AreaWidget extends React.Component {
                       </div>
                     </>
                   )}
+                  {this.state.infoPopupType === 'invalidShapefile' && (
+                    <>
+                      <span className="drawRectanglePopup-icon">
+                        <FontAwesomeIcon icon={['fas', 'info-circle']} />
+                      </span>
+                      <div className="drawRectanglePopup-text">
+                        Invalid Shapefile: missing or incomplete shp file.
+                      </div>
+                    </>
+                  )}
                 </div>
               </div>
             </div>