Merge pull request #1481 from mapbox/3.4.9

Updated to use mapnik 3.4.9
mapbox · Oct 15, 2015 · fc368e6 · fc368e6
2 parents 4cdf2fd + aafccac
commit fc368e6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+### 0.3.2
+
+- Updated to use node-mapnik 3.4.9
+- Vector tile sizes reduced due to removing repeated points in polylines and multi-polylines
+- Simplify distance reduced from 8 to 4 causing vector tiles that are created to be LESS simplified
+- Fixed various bugs with CSVs
+- Various Vector Tile creation speed improvements
+
 ### 0.3.1
 
 - Updated to use node-mapnik 3.4.7

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mapbox-studio",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "main": "./index",
   "author": "Mapbox (https://www.mapbox.com)",
   "engines": {
@@ -32,13 +32,14 @@
     "js-yaml": "https://github.com/mapbox/js-yaml/tarball/scalar-styles",
     "fstream": "1.0.x",
     "tar": "2.1.x",
-    "mapnik": "3.4.8",
-    "mapnik-reference": "~8.5.0",
+    "mapnik": "3.4.9",
+    "mapnik-reference": "~8.5.1",
     "carto": "0.15.3",
     "tilelive": "~5.9.0",
-    "tilelive-bridge": "~1.6.0",
+    "tilelive-bridge": "~2.1.0",
     "tilelive-vector": "~3.5.0",
     "mapnik-omnivore": "~6.3.0",
+    "gdal": "0.7.0", 
     "abaculus": "1.2.1",
     "mapbox-machine-styles": "2.3.1",
     "mapbox-studio-pro-fonts": "https://mapbox-npm.s3.amazonaws.com/package/mapbox-studio-pro-fonts-1.0.0-9870a90b713f307b9391829602f4d5857e419615.tgz",

diff --git a/test/expected/fontfamilies.json b/test/expected/fontfamilies.json
@@ -599,4 +599,4 @@
     "Tisa SC Offc Pro Light Italic",
     "Tisa SC Offc Pro Thin Italic"
   ]
-}
+}
diff --git a/test/expected/source-export-reprojected-info.json b/test/expected/source-export-reprojected-info.json
@@ -15,8 +15,8 @@
       "id": "NZ_Coastline_NZMG",
       "description": "",
       "fields": {
-        "featurecla": "String",
-        "scalerank": "Number"
+        "scalerank": "Number",
+        "featurecla": "String"
       }
     }
   ],

diff --git a/test/source-reproject.test.js b/test/source-reproject.test.js
@@ -106,7 +106,7 @@ test('source.mbtilesExport: verify reprojected 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, 19);
-                t.equal(row.size, 3301);
+                t.equal(row.size, 3386);
                 check([
                     [0,0,0],
                     [1,1,1],

diff --git 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, 376847);
+                t.equal(row.size, 377696);
                 check([
                     [0,0,0],
                     [1,0,0],