dev -> master (#55)

* fix reset app bug (#52)

* updates registerServiceWorker, confirms sw-build and sw-template look good, updates package.json to run customized build (#54)

* Geolocate callback & reliable fonts (#56)

* Send the users location to ga on successful locate
Use a more reliable ttf font file

* geolocate callback

* travis

* weird formatting

* no longer need to trigger

* Revert "updates registerServiceWorker, confirms sw-build and sw-template look good, updates package.json to run customized build (#54)"

This reverts commit 3a1158f.

Author: Daniel B

src/_variables.scss

@@ -6,12 +6,7 @@ $teal: #84cbdd;
 $purple: #935195;
 
 @font-face {font-family: 'Gobold Bold Italic';
-    src: url('https://db.onlinewebfonts.com/t/dbd939c1aa46674fe3c9bedb1a7d2730.eot'); /* IE9*/
-    src: url('https://db.onlinewebfonts.com/t/dbd939c1aa46674fe3c9bedb1a7d2730.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-    url('https://db.onlinewebfonts.com/t/dbd939c1aa46674fe3c9bedb1a7d2730.woff2') format('woff2'), /* chrome firefox */
-    url('https://db.onlinewebfonts.com/t/dbd939c1aa46674fe3c9bedb1a7d2730.woff') format('woff'), /* chrome firefox */
-    url('https://db.onlinewebfonts.com/t/dbd939c1aa46674fe3c9bedb1a7d2730.ttf') format('truetype'), /* chrome firefox opera Safari, Android, iOS 4.2+*/
-    url('https://db.onlinewebfonts.com/t/dbd939c1aa46674fe3c9bedb1a7d2730.svg#Gobold Bold Italic') format('svg'); /* iOS 4.1- */
+    src: url('https://static1.squarespace.com/static/56ec9968746fb97c330f612b/t/5a946ee0e2c483a55b393661/1519677152858/Gobold+Bold+Italic.ttf') format('truetype'); /* chrome firefox opera Safari, Android, iOS 4.2+*/
 }
 
 $font-gobold-bold: 'Gobold Bold Italic';

src/components/Main/Main.js

@@ -63,7 +63,7 @@ const styles = theme => ({
   },
   navLogo: {
     cursor: 'pointer',
-    fontFamily: 'Gobold Bold Italic',
+    fontFamily: 'Gobold Bold Italic, Open Sans, sans-serif;',
     color: '#fff'
   }
 });

src/components/Map/Map.js

@@ -15,8 +15,6 @@ import {
 } from "../../redux/actions";
 import {
   FIND_MY_LOCATION_ERROR,
-  FIND_MY_LOCATION_OUT_OF_BOUNDS,
-  FIND_MY_LOCATION_SELECT,
   FIND_MY_LOCATION_SUCCESS,
   LAYER_BAR_RETAIL_SERVICE,
   LAYER_BAR_RETAIL_SERVICE_LABEL,
@@ -82,15 +80,13 @@ class Map extends Component {
     map.addControl(this.geoLocate);
     map.addControl(this.bearingControl);
 
-    // Replace GeolocateControl's _updateCamera function
-    // see: https://github.com/mapbox/mapbox-gl-js/issues/6789
-    // this.geoLocate._updateCamera = this.handleGeolocation;
+    // Fired on each Geolocation API position update which returned as success.
+    this.geoLocate.on('geolocate', this.handleGeolocationSuccess);
 
     // Catch GeolocateControl errors
     this.geoLocate.on("error", this.handleGeolocationError);
 
-    map.on("load", () => {
-    });
+    map.on("load", () => {});
 
     map.on("click", e => {
       this.handleMapClick(e);
@@ -180,42 +176,21 @@ class Map extends Component {
    * // TODO Don't track user location if out of bounds. Consider going back to custom implementation
    * @param position
    */
-  handleGeolocation = position => {
+  handleGeolocationSuccess = position => {
+
     // get geolocation
     const location = new mapboxgl.LngLat(
       position.coords.longitude,
       position.coords.latitude
     );
-    const bounds = this.map.getMaxBounds();
+
     // "Long,Lat"
     let formattedLocation = [location.lng, location.lat].join(",");
-    // Report "select" action to google analytics
-    findMyLocation({type: FIND_MY_LOCATION_SELECT, payload: null});
-
-    if (bounds) {
-      // if geolocation is within maxBounds
-      if (
-        location.lng >= bounds.getWest() &&
-        location.lng <= bounds.getEast() &&
-        location.lat >= bounds.getSouth() &&
-        location.lat <= bounds.getNorth()
-      ) {
-        // Report "success" action to google analytics
-        findMyLocation({
-          type: FIND_MY_LOCATION_SUCCESS,
-          payload: formattedLocation
-        });
-        // Zoom into user's location
-        this.map.fitBounds(location.toBounds(position.coords.accuracy));
-      } else {
-        // Report "out of bounds" action to google analytics
-        findMyLocation({
-          type: FIND_MY_LOCATION_OUT_OF_BOUNDS,
-          payload: formattedLocation
-        });
-        // TODO display a helpful message about being outside of bounds
-      }
-    }
+
+    findMyLocation({
+      type: FIND_MY_LOCATION_SUCCESS,
+      payload: formattedLocation
+    });
   };
 
   /**