Merge branch 'master' into tile-size

Conflicts:
	lib/torque/renderer/point.js

lib/torque/renderer/point.js

@@ -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 = {};
     

test/acceptance/renderer/point.js

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

test/support/image.js

@@ -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
 };

test/support/point_renderer.js

@@ -6,13 +6,15 @@ var fs = require('fs');
 var torque = require('../../lib/torque/index');
 
 
-function getTile(jsonRelPath, cartocss, z, x, y, step, callback) {
+function getTile(jsonRelPath, cartocss, z, x, y, step, options, callback) {
-    step = step || 0;
+    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) {