X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/6a455ffa0bd1cfea8337ee31867848f5719b47fc..6638f08e4f455405690910627c36dea591aa5f38:/src/templates/detailspage.hbs

diff --git a/src/templates/detailspage.hbs b/src/templates/detailspage.hbs
index 5982ee9..22b4b07 100644
--- a/src/templates/detailspage.hbs
+++ b/src/templates/detailspage.hbs
@@ -13,15 +13,15 @@
         <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}}
 
 {{#*inline "partial_details_keyword_one_row"}}
     <tr>
-        <td>{{formatKeywordToken this.word_token}}</td>
-        {{#if this.word_id}}
-            <td>word id: {{this.word_id}}</td>
+        <td>{{formatKeywordToken this.token}}</td>
+        {{#if this.id}}
+            <td>word id: {{this.id}}</td>
         {{/if}}
     </tr>
 {{/inline}}
@@ -38,7 +38,7 @@
 <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}}
@@ -50,14 +50,14 @@
                 <tr>
                     <td>Name</td>
                     <td>
-                        {{#each aPlace.aNames}}
+                        {{#each aPlace.names}}
                             <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
                         {{/each}}
                     </td>
                 </tr>
                 <tr>
                     <td>Type</td>
-                    <td>{{aPlace.class}}:{{aPlace.type}}</td>
+                    <td>{{aPlace.category}}:{{aPlace.type}}</td>
                 </tr>
                 <tr>
                     <td>Last Updated</td>
@@ -69,7 +69,7 @@
                 </tr>
                 <tr>
                     <td>Rank</td>
-                    <td>{{aPlace.rank_search_label}}</td>
+                    <td>{{formatSearchRank aPlace.rank_search}}</td>
                 </tr>
                 {{#if aPlace.calculated_importance}}
                     <tr>
@@ -85,14 +85,14 @@
                     <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>
                     <td>{{osmLink aPlace}}
                 </tr>
-                {{#if aPlace.wikipedia}}
+                {{#if aPlace.calculated_wikipedia}}
                     <tr>
                         <td>Wikipedia Calculated</td>
                         <td>{{wikipediaLink aPlace}}</td>
@@ -100,12 +100,12 @@
                 {{/if}}
                 <tr>
                     <td>Computed Postcode</td>
-                    <td>{{aPlace.postcode}}</td>
+                    <td>{{aPlace.calculated_postcode}}</td>
                 </tr>
                 <tr>
                     <td>Address Tags</td>
                     <td>
-                        {{#each aPlace.aAddressTags}}
+                        {{#each aPlace.addresstags}}
                             <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
                         {{/each}}
                     </td>
@@ -113,7 +113,7 @@
                 <tr>
                     <td>Extra Tags</td>
                     <td>
-                        {{#each aPlace.aExtraTags}}
+                        {{#each aPlace.extratags}}
                             <div class="line"><span class="name">{{this}}</span> ({{@key}})</div>
                         {{/each}}
                     </td>
@@ -140,46 +140,42 @@
                     </tr>
                 </thead>
                 <tbody>
-                    {{#each aPlace.address_lines}}
-                        {{> partial_details_one_row}}
-                    {{/each}}
-
+                    {{#if aPlace.address}}
+                        {{#each aPlace.address}}
+                            {{> partial_details_one_row}}
+                        {{/each}}
+                    {{/if}}
 
-                    {{#if aPlace.linked_lines}}
+                    {{#if aPlace.linked_places}}
                         {{> partial_h2 'Linked Places'}}
-                        {{#each aPlace.linked_lines}}
+                        {{#each aPlace.linked_places}}
                             {{> partial_details_one_row}}
                         {{/each}}
                     {{/if}}
 
-                    {{#if aPlace.place_search_name_keywords}}
+                    {{#if aPlace.keywords}}
                         {{> partial_h2 'Name Keywords'}}
-                        {{#each aPlace.place_search_name_keywords}}
+                        {{#each aPlace.keywords.name}}
                             {{> partial_details_keyword_one_row}}
                         {{/each}}
-                    {{/if}}
 
-                    {{#if aPlace.place_search_address_keywords}}
                         {{> partial_h2 'Address Keywords'}}
-                        {{#each aPlace.place_search_address_keywords}}
+                        {{#each aPlace.keywords.address}}
                             {{> partial_details_keyword_one_row}}
                         {{/each}}
                     {{/if}}
 
-                    {{#if aPlace.parentof_lines}}
+                    {{#if aPlace.hierarchy}}
                         {{> partial_h2 'Parent Of'}}
 
-                        {{#each aPlace.parentof_lines as |lines type|}}
+                        {{#each aPlace.hierarchy as |lines type|}}
                             {{> partial_h3 type}}
                             {{#each lines}}
                                 {{> partial_details_one_row}}
                             {{/each}}
                         {{/each}}
-                        
-        {{!--                 @if (sizeof($aParentOfLines) >= 500)
-                            <p>There are more child objects which are not shown.</p>
-                        @end --}}
-                   {{/if}}
+                    {{/if}}
+                    {{tooManyHierarchyLinesWarning aPlace}}
                 </tbody>
             </table>
         </div>