From 12eb1427caff5ef06e9ae83fdc52db73a0e72adc Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 5 Jan 2015 15:54:40 +0900
Subject: [PATCH] Updating UI to display new entries from database

---
 client/html/index.html |  8 ++++++--
 server/search.js       | 25 +++++++++++++------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/client/html/index.html b/client/html/index.html
index ef56bff..f522110 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -83,7 +83,9 @@
                             <tr>
                                 <th>Id</th>
                                 <th>Name</th>
-                                <th>Distance</th>
+                                <th>Distance to User</th>
+                                <th>Closest Station</th>
+                                <th>Distance to Station</th>
                                 <th>Score</th>
                             </tr>
                         </thead>
@@ -91,7 +93,9 @@
                             <tr>
                                 <td>{{id}}</td>
                                 <td><a href="{{url}}">{{name}}</a></td>
-                                <th>{{distance}} km</th>
+                                <th>{{distanceToUser}} km</th>
+                                <th>{{closestStn}}</th>
+                                <th>{{distanceToStn}} km</th>
                                 <td>{{score}}</td>
                             </tr>
                         {{/each}}
diff --git a/server/search.js b/server/search.js
index f814e44..28c2910 100644
--- a/server/search.js
+++ b/server/search.js
@@ -64,11 +64,13 @@ function findRecords(data, features, minScore) {
     var results = [];
     walkMatches(data, features, minScore, function(record, score) {
         results.push({
-            name:     record.name,
-            url:      'http://www.tripadvisor.com' + record.relativeUrl,
-            score:    score,
-            distance: record.distanceToUser / 1000.0,
-            id:       record.id
+            name:           record.name,
+            url:            'http://www.tripadvisor.com' + record.relativeUrl,
+            score:          score,
+            distanceToUser: record.distanceToUser / 1000.0,
+            distanceToStn:  record.distanceToStn / 1000.0,
+            closestStn:     record.closestStn,
+            id:             record.id
         });
     });
 
@@ -200,16 +202,15 @@ function getRecords(geo, callback) {
 
         var records = _.map(rows, function(row) {
             return {
-                name:              row.name,
-                id:                row.id,
-                relativeUrl:       row.url,
-                distanceToStation: row.distanceToStation,
-
+                name:          row.name,
+                id:            row.id,
+                relativeUrl:   row.url,
+                closestStn:    row.closestStn,
+                distanceToStn: row.distanceToStn,
                 geo: {
                     latitude:    row.latitude,
                     longitude:   row.longitude
                 },
-
                 features: {
                     delicious:    row.delicious,
                     accomodating: row.accomodating,
@@ -243,7 +244,7 @@ function computeRecordGeo(records, geo, accessDist) {
     _.each(records, function(record) {
         record.features.nearby = -((record.distanceToUser - distUserMin) / distUserRange - 0.5) * 2.0;
 
-        record.features.accessible = 1.0 - (record.distanceToStation / accessDist);
+        record.features.accessible = 1.0 - (record.distanceToStn / accessDist);
         record.features.accessible = Math.min(record.features.accessible, 1.0);
         record.features.accessible = Math.max(record.features.accessible, -1.0);
     });