Switch to shelf-pack binpacker

README.md

@@ -14,7 +14,7 @@ and higher-dpi sprites from the same source.
 ### `generateLayout(imgs, ratio, format, callback)`
 
 Pack a list of images with width and height into a sprite layout.
-Uses bin-pack.
+Uses [shelf-pack](https://github.com/mapbox/shelf-pack).
 
 ### Parameters
 

index.js

@@ -1,7 +1,7 @@
 var mapnik = require('mapnik');
 var assert = require('assert');
 var xtend = require('xtend');
-var pack = require('shelf-pack');
+var ShelfPack = require('shelf-pack');
 var queue = require('queue-async');
 var emptyPNG = new mapnik.Image(1, 1).encodeSync('png');
 var sortBy = require('sort-by');
@@ -10,7 +10,7 @@ var heightAscThanNameComparator = sortBy('-height', 'id');
 
 /**
  * Pack a list of images with width and height into a sprite layout.
- * Uses bin-pack.
+ * Uses shelf-pack.
  * @param {Array<Object>} imgs array of `{ buffer: Buffer, id: String }`
  * @param {number} pixelRatio ratio of a 72dpi screen pixel to the destination
  * pixel density
@@ -41,24 +41,15 @@ function generateLayout(imgs, pixelRatio, format, callback) {
 
     q.awaitAll(function(err, imagesWithSizes){
         if (err) return callback(err);
-        var height = 1;
-        var width = 1;
-        var packing = new pack(width, height);
 
-        imagesWithSizes.forEach(function(image) {
-            var packed = packing.allocate(width, height);
-            if (packed.x === -1 && packed.y === -1) {
-                if (image.width + width > packing.width) width += image.width;
-                if (image.height + height > packing.height) height += image.height;
-                packing.resize(width, height);
-                packing.allocate(image.width, image.height);
-            }
-        });
+        imagesWithSizes.sort(heightAscThanNameComparator);
 
-        var obj = {};
+        var sprite = new ShelfPack(1, 1, { autoResize: true });
+        sprite.pack(imagesWithSizes, { inPlace: true });
 
         if (format) {
-            packing.items.forEach(function(item) {
+            var obj = {};
+            imagesWithSizes.forEach(function(item) {
                 obj[item.id] = {
                     width: item.width,
                     height: item.height,
@@ -68,9 +59,15 @@ function generateLayout(imgs, pixelRatio, format, callback) {
                 };
             });
             return callback(null, obj);
+
         } else {
-            return callback(null, packing);
+            return callback(null, {
+                width: sprite.w,
+                height: sprite.h,
+                items: imagesWithSizes
+            });
         }
+
     });
 }
 module.exports.generateLayout = generateLayout;

package.json

@@ -17,10 +17,9 @@
   "author": "Tom MacWright",
   "license": "ISC",
   "dependencies": {
-    "bin-pack": "^1.0.1",
     "mapnik": "~3.5.0",
     "queue-async": "^1.0.7",
-    "shelf-pack": "0.0.1",
+    "shelf-pack": "1.0.0",
     "sort-by": "^1.1.1",
     "xtend": "^4.0.1"
   },