Merge pull request #35 from mtmail/checking-isaddress

[nominatim-ui.git] / dist / polygons.html

diff --git a/dist/polygons.html b/dist/polygons.html
index aba9dbb15ecaabfbd03885192d59b2a64e444976..a3348a1e56849dc82b812b1effa7b63c33e72b22 100644 (file)
--- a/dist/polygons.html
+++ b/dist/polygons.html
@@ -5,8 +5,8 @@
   <title>OpenStreetMap Nominatim</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <title>OpenStreetMap Nominatim</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 

-  <link rel="icon" type="image/png" href="/assets/images/favicon-194x194.png" sizes="194x194" />
-  <link rel="icon" type="image/png" href="/assets/images/favicon-16x16.png" sizes="16x16" />
+  <link rel="icon" type="image/png" href="assets/images/favicon-194x194.png" sizes="194x194" />
+  <link rel="icon" type="image/png" href="assets/images/favicon-16x16.png" sizes="16x16" />

 
   <link href="assets/css/leaflet.css" rel="stylesheet" />
   <link href="assets/css/Control.MiniMap.min.css" rel="stylesheet" />
 
   <link href="assets/css/leaflet.css" rel="stylesheet" />
   <link href="assets/css/Control.MiniMap.min.css" rel="stylesheet" />


@@ -23,18 +23,21 @@
     <div class="row">
       <div class="col-4">
         <div class="brand">
     <div class="row">
       <div class="col-4">
         <div class="brand">

-          <a href="/">
+          <a href="search.html">

             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>
         </div>
       </div>
             <img alt="logo" src="assets/images/osm_logo.120px.png" width="30" height="30"/>
             <h1>Nominatim</h1>
           </a>
         </div>
       </div>

-      <div id="last-updated" class="col-4 text-center">
-        <div id="loading">loading...</div>
-        Data from <a id="api-request-link" href="">API request</a>
-        <br>
-        Data last updated:
-        <span id="data-date"></span>
+      <div class="col-4">
+        <div id="last-updated" class="text-center">
+          <div id="loading">loading...</div>
+          <div id="api-request">
+            Data from <a href="">API request</a>
+            <span id="api-request-debug">(<a href="">debug output</a>)</span>
+          </div>
+          Data last updated: <span id="data-date"></span>
+        </div>

       </div>
       <div class="col-4 text-right">
         <div class="dropdown">
       </div>
       <div class="col-4 text-right">
         <div class="dropdown">


@@ -199,7 +202,7 @@
 
 <div id="content">
 
 
 <div id="content">
 

-  {{#if sQuery}}
+  {{#if bSearchRan}}

     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}
     <div id="searchresults" class="sidebar">
       {{#each aSearchResults as |aResult|}}
         {{>partial_one_result iResNum=@index aResult=aResult env=env}}


@@ -289,7 +292,7 @@
       </button>
     </div>
     <div class="search-type-link">
       </button>
     </div>
     <div class="search-type-link">

-      <a href="/search.html">forward search</a>
+      <a href="search.html">forward search</a>

     </div>
   </form>
 </div>
     </div>
   </form>
 </div>


@@ -317,7 +320,7 @@
 <script id="detailspage-template" type="text/x-handlebars-template">
 
 {{#*inline "partial_details_one_row"}}
 <script id="detailspage-template" type="text/x-handlebars-template">
 
 {{#*inline "partial_details_one_row"}}

-  <tr class="{{#unless this.isaddress}}notused{{/unless}}">
+  <tr class="{{#unless bAddressLineUsed}}notused{{/unless}}">

     <td class="name">
       {{#if this.localname}}
         {{this.localname}}
     <td class="name">
       {{#if this.localname}}
         {{this.localname}}


@@ -329,7 +332,7 @@
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>

-    <td>{{formatDistance this.distance}}</td>
+    <td>{{formatDistance this.distance bDistanceInMeters}}</td>

     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}
     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}


@@ -477,14 +480,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}

-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=false bAddressLineUsed=this.isaddress}}

             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}

-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=true bAddressLineUsed=true}}

             {{/each}}
           {{/if}}
 
             {{/each}}
           {{/if}}
 


@@ -506,7 +509,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}

-                {{> partial_details_one_row}}
+                {{> partial_details_one_row bDistanceInMeters=true bAddressLineUsed=true}}

               {{/each}}
             {{/each}}
           {{else}}
               {{/each}}
             {{/each}}
           {{else}}