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

Merge pull request #1088 from CartoDB/cartonik

Browse Source 
Upgrade windshaft to version 5.2.0
This commit is contained in:
Daniel G. Aubert
2019-04-29 13:24:01 +02:00
committed by GitHub
parent e38f8b6133 5196d2fed0
commit 778eb54890
4 changed files with 83 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS.md
+2 -3
View File
@@ -13,9 +13,8 @@ Announcements:
- Fix boolean aggregation layer option not working when numbers of rows are above the threshold (#1082)
- Update deps:
- camshat@0.64.0
- windshaft@5.1.1:
- Upgrade `tilelive-mapnik` to version `0.6.18-cdb20`
- Upgrade `@carto/tilelive-bridge` to version `2.5.1-cdb12`
- windshaft@5.2.0:
- Use [`@carto/cartonik`](https://github.com/CartoDB/cartonik/releases/tag/v0.5.0) instead of `@mapbox/tilelive` to fetch raster/vertor tiles.
- Upgrade `grainstore` to version `2.0.0`
- Upgrade `torque.js` to version `3.1.0`
- Upgrade `canvas` to version `2.4.1`
package-lock.json
Generated
+27 -114
View File
@@ -4,6 +4,23 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@carto/cartonik": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.5.0.tgz",
"integrity": "sha512-vdtNbdip+ZBhoRmEIu3gfkHVsRq657yz+rcbSrRZbX9bNwGMzYTlIj6EchI76bDhCAZszm+qfbptH3iOZzaW0w==",
"requires": {
"@carto/mapnik": "^3.6.2-carto.13",
"generic-pool": "^3.6.1",
"mime": "^2.4.0"
},
"dependencies": {
"mime": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
"integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg=="
}
}
},
"@carto/fqdn-sync": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/@carto/fqdn-sync/-/fqdn-sync-0.2.2.tgz",
@@ -14,7 +31,7 @@
"resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.13.tgz",
"integrity": "sha512-F1hxZEBpTLvf04ddzf1t1sjNtHBajFPHL6exfzj47lipTDYj1HB1/50ojlg6a+aBE1n5CcCqocHuB7r1cZMxDA==",
"requires": {
"mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#v1.6.1-carto.2",
"mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#e7ca5471f9e5de81243e6035e70444321fc0a82f",
"nan": "2.13.2",
"node-pre-gyp": "0.12.0"
},
@@ -26,14 +43,6 @@
}
}
},
"@carto/tilelive-bridge": {
"version": "github:cartodb/tilelive-bridge#3c0c4930bf56f4df1b65f0bc98293057506ebe5d",
"from": "github:cartodb/tilelive-bridge#2.5.1-cdb13",
"requires": {
"@carto/mapnik": "3.6.2-carto.13",
"generic-pool": "^3.6.1"
}
},
"abaculus": {
"version": "github:cartodb/abaculus#7288aa301e843197225e94b0b123ed5d1b804601",
"from": "github:cartodb/abaculus#2.0.3-cdb14",
@@ -410,7 +419,7 @@
"integrity": "sha512-1z3Dk9G8KQlNGurbcmGBvNj8DVCh1Keue9uzyyvB6hKOYzBHMxixAMG0D+8nSsA7oQmWUsx/xkZZ5ZxT9toEHA==",
"requires": {
"debug": "^3.1.0",
"pg": "github:cartodb/node-postgres#6.4.2-cdb2",
"pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6",
"underscore": "~1.6.0"
}
},
@@ -2034,7 +2043,7 @@
"carto": "0.16.3",
"debug": "~3.1.0",
"generic-pool": "~2.2.0",
"millstone": "github:cartodb/millstone#v0.6.17-carto.2",
"millstone": "github:cartodb/millstone#f201885250d2d7ea6c870a1e1060ca6bcfdef186",
"postcss": "~5.2.8",
"postcss-scss": "0.4.0",
"postcss-strip-inline-comments": "0.1.5",
@@ -2983,11 +2992,6 @@
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"object-keys": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
"integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY="
},
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -3328,16 +3332,6 @@
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
},
"progress-stream": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-0.5.0.tgz",
"integrity": "sha1-zEdZFnpv9PBYdheThPC2rg0ddYc=",
"requires": {
"single-line-log": "~0.3.1",
"speedometer": "~0.1.2",
"through2": "~0.2.3"
}
},
"propagate": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz",
@@ -3653,11 +3647,6 @@
"resolved": "https://registry.npmjs.org/simple-statistics/-/simple-statistics-0.9.2.tgz",
"integrity": "sha1-PjXLEDCPx2ljqk7nJS5qbqENKOQ="
},
"single-line-log": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-0.3.1.tgz",
"integrity": "sha1-p61lB/IYzl3+FsS/LWWSRkGeegY="
},
"sntp": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
@@ -3699,11 +3688,6 @@
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
"integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
},
"speedometer": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
"integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0="
},
"sphericalmercator": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.5.tgz",
@@ -3920,81 +3904,12 @@
"resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"through2": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
"integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
"requires": {
"readable-stream": "~1.1.9",
"xtend": "~2.1.1"
},
"dependencies": {
"readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
"isarray": "0.0.1",
"string_decoder": "~0.10.x"
}
},
"xtend": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
"integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
"requires": {
"object-keys": "~0.4.0"
}
}
}
},
"tilelive": {
"version": "5.12.3",
"resolved": "https://registry.npmjs.org/tilelive/-/tilelive-5.12.3.tgz",
"integrity": "sha1-nIx3DhGUqo01PZodAxR0BDB83r0=",
"requires": {
"minimist": "~0.2.0",
"progress-stream": "~0.5.x",
"queue-async": "~1.0.7",
"sphericalmercator": "~1.0.1"
},
"dependencies": {
"minimist": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
"integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784="
},
"queue-async": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz",
"integrity": "sha1-Iq4KHaxKkvW81GNPmTxoKiqBCUU="
}
}
},
"tilelive-mapnik": {
"version": "github:cartodb/tilelive-mapnik#731322968cb08223a450cd717973dc2d09905e94",
"from": "github:cartodb/tilelive-mapnik#0.6.18-cdb21",
"requires": {
"@carto/mapnik": "3.6.2-carto.13",
"generic-pool": "^3.6.1",
"mime": "2.3.1"
},
"dependencies": {
"mime": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
"integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
}
}
},
"torque.js": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.1.0.tgz",
"integrity": "sha512-xX0BVo/gAy5A2Qx17dbgzjB2cnzuSDwzohdT1hGaKbG0jveL3sKgKE5VyzlN1/l4hP3p6f/m20HvZo3waIawCQ==",
"requires": {
"carto": "github:cartodb/carto#master",
"carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
"d3": "3.5.17",
"turbo-carto": "^0.21.1",
"turf-jenks": "~1.0.1"
@@ -4191,15 +4106,15 @@
"integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
},
"windshaft": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.1.1.tgz",
"integrity": "sha512-fKGfCGi9V5uGRJKRWtBA8b2uOqQMPgq3JOGVdzRT+M+zpauRjH7XEbTO+W7TQ3vOBdl2VAgK41qX11fN4s7pow==",
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.2.0.tgz",
"integrity": "sha512-1kgT2syKc0B+XiHr0/njDJHJ3BvPrZzLQv+rkbyXZZa06kMXOx0qxDc+D1e2BkuirxI7+zgAFlp3PWpyQVeqHA==",
"requires": {
"@carto/cartonik": "^0.5.0",
"@carto/mapnik": "3.6.2-carto.13",
"@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#2.5.1-cdb13",
"abaculus": "github:cartodb/abaculus#2.0.3-cdb14",
"abaculus": "github:cartodb/abaculus#7288aa301e843197225e94b0b123ed5d1b804601",
"canvas": "^2.4.1",
"carto": "github:cartodb/carto#0.15.1-cdb5",
"carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
"cartodb-psql": "0.13.1",
"debug": "3.1.0",
"grainstore": "^2.0.0",
@@ -4208,8 +4123,6 @@
"request": "2.87.0",
"semver": "5.5.0",
"sphericalmercator": "1.0.5",
"tilelive": "5.12.3",
"tilelive-mapnik": "github:cartodb/tilelive-mapnik#0.6.18-cdb21",
"torque.js": "^3.1.0",
"underscore": "1.6.0"
}
package.json
+1 -1
View File
@@ -49,7 +49,7 @@
"step-profiler": "0.3.0",
"turbo-carto": "0.21.0",
"underscore": "1.6.0",
"windshaft": "5.1.1",
"windshaft": "5.2.0",
"yargs": "11.1.0"
},
"devDependencies": {
test/acceptance/user-render-timeout-limit.js
+53 -7
View File
@@ -129,7 +129,13 @@ describe('user render timeout limit', function () {
const mapconfig = createMapConfig();
this.testClient = new TestClient(mapconfig, 1234);
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
if (err) {
return done(err);
}
this.layergroup = layergroup;
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
});
});
afterEach(function (done) {
@@ -144,7 +150,12 @@ describe('user render timeout limit', function () {
});
it('layergroup creation works but tile request fails due to render timeout', function (done) {
this.testClient.getTile(0, 0, 0, { cacheBuster: true }, (err, res, tile) => {
const params = {
layergroupid: this.layergroup.layergroupid,
cacheBuster: true
};
this.testClient.getTile(0, 0, 0, params, (err, res, tile) => {
assert.ifError(err);
assert.imageIsSimilarToFile(tile, timeoutErrorTilePath, 0.05, (err) => {
@@ -164,7 +175,13 @@ describe('user render timeout limit', function () {
const mapconfig = createMapConfig();
this.testClient = new TestClient(mapconfig, 1234);
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
if (err) {
return done(err);
}
this.layergroup = layergroup;
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
});
});
afterEach(function (done) {
@@ -180,6 +197,7 @@ describe('user render timeout limit', function () {
it('layergroup creation works and render tile fails', function (done) {
var params = {
layergroupid: this.layergroup.layergroupid,
response: {
status: 429,
headers: {
@@ -215,7 +233,13 @@ describe('user render timeout limit', function () {
serverOptions.renderer.mvt.usePostGIS = usePostGIS;
const mapconfig = createMapConfig();
this.testClient = new TestClient(mapconfig, 1234);
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
if (err) {
return done(err);
}
this.layergroup = layergroup;
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
});
});
afterEach(function (done) {
@@ -230,6 +254,7 @@ describe('user render timeout limit', function () {
it('layergroup creation works but vector tile request fails due to render timeout', function (done) {
const params = {
layergroupid: this.layergroup.layergroupid,
format: 'mvt',
response: {
status: 429,
@@ -258,7 +283,13 @@ describe('user render timeout limit', function () {
beforeEach(function (done) {
const mapconfig = createMapConfig();
this.testClient = new TestClient(mapconfig, 1234);
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
if (err) {
return done(err);
}
this.layergroup = layergroup;
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
});
});
afterEach(function (done) {
@@ -272,6 +303,7 @@ describe('user render timeout limit', function () {
it('layergroup creation works but "grid.json" tile request fails due to render timeout', function (done) {
const params = {
layergroupid: this.layergroup.layergroupid,
layers: 'mapnik',
format: 'grid.json',
response: {
@@ -310,7 +342,13 @@ describe('user render timeout limit', function () {
const mapconfig = createMapConfig();
this.testClient = new TestClient(mapconfig, 1234);
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
if (err) {
return done(err);
}
this.layergroup = layergroup;
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
});
});
afterEach(function (done) {
@@ -326,6 +364,7 @@ describe('user render timeout limit', function () {
it('layergroup creation works but static image fails due to render timeout', function (done) {
const params = {
layergroupid: this.layergroup.layergroupid,
zoom: 0,
lat: 0,
lng: 0,
@@ -354,7 +393,13 @@ describe('user render timeout limit', function () {
const mapconfig = createMapConfig();
this.testClient = new TestClient(mapconfig, 1234);
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
this.testClient.getLayergroup(mapconfig, (err, layergroup) => {
if (err) {
return done(err);
}
this.layergroup = layergroup;
this.testClient.setUserRenderTimeoutLimit('localhost', 50, done);
});
});
afterEach(function (done) {
@@ -370,6 +415,7 @@ describe('user render timeout limit', function () {
it('layergroup creation works and render static center tile fails', function (done) {
const params = {
layergroupid: this.layergroup.layergroupid,
zoom: 0,
lat: 0,
lng: 0,