Merged with upstream/master.

This commit is contained in:
polar 2017-10-20 14:33:59 -04:00
parent 8aba44c3b6
commit 83de8ed67f
2 changed files with 2 additions and 6 deletions

View file

@ -9,7 +9,7 @@
], ],
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/polar/tileserver-gl.git" "url": "https://github.com/klokantech/tileserver-gl.git"
}, },
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"engines": { "engines": {
@ -19,7 +19,7 @@
"test": "mocha test/**.js --timeout 10000" "test": "mocha test/**.js --timeout 10000"
}, },
"dependencies": { "dependencies": {
"@mapbox/mapbox-gl-native": "3.5.7", "@mapbox/mapbox-gl-native": "3.5.4",
"@mapbox/mbtiles": "0.9.0", "@mapbox/mbtiles": "0.9.0",
"@mapbox/sphericalmercator": "1.0.5", "@mapbox/sphericalmercator": "1.0.5",
"@mapbox/vector-tile": "1.3.0", "@mapbox/vector-tile": "1.3.0",

View file

@ -399,10 +399,6 @@ module.exports = function(options, repo, params, id, dataResolver) {
renderer.render(params, function(err, data) { renderer.render(params, function(err, data) {
pool.release(renderer); pool.release(renderer);
if (err) { if (err) {
console.error("Error from Renderer:");
console.error("Renderer.render");
console.error(renderer);
console.error(JSON.stringify(params, null, 2));
console.error(err); console.error(err);
return; return;
} }