Merge branch 'main' into 7713-project-types

cityofaustin · Dec 3, 2021 · 8f09c36 · 8f09c36
2 parents 9ef8cd0 + dcb36af
commit 8f09c36
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 22 deletions.
diff --git a/moped-editor/package-lock.json b/moped-editor/package-lock.json
diff --git a/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummary.js b/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummary.js
@@ -23,6 +23,8 @@ import ProjectSummaryProjectDescription from "./ProjectSummaryProjectDescription
 import ProjectSummaryProjectECapris from "./ProjectSummaryProjectECapris";
 import ProjectSummaryProjectTypes from "./ProjectSummaryProjectTypes";
 
+import { countFeatures } from "../../../../utils/mapHelpers";
+
 const useStyles = makeStyles(theme => ({
   fieldGridItem: {
     margin: theme.spacing(2),
@@ -105,6 +107,22 @@ const ProjectSummary = ({ loading, error, data, refetch }) => {
   if (projectFeatureRecords.length === 0 && !makeSureRefresh)
     setMakeSureRefresh(true);
 
+  const renderMap = () => {
+    if (countFeatures(projectFeatureCollection) < 1) {
+      return (
+        <ProjectSummaryMapFallback
+          projectId={projectId}
+          refetchProjectDetails={refetch}
+          mapData={projectFeatureCollection}
+        />
+      );
+    } else {
+      return (
+        <ProjectSummaryMap projectExtentGeoJSON={projectFeatureCollection} />
+      );
+    }
+  };
+
   return (
     <ApolloErrorHandler errors={error}>
       <ProjectSummarySnackbar
@@ -198,9 +216,7 @@ const ProjectSummary = ({ loading, error, data, refetch }) => {
                 onReset={() => setMapError(false)}
                 resetKeys={[mapError]}
               >
-                <ProjectSummaryMap
-                  projectExtentGeoJSON={projectFeatureCollection}
-                />
+                {renderMap()}
               </ErrorBoundary>
             )}
           </Grid>

diff --git a/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummaryMap.js b/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummaryMap.js
@@ -3,7 +3,6 @@ import ReactMapGL, { NavigationControl } from "react-map-gl";
 import { Box, makeStyles } from "@material-ui/core";
 import "mapbox-gl/dist/mapbox-gl.css";
 import "react-map-gl-geocoder/dist/mapbox-gl-geocoder.css";
-import { stopReportingRuntimeErrors } from "react-error-overlay";
 
 import {
   createSummaryMapLayers,
@@ -60,7 +59,7 @@ const ProjectSummaryMap = ({ projectExtentGeoJSON }) => {
    * Let's throw an error intentionally if there are no features for a project.
    */
   if (featureCount < 1) {
-    stopReportingRuntimeErrors();
+    // Throw an error if this component was called without features to render.
     throw Error("Map error: Cannot render or edit maps with no features");
   }