Simplify condition and use positive naming for parsing cartocss

2016-05-19 11:48:57 +02:00
parent 31344a1c75
commit 573932efba
1 changed files with 4 additions and 10 deletions
@@ -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;
 }