cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update windshaft devel branch

Browse Source
This commit is contained in:
Daniel García Aubert 2019-07-29 19:14:27 +02:00
parent 61b66e88d5
commit 945c122dda
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cartodb/api/api-router.js
View File

@ -100,7 +100,8 @@ module.exports = class ApiRouter {
const tileBackend = new windshaft.backend.Tile(rendererCache); const tileBackend = new windshaft.backend.Tile(rendererCache);
const attributesBackend = new windshaft.backend.Attributes(); const attributesBackend = new windshaft.backend.Attributes();
const previewBackend = new windshaft.backend.Preview(rendererCache); const concurrency = serverOptions.renderer.mapnik.poolSize + serverOptions.renderer.mapnik.poolMaxWaitingClients;
const previewBackend = new windshaft.backend.Preview(rendererCache, { concurrency });
const mapValidatorBackend = new windshaft.backend.MapValidator(tileBackend, attributesBackend); const mapValidatorBackend = new windshaft.backend.MapValidator(tileBackend, attributesBackend);
const mapBackend = new windshaft.backend.Map(rendererCache, mapStore, mapValidatorBackend); const mapBackend = new windshaft.backend.Map(rendererCache, mapStore, mapValidatorBackend);

12
package-lock.json generated
View File

@ -5,9 +5,8 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@carto/cartonik": { "@carto/cartonik": {
"version": "0.6.1", "version": "github:cartodb/cartonik#c91fa13562a1fbda30d55405e86ed72bae503eda",
"resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.6.1.tgz", "from": "github:cartodb/cartonik#19-preview-batch-fetchs",
"integrity": "sha512-7tRnEe8JTGzbYxBcsXhneWzK2HVP/Fc4KcI0PNIgMAUsu3q2Yz3tikA9/OoT9PtGvcOmqNn6CwfVibBKwYO23Q==",
"requires": { "requires": {
"@carto/mapnik": "3.6.2-carto.16", "@carto/mapnik": "3.6.2-carto.16",
"@mapbox/sphericalmercator": "^1.1.0", "@mapbox/sphericalmercator": "^1.1.0",
@ -4040,11 +4039,10 @@
"integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
}, },
"windshaft": { "windshaft": {
"version": "5.5.1", "version": "github:cartodb/windshaft#29b0c44e8d74eec8658460eb16b940f02ee157ec",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.5.1.tgz", "from": "github:cartodb/windshaft#update-cartonik-0.7.0",
"integrity": "sha512-Z8ChaxzBThnYCaSQsJJ5uWdNlTQRBndXvefn8DCaU8pikGfG1kcUD6IGE306MziljNDikKJC5XKf5Dmx6Awt5g==",
"requires": { "requires": {
"@carto/cartonik": "^0.6.1", "@carto/cartonik": "github:cartodb/cartonik#19-preview-batch-fetchs",
"@carto/mapnik": "3.6.2-carto.16", "@carto/mapnik": "3.6.2-carto.16",
"canvas": "^2.4.1", "canvas": "^2.4.1",
"carto": "github:cartodb/carto#0.15.1-cdb5", "carto": "github:cartodb/carto#0.15.1-cdb5",

2
package.json
View File

@ -49,7 +49,7 @@
"step-profiler": "0.3.0", "step-profiler": "0.3.0",
"turbo-carto": "0.21.2", "turbo-carto": "0.21.2",
"underscore": "1.6.0", "underscore": "1.6.0",
"windshaft": "^5.5.1", "windshaft": "github:cartodb/windshaft#update-cartonik-0.7.0",
"yargs": "11.1.0" "yargs": "11.1.0"
}, },
"devDependencies": { "devDependencies": {

1
test/acceptance/ported/support/ported_server_options.js
View File

@ -50,6 +50,7 @@ module.exports = _.extend({}, serverOptions, {
renderer: { renderer: {
mapnik: { mapnik: {
poolSize: 4,//require('os').cpus().length, poolSize: 4,//require('os').cpus().length,
poolMaxWaitingClients: 32,
metatile: 1, metatile: 1,
bufferSize: 64, bufferSize: 64,
snapToGrid: false, snapToGrid: false,