don't output style if opacity and comp-op are defaults - refs less#219 …

…and less#339
CartoDB · Apr 28, 2014 · 4b38632 · 4b38632
1 parent 4f771ed
commit 4b38632
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/carto/tree/style.js b/lib/carto/tree/style.js
@@ -53,11 +53,11 @@ tree.StyleXML = function(name, attachment, definitions, env) {
  }).value().join(',') + '"';
  }
 
- if (comp_op.length) {
+ if (comp_op.length && comp_op[0].value.ev(env).value != 'src-over') {
  attrs_xml += ' comp-op="' + comp_op[0].value.ev(env).toString() + '"';
  }
 
- if (opacity.length) {
+ if (opacity.length && opacity[0].value.ev(env).value != 1) {
  attrs_xml += ' opacity="' + opacity[0].value.ev(env).toString() + '"';
  }
  var rule_string = rules.join('');

diff --git a/test/rendering-mss/issue_339b.mss b/test/rendering-mss/issue_339b.mss
@@ -0,0 +1,4 @@
+#poi_label[maki=''] {
+ opacity:1.0;
+ comp-op:src-over;
+}
diff --git a/test/rendering-mss/issue_339b.xml b/test/rendering-mss/issue_339b.xml