From de376eef86188d758dd74eb75ee54e93b14d200a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 27 Nov 2017 14:52:30 +0100 Subject: [PATCH 01/14] vr-aggregation: link to windshaft#vr-aggregation --- package.json | 2 +- yarn.lock | 109 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 78 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 8e4c1d84..f68f2acf 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.20.1", "underscore": "~1.6.0", - "windshaft": "4.0.1", + "windshaft": "cartodb/windshaft#vr-aggretation", "yargs": "~5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 7b5394aa..3eafbd0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"abaculus@github:cartodb/abaculus#2.0.3-cdb1": +abaculus@cartodb/abaculus#2.0.3-cdb1: version "2.0.3-cdb1" resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/f5f34e1c80cdd8d49edd1d6fe3b2220ab2e23aaf" dependencies: @@ -222,7 +222,7 @@ camshaft@0.59.4: dot "^1.0.3" request "^2.69.0" -"canvas@github:cartodb/node-canvas#1.6.2-cdb2": +canvas@cartodb/node-canvas#1.6.2-cdb2: version "1.6.2-cdb2" resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766" dependencies: @@ -240,15 +240,7 @@ carto@0.16.3: semver "^5.1.0" yargs "^4.2.0" -carto@CartoDB/carto#0.15.1-cdb1: - version "0.15.1-cdb1" - resolved "https://codeload.github.com/CartoDB/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398" - dependencies: - mapnik-reference "~6.0.2" - optimist "~0.6.0" - underscore "~1.6.0" - -"carto@github:cartodb/carto#0.15.1-cdb3": +carto@cartodb/carto#0.15.1-cdb3: version "0.15.1-cdb3" resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" dependencies: @@ -256,6 +248,14 @@ carto@CartoDB/carto#0.15.1-cdb1: optimist "~0.6.0" underscore "1.8.3" +"carto@github:cartodb/carto#0.15.1-cdb1": + version "0.15.1-cdb1" + resolved "https://codeload.github.com/cartodb/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398" + dependencies: + mapnik-reference "~6.0.2" + optimist "~0.6.0" + underscore "~1.6.0" + cartocolor@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cartocolor/-/cartocolor-4.0.0.tgz#841a3222d8b5b22718d9d545b1e5b972cb26eb36" @@ -484,6 +484,10 @@ destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + diff@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" @@ -746,7 +750,7 @@ gdal@~0.9.2: nan "~2.6.2" node-pre-gyp "~0.6.36" -generic-pool@2.4.3, generic-pool@~2.4.0, generic-pool@~2.4.1: +generic-pool@2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff" @@ -758,6 +762,10 @@ generic-pool@~2.2.0, generic-pool@~2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.2.2.tgz#7a89f491d575b42f9f069a0e8e2c6dbaa3c241be" +generic-pool@~2.4.0, generic-pool@~2.4.1: + version "2.4.6" + resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.6.tgz#f1b55e572167dba2fe75d5aa91ebb1e9f72642d7" + get-caller-file@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" @@ -768,7 +776,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob@7.1.1, glob@^7.0.5, glob@^7.1.1: +glob@7.1.1, glob@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -799,6 +807,17 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.0.5: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -963,8 +982,8 @@ inherits@2, inherits@2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" ini@~1.3.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" invert-kv@^1.0.0: version "1.0.0" @@ -1300,7 +1319,7 @@ mime@~1.3.4: version "1.3.6" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.2: +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -1360,10 +1379,14 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -nan@^2.0.8, nan@^2.3.4, nan@^2.4.0, nan@~2.7.0: +nan@^2.0.8, nan@^2.3.4, nan@~2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" +nan@^2.4.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" + nan@~2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.4.0.tgz#fb3c59d45fe4effe215f0b890f8adf6eb32d2232" @@ -1392,9 +1415,10 @@ nock@~2.11.0: propagate "0.3.x" node-pre-gyp@~0.6.30, node-pre-gyp@~0.6.36, node-pre-gyp@~0.6.38: - version "0.6.38" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d" + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: + detect-libc "^1.0.2" hawk "3.1.3" mkdirp "^0.5.1" nopt "^4.0.1" @@ -1449,10 +1473,14 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@4.1.0, object-assign@^4.1.0: +object-assign@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + object-keys@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" @@ -1721,8 +1749,8 @@ raw-body@2.3.2: unpipe "1.0.0" rc@^1.1.7: - version "1.2.1" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" + version "1.2.2" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -1744,7 +1772,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -readable-stream@1.1, readable-stream@~1.1.9: +readable-stream@1.1: version "1.1.13" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" dependencies: @@ -1774,6 +1802,15 @@ readable-stream@~1.0.2: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + redis-mpool@0.4.1, redis-mpool@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.4.1.tgz#d917c0a4ed57a1291a9c6eb35434e6c0b7046f80" @@ -1883,7 +1920,7 @@ safe-json-stringify@~1: version "1.0.4" resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911" -"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0: +"semver@2 || 3 || 4 || 5", semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -1891,6 +1928,10 @@ semver@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" +semver@^5.1.0, semver@^5.3.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" + semver@~4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" @@ -1996,10 +2037,14 @@ speedometer@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d" -sphericalmercator@1.0.4, sphericalmercator@1.0.x, sphericalmercator@~1.0.1, sphericalmercator@~1.0.4: +sphericalmercator@1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/sphericalmercator/-/sphericalmercator-1.0.4.tgz#baad4e34187f06e87f2e92fc1280199fa1b01d4e" +sphericalmercator@1.0.x, sphericalmercator@~1.0.1, sphericalmercator@~1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sphericalmercator/-/sphericalmercator-1.0.5.tgz#ddc5a049e360e000d0fad9fc22c4071882584980" + split@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" @@ -2114,8 +2159,8 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3: has-flag "^1.0.0" tar-pack@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" + version "3.4.1" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" dependencies: debug "^2.2.0" fstream "^1.0.10" @@ -2145,7 +2190,7 @@ through@2: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -"tilelive-bridge@github:cartodb/tilelive-bridge#2.3.1-cdb4": +tilelive-bridge@cartodb/tilelive-bridge#2.3.1-cdb4: version "2.3.1-cdb4" resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/faa2b638da2d119b78281575d40255cb523f6ca6" dependencies: @@ -2153,7 +2198,7 @@ through@2: mapnik-pool "~0.1.3" sphericalmercator "1.0.x" -"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb3": +tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb3: version "0.6.18-cdb3" resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/23bd1c31dd57d0b76c86b9f1eaf62462b3c17d01" dependencies: @@ -2314,9 +2359,9 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -windshaft@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.0.1.tgz#16230a0b5b28f08a443491339c37637e3caefa52" +windshaft@cartodb/windshaft#vr-aggretation: + version "4.0.2" + resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/e0cbbafdf7a65537337c3ca185b6fd2f9bac4e59" dependencies: abaculus cartodb/abaculus#2.0.3-cdb1 canvas cartodb/node-canvas#1.6.2-cdb2 From 51c19c0b2eca9d86d4151031c3a32e47b0382765 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 28 Nov 2017 16:49:55 +0000 Subject: [PATCH 02/14] Skip test --- test/acceptance/multilayer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 9d287a58..51545416 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -1164,7 +1164,7 @@ describe(suiteName, function() { }); // See https://github.com/CartoDB/Windshaft-cartodb/issues/133 - it("MapConfig with mapnik layer and no cartocss", function(done) { + it.skip("MapConfig with mapnik layer and no cartocss", function(done) { var layergroup = { version: '1.0.0', From 8270699b8ea1d32e32304210fbb00f9ec5e7cb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 13:12:09 +0100 Subject: [PATCH 03/14] Tests to fect mvt tiles without styles --- test/acceptance/multilayer.js | 4 ++ test/acceptance/mvt.js | 120 +++++++++++++++++++++++++++++++++- 2 files changed, 123 insertions(+), 1 deletion(-) diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index 51545416..a1a93e40 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -1163,6 +1163,10 @@ describe(suiteName, function() { ); }); + // WARN: MapConfig with mapnik layer and no cartocss it's valid since + // vector & raster aggregation project, now we can request MVT format w/o defining styles + // for the layer. + // See https://github.com/CartoDB/Windshaft-cartodb/issues/133 it.skip("MapConfig with mapnik layer and no cartocss", function(done) { diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index ded1772e..c1958ca5 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -34,6 +34,124 @@ return function () { serverOptions.renderer.mvt.usePostGIS = originalUsePostGIS; }); + describe('vector-layergroup', function () { + const POLYGONS_SQL = ` + select + st_buffer(st_setsrid(st_makepoint(x*10, x*10), 4326)::geography, 1000000)::geometry as the_geom, + st_transform( + st_buffer(st_setsrid(st_makepoint(x*10, x*10), 4326)::geography, 1000000)::geometry, + 3857 + ) as the_geom_webmercator, + x as value + from generate_series(-3, 3) x + `; + + const POINTS_SQL = ` + select + st_setsrid(st_makepoint(x*10, x*10), 4326) as the_geom, + st_transform(st_setsrid(st_makepoint(x*10, x*10), 4326), 3857) as the_geom_webmercator, + x as value + from generate_series(-3, 3) x + `; + + function createVectorLayergroup () { + return { + version: '1.6.0', + layers: [ + { + type: 'cartodb', + options: { + sql: POINTS_SQL + } + }, + { + type: 'cartodb', + options: { + sql: POLYGONS_SQL + } + } + ] + }; + } + + beforeEach(function () { + this.mapConfig = createVectorLayergroup(); + this.testClient = new TestClient(this.mapConfig); + }); + + afterEach(function (done) { + this.testClient.drain(done); + }); + + it('should get vector tiles from layergroup with layers w/o cartocss', function (done) { + this.testClient.getTile(0, 0, 0, { format: 'mvt' }, (err, res, tile) => { + if (err) { + return done(err); + } + + assert.equal(tile.tileSize, 4096); + assert.equal(tile.z, 0); + assert.equal(tile.x, 0); + assert.equal(tile.y, 0); + + const layer0 = JSON.parse(tile.toGeoJSONSync(0)); + + assert.equal(layer0.name, 'layer0'); + assert.equal(layer0.features[0].type, 'Feature'); + assert.equal(layer0.features[0].geometry.type, 'Point'); + + const layer1 = JSON.parse(tile.toGeoJSONSync(1)); + + assert.equal(layer1.name, 'layer1'); + assert.equal(layer1.features[0].type, 'Feature'); + assert.equal(layer1.features[0].geometry.type, 'Polygon'); + done(); + }); + }); + + it('should get vector tiles from specific layer (layer0)', function (done) { + this.testClient.getTile(0, 0, 0, { format: 'mvt', layers: 0 }, (err, res, tile) => { + if (err) { + return done(err); + } + + assert.equal(tile.tileSize, 4096); + assert.equal(tile.z, 0); + assert.equal(tile.x, 0); + assert.equal(tile.y, 0); + + const layer = JSON.parse(tile.toGeoJSONSync(0)); + + assert.equal(layer.name, 'layer0'); + assert.equal(layer.features[0].type, 'Feature'); + assert.equal(layer.features[0].geometry.type, 'Point'); + + done(); + }); + }); + + it('should get vector tiles from specific layer (layer1)', function (done) { + this.testClient.getTile(0, 0, 0, { format: 'mvt', layers: 1 }, (err, res, tile) => { + if (err) { + return done(err); + } + + assert.equal(tile.tileSize, 4096); + assert.equal(tile.z, 0); + assert.equal(tile.x, 0); + assert.equal(tile.y, 0); + + const layer = JSON.parse(tile.toGeoJSONSync(0)); + + assert.equal(layer.name, 'layer1'); + assert.equal(layer.features[0].type, 'Feature'); + assert.equal(layer.features[0].geometry.type, 'Polygon'); + + done(); + }); + }); + }); + describe('analysis-layers-dataviews-mvt', function () { function createMapConfig(layers, dataviews, analysis) { @@ -504,4 +622,4 @@ return function () { } }; -} \ No newline at end of file +} From 330f8f3cb514f5494159694c9a4dcd2caf2c4a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 14:10:56 +0100 Subject: [PATCH 04/14] Test invalid format for vector layergroup --- test/acceptance/mvt.js | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index c1958ca5..556f0638 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -150,6 +150,37 @@ return function () { done(); }); }); + + it.only('should fail when the format requested is not mvt', function (done) { + const options = { + format: 'png', + response: { + status: 400, + headers: { + 'Content-Type': 'application/json; charset=utf-8' + } + } + }; + + this.testClient.getTile(0, 0, 0, options, (err, res, body) => { + if (err) { + return done(err); + } + + assert.deepEqual(body, { + "errors": [ + "Invalid format: only mvt format is available for layers without CartoCSS defined" + ], + "errors_with_context":[ + { + "type":"tile", + "message":"Invalid format: only mvt format is available for layers without CartoCSS defined" + } + ] + }); + done(); + }); + }); }); describe('analysis-layers-dataviews-mvt', function () { From f9428682f936f6bc59ff5e0db8e110127440a277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 14:38:06 +0100 Subject: [PATCH 05/14] Remove mocha filter --- test/acceptance/mvt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 556f0638..0c566006 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -151,7 +151,7 @@ return function () { }); }); - it.only('should fail when the format requested is not mvt', function (done) { + it('should fail when the format requested is not mvt', function (done) { const options = { format: 'png', response: { From c9e0f330c0e3771594355235ba5143c9005d38a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 16:15:52 +0100 Subject: [PATCH 06/14] Add test to check incompatible layers --- test/acceptance/mvt.js | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 0c566006..25e32308 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -181,6 +181,38 @@ return function () { done(); }); }); + + it('should fail when the map-config mix layers with and without cartocss', function (done) { + const response = { + status: 400, + headers: { + 'Content-Type': 'application/json; charset=utf-8' + } + }; + + this.testClient.mapConfig.layers[0].options.cartocss = '#layer0 { marker-fill: red; marker-width: 10; }'; + this.testClient.mapConfig.layers[0].options.cartocss_version = '2.3.0'; + this.testClient.getLayergroup(response, (err, body) => { + if (err) { + return done(err); + } + + assert.deepEqual(body, { + "errors": [ + "The layergroup contains incompatible layers: don't mix styled layers with non styled layers (without cartocss)" + ], + "errors_with_context":[ + { + "type":"layergroup", + "message": "The layergroup contains incompatible layers: don't mix styled layers with non styled layers (without cartocss)" + } + ] + }); + + done(); + }); + }); + }); describe('analysis-layers-dataviews-mvt', function () { From 1b6de9961a15dac8eb399df39afecc826c2541a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 16:47:56 +0100 Subject: [PATCH 07/14] Do not use polygons --- test/acceptance/mvt.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 25e32308..3953d3b4 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -35,21 +35,18 @@ return function () { }); describe('vector-layergroup', function () { - const POLYGONS_SQL = ` + const POINTS_SQL_1 = ` select - st_buffer(st_setsrid(st_makepoint(x*10, x*10), 4326)::geography, 1000000)::geometry as the_geom, - st_transform( - st_buffer(st_setsrid(st_makepoint(x*10, x*10), 4326)::geography, 1000000)::geometry, - 3857 - ) as the_geom_webmercator, + st_setsrid(st_makepoint(x*10, x*10), 4326) as the_geom, + st_transform(st_setsrid(st_makepoint(x*10, x*10), 4326), 3857) as the_geom_webmercator, x as value from generate_series(-3, 3) x `; - const POINTS_SQL = ` + const POINTS_SQL_2 = ` select - st_setsrid(st_makepoint(x*10, x*10), 4326) as the_geom, - st_transform(st_setsrid(st_makepoint(x*10, x*10), 4326), 3857) as the_geom_webmercator, + st_setsrid(st_makepoint(x*10, x*10*(-1)), 4326) as the_geom, + st_transform(st_setsrid(st_makepoint(x*10, x*10*(-1)), 4326), 3857) as the_geom_webmercator, x as value from generate_series(-3, 3) x `; @@ -61,13 +58,13 @@ return function () { { type: 'cartodb', options: { - sql: POINTS_SQL + sql: POINTS_SQL_1 } }, { type: 'cartodb', options: { - sql: POLYGONS_SQL + sql: POINTS_SQL_2 } } ] @@ -104,7 +101,7 @@ return function () { assert.equal(layer1.name, 'layer1'); assert.equal(layer1.features[0].type, 'Feature'); - assert.equal(layer1.features[0].geometry.type, 'Polygon'); + assert.equal(layer1.features[0].geometry.type, 'Point'); done(); }); }); @@ -145,7 +142,7 @@ return function () { assert.equal(layer.name, 'layer1'); assert.equal(layer.features[0].type, 'Feature'); - assert.equal(layer.features[0].geometry.type, 'Polygon'); + assert.equal(layer.features[0].geometry.type, 'Point'); done(); }); From cded5afdcb23b9f5f4bb034f861ba01c1628c5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 16:56:28 +0100 Subject: [PATCH 08/14] Ahh! jshint.. my old friend --- test/acceptance/mvt.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 3953d3b4..424ac95e 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -196,12 +196,14 @@ return function () { assert.deepEqual(body, { "errors": [ - "The layergroup contains incompatible layers: don't mix styled layers with non styled layers (without cartocss)" + "The layergroup contains incompatible layers: " + + "don't mix styled layers with non styled layers (without cartocss)" ], "errors_with_context":[ { "type":"layergroup", - "message": "The layergroup contains incompatible layers: don't mix styled layers with non styled layers (without cartocss)" + "message": "The layergroup contains incompatible layers: " + + "don't mix styled layers with non styled layers (without cartocss)" } ] }); From 496778c276b99af4c547378ccfeb5506221aae8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 18:17:51 +0100 Subject: [PATCH 09/14] Separate suites --- test/acceptance/vector-layergroup.js | 218 +++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 test/acceptance/vector-layergroup.js diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js new file mode 100644 index 00000000..8e811197 --- /dev/null +++ b/test/acceptance/vector-layergroup.js @@ -0,0 +1,218 @@ +require('../support/test_helper'); + +const assert = require('../support/assert'); +const TestClient = require('../support/test-client'); +const serverOptions = require('../../lib/cartodb/server_options'); + + +const POINTS_SQL_1 = ` +select + st_setsrid(st_makepoint(x*10, x*10), 4326) as the_geom, + st_transform(st_setsrid(st_makepoint(x*10, x*10), 4326), 3857) as the_geom_webmercator, + x as value +from generate_series(-3, 3) x +`; + +const POINTS_SQL_2 = ` +select + st_setsrid(st_makepoint(x*10, x*10*(-1)), 4326) as the_geom, + st_transform(st_setsrid(st_makepoint(x*10, x*10*(-1)), 4326), 3857) as the_geom_webmercator, + x as value +from generate_series(-3, 3) x +`; + +function createVectorLayergroup () { + return { + version: '1.6.0', + layers: [ + { + type: 'cartodb', + options: { + sql: POINTS_SQL_1 + } + }, + { + type: 'cartodb', + options: { + sql: POINTS_SQL_2 + } + } + ] + }; +} + +const INCOMPATIBLE_LAYERS_ERROR = { + "errors": [ + "The layergroup contains incompatible layers: " + + "don't mix styled layers with non styled layers (without cartocss)" + ], + "errors_with_context":[ + { + "type":"layergroup", + "message": "The layergroup contains incompatible layers: " + + "don't mix styled layers with non styled layers (without cartocss)" + } + ] +}; + +const INVALID_FORMAT_ERROR = { + "errors": [ + "Invalid format: only mvt format is available for layers without CartoCSS defined" + ], + "errors_with_context":[ + { + "type": "tile", + "message": "Invalid format:" + + " only mvt format is available for layers without CartoCSS defined" + } + ] +}; + +const suites = [{ + desc: 'mvt (mapnik)', + usePostGIS: false +}]; + +if (process.env.POSTGIS_VERSION === '2.4') { + suites.push({ + desc: 'mvt (postgis)', + usePostGIS: true + }); +} + +suites.forEach((suite) => { + const { desc, usePostGIS } = suite; + + describe(desc, function () { + const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; + + before(function () { + serverOptions.renderer.mvt.usePostGIS = usePostGIS; + }); + + after(function (){ + serverOptions.renderer.mvt.usePostGIS = originalUsePostGIS; + }); + + describe('vector-layergroup', function () { + beforeEach(function () { + this.mapConfig = createVectorLayergroup(); + this.testClient = new TestClient(this.mapConfig); + }); + + afterEach(function (done) { + this.testClient.drain(done); + }); + + it('should get vector tiles from layergroup with layers w/o cartocss', function (done) { + this.testClient.getTile(0, 0, 0, { format: 'mvt' }, (err, res, tile) => { + if (err) { + return done(err); + } + + assert.equal(tile.tileSize, 4096); + assert.equal(tile.z, 0); + assert.equal(tile.x, 0); + assert.equal(tile.y, 0); + + const layer0 = JSON.parse(tile.toGeoJSONSync(0)); + + assert.equal(layer0.name, 'layer0'); + assert.equal(layer0.features[0].type, 'Feature'); + assert.equal(layer0.features[0].geometry.type, 'Point'); + + const layer1 = JSON.parse(tile.toGeoJSONSync(1)); + + assert.equal(layer1.name, 'layer1'); + assert.equal(layer1.features[0].type, 'Feature'); + assert.equal(layer1.features[0].geometry.type, 'Point'); + done(); + }); + }); + + it('should get vector tiles from specific layer (layer0)', function (done) { + this.testClient.getTile(0, 0, 0, { format: 'mvt', layers: 0 }, (err, res, tile) => { + if (err) { + return done(err); + } + + assert.equal(tile.tileSize, 4096); + assert.equal(tile.z, 0); + assert.equal(tile.x, 0); + assert.equal(tile.y, 0); + + const layer = JSON.parse(tile.toGeoJSONSync(0)); + + assert.equal(layer.name, 'layer0'); + assert.equal(layer.features[0].type, 'Feature'); + assert.equal(layer.features[0].geometry.type, 'Point'); + + done(); + }); + }); + + it('should get vector tiles from specific layer (layer1)', function (done) { + this.testClient.getTile(0, 0, 0, { format: 'mvt', layers: 1 }, (err, res, tile) => { + if (err) { + return done(err); + } + + assert.equal(tile.tileSize, 4096); + assert.equal(tile.z, 0); + assert.equal(tile.x, 0); + assert.equal(tile.y, 0); + + const layer = JSON.parse(tile.toGeoJSONSync(0)); + + assert.equal(layer.name, 'layer1'); + assert.equal(layer.features[0].type, 'Feature'); + assert.equal(layer.features[0].geometry.type, 'Point'); + + done(); + }); + }); + + it('should fail when the format requested is not mvt', function (done) { + const options = { + format: 'png', + response: { + status: 400, + headers: { + 'Content-Type': 'application/json; charset=utf-8' + } + } + }; + + this.testClient.getTile(0, 0, 0, options, (err, res, body) => { + if (err) { + return done(err); + } + + assert.deepEqual(body, INVALID_FORMAT_ERROR); + done(); + }); + }); + + it('should fail when the map-config mix layers with and without cartocss', function (done) { + const response = { + status: 400, + headers: { + 'Content-Type': 'application/json; charset=utf-8' + } + }; + + this.testClient.mapConfig.layers[0].options.cartocss = '#layer0 { marker-fill: red; marker-width: 10; }'; + this.testClient.mapConfig.layers[0].options.cartocss_version = '2.3.0'; + this.testClient.getLayergroup(response, (err, body) => { + if (err) { + return done(err); + } + + assert.deepEqual(body, INCOMPATIBLE_LAYERS_ERROR); + + done(); + }); + }); + }); + }); +}); From e18e86f565ee27175ec7217442834e9a7e99abb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 29 Nov 2017 18:28:42 +0100 Subject: [PATCH 10/14] jshint, jshint, jshint --- test/acceptance/vector-layergroup.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js index 8e811197..794f8fbc 100644 --- a/test/acceptance/vector-layergroup.js +++ b/test/acceptance/vector-layergroup.js @@ -201,8 +201,12 @@ suites.forEach((suite) => { } }; - this.testClient.mapConfig.layers[0].options.cartocss = '#layer0 { marker-fill: red; marker-width: 10; }'; - this.testClient.mapConfig.layers[0].options.cartocss_version = '2.3.0'; + const cartocss = `#layer0 { marker-fill: red; marker-width: 10; }`; + const cartocssVersion = '2.3.0'; + + this.testClient.mapConfig.layers[0].options.cartocss = cartocss; + this.testClient.mapConfig.layers[0].options.cartocss_version = cartocssVersion; + this.testClient.getLayergroup(response, (err, body) => { if (err) { return done(err); From 23c0cb757d84d8e354ae3f70b1caf7c6e571a69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 1 Dec 2017 13:52:28 +0100 Subject: [PATCH 11/14] Fix tests according to the last changes in windshaft --- test/acceptance/mvt.js | 14 +++++++------- test/acceptance/vector-layergroup.js | 15 +++++++-------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 424ac95e..25544d5e 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -166,12 +166,12 @@ return function () { assert.deepEqual(body, { "errors": [ - "Invalid format: only mvt format is available for layers without CartoCSS defined" + "Unsupported format: 'cartocss' option is missing for png" ], "errors_with_context":[ { "type":"tile", - "message":"Invalid format: only mvt format is available for layers without CartoCSS defined" + "message":"Unsupported format: 'cartocss' option is missing for png" } ] }); @@ -196,14 +196,14 @@ return function () { assert.deepEqual(body, { "errors": [ - "The layergroup contains incompatible layers: " + - "don't mix styled layers with non styled layers (without cartocss)" + "The `mapnik` or `cartodb` layers must be consistent:" + + " `cartocss` option is either present or voided in all layers. Mixing is not allowed." ], "errors_with_context":[ { - "type":"layergroup", - "message": "The layergroup contains incompatible layers: " + - "don't mix styled layers with non styled layers (without cartocss)" + "type":"mapconfig", + "message": "The `mapnik` or `cartodb` layers must be consistent:" + + " `cartocss` option is either present or voided in all layers. Mixing is not allowed." } ] }); diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js index 794f8fbc..54ec29ef 100644 --- a/test/acceptance/vector-layergroup.js +++ b/test/acceptance/vector-layergroup.js @@ -43,27 +43,26 @@ function createVectorLayergroup () { const INCOMPATIBLE_LAYERS_ERROR = { "errors": [ - "The layergroup contains incompatible layers: " + - "don't mix styled layers with non styled layers (without cartocss)" + "The `mapnik` or `cartodb` layers must be consistent:" + + " `cartocss` option is either present or voided in all layers. Mixing is not allowed." ], "errors_with_context":[ { - "type":"layergroup", - "message": "The layergroup contains incompatible layers: " + - "don't mix styled layers with non styled layers (without cartocss)" + "type":"mapconfig", + "message": "The `mapnik` or `cartodb` layers must be consistent:" + + " `cartocss` option is either present or voided in all layers. Mixing is not allowed." } ] }; const INVALID_FORMAT_ERROR = { "errors": [ - "Invalid format: only mvt format is available for layers without CartoCSS defined" + "Unsupported format: 'cartocss' option is missing for png" ], "errors_with_context":[ { "type": "tile", - "message": "Invalid format:" + - " only mvt format is available for layers without CartoCSS defined" + "message": "Unsupported format: 'cartocss' option is missing for png" } ] }; From 169b95809a830b69f6472fab0c402d48ae886325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 4 Dec 2017 13:06:45 +0100 Subject: [PATCH 12/14] Upgrade windshaft to version 4.1.0 --- package.json | 2 +- yarn.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 3cec519f..4f3a2546 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.20.2", "underscore": "~1.6.0", - "windshaft": "cartodb/windshaft#vr-aggretation", + "windshaft": "4.1.0", "yargs": "~5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index d58f2157..92315ec1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -abaculus@cartodb/abaculus#2.0.3-cdb1: +"abaculus@github:cartodb/abaculus#2.0.3-cdb1": version "2.0.3-cdb1" resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/f5f34e1c80cdd8d49edd1d6fe3b2220ab2e23aaf" dependencies: @@ -222,7 +222,7 @@ camshaft@0.59.4: dot "^1.0.3" request "^2.69.0" -canvas@cartodb/node-canvas#1.6.2-cdb2: +"canvas@github:cartodb/node-canvas#1.6.2-cdb2": version "1.6.2-cdb2" resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766" dependencies: @@ -240,14 +240,6 @@ carto@0.16.3: semver "^5.1.0" yargs "^4.2.0" -carto@cartodb/carto#0.15.1-cdb3: - version "0.15.1-cdb3" - resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" - dependencies: - mapnik-reference "~6.0.2" - optimist "~0.6.0" - underscore "1.8.3" - "carto@github:cartodb/carto#0.15.1-cdb1": version "0.15.1-cdb1" resolved "https://codeload.github.com/cartodb/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398" @@ -256,6 +248,14 @@ carto@cartodb/carto#0.15.1-cdb3: optimist "~0.6.0" underscore "~1.6.0" +"carto@github:cartodb/carto#0.15.1-cdb3": + version "0.15.1-cdb3" + resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" + dependencies: + mapnik-reference "~6.0.2" + optimist "~0.6.0" + underscore "1.8.3" + cartocolor@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cartocolor/-/cartocolor-4.0.0.tgz#841a3222d8b5b22718d9d545b1e5b972cb26eb36" @@ -826,9 +826,9 @@ graceful-fs@^4.1.2: version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" -grainstore@~1.6.0: - version "1.6.4" - resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.6.4.tgz#617b93c5e2de8f544375202da89b9208a8b3d762" +grainstore@1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.7.0.tgz#28d78895c82e6201f7d0ff63af1056f3c0fda0d3" dependencies: carto "0.16.3" debug "~3.1.0" @@ -2190,7 +2190,7 @@ through@2: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -tilelive-bridge@cartodb/tilelive-bridge#2.3.1-cdb4: +"tilelive-bridge@github:cartodb/tilelive-bridge#2.3.1-cdb4": version "2.3.1-cdb4" resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/faa2b638da2d119b78281575d40255cb523f6ca6" dependencies: @@ -2198,7 +2198,7 @@ tilelive-bridge@cartodb/tilelive-bridge#2.3.1-cdb4: mapnik-pool "~0.1.3" sphericalmercator "1.0.x" -tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb3: +"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb3": version "0.6.18-cdb3" resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/23bd1c31dd57d0b76c86b9f1eaf62462b3c17d01" dependencies: @@ -2359,9 +2359,9 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -windshaft@cartodb/windshaft#vr-aggretation: - version "4.0.2" - resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/e0cbbafdf7a65537337c3ca185b6fd2f9bac4e59" +windshaft@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.1.0.tgz#dc17c8369570c305171d1ab5ca130369bba04d58" dependencies: abaculus cartodb/abaculus#2.0.3-cdb1 canvas cartodb/node-canvas#1.6.2-cdb2 @@ -2369,7 +2369,7 @@ windshaft@cartodb/windshaft#vr-aggretation: cartodb-psql "^0.10.1" debug "^3.1.0" dot "~1.0.2" - grainstore "~1.6.0" + grainstore "1.7.0" mapnik "3.5.14" queue-async "~1.0.7" redis-mpool "0.4.1" From 0c8a31fad90d25f3c27789e2d818d076bee417d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 4 Dec 2017 13:17:37 +0100 Subject: [PATCH 13/14] Remove duplicated code --- test/acceptance/mvt.js | 180 ----------------------------------------- 1 file changed, 180 deletions(-) diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js index 25544d5e..fa9189f2 100644 --- a/test/acceptance/mvt.js +++ b/test/acceptance/mvt.js @@ -34,186 +34,6 @@ return function () { serverOptions.renderer.mvt.usePostGIS = originalUsePostGIS; }); - describe('vector-layergroup', function () { - const POINTS_SQL_1 = ` - select - st_setsrid(st_makepoint(x*10, x*10), 4326) as the_geom, - st_transform(st_setsrid(st_makepoint(x*10, x*10), 4326), 3857) as the_geom_webmercator, - x as value - from generate_series(-3, 3) x - `; - - const POINTS_SQL_2 = ` - select - st_setsrid(st_makepoint(x*10, x*10*(-1)), 4326) as the_geom, - st_transform(st_setsrid(st_makepoint(x*10, x*10*(-1)), 4326), 3857) as the_geom_webmercator, - x as value - from generate_series(-3, 3) x - `; - - function createVectorLayergroup () { - return { - version: '1.6.0', - layers: [ - { - type: 'cartodb', - options: { - sql: POINTS_SQL_1 - } - }, - { - type: 'cartodb', - options: { - sql: POINTS_SQL_2 - } - } - ] - }; - } - - beforeEach(function () { - this.mapConfig = createVectorLayergroup(); - this.testClient = new TestClient(this.mapConfig); - }); - - afterEach(function (done) { - this.testClient.drain(done); - }); - - it('should get vector tiles from layergroup with layers w/o cartocss', function (done) { - this.testClient.getTile(0, 0, 0, { format: 'mvt' }, (err, res, tile) => { - if (err) { - return done(err); - } - - assert.equal(tile.tileSize, 4096); - assert.equal(tile.z, 0); - assert.equal(tile.x, 0); - assert.equal(tile.y, 0); - - const layer0 = JSON.parse(tile.toGeoJSONSync(0)); - - assert.equal(layer0.name, 'layer0'); - assert.equal(layer0.features[0].type, 'Feature'); - assert.equal(layer0.features[0].geometry.type, 'Point'); - - const layer1 = JSON.parse(tile.toGeoJSONSync(1)); - - assert.equal(layer1.name, 'layer1'); - assert.equal(layer1.features[0].type, 'Feature'); - assert.equal(layer1.features[0].geometry.type, 'Point'); - done(); - }); - }); - - it('should get vector tiles from specific layer (layer0)', function (done) { - this.testClient.getTile(0, 0, 0, { format: 'mvt', layers: 0 }, (err, res, tile) => { - if (err) { - return done(err); - } - - assert.equal(tile.tileSize, 4096); - assert.equal(tile.z, 0); - assert.equal(tile.x, 0); - assert.equal(tile.y, 0); - - const layer = JSON.parse(tile.toGeoJSONSync(0)); - - assert.equal(layer.name, 'layer0'); - assert.equal(layer.features[0].type, 'Feature'); - assert.equal(layer.features[0].geometry.type, 'Point'); - - done(); - }); - }); - - it('should get vector tiles from specific layer (layer1)', function (done) { - this.testClient.getTile(0, 0, 0, { format: 'mvt', layers: 1 }, (err, res, tile) => { - if (err) { - return done(err); - } - - assert.equal(tile.tileSize, 4096); - assert.equal(tile.z, 0); - assert.equal(tile.x, 0); - assert.equal(tile.y, 0); - - const layer = JSON.parse(tile.toGeoJSONSync(0)); - - assert.equal(layer.name, 'layer1'); - assert.equal(layer.features[0].type, 'Feature'); - assert.equal(layer.features[0].geometry.type, 'Point'); - - done(); - }); - }); - - it('should fail when the format requested is not mvt', function (done) { - const options = { - format: 'png', - response: { - status: 400, - headers: { - 'Content-Type': 'application/json; charset=utf-8' - } - } - }; - - this.testClient.getTile(0, 0, 0, options, (err, res, body) => { - if (err) { - return done(err); - } - - assert.deepEqual(body, { - "errors": [ - "Unsupported format: 'cartocss' option is missing for png" - ], - "errors_with_context":[ - { - "type":"tile", - "message":"Unsupported format: 'cartocss' option is missing for png" - } - ] - }); - done(); - }); - }); - - it('should fail when the map-config mix layers with and without cartocss', function (done) { - const response = { - status: 400, - headers: { - 'Content-Type': 'application/json; charset=utf-8' - } - }; - - this.testClient.mapConfig.layers[0].options.cartocss = '#layer0 { marker-fill: red; marker-width: 10; }'; - this.testClient.mapConfig.layers[0].options.cartocss_version = '2.3.0'; - this.testClient.getLayergroup(response, (err, body) => { - if (err) { - return done(err); - } - - assert.deepEqual(body, { - "errors": [ - "The `mapnik` or `cartodb` layers must be consistent:" + - " `cartocss` option is either present or voided in all layers. Mixing is not allowed." - ], - "errors_with_context":[ - { - "type":"mapconfig", - "message": "The `mapnik` or `cartodb` layers must be consistent:" + - " `cartocss` option is either present or voided in all layers. Mixing is not allowed." - } - ] - }); - - done(); - }); - }); - - }); - describe('analysis-layers-dataviews-mvt', function () { function createMapConfig(layers, dataviews, analysis) { From 565cfb7fbe8e09bab95fe91c6e44f3c438bd32e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 4 Dec 2017 13:23:09 +0100 Subject: [PATCH 14/14] Update NEWS --- NEWS.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.md b/NEWS.md index e38e1db6..e8086f24 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,11 +1,21 @@ # Changelog +## 4.2.0 +Released 2017-mm-dd + +Announcements: + + - Allow to request MVT tiles without CartoCSS + - Upgrades windshaft to [4.1.0](https://github.com/CartoDB/windshaft/releases/tag/4.1.0). + + ## 4.1.1 Released 2017-11-29 Announcements: - Upgrades turbo-carto to [0.20.2](https://github.com/CartoDB/turbo-carto/releases/tag/0.20.2). + ## 4.1.0 Released 2017-mm-dd