Merge pull request #1477 from mapbox/usethekey

Support key_field_as_attribute postgis option

package.json

@@ -32,9 +32,9 @@
     "js-yaml": "https://github.com/mapbox/js-yaml/tarball/scalar-styles",
     "fstream": "1.0.x",
     "tar": "2.1.x",
-    "mapnik": "3.4.7",
+    "mapnik": "3.4.8",
     "mapnik-reference": "~8.5.0",
-    "carto": "0.15.2",
+    "carto": "0.15.3",
     "tilelive": "~5.9.0",
     "tilelive-bridge": "~1.6.0",
     "tilelive-vector": "~3.5.0",

templates/layerpostgis.html

@@ -55,6 +55,7 @@ <h3 class='fl'>
         <input type='hidden' name='Datasource-type' value='postgis' />
         <input type='hidden' name='Datasource-max_size' value='512' />
         <input type='hidden' name='Datasource-srid' value='<%= obj.Datasource.srid %>' />
+        <input type='hidden' name='Datasource-key_field_as_attribute' value='<%= typeof obj.Datasource.key_field_as_attribute !== undefined ? obj.Datasource.key_field_as_attribute : 1 %>' />
       </section>
       <section class='clearfix pad2x pad1y keyline-bottom'>
         <label class='pad0y col3 inline'>Extent </label>

test/duplicate_module.pretest.js

@@ -23,7 +23,6 @@ var count_module = function (name, callback) {
     'mbtiles',
     'mapnik-reference',
     'carto',
-    'node-pre-gyp'
 ].forEach(function(mod) {
     tape.test('there should only be one ' + mod + ' module, otherwise you are asking for pwnage', function (t) {
         count_module(mod, function (err, count) {

test/source.test.js

@@ -463,7 +463,7 @@ test('source.mbtilesExport: verify export', function(t) {
             src._db.get('select count(1) as count, sum(length(tile_data)) as size from tiles;', function(err, row) {
                 t.ifError(err);
                 t.equal(row.count, 5461);
-                t.equal(row.size, 376830);
+                t.equal(row.size, 376847);
                 check([
                     [0,0,0],
                     [1,0,0],