X-Git-Url: https://git.openstreetmap.org/nominatim-ui.git/blobdiff_plain/6ab65d8875eeb387471c463ec3eb38cc3b6b2a07..8258a52336c84b5bce8352334f5e356543df1b57:/src/pages/ReversePage.svelte

diff --git a/src/pages/ReversePage.svelte b/src/pages/ReversePage.svelte
index 54e2a10..987f206 100644
--- a/src/pages/ReversePage.svelte
+++ b/src/pages/ReversePage.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 ReverseBar from '../components/ReverseBar.svelte';
+  import Header from '../components/Header.svelte';
+  import SearchSectionReverse from '../components/SearchSectionReverse.svelte';
   import ResultsList from '../components/ResultsList.svelte';
   import Map from '../components/Map.svelte';
 
   let api_request_params;
-  let bStructuredSearch;
-
-  function loaddata() {
-    let search_params = new URLSearchParams(window.location.search);
+  let current_result;
+  let position_marker; // what the user searched for
 
+  function loaddata(search_params) {
     update_html_title();
 
     api_request_params = {
@@ -24,15 +19,16 @@
       lon: search_params.get('lon'),
       zoom: (search_params.get('zoom') > 1
         ? Number(search_params.get('zoom'))
-        : Number(get_config_value('Reverse_Default_Search_Zoom'))),
+        : Number(Nominatim_Config.Reverse_Default_Search_Zoom)),
+      layer: search_params.get('layer'),
       format: 'jsonv2'
     };
 
     if (api_request_params.lat || api_request_params.lat) {
 
       fetch_from_api('reverse', api_request_params, function (data) {
+        position_marker = [api_request_params.lat, api_request_params.lon];
         if (data && !data.error) {
-          current_request_latlon.set([api_request_params.lat, api_request_params.lon]);
           results_store.set([data]);
         } else {
           results_store.set([]);
@@ -44,22 +40,32 @@
                             + api_request_params.lon);
         document.querySelector('input[name=lat]').focus();
       });
+    } else {
+      results_store.set(undefined);
     }
   }
 
-  let page_subscription;
-  onMount(() => { page_subscription = page.subscribe(loaddata); });
-  onDestroy(() => { page_subscription(); });
+  $: {
+    let pageinfo = $page;
+    if (pageinfo.tab === 'reverse') {
+      loaddata(pageinfo.params);
+    }
+  }
 </script>
 
-<ReverseBar api_request_params={api_request_params} />
+<Header>
+  <SearchSectionReverse lat={api_request_params.lat}
+                        lon={api_request_params.lon}
+                        zoom={api_request_params.zoom}
+                        api_request_params={api_request_params} />
+</Header>
 
 <div id="content">
   <div class="sidebar">
-    <ResultsList reverse_search={true} />
+    <ResultsList bind:current_result reverse_search={true} />
   </div>
   <div id="map-wrapper">
-    <Map display_minimap={true} />
+    <Map {current_result} {position_marker} display_minimap={true} />
   </div>
 </div>
 
@@ -67,19 +73,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;
   }
 
@@ -92,7 +99,9 @@
       width: 100%;
     }
     #map-wrapper {
+      width: 100%;
       height: 300px;
+      padding-left: 20px;
     }
   }
 </style>