1

Address instead of URLs

This commit is contained in:
Alex Yatskov 2015-09-20 12:36:45 +09:00
parent 60d23faf6c
commit e4cee9f3fe
4 changed files with 10 additions and 6 deletions

View File

@ -128,7 +128,7 @@
</thead>
{{#each records}}
<tr>
<td><a href="{{url}}" target="_blank" onclick="javascript:accessReview({{id}});">{{name}}</a></td>
<td><a href="https://maps.google.com/?q={{#urlEncode}}{{address}}{{/urlEncode}}" target="_blank" onclick="javascript:accessReview({{id}});">{{name}}</a></td>
<td>{{#prettyFloat 2}}{{distanceToUser}}{{/prettyFloat}} km</td>
<td>{{closestStn}}</td>
<td>{{#prettyFloat 2}}{{distanceToStn}}{{/prettyFloat}} km</td>

View File

@ -47,6 +47,10 @@
return parseFloat(options.fn(this)).toFixed(precision);
});
Handlebars.registerHelper('urlEncode', function(options) {
return encodeURIComponent(options.fn(this));
});
$('#minScore,#resolution,#walkingDist,#maxResults').change(onSearch);
$('#profileDlg').on('hidden.bs.modal', onSearch);
$('#resetStorage').click(function() {

View File

@ -62,7 +62,7 @@ type record struct {
Id int `json:"id"`
Name string `json:"name"`
Score float64 `json:"score"`
Urls string `json:"urls"`
Address string `json:"address"`
features map[string]float64
geo geoData
}

View File

@ -256,7 +256,7 @@ func computeRecordCompat(db *sql.DB, entries []record, context queryContext) err
}
func fetchRecords(db *sql.DB, context queryContext) ([]record, error) {
rows, err := db.Query("SELECT name, urls, delicious, accommodating, affordable, atmospheric, latitude, longitude, closestStnDist, closestStnName, accessCount, id FROM reviews")
rows, err := db.Query("SELECT name, address, delicious, accommodating, affordable, atmospheric, latitude, longitude, closestStnDist, closestStnName, accessCount, id FROM reviews")
if err != nil {
return nil, err
}
@ -265,7 +265,7 @@ func fetchRecords(db *sql.DB, context queryContext) ([]record, error) {
var entries []record
for rows.Next() {
var (
name, urls, closestStn string
name, address, closestStn string
delicious, accommodating, affordable, atmospheric float64
latitude, longitude, distanceToStn float64
accessCount, id int
@ -273,7 +273,7 @@ func fetchRecords(db *sql.DB, context queryContext) ([]record, error) {
rows.Scan(
&name,
&urls,
&address,
&delicious,
&accommodating,
&affordable,
@ -287,7 +287,7 @@ func fetchRecords(db *sql.DB, context queryContext) ([]record, error) {
entry := record{
Name: name,
Urls: urls,
Address: address,
DistanceToStn: distanceToStn,
ClosestStn: closestStn,
AccessCount: accessCount,