Merge branch 'staging_environment'

src/maps/mapDrawers/FieldDrawer.tsx

@@ -273,7 +273,7 @@ export default function FieldDrawer(props: Props) {
           <Weather longitude={field.center().longitude} latitude={field.center().latitude} />
         </TabPanelMine>
         <TabPanelMine value={value} index={2}>
-          <TaskViewer drawerView objectKey={field.key()} loadKeys={taskLoadKeys} />
+          <TaskViewer drawerView objectKey={field.key()} loadKeys={taskLoadKeys} overlayButton />
         </TabPanelMine>
       </React.Fragment>
     );

src/maps/mapLayers/geoMapLayer.tsx

@@ -6,7 +6,7 @@ interface Props {
   objectCollection: FeatureCollection;
   measurementCollection?: FeatureCollection;
   showTitle?: boolean;
-  setInteractiveLayers: (layers: string[]) => void;
+  setInteractiveLayers?: (layers: string[]) => void;
 }
 
 export default function GeoMapLayer(props: Props) {
@@ -18,7 +18,9 @@ export default function GeoMapLayer(props: Props) {
   // }, [measurementCollection, objectCollection]);
 
   useEffect(() => {
-    setInteractiveLayers(["shapefill", "shapeborder", "measurementBorder"]);
+    if(setInteractiveLayers){
+      setInteractiveLayers(["shapefill", "shapeborder", "measurementBorder"]);
+    }
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   return (
@@ -60,6 +62,7 @@ export default function GeoMapLayer(props: Props) {
           />
         )}
       </Source>
+      {measurementCollection &&
       <Source type="geojson" data={measurementCollection} id={"measurements"}>
         <Layer
           id="measurementBorder"
@@ -90,6 +93,7 @@ export default function GeoMapLayer(props: Props) {
           }}
         />
       </Source>
+      }
     </React.Fragment>
   );
 }