commit aed6e8aa4c659555caa1bda32da368c30c8f5d4d

Author: Tom Hughes <tom@compton.nu>

Date:   Sun Dec 6 11:05:31 2015 +0000

    Relax some test thresholds

diff --git a/test/blend.test.js b/test/blend.test.js

index 4a6f73be..efc30c53 100644

--- a/test/blend.test.js

+++ b/test/blend.test.js

@@ -437,7 +437,7 @@ describe('mapnik.blend', function() {

             //fs.writeFileSync('test/blend-fixtures/actual-compression-5.webp',result);

             var diff = expected.compare(actual);

             // webp 0.5.0 leads to image with 730 diff pixels

-            assert.ok(diff <= 730);

+            assert.ok(diff <= 750);

             done();

         });

     });

diff --git a/test/image.svg.test.js b/test/image.svg.test.js

index c09fec51..0dc9266c 100644

--- a/test/image.svg.test.js

+++ b/test/image.svg.test.js

@@ -194,7 +194,7 @@ describe('mapnik.Image SVG', function() {

         assert.ok(img instanceof mapnik.Image);

         assert.equal(img.width(), 256);

         assert.equal(img.height(), 256);

-        assert.equal(img.encodeSync('png32').length, 17571);

+        assert.ok(Math.abs(img.encodeSync('png32').length - 17571) <= 100);

     });

     it('#fromSVGSync load from SVG file - 2', function() {

@@ -203,7 +203,7 @@ describe('mapnik.Image SVG', function() {

         assert.ok(img instanceof mapnik.Image);

         assert.equal(img.width(), 256);

         assert.equal(img.height(), 256);

-        assert.equal(img.encodeSync('png32').length, 17571);

+        assert.ok(Math.abs(img.encodeSync('png32').length - 17571) <= 100);

     });

@@ -212,7 +212,7 @@ describe('mapnik.Image SVG', function() {

             assert.ok(img); assert.ok(img instanceof mapnik.Image);

             assert.equal(img.width(), 256);

             assert.equal(img.height(), 256);

-            assert.equal(img.encodeSync('png32').length, 17571);

+            assert.ok(Math.abs(img.encodeSync('png32').length - 17571) <= 100);

             assert.equal(img.premultiplied(), false);

             done();

         });

@@ -226,7 +226,7 @@ describe('mapnik.Image SVG', function() {

         assert.ok(img instanceof mapnik.Image);

         assert.equal(img.width(), 100);

         assert.equal(img.height(), 100);

-        assert.equal(img.encodeSync("png").length, 1270);

+        assert.ok(Math.abs(img.encodeSync('png32').length - 1270) <= 14);

     });

     it('#fromSVGBytesSync load from SVG buffer - 2', function() {

@@ -237,7 +237,7 @@ describe('mapnik.Image SVG', function() {

         assert.ok(img instanceof mapnik.Image);

         assert.equal(img.width(), 100);

         assert.equal(img.height(), 100);

-        assert.equal(img.encodeSync("png").length, 1270);

+        assert.ok(Math.abs(img.encodeSync('png32').length - 1270) <= 14);

     });

     it('#fromSVGBytes load from SVG buffer', function(done) {

@@ -248,7 +248,7 @@ describe('mapnik.Image SVG', function() {

             assert.ok(img instanceof mapnik.Image);

             assert.equal(img.width(), 100);

             assert.equal(img.height(), 100);

-            assert.equal(img.encodeSync("png").length, 1270);

+            assert.ok(Math.abs(img.encodeSync('png32').length - 1270) <= 14);

             assert.equal(img.premultiplied(), false);

             done();

         });

@@ -262,7 +262,7 @@ describe('mapnik.Image SVG', function() {

         assert.ok(img instanceof mapnik.Image);

         assert.equal(img.width(), 50);

         assert.equal(img.height(), 50);

-        assert.equal(img.encodeSync("png").length, 616);

+        assert.ok(Math.abs(img.encodeSync('png32').length - 616) <= 4);

         assert.equal(img.premultiplied(), false);

     });

diff --git a/test/vector-tile.composite.test.js b/test/vector-tile.composite.test.js

index 1380a665..27fb0efc 100644

--- a/test/vector-tile.composite.test.js

+++ b/test/vector-tile.composite.test.js

@@ -108,7 +108,7 @@ function compare_to_image(actual,expected_file) {

         console.log('generating expected image',expected_file);

         actual.save(expected_file,"png32");

     }

-    return actual.compare(new mapnik.Image.open(expected_file));

+    return actual.compare(new mapnik.Image.open(expected_file), {threshold:24});

 }

 describe('mapnik.VectorTile.composite', function() {

@@ -307,25 +307,25 @@ describe('mapnik.VectorTile.composite', function() {

         var expected_file2 = data_base +'/expected/world-reencode-max-extent.png';

         vtile.render(map,new mapnik.Image(256,256),function(err,im) {

             if (err) throw err;

-            assert.equal(0,compare_to_image(im,expected_file));

+            assert.ok(compare_to_image(im,expected_file) <= 500);

             vtile1.render(map,new mapnik.Image(256,256),function(err,im2) {

                 if (err) throw err;

-                assert.equal(0,compare_to_image(im2,expected_file2));

+                assert.ok(compare_to_image(im2,expected_file2) <= 500);

                 vtile3.composite([vtile2],{reencode:true}, function(err) {

                     if (err) throw err;

                     assert.equal(vtile3.getData().length,54837);

                     assert.deepEqual(vtile3.names(),["water","admin"]);

                     vtile3.render(map,new mapnik.Image(256,256),function(err,im) {

                         if (err) throw err;

-                        assert.equal(0,compare_to_image(im,expected_file));

+                        assert.ok(compare_to_image(im,expected_file) <= 500);

                         vtile4.composite([vtile2],{reencode:true,max_extent:world_clipping_extent}, function(err) {

                             if (err) throw err;

                             assert.equal(vtile4.getData().length,54576);

                             assert.deepEqual(vtile4.names(),["water","admin"]);

-                            assert.equal(0,compare_to_image(im2,expected_file2));

+                            assert.ok(compare_to_image(im2,expected_file2) <= 500);

                             vtile4.render(map,new mapnik.Image(256,256),function(err,im) {

                                 if (err) throw err;

-                                assert.equal(0,compare_to_image(im,expected_file2));

+                                assert.ok(compare_to_image(im,expected_file2) <= 500);

                                 done();

                             });

                         });

diff --git a/test/vector-tile.query.test.js b/test/vector-tile.query.test.js

index bbe23350..41c6172f 100644

--- a/test/vector-tile.query.test.js

+++ b/test/vector-tile.query.test.js

@@ -64,8 +64,8 @@ describe('mapnik.VectorTile query polygon', function() {

             assert.equal(features[0].id(),89);

             assert.equal(features[0].geometry().type(),mapnik.Geometry.Polygon);

             assert.equal(features[0].distance,0);

-            assert.equal(features[0].x_hit,0);

-            assert.equal(features[0].y_hit,0);

+            assert.ok(Math.abs(features[0].x_hit) < 1e-8);

+            assert.ok(Math.abs(features[0].y_hit) < 1e-8);

             assert.equal(features[0].layer,'world');

             assert.equal(JSON.parse(features[1].toJSON()).properties.NAME,'Japan');

             assert.equal(features[1].id(),89);

@@ -546,8 +546,8 @@ describe('mapnik.VectorTile query xy single features', function() {

           }]

         }),"layer-name");

         var res = vtile.query(0,0,{tolerance:1});

-        assert.equal(res[0].x_hit, 0);

-        assert.equal(res[0].y_hit, 0);

+        assert.ok(Math.abs(res[0].x_hit) < 1e-8);

+        assert.ok(Math.abs(res[0].y_hit) < 1e-8);

         assert.equal(res[0].attributes().name, 'A');

         done();

     });

@@ -566,8 +566,8 @@ describe('mapnik.VectorTile query xy single features', function() {

           }]

         }),"layer-name");

         var res = vtile.query(0,0,{tolerance:1});

-        assert.equal(res[0].x_hit, 0);

-        assert.equal(res[0].y_hit, 0);

+        assert.ok(Math.abs(res[0].x_hit) < 1e-8);

+        assert.ok(Math.abs(res[0].y_hit) < 1e-8);

         assert.equal(res[0].attributes().name, 'A');

         done();

     });

@@ -586,8 +586,8 @@ describe('mapnik.VectorTile query xy single features', function() {

           }]

         }),"layer-name");

         var res = vtile.query(0,0,{tolerance:1});

-        assert.equal(res[0].x_hit, 0);

-        assert.equal(res[0].y_hit, 0);

+        assert.ok(Math.abs(res[0].x_hit) < 1e-8);

+        assert.ok(Math.abs(res[0].y_hit) < 1e-8);

         assert.equal(res[0].attributes().name, 'A');

         done();

     });

@@ -606,8 +606,8 @@ describe('mapnik.VectorTile query xy single features', function() {

           }]

         }),"layer-name");

         var res = vtile.query(0,0,{tolerance:1});

-        assert.equal(res[0].x_hit, 0);

-        assert.equal(res[0].y_hit, 0);

+        assert.ok(Math.abs(res[0].x_hit) < 1e-8);

+        assert.ok(Math.abs(res[0].y_hit) < 1e-8);

         assert.equal(res[0].attributes().name, 'A');

         done();

     });