From aac47fab4006dde1c8e21fcd7eb70a4cdc98b3a6 Mon Sep 17 00:00:00 2001
From: Owen <owen77stubbs@gmail.com>
Date: Mon, 8 Jul 2024 10:05:29 +0100
Subject: [PATCH] calc area using points for squaremap

---
 src/api/squaremap/parser.ts | 15 +++++++++------
 src/types/town.ts           |  2 +-
 src/utils/functions.ts      | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/api/squaremap/parser.ts b/src/api/squaremap/parser.ts
index 24b15c9..dc4e633 100644
--- a/src/api/squaremap/parser.ts
+++ b/src/api/squaremap/parser.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import striptags from 'striptags'
-import { asBool, calcArea, fastMergeUnique, formatString, range, roundToNearest16, safeParseInt } from '../../utils/functions.js'
+import { asBool, calcAreaPoints, fastMergeUnique, formatString, range, roundToNearest16, safeParseInt } from '../../utils/functions.js'
 
 import type {
     Resident,
@@ -141,18 +141,17 @@ export const parseTowns = async(res: SquaremapMarkerset, removeAccents = false)
             name: formatString(townName, removeAccents),
             nation: nationName,
             foundedTimestamp: Math.floor(new Date(parsedPopup.founded).getTime() / 1000),
-            wealth: safeParseInt(parsedPopup.wealth.slice(0, -1)),
             mayor: parsedPopup.mayor,
             councillors: parsedPopup.councillors,
             residents: parsedPopup.residents,
-            area: calcArea(townX, townZ, townX.length),
+            x: range(townX),
+            z: range(townZ),
+            area: calcAreaPoints(points),
+            points,
             bounds: {
                 x: townX,
                 z: townZ
             },
-            points,
-            x: range(townX),
-            z: range(townZ),
             flags: {
                 // Flags no longer shown
                 pvp: asBool(parsedPopup.flags.pvp),
@@ -188,6 +187,10 @@ export const parseTowns = async(res: SquaremapMarkerset, removeAccents = false)
         }
         //#endregion
 
+        if (parsedPopup.wealth) {
+            town.wealth = safeParseInt(parsedPopup.wealth.slice(0, -1))
+        }
+
         towns.push(town)
     }
 
diff --git a/src/types/town.ts b/src/types/town.ts
index a884b66..20dac60 100644
--- a/src/types/town.ts
+++ b/src/types/town.ts
@@ -30,7 +30,7 @@ export interface BaseTown {
 export type SquaremapTown = Prettify<BaseTown & {
     board?: string
     foundedTimestamp: number,
-    wealth: number
+    wealth?: number
     councillors: string[]
     wikis?: {
         town?: string
diff --git a/src/utils/functions.ts b/src/utils/functions.ts
index 01e9bce..76b517c 100644
--- a/src/utils/functions.ts
+++ b/src/utils/functions.ts
@@ -4,7 +4,8 @@ import { removeDiacritics } from "modern-diacritics"
 import type { 
     Point2D,
     RawPlayer, Player, Town,
-    BaseTown, BaseNation
+    BaseTown, BaseNation,
+    StrictPoint2D
 } from '../types/index.js'
 
 import { NotFound } from './errors.js'
@@ -60,6 +61,20 @@ export function calcArea(X: number[], Z: number[], numPoints: number, divisor =
     return Math.abs(area / 2) / divisor
 }
 
+export function calcAreaPoints(points: StrictPoint2D[]) {
+    let area = 0
+
+    for (let i = 0, NUM_POINTS = points.length; i < NUM_POINTS; i++) {
+        const cur = points[i]
+        const next = points[(i + 1) % NUM_POINTS]
+
+        area += cur.x * next.z
+        area -= cur.z * next.x
+    }
+
+    return Math.abs(area / 2) / 256
+}
+
 export function averageNationPos(name: string, towns: Town[]) {
     const nationTowns = towns.filter(t => t.nation?.toLowerCase() == name.toLowerCase())
     return getAveragePos(nationTowns)