From 1f4e0c105a62a5514831998c767d07e31a14b34b Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Tue, 23 Nov 2021 16:35:16 -0300
Subject: [PATCH] Fixing hard-coded variables and setting location zoom

---
 src/App.js                              |  4 ++--
 src/app/components/map/OpenStreetMap.js |  2 +-
 src/app/config/globals.js               |  1 +
 src/app/screens/MapFeedScreen.js        | 12 +++++++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/App.js b/src/App.js
index eb3f2ca..45446ce 100644
--- a/src/App.js
+++ b/src/App.js
@@ -49,7 +49,7 @@ export default function App() {
     const storageUser = await authStorage.getUser();
     if (storageUser) setUser(storageUser);
 
-    global.location = { lat: -9.97111566376452, long: -67.80984283755332 }; //await getLocation();
+    global.location = await getLocation();
   };
 
   if (!isReady && netInfo.isInternetReachable) {
@@ -61,7 +61,7 @@ export default function App() {
       />
     );
   } else if (netInfo.isInternetReachable) {
-    global.formsSockets = useFiltering(global.location);
+    global.formsSockets = useFiltering(global.location || global.defaultLocation);
 
     return (
       <AuthContext.Provider
diff --git a/src/app/components/map/OpenStreetMap.js b/src/app/components/map/OpenStreetMap.js
index 3bacd88..b5b630b 100644
--- a/src/app/components/map/OpenStreetMap.js
+++ b/src/app/components/map/OpenStreetMap.js
@@ -49,7 +49,7 @@ export default function OpenStreetMap({
   const [mapRef, setMapRef] = useState(null);
   const webviewContent = html_content;
   const [markerListener, setMarkerListener] = useState(null);
-  const viewFunction = setViewCode(global.location.lat, global.location.long);
+  const viewFunction = setViewCode(global.location.lat, global.location.long, global.location.zoom);
 
   const markersList = MapMarkerList({
     markers: markers,
diff --git a/src/app/config/globals.js b/src/app/config/globals.js
index 4fef4fc..d739cbf 100644
--- a/src/app/config/globals.js
+++ b/src/app/config/globals.js
@@ -2,6 +2,7 @@
 global.userDataBase = undefined;
 global.location = undefined;
 global.formsSockets = undefined;
+global.defaultLocation = { lat: -9.97111566376452, long: -54.80984283755332, zoom: 3 }
 //Endereço do evento
 //global.eventAddress =  " ";
 //global.eventCoordinates = undefined;
diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index 8dbfccc..4e2b053 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { StyleSheet, View } from "react-native";
+import { StyleSheet, View, Text } from "react-native";
 import OpenStreetMap from "../components/map/OpenStreetMap";
 import attachFocusToQuery from "../hooks/useFocus";
 import HeaderBarMenu from "../components/HeaderBarMenu";
@@ -9,8 +9,6 @@ import LoadingMarkersModal from "../components/LoadingMarkersModal";
 export default function MapFeedScreen(props) {
   HeaderBarMenu(props.navigation);
 
-  const focusChanged = attachFocusToQuery();
- 
   const [dataOptionsToShow, setDataOptionsToShow] = useState({
     oficial: {
       automaticPluviometer: false,
@@ -26,8 +24,11 @@ export default function MapFeedScreen(props) {
   });  
 
   const markers = useSocketMarkers();
+  console.log("============= qtd markers  " + markers.markers.size + " ================" )
 
+  // console.log("location:  " + JSON.stringify(global.location))
   return (
+    (global.location) ? (
     <View style={styles.container}>
       <OpenStreetMap
         markers={markers}
@@ -38,6 +39,11 @@ export default function MapFeedScreen(props) {
       <LoadingMarkersModal
         show={markers.markers.size <= 0}/>
     </View>
+    ):(
+      <View>
+        <Text>Apresentar um erro no futuro</Text>
+        </View>
+    )
   );
 }