Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for different tile sizes #260

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for different tile sizes #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bdabbd
Add support for different tile sizes
rochoa Jun 1, 2016
f3e4a79
Merge branch 'master' into tile-size
rochoa Aug 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/torque/renderer/point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ var CartoDatasource = require('./datasource');
this._filters = new Filters(this._canvas, {canvasClass: options.canvasClass});
this.style = this.options.cartocss || DEFAULT_CARTOCSS;
this.setCartoCSS(this.style);
this.TILE_SIZE = 256;
this.TILE_SIZE = options.tileSize || 256;
this._style = null;
this._gradients = {};

Expand Down
64 changes: 40 additions & 24 deletions test/acceptance/renderer/point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@ var IMAGE_DIFF_TOLERANCE = 4 / 100;
// Once you have a valid canvas and no errors, it's possible to write to disk the canvas buffer as a png image with:
// require('fs').writeFileSync('/tmp/torque-acceptance-test-tile.png', canvas.toBuffer(), {encoding: null});

asyncTest('navy example', function(assert) {
var cartocss = [
'Map {',
' -torque-time-attribute: "date";',
' -torque-aggregation-function: "count(cartodb_id)";',
' -torque-frame-count: 760;',
' -torque-animation-duration: 15;',
' -torque-resolution: 2',
'}',
'#layer {',
' marker-width: 3;',
' marker-fill-opacity: 0.8;',
' marker-fill: #FEE391; ',
' comp-op: "lighten";',
' [value > 2] { marker-fill: #FEC44F; }',
' [value > 3] { marker-fill: #FE9929; }',
' [value > 4] { marker-fill: #EC7014; }',
' [value > 5] { marker-fill: #CC4C02; }',
' [value > 6] { marker-fill: #993404; }',
' [value > 7] { marker-fill: #662506; }',
' [frame-offset = 1] { marker-width: 10; marker-fill-opacity: 0.05;}',
' [frame-offset = 2] { marker-width: 15; marker-fill-opacity: 0.02;}',
'}'
].join('\n');
var cartocss = [
'Map {',
' -torque-time-attribute: "date";',
' -torque-aggregation-function: "count(cartodb_id)";',
' -torque-frame-count: 760;',
' -torque-animation-duration: 15;',
' -torque-resolution: 2',
'}',
'#layer {',
' marker-width: 3;',
' marker-fill-opacity: 0.8;',
' marker-fill: #FEE391; ',
' comp-op: "lighten";',
' [value > 2] { marker-fill: #FEC44F; }',
' [value > 3] { marker-fill: #FE9929; }',
' [value > 4] { marker-fill: #EC7014; }',
' [value > 5] { marker-fill: #CC4C02; }',
' [value > 6] { marker-fill: #993404; }',
' [value > 7] { marker-fill: #662506; }',
' [frame-offset = 1] { marker-width: 10; marker-fill-opacity: 0.05;}',
' [frame-offset = 2] { marker-width: 15; marker-fill-opacity: 0.02;}',
'}'
].join('\n');

asyncTest('navy example', function(assert) {
var step = 300;

pointRenderer.getTile('default_navy_3-3-2.torque.json', cartocss, 3, 3, 2, step, function(err, canvas) {
Expand All @@ -45,6 +45,22 @@ asyncTest('navy example', function(assert) {
});
});

asyncTest('tileSize = 512', function(assert) {
var step = 300;
var tileSize = 512;
var options = {
tileSize: tileSize
};

pointRenderer.getTile('default_navy_3-3-2.torque.json', cartocss, 3, 3, 2, step, options, function(err, canvas) {
assert.ok(!err, 'no error while getting tile');
var img = image.getImage(canvas.toBuffer());
assert.equal(img.width(), tileSize);
assert.equal(img.height(), tileSize);
QUnit.start();
});
});

asyncTest('basic heatmap', function(assert) {
var cartocss = [
'Map {',
Expand Down
7 changes: 6 additions & 1 deletion test/support/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
var mapnik = require('mapnik');

function getImage(buffer) {
return new mapnik.Image.fromBytesSync(buffer);
}

function compare(buffer, fixtureRelPath) {
save(__dirname + '/../results/' + fixtureRelPath, buffer);

var img = new mapnik.Image.fromBytesSync(buffer);
var img = getImage(buffer);
var reference = new mapnik.Image.openSync(__dirname + '/../fixtures/image/' + fixtureRelPath);
return img.compare(reference) / (reference.width() * reference.height());
}
Expand All @@ -14,6 +18,7 @@ function save(path, buffer) {
}

module.exports = {
getImage: getImage,
compare: compare,
save: save
};
13 changes: 8 additions & 5 deletions test/support/point_renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ var fs = require('fs');
var torque = require('../../lib/torque/index');


function getTile(jsonRelPath, cartocss, z, x, y, step, callback) {
step = step || 0;

function getTile(jsonRelPath, cartocss, z, x, y, step, options, callback) {
if (!callback) {
callback = options;
options = {};
}
var cartoCssOptions = torque.common.TorqueLayer.optionsFromCartoCSS(cartocss);

var provider = new torque.providers.windshaft(_.extend({ no_fetch_map: true }, cartoCssOptions));
var rendererOptions = _.extend({cartocss: cartocss}, cartoCssOptions, {
var rendererOptions = _.extend(options, {cartocss: cartocss}, cartoCssOptions, {
canvasClass: Canvas,
imageClass: Canvas.Image,
setImageSrc: function(img, url, callback) {
Expand Down Expand Up @@ -42,7 +44,8 @@ function getTile(jsonRelPath, cartocss, z, x, y, step, callback) {

var rows = JSON.parse(fs.readFileSync(__dirname + '/../fixtures/json/' + jsonRelPath));

var canvas = new Canvas(256, 256);
var tileSize = options.tileSize || 256;
var canvas = new Canvas(tileSize, tileSize);
var pointRenderer = new torque.renderer.Point(canvas, rendererOptions);

pointRenderer.renderTile(provider.proccessTile(rows, {x: x, y: y}, z), step, function(err) {
Expand Down