Merge pull request #6 from osm-search/structured-search-form

[nominatim-ui.git] / src / templates / searchpage.hbs

diff --git a/src/templates/searchpage.hbs b/src/templates/searchpage.hbs
index ff2d88488e2f81fdbd277ef1fe3f51bbe8cb0745..d1d70ae252bcccb9b71c7b4c90d9acad31849fd6 100644 (file)
--- a/src/templates/searchpage.hbs
+++ b/src/templates/searchpage.hbs
@@ -9,30 +9,65 @@
     <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?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="btn btn-default btn-xs details"
+       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
   </div>
 {{/inline}}
 
-
-<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}}">
-  </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>
+<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>
-</form>
+  <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-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-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="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>
+</div>
 
 <div id="content">
 
@@ -45,7 +80,9 @@
       {{#if aSearchResults}}
         {{#if sMoreURL}}
           <div class="more">
-            <a class="btn btn-primary" href="{{sMoreURL}}">Search for more results</a>
+            <a class="btn btn-primary" href="{{sMoreURL}}">
+              Search for more results
+            </a>
           </div>
         {{/if}}
       {{else}}
@@ -58,13 +95,18 @@
     <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>.
+      For more information visit the
+      <a href="https://nominatim.org">Nominatim home page</a>.
     </div>
 
   {{/if}}