sync with latest Nominatim details-as-json branch

diff --git a/src/assets/js/base.js b/src/assets/js/base.js
index 2aed93b998bfbcd7cf9e141ceab732e4b984a683..9e8f86e7ebbe9ac32ff013557af6ea0e5e9fcedb 100644 (file)
--- a/src/assets/js/base.js
+++ b/src/assets/js/base.js
@@ -63,7 +63,7 @@ function fetch_from_api(endpoint_name, params, callback) {
 
 function update_data_date() {
     fetch_from_api('status', {format: 'json'}, function(data){
 
 function update_data_date() {
     fetch_from_api('status', {format: 'json'}, function(data){

-        $('#data-date').text(data.data_last_updated.formatted);
+        $('#data-date').text(data.data_last_updated);

     });
 }
 
     });
 }
 

diff --git a/src/assets/js/detailpage.js b/src/assets/js/detailpage.js
index 9ab6cc820f22c3523829d08801244e47d78ab153..906cd0358e6f2a27eb8e530308033e1804577ae9 100644 (file)
--- a/src/assets/js/detailpage.js
+++ b/src/assets/js/detailpage.js
@@ -56,10 +56,12 @@ jQuery(document).ready(function(){
         place_id: search_params.get('place_id'),
         osmtype: search_params.get('osmtype'),
         osmid: search_params.get('osmid'),
         place_id: search_params.get('place_id'),
         osmtype: search_params.get('osmtype'),
         osmid: search_params.get('osmid'),

+        keywords: search_params.get('keywords'),

         addressdetails: 1,
         linkedplaces: 1,
         childplaces: 1,
         addressdetails: 1,
         linkedplaces: 1,
         childplaces: 1,

-        group_parents: 1,
+        group_childplaces: 1,
+        polygon_geojson: 1,

         format: 'json'
     };
 
         format: 'json'
     };
 


@@ -71,6 +73,6 @@ jQuery(document).ready(function(){
 
         update_data_date();
 
 
         update_data_date();
 

-        init_map_on_detail_page(aFeature.lat, aFeature.lon, aFeature.geojson);
+        init_map_on_detail_page(aFeature.lat, aFeature.lon, aFeature.geometry);

     });
 });
\ No newline at end of file
     });
 });
\ No newline at end of file

diff --git a/src/handlebar_helpers.js b/src/handlebar_helpers.js
index c86196660daa94ad302691076ba03ba8dd7f8459..722d4bb6b904af3264bcebfa37c1b04f96df4e93 100644 (file)
--- a/src/handlebar_helpers.js
+++ b/src/handlebar_helpers.js
@@ -29,11 +29,11 @@ Handlebars.registerHelper({
     },
     /* en:London_Borough_of_Redbridge => https://en.wikipedia.org/wiki/London_Borough_of_Redbridge */
     wikipediaLink: function(aPlace) {
     },
     /* en:London_Borough_of_Redbridge => https://en.wikipedia.org/wiki/London_Borough_of_Redbridge */
     wikipediaLink: function(aPlace) {

-        if (! aPlace.wikipedia) return '';
+        if (! aPlace.calculated_wikipedia) return '';

 
 

-        var parts = aPlace.wikipedia.split(':', 2);
+        var parts = aPlace.calculated_wikipedia.split(':', 2);

 
 

-        var sTitle = Handlebars.escapeExpression(aPlace.wikipedia),
+        var sTitle = Handlebars.escapeExpression(aPlace.calculated_wikipedia),

             sLanguage = Handlebars.escapeExpression(parts[0]),
             sArticle = Handlebars.escapeExpression(parts[1]);
 
             sLanguage = Handlebars.escapeExpression(parts[0]),
             sArticle = Handlebars.escapeExpression(parts[1]);
 


@@ -55,7 +55,7 @@ Handlebars.registerHelper({
         );
     },
     coverageType: function(aPlace) {
         );
     },
     coverageType: function(aPlace) {

-        return (aPlace.isarea === 't' ? 'Polygon' : 'Point');
+        return (aPlace.isarea ? 'Polygon' : 'Point');

     },
     // fDistance is in meters
     formatDistance: function(fDistanceMeters) {
     },
     // fDistance is in meters
     formatDistance: function(fDistanceMeters) {


@@ -101,10 +101,10 @@ Handlebars.registerHelper({
         }
     },
     tooManyParentLinesWarning: function(aPlace) {
         }
     },
     tooManyParentLinesWarning: function(aPlace) {

-        if (!aPlace.parentof_lines) return;
+        if (!aPlace.parentof) return;

 
         var c = 0;
 
         var c = 0;

-        for (var type in aPlace.parentof_lines) {
+        for (var type in aPlace.parentof) {

             c = c + type.length+1;
         }
         if (c < 500) return;
             c = c + type.length+1;
         }
         if (c < 500) return;

diff --git a/src/templates/detailspage.hbs b/src/templates/detailspage.hbs
index c7098b4d8edaccf568bb8ccd3a8872043604ab43..4ee9d46af7b71dc543ec7085199b38f8c9ebec9e 100644 (file)
--- a/src/templates/detailspage.hbs
+++ b/src/templates/detailspage.hbs
@@ -19,9 +19,9 @@
 
 {{#*inline "partial_details_keyword_one_row"}}
     <tr>
 
 {{#*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}}
         {{/if}}
     </tr>
 {{/inline}}


@@ -50,14 +50,14 @@
                 <tr>
                     <td>Name</td>
                     <td>
                 <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>
                             <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>
                 </tr>
                 <tr>
                     <td>Last Updated</td>


@@ -92,7 +92,7 @@
                     <td>OSM</td>
                     <td>{{osmLink aPlace}}
                 </tr>
                     <td>OSM</td>
                     <td>{{osmLink aPlace}}
                 </tr>

-                {{#if aPlace.wikipedia}}
+                {{#if aPlace.calculated_wikipedia}}

                     <tr>
                         <td>Wikipedia Calculated</td>
                         <td>{{wikipediaLink aPlace}}</td>
                     <tr>
                         <td>Wikipedia Calculated</td>
                         <td>{{wikipediaLink aPlace}}</td>


@@ -105,7 +105,7 @@
                 <tr>
                     <td>Address Tags</td>
                     <td>
                 <tr>
                     <td>Address Tags</td>
                     <td>

-                        {{#each aPlace.aAddressTags}}
+                        {{#each aPlace.addresstags}}

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


@@ -113,7 +113,7 @@
                 <tr>
                     <td>Extra Tags</td>
                     <td>
                 <tr>
                     <td>Extra Tags</td>
                     <td>

-                        {{#each aPlace.aExtraTags}}
+                        {{#each aPlace.extratags}}

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


@@ -140,37 +140,35 @@
                     </tr>
                 </thead>
                 <tbody>
                     </tr>
                 </thead>
                 <tbody>

-                    {{#if aPlace.address_lines}}
-                        {{#each aPlace.address_lines}}
+                    {{#if aPlace.address}}
+                        {{#each aPlace.address}}

                             {{> partial_details_one_row}}
                         {{/each}}
                     {{/if}}
 
                             {{> partial_details_one_row}}
                         {{/each}}
                     {{/if}}
 

-                    {{#if aPlace.linked_lines}}
+                    {{#if aPlace.linked_places}}

                         {{> partial_h2 'Linked Places'}}
                         {{> partial_h2 'Linked Places'}}

-                        {{#each aPlace.linked_lines}}
+                        {{#each aPlace.linked_places}}

                             {{> partial_details_one_row}}
                         {{/each}}
                     {{/if}}
 
                             {{> partial_details_one_row}}
                         {{/each}}
                     {{/if}}
 

-                    {{#if aPlace.place_search_name_keywords}}
+                    {{#if aPlace.keywords}}

                         {{> partial_h2 'Name Keywords'}}
                         {{> partial_h2 'Name Keywords'}}

-                        {{#each aPlace.place_search_name_keywords}}
+                        {{#each aPlace.keywords.name}}

                             {{> partial_details_keyword_one_row}}
                         {{/each}}
                             {{> partial_details_keyword_one_row}}
                         {{/each}}

-                    {{/if}}

 
 

-                    {{#if aPlace.place_search_address_keywords}}

                         {{> partial_h2 'Address Keywords'}}
                         {{> partial_h2 'Address Keywords'}}

-                        {{#each aPlace.place_search_address_keywords}}
+                        {{#each aPlace.keywords.address}}

                             {{> partial_details_keyword_one_row}}
                         {{/each}}
                     {{/if}}
 
                             {{> partial_details_keyword_one_row}}
                         {{/each}}
                     {{/if}}
 

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

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

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

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