From d32796ef670845cccde5465a3a692d719e6359b5 Mon Sep 17 00:00:00 2001
From: Young Hahn <young@mapbox.com>
Date: Thu, 8 Oct 2015 19:40:10 -0400
Subject: [PATCH 1/4] carto@0.15.3

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index af7b92a7..f9716bfe 100644
--- a/package.json
+++ b/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",

From aad665ec330b5e75073ac29cb039f95cbbc071ea Mon Sep 17 00:00:00 2001
From: Young Hahn <young@mapbox.com>
Date: Thu, 8 Oct 2015 19:42:41 -0400
Subject: [PATCH 2/4] Add key_field_as_attribute to postgis template

---
 templates/layerpostgis.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/layerpostgis.html b/templates/layerpostgis.html
index 2bde0280..77f28476 100644
--- a/templates/layerpostgis.html
+++ b/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>

From ea36b0247c018a1275f6c72d7f382d47f55819ff Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 10 Oct 2015 09:22:35 -0700
Subject: [PATCH 3/4] stop strictly testing for dupe node-pre-gyp

 - not a hard requirement
 - avoiding dupes of pre-gyp is desirable only to shrink packaged app size
 - very likely this will drift during development
---
 test/duplicate_module.pretest.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/duplicate_module.pretest.js b/test/duplicate_module.pretest.js
index f5edb8bb..662f00e6 100644
--- a/test/duplicate_module.pretest.js
+++ b/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) {

From c33423c3baf71dd46bfd5288ee1b91d72cbe8d1a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 10 Oct 2015 09:35:55 -0700
Subject: [PATCH 4/4] Adapt to node-mapnik@3.4.8 results

---
 test/source.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/source.test.js b/test/source.test.js
index 804a0232..2c54b882 100644
--- a/test/source.test.js
+++ b/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],