add advanced option -layer- to search.html

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

diff --git a/src/pages/SearchPage.svelte b/src/pages/SearchPage.svelte
index 4870cc44a2e3a418843daa19ee8a66dca158f421..fd4e7c558abb2905f8400d47455da17ab3ce3eca 100644 (file)
--- a/src/pages/SearchPage.svelte
+++ b/src/pages/SearchPage.svelte
@@ -1,6 +1,5 @@
 <script>
   import { page, results_store } from '../lib/stores.js';
 <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 Header from '../components/Header.svelte';
   import { fetch_from_api, update_html_title } from '../lib/api_utils.js';
 
   import Header from '../components/Header.svelte';


@@ -23,12 +22,13 @@
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),
       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'),
       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'),
       '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'),
       limit: search_params.get('limit'),
       polygon_threshold: search_params.get('polygon_threshold'),
       exclude_place_ids: search_params.get('exclude_place_ids'),


@@ -46,9 +46,23 @@
       fetch_from_api('search', api_request_params, function (data) {
         results_store.set(data);
 
       fetch_from_api('search', api_request_params, function (data) {
         results_store.set(data);
 

-        update_html_title('Result for ' + api_request_params.q);
+        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('input[name=q]').focus();
+          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);
       });
     } else {
       results_store.set(undefined);


@@ -80,19 +94,20 @@
 <style>
   .sidebar {
     width: 25%;
 <style>
   .sidebar {
     width: 25%;

+    min-width: 200px;

     padding: 15px;
     padding-top: 0;
     padding: 15px;
     padding-top: 0;

-    display: inline-block;
+    display: block;

     float: left;
   }
 
   #map-wrapper {
     position: relative;
     float: left;
   }
 
   #map-wrapper {
     position: relative;

-    min-height: 300px;

     height: calc(100vh - 250pt);
     height: calc(100vh - 250pt);

+    min-height: 300px;

     width: 75%;
     padding-right: 20px;
     width: 75%;
     padding-right: 20px;

-    display: inline-block;
+    display: block;

     float: left;
   }
 
     float: left;
   }
 


@@ -105,7 +120,9 @@
       width: 100%;
     }
     #map-wrapper {
       width: 100%;
     }
     #map-wrapper {

+      width: 100%;

       height: 300px;
       height: 300px;

+      padding-left: 20px;

     }
   }
 </style>
     }
   }
 </style>