Revert "trying to narrow down the problematic layers"

This reverts commit 410b941.
hackforla · Jun 1, 2022 · 091e858 · 091e858
1 parent 410b941
commit 091e858
Show file tree

Hide file tree

Showing 9 changed files with 636 additions and 69,159 deletions.
diff --git a/client/components/Map/Map.jsx b/client/components/Map/Map.jsx
diff --git a/client/components/Map/geoUtils.js b/client/components/Map/geoUtils.js
@@ -6,29 +6,30 @@ import {
   bbox,
   pointsWithinPolygon,
   booleanPointInPolygon,
-} from "@turf/turf";
+} from '@turf/turf';
 
 export function emptyGeo() {
   return {
     type: "FeatureCollection",
     features: [],
-  };
+  }
 }
 
 // removes holes in a MultiPolygon
 export function removeGeoHoles(feature) {
-  if (feature.geometry.type === "MultiPolygon")
+  if (feature.geometry.type === 'MultiPolygon')
     return {
       ...feature,
       geometry: {
         ...feature.geometry,
-        coordinates: feature.geometry.coordinates.map((poly) => [poly[0]]),
-      },
+        coordinates: feature.geometry.coordinates.map(poly => [poly[0]])
+      }
     };
-  else return feature;
+  else
+    return feature;
 }
 
-export function makeGeoCircle(center, radius = 1, opts = { units: "miles" }) {
+export function makeGeoCircle(center, radius=1, opts={ units: 'miles' }) {
   return circle([center.lng, center.lat], radius, opts);
 }
 
@@ -37,13 +38,7 @@ export function makeGeoMask(poly) {
 }
 
 export function boundingBox(geo) {
-  console.log("making bounding box");
-  try {
-    return bbox(geo);
-  } catch (err) {
-    console.log("failed to create bbox!");
-    console.log(err);
-  }
+  return bbox(geo);
 }
 
 export function pointsWithinGeo(points, geo) {

diff --git a/client/components/Map/layers/AddressLayer.js b/client/components/Map/layers/AddressLayer.js
@@ -1,25 +1,43 @@
 /* eslint-disable */
 
-import React from "react";
-import PropTypes from "prop-types";
-import homeSVG from "@assets/home-15.svg";
-import { emptyGeo, makeGeoCircle, makeGeoMask, boundingBox } from "../geoUtils";
+import React from 'react';
+import PropTypes from 'prop-types';
+import homeSVG from '@assets/home-15.svg';
+import {
+  emptyGeo,
+  makeGeoCircle,
+  makeGeoMask,
+  boundingBox,
+} from '../geoUtils';
 
 const FIT_BOUNDS_PADDING = {
   top: 65,
   bottom: 65,
   left: 300,
-  right: 300,
+  right: 300
 };
 
 function getBoundaryColor(boundaryStyle) {
-  return boundaryStyle === "light" ? "#FFFFFF" : "#27272b";
+  return boundaryStyle === 'light'
+    ? '#FFFFFF'
+    : '#27272b';
 }
 
 function getMaskFillOpacity(boundaryStyle) {
-  return boundaryStyle === "light"
-    ? ["interpolate", ["linear"], ["zoom"], 10, 0, 13, 0.2]
-    : ["interpolate", ["linear"], ["zoom"], 10, 0, 13, 0.5];
+  return boundaryStyle === 'light'
+    ? [
+      'interpolate',
+      ['linear'],
+      ['zoom'],
+      10, 0,
+      13, 0.2
+    ] : [
+      'interpolate',
+      ['linear'],
+      ['zoom'],
+      10, 0,
+      13, 0.5
+    ];
 }
 
 class AddressLayer extends React.Component {
@@ -28,8 +46,8 @@ class AddressLayer extends React.Component {
     this.onSelectRegion = onSelectRegion;
     this.canvas = map.getCanvasContainer();
     this.geojson = {
-      type: "FeatureCollection",
-      features: [],
+      "type": "FeatureCollection",
+      "features": [],
     };
     this.addImages();
     this.addSources();
@@ -41,40 +59,36 @@ class AddressLayer extends React.Component {
       this.offset = null;
       this.circle = null;
     }
-  };
+  }
 
   componentDidUpdate(prev) {
     const { visible } = this.props;
-    if (visible !== prev.visible) this.setVisibility(visible);
+    if (visible !== prev.visible)
+      this.setVisibility(visible);
   }
 
   addImages = () => {
     let img = new Image(30, 30);
-    img.onload = () => this.map.addImage("home-icon", img);
+    img.onload = () => this.map.addImage('home-icon', img);
     img.src = homeSVG;
-  };
+  }
 
   addSources = () => {
-    try {
-      this.map.addSource("point", {
-        type: "geojson",
-        data: this.geojson,
-      });
-    } catch (err) {
-      console.log("failed to add point", this.geojson);
-      console.log(err);
-    }
+    this.map.addSource('point', {
+      "type": "geojson",
+      "data": this.geojson
+    });
   };
 
   addLayers = () => {
     this.map.addLayer({
-      id: "point",
-      type: "symbol",
-      source: "point",
+      id: 'point',
+      type: 'symbol',
+      source: 'point',
       layout: {
-        "icon-image": "home-icon",
+        'icon-image': 'home-icon',
       },
-    });
+    })
   };
 
   addListeners = () => {
@@ -85,6 +99,7 @@ class AddressLayer extends React.Component {
     //   });
     //   this.canvas.style.cursor = 'grabbing';
     // };
+
     // const onUp = e => {
     //   this.onSelectRegion({
     //     geo: this.circle,
@@ -94,6 +109,7 @@ class AddressLayer extends React.Component {
     //   this.map.off('touchmove', onMove);
     //   this.canvas.style.cursor = '';
     // }
+
     // this.map.on('mousedown', 'shed-fill', e => {
     //   e.preventDefault();
     //   this.offset = {
@@ -104,19 +120,22 @@ class AddressLayer extends React.Component {
     //   this.map.once('mouseup', onUp);
     //   this.canvas.style.cursor = 'grab';
     // });
+
     // this.map.on('touchstart', 'shed-fill', e => {
     //   if (e.points.length !== 1) return;
     //   e.preventDefault();
     //   this.map.on('touchmove', onMove);
     //   this.map.once('touchend', onUp);
     // });
+
     // this.map.on('mouseenter', 'shed-fill', e => {
     //   this.canvas.style.cursor = 'move';
     // });
+
     // this.map.on('mouseleave', 'shed-fill', e => {
     //   this.canvas.style.cursor = '';
     // });
-  };
+  }
 
   // setVisibility = visible => {
   //   const value = visible ? 'visible' : 'none';
@@ -149,31 +168,21 @@ class AddressLayer extends React.Component {
   //   this.map.once('zoomend', () => this.onSelectRegion({ geo: this.circle }));
   // };
 
-  addMarker = (lngLat) => {
+  addMarker = lngLat => {
     this.geojson.features[0] = {
-      type: "Feature",
+      type: 'Feature',
       geometry: {
-        type: "Point",
+        type: 'Point',
         coordinates: lngLat,
-      },
-    };
-    try {
-      this.map.getSource("point").setData(this.geojson);
-    } catch (err) {
-      console.log("failed to add marker");
-      console.log(err);
+      }
     }
-  };
+    this.map.getSource('point').setData(this.geojson)
+  }
 
   clearMarker = () => {
     this.geojson.features = [];
-    try {
-      this.map.getSource("point").setData(this.geojson);
-    } catch (err) {
-      console.log("failed to clear marker");
-      console.log(err);
-    }
-  };
+    this.map.getSource('point').setData(this.geojson);
+  }
 
   render() {
     return null;