Merge branch 'master' of github.com:mapbox/carto

test/rendering-mss/issue_284_b.mss

@@ -0,0 +1,18 @@
+#roads_high::inline {
+  [type='primary'] {
+    line-color: darkred;
+  }
+  [foo='bar'] {
+    line-width: 11;
+  }
+}
+
+#roads_high::outline {
+  [type='primary'] {
+    line-color: red;
+  }
+  [foo='bar'] {
+    line-width: 10;
+  }
+}
+

test/rendering-mss/issue_284_b.xml

@@ -0,0 +1,28 @@
+<Style name="style-outline" filter-mode="first">
+  <Rule>
+    <Filter>([foo] = 'bar') and ([type] = 'primary')</Filter>
+    <LineSymbolizer stroke-width="10" stroke="#ff0000" />
+  </Rule>
+  <Rule>
+    <Filter>([foo] = 'bar')</Filter>
+    <LineSymbolizer stroke-width="10" />
+  </Rule>
+  <Rule>
+    <Filter>([type] = 'primary')</Filter>
+    <LineSymbolizer stroke="#ff0000" />
+  </Rule>
+</Style>
+<Style name="style-inline" filter-mode="first">
+  <Rule>
+    <Filter>([foo] = 'bar') and ([type] = 'primary')</Filter>
+    <LineSymbolizer stroke-width="11" stroke="#8b0000" />
+  </Rule>
+  <Rule>
+    <Filter>([foo] = 'bar')</Filter>
+    <LineSymbolizer stroke-width="11" />
+  </Rule>
+  <Rule>
+    <Filter>([type] = 'primary')</Filter>
+    <LineSymbolizer stroke="#8b0000" />
+  </Rule>
+</Style>

test/rendering-mss/issue_284_c.mss

@@ -0,0 +1,18 @@
+#roads_high {
+  [type='primary'] {
+    line-color: darkred;
+  }
+  [foo='bar'] {
+    line-width: 11;
+  }
+}
+
+#roads_high {
+  [type='primary'] {
+    line-color: red;
+  }
+  [foo='bar'] {
+    line-width: 10;
+  }
+}
+

test/rendering-mss/issue_284_c.xml

@@ -0,0 +1,14 @@
+<Style name="style" filter-mode="first">
+  <Rule>
+    <Filter>([foo] = 'bar') and ([type] = 'primary')</Filter>
+    <LineSymbolizer stroke-width="10" stroke="#ff0000" />
+  </Rule>
+  <Rule>
+    <Filter>([foo] = 'bar')</Filter>
+    <LineSymbolizer stroke-width="10" />
+  </Rule>
+  <Rule>
+    <Filter>([type] = 'primary')</Filter>
+    <LineSymbolizer stroke="#ff0000" />
+  </Rule>
+</Style>