Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/pages/SearchPage.svelte b/src/pages/SearchPage.svelte
index ae9aec8b84cdd780e8ef702ebb17fdd8b14ee647..134ea8aab80ed8a8266f1875f4069eb5aa4b5048 100644 (file)
--- a/src/pages/SearchPage.svelte
+++ b/src/pages/SearchPage.svelte
@@ -1,9 +1,9 @@
 <script>
   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';
 
-  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';
 
@@ -22,7 +22,7 @@
       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'),
@@ -47,7 +47,12 @@
 
         update_html_title('Result for ' + api_request_params.q);
 
-        document.querySelector('input[name=q]').focus();
+        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);
@@ -62,7 +67,9 @@
   }
 </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">
@@ -77,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;
   }
 
@@ -102,7 +110,9 @@
       width: 100%;
     }
     #map-wrapper {
+      width: 100%;
       height: 300px;
+      padding-left: 20px;
     }
   }
 </style>