From 373ff372cba84f61f5c9f8050ef9e1a45f67a8fd Mon Sep 17 00:00:00 2001 From: Nicholas Pease Date: Sun, 21 Apr 2024 20:58:08 -0400 Subject: [PATCH] Fix Markers on Empty Profiles --- frontend-next/src/components/app/map/geo.js | 57 +++++++++++---------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/frontend-next/src/components/app/map/geo.js b/frontend-next/src/components/app/map/geo.js index c5446d9..1576dda 100644 --- a/frontend-next/src/components/app/map/geo.js +++ b/frontend-next/src/components/app/map/geo.js @@ -59,19 +59,21 @@ export function Geo({ loc, zoom, moveable, user }) { const [hoverAnchor, setHoverAnchor] = useState([null,null]); if (moveable) { - // 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 (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)}} + > + + ) + }) + } // Load Nearby Markers @@ -92,20 +94,21 @@ export function Geo({ loc, zoom, moveable, user }) { } // Load Friend Markers - - var friendMarkers = FriendMarkers(user); - friendMarkers = Object.values(user.rooms).map((friendData) => { - return ( {window.location.href = "/chat?room=" + friendData.path + "/" + friendData.name + "-" + friendData.timestamp;}} - style={{pointerEvents:'auto'} /* So stupid */} - onMouseOver={() => {setHoverText(friendData.username);setHovering(true);setHoverAnchor([friendData.location.latitude, friendData.location.longitude])}} - onMouseOut={() => {setHovering(false)}} - > - - ) - }) + if (user.friends && user.friends.friends) { + var friendMarkers = FriendMarkers(user); + friendMarkers = Object.values(friendMarkers).map((friendData) => { + return ( {window.location.href = "/chat?room=" + friendData.path + "/" + friendData.name + "-" + friendData.timestamp;}} + style={{pointerEvents:'auto'} /* So stupid */} + onMouseOver={() => {setHoverText(friendData.username);setHovering(true);setHoverAnchor([friendData.location.latitude, friendData.location.longitude])}} + onMouseOut={() => {setHovering(false)}} + > + + ) + }) + } } -- 2.52.0