X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/c061d3fd3d4c9135fdbda0af273d9fc0dc5b5535..ea40d1c5cf15d991bc3d2bc0a10a87f5505336f6:/src/components/SearchSection.svelte

diff --git a/src/components/SearchSection.svelte b/src/components/SearchSection.svelte
index 9bc5090..c1d3c18 100644
--- a/src/components/SearchSection.svelte
+++ b/src/components/SearchSection.svelte
@@ -7,8 +7,9 @@
   export let bStructuredSearch = false;
   export let api_request_params = {};
   let sViewBox;
-  let lat;
-  let lon;
+  // lat,lon are later set in update_reverse_link()
+  let lat; // eslint-disable-line no-unused-vars
+  let lon; // eslint-disable-line no-unused-vars
 
   function map_viewbox_as_string(map) {
     var bounds = map.getBounds();
@@ -69,7 +70,7 @@
   }
 
   function set_dedupe(e) {
-    document.querySelector('input[name=dedupe]').value = e.target.checked ? 1 : '';
+    document.querySelector('input[name=dedupe]').value = e.target.checked ? 1 : 0;
   }
 
   function set_api_param(e) {
@@ -79,147 +80,215 @@
 
 <ul class="nav nav-tabs">
   <li class="nav-item">
-    <a class="nav-link" class:active={!bStructuredSearch} data-toggle="tab" href="#simple">Simple</a>
+    <a class="nav-link" class:active={!bStructuredSearch} data-bs-toggle="tab" href="#simple">
+      Simple
+    </a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" class:active={bStructuredSearch} data-toggle="tab" href="#structured">Structured</a>
+    <a class="nav-link" class:active={bStructuredSearch} data-bs-toggle="tab" href="#structured">
+      Structured
+    </a>
   </li>
 </ul>
 
-<div class="tab-content p-2">
+<div class="tab-content py-2">
   <div class="tab-pane" class:active={!bStructuredSearch} id="simple" role="tabpanel">
     <UrlSubmitForm page="search">
-      <input id="q"
-             name="q"
-             type="text"
-             class="form-control form-control-sm"
-             placeholder="Search"
-             value="{api_request_params.q || ''}" />
-
-      <div class="form-group search-button-group">
+      <div class="col-auto">
+        <input id="q"
+               name="q"
+               type="text"
+               class="form-control form-control-sm"
+               placeholder="Search"
+               value="{api_request_params.q || ''}" />
+      </div>
+      <div class="col-auto">
         <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
-        <input type="hidden" name="viewbox" value="{sViewBox || ''}" />
-        <input type="hidden" name="dedupe" value="{!api_request_params.dedupe ? '' : 1}" />
-        <input type="hidden" name="bounded" value="{api_request_params.bounded ? 1 : ''}" />
-        <input type="hidden" name="accept-language" value="{api_request_params['accept-language'] || ''}" />
-        <input type="hidden" name="countrycodes" value="{api_request_params.countrycodes || ''}" />
-        <input type="hidden" name="limit" value="{api_request_params.limit || ''}" />
-        <input type="hidden" name="polygon_threshold" value="{api_request_params.polygon_threshold || ''}" />
+        <input type="hidden"
+               name="viewbox" value="{sViewBox || ''}" />
+        <input type="hidden"
+               name="dedupe" value="{api_request_params.dedupe === 0 ? 0 : 1}" />
+        <input type="hidden"
+               name="bounded" value="{api_request_params.bounded ? 1 : ''}" />
+        <input type="hidden"
+               name="accept-language"value="{api_request_params['accept-language'] || ''}" />
+        <input type="hidden"
+               name="countrycodes" value="{api_request_params.countrycodes || ''}"
+                                   pattern="^[a-zA-Z]{'{2}'}(,[a-zA-Z]{'{2}'})*$" />
+        <input type="hidden"
+               name="limit" value="{api_request_params.limit || ''}" />
+        <input type="hidden"
+               name="polygon_threshold" value="{api_request_params.polygon_threshold || ''}" />
+        <input type="hidden"
+               name="layer" value="{api_request_params.layer || ''}" />
       </div>
     </UrlSubmitForm>
   </div>
   <div class="tab-pane" class:active={bStructuredSearch} id="structured" role="tabpanel">
     <UrlSubmitForm page="search">
-      <input name="street" type="text" class="form-control form-control-sm mr-1"
-             placeholder="House number/Street"
-             value="{api_request_params.street || ''}" />
-      <input name="city" type="text" class="form-control form-control-sm mr-1"
-             placeholder="City"
-             value="{api_request_params.city || ''}" />
-      <input id="county" name="county" type="text" class="form-control form-control-sm mr-1"
-             placeholder="County"
-             value="{api_request_params.county || ''}" />
-      <input name="state" type="text" class="form-control form-control-sm mr-1"
-             placeholder="State"
-             value="{api_request_params.state || ''}" />
-      <input name="country" type="text" class="form-control form-control-sm mr-1"
-             placeholder="Country"
-             value="{api_request_params.country || ''}" />
-      <input name="postalcode" type="text" class="form-control form-control-sm mr-1"
-             placeholder="Postal Code"
-             value="{api_request_params.postalcode || ''}" />
-
-      <div class="form-group search-button-group">
-        <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
-        <input type="hidden" name="viewbox" value="{sViewBox || ''}" />
-        <input type="hidden" name="dedupe" value="{!api_request_params.dedupe ? '' : 1}" />
-        <input type="hidden" name="bounded" value="{api_request_params.bounded ? 1 : ''}" />
-        <input type="hidden" name="accept-language" value="{api_request_params['accept-language'] || ''}" />
-        <input type="hidden" name="countrycodes" value="{api_request_params.countrycodes || ''}" />
-        <input type="hidden" name="limit" value="{api_request_params.limit || ''}" />
-        <input type="hidden" name="polygon_threshold" value="{api_request_params.polygon_threshold || ''}" />
+      <div class="col-auto">
+        <input name="street" type="text" class="form-control form-control-sm me-1"
+               placeholder="House number/Street"
+               value="{api_request_params.street || ''}" />
+      </div>
+      <div class="col-auto">
+        <input name="city" type="text" class="form-control form-control-sm me-1"
+               placeholder="City"
+               value="{api_request_params.city || ''}" />
+      </div>
+      <div class="col-auto">
+        <input id="county" name="county" type="text" class="form-control form-control-sm me-1"
+               placeholder="County"
+               value="{api_request_params.county || ''}" />
+      </div>
+      <div class="col-auto">
+        <input name="state" type="text" class="form-control form-control-sm me-1"
+               placeholder="State"
+               value="{api_request_params.state || ''}" />
+      </div>
+      <div class="col-auto">
+        <input name="country" type="text" class="form-control form-control-sm me-1"
+               placeholder="Country"
+               value="{api_request_params.country || ''}" />
+      </div>
+      <div class="col-auto">
+        <input name="postalcode" type="text" class="form-control form-control-sm me-1"
+               placeholder="Postal Code"
+               value="{api_request_params.postalcode || ''}" />
+      </div>
+      <div class="col-auto">
+        <button type="submit" class="btn btn-primary btn-sm">Search</button>
+        <input type="hidden"
+               name="viewbox" value="{sViewBox || ''}" />
+        <input type="hidden"
+               name="dedupe" value="{api_request_params.dedupe === 0 ? 0 : 1}" />
+        <input type="hidden"
+               name="bounded" value="{api_request_params.bounded ? 1 : ''}" />
+        <input type="hidden"
+               name="accept-language" value="{api_request_params['accept-language'] || ''}" />
+        <input type="hidden"
+               name="countrycodes" value="{api_request_params.countrycodes || ''}"
+                                   pattern="^[a-zA-Z]{'{2}'}(,[a-zA-Z]{'{2}'})*$" />
+        <input type="hidden"
+               name="limit" value="{api_request_params.limit || ''}" />
+        <input type="hidden"
+               name="polygon_threshold" value="{api_request_params.polygon_threshold || ''}" />
+        <input type="hidden"
+               name="layer" value="{api_request_params.layer || ''}" />
       </div>
     </UrlSubmitForm>
   </div>
-  <!-- Additional options -->
-  <a href="#advanced" class="btn btn-outline-secondary btn-sm" data-toggle="collapse" data-target="#searchAdvancedOptions" role="button" aria-expanded="false" aria-controls="collapseAdvancedOptions">
-    Advanced options
-  </a>
-  <div class="collapse" id="searchAdvancedOptions">
-    <div id="searchAdvancedOptionsContent">
-        <div class="form-check form-check-inline">
-          <span><input type="checkbox" class="form-check-input api-param-setting"
-                 id="use_viewbox" checked={api_request_params.viewbox} on:change={reset_viewbox}>
-          <label class="form-check-label" for="use_viewbox">apply viewbox</label></span>
-          <span><input type="checkbox" class="form-check-input api-param-setting"
-                 id="option_bounded" checked={!!api_request_params.bounded} on:change={set_bounded}>
-          <label class="form-check-label" for="option_bounded">bounded to viewbox</label></span>
-          <span><input type="checkbox" class="form-check-input api-param-setting"
-                 id="option_dedupe" checked={!!api_request_params.dedupe} on:change={set_dedupe}>
-          <label class="form-check-label" for="option_dedupe">deduplicate results</label></span>
-        </div>
-        <div class="form-check form-check-inline">
-          <span><label class="form-check-label" for="option_limit">Maximum number of results: </label>
-          <input type="number" class="form-check-input api-param-setting" data-api-param="limit" id="option_limit" size="5" min="1" max="50" value="{api_request_params.limit || ''}" on:change={set_api_param}></span>
-          <span><label class="form-check-label" for="option_polygon_threashold">Polygon simplification: </label>
-          <input type="number" class="form-check-input api-param-setting" data-api-param="polygon_threshold" id="option_polygon_threshold" size="5" min="0.0" step="0.01" value="{api_request_params.polygon_threshold || ''}" on:change={set_api_param}></span>
-        </div>
-        <div class="form-check form-check-inline">
-          <span><label class="form-check-label" for="accept_lang">Languages: </label>
-          <input type="text" placeholder="e.g. en,zh-Hant" class="form-check-input api-param-setting" data-api-param="accept-language" id="accept_lang" size="15" value="{api_request_params['accept-language'] || ''}" on:change={set_api_param}></span>
-          <span><label class="form-check-label" for="option_ccode">Countries: </label>
-          <input type="text" placeholder="e.g. de,gb" class="form-check-input api-param-setting" data-api-param="countrycodes" id="option_ccode" size="15" value="{api_request_params.countrycodes || ''}" on:change={set_api_param}></span>
-        </div>
-     </div>
-  </div>
 </div> <!-- /tab-content -->
 
+<!-- Additional options -->
+<details id="searchAdvancedOptions">
+  <summary><small>Advanced options</small></summary>
+  <ul>
+    <li>
+      <div class="form-check form-check-inline">
+        <label class="form-check-label" for="use_viewbox">apply viewbox</label>
+        <input type="checkbox" class="form-check-input api-param-setting"
+               id="use_viewbox" checked={api_request_params.viewbox} on:change={reset_viewbox}>
+      </div>
+    </li>
+
+    <li>
+      <div class="form-check form-check-inline">
+        <label class="form-check-label" for="option_bounded">bounded to viewbox</label>
+        <input type="checkbox" class="form-check-input api-param-setting"
+               id="option_bounded" checked={!!api_request_params.bounded} on:change={set_bounded}>
+      </div>
+    </li>
+
+    <li>
+      <div class="form-check form-check-inline">
+        <label class="form-check-label" for="option_dedupe">deduplicate results</label>
+        <input type="checkbox"
+               class="form-check-input api-param-setting"
+               id="option_dedupe"
+               checked={api_request_params.dedupe === 0 ? 0 : 1}
+               on:change={set_dedupe}>
+      </div>
+    </li>
+
+    <li>
+      <label for="option_limit">Maximum number of results</label>
+      <input type="number"
+             class="form-control form-control-sm d-inline w-auto api-param-setting"
+             data-api-param="limit" id="option_limit" min="1" max="50"
+             value="{api_request_params.limit || ''}"
+             on:change={set_api_param}>
+    </li>
+
+    <li>
+      <label for="option_polygon_threshold">Polygon simplification</label>
+      <input type="number"
+             class="form-control form-control-sm d-inline w-auto api-param-setting"
+             data-api-param="polygon_threshold" id="option_polygon_threshold"
+             min="0.0" max="1.0" step="0.001"
+             value="{api_request_params.polygon_threshold || ''}"
+             on:change={set_api_param}>
+    </li>
+
+    <li>
+      <label for="accept_lang">Languages</label>
+      <input type="text" placeholder="e.g. en,zh-Hant"
+             class="form-control form-control-sm d-inline w-auto api-param-setting"
+             data-api-param="accept-language" id="accept_lang" size="15"
+             value="{api_request_params['accept-language'] || ''}"
+             on:change={set_api_param}>
+    </li>
+
+    <li>
+      <label for="option_ccode">Country Codes</label>
+      <input type="text" placeholder="e.g. de,gb"
+            class="form-control form-control-sm d-inline w-auto api-param-setting"
+             data-api-param="countrycodes" id="option_ccode" size="15"
+             value="{api_request_params.countrycodes || ''}"
+             pattern="^[a-zA-Z]{'{2}'}(,[a-zA-Z]{'{2}'})*$"
+             on:change={set_api_param}>
+    </li>
+    <li>
+      <label for="option_layer">Layer</label>
+      <input id="option_layer" name="layer" placeholder="e.g. address,poi,railway,natural,manmade"
+        value="{api_request_params.layer || ''}"
+        data-api-param="layer" on:change={set_api_param}
+        class="form-control form-control-sm d-inline w-auto api-param-setting">
+    </li>
+  </ul>
+</details>
+
 <style>
   .nav-tabs {
     font-size: 0.8em;
+    margin-top: -1em;
   }
 
-  #q {
-    max-width: 500px;
-  }
-
-  .tab-content {
-    display: flex;
-    align-items: baseline
+  .nav-link {
+    padding: 0.1rem 1rem;
   }
 
   #q {
-    min-width: 500px;
-  }
-  @media (max-width: 850px) {
-    #q {
-      min-width: 400px;
-    }
-  }
-
-  label {
-    font-weight: normal;
-    margin-left: 0.4rem;
-    margin-right: 0.4rem;
+    width: 500px;
+    max-width: 100%;
   }
 
-  #searchAdvancedOptionsContent {
-    display: flex;
-    flex-direction: column;
-    padding: 0 10px
+  #searchAdvancedOptions ul {
+    list-style-type: none;
+    padding: 0;
+    font-size: 0.85rem;
   }
 
-  #searchAdvancedOptionsContent label {
-    padding: 0 3px;
-  }
-
-  #searchAdvancedOptionsContent span {
+  #searchAdvancedOptions li {
+    display: inline-block;
     padding: 4px 10px;
+    border-radius: 5px;
+    border: 1px dotted #ccc;
+    margin-right: 1em;
   }
 
-  @media (max-width: 768px) {
-    .search-button-group {
-      display: inline;
-    }
+  #searchAdvancedOptions label {
+    margin-right: 0.5em;
   }
+
 </style>
