Use the layer's sql if available

Partial fix to CartoDB#205. Attempt to use the layer's sql in its options, if this fails create the sql statement as it was previously.
ebrelsford · Dec 9, 2015 · a477756 · a477756
1 parent 59e194e
commit a477756
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/sandbox/scroll.html b/sandbox/scroll.html
@@ -97,7 +97,11 @@
                       layer_name = layer.layers[0].options.layer_name,
                       filter = actions.global.cartodb_filter ? " WHERE "+actions.global.cartodb_filter : "";
 
-                  sublayer.setSQL("SELECT * FROM "+layer_name+filter)
+                  var sql = layer.layers[0].options.sql;
+                  if (!sql) {
+                      sql = "SELECT * FROM "+layer_name+filter;
+                  }
+                  sublayer.setSQL(sql);
 
                   self.map.addLayer(layer);
 

diff --git a/sandbox/slides.html b/sandbox/slides.html
@@ -169,7 +169,11 @@
                       layer_name = layer.layers[0].options.layer_name,
                       filter = actions.global.cartodb_filter ? " WHERE "+actions.global.cartodb_filter : "";
 
-                  sublayer.setSQL("SELECT * FROM "+layer_name+filter)
+                  var sql = layer.layers[0].options.sql;
+                  if (!sql) {
+                      sql = "SELECT * FROM "+layer_name+filter;
+                  }
+                  sublayer.setSQL(sql);
 
                   self.map.addLayer(layer);