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

Merge branch 'vr-aggregation' into mapconfig-aggregation

Browse Source
This commit is contained in:
Daniel García Aubert
2017-12-01 16:23:54 +01:00
parent 0887e5d5f7 23c0cb757d
commit b7c6f5acdf
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/mvt.js
+7 -7
View File
@@ -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."
}
]
});
test/acceptance/vector-layergroup.js
+7 -8
View File
@@ -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"
}
]
};