tileblaster 0.4.7 → 0.4.9

package/lib/tileblaster.js

@@ -128,9 +128,9 @@ tileblaster.prototype.reconfigure = function(config){
 
 			// check for subdomain feature
 			if (map.url.indexOf("{s}") >= 0) {
-				if (!map.sub) throw new Error("no subdomains configured for map "+mapid);
+				if (!map.sub) throw new Error("no subdomains configured for map "+id);
 				if (typeof map.sub === "string") map.sub = map.sub.split("");
-				if (!(map.sub instanceof Array)) throw new Error("invalid 'sub' option for map "+mapid);
+				if (!(map.sub instanceof Array)) throw new Error("invalid 'sub' option for map "+id);
 			} else {
 				map.sub = false;
 			}
@@ -427,7 +427,7 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 			if (self.maps[mapid].versatiles) return self.versatile(tileurl, mapid, z, x, y, next);
 			self.fetchtile(tileurl, mapid, next);
 
-		})(function(err, tilestream, meta){
+		})(function(err, tilestream){
 
 			if (err) {
 				if (stream !== null) {
@@ -552,11 +552,17 @@ tileblaster.prototype.fetchtile = function(tileurl, mapid, fn){
 // get versatile
 tileblaster.prototype.versatile = function(tileurl, mapid, z, x, y, fn) {
 	const self = this;
-	if (!versatile) return fn(new Error("Missing dependency: versatiles"));
+	if (!versatiles) return fn(new Error("Missing dependency: versatiles"));
 	if (!self.maps[mapid].c) self.maps[mapid].c = versatiles(tileurl, { tms: !!self.maps[mapid].tms });
-	self.maps[mapid].c.getTile(z,x,y, function(err, buffer){
+	self.maps[mapid].c.getTile(z,x,y, function(err, buf){
 		if (err) return fn(err);
-		return fn(null, stream.Readable.from(buffer));
+		self.maps[mapid].c.decompress(self.maps[mapid].c.header.tile_precompression, buf, function(err, buf){
+			if (err) return fn(err);
+			var strm = new stream.PassThrough;
+			strm.write(buf);
+			strm.end();
+			return fn(null, strm);
+		});
 	});
 	return self;
 };
@@ -639,8 +645,7 @@ tileblaster.prototype.compress = function(file, comp){
 };
 
 // stream multiplexer
-tileblaster.prototype._mux = function(fn){
-	var self = this;
+tileblaster.prototype._mux = function(){
 
 	// create a passthrough stream for every callback argument
 	// call back with created stream
@@ -654,7 +659,7 @@ tileblaster.prototype._mux = function(fn){
 	return (new stream.Writable({
 		write: function(chunk, encoding, done) {
 			streams.forEach(function(stream){
-				stream.write(chunk);
+				stream.write(chunk, encoding);
 			});
 			done();
 		},
@@ -738,7 +743,6 @@ tileblaster.prototype._tileurl = function(mapid, z, x, y, r, e){
 
 // transform parameters to filename
 tileblaster.prototype._tilefile = function(mapid, z, x, y, r, e){
-	var self = this;
 	return (mapid+"/"+z.toFixed(0)+"/"+x.toFixed(0)+"/"+y.toFixed(0)+((!!r)?r:"")+"."+((e) ? e : ""));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "pretty fast optimizing & compressing tile caching proxy",
   "main": "lib/tileblaster.js",
   "bin": {
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/yetzt/tileblaster#readme",
   "dependencies": {
     "dur": "^0.0.3",
-    "klaw": "^4.1.0",
+    "klaw": "^3.0.0",
     "minimist": "^1.2.8",
     "node-watch": "^0.7.3",
     "phin": "^3.7.0",
@@ -31,5 +31,11 @@
     "nsa": "^0.2",
     "pnck": "^1.0.1",
     "versatiles": "^0.3.0"
-  }
+  },
+  "engines": {
+    "node": ">= 10"
+  },
+  "os": [
+    "!win32"
+  ]
 }