Skip to content

Use 'xyz' as scheme in metadata #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jingsam merged 3 commits into from
May 9, 2019
Merged

Use 'xyz' as scheme in metadata #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be1519b
Use 'xyz' as scheme in metadata
hannesj Sep 28, 2016
c34f9c1
Update tests to match new metadata
hannesj Sep 28, 2016
af3818f
Override scheme from MBtiles metadata
hannesj Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/mbtiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ MBTiles.prototype.getInfo = function(callback) {

var mbtiles = this;
var info = {};
info.scheme = 'tms';
info.basename = path.basename(mbtiles.filename);
info.id = path.basename(mbtiles.filename, path.extname(mbtiles.filename));
info.filesize = mbtiles._stat.size;
Expand Down Expand Up @@ -257,6 +256,10 @@ MBTiles.prototype.getInfo = function(callback) {
break;
}
});

// Guarantee that we always return proper schema type, even if 'tms' is specified in metadata
info.scheme = 'xyz';

ensureZooms(info, function(err, info) {
if (err) return callback(err);
ensureBounds(info, function(err, info) {
Expand Down
6 changes: 3 additions & 3 deletions test/info.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tape('get metadata', function(assert) {
name: 'plain_1',
description: 'demo description',
version: '1.0.3',
scheme: 'tms',
scheme: 'xyz',
minzoom: 0,
maxzoom: 4,
formatter: null,
Expand Down Expand Up @@ -57,7 +57,7 @@ tape('get/put metadata from empty file', function(assert) {
basename: "empty.mbtiles",
filesize: 0,
id: "empty",
scheme: "tms"
scheme: "xyz"
}, data);

mbtiles.putInfo(info, function(err) {
Expand All @@ -80,7 +80,7 @@ tape('get/put metadata from empty file', function(assert) {
basename: "empty.mbtiles",
filesize: 0,
id: "empty",
scheme: "tms",
scheme: "xyz",
version: "1.0.0",
level1: { level2: "property" },
custom: [ 'custom list' ]
Expand Down