resolve merge

src/components/Map/Panels/VoicePanel.tsx

@@ -350,7 +350,7 @@ export const VoicePanel: React.FC<VoicePanelProps> = ({
         else if (chosenType?.length > 0) {
             const chosenTypeKey = parseInt(Object.keys(lmTypes).find(key => lmTypes[key].label == chosenType));
             // get corrected icon id by getting index of chosen icon type in labels array created above
-            setNewLandmark({...newLandmark, landmark_type: chosenTypeKey, title: chosenType[0]})
+            setNewLandmark({...newLandmark, landmark_type: chosenTypeKey, title: chosenType[0], voice: true})
             setAction({...action, actionStep: action.actionStep + 1});
         }
         else {

src/data/landmarks.ts

@@ -40,7 +40,8 @@ export interface Landmark {
     //TODO: add floor property
     // DONE! 
     floor?: number | null,
-    anonymous?: string
+    anonymous?: string,
+    voice?: boolean
 }
 
 export interface LMPhoto {

src/navigation/MapNavigator.tsx

@@ -111,7 +111,7 @@ const MapNavigator: React.FC = ({ }) => {
  */
     const promptAddLandmark = async (longitude?: number, latitude?: number, floor?: number) => {
         console.log('[Map]: Opening add landmark panel...')
-        mapState.setNewLandmark({ latitude: latitude, longitude: longitude, floor: floor });
+        mapState.setNewLandmark({ latitude: latitude, longitude: longitude, floor: floor, voice: false });
         mapState.toggleLmAdd(true)
         mapState.toggleLmDetails(false)
     }

src/utils/RequestUtils.ts

@@ -11,7 +11,6 @@
 //export const API_URL = 'http://192.168.3.81:8000'
 // export const API_URL = 'https://staging.clicknpush.ca'
 
-//export const API_URL = 'http://192.168.1.68:8000'   // Chase
 //export const API_URL = 'http://192.168.0.22:8000'       // Eric
 export const API_URL = 'http://192.168.1.69:8000'