chore: ⚡ updates mapinfo model

Signed-off-by: Lucas Vieira <[email protected]>
lucasvmx · May 10, 2024 · 22296f1 · 22296f1
1 parent adabaf2
commit 22296f1
Showing 1 changed file with 69 additions and 65 deletions.
diff --git a/model/mapinfo/mapinfo.go b/model/mapinfo/mapinfo.go
@@ -1,65 +1,69 @@
-package mapinfo
-
-import (
-	"strings"
-
-	"github.com/lucasvmx/WarTelemetry/utils"
-)
-
-// MapInformation contains information about map
-type MapInformation struct {
-	GridSteps []float64 `json:"grid_steps"`
-	GridZero  []float64 `json:"grid_zero"`
-	MapGen    uint8     `json:"map_generation"`
-	MapMax    []float64 `json:"map_max"`
-	MapMin    []float64 `json:"map_min"`
-	MapSizeX  float64   `json:"map_size_x"`
-	MapSizeY  float64   `json:"map_size_y"`
-
-	// MapSize contains the map size (meters)
-	MapSize float64 `json:"map_size"`
-}
-
-var url string = ""
-var imgPath string = "map.img"
-var path string = "map_info.json"
-
-// GetURL retrieves URL to get map info data
-func GetURL() string {
-	url := utils.GetBaseURL()
-	url = strings.ReplaceAll(url, "$hostname$", utils.GetHostname())
-	url = strings.ReplaceAll(url, "$path$", path)
-	return url
-}
-
-// GetImageURL retrieves the image that contains the map drawing
-func GetImageURL() string {
-	if len(url) == 0 {
-		url = utils.GetBaseURL()
-		url = strings.ReplaceAll(url, "$hostname$", utils.GetHostname())
-		url = strings.ReplaceAll(url, "$path$", imgPath)
-	}
-
-	return url
-}
-
-// CalculateMapSize function fills struct with full map size
-func (mi *MapInformation) CalculateMapSize() {
-	maximumX := mi.MapMax[0]
-	minimumY := mi.MapMax[1]
-	minimumX := mi.MapMin[0]
-	maximumY := mi.MapMin[1]
-
-	// Calculate map sizes
-	mi.MapSizeX = maximumX - minimumX
-	mi.MapSizeY = maximumY - minimumY
-	mi.MapSize = maximumX - minimumX
-
-	if mi.MapSizeX < 0 {
-		mi.MapSizeX *= -1.0
-	} else if mi.MapSize < 0 {
-		mi.MapSize *= -1.0
-	} else if mi.MapSizeY < 0 {
-		mi.MapSizeY *= -1.0
-	}
-}
+package mapinfo
+
+import (
+	"strings"
+
+	"github.com/lucasvmx/WarTelemetry/utils"
+)
+
+type MapInformation struct {
+	GridSize      []float64 `json:"grid_size"`
+	GridSteps     []float64 `json:"grid_steps"`
+	GridZero      []float64 `json:"grid_zero"`
+	HudType       int       `json:"hud_type"`
+	MapGeneration int       `json:"map_generation"`
+	MapMax        []float64 `json:"map_max"`
+	MapMin        []float64 `json:"map_min"`
+	Valid         bool      `json:"valid"`
+
+	// Custom fields
+	MapSizeX float64 `json:"map_size_x"`
+	MapSizeY float64 `json:"map_size_y"`
+
+	// MapSize contains the map size (meters)
+	MapSize float64 `json:"map_size"`
+}
+
+var url string = ""
+var imgPath string = "map.img"
+var path string = "map_info.json"
+
+// GetURL retrieves URL to get map info data
+func GetURL() string {
+	url := utils.GetBaseURL()
+	url = strings.ReplaceAll(url, "$hostname$", utils.GetHostname())
+	url = strings.ReplaceAll(url, "$path$", path)
+	return url
+}
+
+// GetImageURL retrieves the image that contains the map drawing
+func GetImageURL() string {
+	if len(url) == 0 {
+		url = utils.GetBaseURL()
+		url = strings.ReplaceAll(url, "$hostname$", utils.GetHostname())
+		url = strings.ReplaceAll(url, "$path$", imgPath)
+	}
+
+	return url
+}
+
+// CalculateMapSize function fills struct with full map size
+func (mi *MapInformation) CalculateMapSize() {
+	maximumX := mi.MapMax[0]
+	minimumY := mi.MapMax[1]
+	minimumX := mi.MapMin[0]
+	maximumY := mi.MapMin[1]
+
+	// Calculate map sizes
+	mi.MapSizeX = maximumX - minimumX
+	mi.MapSizeY = maximumY - minimumY
+	mi.MapSize = maximumX - minimumX
+
+	if mi.MapSizeX < 0 {
+		mi.MapSizeX *= -1.0
+	} else if mi.MapSize < 0 {
+		mi.MapSize *= -1.0
+	} else if mi.MapSizeY < 0 {
+		mi.MapSizeY *= -1.0
+	}
+}