From ea15132d598a000e7723e2079766b17bc952aeff Mon Sep 17 00:00:00 2001
From: John Lyon-Smith <john@lyon-smith.org>
Date: Thu, 28 Jun 2018 08:32:00 -0700
Subject: [PATCH] Revert to user location from map with better GPS accuracy

---
 mobile/src/Home/Home.js                |  45 +++++++------------------
 mobile/src/Home/images/location.png    | Bin 1558 -> 0 bytes
 mobile/src/Home/images/location@2x.png | Bin 3497 -> 0 bytes
 mobile/src/Home/images/location@3x.png | Bin 5629 -> 0 bytes
 mobile/src/config.js                   |   8 ++---
 mobile/src/ui/Geolocation.js           |  35 ++++++++++---------
 6 files changed, 34 insertions(+), 54 deletions(-)
 delete mode 100644 mobile/src/Home/images/location.png
 delete mode 100644 mobile/src/Home/images/location@2x.png
 delete mode 100644 mobile/src/Home/images/location@3x.png

diff --git a/mobile/src/Home/Home.js b/mobile/src/Home/Home.js
index 6e53813..e906bd6 100644
--- a/mobile/src/Home/Home.js
+++ b/mobile/src/Home/Home.js
@@ -1,10 +1,7 @@
 import React from "react"
 import {
-  StyleSheet,
   Text,
-  TextInput,
   SectionList,
-  Image,
   View,
   TouchableOpacity,
   TouchableHighlight,
@@ -31,12 +28,8 @@ import KeyboardSpacer from "react-native-keyboard-spacer"
 import hardhatPinImage from "./images/hardhat-pin.png"
 import clipboardPinImage from "./images/clipboard-pin.png"
 import questionPinImage from "./images/question-pin.png"
-import locationImage from "./images/location.png"
 import moment from "moment"
 
-const neverAskForLocationPermissionKeyName = "NeverAskForLocationPermission"
-const neverAskForCameraKeyName = "NeverAskForCameraPermission"
-
 export class Home extends React.Component {
   constructor(props) {
     super(props)
@@ -48,8 +41,8 @@ export class Home extends React.Component {
       showWorkItems: true,
       haveCameraPermission: false,
       haveLocationPermission: false,
-      currentPosition: null,
     }
+    this.currentPosition = null
     this.isMapReady = false
     this.goToRegionWhenReady = false
     this.region = null
@@ -97,6 +90,7 @@ export class Home extends React.Component {
         }
       )
     } else {
+      navigator.geolocation.requestAuthorization()
       this.state.haveLocationPermission = true
       this.state.haveCameraPermission = true
     }
@@ -176,8 +170,8 @@ export class Home extends React.Component {
   }
 
   handleWorkItemsListPress() {
-    if (this.state.currentPosition) {
-      const { coords } = this.state.currentPosition
+    if (this.currentPosition) {
+      const { coords } = this.currentPosition
 
       this.props.history.push(
         `/workItemList?latLng=${coords.latitude},${coords.longitude}`
@@ -210,13 +204,13 @@ export class Home extends React.Component {
   }
 
   handleGlassesPress() {
-    const { sections: workItems, currentPosition } = this.state
+    const { sections: workItems } = this.state
 
-    if (currentPosition) {
+    if (this.currentPosition) {
       const {
         latitude: latitude1,
         longitude: longitude1,
-      } = currentPosition.coords
+      } = this.currentPosition.coords
       let closestWorkItem = config.alwaysShowWorkItemInAR ? workItems[0] : null
       let shortestDistance = config.minDistanceToItem
 
@@ -248,10 +242,8 @@ export class Home extends React.Component {
   }
 
   handleMyLocationPress() {
-    const { currentPosition } = this.state
-
-    if (currentPosition && this.isMapReady) {
-      const { coords } = currentPosition
+    if (this.currentPosition && this.isMapReady) {
+      const { coords } = this.currentPosition
 
       this.mapView.animateToCoordinate({
         latitude: coords.latitude,
@@ -281,14 +273,12 @@ export class Home extends React.Component {
   }
 
   handlePositionUpdate(position) {
-    this.setState({ currentPosition: position })
+    this.currentPosition = position
   }
 
   getCoordinateDistance(coordinate) {
-    const { currentPosition } = this.state
-
-    if (currentPosition) {
-      const { coords } = currentPosition
+    if (this.currentPosition) {
+      const { coords } = this.currentPosition
       const { latitude, longitude } = coordinate
 
       return (
@@ -313,7 +303,6 @@ export class Home extends React.Component {
       waitModal,
       haveCameraPermission,
       haveLocationPermission,
-      currentPosition,
     } = this.state
 
     return (
@@ -340,7 +329,7 @@ export class Home extends React.Component {
             showWorkItems && { height: "40%" },
             !showWorkItems && { flexGrow: 1 },
           ]}
-          showsUserLocation={false}
+          showsUserLocation
           showsBuildings={false}
           showsTraffic={false}
           showsIndoors={false}
@@ -376,14 +365,6 @@ export class Home extends React.Component {
               </Callout>
             </Marker>
           ))}
-          {currentPosition && (
-            <Marker
-              key={sections.length}
-              coordinate={currentPosition.coords}
-              anchor={{ x: 0.5, y: 0.5 }}
-              image={locationImage}
-            />
-          )}
         </MapView>
         <View
           style={{
diff --git a/mobile/src/Home/images/location.png b/mobile/src/Home/images/location.png
deleted file mode 100644
index 8535b53e7e17a6fc086be68da1be0d4b33d4c636..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1558
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
IM6N<$g1;^K#sB~S

diff --git a/mobile/src/Home/images/location@2x.png b/mobile/src/Home/images/location@2x.png
deleted file mode 100644
index 5d3e909dea01bd9b75c929a561a7cfeab0af9e7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3497
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
X;XbgBqxrkp00000NkvXXu0mjfYQmGX

diff --git a/mobile/src/Home/images/location@3x.png b/mobile/src/Home/images/location@3x.png
deleted file mode 100644
index 724ba210acd446359975278ae2095d77faed049a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5629
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
Xt{~kxPMu4;00000NkvXXu0mjf=0nQ|

diff --git a/mobile/src/config.js b/mobile/src/config.js
index a69b0d8..8d77af2 100644
--- a/mobile/src/config.js
+++ b/mobile/src/config.js
@@ -1,6 +1,6 @@
 export const config = {
-  localIPAddr: "192.168.1.175",
-  //localIPAddr: "192.168.1.14",
+  // localIPAddr: "192.168.1.175",
+  localIPAddr: "192.168.1.14",
   viroAPIKey: "06F37B6A-74DA-4A83-965A-7DE2209A5C46",
   googleGeocodeAPIKey: "AIzaSyCs4JVT6gysnY5dAJ7KjVJYeykLv_xz1GI",
   googleGeocodeURL: "https://maps.googleapis.com/maps/api/geocode/json",
@@ -12,8 +12,8 @@ export const config = {
   homeRegionDelta: 0.005,
   geocodeDelayMilliseconds: 500,
 
-  //defaultUser: "john@lyon-smith.org",
-  defaultUser: "",
+  defaultUser: "john@lyon-smith.org",
+  //defaultUser: "",
 
   // This region is downtown Toronto
   initialRegion: {
diff --git a/mobile/src/ui/Geolocation.js b/mobile/src/ui/Geolocation.js
index 68829fd..c9e5e41 100644
--- a/mobile/src/ui/Geolocation.js
+++ b/mobile/src/ui/Geolocation.js
@@ -15,36 +15,35 @@ export class Geolocation extends Component {
 
   constructor(props) {
     super(props)
-    reactAutoBind(this)
-
-    if (props.watch) {
-      this.intervalId = setInterval(this.updateLocation, config.geoSampleDelay)
-    } else {
-      this.intervalId = -1
-    }
+    this.watchId = -1
   }
 
   componentDidMount() {
-    this.updateLocation()
-  }
-
-  componentWillUnmount() {
-    if (this.intervalId !== -1) {
-      clearInterval(this.intervalId)
-      this.intervalId = -1
-    }
-  }
-
-  updateLocation() {
     navigator.geolocation.getCurrentPosition(
       (position) => {
         this.props.onUpdate(position)
+
+        if (this.props.watch) {
+          ;(this.watchId = navigator.geolocation.watchPosition((position) =>
+            this.props.onUpdate(position)
+          )),
+            null,
+            { distanceFilter: 5, maximumAge: 0, enableHighAccuracy: true }
+        }
       },
       null,
       { distanceFilter: 5, maximumAge: 0, enableHighAccuracy: true }
     )
   }
 
+  componentWillUnmount() {
+    if (this.watchId !== -1) {
+      navigator.geolocation.clearWatch(this.watchId)
+      navigator.geolocation.stopObserving()
+      this.watchId = -1
+    }
+  }
+
   render() {
     return null
   }