From a0bbdfd8710819c33c6cdca66ad9b155ed4e438a Mon Sep 17 00:00:00 2001
From: David Walker <d0sboots@gmail.com>
Date: Fri, 13 Feb 2026 20:19:17 -0800
Subject: [PATCH] DARKNET: Refactor/adjust getPixelPosition (#2501)

This simplifies the logic. It also adjusts the position of special
servers slightly; in particular, they are horizontally centered
(appearing in-between the adjacent row, and not merely staggered).

The split into two functions is in preparation for perf improvements
that require calculating this without access to the server.
---
 src/DarkNet/ui/networkCanvas.ts | 42 +++++++++++----------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/DarkNet/ui/networkCanvas.ts b/src/DarkNet/ui/networkCanvas.ts
index cad44e385..037320638 100644
--- a/src/DarkNet/ui/networkCanvas.ts
+++ b/src/DarkNet/ui/networkCanvas.ts
@@ -52,40 +52,26 @@ export const drawOnCanvas = (canvas: HTMLCanvasElement) => {
 };
 
 export const getPixelPosition = (server: DarknetServer, centered = false) => {
+  return getPixelPositionFromCoords(server.hostname, server.leftOffset, server.depth, centered);
+};
+
+export const getPixelPositionFromCoords = (hostname: string, x: number, y: number, centered = false) => {
+  if (hostname === SpecialServers.DarkWeb) {
+    x = (NET_WIDTH - 1) * 0.5;
+    y = -1;
+  } else if (isLabyrinthServer(hostname)) {
+    x = (NET_WIDTH - 1) * 0.5;
+    y = getNetDepth() + 0.5;
+  }
   const centeredOffsetHorizontal = centered ? DW_SERVER_WIDTH / 2 : 0;
   const centeredOffsetVertical = centered ? DW_SERVER_HEIGHT / 2 : 0;
 
-  if (server.hostname === SpecialServers.DarkWeb) {
-    return {
-      top: MAP_BORDER_WIDTH * 0.2 + (centered ? centeredOffsetVertical : 0),
-      left: (DW_SERVER_GAP_LEFT + DW_SERVER_WIDTH) * NET_WIDTH * 0.5 + (centered ? centeredOffsetHorizontal : 0),
-    };
-  } else if (isLabyrinthServer(server.hostname)) {
-    return {
-      top:
-        MAP_BORDER_WIDTH +
-        centeredOffsetVertical +
-        (DW_SERVER_GAP_TOP + DW_SERVER_HEIGHT) * getNetDepth() +
-        DW_SERVER_GAP_TOP,
-      left: (DW_SERVER_GAP_LEFT + DW_SERVER_WIDTH) * NET_WIDTH * 0.5 + (centered ? centeredOffsetHorizontal : 0),
-    };
-  }
-
-  const coords = getCoordinates(server);
-
-  const widthOfServers = (DW_SERVER_GAP_LEFT + DW_SERVER_WIDTH) * coords.y;
-  const staggeredHorizontalOffset = coords.x % 2 ? DW_SERVER_WIDTH / 2 : 0;
-  const heightOfServers = (DW_SERVER_GAP_TOP + DW_SERVER_HEIGHT) * coords.x;
+  const widthOfServers = (DW_SERVER_GAP_LEFT + DW_SERVER_WIDTH) * x;
+  const staggeredHorizontalOffset = y >= 0 && y < getNetDepth() && y % 2 ? DW_SERVER_WIDTH / 2 : 0;
+  const heightOfServers = (DW_SERVER_GAP_TOP + DW_SERVER_HEIGHT) * y;
 
   return {
     top: heightOfServers + MAP_BORDER_WIDTH + centeredOffsetVertical,
     left: widthOfServers + MAP_BORDER_WIDTH + centeredOffsetHorizontal + staggeredHorizontalOffset,
   };
 };
-
-const getCoordinates = (server: DarknetServer) => {
-  return {
-    x: server.depth,
-    y: server.leftOffset,
-  };
-};