Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
f3e4a79529 | ||
|
5bdabbd921 |
@ -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 = {};
|
||||
|
||||
|
@ -10,8 +10,7 @@ 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 = [
|
||||
var cartocss = [
|
||||
'Map {',
|
||||
' -torque-time-attribute: "date";',
|
||||
' -torque-aggregation-function: "count(cartodb_id)";',
|
||||
@ -33,8 +32,9 @@ asyncTest('navy example', function(assert) {
|
||||
' [frame-offset = 1] { marker-width: 10; marker-fill-opacity: 0.05;}',
|
||||
' [frame-offset = 2] { marker-width: 15; marker-fill-opacity: 0.02;}',
|
||||
'}'
|
||||
].join('\n');
|
||||
].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) {
|
||||
@ -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 {',
|
||||
|
@ -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());
|
||||
}
|
||||
@ -14,6 +18,7 @@ function save(path, buffer) {
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getImage: getImage,
|
||||
compare: compare,
|
||||
save: save
|
||||
};
|
||||
|
@ -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) {
|
||||
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user