Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4ce4877b6 | ||
|
|
a0a086e95a | ||
|
|
dbaca66b2c | ||
|
|
d465142275 | ||
|
|
7f06f09696 | ||
|
|
f5c5570fca |
@@ -3,14 +3,19 @@ MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
|
||||
|
||||
RUN apt-get -qq update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
|
||||
apt-transport-https \
|
||||
curl \
|
||||
unzip \
|
||||
build-essential \
|
||||
python \
|
||||
libcairo2-dev \
|
||||
xvfb \
|
||||
&& curl -sL https://deb.nodesource.com/setup_4.x | bash - \
|
||||
&& apt-get -y install nodejs \
|
||||
&& echo "deb https://deb.nodesource.com/node_4.x jessie main" >> /etc/apt/sources.list.d/nodejs.list \
|
||||
&& 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
|
||||
|
||||
RUN mkdir -p /usr/src/app
|
||||
|
||||
10
package.json
10
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tileserver-gl",
|
||||
"version": "0.8.0",
|
||||
"version": "0.8.1",
|
||||
"description": "Map tile server for JSON GL styles - serverside generated raster tiles",
|
||||
"main": "src/main.js",
|
||||
"bin": "src/main.js",
|
||||
@@ -16,9 +16,9 @@
|
||||
"test": "mocha test/**.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"async": "1.5.2",
|
||||
"async": "2.0.1",
|
||||
"advanced-pool": "0.3.2",
|
||||
"base64url": "1.0.6",
|
||||
"base64url": "2.0.0",
|
||||
"canvas": "1.4.0",
|
||||
"clone": "1.0.2",
|
||||
"color": "0.11.3",
|
||||
@@ -29,12 +29,12 @@
|
||||
"mbtiles": "0.9.0",
|
||||
"morgan": "1.7.0",
|
||||
"nomnom": "1.8.1",
|
||||
"request": "2.73.0",
|
||||
"request": "2.74.0",
|
||||
"sharp": "0.15.1",
|
||||
"sphericalmercator": "1.0.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"should": "^9.0.0",
|
||||
"should": "^10.0.0",
|
||||
"mocha": "^2.5.0",
|
||||
"supertest": "^1.2.0"
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ var clone = require('clone'),
|
||||
module.exports = function(options, allowedFonts) {
|
||||
var app = express().disable('x-powered-by');
|
||||
|
||||
var lastModified = new Date().toUTCString();
|
||||
|
||||
var fontPath = options.paths.fonts;
|
||||
|
||||
var getFontPbf = function(name, range, callback) {
|
||||
@@ -51,6 +53,7 @@ module.exports = function(options, allowedFonts) {
|
||||
return res.status(400).send('');
|
||||
} else {
|
||||
res.header('Content-type', 'application/x-protobuf');
|
||||
res.header('Last-Modified', lastModified);
|
||||
return res.send(concated);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -38,6 +38,8 @@ mbgl.on('message', function(e) {
|
||||
module.exports = function(options, repo, params, id) {
|
||||
var app = express().disable('x-powered-by');
|
||||
|
||||
var lastModified = new Date().toUTCString();
|
||||
|
||||
var rootPath = options.paths.root;
|
||||
|
||||
var styleFile = params.style;
|
||||
@@ -289,6 +291,7 @@ module.exports = function(options, repo, params, id) {
|
||||
}
|
||||
|
||||
res.set({
|
||||
'Last-Modified': lastModified,
|
||||
'Content-Type': 'image/' + format
|
||||
});
|
||||
return res.status(200).send(buffer);
|
||||
|
||||
Reference in New Issue
Block a user