tileblaster 0.3.6 → 0.4.1

package/bin/tileblaster.js

@@ -4,7 +4,7 @@ var watch = require('node-watch');
 var configfile = require("path").resolve.apply(global, (!!argv._[0]) ? [ process.cwd(), argv._[0] ] : [ "../config.js" ]);
 var tb = require("../lib/tileblaster.js")(
 	(function(config){
-		["socket","tiles","queue","id"].forEach(function(n){
+		["socket","tiles","queue","id","port"].forEach(function(n){
 			if (!!argv[n]) config[n] = argv[n];
 		});
 		// watch changes in config file

package/config.js.dist

@@ -34,6 +34,12 @@ module.exports = {
 			// * {r} resolution marker
 			"url": "https://{s}.tiles.example.com/tiles/{z}/{x}/{y}{r}.{e}",
 		
+			// url points to cloudtiles container (→ https://github.com/OpenCloudTiles/opencloudtiles-specification)
+			"cloudtiles": false,
+			
+			// backend uses tms instead of zxy
+			"tms": false,
+		
 			// possible extensions
 			"ext": ["mvt","json","topojson","png","jpg"],
 

package/lib/tileblaster.js

@@ -19,6 +19,7 @@ var dur = require("dur");
 try { var pnck = require("pnck"); } catch (err) { var pnck = null; }
 try { var jpck = require("jpck"); } catch (err) { var jpck = null; }
 try { var zopfli = require("node-zopfli"); } catch (err) { var zopfli = null; }
+try { var cloudtiles = require("cloudtiles"); } catch (err) { var cloudtiles = null; }
 
 // load package
 var pckg = require("../package.json");
@@ -180,6 +181,9 @@ tileblaster.prototype.reconfigure = function(config){
 			// compression
 			map.compress = map.compress.filter(function(c){ return (self.comp.indexOf(c) >= 0) });
 			
+			// is cloudtile
+			map.cloudtiles = (map.cloudtiles === true);
+			
 			return map;
 			
 		})(self.config.maps[id],id), maps;
@@ -266,6 +270,12 @@ tileblaster.prototype.listen = function(){
 	// wait for server to be ready
 	if (!self.srvr) return (self.listentome = true), this;
 
+	// omit socket if port specified
+	if (self.config.port) return self.srvr.listen(self.config.port, function(err){
+		if (err) debug("<listen> unable to listen on port %d", self.config.port), process.exit(1);
+		debug("<listen> listening on port %d", self.config.port);
+	}), self;
+
 	// listen on socket
 	(function(fn){
 		(function(next){
@@ -409,7 +419,13 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 		// construct upstream tile url
 		var tileurl = self._tileurl(mapid, z, x, y, r, e);
 
-		self.fetchtile(tileurl, mapid, function(err, stream, meta){
+		(function(next){
+			
+			// cloudtile branch
+			if (self.maps[mapid].cloudtiles) return self.cloudtile(tileurl, mapid, z, x, y, next);
+			self.fetchtile(tileurl, mapid, next);
+			
+		})(function(err, tilestream, meta){
 
 			if (err) {
 				if (stream !== null) {
@@ -428,14 +444,14 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 
 			var streams = [];
 
-			streams.push(function(stream){
+			streams.push(function(tilestream){
 				// call back with stream
-				fn(null, stream, {
+				fn(null, tilestream, {
 					'content-type': (self.mime[e])
 				});
 			});
 			
-			if (!!self.config.maps[mapid].cache) streams.push(function(stream){
+			if (!!self.config.maps[mapid].cache) streams.push(function(tilestream){
 				
 				// don't overwrite if tile exists
 				fs.access(tilepath, fs.constants.F_OK, function(err){
@@ -444,7 +460,7 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 					mkdirp(path.dirname(tilepath)).then(function(err){
 
 						// save to tmp file, rename when done
-						stream.pipe(fs.createWriteStream(tilepath+".tmp").on('finish', function(){
+						tilestream.pipe(fs.createWriteStream(tilepath+".tmp").on('finish', function(){
 							fs.rename(tilepath+".tmp", tilepath, function(){
 								
 								// compress
@@ -463,7 +479,7 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 			});
 
 			// stream mux
-			stream.pipe(self.optimize(mapid, e)).pipe(self._mux.apply(self, streams));
+			tilestream.pipe(self.optimize(mapid, e)).pipe(self._mux.apply(self, streams));
 
 		});
 		
@@ -517,6 +533,18 @@ tileblaster.prototype.fetchtile = function(tileurl, mapid, fn){
 	
 };
 
+// get cloudtile
+tileblaster.prototype.cloudtile = function(tileurl, mapid, z, x, y, fn) {
+	const self = this;
+	if (!cloudtiles) return fn(new Error("Missing dependency: cloudtiles"));
+	if (!self.maps[mapid].c) self.maps[mapid].c = cloudtiles(tileurl, { tms: !!self.maps[mapid].tms });
+	self.maps[mapid].c.getTile(z,x,y, function(err, buffer){
+		if (err) return fn(err);
+		return fn(null, stream.Readable.from(buffer));
+	});
+	return self;
+};
+
 // optimization
 tileblaster.prototype.optimize = function(mapid, ext){
 	var self = this;
@@ -527,7 +555,7 @@ tileblaster.prototype.optimize = function(mapid, ext){
 		case "png": 
 			if (!pnck) break;
 			debug("<optimize> [%s] png", mapid);
-			strm = strm.pipe(new pnck(['-zc8','-zm8','-f5','-quiet']));
+			return strm.pipe(pnck(['-o7','-zc8','-zm8','-f5','-quiet','-fix']));
 		break;
 		case "jpg": 
 		case "jpeg": 
@@ -679,6 +707,10 @@ tileblaster.prototype._checktile = function(mapid, z, x, y, r, ext, fn){
 // transform parameters to url
 tileblaster.prototype._tileurl = function(mapid, z, x, y, r, e){
 	var self = this;
+	
+	// when backend uses tms
+	if (!!self.maps[mapid].tms) y = Math.pow(2,z)-y-1;
+	
 	return self.maps[mapid].url
 		.replace("{s}", (self.maps[mapid].sub !== false) ? self.maps[mapid].sub[Math.floor(Math.random()*self.maps[mapid].sub.length)] : "")
 		.replace("{x}", x.toFixed(0))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "0.3.6",
+  "version": "0.4.1",
   "description": "pretty fast optimizing & compressing tile caching proxy",
   "main": "lib/tileblaster.js",
   "bin": {
@@ -19,15 +19,16 @@
   "dependencies": {
     "debug": "^4.3.4",
     "dur": "^0.0.3",
-    "glob": "^8.0.3",
+    "glob": "^8.1.0",
     "minimist": "^1.2.7",
-    "mkdirp": "^1",
+    "mkdirp": "^2.0.0",
     "node-watch": "^0.7.3",
     "nsa": "^0.2",
     "quu": "^0.4.3",
     "request": "^2.88"
   },
   "optionalDependencies": {
+    "cloudtiles": "^0.0.6",
     "jpck": "^1.0.2",
     "node-zopfli": "^2.1.4",
     "pnck": "^1.0.1"

package/readme.md

@@ -6,7 +6,7 @@ tileblaster is a map tile caching (and optimizing) proxy, designed to run with n
 
 `npm i tileblaster -g`
 
-use `--no-optional` if you don't want tile optimization.
+use `--no-optional` if you don't want tile optimization or [opencloudtiles](https://github.com/OpenCloudTiles/opencloudtiles-specification) support.
 
 ## run