ashatora/node-mbtiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first shot at putTile

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
lib/mbtiles.js
+261 -184
View File
@@ -8,6 +8,8 @@ var _ = require('underscore'),
sm = new (require('sphericalmercator')), sm = new (require('sphericalmercator')),
sqlite3 = require('sqlite3'); sqlite3 = require('sqlite3');
if (process.env.NODE_ENV === 'test') sqlite3.verbose();
function noop(err) { function noop(err) {
if (err) throw err; if (err) throw err;
} }
@@ -31,27 +33,24 @@ function MBTiles(uri, callback) {
this.filename = uri.pathname; this.filename = uri.pathname;
Step(function() { Step(function() {
mbtiles._db = new sqlite3.cached.Database(mbtiles.filename, this) mbtiles._db = new sqlite3.cached.Database(mbtiles.filename, this)
}, function(err) {
if (err) return callback(err);
mbtiles._setup(this);
}, function(err) { }, function(err) {
if (err) return callback(err); if (err) return callback(err);
fs.stat(mbtiles.filename, this); fs.stat(mbtiles.filename, this);
}, function(err, stat) { }, function(err, stat) {
if (err) return callback(err); if (err) return callback(err);
mbtiles._stat = stat; mbtiles._stat = stat;
mbtiles._exists('map', this); mbtiles.open = true;
}, function(err, exists) { return callback(null, mbtiles);
if (err) return callback(err);
else if (!exists) mbtiles._setup(this);
else this(null);
}, function(err) {
if (err) callback(err);
callback(null, mbtiles);
}); });
return undefined;
}; };
// Finds all mbtiles file in the filepath and returns their tilesource URI. // Finds all mbtiles file in the filepath and returns their tilesource URI.
MBTiles.list = function(filepath, callback) { MBTiles.list = function(filepath, callback) {
if (typeof callback !== 'function') callback = noop;
filepath = path.resolve(filepath); filepath = path.resolve(filepath);
fs.readdir(filepath, function(err, files) { fs.readdir(filepath, function(err, files) {
if (err) return callback(err); if (err) return callback(err);
@@ -59,20 +58,18 @@ MBTiles.list = function(filepath, callback) {
var name = files[i].match(/^([\w-]+)\.mbtiles$/); var name = files[i].match(/^([\w-]+)\.mbtiles$/);
if (name) result[name[1]] = 'mbtiles://' + path.join(filepath, name[0]); if (name) result[name[1]] = 'mbtiles://' + path.join(filepath, name[0]);
} }
callback(null, result); return callback(null, result);
}); });
}; };
// Finds an mbtiles file with the given ID in the filepath and returns a // Finds an mbtiles file with the given ID in the filepath and returns a
// tilesource URI. // tilesource URI.
MBTiles.findID = function(filepath, id, callback) { MBTiles.findID = function(filepath, id, callback) {
if (typeof callback !== 'function') callback = noop;
filepath = path.resolve(filepath); filepath = path.resolve(filepath);
var file = path.join(filepath, id + '.mbtiles'); var file = path.join(filepath, id + '.mbtiles');
fs.stat(file, function(err, stats) { fs.stat(file, function(err, stats) {
if (err) callback(err); if (err) return callback(err);
else callback(null, 'mbtiles://' + file); else return callback(null, 'mbtiles://' + file);
}); });
}; };
@@ -104,178 +101,175 @@ MBTiles.prototype._integrity = function(callback) {
this._db.get('PRAGMA quick_check(1)', function(err, row) { this._db.get('PRAGMA quick_check(1)', function(err, row) {
if (!(row && row.integrity_check && row.integrity_check === 'ok')) { if (!(row && row.integrity_check && row.integrity_check === 'ok')) {
callback(new Error('Corrupted database.')); return callback(new Error('Corrupted database.'));
} else { } else {
callback(null, true); return callback(null, true);
} }
}); });
}; };
// Setup schema, indices, views for a new mbtiles database. // Setup schema, indices, views for a new mbtiles database.
// Sets the synchronous flag to OFF for (much) faster inserts.
// See http://www.sqlite3.org/pragma.html#pragma_synchronous
MBTiles.prototype._setup = function(callback) { MBTiles.prototype._setup = function(callback) {
if (typeof callback !== 'function') callback = noop; var mbtiles = this;
mbtiles._exists('tiles', function(err, exists) {
fs.readFile(__dirname + '/schema.sql', 'utf8', function(err, sql) { if (exists) return callback(null);
if (err) return callback(err); fs.readFile(__dirname + '/schema.sql', 'utf8', function(err, sql) {
this._db.serialize(function() { if (err) return callback(err);
this._db.run('PRAGMA synchronous = 0'); mbtiles._db.exec(sql, callback);
this._db.exec(sql, callback); });
}.bind(this));
}.bind(this));
};
// Generic object insert.
//
// - `table` String. The table to which objects should be inserted.
// - `objects` Array. Objects to be inserted, where each object attribute
// has key/value pairs as a hash corresponding to column name and row value.
// - `callback` Function.
MBTiles.prototype._insert = function(table, objects, callback) {
if (typeof callback !== 'function') callback = noop;
if (!objects.length) return callback(null);
var keys = _(objects[0]).keys();
var placeholders = [];
_(keys).each(function(k) { placeholders.push('?'); });
var stmt = this._db.prepare(
'INSERT OR IGNORE INTO ' + table + ' ' +
'(' + keys.join(',') + ') ' +
'VALUES (' + placeholders.join(',') + ')'
);
for (var i = 0; i < objects.length; i++) {
stmt.run.apply(stmt, _(objects[i]).values());
}
stmt.finalize(callback);
};
// Insert metadata into the mbtiles database.
//
// - @param {Object} metadata key, value hash of metadata to be inserted.
// - @param {Function} callback
MBTiles.prototype._insertMetadata = function(data, callback) {
if (typeof callback !== 'function') callback = noop;
var metadata = _(data).map(function(value, key) {
return { name: key, value: value};
}); });
this._insert('metadata', metadata, callback);
}; };
// Insert a set of tiles into an mbtiles database. Scheme is TMS. // // Generic object insert.
// //
// // - `table` String. The table to which objects should be inserted.
// // - `objects` Array. Objects to be inserted, where each object attribute
// // has key/value pairs as a hash corresponding to column name and row value.
// // - `callback` Function.
// MBTiles.prototype._insert = function(table, objects, callback) {
// if (typeof callback !== 'function') callback = noop;
// //
// - @param {Array} renders array of images to be inserted. Each item should // if (!objects.length) return callback(null);
// be an object of the form { z: z, x: x, y: y, data: [Image buffer] }. // var keys = _(objects[0]).keys();
// - @param {Function} callback // var placeholders = [];
MBTiles.prototype._insertTiles = function(data, callback) { // _(keys).each(function(k) { placeholders.push('?'); });
var that = this, // var stmt = this._db.prepare(
map = [], // 'INSERT OR IGNORE INTO ' + table + ' ' +
images = [], // '(' + keys.join(',') + ') ' +
ids = []; // 'VALUES (' + placeholders.join(',') + ')'
for (var i = 0; i < data.length; i++) { // );
var tile_id = crypto // for (var i = 0; i < objects.length; i++) {
.createHash('md5') // stmt.run.apply(stmt, _(objects[i]).values());
.update(data[i].data) // }
.digest('hex'); // stmt.finalize(callback);
!_(ids).include(tile_id) && ids.push(tile_id) && images.push({ // };
tile_id: tile_id,
tile_data: data[i].data
});
map.push({
tile_id: tile_id,
zoom_level: data[i].z,
tile_column: data[i].x,
tile_row: data[i].y
});
}
Step(
function() {
var group = this.group();
that._insert('images', images, group());
that._insert('map', map, group());
},
callback
);
};
// Insert a set of grids into an mbtiles database.
// //
// - @param {Array} renders array of grids to be inserted. Each item should // // Insert metadata into the mbtiles database.
// be an object of the form { z: z, x: x, y: y, data: [Image buffer], keys: [] }. // //
// - @param {Function} callback // // - @param {Object} metadata key, value hash of metadata to be inserted.
MBTiles.prototype._insertGrids = function(data, callback) { // // - @param {Function} callback
if (typeof callback !== 'function') callback = noop; // MBTiles.prototype._insertMetadata = function(data, callback) {
// if (typeof callback !== 'function') callback = noop;
var that = this,
map = [],
grids = [],
grid_keys = [],
features = {},
ids = [];
for (var i = 0; i < data.length; i++) {
var json = JSON.stringify({
grid: data[i].grid,
keys: data[i].keys
});
var grid_id = crypto
.createHash('md5')
.update(json)
.digest('hex');
!_(ids).include(grid_id) && ids.push(grid_id) && grids.push({
grid_id: grid_id,
grid_utfgrid: zlib.deflate(new Buffer(json, 'utf8'))
});
data[i].keys.forEach(function(k) {
grid_keys.push({
grid_id: grid_id,
key_name: k
});
});
map.push({
grid_id: grid_id,
zoom_level: data[i].z,
tile_column: data[i].x,
tile_row: data[i].y
});
_(features).extend(data[i].data);
}
features = _(features).map(function(value, key) {
return { key_name: key, key_json: JSON.stringify(value) };
});
Step(
function() {
var group = this.group();
that._insert('grid_utfgrid', grids, group());
that._insert('grid_key', grid_keys, group());
that._insert('keymap', features, group());
that._insertGridTiles(map, group());
},
callback
);
};
// Insert grids into the mbtiles database.
// //
// - @param {Object} tile tile object to be inserted. // var metadata = _(data).map(function(value, key) {
// - @param {Function} callback // return { name: key, value: value};
MBTiles.prototype._insertGridTiles = function(map, callback) { // });
if (typeof callback !== 'function') callback = noop; // this._insert('metadata', metadata, callback);
// };
var stmt = this._db.prepare('UPDATE OR REPLACE map SET grid_id = ? WHERE ' + //
' zoom_level = ? AND tile_column = ? AND tile_row = ?'); // // Insert a set of tiles into an mbtiles database. Scheme is TMS.
// //
for (var i = 0; i < map.length; i++) { // // - @param {Array} renders array of images to be inserted. Each item should
stmt.run( // // be an object of the form { z: z, x: x, y: y, data: [Image buffer] }.
map[i].grid_id, // // - @param {Function} callback
map[i].zoom_level, // MBTiles.prototype._insertTiles = function(data, callback) {
map[i].tile_column, // var that = this,
map[i].tile_row // map = [],
); // images = [],
} // ids = [];
// for (var i = 0; i < data.length; i++) {
stmt.finalize(callback); // var tile_id = crypto
}; // .createHash('md5')
// .update(data[i].data)
// .digest('hex');
// !_(ids).include(tile_id) && ids.push(tile_id) && images.push({
// tile_id: tile_id,
// tile_data: data[i].data
// });
// map.push({
// tile_id: tile_id,
// zoom_level: data[i].z,
// tile_column: data[i].x,
// tile_row: data[i].y
// });
// }
// Step(
// function() {
// var group = this.group();
// that._insert('images', images, group());
// that._insert('map', map, group());
// },
// callback
// );
// };
//
// // Insert a set of grids into an mbtiles database.
// //
// // - @param {Array} renders array of grids to be inserted. Each item should
// // be an object of the form { z: z, x: x, y: y, data: [Image buffer], keys: [] }.
// // - @param {Function} callback
// MBTiles.prototype._insertGrids = function(data, callback) {
// if (typeof callback !== 'function') callback = noop;
//
// var that = this,
// map = [],
// grids = [],
// grid_keys = [],
// features = {},
// ids = [];
// for (var i = 0; i < data.length; i++) {
// var json = JSON.stringify({
// grid: data[i].grid,
// keys: data[i].keys
// });
// var grid_id = crypto
// .createHash('md5')
// .update(json)
// .digest('hex');
// !_(ids).include(grid_id) && ids.push(grid_id) && grids.push({
// grid_id: grid_id,
// grid_utfgrid: zlib.deflate(new Buffer(json, 'utf8'))
// });
// data[i].keys.forEach(function(k) {
// grid_keys.push({
// grid_id: grid_id,
// key_name: k
// });
// });
// map.push({
// grid_id: grid_id,
// zoom_level: data[i].z,
// tile_column: data[i].x,
// tile_row: data[i].y
// });
// _(features).extend(data[i].data);
// }
// features = _(features).map(function(value, key) {
// return { key_name: key, key_json: JSON.stringify(value) };
// });
// Step(
// function() {
// var group = this.group();
// that._insert('grid_utfgrid', grids, group());
// that._insert('grid_key', grid_keys, group());
// that._insert('keymap', features, group());
// that._insertGridTiles(map, group());
// },
// callback
// );
// };
//
// // Insert grids into the mbtiles database.
// //
// // - @param {Object} tile tile object to be inserted.
// // - @param {Function} callback
// MBTiles.prototype._insertGridTiles = function(map, callback) {
// if (typeof callback !== 'function') callback = noop;
//
// var stmt = this._db.prepare('UPDATE OR REPLACE map SET grid_id = ? WHERE ' +
// ' zoom_level = ? AND tile_column = ? AND tile_row = ?');
//
// for (var i = 0; i < map.length; i++) {
// stmt.run(
// map[i].grid_id,
// map[i].zoom_level,
// map[i].tile_column,
// map[i].tile_row
// );
// }
//
// stmt.finalize(callback);
// };
// Select a tile from an mbtiles database. Scheme is XYZ. // Select a tile from an mbtiles database. Scheme is XYZ.
// //
@@ -284,7 +278,8 @@ MBTiles.prototype._insertGridTiles = function(map, callback) {
// - @param {Number} z tile z coordinate. // - @param {Number} z tile z coordinate.
// - @param {Function} callback // - @param {Function} callback
MBTiles.prototype.getTile = function(z, x, y, callback) { MBTiles.prototype.getTile = function(z, x, y, callback) {
if (typeof callback !== 'function') callback = noop; if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
// Flip Y coordinate because MBTiles files are TMS. // Flip Y coordinate because MBTiles files are TMS.
y = Math.pow(2, z) - 1 - y; y = Math.pow(2, z) - 1 - y;
@@ -316,7 +311,8 @@ MBTiles.prototype.getTile = function(z, x, y, callback) {
// - @param {Number} z tile z coordinate // - @param {Number} z tile z coordinate
// - @param {Function} callback // - @param {Function} callback
MBTiles.prototype.getGrid = function(z, x, y, callback) { MBTiles.prototype.getGrid = function(z, x, y, callback) {
if (typeof callback !== 'function') callback = noop; if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
// Flip Y coordinate because MBTiles files are TMS. // Flip Y coordinate because MBTiles files are TMS.
y = Math.pow(2, z) - 1 - y; y = Math.pow(2, z) - 1 - y;
@@ -353,7 +349,7 @@ MBTiles.prototype.getGrid = function(z, x, y, callback) {
}, {}); }, {});
var result = _(JSON.parse(grid)).extend({ data: data }); var result = _(JSON.parse(grid)).extend({ data: data });
} catch (err) { } catch (err) {
callback(new Error('Grid is invalid')); return callback(new Error('Grid is invalid'));
} }
callback(null, result); callback(null, result);
@@ -370,9 +366,9 @@ MBTiles.prototype._metadata = function(key, callback) {
this._db.get('SELECT value FROM metadata WHERE name = ?', this._db.get('SELECT value FROM metadata WHERE name = ?',
key, key,
function(err, row) { function(err, row) {
if (!row || (err && err.errno == 1)) callback(new Error('Key does not exist')); if (!row || (err && err.errno == 1)) return callback(new Error('Key does not exist'));
else if (err) callback(err); else if (err) return callback(err);
else callback(null, row.value); else return callback(null, row.value);
}); });
}; };
@@ -380,7 +376,8 @@ MBTiles.prototype._metadata = function(key, callback) {
// performing fallback queries if certain keys (like `bounds`, `minzoom`, // performing fallback queries if certain keys (like `bounds`, `minzoom`,
// `maxzoom`) have not been provided. // `maxzoom`) have not been provided.
MBTiles.prototype.getInfo = function(callback) { MBTiles.prototype.getInfo = function(callback) {
if (typeof callback !== 'function') callback = noop; if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
var that = this; var that = this;
var info = {}; var info = {};
@@ -481,18 +478,98 @@ MBTiles.prototype.getInfo = function(callback) {
(info.bounds[3] - info.bounds[1]) / 2 + info.bounds[1], (info.bounds[3] - info.bounds[1]) / 2 + info.bounds[1],
(range <= 1) ? info.maxzoom : Math.floor(range * 0.5) + info.minzoom (range <= 1) ? info.maxzoom : Math.floor(range * 0.5) + info.minzoom
]; ];
callback(null, info); return callback(null, info);
});
};
MBTiles.prototype.startWriting = function(callback) {
if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
// Sets the synchronous flag to OFF for (much) faster inserts.
// See http://www.sqlite3.org/pragma.html#pragma_synchronous
var mbtiles = this;
if (!this._isWritable) {
this._isWritable = 1;
this._tileCache = [];
this._gridCache = [];
this._db.run('PRAGMA synchronous=OFF', callback);
} else {
this._isWritable++;
return callback(null);
}
};
MBTiles.prototype._commit = function(callback) {
var mbtiles = this;
this._db.serialize(function() {
mbtiles._db.run('BEGIN');
var tile_data = mbtiles._db.prepare('REPLACE INTO images (tile_id, tile_data) VALUES (?, ?)');
var tile_map = mbtiles._db.prepare('REPLACE INTO map (zoom_level, ' +
'tile_column, tile_row, tile_id, grid_id) VALUES (?, ?, ?, ?, ' +
'(SELECT grid_id FROM map WHERE zoom_level = ? ' +
'AND tile_column = ? AND tile_row = ?))');
mbtiles._tileCache.forEach(function(row) {
var id = crypto.createHash('md5').update(row[3]).digest('hex');
tile_data.run(id, row[3]);
tile_map.run(row[0], row[1], row[2], id, row[0], row[1], row[2]);
});
tile_data.finalize();
tile_map.finalize();
mbtiles._db.run('COMMIT', callback);
});
};
MBTiles.prototype.stopWriting = function(callback) {
if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
var mbtiles = this;
if (this._isWritable) this._isWritable--;
this._commit(function(err) {
if (err) return callback(err);
if (!mbtiles._isWritable) {
mbtiles._db.run('PRAGMA synchronous=NORMAL', callback);
} else {
return callback(null);
}
}); });
}; };
// Insert a tile. Scheme is XYZ. // Insert a tile. Scheme is XYZ.
MBTiles.prototype.putTile = function(z, x, y, data, callback) { MBTiles.prototype.putTile = function(z, x, y, data, callback) {
if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
if (!this._isWritable) return callback(new Error('MBTiles not in write mode'));
// Flip Y coordinate because MBTiles files are TMS. // Flip Y coordinate because MBTiles files are TMS.
y = Math.pow(2, z) - 1 - y; y = Math.pow(2, z) - 1 - y;
this.run('INSERT INGORE INTO ') this._tileCache.push([ z, x, y, data ]);
this._insertTiles([ { z: z, x: x, y: y, data: data }], callback); if (this._tileCache.length + this._gridCache.length >= 100) {
this._commit(callback);
} else {
return callback(null);
}
}; };
// Insert a tile. Scheme is XYZ.
MBTiles.prototype.putGrid = function(z, x, y, data, callback) {
if (typeof callback !== 'function') throw new Error('Callback needed');
if (!this.open) return callback(new Error('MBTiles not yet loaded'));
// Flip Y coordinate because MBTiles files are TMS.
y = Math.pow(2, z) - 1 - y;
this._tileCache.push([ z, x, y, data ]);
if (this._tileCache.length + this._gridCache.length >= 100) {
this._commit(callback);
} else {
return callback(null);
}
};
test/read.test.js
+119 -103
View File
@@ -1,3 +1,5 @@
process.env.NODE_ENV = 'test';
var fs = require('fs'); var fs = require('fs');
var assert = require('assert'); var assert = require('assert');
var MBTiles = require('..'); var MBTiles = require('..');
@@ -60,27 +62,30 @@ exports['get tiles'] = function(beforeExit) {
error: 0 error: 0
}; };
var mbtiles = new MBTiles(fixtures.plain_1); new MBTiles(fixtures.plain_1, function(err, mbtiles) {
fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) { if (err) throw err;
var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/); fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) {
if (coords) { var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/);
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ. if (coords) {
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2]; // Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
mbtiles.getTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, tile) { coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
if (err) throw err; mbtiles.getTile(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, tile) {
assert.deepEqual(tile, fs.readFileSync(__dirname + '/fixtures/images/' + file)); if (err) throw err;
status.success++; 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() { beforeExit(function() {
assert.equal(status.success, 285); assert.equal(status.success, 285);
@@ -94,27 +99,30 @@ exports['get grids'] = function(beforeExit) {
error: 0 error: 0
}; };
var mbtiles = new MBTiles(fixtures.plain_2); new MBTiles(fixtures.plain_2, function(err, mbtiles) {
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) { if (err) throw err;
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/); fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
if (coords) { var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ. if (coords) {
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2]; // Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) { coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
if (err) throw err; mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8')); if (err) throw err;
status.success++; 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() { beforeExit(function() {
assert.equal(status.success, 241); assert.equal(status.success, 241);
@@ -129,21 +137,23 @@ exports['get grids from file without interaction'] = function(beforeExit) {
error: 0 error: 0
}; };
var mbtiles = new MBTiles(fixtures.plain_1); new MBTiles(fixtures.plain_1, function(err, mbtiles) {
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); if (err) throw err;
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, 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() { beforeExit(function() {
assert.equal(status.success, 0); assert.equal(status.success, 0);
@@ -157,27 +167,29 @@ exports['get grids with different schema'] = function(beforeExit) {
error: 0 error: 0
}; };
var mbtiles = new MBTiles(fixtures.plain_4); new MBTiles(fixtures.plain_4, function(err, mbtiles) {
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) { if (err) throw err;
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/); fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
if (coords) { var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
// Flip Y coordinate because file names are TMS, but .getTile() expects XYZ. if (coords) {
coords[2] = Math.pow(2, coords[3]) - 1 - coords[2]; // Flip Y coordinate because file names are TMS, but .getTile() expects XYZ.
mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) { coords[2] = Math.pow(2, coords[3]) - 1 - coords[2];
if (err) throw err; mbtiles.getGrid(coords[3] | 0, coords[1] | 0, coords[2] | 0, function(err, grid) {
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8')); if (err) throw err;
status.success++; 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(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 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(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, -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(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 262140, 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(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist'));
});
beforeExit(function() { beforeExit(function() {
assert.equal(status.success, 241); assert.equal(status.success, 241);
@@ -192,21 +204,23 @@ exports['get grids from file without interaction'] = function(beforeExit) {
error: 0 error: 0
}; };
var mbtiles = new MBTiles(fixtures.plain_1); new MBTiles(fixtures.plain_1, function(err, mbtiles) {
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); if (err) throw err;
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, 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() { beforeExit(function() {
assert.equal(status.success, 0); assert.equal(status.success, 0);
@@ -220,21 +234,23 @@ exports['get tiles from non-existent file'] = function(beforeExit) {
error: 0 error: 0
}; };
var mbtiles = new MBTiles(fixtures.non_existent); new MBTiles(fixtures.non_existent, function(err, mbtiles) {
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist')); if (err) throw err;
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(3, 1, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 3, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(2, -3, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(18, 2, 3, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 3, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 4, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 3, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 5, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 4, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 13, 4, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 5, 8, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 14, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 13, 4, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 0, 7, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 0, 14, yieldsError(status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 6, 2, 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() { beforeExit(function() {
assert.equal(status.success, 0); assert.equal(status.success, 0);
test/write.test.js
+56 -4
View File
@@ -1,3 +1,5 @@
process.env.NODE_ENV = 'test';
var fs = require('fs'); var fs = require('fs');
var assert = require('assert'); var assert = require('assert');
var MBTiles = require('..'); var MBTiles = require('..');
@@ -5,19 +7,69 @@ var MBTiles = require('..');
var fixtureDir = __dirname + '/fixtures/output'; var fixtureDir = __dirname + '/fixtures/output';
// Recreate output directory to remove previous tests. // 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) {} try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {}
exports['test mbtiles file creation'] = function(beforeExit) { exports['test mbtiles file creation'] = function(beforeExit) {
var completed = {}; var completed = { written: 0, read: 0 };
new MBTiles(fixtureDir + '/test_1.mbtiles', function(err, mbtiles) { new MBTiles(fixtureDir + '/write_1.mbtiles', function(err, mbtiles) {
completed.open = true; completed.open = true;
if (err) throw err; 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() { beforeExit(function() {
assert.deepEqual({ assert.deepEqual({
open: true open: true,
started: true,
written: 285,
read: 285,
stopped: true
}, completed); }, completed);
}) })
}; };