From 2a9cbbf180313064830a524f86eae62f41b6b87b Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 9 Dec 2025 11:58:50 -0800
Subject: [PATCH 01/22] fix: battle/raid filtering race condition

---
 src/features/drawer/Stations.jsx   | 25 +++++++++++++++++--------
 src/features/drawer/gyms/Raids.jsx | 25 +++++++++++++++++--------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/features/drawer/Stations.jsx b/src/features/drawer/Stations.jsx
index d2c99ddf2..de1c4f5eb 100644
--- a/src/features/drawer/Stations.jsx
+++ b/src/features/drawer/Stations.jsx
@@ -6,8 +6,8 @@ import ListItemText from '@mui/material/ListItemText'
 import MenuItem from '@mui/material/MenuItem'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@store/useMemory'
 import { useDeepStore, useStorage } from '@store/useStorage'
+import { useGetAvailable } from '@hooks/useGetAvailable'
 import { FCSelect } from '@components/inputs/FCSelect'
 
 import { CollapsibleItem } from './components/CollapsibleItem'
@@ -15,7 +15,7 @@ import { SelectorListMemo } from './components/SelectorList'
 
 function StationLevels() {
   const { t } = useTranslation()
-  const available = useMemory((s) => s.available.stations)
+  const { available } = useGetAvailable('stations')
   const enabled = useStorage(
     (s) =>
       !!s.filters?.stations?.maxBattles && !s.filters?.stations?.allStations,
@@ -24,6 +24,20 @@ function StationLevels() {
     'filters.stations.battleTier',
     'all',
   )
+
+  const battleTiers = React.useMemo(() => {
+    const availableTiers = available
+      .filter((x) => x.startsWith('j'))
+      .map((y) => +y.slice(1))
+    if (filters === 'all') return availableTiers
+
+    const storedTier = Number(filters)
+    if (Number.isNaN(storedTier) || availableTiers.includes(storedTier)) {
+      return availableTiers
+    }
+    return [storedTier, ...availableTiers]
+  }, [available, filters])
+
   return (
     <CollapsibleItem open={enabled}>
       <ListItem
@@ -36,12 +50,7 @@ function StationLevels() {
               setFilters(e.target.value === 'all' ? 'all' : e.target.value)
             }
           >
-            {[
-              'all',
-              ...available
-                .filter((x) => x.startsWith('j'))
-                .map((y) => +y.slice(1)),
-            ].map((tier, i) => (
+            {['all', ...battleTiers].map((tier, i) => (
               <MenuItem key={tier} dense value={tier}>
                 {t(i ? `max_battle_${tier}_plural` : 'disabled')}
               </MenuItem>
diff --git a/src/features/drawer/gyms/Raids.jsx b/src/features/drawer/gyms/Raids.jsx
index 2bc7621f7..a5b30f8de 100644
--- a/src/features/drawer/gyms/Raids.jsx
+++ b/src/features/drawer/gyms/Raids.jsx
@@ -5,8 +5,8 @@ import ListItemText from '@mui/material/ListItemText'
 import MenuItem from '@mui/material/MenuItem'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@store/useMemory'
 import { useStorage, useDeepStore } from '@store/useStorage'
+import { useGetAvailable } from '@hooks/useGetAvailable'
 import { FCSelect } from '@components/inputs/FCSelect'
 
 import { CollapsibleItem } from '../components/CollapsibleItem'
@@ -14,9 +14,23 @@ import { MultiSelectorList, SelectorListMemo } from '../components/SelectorList'
 
 const RaidOverride = () => {
   const { t } = useTranslation()
-  const available = useMemory((s) => s.available.gyms)
+  const { available } = useGetAvailable('gyms')
   const enabled = useStorage((s) => !!s.filters?.gyms?.raids)
   const [filters, setFilters] = useDeepStore('filters.gyms.raidTier', 'all')
+
+  const raidTiers = React.useMemo(() => {
+    const availableTiers = available
+      .filter((x) => x.startsWith('r'))
+      .map((y) => +y.slice(1))
+    if (filters === 'all') return availableTiers
+
+    const storedTier = Number(filters)
+    if (Number.isNaN(storedTier) || availableTiers.includes(storedTier)) {
+      return availableTiers
+    }
+    return [storedTier, ...availableTiers]
+  }, [available, filters])
+
   return (
     <CollapsibleItem open={enabled}>
       <ListItem
@@ -29,12 +43,7 @@ const RaidOverride = () => {
               setFilters(e.target.value === 'all' ? 'all' : e.target.value)
             }
           >
-            {[
-              'all',
-              ...available
-                .filter((x) => x.startsWith('r'))
-                .map((y) => +y.slice(1)),
-            ].map((tier, i) => (
+            {['all', ...raidTiers].map((tier, i) => (
               <MenuItem key={tier} dense value={tier}>
                 {t(i ? `raid_${tier}_plural` : 'disabled')}
               </MenuItem>

From cd01a92bda81f786ca2c14f10df8cc4489163fd6 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 9 Dec 2025 12:12:32 -0800
Subject: [PATCH 02/22] fix: ground raid/battle icons

---
 src/assets/css/main.css                  | 28 ++++++++++++++++++++++++
 src/features/gym/gymMarker.js            | 18 ++++++++-------
 src/features/station/useStationMarker.js | 20 +++++++++--------
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index f6d4a5c95..524bb0502 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -249,6 +249,34 @@ body {
   position: absolute;
 }
 
+.gym-marker__raid-icon,
+.station-marker__battle-icon {
+  position: absolute;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  transform: translateX(-50%);
+}
+
+.gym-marker__raid-icon {
+  width: var(--raid-icon-size, 30px);
+  height: var(--raid-icon-size, 30px);
+}
+
+.station-marker__battle-icon {
+  width: var(--battle-icon-size, 30px);
+  height: var(--battle-icon-size, 30px);
+}
+
+.gym-marker__raid-icon img,
+.station-marker__battle-icon img {
+  width: 100% !important;
+  height: auto !important;
+  max-width: 100% !important;
+  max-height: 100% !important;
+  object-fit: contain;
+}
+
 .invasion-reward {
   display: inline-block;
   width: 30px;
diff --git a/src/features/gym/gymMarker.js b/src/features/gym/gymMarker.js
index afa9f6ed6..2e2479ec2 100644
--- a/src/features/gym/gymMarker.js
+++ b/src/features/gym/gymMarker.js
@@ -166,20 +166,22 @@ export function gymMarker({
           ${
             raidIconUrl
               ? /* html */
-                `<img
-                  src="${raidIconUrl}"
-                  alt="${raidIconUrl}"
+                `<div
+                  class="gym-marker__raid-icon"
                   style="
+                    --raid-icon-size: ${raidIconSize}px;
                     opacity: ${opacity};
-                    width: ${raidIconSize}px;
-                    height: ${raidIconSize}px;
                     bottom: ${
                       gymIconSize * 0.4 + slotModifier * raidMod.offsetY
                     }px;
-                    left: ${raidMod.offsetX * 55}%;
-                    transform: translateX(-50%);
+                    left: ${raidMod.offsetX * 50}%;
                   "
-                />`
+                >
+                  <img
+                    src="${raidIconUrl}"
+                    alt="${raidIconUrl}"
+                  />
+                </div>`
               : ''
           }
           ${
diff --git a/src/features/station/useStationMarker.js b/src/features/station/useStationMarker.js
index 6637d6916..a09434dd5 100644
--- a/src/features/station/useStationMarker.js
+++ b/src/features/station/useStationMarker.js
@@ -83,18 +83,20 @@ export function useStationMarker({
      ${
        showBattleIcon
          ? /* html */ `
-        <img
-            src="${battleIcon}"
-            alt="${battleIcon}"
-            style="
+        <div
+          class="station-marker__battle-icon"
+          style="
+            --battle-icon-size: ${battleSize}px;
             opacity: ${getOpacity(battle_end)};
-            width: ${battleSize}px;
-            height: ${battleSize}px;
             bottom: ${baseSize * 0.8 * battleMod.offsetY}px;
-            left: ${battleMod.offsetX * 55}%;
-            transform: translateX(-50%);
+            left: ${battleMod.offsetX * 50}%;
           "
-        />
+        >
+          <img
+            src="${battleIcon}"
+            alt="${battleIcon}"
+          />
+        </div>
       `
          : ''
      }

From 3717c2ebae353af131cd204d89c814811d301c50 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 9 Dec 2025 12:20:14 -0800
Subject: [PATCH 03/22] chore: centralize overlay logic

---
 src/assets/css/main.css                  | 39 ++++++---------------
 src/features/gym/gymMarker.js            | 25 +++++---------
 src/features/station/useStationMarker.js | 24 +++++--------
 src/utils/renderOverlayIcon.js           | 43 ++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 61 deletions(-)
 create mode 100644 src/utils/renderOverlayIcon.js

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 524bb0502..0b24d2b70 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -249,31 +249,25 @@ body {
   position: absolute;
 }
 
-.gym-marker__raid-icon,
-.station-marker__battle-icon {
+.marker-overlay-icon {
   position: absolute;
   display: flex;
   align-items: flex-end;
   justify-content: center;
   transform: translateX(-50%);
+  width: var(--marker-overlay-size, 30px);
+  height: var(--marker-overlay-size, 30px);
 }
 
-.gym-marker__raid-icon {
-  width: var(--raid-icon-size, 30px);
-  height: var(--raid-icon-size, 30px);
-}
-
-.station-marker__battle-icon {
-  width: var(--battle-icon-size, 30px);
-  height: var(--battle-icon-size, 30px);
-}
-
-.gym-marker__raid-icon img,
-.station-marker__battle-icon img {
-  width: 100% !important;
+.marker-overlay-icon img,
+.leaflet-container
+  .leaflet-marker-pane
+  .pokestop-marker__stack-item
+  img:not(.pokestop-marker__decoration) {
+  width: var(--marker-overlay-size, var(--marker-size, 30px)) !important;
   height: auto !important;
-  max-width: 100% !important;
-  max-height: 100% !important;
+  max-width: var(--marker-overlay-size, var(--marker-size, 30px)) !important;
+  max-height: var(--marker-overlay-size, var(--marker-size, 30px)) !important;
   object-fit: contain;
 }
 
@@ -384,17 +378,6 @@ img {
   transform: translateX(-50%);
 }
 
-.leaflet-container
-  .leaflet-marker-pane
-  .pokestop-marker__stack-item
-  img:not(.pokestop-marker__decoration) {
-  width: var(--marker-size, 30px) !important;
-  height: auto !important;
-  max-width: var(--marker-size, 30px) !important;
-  max-height: var(--marker-size, 30px) !important;
-  object-fit: contain;
-}
-
 .leaflet-container
   .leaflet-marker-pane
   .pokestop-marker__stack-item[data-reward-type='12']
diff --git a/src/features/gym/gymMarker.js b/src/features/gym/gymMarker.js
index 2e2479ec2..3f5f7b6f4 100644
--- a/src/features/gym/gymMarker.js
+++ b/src/features/gym/gymMarker.js
@@ -1,6 +1,7 @@
 // @ts-check
 import { divIcon } from 'leaflet'
 import { useMemory } from '@store/useMemory'
+import { renderOverlayIcon } from '@utils/renderOverlayIcon'
 
 /** @param {number} raidLevel */
 const getBadgeColor = (raidLevel) => {
@@ -165,23 +166,13 @@ export function gymMarker({
           }
           ${
             raidIconUrl
-              ? /* html */
-                `<div
-                  class="gym-marker__raid-icon"
-                  style="
-                    --raid-icon-size: ${raidIconSize}px;
-                    opacity: ${opacity};
-                    bottom: ${
-                      gymIconSize * 0.4 + slotModifier * raidMod.offsetY
-                    }px;
-                    left: ${raidMod.offsetX * 50}%;
-                  "
-                >
-                  <img
-                    src="${raidIconUrl}"
-                    alt="${raidIconUrl}"
-                  />
-                </div>`
+              ? /* html */ renderOverlayIcon({
+                  url: raidIconUrl,
+                  size: raidIconSize,
+                  opacity,
+                  bottom: gymIconSize * 0.4 + slotModifier * raidMod.offsetY,
+                  left: raidMod.offsetX * 50,
+                })
               : ''
           }
           ${
diff --git a/src/features/station/useStationMarker.js b/src/features/station/useStationMarker.js
index a09434dd5..241c30fa6 100644
--- a/src/features/station/useStationMarker.js
+++ b/src/features/station/useStationMarker.js
@@ -4,6 +4,7 @@ import { divIcon } from 'leaflet'
 import { basicEqualFn, useMemory } from '@store/useMemory'
 import { useStorage } from '@store/useStorage'
 import { useOpacity } from '@hooks/useOpacity'
+import { renderOverlayIcon } from '@utils/renderOverlayIcon'
 
 /**
  *
@@ -82,22 +83,13 @@ export function useStationMarker({
       />
      ${
        showBattleIcon
-         ? /* html */ `
-        <div
-          class="station-marker__battle-icon"
-          style="
-            --battle-icon-size: ${battleSize}px;
-            opacity: ${getOpacity(battle_end)};
-            bottom: ${baseSize * 0.8 * battleMod.offsetY}px;
-            left: ${battleMod.offsetX * 50}%;
-          "
-        >
-          <img
-            src="${battleIcon}"
-            alt="${battleIcon}"
-          />
-        </div>
-      `
+         ? /* html */ renderOverlayIcon({
+             url: battleIcon,
+             size: battleSize,
+             opacity: getOpacity(battle_end),
+             bottom: baseSize * 0.8 * battleMod.offsetY,
+             left: battleMod.offsetX * 50,
+           })
          : ''
      }
     </div>
diff --git a/src/utils/renderOverlayIcon.js b/src/utils/renderOverlayIcon.js
new file mode 100644
index 000000000..dcc6f8b42
--- /dev/null
+++ b/src/utils/renderOverlayIcon.js
@@ -0,0 +1,43 @@
+// @ts-check
+
+/**
+ * Render a standard overlay icon wrapper for Leaflet markers.
+ * @param {{
+ *  url: string,
+ *  size: number,
+ *  bottom: number,
+ *  left: number,
+ *  opacity?: number,
+ *  className?: string,
+ *  alt?: string,
+ * }} params
+ */
+export function renderOverlayIcon({
+  url,
+  size,
+  bottom,
+  left,
+  opacity,
+  className,
+  alt = url,
+}) {
+  const classes = ['marker-overlay-icon', className].filter(Boolean).join(' ')
+  const opacityStyle = typeof opacity === 'number' ? `opacity: ${opacity};` : ''
+
+  return `
+    <div
+      class="${classes}"
+      style="
+        --marker-overlay-size: ${size}px;
+        ${opacityStyle}
+        bottom: ${bottom}px;
+        left: ${left}%;
+      "
+    >
+      <img
+        src="${url}"
+        alt="${alt}"
+      />
+    </div>
+  `
+}

From 21b50f51b81bf6f7723753a4f77289ead99c51e7 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 9 Dec 2025 16:53:44 -0800
Subject: [PATCH 04/22] fix: weather icon in pokemon background popup

---
 src/features/pokemon/PokemonPopup.jsx | 40 ++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/features/pokemon/PokemonPopup.jsx b/src/features/pokemon/PokemonPopup.jsx
index da91124f6..f88937713 100644
--- a/src/features/pokemon/PokemonPopup.jsx
+++ b/src/features/pokemon/PokemonPopup.jsx
@@ -286,6 +286,7 @@ export function PokemonPopup({ pokemon, iconUrl, isTutorial = false }) {
         metaData={metaData}
         perms={pokePerms}
         timeOfDay={timeOfDay}
+        backgroundVisuals={backgroundVisuals}
       />
       <ShinyOdds shinyStats={shinyStats} />
       <Footer
@@ -569,12 +570,17 @@ const TappableOrigin = ({ tappable, loading }) => {
   )
 }
 
-const Info = ({ pokemon, metaData, perms, timeOfDay }) => {
+const Info = ({ pokemon, metaData, perms, timeOfDay, backgroundVisuals }) => {
   const Icons = useMemory((s) => s.Icons)
   const { t } = useTranslation()
   const { gender, size, weather, form } = pokemon
   const formTypes = metaData?.forms?.[form]?.types || metaData?.types || []
   const darkMode = useStorage((s) => s.darkMode)
+  const iconStyles = backgroundVisuals?.styles?.icon
+  const hasBackground = Boolean(backgroundVisuals?.hasBackground)
+  const weatherIconTimeOfDay = hasBackground ? 'night' : timeOfDay
+  const weatherIconUrl =
+    Icons?.getWeather?.(weather, weatherIconTimeOfDay) || ''
   return (
     <Grid
       xs={perms.iv ? 3 : 11}
@@ -585,13 +591,39 @@ const Info = ({ pokemon, metaData, perms, timeOfDay }) => {
     >
       {weather != 0 && perms.iv && (
         <Grid
-          className={`grid-item ${darkMode ? '' : 'darken-image'}`}
           style={{
             height: 24,
             width: 24,
-            backgroundImage: `url(${Icons.getWeather(weather, timeOfDay)})`,
+            ...(iconStyles || {}),
           }}
-        />
+        >
+          <div
+            className={
+              hasBackground
+                ? 'grid-item'
+                : `grid-item ${darkMode ? '' : 'darken-image'}`
+            }
+            style={{
+              height: '100%',
+              width: '100%',
+              ...(hasBackground
+                ? {
+                    WebkitMaskImage: `url(${weatherIconUrl})`,
+                    maskImage: `url(${weatherIconUrl})`,
+                    WebkitMaskRepeat: 'no-repeat',
+                    maskRepeat: 'no-repeat',
+                    WebkitMaskPosition: 'center',
+                    maskPosition: 'center',
+                    WebkitMaskSize: 'contain',
+                    maskSize: 'contain',
+                    backgroundColor: '#fff',
+                  }
+                : {
+                    backgroundImage: `url(${weatherIconUrl})`,
+                  }),
+            }}
+          />
+        </Grid>
       )}
       {!!gender && (
         <Grid textAlign="center">

From 640c5ad855dbfab83c7b9dffc2ee7dd73faed2e6 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Wed, 10 Dec 2025 01:18:40 +0000
Subject: [PATCH 05/22] chore(release): v1.40.2-develop.1 [skip ci]

## [1.40.2-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.1...v1.40.2-develop.1) (2025-12-10)

### Bug Fixes

* battle/raid filtering race condition ([2a9cbbf](https://github.com/WatWowMap/ReactMap/commit/2a9cbbf180313064830a524f86eae62f41b6b87b))
* ground raid/battle icons ([cd01a92](https://github.com/WatWowMap/ReactMap/commit/cd01a92bda81f786ca2c14f10df8cc4489163fd6))
* weather icon in pokemon background popup ([21b50f5](https://github.com/WatWowMap/ReactMap/commit/21b50f51b81bf6f7723753a4f77289ead99c51e7))
---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 147e5ffe5..2bb20b9ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [1.40.2-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.1...v1.40.2-develop.1) (2025-12-10)
+
+
+### Bug Fixes
+
+* battle/raid filtering race condition ([2a9cbbf](https://github.com/WatWowMap/ReactMap/commit/2a9cbbf180313064830a524f86eae62f41b6b87b))
+* ground raid/battle icons ([cd01a92](https://github.com/WatWowMap/ReactMap/commit/cd01a92bda81f786ca2c14f10df8cc4489163fd6))
+* weather icon in pokemon background popup ([21b50f5](https://github.com/WatWowMap/ReactMap/commit/21b50f51b81bf6f7723753a4f77289ead99c51e7))
+
 ## [1.40.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.0...v1.40.1) (2025-12-09)
 
 
diff --git a/package.json b/package.json
index d4152e1be..6d038f3be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.40.1",
+  "version": "1.40.2-develop.1",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",

From 4f5aace285285d55e3a946fb2f465b7609a9caea Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Wed, 10 Dec 2025 00:33:45 -0800
Subject: [PATCH 06/22] feat: support stationed pokemon extras

---
 packages/types/lib/scanner.d.ts             |  5 +-
 server/src/graphql/typeDefs/scanner.graphql |  6 ++
 src/features/station/StationPopup.jsx       | 88 +++++++++++++++------
 src/services/Assets.js                      | 29 +++++--
 src/services/queries/station.js             |  6 ++
 5 files changed, 96 insertions(+), 38 deletions(-)

diff --git a/packages/types/lib/scanner.d.ts b/packages/types/lib/scanner.d.ts
index 003c7c9aa..6cce54a32 100644
--- a/packages/types/lib/scanner.d.ts
+++ b/packages/types/lib/scanner.d.ts
@@ -372,11 +372,8 @@ export interface Route {
 
 export type FullRoute = FullModel<Route, RouteModel.Route>
 
-export interface StationPokemon {
+export interface StationPokemon extends PokemonDisplay {
   pokemon_id: number
-  form: number
-  costume: number
-  gender: number
   bread_mode: number
 }
 
diff --git a/server/src/graphql/typeDefs/scanner.graphql b/server/src/graphql/typeDefs/scanner.graphql
index 4296affec..12bc0efa2 100644
--- a/server/src/graphql/typeDefs/scanner.graphql
+++ b/server/src/graphql/typeDefs/scanner.graphql
@@ -323,5 +323,11 @@ type StationPokemon {
   form: Int
   costume: Int
   gender: Int
+  shiny: Boolean
+  temp_evolution: Int
+  temp_evolution_finish_ms: Float
+  alignment: Int
+  badge: Int
+  background: Int
   bread_mode: Int
 }
diff --git a/src/features/station/StationPopup.jsx b/src/features/station/StationPopup.jsx
index 3e05b456e..5a1e104c2 100644
--- a/src/features/station/StationPopup.jsx
+++ b/src/features/station/StationPopup.jsx
@@ -27,6 +27,7 @@ import { Img, PokemonImg } from '@components/Img'
 import { useFormatStore } from '@store/useFormatStore'
 import { useRelativeTimer } from '@hooks/useRelativeTime'
 import { useAnalytics } from '@hooks/useAnalytics'
+import { BackgroundCard } from '@components/popups/BackgroundCard'
 import { Title } from '@components/popups/Title'
 import {
   CollapseWithState,
@@ -39,6 +40,7 @@ import { getTimeUntil } from '@utils/getTimeUntil'
 import { getFormDisplay } from '@utils/getFormDisplay'
 import { CopyCoords } from '@components/popups/Coords'
 import Tooltip from '@mui/material/Tooltip'
+import { usePokemonBackgroundVisuals } from '@hooks/usePokemonBackgroundVisuals'
 
 import { useGetStationMons } from './useGetStationMons'
 
@@ -477,8 +479,11 @@ function StationContent({ start_time, end_time, battle_end, id }) {
 /** @param {import('@rm/types').Station} props */
 function StationMons({ id, updated }) {
   const { t: tId } = useTranslateById()
+  const { t } = useTranslation()
   const mons = useGetStationMons(id, updated)
   const icons = useMemory((s) => s.Icons)
+  const resolveBackgroundVisual = usePokemonBackgroundVisuals()
+  const bestBuddyIcon = icons?.getMisc?.('bestbuddy')
 
   return (
     <CardContent
@@ -487,34 +492,65 @@ function StationMons({ id, updated }) {
       <VirtualGrid data={mons} xs={1} context={{ columns: 5 }}>
         {(index, mon) => {
           const caption = tId(`${mon.pokemon_id}-${mon.form}`)
+          const visuals = resolveBackgroundVisual(mon.background)
+          const { hasBackground } = visuals
+          const backgroundTooltip = visuals.backgroundMeta?.tooltip
+          const tooltipTitle = backgroundTooltip ? (
+            <>
+              {caption}
+              <br />
+              {backgroundTooltip}
+            </>
+          ) : (
+            caption
+          )
           return (
-            <Box
-              display="flex"
-              flexDirection="column"
-              alignItems="center"
-              justifyContent="flex-end"
-              p={1}
-              height="100%"
+            <BackgroundCard
+              visuals={hasBackground ? visuals : undefined}
+              tooltip={tooltipTitle}
+              contentProps={{
+                sx: {
+                  height: 40,
+                  width: 40,
+                  mx: 'auto',
+                },
+              }}
             >
-              <Tooltip title={caption} arrow placement="top">
-                <Img
-                  key={index}
-                  src={icons.getPokemon(
-                    mon.pokemon_id,
-                    mon.form,
-                    0,
-                    mon.gender,
-                    mon.costume,
-                    0,
-                    false,
-                    mon.bread_mode,
-                  )}
-                  alt={caption}
-                  maxHeight={35}
-                  maxWidth={35}
-                />
-              </Tooltip>
-            </Box>
+              <Box
+                display="flex"
+                flexDirection="column"
+                alignItems="center"
+                justifyContent="center"
+                width="100%"
+                height="100%"
+              >
+                <Box
+                  position="relative"
+                  display="flex"
+                  alignItems="center"
+                  justifyContent="center"
+                  width={40}
+                  height={40}
+                >
+                  <Img
+                    key={index}
+                    src={icons.getPokemonByDisplay(mon.pokemon_id, mon)}
+                    alt={caption}
+                    maxHeight={40}
+                    maxWidth={40}
+                  />
+                  {mon.badge === 1 && bestBuddyIcon ? (
+                    <Img
+                      src={bestBuddyIcon}
+                      alt={t('best_buddy')}
+                      maxHeight={12}
+                      maxWidth={12}
+                      style={{ position: 'absolute', top: 0, right: 0 }}
+                    />
+                  ) : null}
+                </Box>
+              </Box>
+            </BackgroundCard>
           )
         }}
       </VirtualGrid>
diff --git a/src/services/Assets.js b/src/services/Assets.js
index 366dba5fb..01aabbded 100644
--- a/src/services/Assets.js
+++ b/src/services/Assets.js
@@ -383,16 +383,29 @@ export class UAssets {
    * @param {import('@rm/types').PokemonDisplay} pokemonDisplay
    */
   getPokemonByDisplay(pokemonId, pokemonDisplay) {
+    const {
+      form,
+      gender,
+      costume,
+      alignment,
+      shiny,
+      temp_evolution,
+      temp_evolution_finish_ms,
+      bread_mode,
+    } = pokemonDisplay || {}
+    const evolution =
+      temp_evolution_finish_ms && Date.now() > temp_evolution_finish_ms
+        ? 0
+        : temp_evolution
     return this.getPokemon(
       pokemonId,
-      pokemonDisplay.form,
-      Date.now() > pokemonDisplay.temp_evolution_finish_ms
-        ? 0
-        : pokemonDisplay.temp_evolution,
-      pokemonDisplay.gender,
-      pokemonDisplay.costume,
-      pokemonDisplay.alignment,
-      pokemonDisplay.shiny,
+      form,
+      evolution,
+      gender,
+      costume,
+      alignment,
+      shiny,
+      bread_mode,
     )
   }
 
diff --git a/src/services/queries/station.js b/src/services/queries/station.js
index 30b53113d..6a34940c8 100644
--- a/src/services/queries/station.js
+++ b/src/services/queries/station.js
@@ -88,6 +88,12 @@ export const GET_STATION_POKEMON = gql`
       form
       costume
       gender
+      shiny
+      temp_evolution
+      temp_evolution_finish_ms
+      alignment
+      badge
+      background
       bread_mode
     }
   }

From 907ca331beb1fe81dd671732d5ebe1980d8d6faa Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 11 Dec 2025 14:57:12 -0800
Subject: [PATCH 07/22] fix: no scrollbars plz

---
 src/components/virtual/VirtualGrid.jsx |  5 ++-
 src/features/station/StationPopup.jsx  | 58 ++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/components/virtual/VirtualGrid.jsx b/src/components/virtual/VirtualGrid.jsx
index 599dc0bd0..275544909 100644
--- a/src/components/virtual/VirtualGrid.jsx
+++ b/src/components/virtual/VirtualGrid.jsx
@@ -40,7 +40,8 @@ const List = React.forwardRef(({ context, ...props }, ref) => (
  *  children: import('react-virtuoso').VirtuosoGridProps<T, U & SomeGridProps>['itemContent'],
  *  Header?: React.ComponentType<U>,
  *  Footer?: React.ComponentType<U>,
- *  useWindowScroll?: boolean
+ *  useWindowScroll?: boolean,
+ *  scrollerRef?: import('react-virtuoso').VirtuosoGridProps<T, U & SomeGridProps>['scrollerRef']
  * }} props
  */
 export function VirtualGrid({
@@ -55,6 +56,7 @@ export function VirtualGrid({
   Header,
   Footer,
   useWindowScroll,
+  scrollerRef,
 }) {
   const fullContext = React.useMemo(
     () => ({ ...context, xs, sm, md, lg, xl }),
@@ -74,6 +76,7 @@ export function VirtualGrid({
       components={components}
       itemContent={children}
       useWindowScroll={useWindowScroll}
+      scrollerRef={scrollerRef}
     />
   )
 }
diff --git a/src/features/station/StationPopup.jsx b/src/features/station/StationPopup.jsx
index 5a1e104c2..da173bbd6 100644
--- a/src/features/station/StationPopup.jsx
+++ b/src/features/station/StationPopup.jsx
@@ -484,12 +484,54 @@ function StationMons({ id, updated }) {
   const icons = useMemory((s) => s.Icons)
   const resolveBackgroundVisual = usePokemonBackgroundVisuals()
   const bestBuddyIcon = icons?.getMisc?.('bestbuddy')
+  const scrollerEl = React.useRef(/** @type {HTMLElement | null} */ (null))
+  const resizeObserver = React.useRef(
+    /** @type {ResizeObserver | null} */ (null),
+  )
+  const [iconSize, setIconSize] = React.useState(40)
+  const columns = 5
+
+  const recomputeIconSize = React.useCallback(() => {
+    const el = scrollerEl.current
+    if (!el) return
+    const perColumn = Math.floor(el.clientWidth / columns)
+    const nextSize = Math.min(40, perColumn || 40)
+    setIconSize((prev) => (prev === nextSize ? prev : nextSize))
+  }, [columns])
+
+  const handleScrollerRef = React.useCallback(
+    (ref) => {
+      if (resizeObserver.current) {
+        resizeObserver.current.disconnect()
+        resizeObserver.current = null
+      }
+      scrollerEl.current = ref
+      if (ref) {
+        recomputeIconSize()
+        if (typeof ResizeObserver !== 'undefined') {
+          const observer = new ResizeObserver(() => recomputeIconSize())
+          observer.observe(ref)
+          resizeObserver.current = observer
+        }
+      }
+    },
+    [recomputeIconSize],
+  )
+
+  React.useLayoutEffect(() => {
+    recomputeIconSize()
+  }, [mons.length, recomputeIconSize])
 
   return (
     <CardContent
       sx={{ m: 0, p: 0, height: 130, pb: 0, '&:last-child': { pb: 0 } }}
     >
-      <VirtualGrid data={mons} xs={1} context={{ columns: 5 }}>
+      <VirtualGrid
+        data={mons}
+        xs={1}
+        context={{ columns }}
+        scrollerRef={handleScrollerRef}
+      >
         {(index, mon) => {
           const caption = tId(`${mon.pokemon_id}-${mon.form}`)
           const visuals = resolveBackgroundVisual(mon.background)
@@ -510,9 +552,9 @@ function StationMons({ id, updated }) {
               tooltip={tooltipTitle}
               contentProps={{
                 sx: {
-                  height: 40,
-                  width: 40,
                   mx: 'auto',
+                  width: iconSize,
+                  height: iconSize,
                 },
               }}
             >
@@ -529,15 +571,17 @@ function StationMons({ id, updated }) {
                   display="flex"
                   alignItems="center"
                   justifyContent="center"
-                  width={40}
-                  height={40}
+                  sx={{
+                    width: iconSize,
+                    height: iconSize,
+                  }}
                 >
                   <Img
                     key={index}
                     src={icons.getPokemonByDisplay(mon.pokemon_id, mon)}
                     alt={caption}
-                    maxHeight={40}
-                    maxWidth={40}
+                    maxHeight="100%"
+                    maxWidth="100%"
                   />
                   {mon.badge === 1 && bestBuddyIcon ? (
                     <Img

From 8a0447c3e9d7df9c4aa9add657a234a1bc59b412 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 11 Dec 2025 15:06:23 -0800
Subject: [PATCH 08/22] feat: dynamic placed Pokemon dropdown height

---
 src/features/station/StationPopup.jsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/features/station/StationPopup.jsx b/src/features/station/StationPopup.jsx
index da173bbd6..5b13d60ed 100644
--- a/src/features/station/StationPopup.jsx
+++ b/src/features/station/StationPopup.jsx
@@ -490,6 +490,12 @@ function StationMons({ id, updated }) {
   )
   const [iconSize, setIconSize] = React.useState(40)
   const columns = 5
+  const maxRows = 3
+  const visibleRows = Math.min(
+    maxRows,
+    Math.max(1, Math.ceil(mons.length / columns)),
+  )
+  const gridHeight = visibleRows * iconSize
 
   const recomputeIconSize = React.useCallback(() => {
     const el = scrollerEl.current
@@ -524,7 +530,13 @@ function StationMons({ id, updated }) {
 
   return (
     <CardContent
-      sx={{ m: 0, p: 0, height: 130, pb: 0, '&:last-child': { pb: 0 } }}
+      sx={{
+        m: 0,
+        p: 0,
+        height: gridHeight,
+        pb: 0,
+        '&:last-child': { pb: 0 },
+      }}
     >
       <VirtualGrid
         data={mons}

From 497f3504a4ea6000184c9df30c5a3c3e76d65d80 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 11 Dec 2025 15:31:22 -0800
Subject: [PATCH 09/22] fix: battle/raid icon max height

---
 src/assets/css/main.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 0b24d2b70..9c806d452 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -271,6 +271,12 @@ body {
   object-fit: contain;
 }
 
+/* Override Leaflet's marker-pane img reset for overlay icons */
+.leaflet-container .leaflet-marker-pane .marker-overlay-icon img {
+  max-width: var(--marker-overlay-size, var(--marker-size, 30px)) !important;
+  max-height: var(--marker-overlay-size, var(--marker-size, 30px)) !important;
+}
+
 .invasion-reward {
   display: inline-block;
   width: 30px;

From b2ea5257eac5a9df038772587a047856af53e5e0 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Thu, 11 Dec 2025 23:34:33 +0000
Subject: [PATCH 10/22] chore(release): v1.41.0-develop.1 [skip ci]

# [1.41.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.2-develop.1...v1.41.0-develop.1) (2025-12-11)

### Bug Fixes

* battle/raid icon max height ([497f350](https://github.com/WatWowMap/ReactMap/commit/497f3504a4ea6000184c9df30c5a3c3e76d65d80))
* no scrollbars plz ([907ca33](https://github.com/WatWowMap/ReactMap/commit/907ca331beb1fe81dd671732d5ebe1980d8d6faa))

### Features

* dynamic placed Pokemon dropdown height ([8a0447c](https://github.com/WatWowMap/ReactMap/commit/8a0447c3e9d7df9c4aa9add657a234a1bc59b412))
* support stationed pokemon extras ([4f5aace](https://github.com/WatWowMap/ReactMap/commit/4f5aace285285d55e3a946fb2f465b7609a9caea))
---
 CHANGELOG.md | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bb20b9ef..6255c7bf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [1.41.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.2-develop.1...v1.41.0-develop.1) (2025-12-11)
+
+
+### Bug Fixes
+
+* battle/raid icon max height ([497f350](https://github.com/WatWowMap/ReactMap/commit/497f3504a4ea6000184c9df30c5a3c3e76d65d80))
+* no scrollbars plz ([907ca33](https://github.com/WatWowMap/ReactMap/commit/907ca331beb1fe81dd671732d5ebe1980d8d6faa))
+
+
+### Features
+
+* dynamic placed Pokemon dropdown height ([8a0447c](https://github.com/WatWowMap/ReactMap/commit/8a0447c3e9d7df9c4aa9add657a234a1bc59b412))
+* support stationed pokemon extras ([4f5aace](https://github.com/WatWowMap/ReactMap/commit/4f5aace285285d55e3a946fb2f465b7609a9caea))
+
 ## [1.40.2-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.1...v1.40.2-develop.1) (2025-12-10)
 
 
diff --git a/package.json b/package.json
index 6d038f3be..667bee97e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.40.2-develop.1",
+  "version": "1.41.0-develop.1",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",

From 0f157edba37eb727fdb9f4a5b96bdf417298cdfc Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 11 Dec 2025 15:43:39 -0800
Subject: [PATCH 11/22] fix: remove extra Forms

---
 src/components/filters/Advanced.jsx             |  4 +++-
 src/components/virtual/SelectorItem.jsx         |  1 +
 src/features/drawer/components/SelectorList.jsx |  5 ++++-
 src/hooks/useTranslateById.js                   | 17 ++++++++++++++---
 src/utils/getFormDisplay.js                     |  6 ++++--
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/components/filters/Advanced.jsx b/src/components/filters/Advanced.jsx
index 90060974e..381b32d80 100644
--- a/src/components/filters/Advanced.jsx
+++ b/src/components/filters/Advanced.jsx
@@ -126,7 +126,9 @@ export function AdvancedFilter() {
           category === 'pokemon' || (!id.startsWith('l') && !id.startsWith('i'))
             ? t('advanced')
             : t('set_size')
-        } - ${tId(id)}`}
+        } - ${tId(id, {
+          omitFormSuffix: true,
+        })}`}
         action={() => toggleClose(false)}
       />
       <DialogContent sx={{ mt: 3 }}>
diff --git a/src/components/virtual/SelectorItem.jsx b/src/components/virtual/SelectorItem.jsx
index 4ae49be73..ae80245f9 100644
--- a/src/components/virtual/SelectorItem.jsx
+++ b/src/components/virtual/SelectorItem.jsx
@@ -48,6 +48,7 @@ export function SelectorItem({
     alt: true,
     newLine: true,
     quest: category === 'pokestops',
+    omitFormSuffix: true,
   })
   const title = t(id)
   const url = useMemory((s) => s.Icons.getIconById(id))
diff --git a/src/features/drawer/components/SelectorList.jsx b/src/features/drawer/components/SelectorList.jsx
index 1787ab510..1b799c8f5 100644
--- a/src/features/drawer/components/SelectorList.jsx
+++ b/src/features/drawer/components/SelectorList.jsx
@@ -45,7 +45,10 @@ function SelectorList({ category, subCategory, label, height = 400 }) {
     subCategory ? capitalize(subCategory) : ''
   }QuickSelect`
   const { available } = useGetAvailable(category)
-  const { t: tId } = useTranslateById({ quest: subCategory === 'pokemon' })
+  const { t: tId } = useTranslateById({
+    quest: subCategory === 'pokemon',
+    omitFormSuffix: true,
+  })
   const { t } = useTranslation()
   const allFilters = useMemory((s) => s.filters[category]?.filter)
 
diff --git a/src/hooks/useTranslateById.js b/src/hooks/useTranslateById.js
index 3e7f45bfe..c434dc259 100644
--- a/src/hooks/useTranslateById.js
+++ b/src/hooks/useTranslateById.js
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import { getFormDisplay } from '@utils/getFormDisplay'
 
 /**
- * @typedef {{ plural?: boolean, amount?: boolean, alt?: boolean, newLine?: boolean, quest?: boolean }} CustomTOptions
+ * @typedef {{ plural?: boolean, amount?: boolean, alt?: boolean, newLine?: boolean, quest?: boolean, omitFormSuffix?: boolean }} CustomTOptions
  * @typedef {(id: string, options?: CustomTOptions) => string} CustomT
  */
 
@@ -19,7 +19,10 @@ export function useTranslateById(options = {}) {
   return useMemo(
     () => ({
       language: i18n.i18n.language,
-      t: (id, { plural, amount, alt, newLine, quest } = options) => {
+      t: (
+        id,
+        { plural, amount, alt, newLine, quest, omitFormSuffix } = options,
+      ) => {
         if (typeof id !== 'string') {
           return ''
         }
@@ -116,6 +119,7 @@ export function useTranslateById(options = {}) {
                 ? ''
                 : getFormDisplay(pokemon, form, undefined, {
                     showDefaultForms: quest,
+                    appendFormSuffix: !omitFormSuffix,
                   })
             return formLabel
               ? `${pokemonName}${newLine ? '\n' : ' '}(${formLabel})`
@@ -124,6 +128,13 @@ export function useTranslateById(options = {}) {
         }
       },
     }),
-    [i18n, options.alt, options.amount, options.plural, options.newLine],
+    [
+      i18n,
+      options.alt,
+      options.amount,
+      options.plural,
+      options.newLine,
+      options.omitFormSuffix,
+    ],
   )
 }
diff --git a/src/utils/getFormDisplay.js b/src/utils/getFormDisplay.js
index 1ea6569c8..f028107f6 100644
--- a/src/utils/getFormDisplay.js
+++ b/src/utils/getFormDisplay.js
@@ -10,7 +10,7 @@ const ALWAYS_SHOW_FORM_POKEMON = new Set([51]) // Dugtrio (51) needs form labels
  * @param {number | string | null | undefined} pokemonId
  * @param {number | string | null | undefined} form
  * @param {number | string | null | undefined} costume
- * @param {{ showDefaultForms?: boolean }} [options]
+ * @param {{ showDefaultForms?: boolean, appendFormSuffix?: boolean }} [options]
  * @returns {string}
  */
 export function getFormDisplay(pokemonId, form, costume, options = {}) {
@@ -34,7 +34,7 @@ export function getFormDisplay(pokemonId, form, costume, options = {}) {
     return `${translate('form')} ${form}`
   }
 
-  const { showDefaultForms = false } = options
+  const { showDefaultForms = false, appendFormSuffix = true } = options
   if (!showDefaultForms) {
     const normalizedPokemonId =
       typeof pokemonId === 'number'
@@ -52,6 +52,8 @@ export function getFormDisplay(pokemonId, form, costume, options = {}) {
       return ''
   }
 
+  if (!appendFormSuffix) return formName
+
   const suffix = ` ${translate('form')}`
   return formName.endsWith(suffix) ? formName : `${formName}${suffix}`
 }

From e46ea5b974b8bd727cf16ceabbfb28b8d8049f12 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Mon, 15 Dec 2025 23:11:25 +0000
Subject: [PATCH 12/22] chore(release): v1.41.0-develop.2 [skip ci]

# [1.41.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.1...v1.41.0-develop.2) (2025-12-15)

### Bug Fixes

* remove extra Forms ([0f157ed](https://github.com/WatWowMap/ReactMap/commit/0f157edba37eb727fdb9f4a5b96bdf417298cdfc))
---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6255c7bf4..ec5d3a0f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [1.41.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.1...v1.41.0-develop.2) (2025-12-15)
+
+
+### Bug Fixes
+
+* remove extra Forms ([0f157ed](https://github.com/WatWowMap/ReactMap/commit/0f157edba37eb727fdb9f4a5b96bdf417298cdfc))
+
 # [1.41.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.2-develop.1...v1.41.0-develop.1) (2025-12-11)
 
 
diff --git a/package.json b/package.json
index 667bee97e..cb4dc22af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.41.0-develop.1",
+  "version": "1.41.0-develop.2",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",

From a2c7f17e02ff7cd5467d4bf5ccd8b13a444ba725 Mon Sep 17 00:00:00 2001
From: ComplementaryPogo <complementary@metrapogo.org>
Date: Mon, 15 Dec 2025 17:44:25 -0600
Subject: [PATCH 13/22] fix: logic bug in loading non-clustered elements
 (#1161)

Co-authored-by: Mygod <contact-git@mygod.be>
---
 config/custom-environment-variables.json | 2 +-
 src/pages/map/components/Clustering.jsx  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
index 87597216e..e8114d907 100644
--- a/config/custom-environment-variables.json
+++ b/config/custom-environment-variables.json
@@ -2473,4 +2473,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/map/components/Clustering.jsx b/src/pages/map/components/Clustering.jsx
index 6376074e1..10e296c7f 100644
--- a/src/pages/map/components/Clustering.jsx
+++ b/src/pages/map/components/Clustering.jsx
@@ -154,7 +154,9 @@ export function Clustering({ category, children }) {
   }, [children, featureRef, superCluster])
 
   const clustered = React.useMemo(() => {
-    const requiresFilter = children.length > rules.forcedLimit || userCluster
+    const requiresFilter =
+      userCluster ||
+      (children.length > rules.forcedLimit && !IGNORE_CLUSTERING.has(category))
     if (!requiresFilter) return children
     const base = children.filter((x) => x && markers.has(x.key))
     if (manualKey) {
@@ -166,7 +168,7 @@ export function Clustering({ category, children }) {
       }
     }
     return base
-  }, [children, markers, manualKey, rules.forcedLimit, userCluster])
+  }, [category, children, markers, manualKey, rules.forcedLimit, userCluster])
 
   return (
     <>

From bce4be5b416eda10818788ebdc519f12e1f33c01 Mon Sep 17 00:00:00 2001
From: turtlesocks-bot <turtlesocks-bot@users.noreply.github.com>
Date: Mon, 15 Dec 2025 23:44:34 +0000
Subject: [PATCH 14/22] chore: sync config [skip ci]

---
 config/custom-environment-variables.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
index e8114d907..87597216e 100644
--- a/config/custom-environment-variables.json
+++ b/config/custom-environment-variables.json
@@ -2473,4 +2473,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

From d3ea283b5eacda18b9f4725e50e5353a955a363d Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Mon, 15 Dec 2025 19:28:17 -0800
Subject: [PATCH 15/22] feat: default clientPrompt to none to skip permission
 reapproval

---
 config/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.json b/config/default.json
index db377b97f..1742b860d 100644
--- a/config/default.json
+++ b/config/default.json
@@ -719,7 +719,7 @@
         "allowedGuilds": [],
         "blockedGuilds": [],
         "allowedUsers": [],
-        "clientPrompt": "consent",
+        "clientPrompt": "none",
         "thumbnailUrl": "https://user-images.githubusercontent.com/58572875/167069223-745a139d-f485-45e3-a25c-93ec4d09779c.png",
         "trialPeriod": {
           "start": {

From d7ecbdee499b61218339600ea4cfa80cc1b6fcd5 Mon Sep 17 00:00:00 2001
From: turtlesocks-bot <turtlesocks-bot@users.noreply.github.com>
Date: Tue, 16 Dec 2025 03:29:02 +0000
Subject: [PATCH 16/22] chore: sync config [skip ci]

---
 packages/config/.configref | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/config/.configref b/packages/config/.configref
index ad8102533..c2dbeed58 100644
--- a/packages/config/.configref
+++ b/packages/config/.configref
@@ -1 +1 @@
-26702
\ No newline at end of file
+26699
\ No newline at end of file

From b579dedeb196fb4d8b1da025e325049bfd7833e8 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Mon, 15 Dec 2025 22:59:04 -0800
Subject: [PATCH 17/22] fix: more robust discord handling (#1181)

---
 server/src/services/DiscordClient.js | 31 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/server/src/services/DiscordClient.js b/server/src/services/DiscordClient.js
index 4591cda1a..6a191e9ae 100644
--- a/server/src/services/DiscordClient.js
+++ b/server/src/services/DiscordClient.js
@@ -87,23 +87,36 @@ class DiscordClient extends AuthClient {
     this.client.login(this.strategy.botToken)
   }
 
-  /** @param {string} guildId @param {string} userId */
+  /**
+   * @param {string} guildId
+   * @param {string} userId
+   * @returns {Promise<string[]>}
+   */
   async getUserRoles(guildId, userId) {
     try {
-      const members = await this.client.guilds.cache
-        .get(guildId)
-        ?.members.fetch()
-      if (members) {
-        const member = members.get(userId)
-        return member?.roles.cache.map((role) => role.id) || []
-      }
-      return []
+      const guild =
+        this.client.guilds.cache.get(guildId) ||
+        (await this.client.guilds.fetch(guildId))
+      const member = await guild?.members.fetch(userId)
+      return member?.roles.cache.map((role) => role.id) || []
     } catch (e) {
+      const code =
+        e && typeof e === 'object' && 'code' in e ? Number(e.code) : null
+      if (code === 10007) {
+        this.log.debug(
+          'Discord member not found in guild',
+          guildId,
+          'for user',
+          userId,
+        )
+        return []
+      }
       this.log.error(
         'Failed to get roles in guild',
         guildId,
         'for user',
         userId,
+        e,
       )
     }
     return []

From 11c75e042270d7b23a700135d9ff3b223f2e8859 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Tue, 16 Dec 2025 07:02:05 +0000
Subject: [PATCH 18/22] chore(release): v1.41.0-develop.3 [skip ci]

# [1.41.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.2...v1.41.0-develop.3) (2025-12-16)

### Bug Fixes

* logic bug in loading non-clustered elements ([#1161](https://github.com/WatWowMap/ReactMap/issues/1161)) ([a2c7f17](https://github.com/WatWowMap/ReactMap/commit/a2c7f17e02ff7cd5467d4bf5ccd8b13a444ba725))
* more robust discord handling ([#1181](https://github.com/WatWowMap/ReactMap/issues/1181)) ([b579ded](https://github.com/WatWowMap/ReactMap/commit/b579dedeb196fb4d8b1da025e325049bfd7833e8))

### Features

* default clientPrompt to none to skip permission reapproval ([d3ea283](https://github.com/WatWowMap/ReactMap/commit/d3ea283b5eacda18b9f4725e50e5353a955a363d))
---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec5d3a0f1..424ef5452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [1.41.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.2...v1.41.0-develop.3) (2025-12-16)
+
+
+### Bug Fixes
+
+* logic bug in loading non-clustered elements ([#1161](https://github.com/WatWowMap/ReactMap/issues/1161)) ([a2c7f17](https://github.com/WatWowMap/ReactMap/commit/a2c7f17e02ff7cd5467d4bf5ccd8b13a444ba725))
+* more robust discord handling ([#1181](https://github.com/WatWowMap/ReactMap/issues/1181)) ([b579ded](https://github.com/WatWowMap/ReactMap/commit/b579dedeb196fb4d8b1da025e325049bfd7833e8))
+
+
+### Features
+
+* default clientPrompt to none to skip permission reapproval ([d3ea283](https://github.com/WatWowMap/ReactMap/commit/d3ea283b5eacda18b9f4725e50e5353a955a363d))
+
 # [1.41.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.1...v1.41.0-develop.2) (2025-12-15)
 
 
diff --git a/package.json b/package.json
index cb4dc22af..c30ebb10e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.41.0-develop.2",
+  "version": "1.41.0-develop.3",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",

From cea3141386d804f502e83e89b9bf92da93102a5d Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 30 Dec 2025 17:56:01 -0800
Subject: [PATCH 19/22] fix: area reload

---
 server/src/utils/reloadConfig.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/src/utils/reloadConfig.js b/server/src/utils/reloadConfig.js
index d82adaff1..ef7afd985 100644
--- a/server/src/utils/reloadConfig.js
+++ b/server/src/utils/reloadConfig.js
@@ -5,7 +5,7 @@ const { log, TAGS } = require('@rm/logger')
 
 const { state } = require('../services/state')
 const { bindConnections } = require('../models')
-const { loadLatestAreas } = require('../services/areas')
+const { loadCachedAreas, loadLatestAreas } = require('../services/areas')
 const { loadAuthStrategies } = require('../routes/authRouter')
 const { deepCompare } = require('./deepCompare')
 
@@ -52,6 +52,10 @@ async function reloadConfig() {
     const newConfig = require('@rm/config')
 
     const { areas, ...oldWithoutAreas } = oldConfig
+    const primedAreas = areas || loadCachedAreas()
+    // Prime areas early so config.getSafe('areas') never fails during reload.
+    newConfig.setAreas(primedAreas)
+    oldWithoutAreas.areas = primedAreas
 
     const { report, areEqual, changed } = deepCompare(
       oldWithoutAreas,
@@ -69,8 +73,6 @@ async function reloadConfig() {
       !report.manualAreas.areEqual
     ) {
       newConfig.setAreas(await loadLatestAreas())
-    } else {
-      newConfig.setAreas(areas)
     }
 
     if (areEqual) {

From 5c907c537a2bea62866c81d94997ba6072bd9fd4 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Wed, 31 Dec 2025 01:59:21 +0000
Subject: [PATCH 20/22] chore(release): v1.41.0-develop.4 [skip ci]

# [1.41.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.3...v1.41.0-develop.4) (2025-12-31)

### Bug Fixes

* area reload ([cea3141](https://github.com/WatWowMap/ReactMap/commit/cea3141386d804f502e83e89b9bf92da93102a5d))
---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 424ef5452..b9d498f20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [1.41.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.3...v1.41.0-develop.4) (2025-12-31)
+
+
+### Bug Fixes
+
+* area reload ([cea3141](https://github.com/WatWowMap/ReactMap/commit/cea3141386d804f502e83e89b9bf92da93102a5d))
+
 # [1.41.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.2...v1.41.0-develop.3) (2025-12-16)
 
 
diff --git a/package.json b/package.json
index c30ebb10e..49f17bc1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.41.0-develop.3",
+  "version": "1.41.0-develop.4",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",

From 7bd5ce10d3e8aa6f64faac8d3d9773c589d6a28e Mon Sep 17 00:00:00 2001
From: Josh Vincent <jdvswimmer@gmail.com>
Date: Thu, 8 Jan 2026 16:43:22 -0700
Subject: [PATCH 21/22] fix: escape gpx xml (#1186)

* Escapes XML in GPX route data

Ensures route names and descriptions are properly escaped
when generating GPX files, preventing potential XML parsing issues.
Sanitizes the filename to be downloaded.

* Prettier

* fix: filename sanitizer to also strip backslashes for Windows safety

---------

Co-authored-by: Mygod <contact-git@mygod.be>
---
 src/features/route/RoutePopup.jsx | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/features/route/RoutePopup.jsx b/src/features/route/RoutePopup.jsx
index 09cc7b068..6f9c4e934 100644
--- a/src/features/route/RoutePopup.jsx
+++ b/src/features/route/RoutePopup.jsx
@@ -388,6 +388,24 @@ export function RoutePopup({ end, inline = false, ...props }) {
 }
 
 function DownloadRouteGPX({ route }) {
+  const escapeXml = (value = '') =>
+    String(value).replace(
+      /[<>&'"]/g,
+      (c) =>
+        ({
+          '<': '&lt;',
+          '>': '&gt;',
+          '&': '&amp;',
+          "'": '&apos;',
+          '"': '&quot;',
+        })[c],
+    )
+
+  const sanitizeFilename = (name = '') =>
+    String(name)
+      .replace(/[\\/:*?"<>|]/g, '')
+      .slice(0, 200) || 'route'
+
   const GPXContent = React.useMemo(() => {
     if (!route.waypoints.length) {
       return null
@@ -396,8 +414,8 @@ function DownloadRouteGPX({ route }) {
     return `<?xml version="1.0" encoding="UTF-8"?>
 <gpx version="1.1" creator="ReactMap" xmlns="http://www.topografix.com/GPX/1/1">
   <rte>
-    <name>${route.name}</name>
-    <desc>${route.description}</desc>
+    <name>${escapeXml(route.name)}</name>
+    <desc>${escapeXml(route.description)}</desc>
     ${route.waypoints
       .map(
         (waypoint) =>
@@ -417,7 +435,7 @@ function DownloadRouteGPX({ route }) {
       href={`data:application/gpx;charset=utf-8,${encodeURIComponent(
         GPXContent,
       )}`}
-      download={`${route.name}.gpx`}
+      download={`${sanitizeFilename(route.name)}.gpx`}
       size="small"
       style={{ color: 'inherit' }}
     >

From 5b3206764dae1a34b4de8d07f22cb9ceea007591 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Thu, 8 Jan 2026 23:46:17 +0000
Subject: [PATCH 22/22] chore(release): v1.41.0-develop.5 [skip ci]

# [1.41.0-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.4...v1.41.0-develop.5) (2026-01-08)

### Bug Fixes

* escape gpx xml ([#1186](https://github.com/WatWowMap/ReactMap/issues/1186)) ([7bd5ce1](https://github.com/WatWowMap/ReactMap/commit/7bd5ce10d3e8aa6f64faac8d3d9773c589d6a28e))
---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9d498f20..e310e6167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [1.41.0-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.4...v1.41.0-develop.5) (2026-01-08)
+
+
+### Bug Fixes
+
+* escape gpx xml ([#1186](https://github.com/WatWowMap/ReactMap/issues/1186)) ([7bd5ce1](https://github.com/WatWowMap/ReactMap/commit/7bd5ce10d3e8aa6f64faac8d3d9773c589d6a28e))
+
 # [1.41.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.41.0-develop.3...v1.41.0-develop.4) (2025-12-31)
 
 
diff --git a/package.json b/package.json
index 49f17bc1f..10e04a679 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.41.0-develop.4",
+  "version": "1.41.0-develop.5",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",