Fix grid calculation

Author: alexemanuelol

src/utils/constants.ts

@@ -45,7 +45,7 @@ export const STEAMID64_LENGTH = 17;
 export const STEAM_PROFILE_NAME_MAX_LENGTH = 32;
 export const BOT_MESSAGE_HISTORY_LIMIT = 16;
 export const BOT_LEAVE_VOICE_CHAT_TIMEOUT_MS = 10000;
-export const GRID_DIAMETER = 146.28571428571428;
+export const GRID_DIAMETER = 146.28571;
 export const DEFAULT_LANGUAGE = 'en';
 export const DEFAULT_RECONNECT_TIMEOUT_SECONDS = 3;
 export const MAX_RECONNECT_TIMEOUT_SECONDS = 30;

src/utils/map.ts

@@ -166,20 +166,29 @@ export function getGridPosLettersX(x: number, mapSize: number): string {
     let grid;
     const numberOfGrids = Math.floor(mapSize / constants.GRID_DIAMETER);
     const gridDiameter = mapSize / numberOfGrids;
+    const margin = 1;
+
     for (grid = 0; grid < numberOfGrids; grid++) {
         if (grid === (numberOfGrids - 1) || x > mapSize) break;
-        if (x >= (grid * gridDiameter) && x < ((grid * gridDiameter) + gridDiameter)) break;
+        const left = grid * gridDiameter;
+        const right = left + gridDiameter;
+        if ((x + margin) < right) break;
     }
+
     return numberToLetters(grid + 1);
 }
 
 export function getGridPosNumberY(y: number, mapSize: number): number {
     let grid;
     const numberOfGrids = Math.floor(mapSize / constants.GRID_DIAMETER);
     const gridDiameter = mapSize / numberOfGrids;
+    const margin = 1;
+
     for (grid = 0; grid < numberOfGrids; grid++) {
         if (grid === (numberOfGrids - 1) || y > mapSize) break;
-        if (y <= (mapSize - grid * gridDiameter) && y > ((mapSize - grid * gridDiameter) - gridDiameter)) break;
+        const upper = mapSize - (grid * gridDiameter);
+        const lower = upper - gridDiameter;
+        if ((y - margin) > lower) break;
     }
     return grid;
 }