From 573932efba82b4e52d0df5eabee7254a41e5fcb1 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 19 May 2016 11:48:57 +0200 Subject: [PATCH] Simplify condition and use positive naming for parsing cartocss --- lib/cartodb/utils/style/turbo-carto-adapter.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/cartodb/utils/style/turbo-carto-adapter.js b/lib/cartodb/utils/style/turbo-carto-adapter.js index d1c0c81f..fa754835 100644 --- a/lib/cartodb/utils/style/turbo-carto-adapter.js +++ b/lib/cartodb/utils/style/turbo-carto-adapter.js @@ -32,10 +32,8 @@ TurboCartoAdapter.prototype.getLayers = function (username, layers, callback) { }; TurboCartoAdapter.prototype._parseCartoCss = function (username, layer, callback) { - if (isNotLayerToParseCartocss(layer)) { - return process.nextTick(function () { - callback(null, layer); - }); + if (!shouldParseLayerCartocss(layer)) { + return callback(null, layer); } var sql = SubstitutionTokens.replace(layer.options.sql, { @@ -61,10 +59,6 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, layer, callback }); }; -function isNotLayerToParseCartocss(layer) { - if (!layer || !layer.options || !layer.options.cartocss || !layer.options.sql) { - return true; - } - - return false; +function shouldParseLayerCartocss(layer) { + return layer && layer.options && layer.options.cartocss && layer.options.sql; }