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

Improve error message

Browse Source
This commit is contained in:
Daniel García Aubert 2017-12-05 17:44:52 +01:00
parent 81d99ca655
commit e7592ee570
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
View File

@ -1,7 +1,8 @@
const AggregationProxy = require('../../aggregation/aggregation-proxy'); const AggregationProxy = require('../../aggregation/aggregation-proxy');
const { MapConfig } = require('windshaft').model; const { MapConfig } = require('windshaft').model;
const MISSING_AGGREGATION_COLUMNS = 'There are missing columns to perform aggregation'; const MISSING_AGGREGATION_COLUMNS = 'Missing columns in the aggregation. The map-config defines cartocss expressions,'+
' interactivity fields or attributes that are not present in the aggregation';
module.exports = class AggregationMapConfigAdapter { module.exports = class AggregationMapConfigAdapter {
getMapConfig (user, requestMapConfig, params, context, callback) { getMapConfig (user, requestMapConfig, params, context, callback) {

5
test/acceptance/aggregation.js
View File

@ -3,7 +3,8 @@ require('../support/test_helper');
const assert = require('../support/assert'); const assert = require('../support/assert');
const TestClient = require('../support/test-client'); const TestClient = require('../support/test-client');
const serverOptions = require('../../lib/cartodb/server_options'); const serverOptions = require('../../lib/cartodb/server_options');
const MISSING_AGGREGATION_COLUMNS = 'There are missing columns to perform aggregation'; const MISSING_AGGREGATION_COLUMNS = 'Missing columns in the aggregation. The map-config defines cartocss expressions,'+
' interactivity fields or attributes that are not present in the aggregation';
const suites = [{ const suites = [{
desc: 'mvt (mapnik)', desc: 'mvt (mapnik)',
@ -61,7 +62,7 @@ describe('aggregation', function () {
suites.forEach((suite) => { suites.forEach((suite) => {
const { desc, usePostGIS } = suite; const { desc, usePostGIS } = suite;
describe.only(desc, function () { describe(desc, function () {
const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS;
before(function () { before(function () {