From bcce5eea3cc8018ca100249e42c5b986c9170599 Mon Sep 17 00:00:00 2001
From: mtmail <mtmail@gmx.net>
Date: Mon, 24 Nov 2025 23:22:25 +0100
Subject: [PATCH] reverse page: keep advanced options after map click (#313)

---
 src/components/SearchSectionReverse.svelte | 23 ++++++++++++-----
 test/reverse.js                            | 29 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/components/SearchSectionReverse.svelte b/src/components/SearchSectionReverse.svelte
index e99d031..d74b7a3 100644
--- a/src/components/SearchSectionReverse.svelte
+++ b/src/components/SearchSectionReverse.svelte
@@ -1,5 +1,6 @@
 <script>
   import UrlSubmitForm from '../components/UrlSubmitForm.svelte';
+  import { SvelteURLSearchParams } from 'svelte/reactivity';
 
   import { zoomLevels } from '../lib/helpers.js';
   import { mapState } from '../state/MapState.svelte.js';
@@ -9,12 +10,22 @@
 
   $effect(() => {
     const newCenter = mapState.lastClick;
-    if (newCenter) {
-      appState.refreshPage('reverse', new URLSearchParams({
-        'lat': newCenter.lat,
-        'lon': newCenter.lng,
-        'zoom': zoom
-      }));
+    const latChanged = Number(lat) !== newCenter?.lat;
+    const lonChanged = Number(lon) !== newCenter?.lng;
+
+    if (newCenter && (latChanged || lonChanged)) {
+      const params = new SvelteURLSearchParams(appState.page?.params || {});
+
+      params.set('lat', newCenter.lat);
+      params.set('lon', newCenter.lng);
+
+      if (zoom) {
+        params.set('zoom', zoom);
+      } else {
+        params.delete('zoom');
+      }
+
+      appState.refreshPage('reverse', params);
     }
   });
 
diff --git a/test/reverse.js b/test/reverse.js
index 2fea785..f6f7e84 100644
--- a/test/reverse.js
+++ b/test/reverse.js
@@ -61,6 +61,35 @@ describe('Reverse Page', function () {
       assert.equal((await page.$$('#map')).length, 1);
     });
 
+   it('should preserve advanced options when searching from a map click', async function () {
+      // Set layer=address, submit form
+      await page.click('#searchAdvancedOptions summary');
+      await page.waitForSelector('input[name=layer]');
+      await page.$eval('#option_layer', (input) => { input.value = ''; });
+      await page.type('#option_layer', 'address');
+      await page.click('button[type=submit]');
+      await page.waitForFunction(() => {
+        return new URLSearchParams(location.search).get('layer') === 'address';
+      });
+
+      const initialUrl = new URL(await page.url());
+      const initialLat = initialUrl.searchParams.get('lat');
+
+      // Click on new position
+      await page.click('#map', { offset: { x: 50, y: 50 } });
+
+      // Wait until latitude in URL changed
+      await page.waitForFunction(
+        (previousLat) => new URL(window.location.href).searchParams.get('lat') !== previousLat,
+        {},
+        initialLat
+      );
+
+      // Confirm the layer=address is still in URL
+      const refreshedUrl = new URL(await page.url());
+      assert.strictEqual(refreshedUrl.searchParams.get('layer'), 'address');
+    });
+
     it('should redirect to details page on clicking details button', async function () {
       let current_url;
       let results = await page.$$('#searchresults .result a');
-- 
2.39.5