first shot at putTile

This commit is contained in:
Konstantin Käfer
2011-07-07 21:04:11 +02:00
parent bce3cfcc58
commit c0fb0fd2a6
3 changed files with 436 additions and 291 deletions

View File

@@ -1,3 +1,5 @@
process.env.NODE_ENV = 'test';
var fs = require('fs');
var assert = require('assert');
var MBTiles = require('..');
@@ -60,27 +62,30 @@ exports['get tiles'] = function(beforeExit) {
error: 0
};
var mbtiles = new MBTiles(fixtures.plain_1);
fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) {
var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/);
if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, tile) {
if (err) throw err;
assert.deepEqual(tile, fs.readFileSync(__dirname + '/fixtures/images/' + file));
status.success++;
});
}
new MBTiles(fixtures.plain_1, function(err, mbtiles) {
if (err) throw err;
fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) {
var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/);
if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, tile) {
if (err) throw err;
assert.deepEqual(tile, fs.readFileSync(__dirname + '/fixtures/images/' + file));
status.success++;
});
}
});
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, 1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, -1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 3, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 262140, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 15, yieldsError(status, 'error', 'Tile does not exist'));
});
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, 1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, -1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 3, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 262140, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 15, yieldsError(status, 'error', 'Tile does not exist'));
beforeExit(function() {
assert.equal(status.success, 285);
@@ -94,27 +99,30 @@ exports['get grids'] = function(beforeExit) {
error: 0
};
var mbtiles = new MBTiles(fixtures.plain_2);
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
if (err) throw err;
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
status.success++;
});
}
new MBTiles(fixtures.plain_2, function(err, mbtiles) {
if (err) throw err;
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
if (err) throw err;
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
status.success++;
});
}
});
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist'));
});
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist'));
beforeExit(function() {
assert.equal(status.success, 241);
@@ -129,21 +137,23 @@ exports['get grids from file without interaction'] = function(beforeExit) {
error: 0
};
var mbtiles = new MBTiles(fixtures.plain_1);
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid does not exist'));
new MBTiles(fixtures.plain_1, function(err, mbtiles) {
if (err) throw err;
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid does not exist'));
});
beforeExit(function() {
assert.equal(status.success, 0);
@@ -157,27 +167,29 @@ exports['get grids with different schema'] = function(beforeExit) {
error: 0
};
var mbtiles = new MBTiles(fixtures.plain_4);
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
if (err) throw err;
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
status.success++;
});
}
});
new MBTiles(fixtures.plain_4, function(err, mbtiles) {
if (err) throw err;
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
if (err) throw err;
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
status.success++;
});
}
});
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist'));
});
beforeExit(function() {
assert.equal(status.success, 241);
@@ -192,21 +204,23 @@ exports['get grids from file without interaction'] = function(beforeExit) {
error: 0
};
var mbtiles = new MBTiles(fixtures.plain_1);
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid does not exist'));
new MBTiles(fixtures.plain_1, function(err, mbtiles) {
if (err) throw err;
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid does not exist'));
});
beforeExit(function() {
assert.equal(status.success, 0);
@@ -220,21 +234,23 @@ exports['get tiles from non-existent file'] = function(beforeExit) {
error: 0
};
var mbtiles = new MBTiles(fixtures.non_existent);
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 3, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 3, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 4, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 5, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 13, 4, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 14, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 0, 7, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 6, 2, yieldsError(status, 'error', 'Tile does not exist'));
new MBTiles(fixtures.non_existent, function(err, mbtiles) {
if (err) throw err;
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 3, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 3, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 4, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 5, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 13, 4, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 14, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 0, 7, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 6, 2, yieldsError(status, 'error', 'Tile does not exist'));
});
beforeExit(function() {
assert.equal(status.success, 0);

View File

@@ -1,3 +1,5 @@
process.env.NODE_ENV = 'test';
var fs = require('fs');
var assert = require('assert');
var MBTiles = require('..');
@@ -5,19 +7,69 @@ var MBTiles = require('..');
var fixtureDir = __dirname + '/fixtures/output';
// Recreate output directory to remove previous tests.
try { fs.unlinkSync(fixtureDir + '/test_1.mbtiles'); } catch(err) {}
try { fs.unlinkSync(fixtureDir + '/write_1.mbtiles'); } catch(err) {}
try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {}
exports['test mbtiles file creation'] = function(beforeExit) {
var completed = {};
new MBTiles(fixtureDir + '/test_1.mbtiles', function(err, mbtiles) {
var completed = { written: 0, read: 0 };
new MBTiles(fixtureDir + '/write_1.mbtiles', function(err, mbtiles) {
completed.open = true;
if (err) throw err;
mbtiles.startWriting(function(err) {
completed.started = true;
if (err) throw err;
fs.readdirSync(__dirname + '/fixtures/images/').forEach(insertTile);
});
function insertTile(file) {
var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/);
if (!coords) return;
// Flip Y coordinate because file names are TMS, but .putTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
fs.readFile(__dirname + '/fixtures/images/' + file, function(err, tile) {
if (err) throw err;
mbtiles.putTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, tile, function(err) {
if (err) throw err;
completed.written++;
if (completed.written === 285) {
mbtiles.stopWriting(function(err) {
completed.stopped = true;
if (err) throw err;
verifyWritten();
});
}
});
});
}
function verifyWritten() {
fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) {
var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/);
if (coords) {
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
mbtiles.getTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, tile) {
if (err) throw err;
assert.deepEqual(tile, fs.readFileSync(__dirname + '/fixtures/images/' + file));
completed.read++;
});
}
});
}
});
beforeExit(function() {
assert.deepEqual({
open: true
open: true,
started: true,
written: 285,
read: 285,
stopped: true
}, completed);
})
};