ashatora/tileserver-gl
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'klokantech/master' into public_url

Browse Source 
# Conflicts:
#	src/main.js
#	src/server.js
This commit is contained in:
Alban Mouton
2018-12-19 09:53:40 +01:00
parent dc6be5047c 243bdbdaa0
commit c99a1a5425
22 changed files with 1297 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/setup.js
View File

@@ -18,5 +18,5 @@ before(function() {
after(function() {
console.log('global teardown');
global.server.close(function() { console.log('Done'); });
global.server.close(function() { console.log('Done'); process.exit(); });
});

2
test/tiles_data.js
View File

@@ -23,6 +23,6 @@ describe('Vector tiles', function() {
testTile(prefix, 0, 1, 0, 404);
testTile(prefix, 0, 0, 1, 404);
testTile(prefix, 14, 0, 0, 404); // non existent tile
testTile(prefix, 14, 0, 0, 204); // non existent tile
});
});