Merge pull request #21 from osm-search/dependabot/npm_and_yarn/lodash-4.17.19

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

diff --git a/src/templates/detailspage.hbs b/src/templates/detailspage.hbs
index 6fa2886efd921e142c0c763d4c4a546a25a1a4f0..48ecde95c3aabf3d3609bc0748809a4e363e3360 100644 (file)
--- a/src/templates/detailspage.hbs
+++ b/src/templates/detailspage.hbs
@@ -1,6 +1,6 @@
 
 {{#*inline "partial_details_one_row"}}
 
 {{#*inline "partial_details_one_row"}}

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

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


@@ -8,12 +8,12 @@
         <span class="noname">No Name</span>
       {{/if}}
     </td>
         <span class="noname">No Name</span>
       {{/if}}
     </td>

-    <td>{{this.class}}:{{this.type}}</td>
+    <td>{{formatPlaceType this}}</td>

     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
     <td>{{formatDistance this.distance}}</td>
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
     <td>{{formatDistance this.distance}}</td>

-    <td>{{detailsLink this null}}</td>
+    <td>{{detailsPermaLink this 'details >'}}</td>

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


@@ -38,10 +38,13 @@
 <div class="container">
   <div class="row">
     <div class="col-sm-10">
 <div class="container">
   <div class="row">
     <div class="col-sm-10">

-      <h1>{{aPlace.localname}} <small>{{detailsPermaLink aPlace 'link to this page'}}</small></h1>
+      <h1>
+        {{aPlace.localname}}
+        <small>{{detailsPermaLink aPlace 'link to this page'}}</small>
+      </h1>

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

-      {{formatMapIcon aPlace.icon}}
+      {{formatMapIcon aPlace}}

     </div>
   </div>
   <div class="row">
     </div>
   </div>
   <div class="row">


@@ -51,7 +54,9 @@
           <td>Name</td>
           <td>
             {{#each aPlace.names}}
           <td>Name</td>
           <td>
             {{#each aPlace.names}}

-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>

             {{/each}}
           </td>
         </tr>
             {{/each}}
           </td>
         </tr>


@@ -86,12 +91,21 @@
         </tr>
         <tr>
           <td>Centre Point (lat,lon)</td>
         </tr>
         <tr>
           <td>Centre Point (lat,lon)</td>

-          <td>{{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}</td>
+          <td>
+            {{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}
+          </td>

         </tr>
         <tr>
           <td>OSM</td>
           <td>{{osmLink aPlace}}
         </tr>
         </tr>
         <tr>
           <td>OSM</td>
           <td>{{osmLink aPlace}}
         </tr>

+        <tr>
+          <td>
+            Place Id
+            (<a href="https://nominatim.org/release-docs/develop/api/Output/#place_id-is-not-a-persistent-id">on this server</a>)
+          </td>
+          <td>{{aPlace.place_id}}</td>
+        </tr>

         {{#if aPlace.calculated_wikipedia}}
           <tr>
             <td>Wikipedia Calculated</td>
         {{#if aPlace.calculated_wikipedia}}
           <tr>
             <td>Wikipedia Calculated</td>


@@ -106,7 +120,9 @@
           <td>Address Tags</td>
           <td>
             {{#each aPlace.addresstags}}
           <td>Address Tags</td>
           <td>
             {{#each aPlace.addresstags}}

-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>

             {{/each}}
           </td>
         </tr>
             {{/each}}
           </td>
         </tr>


@@ -114,7 +130,9 @@
           <td>Extra Tags</td>
           <td>
             {{#each aPlace.extratags}}
           <td>Extra Tags</td>
           <td>
             {{#each aPlace.extratags}}

-              <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
+              <div class="line">
+                <span class="name">{{this}}</span> ({{@key}})
+              </div>

             {{/each}}
           </td>
         </tr>
             {{/each}}
           </td>
         </tr>


@@ -127,7 +145,7 @@
   <div class="row">
     <div class="col-md-12">
       <h2>Address</h2>
   <div class="row">
     <div class="col-md-12">
       <h2>Address</h2>

-       <table id="address" class="table table-striped table-responsive">
+       <table id="address" class="table table-striped table-small">

         <thead>
           <tr>
             <th>Local name</th>
         <thead>
           <tr>
             <th>Local name</th>


@@ -165,8 +183,8 @@
             {{/each}}
           {{/if}}
 
             {{/each}}
           {{/if}}
 

+          {{> partial_h2 'Parent Of'}}

           {{#if aPlace.hierarchy}}
           {{#if aPlace.hierarchy}}

-            {{> partial_h2 'Parent Of'}}

 
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
 
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}


@@ -174,6 +192,13 @@
                 {{> partial_details_one_row}}
               {{/each}}
             {{/each}}
                 {{> partial_details_one_row}}
               {{/each}}
             {{/each}}

+          {{else}}
+            <tr>
+              <td>
+                <a class="btn btn-outline-secondary btn-sm"
+                  href="{{base_url}}&hierarchy=1">display child places</a>
+              </td>
+            </tr>

           {{/if}}
           {{tooManyHierarchyLinesWarning aPlace}}
         </tbody>
           {{/if}}
           {{tooManyHierarchyLinesWarning aPlace}}
         </tbody>