Merge pull request #40 from mtmail/navigation-to-details-index-page

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

diff --git a/dist/details.html b/dist/details.html
index e323dcc10ec647e794612b338610034d006090d3..9064234cc49e9a3f59e3a6c38da38a57eeaa8845 100644 (file)
--- a/dist/details.html
+++ b/dist/details.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" />


@@ -29,12 +29,15 @@
           </a>
         </div>
       </div>
           </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">


@@ -124,8 +127,7 @@
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
     <span class="type">({{formatLabel aResult}})</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 

-    <a class="details btn btn-outline-secondary btn-sm"
-       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="details btn btn-outline-secondary btn-sm" href="{{detailsURL aResult}}">details</a>

   </div>
 {{/inline}}
 
   </div>
 {{/inline}}
 


@@ -138,6 +140,7 @@
       <a class="nav-link {{#if hStructured}}active{{/if}}" data-toggle="tab" href="#structured">structured</a>
     </li>
     <div class="search-type-link">
       <a class="nav-link {{#if hStructured}}active{{/if}}" data-toggle="tab" href="#structured">structured</a>
     </li>
     <div class="search-type-link">

+      <a href="details.html" class="mr-2">search by id</a>

       <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
     </div>
   </ul>
       <a id="switch-to-reverse" href="/reverse.html">reverse search</a>
     </div>
   </ul>


@@ -258,8 +261,7 @@
     <span class="type">{{formatLabel aResult}}</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 
     <span class="type">{{formatLabel aResult}}</span>
     <p class="coords">{{aResult.lat}},{{aResult.lon}}</p>  
 

-    <a class="details btn btn-outline-secondary btn-sm"
-       href="details.html?osmtype={{shortOSMType aResult.osm_type}}&osmid={{aResult.osm_id}}">details</a>
+    <a class="details btn btn-outline-secondary btn-sm" href="{{detailsURL aResult}}">details</a>

   </div>
 {{/inline}}
 
   </div>
 {{/inline}}
 


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

+      <a href="details.html" class="mr-2">search by id</a>

       <a href="search.html">forward search</a>
     </div>
   </form>
       <a href="search.html">forward search</a>
     </div>
   </form>


@@ -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}}


@@ -330,7 +333,7 @@
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
     <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
     <td>{{formatDistance this.distance bDistanceInMeters}}</td>

-    <td>{{detailsPermaLink this 'details >'}}</td>
+    <td>{{#if this.osm_id}}<a href="{{detailsURL this}}">details</a>{{/if}}</td>

   </tr>
 {{/inline}}
 
   </tr>
 {{/inline}}
 


@@ -357,7 +360,7 @@
     <div class="col-sm-10">
       <h1>
         {{aPlace.localname}}
     <div class="col-sm-10">
       <h1>
         {{aPlace.localname}}

-        <small>{{detailsPermaLink aPlace 'link to this page'}}</small>
+        <small><a href="{{detailsURL aPlace}}">link to this page</a></small>

       </h1>
     </div>
     <div class="col-sm-2 text-right">
       </h1>
     </div>
     <div class="col-sm-2 text-right">


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

-              {{> partial_details_one_row bDistanceInMeters=false}}
+              {{> 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 bDistanceInMeters=true}}
+              {{> 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 bDistanceInMeters=true}}
+                {{> partial_details_one_row bDistanceInMeters=true bAddressLineUsed=true}}

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


@@ -605,7 +608,7 @@
         <tbody>
           {{#each aPolygons}}
           <tr>
         <tbody>
           {{#each aPolygons}}
           <tr>

-            <td>{{detailsLink this place_id}}</td>
+            <td><a href="{{detailsURL this}}">{{this.place_id}}</a></td>

             <td>{{country_code}}</td>
             <td>{{name}}</td>
             <td>{{osmLink this}}</td>
             <td>{{country_code}}</td>
             <td>{{name}}</td>
             <td>{{osmLink this}}</td>