X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/6ab65d8875eeb387471c463ec3eb38cc3b6b2a07..ea40d1c5cf15d991bc3d2bc0a10a87f5505336f6:/src/pages/SearchPage.svelte

diff --git a/src/pages/SearchPage.svelte b/src/pages/SearchPage.svelte
index 327d6aa..fd4e7c5 100644
--- a/src/pages/SearchPage.svelte
+++ b/src/pages/SearchPage.svelte
@@ -1,22 +1,17 @@
 <script>
-  import { onMount, onDestroy } from 'svelte';
-
-  import {
-    page, results_store, current_request_latlon
-  } from '../lib/stores.js';
-  import { get_config_value } from '../lib/config_reader.js';
+  import { page, results_store } from '../lib/stores.js';
   import { fetch_from_api, update_html_title } from '../lib/api_utils.js';
 
-  import SearchBar from '../components/SearchBar.svelte';
+  import Header from '../components/Header.svelte';
+  import SearchSection from '../components/SearchSection.svelte';
   import ResultsList from '../components/ResultsList.svelte';
   import Map from '../components/Map.svelte';
 
   let api_request_params;
   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 = {
@@ -27,12 +22,13 @@
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),
-      polygon_geojson: get_config_value('Search_AreaPolygons', false) ? 1 : 0,
+      polygon_geojson: Nominatim_Config.Search_AreaPolygons ? 1 : 0,
       viewbox: search_params.get('viewbox'),
       bounded: search_params.get('bounded'),
-      dedupe: search_params.get('dedupe'),
+      dedupe: (!search_params.has('dedupe') || search_params.get('dedupe') === '1') ? 1 : 0,
       'accept-language': search_params.get('accept-language'),
       countrycodes: search_params.get('countrycodes'),
+      layer: search_params.get('layer'),
       limit: search_params.get('limit'),
       polygon_threshold: search_params.get('polygon_threshold'),
       exclude_place_ids: search_params.get('exclude_place_ids'),
@@ -50,26 +46,47 @@
       fetch_from_api('search', api_request_params, function (data) {
         results_store.set(data);
 
-        update_html_title('Result for ' + api_request_params.q);
-
-        document.querySelector('input[name=q]').focus();
+        if (anyStructuredFieldsSet) {
+          update_html_title('Result for ' + [
+            api_request_params.street,
+            api_request_params.city,
+            api_request_params.county,
+            api_request_params.state,
+            api_request_params.country,
+            api_request_params.postalcode
+          ].filter((text) => text && text.length > 1).join(', '));
+
+          document.querySelector(".nav-tabs a[href='#structured']").click();
+          document.querySelector('input[name=street]').focus();
+        } else {
+          update_html_title('Result for ' + api_request_params.q);
+
+          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} />
+<Header>
+  <SearchSection api_request_params={api_request_params} bStructuredSearch={bStructuredSearch} />
+</Header>
 
 <div id="content">
   <div class="sidebar">
-    <ResultsList reverse_search={false} />
+    <ResultsList bind:current_result reverse_search={false} />
   </div>
   <div id="map-wrapper">
-    <Map display_minimap={true} />
+    <Map {current_result} display_minimap={true} />
   </div>
 </div>
 
@@ -77,19 +94,20 @@
 <style>
   .sidebar {
     width: 25%;
+    min-width: 200px;
     padding: 15px;
     padding-top: 0;
-    display: inline-block;
+    display: block;
     float: left;
   }
 
   #map-wrapper {
     position: relative;
-    min-height: 300px;
     height: calc(100vh - 250pt);
+    min-height: 300px;
     width: 75%;
     padding-right: 20px;
-    display: inline-block;
+    display: block;
     float: left;
   }
 
@@ -102,7 +120,9 @@
       width: 100%;
     }
     #map-wrapper {
+      width: 100%;
       height: 300px;
+      padding-left: 20px;
     }
   }
 </style>