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

Fix jshint

Browse Source
This commit is contained in:
David M 2017-10-09 15:49:51 +02:00
parent 1766cd0ad4
commit 82648df21c
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
test/acceptance/mvt.js
View File

@ -144,7 +144,7 @@ return function () {
const { z, x, y } = test.coords; const { z, x, y } = test.coords;
const { format, response } = test; const { format, response } = test;
testClient.getTile(z, x, y, { format, response }, (err, res) => { testClient.getTile(z, x, y, { format, response }, err => {
assert.ifError(err); assert.ifError(err);
testClient.drain(done); testClient.drain(done);
}); });
@ -185,7 +185,8 @@ return function () {
type: 'mapnik', type: 'mapnik',
options: { options: {
sql: 'select * from populated_places_simple_reduced', sql: 'select * from populated_places_simple_reduced',
cartocss: '#layer0 { marker-fill: red; marker-width: 10; [name="Madrid"] { marker-fill: green; } }', cartocss:
'#layer0 { marker-fill: red; marker-width: 10; [name="Madrid"] { marker-fill: green; } }',
cartocss_version: '2.0.1', cartocss_version: '2.0.1',
widgets: { widgets: {
adm0name: { adm0name: {
@ -336,20 +337,20 @@ return function () {
].join('\n'); ].join('\n');
var sql = [ var sql = [
'WITH hgrid AS (', 'WITH hgrid AS (',
' SELECT CDB_HexagonGrid(', ' SELECT CDB_HexagonGrid(',
' ST_Expand(!bbox!, greatest(!pixel_width!,!pixel_height!) * 100),', ' ST_Expand(!bbox!, greatest(!pixel_width!,!pixel_height!) * 100),',
' greatest(!pixel_width!,!pixel_height!) * 100', ' greatest(!pixel_width!,!pixel_height!) * 100',
' ) as cell', ' ) as cell',
')', ')',
'SELECT', 'SELECT',
' hgrid.cell as the_geom_webmercator,', ' hgrid.cell as the_geom_webmercator,',
' count(1) as points_count,', ' count(1) as points_count,',
' count(1)/power(100 * CDB_XYZ_Resolution(CDB_ZoomFromScale(!scale_denominator!)), 2) as points_density,', ' count(1)/power(100 * CDB_XYZ_Resolution(CDB_ZoomFromScale(!scale_denominator!)), 2) as points_density,',
' 1 as cartodb_id', ' 1 as cartodb_id',
'FROM hgrid, (SELECT * FROM populated_places_simple_reduced) i', 'FROM hgrid, (SELECT * FROM populated_places_simple_reduced) i',
'where ST_Intersects(i.the_geom_webmercator, hgrid.cell)', 'where ST_Intersects(i.the_geom_webmercator, hgrid.cell)',
'GROUP BY hgrid.cell' 'GROUP BY hgrid.cell'
].join('\n'); ].join('\n');
var mapConfig = { var mapConfig = {
@ -499,5 +500,5 @@ return function () {
}); });
} }
} };
} }