From 16924c47baec64de488ee3ce4980a1d57fea67f4 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 29 Oct 2019 19:30:29 +0530
Subject: [PATCH 01/21] [wip] service to talk to the observe api

---
 app/actions/observeApi.js   |  7 ++++++
 app/screens/Settings.js     | 11 +++++++-
 app/services/observe-api.js | 50 +++++++++++++++++++++++++++++++++++++
 app/utils/url.js            | 10 ++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 app/services/observe-api.js
 create mode 100644 app/utils/url.js

diff --git a/app/actions/observeApi.js b/app/actions/observeApi.js
index 3edb2b1f5..ecc75b850 100644
--- a/app/actions/observeApi.js
+++ b/app/actions/observeApi.js
@@ -1,4 +1,5 @@
 import * as types from './actionTypes'
+import { getProfile as apiGetProfile } from '../services/observe-api'
 
 export function setObserveAPIToken (token) {
   return {
@@ -6,3 +7,9 @@ export function setObserveAPIToken (token) {
     token
   }
 }
+
+export function getProfile () {
+  return async dispatch => {
+    await dispatch(apiGetProfile())
+  }
+}
diff --git a/app/screens/Settings.js b/app/screens/Settings.js
index 5a30629db..433738700 100644
--- a/app/screens/Settings.js
+++ b/app/screens/Settings.js
@@ -6,6 +6,7 @@ import Config from 'react-native-config'
 import { purgeCache, purgeStore, purgeCookies } from '../actions/about'
 import { purgeAllEdits } from '../actions/edit'
 import { startTrace, endTrace } from '../actions/traces'
+import { getProfile } from '../actions/observeApi'
 import Icon from '../components/Collecticons'
 import Header from '../components/Header'
 import PageWrapper from '../components/PageWrapper'
@@ -110,6 +111,13 @@ class Settings extends React.Component {
               color={colors.primary}
             />
           </ButtonWrapper>
+          <ButtonWrapper>
+            <Button
+              onPress={this.props.getProfile}
+              title='Get Observe API Profile'
+              color={colors.primary}
+            />
+          </ButtonWrapper>
           <Text>
             Observe-{version}
           </Text>
@@ -129,7 +137,8 @@ const mapDispatchToProps = {
   purgeCookies,
   purgeAllEdits,
   startTrace,
-  endTrace
+  endTrace,
+  getProfile
 }
 
 export default connect(
diff --git a/app/services/observe-api.js b/app/services/observe-api.js
new file mode 100644
index 000000000..ca99e8d4d
--- /dev/null
+++ b/app/services/observe-api.js
@@ -0,0 +1,50 @@
+import { store } from '../utils/store'
+import Config from 'react-native-config'
+import { ObserveError } from '../utils/errors'
+import { objToQueryString } from '../utils/url'
+
+/**
+ * Base function to call the Observe API. Ideally, you would not
+ * use this function directly from the outside.
+ * 
+ * @param {String} path - Path to endpoint, beginning with a '/', eg. '/traces' 
+ * @param {String} method - Method to use for request, eg. GET, POST, DELETE, PATCH. Defaults to GET.
+ * @param {Object} data - object with data to send with the request
+ */
+export async function callAPI (path, method='GET', data) {
+  const url = `${Config.OBSERVE_API_URL}${path}`
+  const token = store.getState().observeApi.token
+  if (!token) {
+    throw new ObserveError('Not logged in to Observe API') // FIXME: create error class
+  }
+  let fetchOpts = {
+    headers: {
+      'Authorization': token
+    }
+  }
+  let queryParams
+  if (data) {
+    if (method === 'GET') { // for GET, add data to URL querystring
+      queryParams = objToQueryString(data)
+      url = url + `?${queryParams}`
+    } else { // for all non-GET methods, send data as a JSON string in body
+      fetchOpts.body = JSON.stringify(data)
+    }
+  }
+  // FIXME: look into whether we should do more error handling here,
+  // or in wrapper functions
+  return await fetch(url, fetchOpts)
+}
+
+export async function getProfile () {
+  try {
+    const response = await callAPI('/profile')
+    const data = await response.json()
+    console.log('data', data)
+  }
+  catch (err) {
+    console.log('error fetching profile', err)
+  }
+}
+
+
diff --git a/app/utils/url.js b/app/utils/url.js
new file mode 100644
index 000000000..d35784bfb
--- /dev/null
+++ b/app/utils/url.js
@@ -0,0 +1,10 @@
+
+/**
+ * Converts an object like {a: 1, b: 'foo'} into "a=1&b=foo"
+ * @param {*} obj 
+ */
+export function objToQueryString (obj) {
+  return Object.keys(obj).map(key => {
+    return `${key}=${obj[key]}`
+  }).join('&')
+}
\ No newline at end of file

From e30c94ad7b51f9d8b9a6977a9a2ca6a13051bfc5 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Wed, 30 Oct 2019 15:08:29 +0530
Subject: [PATCH 02/21] use qs module instead of custom util function to
 stringify querystring

---
 app/utils/url.js | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 app/utils/url.js

diff --git a/app/utils/url.js b/app/utils/url.js
deleted file mode 100644
index d35784bfb..000000000
--- a/app/utils/url.js
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/**
- * Converts an object like {a: 1, b: 'foo'} into "a=1&b=foo"
- * @param {*} obj 
- */
-export function objToQueryString (obj) {
-  return Object.keys(obj).map(key => {
-    return `${key}=${obj[key]}`
-  }).join('&')
-}
\ No newline at end of file

From 6d2fdcf553e527af4bd3ecbf3e32ef8764f082d1 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Wed, 30 Oct 2019 15:58:20 +0530
Subject: [PATCH 03/21] lintfixes

---
 app/services/observe-api.js | 19 ++++++++-----------
 package.json                |  1 +
 yarn.lock                   |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/services/observe-api.js b/app/services/observe-api.js
index ca99e8d4d..e8c249954 100644
--- a/app/services/observe-api.js
+++ b/app/services/observe-api.js
@@ -1,18 +1,18 @@
 import { store } from '../utils/store'
 import Config from 'react-native-config'
 import { ObserveError } from '../utils/errors'
-import { objToQueryString } from '../utils/url'
+import qs from 'qs'
 
 /**
  * Base function to call the Observe API. Ideally, you would not
  * use this function directly from the outside.
- * 
- * @param {String} path - Path to endpoint, beginning with a '/', eg. '/traces' 
+ *
+ * @param {String} path - Path to endpoint, beginning with a '/', eg. '/traces'
  * @param {String} method - Method to use for request, eg. GET, POST, DELETE, PATCH. Defaults to GET.
  * @param {Object} data - object with data to send with the request
  */
-export async function callAPI (path, method='GET', data) {
-  const url = `${Config.OBSERVE_API_URL}${path}`
+export async function callAPI (path, method = 'GET', data) {
+  let url = `${Config.OBSERVE_API_URL}${path}`
   const token = store.getState().observeApi.token
   if (!token) {
     throw new ObserveError('Not logged in to Observe API') // FIXME: create error class
@@ -25,7 +25,7 @@ export async function callAPI (path, method='GET', data) {
   let queryParams
   if (data) {
     if (method === 'GET') { // for GET, add data to URL querystring
-      queryParams = objToQueryString(data)
+      queryParams = qs.stringify(data)
       url = url + `?${queryParams}`
     } else { // for all non-GET methods, send data as a JSON string in body
       fetchOpts.body = JSON.stringify(data)
@@ -33,7 +33,7 @@ export async function callAPI (path, method='GET', data) {
   }
   // FIXME: look into whether we should do more error handling here,
   // or in wrapper functions
-  return await fetch(url, fetchOpts)
+  return fetch(url, fetchOpts)
 }
 
 export async function getProfile () {
@@ -41,10 +41,7 @@ export async function getProfile () {
     const response = await callAPI('/profile')
     const data = await response.json()
     console.log('data', data)
-  }
-  catch (err) {
+  } catch (err) {
     console.log('error fetching profile', err)
   }
 }
-
-
diff --git a/package.json b/package.json
index 6d5af7d65..eb16236a1 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "p-retry": "^4.0.0",
     "p-timeout": "^3.0.0",
     "pretty-bytes": "^5.1.0",
+    "qs": "^6.9.0",
     "react": "16.9.0",
     "react-native": "0.61.1",
     "react-native-config": "^0.11.7",
diff --git a/yarn.lock b/yarn.lock
index 57bd41240..8e308fc06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7718,7 +7718,7 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-qs@^6.4.0:
+qs@^6.4.0, qs@^6.9.0:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.0.tgz#d1297e2a049c53119cb49cca366adbbacc80b409"
   integrity sha512-27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==

From 8a400eae923c79d03c65472bec8c5eaa132a481b Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Thu, 31 Oct 2019 17:48:20 +0530
Subject: [PATCH 04/21] [wip] start scaffolding action to upload all traces,
 api call + add error handling to base callAPI function

---
 app/actions/observeApi.js   |  4 ++--
 app/actions/traces.js       | 11 +++++++++++
 app/services/observe-api.js | 25 +++++++++++++++++++------
 app/utils/errors.js         |  7 +++++++
 app/utils/traces.js         |  6 ++++++
 5 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/app/actions/observeApi.js b/app/actions/observeApi.js
index ecc75b850..93b78dcad 100644
--- a/app/actions/observeApi.js
+++ b/app/actions/observeApi.js
@@ -1,5 +1,5 @@
 import * as types from './actionTypes'
-import { getProfile as apiGetProfile } from '../services/observe-api'
+import * as api from '../services/observe-api'
 
 export function setObserveAPIToken (token) {
   return {
@@ -10,6 +10,6 @@ export function setObserveAPIToken (token) {
 
 export function getProfile () {
   return async dispatch => {
-    await dispatch(apiGetProfile())
+    await dispatch(api.getProfile())
   }
 }
diff --git a/app/actions/traces.js b/app/actions/traces.js
index ae9c280ea..f68bfb1ed 100644
--- a/app/actions/traces.js
+++ b/app/actions/traces.js
@@ -1,5 +1,6 @@
 import * as types from './actionTypes'
 import traceService from '../services/trace'
+import { uploadTrace } from '../utils/traces'
 
 export function startTrace () {
   return (dispatch, getState) => {
@@ -35,6 +36,16 @@ export function endTrace (description = '') {
   }
 }
 
+export function uploadPendingTraces () {
+  return async (dispatch, getState) => {
+    const { traces } = getState().traces
+    const pendingTraces = traces.filter(t => t.pending)
+    for (let trace of pendingTraces) {
+      await uploadTrace(trace)
+    }
+  }
+}
+
 /**
  * Used to set a `saving` boolean on traces.
  * We need this to know to hide the RecordHeader on the saveTraces screen
diff --git a/app/services/observe-api.js b/app/services/observe-api.js
index e8c249954..53108bcf2 100644
--- a/app/services/observe-api.js
+++ b/app/services/observe-api.js
@@ -1,6 +1,6 @@
 import { store } from '../utils/store'
 import Config from 'react-native-config'
-import { ObserveError } from '../utils/errors'
+import { ObserveError, ObserveAPIError } from '../utils/errors'
 import qs from 'qs'
 
 /**
@@ -31,17 +31,30 @@ export async function callAPI (path, method = 'GET', data) {
       fetchOpts.body = JSON.stringify(data)
     }
   }
-  // FIXME: look into whether we should do more error handling here,
-  // or in wrapper functions
-  return fetch(url, fetchOpts)
+
+  try {
+    const response = await fetch(url, fetchOpts)
+    const data = await response.json()
+    if (response.status > 400) {
+      throw new ObserveAPIError(data.message, response.status)
+    } else {
+      return data
+    }
+  } catch (err) {
+    console.log('fetch to API failed, network error')
+    // FIXME: throw a NetworkError or so
+  }
 }
 
 export async function getProfile () {
   try {
-    const response = await callAPI('/profile')
-    const data = await response.json()
+    const data = await callAPI('/profile')
     console.log('data', data)
   } catch (err) {
     console.log('error fetching profile', err)
   }
 }
+
+export async function uploadTrace (trace) {
+  return callAPI('/traces', 'POST', trace)
+}
diff --git a/app/utils/errors.js b/app/utils/errors.js
index 2c313c3a4..783467d62 100644
--- a/app/utils/errors.js
+++ b/app/utils/errors.js
@@ -86,3 +86,10 @@ export class FeatureDeletedError extends ObserveError {
     this.retryable = false
   }
 }
+
+export class ObserveAPIError extends ObserveError {
+  constructor (message = 'Error from Observe API', status) {
+    super('ObserveAPIError', message)
+    this.status = status
+  }
+}
diff --git a/app/utils/traces.js b/app/utils/traces.js
index d0f6a9dfd..c7d20246b 100644
--- a/app/utils/traces.js
+++ b/app/utils/traces.js
@@ -1,4 +1,5 @@
 import turfLength from '@turf/length'
+import * as api from '../services/observe-api'
 
 /**
  * Returns an empty trace object
@@ -79,3 +80,8 @@ export function isValidTrace (traceGeoJSON, options) {
 export function getTraceLength (traceGeoJSON) {
   return turfLength(traceGeoJSON, { units: 'kilometers' }) * 1000
 }
+
+
+export async function uploadTrace (trace) {
+  
+}
\ No newline at end of file

From da26185266be1b7db49d708c28bf2eb16d58ffa4 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Thu, 31 Oct 2019 19:03:48 +0530
Subject: [PATCH 05/21] actions for start upload trace / uploaded trace / trace
 upload error

---
 app/actions/traces.js       | 32 +++++++++++++++++++++++++++++++-
 app/services/observe-api.js |  3 ++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/actions/traces.js b/app/actions/traces.js
index f68bfb1ed..0a1ee7452 100644
--- a/app/actions/traces.js
+++ b/app/actions/traces.js
@@ -41,11 +41,41 @@ export function uploadPendingTraces () {
     const { traces } = getState().traces
     const pendingTraces = traces.filter(t => t.pending)
     for (let trace of pendingTraces) {
-      await uploadTrace(trace)
+      dispatch(startUploadingTrace(trace))
+      try {
+        const id = await uploadTrace(trace)
+        dispatch(uploadedTrace(trace, id))
+      }
+      catch (e) {
+        dispatch(uploadTraceFailed(trace, e))
+      }
     }
   }
 }
 
+function startUploadingTrace (trace) {
+  return {
+    type: types.TRACE_UPLOAD_STARTED,
+    trace
+  }
+}
+
+function uploadedTrace (trace, id) {
+  return {
+    type: types.TRACE_UPLOADED,
+    trace,
+    newId: id
+  }
+}
+
+function uploadTraceFailed (trace, error) {
+  return {
+    type: types.TRACE_UPLOAD_FAILED,
+    trace,
+    error
+  }
+}
+
 /**
  * Used to set a `saving` boolean on traces.
  * We need this to know to hide the RecordHeader on the saveTraces screen
diff --git a/app/services/observe-api.js b/app/services/observe-api.js
index 53108bcf2..172c817f3 100644
--- a/app/services/observe-api.js
+++ b/app/services/observe-api.js
@@ -56,5 +56,6 @@ export async function getProfile () {
 }
 
 export async function uploadTrace (trace) {
-  return callAPI('/traces', 'POST', trace)
+  const data = await callAPI('/traces', 'POST', trace)
+  return data.properties.id
 }

From b8745ccf8f0cf69956c3c26d163e3d386dfd9450 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Mon, 4 Nov 2019 14:22:42 +0530
Subject: [PATCH 06/21] [wip] reducers to trace upload actions

---
 __tests__/reducers/traces.test.js |  2 ++
 app/actions/traces.js             | 30 ++++++++++++------------
 app/reducers/traces.js            | 38 +++++++++++++++++++++++++++++++
 app/utils/traces.js               |  6 -----
 package.json                      |  1 +
 yarn.lock                         |  5 ++++
 6 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/__tests__/reducers/traces.test.js b/__tests__/reducers/traces.test.js
index e0de7348d..f9f3411ff 100644
--- a/__tests__/reducers/traces.test.js
+++ b/__tests__/reducers/traces.test.js
@@ -185,6 +185,8 @@ describe('test for traces reducer', () => {
         {
           id: 'observe-hauptbanhof',
           pending: true,
+          uploading: false,
+          errors: [],
           geojson: expectedTraceGeoJSON
         }
       ]
diff --git a/app/actions/traces.js b/app/actions/traces.js
index 0a1ee7452..18e9a9d8c 100644
--- a/app/actions/traces.js
+++ b/app/actions/traces.js
@@ -1,6 +1,6 @@
 import * as types from './actionTypes'
 import traceService from '../services/trace'
-import { uploadTrace } from '../utils/traces'
+import * as api from '../services/observe-api'
 
 export function startTrace () {
   return (dispatch, getState) => {
@@ -26,13 +26,14 @@ export function unpauseTrace () {
 }
 
 export function endTrace (description = '') {
-  return (dispatch, getState) => {
+  return async (dispatch, getState) => {
     const { watcher, currentTrace } = getState().traces
     if (!currentTrace) {
       console.error('endTrace called with no current trace')
       return
     }
     traceService.endTrace(dispatch, watcher, description)
+    await uploadPendingTraces()
   }
 }
 
@@ -41,37 +42,36 @@ export function uploadPendingTraces () {
     const { traces } = getState().traces
     const pendingTraces = traces.filter(t => t.pending)
     for (let trace of pendingTraces) {
-      dispatch(startUploadingTrace(trace))
+      dispatch(startUploadingTrace(trace.id))
       try {
-        const id = await uploadTrace(trace)
-        dispatch(uploadedTrace(trace, id))
-      }
-      catch (e) {
-        dispatch(uploadTraceFailed(trace, e))
+        const newId = await api.uploadTrace(trace)
+        dispatch(uploadedTrace(trace.id, newId))
+      } catch (e) {
+        dispatch(uploadTraceFailed(trace.id, e))
       }
     }
   }
 }
 
-function startUploadingTrace (trace) {
+function startUploadingTrace (id) {
   return {
     type: types.TRACE_UPLOAD_STARTED,
-    trace
+    id
   }
 }
 
-function uploadedTrace (trace, id) {
+function uploadedTrace (oldId, newId) {
   return {
     type: types.TRACE_UPLOADED,
-    trace,
-    newId: id
+    oldId,
+    newId
   }
 }
 
-function uploadTraceFailed (trace, error) {
+function uploadTraceFailed (id, error) {
   return {
     type: types.TRACE_UPLOAD_FAILED,
-    trace,
+    id,
     error
   }
 }
diff --git a/app/reducers/traces.js b/app/reducers/traces.js
index 1a1cf6339..f6fee0238 100644
--- a/app/reducers/traces.js
+++ b/app/reducers/traces.js
@@ -5,6 +5,8 @@ import {
 } from '../utils/traces'
 
 import getRandomId from '../utils/get-random-id'
+import _cloneDeep from 'lodash.clonedeep'
+import _findIndex from 'lodash.findindex'
 
 const initialState = {
   currentTrace: null,
@@ -53,6 +55,8 @@ export default function (state = initialState, action) {
       const newTrace = {
         id: traceId,
         pending: true,
+        uploading: false,
+        errors: [],
         geojson: {
           ...state.currentTrace,
           properties: {
@@ -104,6 +108,40 @@ export default function (state = initialState, action) {
         watcher: action.watcher
       }
     }
+
+    case types.TRACE_UPLOAD_STARTED: {
+      const traces = _cloneDeep(state.traces)
+      const index = _findIndex(state.traces, t => t.id === action.id)
+      traces[index].uploading = true
+      return {
+        ...state,
+        traces
+      }
+    }
+
+    case types.TRACE_UPLOADED: {
+      const traces = _cloneDeep(state.traces)
+      const index = _findIndex(state.traces, t => t.id === action.oldId)
+      traces[index].pending = false
+      traces[index].uploading = false
+      traces[index].id = action.newId
+      traces[index].properties.id = action.newId
+      return {
+        ...state,
+        traces
+      }
+    }
+
+    case types.TRACE_UPLOAD_FAILED: {
+      const traces = _cloneDeep(state.traces)
+      const index = _findIndex(state.traces, t => t.id === action.id)
+      traces[index].uploading = false
+      traces[index].errors.push(action.error)
+      return {
+        ...state,
+        traces
+      }
+    }
   }
   return state
 }
diff --git a/app/utils/traces.js b/app/utils/traces.js
index c7d20246b..d0f6a9dfd 100644
--- a/app/utils/traces.js
+++ b/app/utils/traces.js
@@ -1,5 +1,4 @@
 import turfLength from '@turf/length'
-import * as api from '../services/observe-api'
 
 /**
  * Returns an empty trace object
@@ -80,8 +79,3 @@ export function isValidTrace (traceGeoJSON, options) {
 export function getTraceLength (traceGeoJSON) {
   return turfLength(traceGeoJSON, { units: 'kilometers' }) * 1000
 }
-
-
-export async function uploadTrace (trace) {
-  
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index eb16236a1..70904cf33 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.difference": "^4.5.0",
     "lodash.find": "^4.6.0",
+    "lodash.findindex": "^4.6.0",
     "lodash.flatten": "^4.4.0",
     "lodash.intersection": "^4.4.0",
     "lodash.isequal": "^4.5.0",
diff --git a/yarn.lock b/yarn.lock
index 8e308fc06..f3c93920a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5838,6 +5838,11 @@ lodash.find@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
   integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
 
+lodash.findindex@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106"
+  integrity sha1-oyRd7mH7m24GJLU1ElYku2nBEQY=
+
 lodash.flatten@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"

From 497753345b1d2866fc23ced31269040f0200d597 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Mon, 4 Nov 2019 14:56:40 +0530
Subject: [PATCH 07/21] call uploadPendingTraces action

---
 app/actions/traces.js       | 2 +-
 app/services/observe-api.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/actions/traces.js b/app/actions/traces.js
index 18e9a9d8c..45694b437 100644
--- a/app/actions/traces.js
+++ b/app/actions/traces.js
@@ -33,7 +33,7 @@ export function endTrace (description = '') {
       return
     }
     traceService.endTrace(dispatch, watcher, description)
-    await uploadPendingTraces()
+    await dispatch(uploadPendingTraces())
   }
 }
 
diff --git a/app/services/observe-api.js b/app/services/observe-api.js
index 172c817f3..fbe55dde7 100644
--- a/app/services/observe-api.js
+++ b/app/services/observe-api.js
@@ -56,6 +56,7 @@ export async function getProfile () {
 }
 
 export async function uploadTrace (trace) {
+  console.log('upload trace called', trace)
   const data = await callAPI('/traces', 'POST', trace)
   return data.properties.id
 }

From 77a0e9a71a494491cb281dc89d4f737fae4b4650 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Mon, 4 Nov 2019 20:30:08 +0530
Subject: [PATCH 08/21] [wip] posting to API works

---
 app/actions/traces.js       |  1 +
 app/services/observe-api.js | 16 +++++++++++-----
 app/utils/traces.js         | 11 +++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/actions/traces.js b/app/actions/traces.js
index 45694b437..e0635a5f1 100644
--- a/app/actions/traces.js
+++ b/app/actions/traces.js
@@ -39,6 +39,7 @@ export function endTrace (description = '') {
 
 export function uploadPendingTraces () {
   return async (dispatch, getState) => {
+    console.log('called upload pending traces')
     const { traces } = getState().traces
     const pendingTraces = traces.filter(t => t.pending)
     for (let trace of pendingTraces) {
diff --git a/app/services/observe-api.js b/app/services/observe-api.js
index fbe55dde7..1e30594b3 100644
--- a/app/services/observe-api.js
+++ b/app/services/observe-api.js
@@ -2,6 +2,7 @@ import { store } from '../utils/store'
 import Config from 'react-native-config'
 import { ObserveError, ObserveAPIError } from '../utils/errors'
 import qs from 'qs'
+import { getTraceGeoJSON } from '../utils/traces'
 
 /**
  * Base function to call the Observe API. Ideally, you would not
@@ -15,12 +16,15 @@ export async function callAPI (path, method = 'GET', data) {
   let url = `${Config.OBSERVE_API_URL}${path}`
   const token = store.getState().observeApi.token
   if (!token) {
+    console.log('no token found!')
     throw new ObserveError('Not logged in to Observe API') // FIXME: create error class
   }
   let fetchOpts = {
     headers: {
-      'Authorization': token
-    }
+      'Authorization': token,
+      'Content-Type': 'application/json'
+    },
+    method
   }
   let queryParams
   if (data) {
@@ -33,15 +37,17 @@ export async function callAPI (path, method = 'GET', data) {
   }
 
   try {
+    console.log('opts', url, fetchOpts)
     const response = await fetch(url, fetchOpts)
     const data = await response.json()
+    console.log('response data', data, response.status)
     if (response.status > 400) {
       throw new ObserveAPIError(data.message, response.status)
     } else {
       return data
     }
   } catch (err) {
-    console.log('fetch to API failed, network error')
+    console.log('fetch to API failed, network error', err)
     // FIXME: throw a NetworkError or so
   }
 }
@@ -56,7 +62,7 @@ export async function getProfile () {
 }
 
 export async function uploadTrace (trace) {
-  console.log('upload trace called', trace)
-  const data = await callAPI('/traces', 'POST', trace)
+  const traceGeoJSON = getTraceGeoJSON(trace)
+  const data = await callAPI('/traces', 'POST', {'tracejson': traceGeoJSON})
   return data.properties.id
 }
diff --git a/app/utils/traces.js b/app/utils/traces.js
index d0f6a9dfd..90293c9b9 100644
--- a/app/utils/traces.js
+++ b/app/utils/traces.js
@@ -79,3 +79,14 @@ export function isValidTrace (traceGeoJSON, options) {
 export function getTraceLength (traceGeoJSON) {
   return turfLength(traceGeoJSON, { units: 'kilometers' }) * 1000
 }
+
+export function getTraceGeoJSON (trace) {
+  return {
+    type: 'Feature',
+    properties: {
+      timestamps: trace.geojson.properties.timestamps,
+      description: trace.geojson.properties.description || ''
+    },
+    geometry: trace.geojson.geometry
+  }
+}
\ No newline at end of file

From 1bbbfa53cf015f34e9735970fec9860cba112d57 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 5 Nov 2019 11:23:05 +0530
Subject: [PATCH 09/21] dont try and upload a trace that is in an uploading
 state

---
 app/actions/traces.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/actions/traces.js b/app/actions/traces.js
index e0635a5f1..db38967aa 100644
--- a/app/actions/traces.js
+++ b/app/actions/traces.js
@@ -41,7 +41,7 @@ export function uploadPendingTraces () {
   return async (dispatch, getState) => {
     console.log('called upload pending traces')
     const { traces } = getState().traces
-    const pendingTraces = traces.filter(t => t.pending)
+    const pendingTraces = traces.filter(t => t.pending && !t.uploading)
     for (let trace of pendingTraces) {
       dispatch(startUploadingTrace(trace.id))
       try {

From a02e72dc681584b71491bfb65c13347c6b3ba065 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 5 Nov 2019 15:40:42 +0530
Subject: [PATCH 10/21] add persistence for observe api token

---
 app/reducers/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/reducers/index.js b/app/reducers/index.js
index 8ebeea195..14deee2ac 100644
--- a/app/reducers/index.js
+++ b/app/reducers/index.js
@@ -46,6 +46,14 @@ const tracesPersistConfig = {
   ]
 }
 
+const observeApiPersistConfig = {
+  key: 'observeApi',
+  whitelist: [
+    'token'
+  ]
+}
+
+
 const rootReducer = combineReducers({
   about: AboutReducer,
   authorization: persistReducer(authorizationPersistConfig, AuthorizationReducer),
@@ -57,7 +65,7 @@ const rootReducer = combineReducers({
   notification: NotificationReducer,
   photos: CameraReducer,
   traces: persistReducer(tracesPersistConfig, TracesReducer),
-  observeApi: ObserveAPIReducer
+  observeApi: persistReducer(observeApiPersistConfig, ObserveAPIReducer)
 })
 
 export default rootReducer

From a8c55be24aca871868dbb520410ac525d460940d Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 5 Nov 2019 17:17:59 +0530
Subject: [PATCH 11/21] [wip] start adding tests for trace upload actions

---
 .../actions/__snapshots__/trace.test.js.snap  | 32 ++++++-
 __tests__/actions/trace.test.js               | 95 ++++++++++++++++++-
 __tests__/setup/mock.js                       |  3 +-
 3 files changed, 125 insertions(+), 5 deletions(-)

diff --git a/__tests__/actions/__snapshots__/trace.test.js.snap b/__tests__/actions/__snapshots__/trace.test.js.snap
index 4d112e21f..cda8d5b6b 100644
--- a/__tests__/actions/__snapshots__/trace.test.js.snap
+++ b/__tests__/actions/__snapshots__/trace.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`test trace actions should start trace correctly 1`] = `
+exports[`test trace sync actions should start trace correctly 1`] = `
 Array [
   Object {
     "type": "TRACE_START",
@@ -45,3 +45,33 @@ Array [
   },
 ]
 `;
+
+exports[`trace upload / async actions should upload a single trace 1`] = `
+Array [
+  Object {
+    "id": "id-1",
+    "type": "TRACE_UPLOAD_STARTED",
+  },
+  Object {
+    "newId": "fakeid",
+    "oldId": "id-1",
+    "type": "TRACE_UPLOADED",
+  },
+]
+`;
+
+exports[`trace upload / async actions should upload a single trace 2`] = `
+Array [
+  Array [
+    "http://localhost:3000/traces",
+    Object {
+      "body": "{\\"tracejson\\":{\\"type\\":\\"Feature\\",\\"properties\\":{\\"timestamps\\":[1,11,21],\\"description\\":\\"\\"},\\"geometry\\":{\\"type\\":\\"LineString\\",\\"coordinates\\":[[1,1],[2,0],[3,-1]]}}}",
+      "headers": Object {
+        "Authorization": "abcd",
+        "Content-Type": "application/json",
+      },
+      "method": "POST",
+    },
+  ],
+]
+`;
diff --git a/__tests__/actions/trace.test.js b/__tests__/actions/trace.test.js
index f2ece2b00..0fb6da503 100644
--- a/__tests__/actions/trace.test.js
+++ b/__tests__/actions/trace.test.js
@@ -1,4 +1,4 @@
-/* global jest, it, expect, describe */
+/* global jest, it, expect, describe, fetch */
 
 import configureStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
@@ -8,7 +8,8 @@ import {
   pauseTrace,
   unpauseTrace,
   startSavingTrace,
-  discardTrace
+  discardTrace,
+  uploadPendingTraces
 } from '../../app/actions/traces'
 const middlewares = [thunk]
 const mockStore = configureStore(middlewares)
@@ -45,6 +46,22 @@ jest.mock('../../app/services/trace', () => {
   }
 })
 
+// This is required because the observe API service calls the store directly
+// to get the token.
+jest.mock('../../app/utils/store', () => {
+  return {
+    store: {
+      getState: () => {
+        return {
+          observeApi: {
+            token: 'abcd'
+          }
+        }
+      }
+    }
+  }
+})
+
 const getMockCurrentTrace = function () {
   return {
     type: 'Feature',
@@ -59,7 +76,59 @@ const getMockCurrentTrace = function () {
   }
 }
 
-describe('test trace actions', () => {
+/**
+ * 
+ * @param {Number} m - used to construct id, timestamps, coords 
+ */
+const getMockTrace = function (m) {
+  return {
+    id: `id-${m}`,
+    pending: true,
+    uploading: false,
+    geojson: {
+      type: 'Feature',
+      properties: {
+        timestamps: [
+          m,
+          m + 10,
+          m + 20
+        ]
+      },
+      geometry: {
+        type: 'LineString',
+        coordinates: [
+          [m,m],
+          [m+1, m-1],
+          [m+2, m-2]
+        ]
+      }
+    }
+  }
+}
+
+const getMockTracePostResponse = function (m, id) {
+  return {
+    type: 'Feature',
+    properties: {
+      id,
+      timestamps: [
+        m,
+        m + 10,
+        m + 20
+      ]
+    },
+    geometry: {
+      type: 'LineString',
+      coordinates: [
+        [m,m],
+        [m+1, m-1],
+        [m+2, m-2]
+      ]
+    }
+  }
+}
+
+describe('test trace sync actions', () => {
   it('should start trace correctly', () => {
     const store = mockStore({
       traces: {
@@ -123,3 +192,23 @@ describe('test trace actions', () => {
     expect(actions[0].type).toEqual('TRACE_DISCARD')
   })
 })
+
+describe('trace upload / async actions', () => {
+  it('should upload a single trace', async () => {
+    const store = mockStore({
+      traces: {
+        traces: [
+          getMockTrace(1)
+        ]
+      },
+      observeApi: {
+        token: 'abcd'
+      }
+    })
+    fetch.once(JSON.stringify(getMockTracePostResponse(1, 'fakeid')))
+    await store.dispatch(uploadPendingTraces())
+    const actions = store.getActions()
+    expect(actions).toMatchSnapshot()
+    expect(fetch.mock.calls).toMatchSnapshot()
+  })
+})
diff --git a/__tests__/setup/mock.js b/__tests__/setup/mock.js
index 4d9b9483b..a46e63c1e 100644
--- a/__tests__/setup/mock.js
+++ b/__tests__/setup/mock.js
@@ -266,7 +266,8 @@ jest.mock('react-native-geolocation-service', () => ({
 
 jest.mock('react-native-config', () => ({
   OPENCAGE_KEY: 123,
-  API_URL: 'http://example.com'
+  API_URL: 'http://example.com',
+  OBSERVE_API_URL: 'http://localhost:3000'
 }))
 
 jest.mock('../../app/utils/get-random-id', () => {

From 72b14d52c0ca5d282d091280cb2f5f1a35a6dc3b Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 5 Nov 2019 17:25:17 +0530
Subject: [PATCH 12/21] lintfix

---
 __tests__/actions/trace.test.js | 16 ++++++++--------
 app/reducers/index.js           |  1 -
 app/services/observe-api.js     |  2 +-
 app/utils/traces.js             |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/__tests__/actions/trace.test.js b/__tests__/actions/trace.test.js
index 0fb6da503..5efd68954 100644
--- a/__tests__/actions/trace.test.js
+++ b/__tests__/actions/trace.test.js
@@ -77,8 +77,8 @@ const getMockCurrentTrace = function () {
 }
 
 /**
- * 
- * @param {Number} m - used to construct id, timestamps, coords 
+ *
+ * @param {Number} m - used to construct id, timestamps, coords
  */
 const getMockTrace = function (m) {
   return {
@@ -97,9 +97,9 @@ const getMockTrace = function (m) {
       geometry: {
         type: 'LineString',
         coordinates: [
-          [m,m],
-          [m+1, m-1],
-          [m+2, m-2]
+          [m, m],
+          [m + 1, m - 1],
+          [m + 2, m - 2]
         ]
       }
     }
@@ -120,9 +120,9 @@ const getMockTracePostResponse = function (m, id) {
     geometry: {
       type: 'LineString',
       coordinates: [
-        [m,m],
-        [m+1, m-1],
-        [m+2, m-2]
+        [m, m],
+        [m + 1, m - 1],
+        [m + 2, m - 2]
       ]
     }
   }
diff --git a/app/reducers/index.js b/app/reducers/index.js
index 14deee2ac..34d4d28f1 100644
--- a/app/reducers/index.js
+++ b/app/reducers/index.js
@@ -53,7 +53,6 @@ const observeApiPersistConfig = {
   ]
 }
 
-
 const rootReducer = combineReducers({
   about: AboutReducer,
   authorization: persistReducer(authorizationPersistConfig, AuthorizationReducer),
diff --git a/app/services/observe-api.js b/app/services/observe-api.js
index 1e30594b3..f9181ab36 100644
--- a/app/services/observe-api.js
+++ b/app/services/observe-api.js
@@ -63,6 +63,6 @@ export async function getProfile () {
 
 export async function uploadTrace (trace) {
   const traceGeoJSON = getTraceGeoJSON(trace)
-  const data = await callAPI('/traces', 'POST', {'tracejson': traceGeoJSON})
+  const data = await callAPI('/traces', 'POST', { 'tracejson': traceGeoJSON })
   return data.properties.id
 }
diff --git a/app/utils/traces.js b/app/utils/traces.js
index 90293c9b9..fad819024 100644
--- a/app/utils/traces.js
+++ b/app/utils/traces.js
@@ -89,4 +89,4 @@ export function getTraceGeoJSON (trace) {
     },
     geometry: trace.geojson.geometry
   }
-}
\ No newline at end of file
+}

From 24af884b90382f59c0f22db829a6e3e93554f247 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 5 Nov 2019 18:01:59 +0530
Subject: [PATCH 13/21] add tests to handle pending and uploading states of
 traces

---
 .../actions/__snapshots__/trace.test.js.snap  | 110 ++++++++++++++++++
 __tests__/actions/trace.test.js               |  62 +++++++++-
 2 files changed, 169 insertions(+), 3 deletions(-)

diff --git a/__tests__/actions/__snapshots__/trace.test.js.snap b/__tests__/actions/__snapshots__/trace.test.js.snap
index cda8d5b6b..9b36329e3 100644
--- a/__tests__/actions/__snapshots__/trace.test.js.snap
+++ b/__tests__/actions/__snapshots__/trace.test.js.snap
@@ -46,6 +46,66 @@ Array [
 ]
 `;
 
+exports[`trace upload / async actions should not upload non-pending traces 1`] = `
+Array [
+  Object {
+    "id": "id-1",
+    "type": "TRACE_UPLOAD_STARTED",
+  },
+  Object {
+    "newId": "fakeid-1",
+    "oldId": "id-1",
+    "type": "TRACE_UPLOADED",
+  },
+]
+`;
+
+exports[`trace upload / async actions should not upload non-pending traces 2`] = `
+Array [
+  Array [
+    "http://localhost:3000/traces",
+    Object {
+      "body": "{\\"tracejson\\":{\\"type\\":\\"Feature\\",\\"properties\\":{\\"timestamps\\":[1,11,21],\\"description\\":\\"\\"},\\"geometry\\":{\\"type\\":\\"LineString\\",\\"coordinates\\":[[1,1],[2,0],[3,-1]]}}}",
+      "headers": Object {
+        "Authorization": "abcd",
+        "Content-Type": "application/json",
+      },
+      "method": "POST",
+    },
+  ],
+]
+`;
+
+exports[`trace upload / async actions should not upload uploading traces 1`] = `
+Array [
+  Object {
+    "id": "id-2",
+    "type": "TRACE_UPLOAD_STARTED",
+  },
+  Object {
+    "newId": "fakeid-2",
+    "oldId": "id-2",
+    "type": "TRACE_UPLOADED",
+  },
+]
+`;
+
+exports[`trace upload / async actions should not upload uploading traces 2`] = `
+Array [
+  Array [
+    "http://localhost:3000/traces",
+    Object {
+      "body": "{\\"tracejson\\":{\\"type\\":\\"Feature\\",\\"properties\\":{\\"timestamps\\":[2,12,22],\\"description\\":\\"\\"},\\"geometry\\":{\\"type\\":\\"LineString\\",\\"coordinates\\":[[2,2],[3,1],[4,0]]}}}",
+      "headers": Object {
+        "Authorization": "abcd",
+        "Content-Type": "application/json",
+      },
+      "method": "POST",
+    },
+  ],
+]
+`;
+
 exports[`trace upload / async actions should upload a single trace 1`] = `
 Array [
   Object {
@@ -75,3 +135,53 @@ Array [
   ],
 ]
 `;
+
+exports[`trace upload / async actions should upload multiple pending traces 1`] = `
+Array [
+  Object {
+    "id": "id-1",
+    "type": "TRACE_UPLOAD_STARTED",
+  },
+  Object {
+    "newId": "fakeid-1",
+    "oldId": "id-1",
+    "type": "TRACE_UPLOADED",
+  },
+  Object {
+    "id": "id-2",
+    "type": "TRACE_UPLOAD_STARTED",
+  },
+  Object {
+    "newId": "fakeid-2",
+    "oldId": "id-2",
+    "type": "TRACE_UPLOADED",
+  },
+]
+`;
+
+exports[`trace upload / async actions should upload multiple pending traces 2`] = `
+Array [
+  Array [
+    "http://localhost:3000/traces",
+    Object {
+      "body": "{\\"tracejson\\":{\\"type\\":\\"Feature\\",\\"properties\\":{\\"timestamps\\":[1,11,21],\\"description\\":\\"\\"},\\"geometry\\":{\\"type\\":\\"LineString\\",\\"coordinates\\":[[1,1],[2,0],[3,-1]]}}}",
+      "headers": Object {
+        "Authorization": "abcd",
+        "Content-Type": "application/json",
+      },
+      "method": "POST",
+    },
+  ],
+  Array [
+    "http://localhost:3000/traces",
+    Object {
+      "body": "{\\"tracejson\\":{\\"type\\":\\"Feature\\",\\"properties\\":{\\"timestamps\\":[2,12,22],\\"description\\":\\"\\"},\\"geometry\\":{\\"type\\":\\"LineString\\",\\"coordinates\\":[[2,2],[3,1],[4,0]]}}}",
+      "headers": Object {
+        "Authorization": "abcd",
+        "Content-Type": "application/json",
+      },
+      "method": "POST",
+    },
+  ],
+]
+`;
diff --git a/__tests__/actions/trace.test.js b/__tests__/actions/trace.test.js
index 5efd68954..9e7995678 100644
--- a/__tests__/actions/trace.test.js
+++ b/__tests__/actions/trace.test.js
@@ -200,15 +200,71 @@ describe('trace upload / async actions', () => {
         traces: [
           getMockTrace(1)
         ]
-      },
-      observeApi: {
-        token: 'abcd'
       }
     })
+    fetch.resetMocks()
     fetch.once(JSON.stringify(getMockTracePostResponse(1, 'fakeid')))
     await store.dispatch(uploadPendingTraces())
     const actions = store.getActions()
     expect(actions).toMatchSnapshot()
     expect(fetch.mock.calls).toMatchSnapshot()
   })
+
+  it('should upload multiple pending traces', async () => {
+    const store = mockStore({
+      traces: {
+        traces: [
+          getMockTrace(1),
+          getMockTrace(2)
+        ]
+      }
+    })
+    fetch.resetMocks()
+    fetch.once(JSON.stringify(getMockTracePostResponse(1, 'fakeid-1')))
+      .once(JSON.stringify(getMockTracePostResponse(2, 'fakeid-2')))
+    await store.dispatch(uploadPendingTraces())
+    const actions = store.getActions()
+    expect(actions).toMatchSnapshot()
+    expect(fetch.mock.calls).toMatchSnapshot()
+  })
+
+  it('should not upload non-pending traces', async () => {
+    const trace1 = getMockTrace(1)
+    const trace2 = getMockTrace(2)
+    trace2.pending = false
+    const store = mockStore({
+      traces: {
+        traces: [
+          trace1,
+          trace2
+        ]
+      }
+    })
+    fetch.resetMocks()
+    fetch.once(JSON.stringify(getMockTracePostResponse(1, 'fakeid-1')))
+    await store.dispatch(uploadPendingTraces())
+    const actions = store.getActions()
+    expect(actions).toMatchSnapshot()
+    expect(fetch.mock.calls).toMatchSnapshot()
+  })
+
+  it('should not upload uploading traces', async () => {
+    const trace1 = getMockTrace(1)
+    trace1.uploading = true
+    const trace2 = getMockTrace(2)
+    const store = mockStore({
+      traces: {
+        traces: [
+          trace1,
+          trace2
+        ]
+      }
+    })
+    fetch.resetMocks()
+    fetch.once(JSON.stringify(getMockTracePostResponse(2, 'fakeid-2')))
+    await store.dispatch(uploadPendingTraces())
+    const actions = store.getActions()
+    expect(actions).toMatchSnapshot()
+    expect(fetch.mock.calls).toMatchSnapshot()
+  })
 })

From ba3b05914ba9ca07c92d5e6b7142314b7bd6d603 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 5 Nov 2019 18:11:38 +0530
Subject: [PATCH 14/21] add basic test that error fires error action and stores
 error details with trace

---
 .../actions/__snapshots__/trace.test.js.snap  | 30 +++++++++++++++++++
 __tests__/actions/trace.test.js               | 17 +++++++++++
 app/services/observe-api.js                   |  3 +-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/__tests__/actions/__snapshots__/trace.test.js.snap b/__tests__/actions/__snapshots__/trace.test.js.snap
index 9b36329e3..ff34ad410 100644
--- a/__tests__/actions/__snapshots__/trace.test.js.snap
+++ b/__tests__/actions/__snapshots__/trace.test.js.snap
@@ -46,6 +46,36 @@ Array [
 ]
 `;
 
+exports[`trace upload / async actions should add error to the trace for an error response 1`] = `
+Array [
+  Object {
+    "id": "id-1",
+    "type": "TRACE_UPLOAD_STARTED",
+  },
+  Object {
+    "error": [Error: Unknown error],
+    "id": "id-1",
+    "type": "TRACE_UPLOAD_FAILED",
+  },
+]
+`;
+
+exports[`trace upload / async actions should add error to the trace for an error response 2`] = `
+Array [
+  Array [
+    "http://localhost:3000/traces",
+    Object {
+      "body": "{\\"tracejson\\":{\\"type\\":\\"Feature\\",\\"properties\\":{\\"timestamps\\":[1,11,21],\\"description\\":\\"\\"},\\"geometry\\":{\\"type\\":\\"LineString\\",\\"coordinates\\":[[1,1],[2,0],[3,-1]]}}}",
+      "headers": Object {
+        "Authorization": "abcd",
+        "Content-Type": "application/json",
+      },
+      "method": "POST",
+    },
+  ],
+]
+`;
+
 exports[`trace upload / async actions should not upload non-pending traces 1`] = `
 Array [
   Object {
diff --git a/__tests__/actions/trace.test.js b/__tests__/actions/trace.test.js
index 9e7995678..644bd6362 100644
--- a/__tests__/actions/trace.test.js
+++ b/__tests__/actions/trace.test.js
@@ -267,4 +267,21 @@ describe('trace upload / async actions', () => {
     expect(actions).toMatchSnapshot()
     expect(fetch.mock.calls).toMatchSnapshot()
   })
+
+  it('should add error to the trace for an error response', async () => {
+    const trace1 = getMockTrace(1)
+    const store = mockStore({
+      traces: {
+        traces: [
+          trace1
+        ]
+      }
+    })
+    fetch.resetMocks()
+    fetch.once(JSON.stringify({'message': 'Unknown error'}), {status: 500})
+    await store.dispatch(uploadPendingTraces())
+    const actions = store.getActions()
+    expect(actions).toMatchSnapshot()
+    expect(fetch.mock.calls).toMatchSnapshot()
+  })
 })
diff --git a/app/services/observe-api.js b/app/services/observe-api.js
index f9181ab36..252ae8329 100644
--- a/app/services/observe-api.js
+++ b/app/services/observe-api.js
@@ -47,7 +47,8 @@ export async function callAPI (path, method = 'GET', data) {
       return data
     }
   } catch (err) {
-    console.log('fetch to API failed, network error', err)
+    console.log('fetch to API failed', err)
+    throw err
     // FIXME: throw a NetworkError or so
   }
 }

From 6993c657e6149122a3beb3d7d12f40d0ef0bf98e Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Tue, 5 Nov 2019 18:12:04 +0530
Subject: [PATCH 15/21] lintfix

---
 __tests__/actions/trace.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/actions/trace.test.js b/__tests__/actions/trace.test.js
index 644bd6362..a45fbf8b9 100644
--- a/__tests__/actions/trace.test.js
+++ b/__tests__/actions/trace.test.js
@@ -278,7 +278,7 @@ describe('trace upload / async actions', () => {
       }
     })
     fetch.resetMocks()
-    fetch.once(JSON.stringify({'message': 'Unknown error'}), {status: 500})
+    fetch.once(JSON.stringify({ 'message': 'Unknown error' }), { status: 500 })
     await store.dispatch(uploadPendingTraces())
     const actions = store.getActions()
     expect(actions).toMatchSnapshot()

From a4eccc1e559166e2fd2c0ee6702051295c0a0c7b Mon Sep 17 00:00:00 2001
From: sethvincent <sethvincent@gmail.com>
Date: Thu, 7 Nov 2019 17:45:46 -0500
Subject: [PATCH 16/21] add example env to .env.sample, add storage to
 observeApiPersistConfig

---
 .env.sample           | 9 ++++++---
 app/reducers/index.js | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env.sample b/.env.sample
index 0e9d6085d..2e43daeb5 100644
--- a/.env.sample
+++ b/.env.sample
@@ -27,11 +27,14 @@ OAUTH_CONSUMER_KEY=<consumer_key>
 OAUTH_CONSUMER_SECRET=<consumer_secret>
 
 # require additional auth before osm auth
-PREAUTH_URL=<optional>
-PREAUTH_NAME=<optional>
+# PREAUTH_URL=<optional>
+# PREAUTH_NAME=<optional>
 
 # geocoding via opencage
 OPENCAGE_KEY=<optional>
 
 # set limit for downloading mapbox tiles. 6000 is default and compliant with ToS
-MAPBOX_OFFLINE_TILE_DOWNLOAD_LIMIT=6000
\ No newline at end of file
+MAPBOX_OFFLINE_TILE_DOWNLOAD_LIMIT=6000
+
+# optional observe api endpoint to send photos and traces to
+# OBSERVE_API_URL=<optional>
diff --git a/app/reducers/index.js b/app/reducers/index.js
index b0e4c4779..c06ecb0ea 100644
--- a/app/reducers/index.js
+++ b/app/reducers/index.js
@@ -48,6 +48,7 @@ const tracesPersistConfig = {
 
 const observeApiPersistConfig = {
   key: 'observeApi',
+  storage,
   whitelist: [
     'token'
   ]

From 9e1599d12e6397c19ec1c83319aefbbee076fc37 Mon Sep 17 00:00:00 2001
From: sethvincent <sethvincent@gmail.com>
Date: Fri, 8 Nov 2019 13:05:27 -0500
Subject: [PATCH 17/21] check if properties obj exists on new traces

---
 app/reducers/traces.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/reducers/traces.js b/app/reducers/traces.js
index f6fee0238..6389c5feb 100644
--- a/app/reducers/traces.js
+++ b/app/reducers/traces.js
@@ -125,6 +125,9 @@ export default function (state = initialState, action) {
       traces[index].pending = false
       traces[index].uploading = false
       traces[index].id = action.newId
+      if (!traces[index].properties) {
+        traces[index].properties = {}
+      }
       traces[index].properties.id = action.newId
       return {
         ...state,

From 956105cfb7c7f11d3e05ff037616f01ce33883d3 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Mon, 11 Nov 2019 16:44:57 +0530
Subject: [PATCH 18/21] [wip] reducer tests

---
 __tests__/actions/trace.test.js   | 30 +-----------------------------
 __tests__/reducers/traces.test.js |  6 ++++++
 __tests__/test-utils.js           | 31 +++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/__tests__/actions/trace.test.js b/__tests__/actions/trace.test.js
index a45fbf8b9..bbe703fc4 100644
--- a/__tests__/actions/trace.test.js
+++ b/__tests__/actions/trace.test.js
@@ -13,6 +13,7 @@ import {
 } from '../../app/actions/traces'
 const middlewares = [thunk]
 const mockStore = configureStore(middlewares)
+import { getMockTrace } from '../test-utils'
 
 jest.mock('../../app/services/trace', () => {
   return {
@@ -76,35 +77,6 @@ const getMockCurrentTrace = function () {
   }
 }
 
-/**
- *
- * @param {Number} m - used to construct id, timestamps, coords
- */
-const getMockTrace = function (m) {
-  return {
-    id: `id-${m}`,
-    pending: true,
-    uploading: false,
-    geojson: {
-      type: 'Feature',
-      properties: {
-        timestamps: [
-          m,
-          m + 10,
-          m + 20
-        ]
-      },
-      geometry: {
-        type: 'LineString',
-        coordinates: [
-          [m, m],
-          [m + 1, m - 1],
-          [m + 2, m - 2]
-        ]
-      }
-    }
-  }
-}
 
 const getMockTracePostResponse = function (m, id) {
   return {
diff --git a/__tests__/reducers/traces.test.js b/__tests__/reducers/traces.test.js
index f9f3411ff..62e82b671 100644
--- a/__tests__/reducers/traces.test.js
+++ b/__tests__/reducers/traces.test.js
@@ -221,3 +221,9 @@ describe('test for traces reducer', () => {
     expect(newState.saving).toEqual(false)
   })
 })
+
+describe('tests for upload trace actions', () => {
+  it('should handle TRACE_UPLOAD_START action correctly', () => {
+    
+  })
+})
diff --git a/__tests__/test-utils.js b/__tests__/test-utils.js
index 531f42fb9..931742a67 100644
--- a/__tests__/test-utils.js
+++ b/__tests__/test-utils.js
@@ -16,3 +16,34 @@ export function getFeature (
     geometry
   }
 }
+
+/**
+ * 
+ * @param {Number} m - used to construct id, timestamps, coords
+ */
+export function getMockTrace (m) {
+  return {
+    id: `id-${m}`,
+    pending: true,
+    uploading: false,
+    geojson: {
+      type: 'Feature',
+      properties: {
+        timestamps: [
+          m,
+          m + 10,
+          m + 20
+        ]
+      },
+      geometry: {
+        type: 'LineString',
+        coordinates: [
+          [m, m],
+          [m + 1, m - 1],
+          [m + 2, m - 2]
+        ]
+      }
+    }
+  }
+}
+

From db2a4127b82b620cc331453b3c9b984e3e49e94d Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Wed, 13 Nov 2019 18:21:30 +0530
Subject: [PATCH 19/21] test for trace upload failed reducer

---
 __tests__/reducers/traces.test.js | 68 ++++++++++++++++++++++++++++++-
 __tests__/test-utils.js           |  1 +
 app/reducers/traces.js            |  5 +--
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/__tests__/reducers/traces.test.js b/__tests__/reducers/traces.test.js
index 62e82b671..eaf8d701b 100644
--- a/__tests__/reducers/traces.test.js
+++ b/__tests__/reducers/traces.test.js
@@ -1,6 +1,8 @@
 /* global describe, it, expect */
 
 import reducer from '../../app/reducers/traces'
+import { getMockTrace } from '../test-utils'
+import { ObserveAPIError } from '../../app/utils/errors'
 
 const initialState = {
   currentTrace: null,
@@ -223,7 +225,69 @@ describe('test for traces reducer', () => {
 })
 
 describe('tests for upload trace actions', () => {
-  it('should handle TRACE_UPLOAD_START action correctly', () => {
-    
+  it('should handle TRACE_UPLOAD_STARTED action correctly', () => {
+    const mockTrace1 = getMockTrace(1)
+    const mockTrace2 = getMockTrace(2)
+    const state = {
+      ...initialState,
+      traces: [
+        mockTrace1,
+        mockTrace2
+      ]
+    }
+    const action = {
+      type: 'TRACE_UPLOAD_STARTED',
+      id: mockTrace1.id
+    }
+    const newState = reducer(state, action)
+    expect(newState.traces[0].uploading).toEqual(true)
+    expect(newState.traces[1].uploading).toEqual(false)
+  })
+
+  it('should handle TRACE_UPLOADED action correctly', () => {
+    const mockTrace1 = getMockTrace(1)
+    mockTrace1.uploading = true
+    const mockTrace2 = getMockTrace(2)
+    const state = {
+      ...initialState,
+      traces: [
+        mockTrace1,
+        mockTrace2
+      ]
+    }
+    const action = {
+      type: 'TRACE_UPLOADED',
+      oldId: mockTrace1.id,
+      newId: 'fakeid'
+    }
+    const newState = reducer(state, action)
+    expect(newState.traces[0].id).toEqual('fakeid')
+    expect(newState.traces[0].uploading).toEqual(false)
+    expect(newState.traces[0].pending).toEqual(false)
+    expect(newState.traces[0].geojson.properties.id).toEqual('fakeid')
+  })
+
+  it('should handle TRACE_UPLOAD_FAILED action correctly', () => {
+    const mockTrace1 = getMockTrace(1)
+    mockTrace1.uploading = true
+    const mockTrace2 = getMockTrace(2)
+    const state = {
+      ...initialState,
+      traces: [
+        mockTrace1,
+        mockTrace2
+      ]
+    }
+    const action = {
+      type: 'TRACE_UPLOAD_FAILED',
+      id: mockTrace1.id,
+      error: new ObserveAPIError('fake', 404)
+    }
+    const newState = reducer(state, action)
+    expect(newState.traces[0].errors.length).toEqual(1)
+    expect(newState.traces[0].pending).toEqual(true)
+    expect(newState.traces[0].uploading).toEqual(false)
+    expect(newState.traces[0].errors[0].message).toEqual('fake')
+    expect(newState.traces[0].errors[0].status).toEqual(404)
   })
 })
diff --git a/__tests__/test-utils.js b/__tests__/test-utils.js
index 931742a67..8871d819a 100644
--- a/__tests__/test-utils.js
+++ b/__tests__/test-utils.js
@@ -26,6 +26,7 @@ export function getMockTrace (m) {
     id: `id-${m}`,
     pending: true,
     uploading: false,
+    errors: [],
     geojson: {
       type: 'Feature',
       properties: {
diff --git a/app/reducers/traces.js b/app/reducers/traces.js
index 6389c5feb..0fdd11f71 100644
--- a/app/reducers/traces.js
+++ b/app/reducers/traces.js
@@ -125,10 +125,7 @@ export default function (state = initialState, action) {
       traces[index].pending = false
       traces[index].uploading = false
       traces[index].id = action.newId
-      if (!traces[index].properties) {
-        traces[index].properties = {}
-      }
-      traces[index].properties.id = action.newId
+      traces[index].geojson.properties.id = action.newId
       return {
         ...state,
         traces

From 591248fc48095b92f14f4f7dda468a10ff55e030 Mon Sep 17 00:00:00 2001
From: Sanjay B <sanjaybhangar@gmail.com>
Date: Wed, 13 Nov 2019 18:32:55 +0530
Subject: [PATCH 20/21] use status string to signify pending, uploading,
 uploaded for traces, similar to edits

---
 __tests__/actions/trace.test.js   |  7 +++----
 __tests__/reducers/traces.test.js | 13 +++++--------
 __tests__/test-utils.js           |  6 ++----
 app/actions/traces.js             |  2 +-
 app/reducers/traces.js            | 10 ++++------
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/__tests__/actions/trace.test.js b/__tests__/actions/trace.test.js
index bbe703fc4..0c7df7992 100644
--- a/__tests__/actions/trace.test.js
+++ b/__tests__/actions/trace.test.js
@@ -11,9 +11,9 @@ import {
   discardTrace,
   uploadPendingTraces
 } from '../../app/actions/traces'
+import { getMockTrace } from '../test-utils'
 const middlewares = [thunk]
 const mockStore = configureStore(middlewares)
-import { getMockTrace } from '../test-utils'
 
 jest.mock('../../app/services/trace', () => {
   return {
@@ -77,7 +77,6 @@ const getMockCurrentTrace = function () {
   }
 }
 
-
 const getMockTracePostResponse = function (m, id) {
   return {
     type: 'Feature',
@@ -203,7 +202,7 @@ describe('trace upload / async actions', () => {
   it('should not upload non-pending traces', async () => {
     const trace1 = getMockTrace(1)
     const trace2 = getMockTrace(2)
-    trace2.pending = false
+    trace2.status = 'uploaded'
     const store = mockStore({
       traces: {
         traces: [
@@ -222,7 +221,7 @@ describe('trace upload / async actions', () => {
 
   it('should not upload uploading traces', async () => {
     const trace1 = getMockTrace(1)
-    trace1.uploading = true
+    trace1.status = 'uploading'
     const trace2 = getMockTrace(2)
     const store = mockStore({
       traces: {
diff --git a/__tests__/reducers/traces.test.js b/__tests__/reducers/traces.test.js
index eaf8d701b..a0ed58362 100644
--- a/__tests__/reducers/traces.test.js
+++ b/__tests__/reducers/traces.test.js
@@ -186,8 +186,7 @@ describe('test for traces reducer', () => {
       traces: [
         {
           id: 'observe-hauptbanhof',
-          pending: true,
-          uploading: false,
+          status: 'pending',
           errors: [],
           geojson: expectedTraceGeoJSON
         }
@@ -240,8 +239,8 @@ describe('tests for upload trace actions', () => {
       id: mockTrace1.id
     }
     const newState = reducer(state, action)
-    expect(newState.traces[0].uploading).toEqual(true)
-    expect(newState.traces[1].uploading).toEqual(false)
+    expect(newState.traces[0].status).toEqual('uploading')
+    expect(newState.traces[1].status).toEqual('pending')
   })
 
   it('should handle TRACE_UPLOADED action correctly', () => {
@@ -262,8 +261,7 @@ describe('tests for upload trace actions', () => {
     }
     const newState = reducer(state, action)
     expect(newState.traces[0].id).toEqual('fakeid')
-    expect(newState.traces[0].uploading).toEqual(false)
-    expect(newState.traces[0].pending).toEqual(false)
+    expect(newState.traces[0].status).toEqual('uploaded')
     expect(newState.traces[0].geojson.properties.id).toEqual('fakeid')
   })
 
@@ -285,8 +283,7 @@ describe('tests for upload trace actions', () => {
     }
     const newState = reducer(state, action)
     expect(newState.traces[0].errors.length).toEqual(1)
-    expect(newState.traces[0].pending).toEqual(true)
-    expect(newState.traces[0].uploading).toEqual(false)
+    expect(newState.traces[0].status).toEqual('pending')
     expect(newState.traces[0].errors[0].message).toEqual('fake')
     expect(newState.traces[0].errors[0].status).toEqual(404)
   })
diff --git a/__tests__/test-utils.js b/__tests__/test-utils.js
index 8871d819a..f5c051fc0 100644
--- a/__tests__/test-utils.js
+++ b/__tests__/test-utils.js
@@ -18,14 +18,13 @@ export function getFeature (
 }
 
 /**
- * 
+ *
  * @param {Number} m - used to construct id, timestamps, coords
  */
 export function getMockTrace (m) {
   return {
     id: `id-${m}`,
-    pending: true,
-    uploading: false,
+    status: 'pending',
     errors: [],
     geojson: {
       type: 'Feature',
@@ -47,4 +46,3 @@ export function getMockTrace (m) {
     }
   }
 }
-
diff --git a/app/actions/traces.js b/app/actions/traces.js
index db38967aa..f32933520 100644
--- a/app/actions/traces.js
+++ b/app/actions/traces.js
@@ -41,7 +41,7 @@ export function uploadPendingTraces () {
   return async (dispatch, getState) => {
     console.log('called upload pending traces')
     const { traces } = getState().traces
-    const pendingTraces = traces.filter(t => t.pending && !t.uploading)
+    const pendingTraces = traces.filter(t => t.status === 'pending')
     for (let trace of pendingTraces) {
       dispatch(startUploadingTrace(trace.id))
       try {
diff --git a/app/reducers/traces.js b/app/reducers/traces.js
index 0fdd11f71..91057bc03 100644
--- a/app/reducers/traces.js
+++ b/app/reducers/traces.js
@@ -54,8 +54,7 @@ export default function (state = initialState, action) {
       const traceId = getRandomId()
       const newTrace = {
         id: traceId,
-        pending: true,
-        uploading: false,
+        status: 'pending',
         errors: [],
         geojson: {
           ...state.currentTrace,
@@ -112,7 +111,7 @@ export default function (state = initialState, action) {
     case types.TRACE_UPLOAD_STARTED: {
       const traces = _cloneDeep(state.traces)
       const index = _findIndex(state.traces, t => t.id === action.id)
-      traces[index].uploading = true
+      traces[index].status = 'uploading'
       return {
         ...state,
         traces
@@ -122,8 +121,7 @@ export default function (state = initialState, action) {
     case types.TRACE_UPLOADED: {
       const traces = _cloneDeep(state.traces)
       const index = _findIndex(state.traces, t => t.id === action.oldId)
-      traces[index].pending = false
-      traces[index].uploading = false
+      traces[index].status = 'uploaded'
       traces[index].id = action.newId
       traces[index].geojson.properties.id = action.newId
       return {
@@ -135,7 +133,7 @@ export default function (state = initialState, action) {
     case types.TRACE_UPLOAD_FAILED: {
       const traces = _cloneDeep(state.traces)
       const index = _findIndex(state.traces, t => t.id === action.id)
-      traces[index].uploading = false
+      traces[index].status = 'pending'
       traces[index].errors.push(action.error)
       return {
         ...state,

From 4bca657f35d0cf39af28132d39e6f33b18399cfb Mon Sep 17 00:00:00 2001
From: Sajjad Anwar <sajjadkm@gmail.com>
Date: Thu, 14 Nov 2019 15:01:24 +0530
Subject: [PATCH 21/21] merge develop

---
 ios/Observe.xcodeproj/project.pbxproj | 186 +++++++++++++-------------
 ios/Podfile.lock                      |   4 +-
 ios/Pods/Manifest.lock                |   4 +-
 yarn.lock                             |   2 +-
 4 files changed, 99 insertions(+), 97 deletions(-)

diff --git a/ios/Observe.xcodeproj/project.pbxproj b/ios/Observe.xcodeproj/project.pbxproj
index f3cdae84d..e184e57fc 100644
--- a/ios/Observe.xcodeproj/project.pbxproj
+++ b/ios/Observe.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		0006068175814A0F9C8DDB1A /* libReactNativeConfig-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88908ED409294243BD55F344 /* libReactNativeConfig-tvOS.a */; };
 		00E356F31AD99517003FC87E /* ObserveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ObserveTests.m */; };
-		0FE5C5FC00C864BC7A7FBBD6 /* libPods-Observe-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DE89B2A7BF638129E94190C /* libPods-Observe-tvOSTests.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
@@ -29,6 +28,7 @@
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* ObserveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ObserveTests.m */; };
 		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
+		4185DD5158DE70B89EAAE24F /* Pods_Observe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EBF3864AA5B78C0F94F63F3 /* Pods_Observe.framework */; };
 		5D14C0E62239D73C00C8981E /* satellite.json in Resources */ = {isa = PBXBuildFile; fileRef = 5D14C0E32239D73C00C8981E /* satellite.json */; };
 		5D14C0ED2239E6DD00C8981E /* NSURLSessionConfiguration+Cookie.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D14C0EC2239E6DD00C8981E /* NSURLSessionConfiguration+Cookie.m */; };
 		5D14C0F02239E71700C8981E /* NSObject+DTRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D14C0EF2239E71700C8981E /* NSObject+DTRuntime.m */; };
@@ -36,14 +36,14 @@
 		5D14C0F52239E93500C8981E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D14C0F42239E93500C8981E /* Foundation.framework */; };
 		5D88CF462231B4D30047A8D4 /* osm.json in Resources */ = {isa = PBXBuildFile; fileRef = 5D88CF1B2231B4D30047A8D4 /* osm.json */; };
 		5D88CF472231B4D30047A8D4 /* osm.json in Resources */ = {isa = PBXBuildFile; fileRef = 5D88CF1B2231B4D30047A8D4 /* osm.json */; };
-		7759261579125FE99E928107 /* libPods-Observe-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D9121507938FD73E7973610 /* libPods-Observe-tvOS.a */; };
+		6196D8A73C7018BB434BD8BF /* libPods-Observe-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71352E6928EA52FD25D811AB /* libPods-Observe-tvOS.a */; };
 		8A612A182244C17D0091590F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		8A9F59F62289529D002CDA8F /* Monospace.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A9F59F52289529C002CDA8F /* Monospace.ttf */; };
 		8A9F59F72289529D002CDA8F /* Monospace.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8A9F59F52289529C002CDA8F /* Monospace.ttf */; };
-		ADA1526399C1BAF8AEB942EA /* Pods_Observe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 165119A31B88001E4DA15E29 /* Pods_Observe.framework */; };
+		8F825AAECD8C24FB036D0946 /* libPods-Observe-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2325D7DF7BC198F821DB7143 /* libPods-Observe-tvOSTests.a */; };
 		ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
 		ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; };
-		FF6BDDED9CEDCE09CFDEA1F7 /* Pods_ObserveTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 930F54EDF20E6A7B2EF1F5F5 /* Pods_ObserveTests.framework */; };
+		F0027A4C44BCB86981DEB153 /* Pods_ObserveTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93265622DE4B584DDB03D008 /* Pods_ObserveTests.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -640,8 +640,8 @@
 		00E356EE1AD99517003FC87E /* ObserveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ObserveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* ObserveTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ObserveTests.m; sourceTree = "<group>"; };
-		09AC53E4CDC8B0CE7BA26437 /* Pods-Observe-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-Observe-tvOSTests/Pods-Observe-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
-		113F6C6BC4FC69974EFA0E22 /* Pods-Observe.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe.debug.xcconfig"; path = "Target Support Files/Pods-Observe/Pods-Observe.debug.xcconfig"; sourceTree = "<group>"; };
+		0280CF0B529FDE61645AA84B /* Pods-Observe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe.release.xcconfig"; path = "Target Support Files/Pods-Observe/Pods-Observe.release.xcconfig"; sourceTree = "<group>"; };
+		0B6156653C40EB3F63E6207F /* Pods-ObserveTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ObserveTests.debug.xcconfig"; path = "Target Support Files/Pods-ObserveTests/Pods-ObserveTests.debug.xcconfig"; sourceTree = "<group>"; };
 		139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
 		139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* Observe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Observe.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -652,20 +652,19 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Observe/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Observe/main.m; sourceTree = "<group>"; };
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
-		165119A31B88001E4DA15E29 /* Pods_Observe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Observe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		1D9121507938FD73E7973610 /* libPods-Observe-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Observe-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		2325D7DF7BC198F821DB7143 /* libPods-Observe-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Observe-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		260BDD3A22B9E9670032CA17 /* ObserveIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ObserveIcons.ttf; path = "../node_modules/observe-icon-font/font/fonts/ObserveIcons.ttf"; sourceTree = "<group>"; };
 		2620ACB62214EBF000ED09FD /* Observe.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Observe.entitlements; path = Observe/Observe.entitlements; sourceTree = "<group>"; };
 		264528A5223AB43A0027F56B /* Collecticons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Collecticons.ttf; path = Observe/Collecticons.ttf; sourceTree = "<group>"; };
 		26DAE23C227CAF5C00DFF1AB /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = Pods/Pods.xcodeproj; sourceTree = "<group>"; };
 		27E9609866E8413ABCC705D8 /* RNCookieManagerIOS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCookieManagerIOS.xcodeproj; path = "../node_modules/react-native-cookies/ios/RNCookieManagerIOS.xcodeproj"; sourceTree = "<group>"; };
-		2A858978C81832737D0AC4C9 /* Pods-Observe-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOS.release.xcconfig"; path = "Target Support Files/Pods-Observe-tvOS/Pods-Observe-tvOS.release.xcconfig"; sourceTree = "<group>"; };
 		2CFFFAA40BEA49BB93C1A784 /* libRNCookieManagerIOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCookieManagerIOS.a; sourceTree = "<group>"; };
 		2D02E47B1E0B4A5D006451C7 /* Observe-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Observe-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E4901E0B4A5D006451C7 /* Observe-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Observe-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		3DE89B2A7BF638129E94190C /* libPods-Observe-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Observe-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4D92491F83233BBC5CA29B4B /* Pods-Observe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe.release.xcconfig"; path = "Target Support Files/Pods-Observe/Pods-Observe.release.xcconfig"; sourceTree = "<group>"; };
+		33D200C6FAE47173FE1176BB /* Pods-Observe.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe.debug.xcconfig"; path = "Target Support Files/Pods-Observe/Pods-Observe.debug.xcconfig"; sourceTree = "<group>"; };
+		4EBF3864AA5B78C0F94F63F3 /* Pods_Observe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Observe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		58E91954D4E09DD3B6CCA5C5 /* Pods-Observe-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-Observe-tvOSTests/Pods-Observe-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
 		5D12BCEE224593FB00F9BC6E /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNFetchBlob.xcodeproj; path = "../node_modules/rn-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; };
 		5D14C0E32239D73C00C8981E /* satellite.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = satellite.json; path = Observe/satellite.json; sourceTree = "<group>"; };
 		5D14C0EB2239E6DD00C8981E /* NSURLSessionConfiguration+Cookie.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSURLSessionConfiguration+Cookie.h"; path = "Observe/NSURLSessionConfiguration+Cookie.h"; sourceTree = "<group>"; };
@@ -677,12 +676,14 @@
 		5D14C0F42239E93500C8981E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		5D6A248C22382E0E00AF7118 /* RNKeychain.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNKeychain.xcodeproj; path = "../node_modules/react-native-keychain/RNKeychain.xcodeproj"; sourceTree = "<group>"; };
 		5D88CF1B2231B4D30047A8D4 /* osm.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = osm.json; path = Observe/osm.json; sourceTree = "<group>"; };
+		5E05B3FAD459248AB6AE14ED /* Pods-ObserveTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ObserveTests.release.xcconfig"; path = "Target Support Files/Pods-ObserveTests/Pods-ObserveTests.release.xcconfig"; sourceTree = "<group>"; };
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
 		623ED83ECC984C7DB624A2EE /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNGestureHandler.xcodeproj; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = "<group>"; };
 		66E0A97496244D75B75FE923 /* libReactNativeConfig.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativeConfig.a; sourceTree = "<group>"; };
-		702615759765A35F9E04C8D4 /* Pods-Observe-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-Observe-tvOS/Pods-Observe-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
-		75DDC04CF316191515415F8C /* Pods-ObserveTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ObserveTests.debug.xcconfig"; path = "Target Support Files/Pods-ObserveTests/Pods-ObserveTests.debug.xcconfig"; sourceTree = "<group>"; };
+		71352E6928EA52FD25D811AB /* libPods-Observe-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Observe-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7206F0715DB59A39E5A0D879 /* Pods-Observe-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-Observe-tvOS/Pods-Observe-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
+		7EFF463A3B7626806EDE8920 /* Pods-Observe-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOS.release.xcconfig"; path = "Target Support Files/Pods-Observe-tvOS/Pods-Observe-tvOS.release.xcconfig"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 		88908ED409294243BD55F344 /* libReactNativeConfig-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libReactNativeConfig-tvOS.a"; sourceTree = "<group>"; };
 		8A38B264234498CF00D6874E /* ios */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ios; sourceTree = "<group>"; };
@@ -698,11 +699,10 @@
 		8A38B2A62344991000D6874E /* ios */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ios; sourceTree = "<group>"; };
 		8A38B2A82344991600D6874E /* ios */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ios; sourceTree = "<group>"; };
 		8A9F59F52289529C002CDA8F /* Monospace.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Monospace.ttf; path = Observe/Monospace.ttf; sourceTree = "<group>"; };
-		8AE27C5C63C8D02562B93ADD /* Pods-ObserveTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ObserveTests.release.xcconfig"; path = "Target Support Files/Pods-ObserveTests/Pods-ObserveTests.release.xcconfig"; sourceTree = "<group>"; };
 		90A4978F843548188D3AED7C /* libRNGestureHandler.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNGestureHandler.a; sourceTree = "<group>"; };
-		930F54EDF20E6A7B2EF1F5F5 /* Pods_ObserveTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ObserveTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		93265622DE4B584DDB03D008 /* Pods_ObserveTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ObserveTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A5AC63C922397073B67EEF81 /* Pods-Observe-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-Observe-tvOSTests/Pods-Observe-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
-		BA4C13291D189722786323AE /* Pods-Observe-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Observe-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-Observe-tvOSTests/Pods-Observe-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
 		D018AB5D1B1F4661B937A3CE /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeConfig.xcodeproj; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
@@ -713,7 +713,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FF6BDDED9CEDCE09CFDEA1F7 /* Pods_ObserveTests.framework in Frameworks */,
+				F0027A4C44BCB86981DEB153 /* Pods_ObserveTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -723,7 +723,7 @@
 			files = (
 				5D14C0F52239E93500C8981E /* Foundation.framework in Frameworks */,
 				ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
-				ADA1526399C1BAF8AEB942EA /* Pods_Observe.framework in Frameworks */,
+				4185DD5158DE70B89EAAE24F /* Pods_Observe.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -741,7 +741,7 @@
 				2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */,
 				2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */,
 				0006068175814A0F9C8DDB1A /* libReactNativeConfig-tvOS.a in Frameworks */,
-				7759261579125FE99E928107 /* libPods-Observe-tvOS.a in Frameworks */,
+				6196D8A73C7018BB434BD8BF /* libPods-Observe-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -750,7 +750,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */,
-				0FE5C5FC00C864BC7A7FBBD6 /* libPods-Observe-tvOSTests.a in Frameworks */,
+				8F825AAECD8C24FB036D0946 /* libPods-Observe-tvOSTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -970,10 +970,10 @@
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
 				2D16E6891FA4F8E400B85C8A /* libReact.a */,
-				165119A31B88001E4DA15E29 /* Pods_Observe.framework */,
-				1D9121507938FD73E7973610 /* libPods-Observe-tvOS.a */,
-				3DE89B2A7BF638129E94190C /* libPods-Observe-tvOSTests.a */,
-				930F54EDF20E6A7B2EF1F5F5 /* Pods_ObserveTests.framework */,
+				4EBF3864AA5B78C0F94F63F3 /* Pods_Observe.framework */,
+				71352E6928EA52FD25D811AB /* libPods-Observe-tvOS.a */,
+				2325D7DF7BC198F821DB7143 /* libPods-Observe-tvOSTests.a */,
+				93265622DE4B584DDB03D008 /* Pods_ObserveTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1007,14 +1007,14 @@
 		6DCF69FED43C537DA32D7A56 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				113F6C6BC4FC69974EFA0E22 /* Pods-Observe.debug.xcconfig */,
-				4D92491F83233BBC5CA29B4B /* Pods-Observe.release.xcconfig */,
-				702615759765A35F9E04C8D4 /* Pods-Observe-tvOS.debug.xcconfig */,
-				2A858978C81832737D0AC4C9 /* Pods-Observe-tvOS.release.xcconfig */,
-				09AC53E4CDC8B0CE7BA26437 /* Pods-Observe-tvOSTests.debug.xcconfig */,
-				BA4C13291D189722786323AE /* Pods-Observe-tvOSTests.release.xcconfig */,
-				75DDC04CF316191515415F8C /* Pods-ObserveTests.debug.xcconfig */,
-				8AE27C5C63C8D02562B93ADD /* Pods-ObserveTests.release.xcconfig */,
+				33D200C6FAE47173FE1176BB /* Pods-Observe.debug.xcconfig */,
+				0280CF0B529FDE61645AA84B /* Pods-Observe.release.xcconfig */,
+				7206F0715DB59A39E5A0D879 /* Pods-Observe-tvOS.debug.xcconfig */,
+				7EFF463A3B7626806EDE8920 /* Pods-Observe-tvOS.release.xcconfig */,
+				A5AC63C922397073B67EEF81 /* Pods-Observe-tvOSTests.debug.xcconfig */,
+				58E91954D4E09DD3B6CCA5C5 /* Pods-Observe-tvOSTests.release.xcconfig */,
+				0B6156653C40EB3F63E6207F /* Pods-ObserveTests.debug.xcconfig */,
+				5E05B3FAD459248AB6AE14ED /* Pods-ObserveTests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -1119,7 +1119,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "ObserveTests" */;
 			buildPhases = (
-				CB414E72FAA9AE3956953D5F /* [CP] Check Pods Manifest.lock */,
+				5FB6F83B03D03B984B46ADDF /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
@@ -1138,13 +1138,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Observe" */;
 			buildPhases = (
-				3D5B1FE79F6B8FFE0FD56149 /* [CP] Check Pods Manifest.lock */,
+				322C254EC53F28B32A6A6020 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				266358FF2208E3DE008C2B62 /* Run Script */,
-				AC0866DF5A95319E0C723112 /* [CP] Embed Pods Frameworks */,
+				7C1265E82D85FAD5449E789B /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1159,7 +1159,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "Observe-tvOS" */;
 			buildPhases = (
-				7EF26C5A4170A3E442A51996 /* [CP] Check Pods Manifest.lock */,
+				5FE4876208791FA691DC5987 /* [CP] Check Pods Manifest.lock */,
 				2D02E4771E0B4A5D006451C7 /* Sources */,
 				2D02E4781E0B4A5D006451C7 /* Frameworks */,
 				2D02E4791E0B4A5D006451C7 /* Resources */,
@@ -1178,7 +1178,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "Observe-tvOSTests" */;
 			buildPhases = (
-				D8B1D055919E7EC4B6072A1D /* [CP] Check Pods Manifest.lock */,
+				48A292CD6E9A3B5246DB397A /* [CP] Check Pods Manifest.lock */,
 				2D02E48C1E0B4A5D006451C7 /* Sources */,
 				2D02E48D1E0B4A5D006451C7 /* Frameworks */,
 				2D02E48E1E0B4A5D006451C7 /* Resources */,
@@ -1983,7 +1983,7 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
-		3D5B1FE79F6B8FFE0FD56149 /* [CP] Check Pods Manifest.lock */ = {
+		322C254EC53F28B32A6A6020 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -2005,7 +2005,51 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7EF26C5A4170A3E442A51996 /* [CP] Check Pods Manifest.lock */ = {
+		48A292CD6E9A3B5246DB397A /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Observe-tvOSTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		5FB6F83B03D03B984B46ADDF /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-ObserveTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		5FE4876208791FA691DC5987 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -2027,7 +2071,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		AC0866DF5A95319E0C723112 /* [CP] Embed Pods Frameworks */ = {
+		7C1265E82D85FAD5449E789B /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -2044,6 +2088,7 @@
 				"${BUILT_PRODUCTS_DIR}/EXLocation/EXLocation.framework",
 				"${BUILT_PRODUCTS_DIR}/EXPermissions/EXPermissions.framework",
 				"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
+				"${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
 				"${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework",
 				"${BUILT_PRODUCTS_DIR}/RNGestureHandler/RNGestureHandler.framework",
 				"${BUILT_PRODUCTS_DIR}/RNKeychain/RNKeychain.framework",
@@ -2089,6 +2134,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EXLocation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EXPermissions.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNGestureHandler.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNKeychain.framework",
@@ -2127,50 +2173,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Observe/Pods-Observe-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CB414E72FAA9AE3956953D5F /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-ObserveTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		D8B1D055919E7EC4B6072A1D /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Observe-tvOSTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -2241,7 +2243,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 75DDC04CF316191515415F8C /* Pods-ObserveTests.debug.xcconfig */;
+			baseConfigurationReference = 0B6156653C40EB3F63E6207F /* Pods-ObserveTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2277,7 +2279,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8AE27C5C63C8D02562B93ADD /* Pods-ObserveTests.release.xcconfig */;
+			baseConfigurationReference = 5E05B3FAD459248AB6AE14ED /* Pods-ObserveTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2310,7 +2312,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 113F6C6BC4FC69974EFA0E22 /* Pods-Observe.debug.xcconfig */;
+			baseConfigurationReference = 33D200C6FAE47173FE1176BB /* Pods-Observe.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Observe/Observe.entitlements;
@@ -2349,7 +2351,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4D92491F83233BBC5CA29B4B /* Pods-Observe.release.xcconfig */;
+			baseConfigurationReference = 0280CF0B529FDE61645AA84B /* Pods-Observe.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Observe/Observe.entitlements;
@@ -2387,7 +2389,7 @@
 		};
 		2D02E4971E0B4A5E006451C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 702615759765A35F9E04C8D4 /* Pods-Observe-tvOS.debug.xcconfig */;
+			baseConfigurationReference = 7206F0715DB59A39E5A0D879 /* Pods-Observe-tvOS.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -2424,7 +2426,7 @@
 		};
 		2D02E4981E0B4A5E006451C7 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2A858978C81832737D0AC4C9 /* Pods-Observe-tvOS.release.xcconfig */;
+			baseConfigurationReference = 7EFF463A3B7626806EDE8920 /* Pods-Observe-tvOS.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -2461,7 +2463,7 @@
 		};
 		2D02E4991E0B4A5E006451C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 09AC53E4CDC8B0CE7BA26437 /* Pods-Observe-tvOSTests.debug.xcconfig */;
+			baseConfigurationReference = A5AC63C922397073B67EEF81 /* Pods-Observe-tvOSTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
@@ -2497,7 +2499,7 @@
 		};
 		2D02E49A1E0B4A5E006451C7 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BA4C13291D189722786323AE /* Pods-Observe-tvOSTests.release.xcconfig */;
+			baseConfigurationReference = 58E91954D4E09DD3B6CCA5C5 /* Pods-Observe-tvOSTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 47e321d4a..95929dd7b 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -222,7 +222,7 @@ PODS:
     - React
   - react-native-geolocation (1.4.2):
     - React
-  - react-native-mapbox-gl (7.0.6):
+  - react-native-mapbox-gl (7.0.8):
     - React
   - react-native-netinfo (4.3.1):
     - React
@@ -515,7 +515,7 @@ SPEC CHECKSUMS:
   react-native-config: 55548054279d92e0e4566ea15a8b9b81028ec342
   react-native-cookies: 854d59c4135c70b92a02ca4930e68e4e2eb58150
   react-native-geolocation: a7b94614afbd5fd8350e0233a2025c8228fc8041
-  react-native-mapbox-gl: 4988be25f86de3daa43bda9325dca9020a7825e0
+  react-native-mapbox-gl: fcd88e2bf0ddea552b0209cc2770a5ac2b9c9910
   react-native-netinfo: 397dc351976ee5640fabca2452c23813895be2e5
   React-RCTActionSheet: af4d951113b1e068bb30611f91b984a7a73597ff
   React-RCTAnimation: 4f518d70bb6890b7c3d9d732f84786d6693ca297
diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock
index 47e321d4a..95929dd7b 100644
--- a/ios/Pods/Manifest.lock
+++ b/ios/Pods/Manifest.lock
@@ -222,7 +222,7 @@ PODS:
     - React
   - react-native-geolocation (1.4.2):
     - React
-  - react-native-mapbox-gl (7.0.6):
+  - react-native-mapbox-gl (7.0.8):
     - React
   - react-native-netinfo (4.3.1):
     - React
@@ -515,7 +515,7 @@ SPEC CHECKSUMS:
   react-native-config: 55548054279d92e0e4566ea15a8b9b81028ec342
   react-native-cookies: 854d59c4135c70b92a02ca4930e68e4e2eb58150
   react-native-geolocation: a7b94614afbd5fd8350e0233a2025c8228fc8041
-  react-native-mapbox-gl: 4988be25f86de3daa43bda9325dca9020a7825e0
+  react-native-mapbox-gl: fcd88e2bf0ddea552b0209cc2770a5ac2b9c9910
   react-native-netinfo: 397dc351976ee5640fabca2452c23813895be2e5
   React-RCTActionSheet: af4d951113b1e068bb30611f91b984a7a73597ff
   React-RCTAnimation: 4f518d70bb6890b7c3d9d732f84786d6693ca297
diff --git a/yarn.lock b/yarn.lock
index 1045a2f0c..cacf32366 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1380,7 +1380,7 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-4.3.1.tgz#0601954eae93c1e06647b74600c0b82c65689d22"
   integrity sha512-djUdmm/RCnKKCNR6w6APDLH1oRhS7EgMHcgghU4cxlgEGJMQ4yVO6jl+99DpI3pY4WElahgU9D8IK1PKTz6rig==
 
-"@react-native-mapbox-gl/maps@^7.0.6":
+"@react-native-mapbox-gl/maps@^7.0.8":
   version "7.0.8"
   resolved "https://registry.yarnpkg.com/@react-native-mapbox-gl/maps/-/maps-7.0.8.tgz#f2d4ee09a889d1c62217c20ea29743f8ce0f886e"
   integrity sha512-6LCvTx0ZJwaySjxlOtf4zUKHkMXOGCTANDBLtGoxZtrYdcvJNfd/rtSyR7c/0amljZEhxN0u1k0Q8hkNkxOgHg==