cartodb/torque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

needed str replacements

Browse Source
This commit is contained in:
Andrew Hill 2013-04-24 11:06:50 -04:00
parent c09064625c
commit 436d914c0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/grid_layer.js
View File

@ -188,7 +188,7 @@ TimePlayer.prototype.get_time_data = function (tile, coord, zoom) {
" FROM " + " FROM " +
" hgrid, {0} i ".format(this.table) + " hgrid, {0} i ".format(this.table) +
" WHERE " + " WHERE " +
" i.the_geom_webmercator && CDB_XYZ_Extent({0}, {1}, {2}) " + " i.the_geom_webmercator && CDB_XYZ_Extent({0}, {1}, {2}) ".format(coord.x, coord.y, zoom) +
" AND ST_Intersects(i.the_geom_webmercator, hgrid.cell) " + " AND ST_Intersects(i.the_geom_webmercator, hgrid.cell) " +
" GROUP BY " + " GROUP BY " +
" hgrid.cell, " + " hgrid.cell, " +
@ -212,7 +212,7 @@ TimePlayer.prototype.get_time_data = function (tile, coord, zoom) {
" FROM " + " FROM " +
" hgrid, {0} i ".format(this.table) + " hgrid, {0} i ".format(this.table) +
" WHERE " + " WHERE " +
" i.the_geom_webmercator && CDB_XYZ_Extent({0}, {1}, {2}) " + " i.the_geom_webmercator && CDB_XYZ_Extent({0}, {1}, {2}) ".format(coord.x, coord.y, zoom) +
" AND ST_Intersects(i.the_geom_webmercator, hgrid.cell) " + " AND ST_Intersects(i.the_geom_webmercator, hgrid.cell) " +
" GROUP BY " + " GROUP BY " +
" hgrid.cell, floor(({0} - {1})/{2})".format(column_conv, this.MIN_DATE, this.step) + " hgrid.cell, floor(({0} - {1})/{2})".format(column_conv, this.MIN_DATE, this.step) +