Skip to content

Commit

Permalink
fixes display names in top/bottom map list
Browse files Browse the repository at this point in the history
  • Loading branch information
@davelandry
davelandry committed Apr 16, 2016
1 parent fcc85fa commit 1c75a9c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 12 deletions.
18 changes: 12 additions & 6 deletions datausa/assets/js/viz/geo/draw.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -652,16 +652,19 @@ viz.mapDraw = function(vars) {
});
if (tdata.length > 20) {
var top = tdata.slice(0, 10).map(function(c, i){
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + vars.attrs.value[c.geo].name + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
var n = vars.attrs.value[c.geo].display_name || vars.attrs.value[c.geo].name;
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + n + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
}).join("");
var bottom = tdata.slice().reverse().slice(0, 10).reverse().map(function(c, i){
return "<tr><td class='list-rank'>" + ((length - 9) + i) + ".</td><td class='list-name' id='id" + c.geo + "'>" + vars.attrs.value[c.geo].name + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
var n = vars.attrs.value[c.geo].display_name || vars.attrs.value[c.geo].name;
return "<tr><td class='list-rank'>" + ((length - 9) + i) + ".</td><td class='list-name' id='id" + c.geo + "'>" + n + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
}).join("");
var html = "<div class='list-title'>Top 10 Locations</div><table>" + top + "</table><div class='list-title'>Bottom 10 Locations</div><table>" + bottom + "</table>";
}
else {
var html = tdata.map(function(c, i){
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + vars.attrs.value[c.geo].name + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
var n = vars.attrs.value[c.geo].display_name || vars.attrs.value[c.geo].name;
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + n + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
}).join("");
html = "<div class='list-title'>Location Ranking</div><table>" + html + "</table>";
}
Expand Down Expand Up @@ -718,16 +721,19 @@ viz.mapDraw = function(vars) {

if (data.length > 20) {
var top = data.slice(0, 10).map(function(c, i){
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + vars.attrs.value[c.geo].name + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
var n = vars.attrs.value[c.geo].display_name || vars.attrs.value[c.geo].name;
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + n + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
}).join("");
var bottom = data.slice().reverse().slice(0, 10).reverse().map(function(c, i){
return "<tr><td class='list-rank'>" + ((data.length - 9) + i) + ".</td><td class='list-name' id='id" + c.geo + "'>" + vars.attrs.value[c.geo].name + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
var n = vars.attrs.value[c.geo].display_name || vars.attrs.value[c.geo].name;
return "<tr><td class='list-rank'>" + ((data.length - 9) + i) + ".</td><td class='list-name' id='id" + c.geo + "'>" + n + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
}).join("");
var html = "<div class='list-title'>Top 10 Locations</div><table>" + top + "</table><div class='list-title'>Bottom 10 Locations</div><table>" + bottom + "</table>";
}
else {
var html = data.map(function(c, i){
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + vars.attrs.value[c.geo].name + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
var n = vars.attrs.value[c.geo].display_name || vars.attrs.value[c.geo].name;
return "<tr><td class='list-rank'>" + (i + 1) + ".</td><td class='list-name' id='id" + c.geo + "'>" + n + "</td><td class='list-value'>" + vars.format.number(c[vars.color.value], {"key": vars.color.value, "vars": vars}) + "</td></tr>";
}).join("");
html = "<div class='list-title'>County Ranking</div><table>" + html + "</table>";
}
Expand Down
18 changes: 12 additions & 6 deletions datausa/static/js/site.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1c75a9c

Please sign in to comment.