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] 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) {