Merge remote-tracking branch 'origin/master' into analysis-layers

2016-04-07 15:04:25 +02:00
parent 1c250bf243 c974b91c6b
commit efacafaa0d
5 changed files with 240 additions and 75 deletions
@@ -477,7 +477,11 @@ o.instance = function(template, params) {
  var layergroup = JSON.parse(JSON.stringify(template.layergroup));
  for (var i=0; i<layergroup.layers.length; ++i) {
    var lyropt = layergroup.layers[i].options;
-    if ( lyropt.cartocss ) {
+
+    if ( params.styles && params.styles[i] ) {
+        // dynamic styling for this layer
+        lyropt.cartocss = params.styles[i];
+    } else if ( lyropt.cartocss ) {
        lyropt.cartocss = _replaceVars(lyropt.cartocss, all_params);
    }
    if ( lyropt.sql) {