X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/c636646759d9c541f7baf19812be18d002a8ce1d..ff85679c2bc5fcc4119ab4da563fa5222440f3ab:/src/pages/SearchPage.svelte?ds=sidebyside

diff --git a/src/pages/SearchPage.svelte b/src/pages/SearchPage.svelte
index 8367817..134ea8a 100644
--- a/src/pages/SearchPage.svelte
+++ b/src/pages/SearchPage.svelte
@@ -1,106 +1,82 @@
 <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';
 
-  export let reverse_search = false;
-
   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();
 
-    if (reverse_search) {
-      api_request_params = {
-        lat: search_params.get('lat'),
-        lon: search_params.get('lon'),
-        zoom: (search_params.get('zoom') > 1
-          ? Number(search_params.get('zoom'))
-          : Number(get_config_value('Reverse_Default_Search_Zoom'))),
-        format: 'jsonv2'
-      };
-
-      if (api_request_params.lat || api_request_params.lat) {
-
-        fetch_from_api('reverse', api_request_params, function (data) {
-          if (data && !data.error) {
-            current_request_latlon.set([api_request_params.lat, api_request_params.lon]);
-            results_store.set([data]);
-          } else {
-            results_store.set([]);
-          }
-
-          update_html_title('Reverse result for '
-                              + api_request_params.lat
-                              + ','
-                              + api_request_params.lon);
-          document.querySelector('input[name=lat]').focus();
-        });
-      }
-    } else {
-      api_request_params = {
-        q: search_params.get('q'),
-        street: search_params.get('street'),
-        city: search_params.get('city'),
-        county: search_params.get('county'),
-        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,
-        viewbox: search_params.get('viewbox'),
-        bounded: search_params.get('bounded'),
-        dedupe: search_params.get('dedupe'),
-        'accept-language': search_params.get('accept-language'),
-        countrycodes: search_params.get('countrycodes'),
-        limit: search_params.get('limit'),
-        polygon_threshold: search_params.get('polygon_threshold'),
-        exclude_place_ids: search_params.get('exclude_place_ids'),
-        format: 'jsonv2'
-      };
-
-      let anyStructuredFieldsSet = (api_request_params.street
-                                  || api_request_params.city
-                                  || api_request_params.county
-                                  || api_request_params.state
-                                  || api_request_params.country
-                                  || api_request_params.postalcode);
-
-      if (api_request_params.q || anyStructuredFieldsSet) {
-        fetch_from_api('search', api_request_params, function (data) {
-          results_store.set(data);
-
-          update_html_title('Result for ' + api_request_params.q);
-
+    api_request_params = {
+      q: search_params.get('q'),
+      street: search_params.get('street'),
+      city: search_params.get('city'),
+      county: search_params.get('county'),
+      state: search_params.get('state'),
+      country: search_params.get('country'),
+      postalcode: search_params.get('postalcode'),
+      polygon_geojson: Nominatim_Config.Search_AreaPolygons ? 1 : 0,
+      viewbox: search_params.get('viewbox'),
+      bounded: search_params.get('bounded'),
+      dedupe: search_params.get('dedupe'),
+      'accept-language': search_params.get('accept-language'),
+      countrycodes: search_params.get('countrycodes'),
+      limit: search_params.get('limit'),
+      polygon_threshold: search_params.get('polygon_threshold'),
+      exclude_place_ids: search_params.get('exclude_place_ids'),
+      format: 'jsonv2'
+    };
+
+    let anyStructuredFieldsSet = (api_request_params.street
+                                || api_request_params.city
+                                || api_request_params.county
+                                || api_request_params.state
+                                || api_request_params.country
+                                || api_request_params.postalcode);
+
+    if (api_request_params.q || anyStructuredFieldsSet) {
+      fetch_from_api('search', api_request_params, function (data) {
+        results_store.set(data);
+
+        update_html_title('Result for ' + api_request_params.q);
+
+        if (anyStructuredFieldsSet) {
+          document.querySelector(".nav-tabs a[href='#structured']").click();
+          document.querySelector('input[name=street]').focus();
+        } else {
           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 reverse_search={reverse_search} 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={reverse_search} />
+    <ResultsList bind:current_result reverse_search={false} />
   </div>
   <div id="map-wrapper">
-    <Map display_minimap={true} />
+    <Map {current_result} display_minimap={true} />
   </div>
 </div>
 
@@ -108,19 +84,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;
   }
 
@@ -133,7 +110,9 @@
       width: 100%;
     }
     #map-wrapper {
+      width: 100%;
       height: 300px;
+      padding-left: 20px;
     }
   }
 </style>