Merge pull request #22 from mtmail/distance-in-meters-or-spheric

API returns some distance in spheric, not meters

diff --git a/dist/deletable.html b/dist/deletable.html
index 1b809687c0820f8b19f71b40e5e8746da623155a..11a824dd35ed88285e467d387d6ef5a53dd7cd9e 100644 (file)
--- a/dist/deletable.html
+++ b/dist/deletable.html
@@ -329,7 +329,7 @@
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
-    <td>{{formatDistance this.distance}}</td>
+    <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}
@@ -477,14 +477,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=false}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=true}}
             {{/each}}
           {{/if}}
 
@@ -506,7 +506,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
-                {{> partial_details_one_row}}
+                {{> partial_details_one_row bDistanceInMeters=true}}
               {{/each}}
             {{/each}}
           {{else}}

diff --git a/dist/details.html b/dist/details.html
index 1b809687c0820f8b19f71b40e5e8746da623155a..11a824dd35ed88285e467d387d6ef5a53dd7cd9e 100644 (file)
--- a/dist/details.html
+++ b/dist/details.html
@@ -329,7 +329,7 @@
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
-    <td>{{formatDistance this.distance}}</td>
+    <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}
@@ -477,14 +477,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=false}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=true}}
             {{/each}}
           {{/if}}
 
@@ -506,7 +506,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
-                {{> partial_details_one_row}}
+                {{> partial_details_one_row bDistanceInMeters=true}}
               {{/each}}
             {{/each}}
           {{else}}

diff --git a/dist/handlebar_helpers.js b/dist/handlebar_helpers.js
index 4d1889f324530b13371c7c3bca0930a8cf363c0e..3ece852a9d0fa13788ee40e5e41707e11c670cd3 100644 (file)
--- a/dist/handlebar_helpers.js
+++ b/dist/handlebar_helpers.js
@@ -184,16 +184,25 @@ Handlebars.registerHelper({
   coverageType: function (aPlace) {
     return (aPlace.isarea ? 'Polygon' : 'Point');
   },
-  // fDistance is in meters
-  formatDistance: function (fDistanceMeters) {
-    if (fDistanceMeters < 1) return '0';
+  formatDistance: function (fDistance, bInMeters) {
+    if (bInMeters) {
+      if (fDistance < 1) return '0';
+      var sFormatted = (fDistance >= 1000)
+        ? Math.round(fDistance / 1000, 1) + ' km'
+        : Math.round(fDistance, 0) + ' m';
 
-    var formatted = (fDistanceMeters >= 1000)
-      ? Math.round(fDistanceMeters / 1000, 1) + ' km'
-      : Math.round(fDistanceMeters, 0) + ' m';
+      return new Handlebars.SafeString(
+        '<abbr class="distance" title="' + fDistance + ' meters">~' + sFormatted + '</abbr>'
+      );
+    }
+
+    // spheric distance, http://postgis.net/docs/ST_Distance_Spheroid.html
+    if (fDistance === 0) return '0';
 
     return new Handlebars.SafeString(
-      '<abbr class="distance" title="' + fDistanceMeters + '">~' + formatted + '</abbr>'
+      '<abbr class="distance" title="spheric distance ' + fDistance + '">~'
+        + (Math.round(fDistance * 1000, 4) / 1000)
+        + '</abbr>'
     );
   },
   // mark partial tokens (those starting with a space) with a star for readability

diff --git a/dist/polygons.html b/dist/polygons.html
index 1b809687c0820f8b19f71b40e5e8746da623155a..11a824dd35ed88285e467d387d6ef5a53dd7cd9e 100644 (file)
--- a/dist/polygons.html
+++ b/dist/polygons.html
@@ -329,7 +329,7 @@
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
-    <td>{{formatDistance this.distance}}</td>
+    <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}
@@ -477,14 +477,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=false}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=true}}
             {{/each}}
           {{/if}}
 
@@ -506,7 +506,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
-                {{> partial_details_one_row}}
+                {{> partial_details_one_row bDistanceInMeters=true}}
               {{/each}}
             {{/each}}
           {{else}}

diff --git a/dist/reverse.html b/dist/reverse.html
index 1b809687c0820f8b19f71b40e5e8746da623155a..11a824dd35ed88285e467d387d6ef5a53dd7cd9e 100644 (file)
--- a/dist/reverse.html
+++ b/dist/reverse.html
@@ -329,7 +329,7 @@
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
-    <td>{{formatDistance this.distance}}</td>
+    <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}
@@ -477,14 +477,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=false}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=true}}
             {{/each}}
           {{/if}}
 
@@ -506,7 +506,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
-                {{> partial_details_one_row}}
+                {{> partial_details_one_row bDistanceInMeters=true}}
               {{/each}}
             {{/each}}
           {{else}}

diff --git a/dist/search.html b/dist/search.html
index 1b809687c0820f8b19f71b40e5e8746da623155a..11a824dd35ed88285e467d387d6ef5a53dd7cd9e 100644 (file)
--- a/dist/search.html
+++ b/dist/search.html
@@ -329,7 +329,7 @@
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
-    <td>{{formatDistance this.distance}}</td>
+    <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}
@@ -477,14 +477,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=false}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=true}}
             {{/each}}
           {{/if}}
 
@@ -506,7 +506,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
-                {{> partial_details_one_row}}
+                {{> partial_details_one_row bDistanceInMeters=true}}
               {{/each}}
             {{/each}}
           {{else}}

diff --git a/src/handlebar_helpers.js b/src/handlebar_helpers.js
index 4d1889f324530b13371c7c3bca0930a8cf363c0e..3ece852a9d0fa13788ee40e5e41707e11c670cd3 100644 (file)
--- a/src/handlebar_helpers.js
+++ b/src/handlebar_helpers.js
@@ -184,16 +184,25 @@ Handlebars.registerHelper({
   coverageType: function (aPlace) {
     return (aPlace.isarea ? 'Polygon' : 'Point');
   },
-  // fDistance is in meters
-  formatDistance: function (fDistanceMeters) {
-    if (fDistanceMeters < 1) return '0';
+  formatDistance: function (fDistance, bInMeters) {
+    if (bInMeters) {
+      if (fDistance < 1) return '0';
+      var sFormatted = (fDistance >= 1000)
+        ? Math.round(fDistance / 1000, 1) + ' km'
+        : Math.round(fDistance, 0) + ' m';
 
-    var formatted = (fDistanceMeters >= 1000)
-      ? Math.round(fDistanceMeters / 1000, 1) + ' km'
-      : Math.round(fDistanceMeters, 0) + ' m';
+      return new Handlebars.SafeString(
+        '<abbr class="distance" title="' + fDistance + ' meters">~' + sFormatted + '</abbr>'
+      );
+    }
+
+    // spheric distance, http://postgis.net/docs/ST_Distance_Spheroid.html
+    if (fDistance === 0) return '0';
 
     return new Handlebars.SafeString(
-      '<abbr class="distance" title="' + fDistanceMeters + '">~' + formatted + '</abbr>'
+      '<abbr class="distance" title="spheric distance ' + fDistance + '">~'
+        + (Math.round(fDistance * 1000, 4) / 1000)
+        + '</abbr>'
     );
   },
   // mark partial tokens (those starting with a space) with a star for readability

diff --git a/src/templates/detailspage.hbs b/src/templates/detailspage.hbs
index 48ecde95c3aabf3d3609bc0748809a4e363e3360..783865a03dc724a806e94dec3c2ad91d5daf1818 100644 (file)
--- a/src/templates/detailspage.hbs
+++ b/src/templates/detailspage.hbs
@@ -12,7 +12,7 @@
     <td>{{osmLink this}}</td>
     <td>{{this.rank_address}}</td>
     <td>{{formatAdminLevel this.admin_level}}</td>
-    <td>{{formatDistance this.distance}}</td>
+    <td>{{formatDistance this.distance bDistanceInMeters}}</td>
     <td>{{detailsPermaLink this 'details >'}}</td>
   </tr>
 {{/inline}}
@@ -160,14 +160,14 @@
         <tbody>
           {{#if aPlace.address}}
             {{#each aPlace.address}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=false}}
             {{/each}}
           {{/if}}
 
           {{#if aPlace.linked_places}}
             {{> partial_h2 'Linked Places'}}
             {{#each aPlace.linked_places}}
-              {{> partial_details_one_row}}
+              {{> partial_details_one_row bDistanceInMeters=true}}
             {{/each}}
           {{/if}}
 
@@ -189,7 +189,7 @@
             {{#each aPlace.hierarchy as |lines type|}}
               {{> partial_h3 type}}
               {{#each lines}}
-                {{> partial_details_one_row}}
+                {{> partial_details_one_row bDistanceInMeters=true}}
               {{/each}}
             {{/each}}
           {{else}}