diff --git a/frontend-next/src/components/app/map/geo.js b/frontend-next/src/components/app/map/geo.js index f446a78..ecc4d38 100644 --- a/frontend-next/src/components/app/map/geo.js +++ b/frontend-next/src/components/app/map/geo.js @@ -21,52 +21,49 @@ export function Geo({ loc, zoom, moveable, user }) { const [hoverAnchor, setHoverAnchor] = useState([null,null]); const [nearbyMarkersFinal, setNearbyMarkers] = useState(null); - if (moveable) { - if (user.rooms) { - // Load My Rooms Markers - var myRoomsMarkers = Object.values(user.rooms).map((roomObj) => { - return ( {window.location.href = "/chat?room=" + roomObj.path + "/" + roomObj.name + "-" + roomObj.timestamp;}} - style={{pointerEvents:'auto'} /* So stupid */} - onMouseOver={() => {setHoverText(roomObj.name);setHovering(true);setHoverAnchor([roomObj.latitude, roomObj.longitude])}} - onMouseOut={() => {setHovering(false)}} - > - - ) + if (moveable && user.rooms) { + // Load My Rooms Markers + var myRoomsMarkers = Object.values(user.rooms).map((roomObj) => { + return ( {window.location.href = "/chat?room=" + roomObj.path + "/" + roomObj.name + "-" + roomObj.timestamp;}} + style={{pointerEvents:'auto'} /* So stupid */} + onMouseOver={() => {setHoverText(roomObj.name);setHovering(true);setHoverAnchor([roomObj.latitude, roomObj.longitude])}} + onMouseOut={() => {setHovering(false)}} + > + + ) + }) + } + + useEffect(() => { + // Load Nearby Markers + if (moveable && loc) { + const path = String(loc.latitude.toFixed(2)).replace(".", "") +"/" +String(loc.longitude.toFixed(2)).replace(".", "") +"/"; + get(ref(database, `/rooms/${path}`)).then((snapshot) => { + console.log("ran") + if (snapshot.exists()) { + nearbyMarkers = snapshot.val(); + if (nearbyMarkers) { + var nearbyMarkers = Object.values(nearbyMarkers).map((roomObj) => { + return ( {window.location.href = "/chat?room=" + roomObj.path + "/" + roomObj.name + "-" + roomObj.timestamp;}} + style={{pointerEvents:'auto'} /* So stupid */} + onMouseOver={() => {setHoverText(roomObj.name);setHovering(true);setHoverAnchor([roomObj.latitude, roomObj.longitude])}} + onMouseOut={() => {setHovering(false)}} + > + + ) + }) + setNearbyMarkers(nearbyMarkers); + } + } }) } - - useEffect(() => { - // Load Nearby Markers - if (loc) { - const path = String(loc.latitude.toFixed(2)).replace(".", "") +"/" +String(loc.longitude.toFixed(2)).replace(".", "") +"/"; - get(ref(database, `/rooms/${path}`)).then((snapshot) => { - console.log("Ran") - if (snapshot.exists()) { - nearbyMarkers = snapshot.val(); - if (nearbyMarkers) { - var nearbyMarkers = Object.values(nearbyMarkers).map((roomObj) => { - return ( {window.location.href = "/chat?room=" + roomObj.path + "/" + roomObj.name + "-" + roomObj.timestamp;}} - style={{pointerEvents:'auto'} /* So stupid */} - onMouseOver={() => {setHoverText(roomObj.name);setHovering(true);setHoverAnchor([roomObj.latitude, roomObj.longitude])}} - onMouseOut={() => {setHovering(false)}} - > - - ) - }) - setNearbyMarkers(nearbyMarkers); - } - } - }) - } - }, []) - - } + }, []) if (!loc) { return
Getting Location...
;