Merge branch 'master' into turbo-carto-tokens

2016-05-19 16:56:00 +02:00
parent 64dd033c94 d74daf39c7
commit 14a0afc7c0
6 changed files with 76 additions and 35 deletions
@@ -38,7 +38,12 @@ PostgresDatasource.prototype.getName = function () {
 };

 PostgresDatasource.prototype.getRamp = function (column, buckets, method, callback) {
-    var methodName = methods.hasOwnProperty(method) ? method : 'quantiles';
+    if (method && !methodTemplates.hasOwnProperty(method)) {
+        return callback(new Error(
+            'Invalid method "' + method + '", valid methods: [' + Object.keys(methodTemplates).join(',') + ']'
+        ));
+    }
+    var methodName = method || 'quantiles';
    var template = methodTemplates[methodName];

    var query = template({ _column: column, _sql: this.query, _buckets: buckets });