Merge pull request #2 from mtmail/dependabot/npm_and_yarn/bootstrap-3.4.1

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

diff --git a/src/templates/detailspage.hbs b/src/templates/detailspage.hbs
index 4ee9d46af7b71dc543ec7085199b38f8c9ebec9e..22b4b07e21912b35e3ca5d4b3377701a4c874881 100644 (file)
--- a/src/templates/detailspage.hbs
+++ b/src/templates/detailspage.hbs
@@ -13,7 +13,7 @@
         <td>{{this.rank_address}}</td>
         <td>{{formatAdminLevel this.admin_level}}</td>
         <td>{{formatDistance this.distance}}</td>
         <td>{{this.rank_address}}</td>
         <td>{{formatAdminLevel this.admin_level}}</td>
         <td>{{formatDistance this.distance}}</td>

-        <td>{{detailsLink this}}</td>
+        <td>{{detailsLink this null}}</td>

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


@@ -38,7 +38,7 @@
 <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}}</h1>
+            <h1>{{aPlace.localname}} <small>{{detailsPermaLink aPlace 'link to this page'}}</small></h1>

         </div>
         <div class="col-sm-2 text-right">
             {{formatMapIcon aPlace.icon}}
         </div>
         <div class="col-sm-2 text-right">
             {{formatMapIcon aPlace.icon}}


@@ -69,7 +69,7 @@
                 </tr>
                 <tr>
                     <td>Rank</td>
                 </tr>
                 <tr>
                     <td>Rank</td>

-                    <td>{{aPlace.rank_search_label}}</td>
+                    <td>{{formatSearchRank aPlace.rank_search}}</td>

                 </tr>
                 {{#if aPlace.calculated_importance}}
                     <tr>
                 </tr>
                 {{#if aPlace.calculated_importance}}
                     <tr>


@@ -85,8 +85,8 @@
                     <td>{{coverageType aPlace}}</td>
                 </tr>
                 <tr>
                     <td>{{coverageType aPlace}}</td>
                 </tr>
                 <tr>

-                    <td>Centre Point</td>
-                    <td>{{aPlace.lat}},{{aPlace.lon}}</td>
+                    <td>Centre Point (lat,lon)</td>
+                    <td>{{aPlace.centroid.coordinates.[1]}},{{aPlace.centroid.coordinates.[0]}}</td>

                 </tr>
                 <tr>
                     <td>OSM</td>
                 </tr>
                 <tr>
                     <td>OSM</td>


@@ -100,7 +100,7 @@
                 {{/if}}
                 <tr>
                     <td>Computed Postcode</td>
                 {{/if}}
                 <tr>
                     <td>Computed Postcode</td>

-                    <td>{{aPlace.postcode}}</td>
+                    <td>{{aPlace.calculated_postcode}}</td>

                 </tr>
                 <tr>
                     <td>Address Tags</td>
                 </tr>
                 <tr>
                     <td>Address Tags</td>


@@ -165,17 +165,17 @@
                         {{/each}}
                     {{/if}}
 
                         {{/each}}
                     {{/if}}
 

-                    {{#if aPlace.parentof}}
+                    {{#if aPlace.hierarchy}}

                         {{> partial_h2 'Parent Of'}}
 
                         {{> partial_h2 'Parent Of'}}
 

-                        {{#each aPlace.parentof as |lines type|}}
+                        {{#each aPlace.hierarchy as |lines type|}}

                             {{> partial_h3 type}}
                             {{#each lines}}
                                 {{> partial_details_one_row}}
                             {{/each}}
                         {{/each}}
                     {{/if}}
                             {{> partial_h3 type}}
                             {{#each lines}}
                                 {{> partial_details_one_row}}
                             {{/each}}
                         {{/each}}
                     {{/if}}

-                    {{tooManyParentLinesWarning aPlace}}
+                    {{tooManyHierarchyLinesWarning aPlace}}

                 </tbody>
             </table>
         </div>
                 </tbody>
             </table>
         </div>