Rename _shouldOverrideRange & _shouldOverrideBins methods

This commit is contained in:
Daniel García Aubert
2017-09-12 10:14:55 +02:00
parent 3a936474cf
commit 2576c3e7d5
3 changed files with 12 additions and 12 deletions
@@ -59,17 +59,23 @@ module.exports = class BaseHistogram extends BaseDataview {
});
}
_hasOverridenRange (override) {
return override && override.hasOwnProperty('start') && override.hasOwnProperty('end');
}
_getBinStart (override = {}) {
if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) {
if (this._hasOverridenRange(override)) {
return Math.min(override.start, override.end);
}
return override.start || 0;
}
_getBinEnd (override = {}) {
if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) {
if (this._hasOverridenRange(override)) {
return Math.max(override.start, override.end);
}
return override.end || 0;
}
@@ -177,9 +177,7 @@ module.exports = class DateHistogram extends BaseHistogram {
_buildQueryTpl (ctx) {
return `
WITH
${ctx._override && ctx._override.hasOwnProperty('start') && ctx._override.hasOwnProperty('end') ?
dateOverrideBasicsQueryTpl(ctx) :
dateBasicsQueryTpl(ctx)},
${this._hasOverridenRange(ctx._override) ? dateOverrideBasicsQueryTpl(ctx) : dateBasicsQueryTpl(ctx)},
${dateBinsQueryTpl(ctx)},
${nullsQueryTpl(ctx)}
${dateHistogramQueryTpl(ctx)}
@@ -186,8 +186,8 @@ module.exports = class NumericHistogram extends BaseHistogram {
return `
WITH
${filteredQueryTpl(ctx)},
${this._shouldOverrideRange(ctx._override) ? overrideBasicsQueryTpl(ctx) : basicsQueryTpl(ctx)},
${this._shouldOverrideBins(ctx._override) ?
${this._hasOverridenRange(ctx._override) ? overrideBasicsQueryTpl(ctx) : basicsQueryTpl(ctx)},
${this._hasOverridenBins(ctx._override) ?
overrideBinsQueryTpl(ctx) :
`${iqrQueryTpl(ctx)}, ${binsQueryTpl(ctx)}`
},
@@ -197,11 +197,7 @@ module.exports = class NumericHistogram extends BaseHistogram {
`;
}
_shouldOverrideRange (override) {
return override && override.hasOwnProperty('start') && override.hasOwnProperty('end');
}
_shouldOverrideBins (override) {
_hasOverridenBins (override) {
return override && override.hasOwnProperty('bins');
}