X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/047b306f7b94f9faef31fa9da61f5e99e6c3e7ae..39f28a36ce98b7fb0c1bd7203084c291cd651c59:/src/templates/searchpage.hbs?ds=inline

diff --git a/src/templates/searchpage.hbs b/src/templates/searchpage.hbs
index 65e8bad..d1d70ae 100644
--- a/src/templates/searchpage.hbs
+++ b/src/templates/searchpage.hbs
@@ -1,79 +1,121 @@
 {{#*inline "partial_one_result"}}
-    <div class="result" data-position="{{iResNum}}">
-        {{#if aResult.icon}}
-            {{!-- <img src="{{env.Images_Base_Url}}{{aResult.icon}}" /> --}}
-            {{formatMapIcon aResult.icon}}
-        {{/if}}
+  <div class="result" data-position="{{iResNum}}">
+    {{#if aResult.icon}}
+      {{!-- <img src="{{env.Images_Base_Url}}{{aResult.icon}}" /> --}}
+      {{formatMapIcon aResult.icon}}
+    {{/if}}
 
-        <span class="name">{{aResult.display_name}}</span>
-        <span class="type">({{formatLabel aResult}})</span>
-        <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
+    <span class="name">{{aResult.display_name}}</span>
+    <span class="type">({{formatLabel aResult}})</span>
+    <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
-        <a class="btn btn-default btn-xs details" href="details.html?place_id={{aResult.place_id}}">details</a>
-    </div>
+    <a class="btn btn-default btn-xs details"
+       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+  </div>
 {{/inline}}
 
+<div class="top-bar" id="structured-query-selector">
+  <div class="search-type-link">
+    <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
+  </div>
+  <div class="radio-inline"><input type="radio" name="query-selector" id="simple" value="simple" {{#unless hStructured}}checked="checked"{{/unless}}>
+  <label for="simple">simple</label></div>
+  <div class="radio-inline"><input type="radio" name="query-selector" id="structured" value="structured" {{#if hStructured}}checked="checked"{{/if}}>
+  <label for="structured">structured</label></div>
 
-<form class="form-inline" role="search" accept-charset="UTF-8" action="">
-    <div class="form-group">
-        <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="{{sQuery}}">
+  <form class="form-inline" role="search" accept-charset="UTF-8" action="">
+    <div class="form-group-simple {{#if hStructured}}hidden{{/if}}">
+      <input id="q"
+             name="q"
+             type="text"
+             class="form-control input-sm"
+             placeholder="Search"
+             value="{{sQuery}}" />
     </div>
-    <div class="form-group search-button-group">
-        <button type="submit" class="btn btn-primary btn-sm">Search</button>
-        {{#if env.Search_AreaPolygons}}
-            <input type="hidden" value="1" name="polygon_geojson" />
-        {{/if}}
-        <input type="hidden" name="viewbox" value="{{sViewBox}}" />
-        <div class="checkbox-inline">
-            <input type="checkbox" id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
-            <label for="use_viewbox">apply viewbox</label>
-        </div>
+    <div class="form-group-structured {{#unless hStructured}}hidden{{/unless}}">
+      <div class="form-inline">
+        <input name="street" type="text" class="form-control input-sm"
+               placeholder="House number/Street"
+               value="{{hStructured.street}}" />
+        <input name="city" type="text" class="form-control input-sm"
+               placeholder="City"
+               value="{{hStructured.city}}" />
+        <input id="county" name="county" type="text" class="form-control input-sm"
+               placeholder="County"
+               value="{{hStructured.county}}" />
+        <input name="state" type="text" class="form-control input-sm"
+               placeholder="State"
+               value="{{hStructured.state}}" />
+        <input name="country" type="text" class="form-control input-sm"
+               placeholder="Country"
+               value="{{hStructured.country}}" />
+        <input name="postalcode" type="text" class="form-control input-sm"
+               placeholder="Postal Code"
+               value="{{hStructured.postalcode}}" />
+      </div>
     </div>
-    <div class="search-type-link">
-        <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
+    <div class="form-group search-button-group">
+      <button type="submit" class="btn btn-primary btn-sm">Search</button>
+      {{#if env.Search_AreaPolygons}}
+        <input type="hidden" value="1" name="polygon_geojson" />
+      {{/if}}
+      <input type="hidden" name="viewbox" value="{{sViewBox}}" />
+      <div class="checkbox-inline">
+        <input type="checkbox"
+               id="use_viewbox" {{#if sViewBox}}checked="checked"{{/if}}>
+        <label for="use_viewbox">apply viewbox</label>
+      </div>
     </div>
-</form>
+  </form>
+</div>
 
 <div id="content">
 
-    {{#if sQuery}}
-        <div id="searchresults" class="sidebar">
-            {{#each aSearchResults as |aResult|}}
-                {{>partial_one_result iResNum=@index aResult=aResult env=env}}
-            {{/each}}
+  {{#if sQuery}}
+    <div id="searchresults" class="sidebar">
+      {{#each aSearchResults as |aResult|}}
+        {{>partial_one_result iResNum=@index aResult=aResult env=env}}
+      {{/each}}
 
-            {{#if aSearchResults}}
-                {{#if sMoreURL}}
-                    <div class="more">
-                        <a class="btn btn-primary" href="{{sMoreURL}}">Search for more results</a>
-                    </div>
-                {{/if}}
-            {{else}}
-                <div class="noresults">No search results found</div>
-            {{/if}}
-        </div>
+      {{#if aSearchResults}}
+        {{#if sMoreURL}}
+          <div class="more">
+            <a class="btn btn-primary" href="{{sMoreURL}}">
+              Search for more results
+            </a>
+          </div>
+        {{/if}}
+      {{else}}
+        <div class="noresults">No search results found</div>
+      {{/if}}
+    </div>
 
-    {{else}}
+  {{else}}
 
-        <div id="intro" class="sidebar">
-            <h2>Welcome to Nominatim</h2>
+    <div id="intro" class="sidebar">
+      <h2>Welcome to Nominatim</h2>
 
-            <p>Nominatim is a search engine for <a href="https://www.openstreetmap.org">OpenStreetMap</a>
-            data. This is the debugging interface. You may search for a name or address(forward search) or
-            look up data by its geographic coordinate(reverse search). Each result comes with a
-            link to a details page where you can inspect what data about the object is saved in 
-            the database and investigate how the address of the object has been computed.</p>
+      <p>
+        Nominatim is a search engine for
+        <a href="https://www.openstreetmap.org">OpenStreetMap</a> data. This
+        is the debugging interface. You may search for a name or address
+        (forward search) or look up data by its geographic coordinate (reverse
+        search). Each result comes with a link to a details page where you
+        can inspect what data about the object is saved in the database and
+        investigate how the address of the object has been computed.
+      </p>
 
-            For more information visit the <a href="https://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.
-        </div>
+      For more information visit the
+      <a href="https://nominatim.org">Nominatim home page</a>.
+    </div>
 
-    {{/if}}
+  {{/if}}
 
-    <div id="map-wrapper">
-        <div id="map-position">
-            <div id="map-position-inner"></div>
-            <div id="map-position-close"><a href="#">hide</a></div>
-        </div>
-        <div id="map"></div>
+  <div id="map-wrapper">
+    <div id="map-position">
+      <div id="map-position-inner"></div>
+      <div id="map-position-close"><a href="#">hide</a></div>
     </div>
+    <div id="map"></div>
+  </div>
 </div>