From de75ecf942756bba2e6cc2bbe6a527a7e5f21924 Mon Sep 17 00:00:00 2001
From: Joaquim d'Souza <joaquimds@gmail.com>
Date: Thu, 19 Feb 2026 15:28:25 +0100
Subject: [PATCH 1/2] fix: bug where one missing address column would fail
 geocoding, even when other columns exist

---
 .../[id]/components/GeocodingConfigFields.tsx            | 7 ++++++-
 src/server/mapping/geocode.ts                            | 9 +++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/(private)/data-sources/[id]/components/GeocodingConfigFields.tsx b/src/app/(private)/data-sources/[id]/components/GeocodingConfigFields.tsx
index 5bf8b7093..ac7fa2622 100644
--- a/src/app/(private)/data-sources/[id]/components/GeocodingConfigFields.tsx
+++ b/src/app/(private)/data-sources/[id]/components/GeocodingConfigFields.tsx
@@ -99,6 +99,11 @@ export function GeocodingConfigFields({
     }
   };
 
+  // Include previous options that are no longer in the data source column defs, so they can be removed
+  const allOptions = Array.from(
+    new Set(locationColumnOptions.map((c) => c.label).concat(columns)),
+  );
+
   return (
     <>
       <CustomSelect
@@ -114,7 +119,7 @@ export function GeocodingConfigFields({
         <CustomMultiSelect
           id="config-location-columns-multi"
           label="Location columns"
-          allOptions={dataSource?.columnDefs.map((cd) => cd.name)}
+          allOptions={allOptions}
           selectedOptions={columns}
           onChange={onDropdownChange}
         />
diff --git a/src/server/mapping/geocode.ts b/src/server/mapping/geocode.ts
index 4a79c5e39..f9b7de692 100644
--- a/src/server/mapping/geocode.ts
+++ b/src/server/mapping/geocode.ts
@@ -191,10 +191,11 @@ const geocodeRecordByAddress = async (
 ) => {
   const dataRecordJson = dataRecord.json;
   const { columns: addressColumns } = geocodingConfig;
-  for (const addressColumn of addressColumns) {
-    if (!(addressColumn in dataRecordJson)) {
-      throw new Error(`Missing area column "${addressColumn}" in row`);
-    }
+  const hasColumn = addressColumns.some((c) => c in dataRecordJson);
+  if (!hasColumn) {
+    throw new Error(
+      `Missing area columns "${addressColumns.join(", ")}" in row`,
+    );
   }
 
   // TODO: remove UK when other countries are supported

From fb9c1da7ab850ac91db9f7c8aeba1f3ad9dd4260 Mon Sep 17 00:00:00 2001
From: joaquimds <joaquimds@gmail.com>
Date: Thu, 19 Feb 2026 15:40:26 +0100
Subject: [PATCH 2/2] Update src/server/mapping/geocode.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/server/mapping/geocode.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/mapping/geocode.ts b/src/server/mapping/geocode.ts
index f9b7de692..af006f06a 100644
--- a/src/server/mapping/geocode.ts
+++ b/src/server/mapping/geocode.ts
@@ -194,7 +194,7 @@ const geocodeRecordByAddress = async (
   const hasColumn = addressColumns.some((c) => c in dataRecordJson);
   if (!hasColumn) {
     throw new Error(
-      `Missing area columns "${addressColumns.join(", ")}" in row`,
+      `Missing address columns "${addressColumns.join(", ")}" in row`,
     );
   }