From f44323495db8c61c295202142fa4253bf20371a3 Mon Sep 17 00:00:00 2001
From: Sven Verweij <37927107+SvenVw@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:41:12 +0100
Subject: [PATCH 1/2] Fix: saved fields of the farm are visible again with a
 colored outline

---
 .changeset/nice-clocks-rush.md                |  5 ++++
 .../components/blocks/atlas/atlas-panels.tsx  | 29 ++++++++++++-------
 ..._id_farm.$calendar.atlas.fields._index.tsx | 24 +++++++++++++--
 ...farm.create.$b_id_farm.$calendar.atlas.tsx | 10 +++++--
 4 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/nice-clocks-rush.md

diff --git a/.changeset/nice-clocks-rush.md b/.changeset/nice-clocks-rush.md
new file mode 100644
index 000000000..be6ad36de
--- /dev/null
+++ b/.changeset/nice-clocks-rush.md
@@ -0,0 +1,5 @@
+---
+"@svenvw/fdm-app": patch
+---
+
+Fixes that saved fields of the farm are visible again with a colored outline
diff --git a/fdm-app/app/components/blocks/atlas/atlas-panels.tsx b/fdm-app/app/components/blocks/atlas/atlas-panels.tsx
index 9364da301..6fb474911 100644
--- a/fdm-app/app/components/blocks/atlas/atlas-panels.tsx
+++ b/fdm-app/app/components/blocks/atlas/atlas-panels.tsx
@@ -38,22 +38,29 @@ export function FieldsPanelHover({
                 // Set message about zoom level
                 const zoom = map.getZoom()
                 if (zoom && zoom > zoomLevelFields) {
+                    if (!map.getLayer(layer)) return
+
                     const features = map.queryRenderedFeatures(evt.point, {
                         layers: [layer],
                     })
 
                     if (layerExclude) {
-                        const featuresExclude = map.queryRenderedFeatures(
-                            evt.point,
-                            {
-                                layers: Array.isArray(layerExclude)
-                                    ? layerExclude
-                                    : [layerExclude],
-                            },
-                        )
-                        if (featuresExclude && featuresExclude.length > 0) {
-                            setPanel(null)
-                            return
+                        const layers = Array.isArray(layerExclude)
+                            ? layerExclude
+                            : [layerExclude]
+                        const validLayers = layers.filter((l) => map.getLayer(l))
+
+                        if (validLayers.length > 0) {
+                            const featuresExclude = map.queryRenderedFeatures(
+                                evt.point,
+                                {
+                                    layers: validLayers,
+                                },
+                            )
+                            if (featuresExclude && featuresExclude.length > 0) {
+                                setPanel(null)
+                                return
+                            }
                         }
                     }
 
diff --git a/fdm-app/app/routes/farm.$b_id_farm.$calendar.atlas.fields._index.tsx b/fdm-app/app/routes/farm.$b_id_farm.$calendar.atlas.fields._index.tsx
index 73c0be990..607792b46 100644
--- a/fdm-app/app/routes/farm.$b_id_farm.$calendar.atlas.fields._index.tsx
+++ b/fdm-app/app/routes/farm.$b_id_farm.$calendar.atlas.fields._index.tsx
@@ -12,7 +12,10 @@ import { type LoaderFunctionArgs, useLoaderData } from "react-router"
 import { ZOOM_LEVEL_FIELDS } from "~/components/blocks/atlas/atlas"
 import { Controls } from "~/components/blocks/atlas/atlas-controls"
 import { FieldsPanelHover } from "~/components/blocks/atlas/atlas-panels"
-import { FieldsSourceAvailable } from "~/components/blocks/atlas/atlas-sources"
+import {
+    FieldsSourceAvailable,
+    FieldsSourceNotClickable,
+} from "~/components/blocks/atlas/atlas-sources"
 import { getFieldsStyle } from "~/components/blocks/atlas/atlas-styles"
 import { getViewState } from "~/components/blocks/atlas/atlas-viewstate"
 import { getMapboxStyle, getMapboxToken } from "~/integrations/mapbox"
@@ -117,10 +120,10 @@ export default function FarmAtlasFieldsBlock() {
 
     const id = "fieldsSaved"
     const fields = loaderData.savedFields
-    const _fieldsSavedStyle = getFieldsStyle(id)
+    const fieldsSavedStyle = getFieldsStyle(id)
     const fieldsAvailableId = "fieldsAvailable"
     const fieldsAvailableStyle = getFieldsStyle(fieldsAvailableId)
-    const _fieldsSavedOutlineStyle = getFieldsStyle("fieldsSavedOutline")
+    const fieldsSavedOutlineStyle = getFieldsStyle("fieldsSavedOutline")
     const initialViewState = getViewState(fields)
 
     // Create a sessionStorage to store the latest viewstate
@@ -191,6 +194,21 @@ export default function FarmAtlasFieldsBlock() {
                 <Layer {...fieldsAvailableStyle} layout={layerLayout} />
             </FieldsSourceAvailable>
 
+            {fields && (
+                <FieldsSourceNotClickable id={id} fieldsData={fields}>
+                    <Layer
+                        {...fieldsSavedOutlineStyle}
+                        source={id}
+                        layout={layerLayout}
+                    />
+                    <Layer
+                        {...fieldsSavedStyle}
+                        source={id}
+                        layout={layerLayout}
+                    />
+                </FieldsSourceNotClickable>
+            )}
+
             <div className="fields-panel grid gap-4 w-[350px]">
                 <FieldsPanelHover
                     zoomLevelFields={ZOOM_LEVEL_FIELDS}
diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.atlas.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.atlas.tsx
index 333b58587..489b40a76 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.atlas.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.atlas.tsx
@@ -336,8 +336,14 @@ export default function Index() {
                                     id={fieldsSavedId}
                                     fieldsData={fieldsSaved}
                                 >
-                                    <Layer {...fieldsSavedStyle} />
-                                    <Layer {...fieldsSavedOutlineStyle} />
+                                    <Layer
+                                        {...fieldsSavedOutlineStyle}
+                                        source={fieldsSavedId}
+                                    />
+                                    <Layer
+                                        {...fieldsSavedStyle}
+                                        source={fieldsSavedId}
+                                    />
                                 </FieldsSourceNotClickable>
 
                                 <div className="fields-panel grid gap-4 w-[350px]">

From 49c65e99d2eb1f02fecdb9f830da06649f988183 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 15:51:15 +0000
Subject: [PATCH 2/2] chore: bump version of packages for release

---
 .changeset/nice-clocks-rush.md | 5 -----
 fdm-app/CHANGELOG.md           | 6 ++++++
 fdm-app/package.json           | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/nice-clocks-rush.md

diff --git a/.changeset/nice-clocks-rush.md b/.changeset/nice-clocks-rush.md
deleted file mode 100644
index be6ad36de..000000000
--- a/.changeset/nice-clocks-rush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@svenvw/fdm-app": patch
----
-
-Fixes that saved fields of the farm are visible again with a colored outline
diff --git a/fdm-app/CHANGELOG.md b/fdm-app/CHANGELOG.md
index 9b45bc82b..52e522e2a 100644
--- a/fdm-app/CHANGELOG.md
+++ b/fdm-app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog fdm-app
 
+## 0.25.2
+
+### Patch Changes
+
+- f443234: Fixes that saved fields of the farm are visible again with a colored outline
+
 ## 0.25.1
 
 ### Patch Changes
diff --git a/fdm-app/package.json b/fdm-app/package.json
index 972d3ab34..c30d01d8e 100644
--- a/fdm-app/package.json
+++ b/fdm-app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@svenvw/fdm-app",
-    "version": "0.25.1",
+    "version": "0.25.2",
     "private": true,
     "sideEffects": false,
     "type": "module",