From 19e7fd5d95fab8d2f2f2e4435348c0383ea42538 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 26 Oct 2025 22:12:28 -0700
Subject: [PATCH] Rename location_card to background

---
 decoder/gym.go      | 24 ++++++++++++------------
 decoder/pokestop.go |  8 ++++----
 util/pogo.go        |  7 ++++---
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/decoder/gym.go b/decoder/gym.go
index b3963c77..c1fbd164 100644
--- a/decoder/gym.go
+++ b/decoder/gym.go
@@ -173,15 +173,15 @@ func calculatePowerUpPoints(fortData *pogo.PokemonFortProto) (null.Int, null.Int
 
 func (gym *Gym) updateGymFromFort(fortData *pogo.PokemonFortProto, cellId uint64) *Gym {
 	type pokemonDisplay struct {
-		Form                  int   `json:"form,omitempty"`
-		Costume               int   `json:"costume,omitempty"`
-		Gender                int   `json:"gender"`
-		Shiny                 bool  `json:"shiny,omitempty"`
-		TempEvolution         int   `json:"temp_evolution,omitempty"`
-		TempEvolutionFinishMs int64 `json:"temp_evolution_finish_ms,omitempty"`
-		Alignment             int   `json:"alignment,omitempty"`
-		Badge                 int   `json:"badge,omitempty"`
-		LocationCard          int   `json:"location_card,omitempty"`
+		Form                  int    `json:"form,omitempty"`
+		Costume               int    `json:"costume,omitempty"`
+		Gender                int    `json:"gender"`
+		Shiny                 bool   `json:"shiny,omitempty"`
+		TempEvolution         int    `json:"temp_evolution,omitempty"`
+		TempEvolutionFinishMs int64  `json:"temp_evolution_finish_ms,omitempty"`
+		Alignment             int    `json:"alignment,omitempty"`
+		Badge                 int    `json:"badge,omitempty"`
+		Background            *int64 `json:"background,omitempty"`
 	}
 	gym.Id = fortData.FortId
 	gym.Lat = fortData.Latitude  //fmt.Sprintf("%f", fortData.Latitude)
@@ -200,7 +200,7 @@ func (gym *Gym) updateGymFromFort(fortData *pogo.PokemonFortProto, cellId uint64
 			TempEvolutionFinishMs: fortData.GuardPokemonDisplay.TemporaryEvolutionFinishMs,
 			Alignment:             int(fortData.GuardPokemonDisplay.Alignment),
 			Badge:                 int(fortData.GuardPokemonDisplay.PokemonBadge),
-			LocationCard:          util.ExtractLocationCardFromDisplay(fortData.GuardPokemonDisplay),
+			Background:            util.ExtractBackgroundFromDisplay(fortData.GuardPokemonDisplay),
 		})
 		gym.GuardingPokemonDisplay = null.StringFrom(string(display))
 	}
@@ -331,7 +331,7 @@ func (gym *Gym) updateGymFromGymInfoOutProto(gymData *pogo.GymGetInfoOutProto) *
 		TempEvolutionFinishMs int64              `json:"temp_evolution_finish_ms,omitempty"`
 		Alignment             int                `json:"alignment,omitempty"`
 		Badge                 int                `json:"badge,omitempty"`
-		LocationCard          int                `json:"location_card,omitempty"`
+		Background            *int64             `json:"background,omitempty"`
 		DeployedMs            int64              `json:"deployed_ms,omitempty"`
 		DeployedTime          int64              `json:"deployed_time,omitempty"`
 		BattlesWon            int32              `json:"battles_won"`
@@ -364,7 +364,7 @@ func (gym *Gym) updateGymFromGymInfoOutProto(gymData *pogo.GymGetInfoOutProto) *
 			TempEvolutionFinishMs: pokemonDisplay.TemporaryEvolutionFinishMs,
 			Alignment:             int(pokemonDisplay.Alignment),
 			Badge:                 int(pokemonDisplay.PokemonBadge),
-			LocationCard:          util.ExtractLocationCardFromDisplay(pokemonDisplay),
+			Background:            util.ExtractBackgroundFromDisplay(pokemonDisplay),
 			Shiny:                 pokemonDisplay.Shiny,
 			MotivationNow:         util.RoundedFloat4(motivatedPokemon.MotivationNow),
 			CpNow:                 motivatedPokemon.CpNow,
diff --git a/decoder/pokestop.go b/decoder/pokestop.go
index f0afa989..ee910222 100644
--- a/decoder/pokestop.go
+++ b/decoder/pokestop.go
@@ -454,8 +454,8 @@ func (stop *Pokestop) updatePokestopFromQuestProto(questProto *pogo.FortSearchOu
 				if display.Shiny {
 					infoData["shiny"] = display.Shiny
 				}
-				if locationCard := util.ExtractLocationCardFromDisplay(display); locationCard != 0 {
-					infoData["location_card"] = locationCard
+				if background := util.ExtractBackgroundFromDisplay(display); background != nil {
+					infoData["background"] = background
 				}
 				if breadMode := int(display.BreadModeEnum); breadMode != 0 {
 					infoData["bread_mode"] = breadMode
@@ -609,7 +609,7 @@ func (stop *Pokestop) updatePokestopFromGetPokemonSizeContestEntryOutProto(conte
 		TempEvolutionFinishMs int64   `json:"temp_evolution_finish_ms"`
 		Alignment             int     `json:"alignment"`
 		Badge                 int     `json:"badge"`
-		LocationCard          int     `json:"location_card"`
+		Background            *int64  `json:"background,omitempty"`
 	}
 	type contestJson struct {
 		TotalEntries   int            `json:"total_entries"`
@@ -637,7 +637,7 @@ func (stop *Pokestop) updatePokestopFromGetPokemonSizeContestEntryOutProto(conte
 			TempEvolutionFinishMs: entry.GetPokemonDisplay().TemporaryEvolutionFinishMs,
 			Alignment:             int(entry.GetPokemonDisplay().Alignment),
 			Badge:                 int(entry.GetPokemonDisplay().PokemonBadge),
-			LocationCard:          util.ExtractLocationCardFromDisplay(entry.PokemonDisplay),
+			Background:            util.ExtractBackgroundFromDisplay(entry.PokemonDisplay),
 		})
 
 	}
diff --git a/util/pogo.go b/util/pogo.go
index dc92af7b..a4634634 100644
--- a/util/pogo.go
+++ b/util/pogo.go
@@ -27,9 +27,10 @@ var IncidentTypeToName = map[int8]string{
 	9: "showcase",
 }
 
-func ExtractLocationCardFromDisplay(display *pogo.PokemonDisplayProto) int {
+func ExtractBackgroundFromDisplay(display *pogo.PokemonDisplayProto) *int64 {
 	if display.LocationCard == nil {
-		return 0
+		return nil
 	}
-	return int(display.LocationCard.LocationCard)
+	result := int64(display.LocationCard.LocationCard)
+	return &result
 }