Handle all page changes via page store (#70)

[nominatim-ui.git] / src / pages / SearchPage.svelte

diff --git a/src/pages/SearchPage.svelte b/src/pages/SearchPage.svelte
index caa4e9687974d51ec8a630c0c1247cb194102418..ae9aec8b84cdd780e8ef702ebb17fdd8b14ee647 100644 (file)
--- a/src/pages/SearchPage.svelte
+++ b/src/pages/SearchPage.svelte
@@ -1,6 +1,4 @@
 <script>
-  import { onMount, onDestroy } from 'svelte';
-
   import { page, results_store } from '../lib/stores.js';
   import { get_config_value } from '../lib/config_reader.js';
   import { fetch_from_api, update_html_title } from '../lib/api_utils.js';
@@ -13,9 +11,7 @@
   let bStructuredSearch;
   let current_result;
 
-  function loaddata() {
-    let search_params = new URLSearchParams(window.location.search);
-
+  function loaddata(search_params) {
     update_html_title();
 
     api_request_params = {
@@ -53,12 +49,17 @@
 
         document.querySelector('input[name=q]').focus();
       });
+    } else {
+      results_store.set(undefined);
     }
   }
 
-  let page_subscription;
-  onMount(() => { page_subscription = page.subscribe(loaddata); });
-  onDestroy(() => { page_subscription(); });
+  $: {
+    let pageinfo = $page;
+    if (pageinfo.tab === 'search') {
+      loaddata(pageinfo.params);
+    }
+  }
 </script>
 
 <SearchBar api_request_params={api_request_params} bStructuredSearch={bStructuredSearch} />