Move points to avoid x/y axes

This commit is contained in:
Daniel García Aubert 2019-03-12 15:18:31 +01:00
parent 8324d4c4c2
commit 6b2ad8826b

View File

@ -8,8 +8,8 @@ const TestClient = require('../support/test-client');
const POINTS_SQL_1 = `
select
x + 4 as cartodb_id,
st_setsrid(st_makepoint(x*10, x*10), 4326) as the_geom,
st_transform(st_setsrid(st_makepoint(x*10 + 10, x*10 + 10), 4326), 3857) as the_geom_webmercator,
st_setsrid(st_makepoint(x*10 + 18, x*10 + 5), 4326) as the_geom,
st_transform(st_setsrid(st_makepoint(x*10 + 18, x*10 + 5), 4326), 3857) as the_geom_webmercator,
x as value,
CASE
WHEN x % 2 = 0 THEN 'even'
@ -62,14 +62,14 @@ describe('cluster', function () {
}
assert.deepStrictEqual(body, {
errors:[ 'Map 22771437ab05d49179f535c790a347c3 has no aggregation defined for layer 0' ],
errors:[ 'Map f697fb370c6479559ae2f66d684e8227 has no aggregation defined for layer 0' ],
errors_with_context:[
{
layer: {
index: '0',
type: 'cartodb'
},
message: 'Map 22771437ab05d49179f535c790a347c3 has no aggregation defined for layer 0',
message: 'Map f697fb370c6479559ae2f66d684e8227 has no aggregation defined for layer 0',
subtype: 'aggregation',
type: 'layer'
}
@ -104,14 +104,14 @@ describe('cluster', function () {
}
assert.deepStrictEqual(body, {
errors:[ 'Map c7fbde4bbf7cc73692b4f3767d5c6604 has no aggregation defined for layer 0' ],
errors:[ 'Map 7521bcd1029c401289dd651ce91d5d9d has no aggregation defined for layer 0' ],
errors_with_context:[
{
layer: {
index: '0',
type: 'cartodb'
},
message: 'Map c7fbde4bbf7cc73692b4f3767d5c6604 has no aggregation defined for layer 0',
message: 'Map 7521bcd1029c401289dd651ce91d5d9d has no aggregation defined for layer 0',
subtype: 'aggregation',
type: 'layer'
}
@ -215,8 +215,7 @@ describe('cluster', function () {
resolution: 50,
expected: [
{ cartodb_id: 1, value: -3, type: 'odd' },
{ cartodb_id: 2, value: -2, type: 'even' },
{ cartodb_id: 3, value: -1, type: 'odd' }
{ cartodb_id: 2, value: -2, type: 'even' }
]
},
{
@ -278,8 +277,7 @@ describe('cluster', function () {
resolution: 50,
expected: [
{ cartodb_id: 1, value: -3, type: 'odd' },
{ cartodb_id: 2, value: -2, type: 'even'},
{ cartodb_id: 3, value: -1, type: 'odd' }
{ cartodb_id: 2, value: -2, type: 'even'}
]
},
{
@ -288,8 +286,7 @@ describe('cluster', function () {
resolution: 50,
expected: [
{ cartodb_id: 4, value: 0, type: 'even' },
{ cartodb_id: 5, value: 1, type: 'odd' },
{ cartodb_id: 6, value: 2, type: 'even' }
{ cartodb_id: 5, value: 1, type: 'odd' }
]
}
];
@ -381,7 +378,7 @@ describe('cluster', function () {
aggregation: { columns: ['type'] },
expected: [
{ _cdb_feature_count: 1, type: 'even' },
{ _cdb_feature_count: 2, type: 'odd' }
{ _cdb_feature_count: 1, type: 'odd' }
]
},
{
@ -514,7 +511,7 @@ describe('cluster', function () {
},
expected: [
{ _cdb_feature_count: 1, type: 'even', max_value: -2 },
{ _cdb_feature_count: 2, type: 'odd', max_value: -1 }
{ _cdb_feature_count: 1, type: 'odd', max_value: -3 }
]
},
{