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

diff --git a/src/assets/js/detailpage.js b/src/assets/js/detailpage.js
index 299103e39567e8368bb154c899e5e5a8766bbdca..301b725391ff8ecaa074a66bfe757e30b1fa5f1a 100644 (file)
--- a/src/assets/js/detailpage.js
+++ b/src/assets/js/detailpage.js
@@ -72,6 +72,8 @@ jQuery(document).ready(function(){
 
         update_data_date();
 
-        init_map_on_detail_page(aFeature.lat, aFeature.lon, aFeature.geometry);
+        var lat = aFeature.centroid.coordinates[1];
+        var lon = aFeature.centroid.coordinates[0];
+        init_map_on_detail_page(lat, lon, aFeature.geometry);
     });
 });
\ No newline at end of file

diff --git a/src/handlebar_helpers.js b/src/handlebar_helpers.js
index b40b11a88a1afcea949a3e680e10054ff99a0302..22d3815fc880205d47e59886b4bce40a28591570 100644 (file)
--- a/src/handlebar_helpers.js
+++ b/src/handlebar_helpers.js
@@ -111,6 +111,47 @@ Handlebars.registerHelper({
             return capitalize(aPlace.type.replace(/_/g, ' '));
         }
     },
+    formatSearchRank: function(iRank) {
+        // same as
+        // https://github.com/openstreetmap/Nominatim/blob/master/sql/functions.sql
+        // get_searchrank_label()
+
+        if (iRank < 2) {
+            return 'continent';
+        } else if (iRank < 4) {
+            return 'sea';
+        } else if (iRank < 8) {
+            return 'country';
+        } else if (iRank < 12) {
+            return 'state';
+        } else if (iRank < 16) { 
+            return 'county';
+        } else if (iRank == 16) {
+            return 'city';
+        } else if (iRank == 17) {
+            return 'town / island';
+        } else if (iRank == 18) {
+            return 'village / hamlet';
+        } else if (iRank == 20) {
+            return 'suburb';
+        } else if (iRank == 21) {
+            return 'postcode area';
+        } else if (iRank == 22) {
+            return 'croft / farm / locality / islet';
+        } else if (iRank == 23) {
+            return 'postcode area';
+        } else if (iRank == 25) {
+            return 'postcode point';
+        } else if (iRank == 26) {
+            return 'street / major landmark';
+        } else if (iRank == 27) {
+            return 'minory street / path';
+        } else if (iRank == 28) {
+            return 'house / building';
+        } else {
+            return 'other: ' + iRank;
+        }
+    },
     tooManyHierarchyLinesWarning: function(aPlace) {
         if (!aPlace.hierarchy) return;
 

diff --git a/src/templates/detailspage.hbs b/src/templates/detailspage.hbs
index 8328f1ce14cb9e86eadf0bc7065e2ceb7bb9fae0..22b4b07e21912b35e3ca5d4b3377701a4c874881 100644 (file)
--- a/src/templates/detailspage.hbs
+++ b/src/templates/detailspage.hbs
@@ -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,8 +85,8 @@
                     <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>