commit 63bc55b4dc05b7aea041063932bf55bb5c25d841
Author: Tom Hughes <tom@compton.nu>
Date: Sun Dec 6 11:05:31 2015 +0000
Relax some test thresholds
diff --git a/test/vector-tile.composite.test.js b/test/vector-tile.composite.test.js
index 8debd8c..d0ab75c 100644
--- a/test/vector-tile.composite.test.js
+++ b/test/vector-tile.composite.test.js
@@ -301,31 +301,35 @@ describe('mapnik.VectorTile.composite', function() {
vtile1.composite([vtile2],{reencode:true,max_extent:world_clipping_extent});
assert.equal(vtile.getData().length,54781);
assert.deepEqual(vtile.names(),["water","admin"]);
- assert.equal(vtile1.getData().length,54463);
+ assert.ok(vtile1.getData().length >= 54462 &&
+ vtile1.getData().length <= 54521,
+ vtile1.getData().length);
assert.deepEqual(vtile1.names(),["water","admin"]);
var expected_file = data_base +'/expected/world-reencode.png';
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,54781);
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,54463);
+ assert.ok(vtile4.getData().length >= 54462 &&
+ vtile4.getData().length <= 54521,
+ vtile4.getData().length);
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 ecbb782..87afd5b 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();
});