Skip to content

Commit

Permalink
finish the port from expresso to mocha
Browse files Browse the repository at this point in the history
  • Loading branch information
Dane Springmeyer committed Apr 16, 2012
1 parent e239e81 commit 87e8037
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 52 deletions.
29 changes: 15 additions & 14 deletions test/grid.test.js
View file
Expand Up @@ -28,38 +28,40 @@ describe('mapnik.Grid ', function() {
assert.equal(grid.encodeSync().length, v.encodeSync().length); assert.equal(grid.encodeSync().length, v.encodeSync().length);
}); });


it('should be painted after rendering', function(done) { it('should not be painted after rendering', function(done) {
var grid_blank = new mapnik.Grid(4, 4); var grid_blank = new mapnik.Grid(4, 4);
assert.equal(grid_blank.painted(), false); assert.equal(grid_blank.painted(), false);
assert.equal(grid_blank.background, undefined); assert.equal(grid_blank.background, undefined);
var m = new mapnik.Map(4, 4); var m = new mapnik.Map(4, 4);
var l = new mapnik.Layer('test'); var l = new mapnik.Layer('test');
m.add_layer(l); m.add_layer(l);

m.render(grid_blank, {layer: 0},function(err,grid_blank) { m.render(grid_blank, {layer: 0},function(err,grid_blank) {
assert.equal(grid_blank.painted(), false); assert.equal(grid_blank.painted(), false);
// TODO - expose grid background
assert.equal(grid_blank.background, undefined); assert.equal(grid_blank.background, undefined);
done();
}); });
});


var grid_blank2 = new mapnik.Grid(4, 4); it('should be have background applied after rendering', function(done) {
assert.equal(grid_blank2.painted(), false);
assert.equal(grid_blank2.background, undefined);


var m2 = new mapnik.Map(4, 4); var grid_blank = new mapnik.Grid(4, 4);
var m = new mapnik.Map(4, 4);
var l = new mapnik.Layer('test'); var l = new mapnik.Layer('test');
m2.add_layer(l); m.add_layer(l);

m.background = new mapnik.Color('green');
m2.background = new mapnik.Color('green'); m.render(grid_blank, {layer: 0},function(err,grid_blank2) {
m2.render(grid_blank2, {layer: 0},function(err,grid_blank2) { assert.equal(grid_blank.painted(), false);
assert.equal(grid_blank2.painted(), false); // TODO - expose grid background
//assert.ok(grid_blank2.background); //assert.ok(grid_blank2.background);
done();
}); });
});



it('should be painted after rendering2', function(done) {
var grid_blank3 = new mapnik.Grid(4, 4); var grid_blank3 = new mapnik.Grid(4, 4);
assert.equal(grid_blank3.painted(), false); assert.equal(grid_blank3.painted(), false);
assert.equal(grid_blank3.background, undefined); assert.equal(grid_blank3.background, undefined);

var m3 = new mapnik.Map(4, 4); var m3 = new mapnik.Map(4, 4);
var s = '<Map>'; var s = '<Map>';
s += '<Style name="points">'; s += '<Style name="points">';
Expand All @@ -69,7 +71,6 @@ describe('mapnik.Grid ', function() {
s += '</Style>'; s += '</Style>';
s += '</Map>'; s += '</Map>';
m3.fromStringSync(s); m3.fromStringSync(s);

var mem_datasource = new mapnik.MemoryDatasource({'extent': '-180,-90,180,90'}); var mem_datasource = new mapnik.MemoryDatasource({'extent': '-180,-90,180,90'});
mem_datasource.add({ 'x': 0, 'y': 0 }); mem_datasource.add({ 'x': 0, 'y': 0 });
mem_datasource.add({ 'x': 1, 'y': 1 }); mem_datasource.add({ 'x': 1, 'y': 1 });
Expand Down
1 change: 0 additions & 1 deletion test/grid_view.test.js
View file
Expand Up @@ -31,7 +31,6 @@ describe('mapnik.GridView ', function() {
}; };
var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'}); var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'});
map.render(grid, options, function(err, grid) { map.render(grid, options, function(err, grid) {

var view = grid.view(0, 0, 256, 256); var view = grid.view(0, 0, 256, 256);
assert.equal(view.isSolid(), false); assert.equal(view.isSolid(), false);
// hit alaska (USA is id 207) // hit alaska (USA is id 207)
Expand Down
8 changes: 7 additions & 1 deletion test/image.test.js
View file
Expand Up @@ -38,7 +38,7 @@ describe('mapnik.Image ', function() {
assert.equal(im.encodeSync().length, im2.encodeSync().length); assert.equal(im.encodeSync().length, im2.encodeSync().length);
}); });


it('should be painted after rendering', function(done) { it('should not be painted after rendering', function(done) {
var im_blank = new mapnik.Image(4, 4); var im_blank = new mapnik.Image(4, 4);
assert.equal(im_blank.painted(), false); assert.equal(im_blank.painted(), false);
assert.equal(im_blank.background, undefined); assert.equal(im_blank.background, undefined);
Expand All @@ -48,8 +48,11 @@ describe('mapnik.Image ', function() {
m.render(im_blank, {},function(err,im_blank) { m.render(im_blank, {},function(err,im_blank) {
assert.equal(im_blank.painted(), false); assert.equal(im_blank.painted(), false);
assert.equal(im_blank.background, undefined); assert.equal(im_blank.background, undefined);
done();
}); });
});


it('should have background set after rendering', function(done) {
var im_blank2 = new mapnik.Image(4, 4); var im_blank2 = new mapnik.Image(4, 4);
assert.equal(im_blank2.painted(), false); assert.equal(im_blank2.painted(), false);
assert.equal(im_blank2.background, undefined); assert.equal(im_blank2.background, undefined);
Expand All @@ -60,8 +63,11 @@ describe('mapnik.Image ', function() {
m2.render(im_blank2, {},function(err,im_blank2) { m2.render(im_blank2, {},function(err,im_blank2) {
assert.equal(im_blank2.painted(), false); assert.equal(im_blank2.painted(), false);
assert.ok(im_blank2.background); assert.ok(im_blank2.background);
done();
}); });
});


it('should be painted after rendering', function(done) {


var im_blank3 = new mapnik.Image(4, 4); var im_blank3 = new mapnik.Image(4, 4);
assert.equal(im_blank3.painted(), false); assert.equal(im_blank3.painted(), false);
Expand Down
102 changes: 66 additions & 36 deletions test/render_grid.test.js
View file
Expand Up @@ -7,9 +7,37 @@ var reference = fs.readFileSync('./test/support/grid2.json', 'utf8');
var reference_view = fs.readFileSync('./test/support/grid_view.json', 'utf8'); var reference_view = fs.readFileSync('./test/support/grid_view.json', 'utf8');


describe('mapnik grid rendering ', function() { describe('mapnik grid rendering ', function() {
it('should match expected output (sync rendering)', function() {
var map_grid = new mapnik.Map(256, 256); it('should match expected output (sync rendering)', function(done) {
map_grid.load(stylesheet, {strict: true}, function(err,map) { var map = new mapnik.Map(256, 256);
map.loadSync(stylesheet, {strict: true});
map.zoomAll();
var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'});
var options = {'layer': 0,
'fields': ['NAME']
};
map.render(grid, options, function(err, grid) {
var grid_utf = grid.encodeSync('utf', {resolution: 4});
//fs.writeFileSync('./ref.json',JSON.stringify(grid_utf))
assert.equal(JSON.stringify(grid_utf), reference);
// pull an identical view and compare it to original grid
var gv = grid.view(0, 0, 256, 256);
var gv_utf = gv.encodeSync('utf', {resolution: 4});
assert.equal(JSON.stringify(gv_utf), reference);
// pull a subsetted view (greenland basically)
var gv2 = grid.view(64, 64, 64, 64);
assert.equal(gv2.width(), 64);
assert.equal(gv2.height(), 64);
var gv_utf2 = gv2.encodeSync('utf', {resolution: 4});
//fs.writeFileSync('./test/support/grid_view.json',JSON.stringify(gv_utf2),'utf8')
assert.equal(JSON.stringify(gv_utf2), reference_view);
done();
});
});

it('should match expected output (async rendering)', function(done) {
var map = new mapnik.Map(256, 256);
map.load(stylesheet, {strict: true}, function(err,map) {
if (err) throw err; if (err) throw err;
map.zoomAll(); map.zoomAll();
var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'}); var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'});
Expand All @@ -19,29 +47,38 @@ describe('mapnik grid rendering ', function() {
}; };
map.render(grid, options, function(err, grid) { map.render(grid, options, function(err, grid) {
assert.ok(!err); assert.ok(!err);
grid_utf = grid.encodeSync('utf', {resolution: 4}); grid.encode('utf', {resolution: 4}, function(err,utf) {
//fs.writeFileSync('./ref.json',JSON.stringify(grid_utf)) assert.equal(JSON.stringify(utf), reference);
assert.equal(JSON.stringify(grid_utf), reference); done();
// pull an identical view and compare it to original grid });
var gv = grid.view(0, 0, 256, 256); });
gv_utf = gv.encodeSync('utf', {resolution: 4}); });
assert.equal(JSON.stringify(gv_utf), reference); });


// pull a subsetted view (greenland basically) it('should match expected output (async rendering view)', function(done) {
var gv2 = grid.view(64, 64, 64, 64); var map = new mapnik.Map(256, 256);
assert.equal(gv2.width(), 64); map.load(stylesheet, {strict: true}, function(err,map) {
assert.equal(gv2.height(), 64); if (err) throw err;
gv_utf2 = gv2.encodeSync('utf', {resolution: 4}); map.zoomAll();
//fs.writeFileSync('./test/support/grid_view.json',JSON.stringify(gv_utf2),'utf8') var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'});
assert.equal(JSON.stringify(gv_utf2), reference_view);
done(); var options = {'layer': 0,
'fields': ['NAME']
};
map.render(grid, options, function(err, grid) {
assert.ok(!err);
var gv = grid.view(0, 0, 256, 256);
gv.encode('utf', {resolution: 4}, function(err,gv_utf1) {
assert.equal(JSON.stringify(gv_utf1), reference);
done()
});
}); });
}); });
}); });


it('should match expected output (async rendering)', function() { it('should match expected output (async rendering view subsetted)', function(done) {
var map_grid = new mapnik.Map(256, 256); var map = new mapnik.Map(256, 256);
map_grid.load(stylesheet, {strict: true}, function(err,map) { map.load(stylesheet, {strict: true}, function(err,map) {
if (err) throw err; if (err) throw err;
map.zoomAll(); map.zoomAll();
var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'}); var grid = new mapnik.Grid(map.width, map.height, {key: '__id__'});
Expand All @@ -51,23 +88,16 @@ describe('mapnik grid rendering ', function() {
}; };
map.render(grid, options, function(err, grid) { map.render(grid, options, function(err, grid) {
assert.ok(!err); assert.ok(!err);
grid.encode('utf', {resolution: 4}, function(utf) { // pull a subsetted view (greenland basically)
assert.equal(JSON.stringify(utf), reference); var gv2 = grid.view(64, 64, 64, 64);
// pull an identical view and compare it to original grid assert.equal(gv2.width(), 64);
var gv = grid.view(0, 0, 256, 256); assert.equal(gv2.height(), 64);
gv_utf = gv.encode('utf', {resolution: 4}, function(utf) { gv2.encode('utf', {resolution: 4}, function(err,gv_utf2) {
assert.equal(JSON.stringify(utf), reference); assert.equal(JSON.stringify(gv_utf2), reference_view);
// pull a subsetted view (greenland basically) done();
var gv2 = grid.view(64, 64, 64, 64);
assert.equal(gv2.width(), 64);
assert.equal(gv2.height(), 64);
gv_utf2 = gv2.encode('utf', {resolution: 4}, function(utf) {
assert.equal(JSON.stringify(gv_utf2), reference_view);
done();
});
});
}); });
}); });
}); });
}); });

}); });

0 comments on commit 87e8037

Please sign in to comment.