fix issue #370

mapbox · Feb 27, 2016 · ad39e0b · ad39e0b
1 parent 2c911fe
commit ad39e0b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/lib/carto/tree/filterset.js b/lib/carto/tree/filterset.js
@@ -209,14 +209,6 @@ tree.Filterset.prototype.add = function(filter, env) {
     } else if (op === '=~') {
         this.filters[key + '=~' + filter.val] = filter;
     } else if (op === '>') {
-        // If there are other filters that are also >
-        // but are less than this one, they don't matter, so
-        // remove them.
-        for (var j in this.filters) {
-            if (this.filters[j].key == key && this.filters[j].val <= filter.val) {
-                delete this.filters[j];
-            }
-        }
         this.filters[key + '>'] = filter;
     } else if (op === '>=') {
         for (var k in this.filters) {

diff --git a/test/filterset.test.js b/test/filterset.test.js
@@ -225,12 +225,12 @@ describe('Filtersets', function() {
         f = new tree.Filterset();
         f.add({ key: 'TOTAL', op: '!=', val: '11' });
         f.add({ key: 'TOTAL', op: '>',  val:  11 });
-        assert.deepEqual(f.filters, { 'TOTAL>':   { key: 'TOTAL', op: '>',  val:  11 }});
+        assert.deepEqual(f.filters, {"TOTAL!=11":{"key":"TOTAL","op":"!=","val":"11"},"TOTAL>":{"key":"TOTAL","op":">","val":11}});
 
         f = new tree.Filterset();
         f.add({ key: 'TOTAL', op: '!=', val: '11' });
         f.add({ key: 'TOTAL', op: '>',  val:  90 });
-        assert.deepEqual(f.filters, { 'TOTAL>':   { key: 'TOTAL', op: '>',  val:  90 }});
+        assert.deepEqual(f.filters, {"TOTAL!=11":{"key":"TOTAL","op":"!=","val":"11"},"TOTAL>":{"key":"TOTAL","op":">","val":90}});
 
         f = new tree.Filterset();
         f.add({ key: 'TOTAL', op: '!=', val: '11' });

diff --git a/test/rendering-mss/issue_370.mss b/test/rendering-mss/issue_370.mss
@@ -0,0 +1,3 @@
+[way_pixels < 192000][way_pixels > 3000] { 
+  line-width: 1;
+}
diff --git a/test/rendering-mss/issue_370.xml b/test/rendering-mss/issue_370.xml
@@ -0,0 +1,6 @@
+<Style name="style" filter-mode="first">
+  <Rule>
+    <Filter>([way_pixels] &lt; 192000) and ([way_pixels] &gt; 3000)</Filter>
+    <LineSymbolizer stroke-width="1" />
+  </Rule>
+</Style>
diff --git a/test/rendering-mss/issue_370_b.mss b/test/rendering-mss/issue_370_b.mss
@@ -0,0 +1,3 @@
+[way_pixels <= 192000][way_pixels >= 3000] { 
+  line-width: 1;
+}
diff --git a/test/rendering-mss/issue_370_b.xml b/test/rendering-mss/issue_370_b.xml
@@ -0,0 +1,6 @@
+<Style name="style" filter-mode="first">
+  <Rule>
+    <Filter>([way_pixels] &lt;= 192000) and ([way_pixels] &gt;= 3000)</Filter>
+    <LineSymbolizer stroke-width="1" />
+  </Rule>
+</Style>