[not ready!] vt processors

index.js

@@ -7,6 +7,7 @@ var fs = require('fs');
 var qs = require('querystring');
 var sm = new (require('sphericalmercator'))();
 var immediate = global.setImmediate || process.nextTick;
+var vtfx = require('vtfx');
 
 // Register datasource plugins
 mapnik.register_default_input_plugins();
@@ -97,12 +98,13 @@ Bridge.prototype.getTile = function(z, x, y, callback) {
     var source = this;
     source._map.acquire(function(err, map) {
         if (err) return callback(err);
-
         // set source _maxzoom cache to prevent repeat calls to map.parameters
         if (source._maxzoom === undefined) {
             source._maxzoom = map.parameters.maxzoom ? parseInt(map.parameters.maxzoom, 10) : 14;
         }
 
+        source._vtfx = map.parameters.vtfx ? JSON.parse(map.parameters.vtfx) : null;
+
         // set source _type cache to prevent repeat calls to map layers
         if (source._type === undefined) {
             var layers = map.layers();
@@ -174,30 +176,41 @@ Bridge.getVector = function(source, map, z, x, y, callback) {
             if (err) return callback(err);
 
             var buffer = image.getData();
-            zlib.gzip(buffer, function(err, pbfz) {
-                if (err) return callback(err);
 
-                headers['Content-Encoding'] = 'gzip';
+            if (source._vtfx && Object.keys(source._vtfx).length) {
+                vtfx(buffer, source._vtfx, function(err, buffer) {
+                    zip(buffer);
+                });
+            } else {
+                zip(buffer);
+            }
 
-                // Solid handling.
-                if (solid === false) return callback(err, pbfz, headers);
+            function zip(buffer){
+                zlib.gzip(buffer, function(err, pbfz) {
+                    if (err) return callback(err);
 
-                // Empty tiles are equivalent to no tile.
-                if (source._blank || !key) return callback(new Error('Tile does not exist'));
+                    headers['Content-Encoding'] = 'gzip';
 
-                // Fake a hex code by md5ing the buffer. The key generated by
-                // node-mapnik for vector tiles is not reliably different for
-                // "solid" tiles with different contents.
-                var mockrgb = crypto.createHash('md5').update(buffer).digest('hex').substr(0,6);
-                pbfz.solid = [
-                    parseInt(mockrgb.substr(0,2),16),
-                    parseInt(mockrgb.substr(2,2),16),
-                    parseInt(mockrgb.substr(4,2),16),
-                    1
-                ].join(',');
+                    // Solid handling.
+                    if (solid === false) return callback(err, pbfz, headers);
 
-                return callback(err, pbfz, headers);
-            });
+                    // Empty tiles are equivalent to no tile.
+                    if (source._blank || !key) return callback(new Error('Tile does not exist'));
+
+                    // Fake a hex code by md5ing the buffer. The key generated by
+                    // node-mapnik for vector tiles is not reliably different for
+                    // "solid" tiles with different contents.
+                    var mockrgb = crypto.createHash('md5').update(buffer).digest('hex').substr(0,6);
+                    pbfz.solid = [
+                        parseInt(mockrgb.substr(0,2),16),
+                        parseInt(mockrgb.substr(2,2),16),
+                        parseInt(mockrgb.substr(4,2),16),
+                        1
+                    ].join(',');
+
+                    return callback(err, pbfz, headers);
+                });
+            }
         });
     });
 };

package.json

@@ -15,7 +15,8 @@
   "dependencies": {
     "mapnik": "~3.0.0",
     "sphericalmercator": "1.0.x",
-    "mapnik-pool": "0.1.x"
+    "mapnik-pool": "0.1.x",
+    "vtfx": "https://github.com/mapbox/vtfx/tarball/master"
   },
   "devDependencies": {
     "tape": "3.0.x"

test/test-c.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Map srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs" background-color="steelblue">
+
+<Parameters>
+  <Parameter name="bounds">-180,-85.0511,180,85.0511</Parameter>
+  <Parameter name="center">0,0,2</Parameter>
+  <Parameter name="minzoom">0</Parameter>
+  <Parameter name="maxzoom">8</Parameter>
+  <Parameter name="geocoder_layer">world.NAME</Parameter>
+  <Parameter name="geocoder_resolution">0</Parameter>
+  <Parameter name="name"><![CDATA[test-a]]></Parameter>
+  <Parameter name="json"><![CDATA[{"level1":{"level2":"property"},"minzoom":2}]]></Parameter>
+  <Parameter name="vtfx"><![CDATA[{"world": [{"id":"drop", "limit": 200}]}]]></Parameter>
+</Parameters>
+
+<Layer name="world" srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs">
+    <Datasource>
+        <Parameter name="file">data/world_merc.shp</Parameter>
+        <Parameter name="type">shape</Parameter>
+    </Datasource>
+</Layer>
+
+</Map>

test/test.js

@@ -8,8 +8,9 @@ var UPDATE = process.env.UPDATE;
 
 // Load fixture data.
 var xml = {
-    a: fs.readFileSync(path.resolve(path.join(__dirname,'/test-a.xml')), 'utf8'),
-    b: fs.readFileSync(path.resolve(path.join(__dirname,'/test-b.xml')), 'utf8')
+    a: fs.readFileSync(path.resolve(path.join(__dirname + '/test-a.xml')), 'utf8'),
+    b: fs.readFileSync(path.resolve(path.join(__dirname + '/test-b.xml')), 'utf8'),
+    c: fs.readFileSync(path.resolve(path.join(__dirname + '/test-c.xml')), 'utf8')
 };
 var rasterxml = {
     a: fs.readFileSync(path.resolve(path.join(__dirname,'/raster-a.xml')), 'utf8')
@@ -131,14 +132,16 @@ function compare_vtiles(assert,filepath,vtile1,vtile2) {
 
 (function() {
     var sources = {
-        a: new Bridge({ xml:xml.a, base:path.join(__dirname,'/'), blank:true }),
-        b: new Bridge({ xml:xml.b, base:path.join(__dirname,'/') }),
-        c: new Bridge({ xml:xml.a, base:path.join(__dirname,'/'), blank:false })
+        a: new Bridge({ xml:xml.a, base:path.join(__dirname + '/'), blank:true }),
+        b: new Bridge({ xml:xml.b, base:path.join(__dirname + '/') }),
+        c: new Bridge({ xml:xml.a, base:path.join(__dirname + '/'), blank:false }),
+        d: new Bridge({ xml:xml.c, base:path.join(__dirname + '/') })
     };
     var tests = {
         a: ['0.0.0', '1.0.0', '1.0.1', {key:'10.0.0',empty:true}, {key:'10.765.295',empty:true}],
         b: ['0.0.0'],
-        c: [{key:'10.0.0',empty:true}, {key:'10.765.295', solid:'217,222,32,1'}]
+        c: [{key:'10.0.0',empty:true}, {key:'10.765.295', solid:'217,222,32,1'}],
+        d: [{key:'0.0.0', vtfx:true}, {key:'10.765.295', vtfx:true}]
     };
     Object.keys(tests).forEach(function(source) {
         tape('setup', function(assert) {