From 1ddefbe8eb59d9788e15c9905d0968368c4d0137 Mon Sep 17 00:00:00 2001
From: Jan Marsch <jama@keks.com>
Date: Wed, 20 Aug 2014 15:44:38 +0200
Subject: [PATCH] env parameter added to several function calls

filtercondition-value now properly quotes strings
---
 lib/carto/renderer_js.js     |  2 +-
 lib/carto/tree/definition.js | 12 ++++++------
 lib/carto/tree/filterset.js  |  5 ++---
 lib/carto/tree/value.js      |  4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/carto/renderer_js.js b/lib/carto/renderer_js.js
index 2d9a518..b0fa38d 100644
--- a/lib/carto/renderer_js.js
+++ b/lib/carto/renderer_js.js
@@ -201,7 +201,7 @@ CartoCSS.prototype = {
         });
         layer.frames = [];
         layer.zoom = tree.Zoom.all;
-        var props = def.toJS();
+        var props = def.toJS(parse_env);
         console.log("props", props);
         for(var v in props) {
           var lyr = layer[v] = layer[v] || {
diff --git a/lib/carto/tree/definition.js b/lib/carto/tree/definition.js
index d9f4f64..8e4ee0b 100644
--- a/lib/carto/tree/definition.js
+++ b/lib/carto/tree/definition.js
@@ -208,14 +208,14 @@ tree.Definition.prototype.toXML = function(env, existing) {
     return xml;
 };
 
-tree.Definition.prototype.toJS = function() {
+tree.Definition.prototype.toJS = function(env) {
   var shaderAttrs = {};
 
   // merge conditions from filters with zoom condition of the
   // definition
   var zoom = "(" + this.zoom + " & (1 << ctx.zoom))";
   var frame_offset = this.frame_offset;
-  var _if = this.filters.toJS();
+  var _if = this.filters.toJS(env);
   var filters = [zoom];
   if(_if) filters.push(_if);
   if(frame_offset) filters.push('ctx["frame-offset"] === ' + frame_offset);
@@ -230,19 +230,19 @@ tree.Definition.prototype.toJS = function() {
         };
 
         if (_if) {
-          r.js = "if(" + _if + "){" + rule.value.toJS() + "}"
+          r.js = "if(" + _if + "){" + rule.value.toJS(env) + "}"
         } else {
-          r.js = rule.value.toJS();
+          r.js = rule.value.toJS(env);
         }
 
-        r.constant = rule.value.ev().is !== 'field';
+        r.constant = rule.value.ev(env).is !== 'field';
         r.filtered = !!_if;
 
         shaderAttrs[rule.name].push(r);
       } else {
         throw new Error("Ruleset not supported");
         //if (rule instanceof tree.Ruleset) {
-          //var sh = rule.toJS();
+          //var sh = rule.toJS(env);
           //for(var v in sh) {
             //shaderAttrs[v] = shaderAttrs[v] || [];
             //for(var attr in sh[v]) {
diff --git a/lib/carto/tree/filterset.js b/lib/carto/tree/filterset.js
index 0fd7ba7..8ca49cc 100644
--- a/lib/carto/tree/filterset.js
+++ b/lib/carto/tree/filterset.js
@@ -90,11 +90,10 @@ tree.Filterset.prototype.toJS = function(env) {
     if(filter._val !== undefined) {
       val = filter._val.toString(true);
     }
-
     var attrs = "data";
-    return attrs + "." + filter.key.value  + " " + op + " " + val;
+    return attrs + "." + filter.key.value  + " " + op + " " + (val.is === 'string' ? "'"+ val +"'" : val);
   }).join(' && ');
-}
+};
 
 // Returns true when the new filter can be added, false otherwise.
 // It can also return null, and on the other side we test for === true or
diff --git a/lib/carto/tree/value.js b/lib/carto/tree/value.js
index 2ecc2b9..a02353d 100644
--- a/lib/carto/tree/value.js
+++ b/lib/carto/tree/value.js
@@ -28,9 +28,9 @@ tree.Value.prototype = {
         return obj;
     },
 
-    toJS: function() {
+    toJS: function(env) {
       //var v = this.value[0].value[0];
-      var val = this.ev();
+      var val = this.ev(env);
       var v = val.toString();
       if(val.is === "color" || val.is === 'uri' || val.is === 'string' || val.is === 'keyword') {
         v = "'" + v + "'";