Compare commits

...

16 Commits

Author SHA1 Message Date
Petr Pridal
ffc72789ae Update version to 0.9.0 2016-07-28 11:22:50 +02:00
Dalibor Janák
4fc76251c3 Responsive CSS for the web page - fixes (closes #33) 2016-07-27 17:56:54 +02:00
Dalibor Janák
b048990e14 Responsive CSS for the web page #33 2016-07-27 14:05:33 +02:00
Petr Sloup
b257855e38 Update version to 0.8.3 2016-07-27 12:33:19 +08:00
Petr Sloup
fb758be730 Update tests to use v0.8 dataset 2016-07-27 12:32:53 +08:00
Petr Sloup
7accdfa7da Very early CPU-cheap 304 based solely on last-modified 2016-07-27 12:31:47 +08:00
Petr Sloup
7efe22cf7f Minor typo fix 2016-07-26 19:02:44 +07:00
Petr Sloup
5a20bf4fac Update version to 0.8.2 2016-07-26 18:57:39 +07:00
Petr Sloup
a0fbf7fb79 Fix font compositing (close #32) 2016-07-26 18:56:32 +07:00
Petr Sloup
ed0af943da New design (close #31) 2016-07-26 17:27:08 +07:00
Petr Sloup
e4ce4877b6 Update version to 0.8.1 2016-07-26 10:43:33 +08:00
Petr Sloup
a0a086e95a Update dependencies 2016-07-26 10:43:33 +08:00
Petr Sloup
dbaca66b2c Add `Last-Modified' headers to improve caching 2016-07-26 10:43:33 +08:00
Petr Sloup
d465142275 Merge pull request #28 from stirringhalo/master
Avoid curl | bash
2016-07-22 19:02:22 +08:00
stirringhalo
7f06f09696 Duplicate nodejs install 2016-07-20 15:18:58 -04:00
stirringhalo
f5c5570fca Avoid curl | bash 2016-07-18 18:42:09 -04:00
25 changed files with 373 additions and 206 deletions

View File

@@ -15,7 +15,7 @@ before_install:
- sudo apt-get install -qq xvfb - sudo apt-get install -qq xvfb
install: install:
- npm install - npm install
- wget -O test_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.0.3.zip - wget -O test_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.8.zip
- unzip -q test_data.zip -d tmp_test_data - unzip -q test_data.zip -d tmp_test_data
- mkdir test_data - mkdir test_data
- mv tmp_test_data/tileserver-gl-data-*/* -t test_data - mv tmp_test_data/tileserver-gl-data-*/* -t test_data

View File

@@ -3,14 +3,19 @@ MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
RUN apt-get -qq update \ RUN apt-get -qq update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install \ && DEBIAN_FRONTEND=noninteractive apt-get -y install \
apt-transport-https \
curl \ curl \
unzip \ unzip \
build-essential \ build-essential \
python \ python \
libcairo2-dev \ libcairo2-dev \
xvfb \ xvfb \
&& curl -sL https://deb.nodesource.com/setup_4.x | bash - \ && echo "deb https://deb.nodesource.com/node_4.x jessie main" >> /etc/apt/sources.list.d/nodejs.list \
&& apt-get -y install nodejs \ && echo "deb-src https://deb.nodesource.com/node_4.x jessie main" >> /etc/apt/sources.list.d/nodejs.list \
&& apt-get -qq update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated install \
nodejs \
&& rm /etc/apt/sources.list.d/nodejs.list \
&& apt-get clean && apt-get clean
RUN mkdir -p /usr/src/app RUN mkdir -p /usr/src/app

View File

@@ -1,6 +1,6 @@
{ {
"name": "tileserver-gl", "name": "tileserver-gl",
"version": "0.8.0", "version": "0.9.0",
"description": "Map tile server for JSON GL styles - serverside generated raster tiles", "description": "Map tile server for JSON GL styles - serverside generated raster tiles",
"main": "src/main.js", "main": "src/main.js",
"bin": "src/main.js", "bin": "src/main.js",
@@ -16,25 +16,26 @@
"test": "mocha test/**.js" "test": "mocha test/**.js"
}, },
"dependencies": { "dependencies": {
"async": "1.5.2", "async": "2.0.1",
"advanced-pool": "0.3.2", "advanced-pool": "0.3.2",
"base64url": "1.0.6", "base64url": "2.0.0",
"canvas": "1.4.0", "canvas": "1.4.0",
"clone": "1.0.2", "clone": "1.0.2",
"color": "0.11.3", "color": "0.11.3",
"cors": "2.7.1", "cors": "2.7.1",
"express": "4.14.0", "express": "4.14.0",
"glyph-pbf-composite": "0.0.2",
"handlebars": "4.0.5", "handlebars": "4.0.5",
"mapbox-gl-native": "3.2.1", "mapbox-gl-native": "3.2.1",
"mbtiles": "0.9.0", "mbtiles": "0.9.0",
"morgan": "1.7.0", "morgan": "1.7.0",
"nomnom": "1.8.1", "nomnom": "1.8.1",
"request": "2.73.0", "request": "2.74.0",
"sharp": "0.15.1", "sharp": "0.15.1",
"sphericalmercator": "1.0.5" "sphericalmercator": "1.0.5"
}, },
"devDependencies": { "devDependencies": {
"should": "^9.0.0", "should": "^10.0.0",
"mocha": "^2.5.0", "mocha": "^2.5.0",
"supertest": "^1.2.0" "supertest": "^1.2.0"
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

File diff suppressed because one or more lines are too long

View File

@@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{name}} - TileServer GL</title> <title>{{name}} - TileServer GL</title>
{{#is_vector}} {{#is_vector}}
<link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" /> <link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" />

File diff suppressed because one or more lines are too long

View File

@@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{name}} - TileServer GL</title> <title>{{name}} - TileServer GL</title>
<link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" /> <link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" />
<script src="/mapbox-gl.js{{&key_query}}"></script> <script src="/mapbox-gl.js{{&key_query}}"></script>

View File

@@ -1,56 +1,29 @@
'use strict'; 'use strict';
var async = require('async'),
path = require('path'),
fs = require('fs');
var clone = require('clone'), var clone = require('clone'),
express = require('express'); express = require('express');
var utils = require('./utils');
module.exports = function(options, allowedFonts) { module.exports = function(options, allowedFonts) {
var app = express().disable('x-powered-by'); var app = express().disable('x-powered-by');
var fontPath = options.paths.fonts; var lastModified = new Date().toUTCString();
var getFontPbf = function(name, range, callback) { var fontPath = options.paths.fonts;
// if some of the files failed to load (does not exist or not allowed),
// return empty buffer so the other fonts can still work
if (allowedFonts[name]) {
var filename = path.join(fontPath, name, range + '.pbf');
return fs.readFile(filename, function(err, data) {
if (err) {
console.log('Font load error:', filename);
return callback(null, new Buffer([]));
} else {
return callback(null, data);
}
});
} else {
return callback(null, new Buffer([]));
}
};
app.get('/:fontstack/:range([\\d]+-[\\d]+).pbf', app.get('/:fontstack/:range([\\d]+-[\\d]+).pbf',
function(req, res, next) { function(req, res, next) {
var fontstack = decodeURI(req.params.fontstack); var fontstack = decodeURI(req.params.fontstack);
var range = req.params.range; var range = req.params.range;
var fonts = fontstack.split(','); return utils.getFontsPbf(allowedFonts, fontPath, fontstack, range,
function(err, concated) {
var queue = []; if (err || concated.length === 0) {
fonts.forEach(function(font) {
queue.push(function(callback) {
getFontPbf(font, range, callback);
});
});
return async.parallel(queue, function(err, results) {
var concated = Buffer.concat(results);
if (err || concated.length == 0) {
return res.status(400).send(''); return res.status(400).send('');
} else { } else {
res.header('Content-type', 'application/x-protobuf'); res.header('Content-type', 'application/x-protobuf');
res.header('Last-Modified', lastModified);
return res.send(concated); return res.send(concated);
} }
}); });

View File

@@ -38,6 +38,8 @@ mbgl.on('message', function(e) {
module.exports = function(options, repo, params, id) { module.exports = function(options, repo, params, id) {
var app = express().disable('x-powered-by'); var app = express().disable('x-powered-by');
var lastModified = new Date().toUTCString();
var rootPath = options.paths.root; var rootPath = options.paths.root;
var styleFile = params.style; var styleFile = params.style;
@@ -54,12 +56,20 @@ module.exports = function(options, repo, params, id) {
request: function(req, callback) { request: function(req, callback) {
var protocol = req.url.split(':')[0]; var protocol = req.url.split(':')[0];
//console.log('Handling request:', req); //console.log('Handling request:', req);
if (protocol == 'sprites' || protocol == 'fonts') { if (protocol == 'sprites') {
var dir = options.paths[protocol]; var dir = options.paths[protocol];
var file = unescape(req.url).substring(protocol.length + 3); var file = unescape(req.url).substring(protocol.length + 3);
fs.readFile(path.join(dir, file), function(err, data) { fs.readFile(path.join(dir, file), function(err, data) {
callback(err, { data: data }); callback(err, { data: data });
}); });
} else if (protocol == 'fonts') {
var parts = req.url.split('/');
var fontstack = unescape(parts[2]);
var range = parts[3].split('.')[0];
utils.getFontsPbf(null, options.paths[protocol], fontstack, range,
function(err, concated) {
callback(err, {data: concated});
});
} else if (protocol == 'mbtiles') { } else if (protocol == 'mbtiles') {
var parts = req.url.split('/'); var parts = req.url.split('/');
var source = map.sources[parts[2]]; var source = map.sources[parts[2]];
@@ -289,6 +299,7 @@ module.exports = function(options, repo, params, id) {
} }
res.set({ res.set({
'Last-Modified': lastModified,
'Content-Type': 'image/' + format 'Content-Type': 'image/' + format
}); });
return res.status(200).send(buffer); return res.status(200).send(buffer);
@@ -298,6 +309,13 @@ module.exports = function(options, repo, params, id) {
}; };
app.get(tilePattern, function(req, res, next) { app.get(tilePattern, function(req, res, next) {
var modifiedSince = req.get('if-modified-since'), cc = req.get('cache-control');
if (modifiedSince && (!cc || cc.indexOf('no-cache') == -1)) {
if (new Date(lastModified) <= new Date(modifiedSince)) {
return res.sendStatus(304);
}
}
var z = req.params.z | 0, var z = req.params.z | 0,
x = req.params.x | 0, x = req.params.x | 0,
y = req.params.y | 0, y = req.params.y | 0,

View File

@@ -1,5 +1,11 @@
'use strict'; 'use strict';
var async = require('async'),
path = require('path'),
fs = require('fs');
var glyphCompose = require('glyph-pbf-composite');
module.exports.getTileUrls = function(req, domains, path, format) { module.exports.getTileUrls = function(req, domains, path, format) {
if (domains) { if (domains) {
@@ -37,3 +43,36 @@ module.exports.fixTileJSONCenter = function(tileJSON) {
]; ];
} }
}; };
module.exports.getFontsPbf = function(allowedFonts, fontPath, names, range, callback) {
var getFontPbf = function(name, range, callback) {
if (!allowedFonts || allowedFonts[name]) {
var filename = path.join(fontPath, name, range + '.pbf');
return fs.readFile(filename, function(err, data) {
if (err) {
return callback(new Error('Font load error: ' + name));
} else {
return callback(null, data);
}
});
} else {
return callback(new Error('Font not allowed: ' + name));
}
};
var fonts = names.split(',');
var queue = [];
fonts.forEach(function(font) {
queue.push(function(callback) {
getFontPbf(font, range, callback);
});
});
return async.parallel(queue, function(err, results) {
if (err) {
callback(err, new Buffer([]));
} else {
callback(err, glyphCompose.combine(results));
}
});
};

View File

@@ -64,6 +64,6 @@ describe('Metadata', function() {
}); });
}); });
testTileJSON('/styles/test/rendered.json', 'test'); testTileJSON('/styles/bright/rendered.json', 'bright');
testTileJSON('/data/zurich-vector.json', 'zurich-vector'); testTileJSON('/data/zurich-vector.json', 'zurich-vector');
}); });

View File

@@ -12,88 +12,90 @@ var testStatic = function(prefix, q, format, status, scale, type, query) {
}); });
}; };
var prefix = 'bright';
describe('Static endpoints', function() { describe('Static endpoints', function() {
describe('center-based', function() { describe('center-based', function() {
describe('valid requests', function() { describe('valid requests', function() {
describe('various formats', function() { describe('various formats', function() {
testStatic('test', '0,0,0/256x256', 'png', 200, undefined, /image\/png/); testStatic(prefix, '0,0,0/256x256', 'png', 200, undefined, /image\/png/);
testStatic('test', '0,0,0/256x256', 'jpg', 200, undefined, /image\/jpeg/); testStatic(prefix, '0,0,0/256x256', 'jpg', 200, undefined, /image\/jpeg/);
testStatic('test', '0,0,0/256x256', 'jpeg', 200, undefined, /image\/jpeg/); testStatic(prefix, '0,0,0/256x256', 'jpeg', 200, undefined, /image\/jpeg/);
testStatic('test', '0,0,0/256x256', 'webp', 200, undefined, /image\/webp/); testStatic(prefix, '0,0,0/256x256', 'webp', 200, undefined, /image\/webp/);
}); });
describe('different parameters', function() { describe('different parameters', function() {
testStatic('test', '0,0,0/300x300', 'png', 200, 2); testStatic(prefix, '0,0,0/300x300', 'png', 200, 2);
testStatic('test', '0,0,0/300x300', 'png', 200, 3); testStatic(prefix, '0,0,0/300x300', 'png', 200, 3);
testStatic('test', '80,40,20/600x300', 'png', 200, 3); testStatic(prefix, '80,40,20/600x300', 'png', 200, 3);
testStatic('test', '8.5,40.5,20/300x150', 'png', 200, 3); testStatic(prefix, '8.5,40.5,20/300x150', 'png', 200, 3);
testStatic('test', '-8.5,-40.5,20/300x150', 'png', 200, 3); testStatic(prefix, '-8.5,-40.5,20/300x150', 'png', 200, 3);
testStatic('test', '8,40,2@0,0/300x150', 'png', 200); testStatic(prefix, '8,40,2@0,0/300x150', 'png', 200);
testStatic('test', '8,40,2@180,45/300x150', 'png', 200, 2); testStatic(prefix, '8,40,2@180,45/300x150', 'png', 200, 2);
testStatic('test', '8,40,2@10/300x150', 'png', 200, 3); testStatic(prefix, '8,40,2@10/300x150', 'png', 200, 3);
testStatic('test', '8,40,2@10.3,20.4/300x300', 'png', 200); testStatic(prefix, '8,40,2@10.3,20.4/300x300', 'png', 200);
testStatic('test', '0,0,2@390,120/300x300', 'png', 200); testStatic(prefix, '0,0,2@390,120/300x300', 'png', 200);
}); });
}); });
describe('invalid requests return 4xx', function() { describe('invalid requests return 4xx', function() {
testStatic('test', '190,0,0/256x256', 'png', 400); testStatic(prefix, '190,0,0/256x256', 'png', 400);
testStatic('test', '0,86,0/256x256', 'png', 400); testStatic(prefix, '0,86,0/256x256', 'png', 400);
testStatic('test', '80,40,20/0x0', 'png', 400); testStatic(prefix, '80,40,20/0x0', 'png', 400);
testStatic('test', '0,0,0/256x256', 'gif', 400); testStatic(prefix, '0,0,0/256x256', 'gif', 400);
testStatic('test', '0,0,0/256x256', 'png', 404, 1); testStatic(prefix, '0,0,0/256x256', 'png', 404, 1);
testStatic('test', '0,0,-1/256x256', 'png', 404); testStatic(prefix, '0,0,-1/256x256', 'png', 404);
testStatic('test', '0,0,1.5/256x256', 'png', 404); testStatic(prefix, '0,0,1.5/256x256', 'png', 404);
testStatic('test', '0,0,0/256.5x256.5', 'png', 404); testStatic(prefix, '0,0,0/256.5x256.5', 'png', 404);
testStatic('test', '0,0,0,/256x256', 'png', 404); testStatic(prefix, '0,0,0,/256x256', 'png', 404);
testStatic('test', '0,0,0,0,/256x256', 'png', 404); testStatic(prefix, '0,0,0,0,/256x256', 'png', 404);
}); });
}); });
describe('area-based', function() { describe('area-based', function() {
describe('valid requests', function() { describe('valid requests', function() {
describe('various formats', function() { describe('various formats', function() {
testStatic('test', '-180,-80,180,80/10x10', 'png', 200, undefined, /image\/png/); testStatic(prefix, '-180,-80,180,80/10x10', 'png', 200, undefined, /image\/png/);
testStatic('test', '-180,-80,180,80/10x10', 'jpg', 200, undefined, /image\/jpeg/); testStatic(prefix, '-180,-80,180,80/10x10', 'jpg', 200, undefined, /image\/jpeg/);
testStatic('test', '-180,-80,180,80/10x10', 'jpeg', 200, undefined, /image\/jpeg/); testStatic(prefix, '-180,-80,180,80/10x10', 'jpeg', 200, undefined, /image\/jpeg/);
testStatic('test', '-180,-80,180,80/10x10', 'webp', 200, undefined, /image\/webp/); testStatic(prefix, '-180,-80,180,80/10x10', 'webp', 200, undefined, /image\/webp/);
}); });
describe('different parameters', function() { describe('different parameters', function() {
testStatic('test', '-180,-90,180,90/20x20', 'png', 200, 2); testStatic(prefix, '-180,-90,180,90/20x20', 'png', 200, 2);
testStatic('test', '0,0,1,1/200x200', 'png', 200, 3); testStatic(prefix, '0,0,1,1/200x200', 'png', 200, 3);
testStatic('test', '-280,-80,0,80/280x160', 'png', 200); testStatic(prefix, '-280,-80,0,80/280x160', 'png', 200);
}); });
}); });
describe('invalid requests return 4xx', function() { describe('invalid requests return 4xx', function() {
testStatic('test', '0,87,1,88/5x2', 'png', 400); testStatic(prefix, '0,87,1,88/5x2', 'png', 400);
testStatic('test', '0,0,1,1/1x1', 'gif', 400); testStatic(prefix, '0,0,1,1/1x1', 'gif', 400);
testStatic('test', '-180,-80,180,80/0.5x2.6', 'png', 404); testStatic(prefix, '-180,-80,180,80/0.5x2.6', 'png', 404);
}); });
}); });
describe('autofit path', function() { describe('autofit path', function() {
describe('valid requests', function() { describe('valid requests', function() {
testStatic('test', 'auto/256x256', 'png', 200, undefined, /image\/png/, '?path=10,10|20,20'); testStatic(prefix, 'auto/256x256', 'png', 200, undefined, /image\/png/, '?path=10,10|20,20');
describe('different parameters', function() { describe('different parameters', function() {
testStatic('test', 'auto/20x20', 'png', 200, 2, /image\/png/, '?path=10,10|20,20'); testStatic(prefix, 'auto/20x20', 'png', 200, 2, /image\/png/, '?path=10,10|20,20');
testStatic('test', 'auto/200x200', 'png', 200, 3, /image\/png/, '?path=-10,-10|-20,-20'); testStatic(prefix, 'auto/200x200', 'png', 200, 3, /image\/png/, '?path=-10,-10|-20,-20');
}); });
}); });
describe('invalid requests return 4xx', function() { describe('invalid requests return 4xx', function() {
testStatic('test', 'auto/256x256', 'png', 400); testStatic(prefix, 'auto/256x256', 'png', 400);
testStatic('test', 'auto/256x256', 'png', 400, undefined, undefined, '?path=10,10'); testStatic(prefix, 'auto/256x256', 'png', 400, undefined, undefined, '?path=10,10');
testStatic('test', 'auto/2560x2560', 'png', 400, undefined, undefined, '?path=10,10|20,20'); testStatic(prefix, 'auto/2560x2560', 'png', 400, undefined, undefined, '?path=10,10|20,20');
}); });
}); });
}); });

View File

@@ -8,13 +8,15 @@ var testIs = function(url, type, status) {
}); });
}; };
var prefix = 'bright';
describe('Styles', function() { describe('Styles', function() {
describe('/styles/test.json is valid style', function() { describe('/styles/' + prefix + '.json is valid style', function() {
testIs('/styles/test.json', /application\/json/); testIs('/styles/' + prefix + '.json', /application\/json/);
it('contains expected properties', function(done) { it('contains expected properties', function(done) {
supertest(app) supertest(app)
.get('/styles/test.json') .get('/styles/' + prefix + '.json')
.expect(function(res) { .expect(function(res) {
res.body.version.should.equal(8); res.body.version.should.equal(8);
res.body.name.should.be.String(); res.body.name.should.be.String();
@@ -29,20 +31,20 @@ describe('Styles', function() {
testIs('/styles/streets.json', /./, 404); testIs('/styles/streets.json', /./, 404);
}); });
describe('/styles/test/sprite[@2x].{format}', function() { describe('/styles/' + prefix + '/sprite[@2x].{format}', function() {
testIs('/styles/test/sprite.json', /application\/json/); testIs('/styles/' + prefix + '/sprite.json', /application\/json/);
testIs('/styles/test/sprite@2x.json', /application\/json/); testIs('/styles/' + prefix + '/sprite@2x.json', /application\/json/);
testIs('/styles/test/sprite.png', /image\/png/); testIs('/styles/' + prefix + '/sprite.png', /image\/png/);
testIs('/styles/test/sprite@2x.png', /image\/png/); testIs('/styles/' + prefix + '/sprite@2x.png', /image\/png/);
}); });
}); });
describe('Fonts', function() { describe('Fonts', function() {
testIs('/fonts/Open Sans Bold/0-255.pbf', /application\/x-protobuf/); testIs('/fonts/Open Sans Bold/0-255.pbf', /application\/x-protobuf/);
testIs('/fonts/Open Sans Regular/65280-65533.pbf', /application\/x-protobuf/); testIs('/fonts/Open Sans Regular/65280-65535.pbf', /application\/x-protobuf/);
testIs('/fonts/Open Sans Bold,Open Sans Regular/0-255.pbf', testIs('/fonts/Open Sans Bold,Open Sans Regular/0-255.pbf',
/application\/x-protobuf/); /application\/x-protobuf/);
testIs('/fonts/Nonsense,Open Sans Bold/0-255.pbf', /application\/x-protobuf/); testIs('/fonts/Nonsense,Open Sans Bold/0-255.pbf', /./, 400);
testIs('/fonts/Nonsense/0-255.pbf', /./, 400); testIs('/fonts/Nonsense/0-255.pbf', /./, 400);
testIs('/fonts/Nonsense1,Nonsense2/0-255.pbf', /./, 400); testIs('/fonts/Nonsense1,Nonsense2/0-255.pbf', /./, 400);

View File

@@ -9,35 +9,37 @@ var testTile = function(prefix, z, x, y, format, status, scale, type) {
}); });
}; };
var prefix = 'bright';
describe('Raster tiles', function() { describe('Raster tiles', function() {
describe('valid requests', function() { describe('valid requests', function() {
describe('various formats', function() { describe('various formats', function() {
testTile('test', 0, 0, 0, 'png', 200, undefined, /image\/png/); testTile(prefix, 0, 0, 0, 'png', 200, undefined, /image\/png/);
testTile('test', 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/); testTile(prefix, 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/);
testTile('test', 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/); testTile(prefix, 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/);
testTile('test', 0, 0, 0, 'webp', 200, undefined, /image\/webp/); testTile(prefix, 0, 0, 0, 'webp', 200, undefined, /image\/webp/);
}); });
describe('different coordinates and scales', function() { describe('different coordinates and scales', function() {
testTile('test', 1, 1, 1, 'png', 200); testTile(prefix, 1, 1, 1, 'png', 200);
testTile('test', 0, 0, 0, 'png', 200, 2); testTile(prefix, 0, 0, 0, 'png', 200, 2);
testTile('test', 0, 0, 0, 'png', 200, 3); testTile(prefix, 0, 0, 0, 'png', 200, 3);
testTile('test', 2, 1, 1, 'png', 200, 3); testTile(prefix, 2, 1, 1, 'png', 200, 3);
}); });
}); });
describe('invalid requests return 4xx', function() { describe('invalid requests return 4xx', function() {
testTile('non_existent', 0, 0, 0, 'png', 404); testTile('non_existent', 0, 0, 0, 'png', 404);
testTile('test', -1, 0, 0, 'png', 404); testTile(prefix, -1, 0, 0, 'png', 404);
testTile('test', 25, 0, 0, 'png', 404); testTile(prefix, 25, 0, 0, 'png', 404);
testTile('test', 0, 1, 0, 'png', 404); testTile(prefix, 0, 1, 0, 'png', 404);
testTile('test', 0, 0, 1, 'png', 404); testTile(prefix, 0, 0, 1, 'png', 404);
testTile('test', 0, 0, 0, 'gif', 400); testTile(prefix, 0, 0, 0, 'gif', 400);
testTile('test', 0, 0, 0, 'pbf', 400); testTile(prefix, 0, 0, 0, 'pbf', 400);
testTile('test', 0, 0, 0, 'png', 404, 1); testTile(prefix, 0, 0, 0, 'png', 404, 1);
testTile('test', 0, 0, 0, 'png', 404, 4); testTile(prefix, 0, 0, 0, 'png', 404, 4);
//testTile('hybrid', 0, 0, 0, 'png', 404); //TODO: test this //testTile('hybrid', 0, 0, 0, 'png', 404); //TODO: test this
}); });