bring in line with API (https://github.com/openstreetmap/Nominatim/pull/968)

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

diff --git a/src/templates/detailspage.hbs b/src/templates/detailspage.hbs
index c7098b4d8edaccf568bb8ccd3a8872043604ab43..a725cd59b65778a0a0e471bea7dbdf05421b53e3 100644 (file)
--- a/src/templates/detailspage.hbs
+++ b/src/templates/detailspage.hbs
@@ -19,9 +19,9 @@
 
 {{#*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}}
@@ -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>
@@ -92,7 +92,7 @@
                     <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,44 +140,42 @@
                     </tr>
                 </thead>
                 <tbody>
-                    {{#if aPlace.address_lines}}
-                        {{#each aPlace.address_lines}}
+                    {{#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}}
-                    {{tooManyParentLinesWarning aPlace}}
+                    {{tooManyHierarchyLinesWarning aPlace}}
                 </tbody>
             </table>
         </div>