Merge pull request #365 from mapbox/variable-transforms-test-coverage

Add support for variable transforms - refs #163, and improve test covera...

lib/carto/tree/call.js

@@ -78,6 +78,7 @@ tree.Call.prototype = {
                 };
             }
             if (fn !== args.length &&
+                !(Array.isArray(fn) && _.include(fn, args.length)) &&
                 // support variable-arg functions like `colorize-alpha`
                 fn !== -1) {
                 env.error({

lib/carto/tree/reference.js

@@ -12,6 +12,14 @@ ref.setData = function(data) {
     ref.data = data;
     ref.selector_cache = generateSelectorCache(data);
     ref.mapnikFunctions = generateMapnikFunctions(data);
+
+    ref.mapnikFunctions.matrix = [6];
+    ref.mapnikFunctions.translate = [1, 2];
+    ref.mapnikFunctions.scale = [1, 2];
+    ref.mapnikFunctions.rotate = [1, 3];
+    ref.mapnikFunctions.skewX = [1];
+    ref.mapnikFunctions.skewY = [1];
+
     ref.required_cache = generateRequiredProperties(data);
 };
 

test/errorhandling/bad_op.mml

@@ -0,0 +1,15 @@
+{
+    "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+    "Stylesheet": [
+        "bad_op.mss"
+    ],
+    "Layer": [{
+        "id": "world",
+        "name": "world",
+        "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+        "Datasource": {
+            "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
+            "type": "shape"
+        }
+    }]
+}

test/errorhandling/bad_op.mss

@@ -0,0 +1,3 @@
+#world {
+    line-width: 20% + 2px;
+}

test/errorhandling/bad_op.result

@@ -0,0 +1 @@
+bad_op.mss:2:4 If two operands differ, the first must not be %

test/errorhandling/bad_op_2.mml

@@ -0,0 +1,15 @@
+{
+    "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+    "Stylesheet": [
+        "bad_op_2.mss"
+    ],
+    "Layer": [{
+        "id": "world",
+        "name": "world",
+        "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+        "Datasource": {
+            "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
+            "type": "shape"
+        }
+    }]
+}

test/errorhandling/bad_op_2.mss

@@ -0,0 +1,3 @@
+#world {
+    line-width: 20px * 2%;
+}

test/errorhandling/bad_op_2.result

@@ -0,0 +1 @@
+bad_op_2.mss:2:4 Percent values can only be added or subtracted from other values

test/errorhandling/invaliddimension.mml

@@ -0,0 +1,15 @@
+{
+    "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+    "Stylesheet": [
+        "invaliddimension.mss"
+    ],
+    "Layer": [{
+        "id": "world",
+        "name": "world",
+        "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+        "Datasource": {
+            "file": "http://tilemill-data.s3.amazonaws.com/test_data/shape_demo.zip",
+            "type": "shape"
+        }
+    }]
+}

test/errorhandling/invaliddimension.mss

@@ -0,0 +1,3 @@
+#world {
+    line-width: 10wifflewaffles;
+}

test/errorhandling/invaliddimension.result

@@ -0,0 +1 @@
+invaliddimension.mss:2:4 Invalid unit: 'wifflewaffles'

test/rendering/transforms.mss

@@ -2,4 +2,6 @@
 #world {
   point-file: url(foo.png);
   point-transform: translate( @trans * 2, @trans);
+  marker-width: 2;
+  marker-transform: scale(2);
 }

test/rendering/transforms.result

@@ -3,9 +3,10 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
 
 
-<Style name="world" filter-mode="first" >
+<Style name="world" filter-mode="first">
   <Rule>
     <PointSymbolizer file="[absolute path]" transform="translate(4,2)" />
+    <MarkersSymbolizer width="2" transform="scale(2)" />
   </Rule>
 </Style>
 <Layer name="world"