tileblaster 1.0.2 → 1.0.4

package/builtins/cache.js

@@ -14,7 +14,7 @@ module.exports = function({ opts, data, res }, next, skip){
 	if (!cache.hasOwnProperty(data.map)) {
 
 		// store instance
-		cache.store = this.lib.store({ root: config.paths.data });
+		cache.store = this.lib.store({ root: config.paths.data, ext: config.id+".tmp" });
 
 		// merge opts of all uses of the cache builtin in a map config
 		opts = config.maps[data.map].filter(function(use){

package/builtins/check.js

@@ -1,4 +1,4 @@
-// check data.params against constraints
+// check data.req.params against constraints
 
 const cache = {};
 
@@ -86,28 +86,28 @@ module.exports = function({ req, res, opts, data }, next){
 	opts = cache[data.map];
 
 	// check for NaNs
-	if (isNaN(data.params.z) || isNaN(data.params.x) || isNaN(data.params.y)) return next(new Error("illegal zxy."));
+	if (isNaN(data.req.params.z) || isNaN(data.req.params.x) || isNaN(data.req.params.y)) return next(new Error("illegal zxy."));
 
 	// check zoom
-	if (data.params.z < opts.minZoom || data.params.z > opts.maxZoom) return next(new Error("illegal zoom."));
+	if (data.req.params.z < opts.minZoom || data.req.params.z > opts.maxZoom) return next(new Error("illegal zoom."));
 
 	// check bounds
 	if (opts.bounds) {
-		if (opts.bounds[data.params.z][0] < opts.bounds[data.params.z][2]) { // check for bounds spanning antimeridian
+		if (opts.bounds[data.req.params.z][0] < opts.bounds[data.req.params.z][2]) { // check for bounds spanning antimeridian
 			// bounds don't span antimeridian
-			if (data.params.x < opts.bounds[data.params.z][0] || data.params.x > opts.bounds[data.params.z][2]) return next(new Error("x is out of bounds."));
+			if (data.req.params.x < opts.bounds[data.req.params.z][0] || data.req.params.x > opts.bounds[data.req.params.z][2]) return next(new Error("x is out of bounds."));
 		} else {
 			// bounds span antimeridian
-			if (data.params.x > opts.bounds[data.params.z][0] && data.params.x < opts.bounds[data.params.z][2]) return next(new Error("x is out of bounds, bounds span antimeridian"));
+			if (data.req.params.x > opts.bounds[data.req.params.z][0] && data.req.params.x < opts.bounds[data.req.params.z][2]) return next(new Error("x is out of bounds, bounds span antimeridian"));
 		}
-		if (data.params.y < opts.bounds[data.params.z][1] || data.params.y > opts.bounds[data.params.z][3]) return next(new Error("y is out of bounds."));
+		if (data.req.params.y < opts.bounds[data.req.params.z][1] || data.req.params.y > opts.bounds[data.req.params.z][3]) return next(new Error("y is out of bounds."));
 	}
 
 	// check extension
-	if (opts.extensions.length > 0 && !opts.extensions.includes(data.params.e) && !opts.extensions.includes(data.params.f)) return next(new Error("illegal extension."));
+	if (opts.extensions.length > 0 && !opts.extensions.includes(data.req.params.e) && !opts.extensions.includes(data.req.params.f)) return next(new Error("illegal extension."));
 
 	// check density
-	if (opts.density && !opts.density.includes(data.params.d) && !opts.density.includes(data.params.f)) return next(new Error("illegal density marker."));
+	if (opts.density && !opts.density.includes(data.req.params.d) && !opts.density.includes(data.req.params.f)) return next(new Error("illegal density marker."));
 
 	// all passed
 	next();

package/builtins/compress.js

@@ -80,7 +80,7 @@ module.exports = function({ req, res, opts, data }, next){
 	}, [])).then(function(){
 
 		// set tile to best compressed tile client accepts FIXME find by buffer size?
-		const bestCompression = (opts.brotli && data.capabilities.br) ? "br" : (opts.gzip && data.capabilities.gz) ? "gzip" : null;
+		const bestCompression = (opts.brotli && data.req.supports.br) ? "br" : (opts.gzip && data.req.supports.gz) ? "gzip" : null;
 		if (bestCompression) data.tile = data.tiles.find(function(tile){
 			return tile.compression === bestCompression && tile.mimetype === data.tile.mimetype && tile.filetype === data.tile.filetype;
 		}) || data.tile;

package/lib/store.js

@@ -6,10 +6,11 @@ const path = require("node:path");
 const xattr = require("fs-xattr");
 const rfc822date = require("./rfc822date");
 
-const store = module.exports = function store({ root }){
+const store = module.exports = function store({ root, ext }){
 	if (!(this instanceof store)) return new store(...arguments);
 
 	this.root = path.resolve(process.cwd(), root);
+	this.ext = ext || ".tmp";
 	this.cache = {}; // FIXME use lru cache
 
 	return this;
@@ -79,7 +80,7 @@ store.prototype.put = function(tile, fn){
 	const self = this;
 
 	const destfile = path.join(self.root, tile.path);
-	const tmpfile = destfile+".tmp";
+	const tmpfile = destfile+self.ext;
 
 	// check if exists and still valid?
 	self.check(destfile, function(err, isValid){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "a quick and versatile map tile caching proxy",
   "main": "tileblaster.js",
   "bin": {
@@ -25,7 +25,7 @@
     "fs-xattr": "^0.3.1",
     "klaw": "^4.1.0",
     "minimist": "^1.2.8",
-    "node-watch": "^0.7.3",
+    "node-watch": "^0.7.4",
     "phin": "^3.7.0",
     "quu": "^0.4.3"
   },
@@ -35,7 +35,7 @@
     "mbg": "^0.0.2",
     "node-liblzma": "^1.1.9",
     "optipng-js": "^0.1.2",
-    "pmtiles": "^2.9.0",
+    "pmtiles": "^2.10.0",
     "sharp": "^0.32.4",
     "versatiles": "^0.3.1",
     "vtt": "^0.0.3"
@@ -48,6 +48,20 @@
     "linux"
   ],
   "keywords": [
-    "tileblaster", "tileserver", "map", "tiles", "tile", "mbtiles", "versatiles", "pmtiles", "server", "proxy", "cache", "vectortiles", "rastertiles", "mvt", "pbf"
+    "tileblaster",
+    "tileserver",
+    "map",
+    "tiles",
+    "tile",
+    "mbtiles",
+    "versatiles",
+    "pmtiles",
+    "server",
+    "proxy",
+    "cache",
+    "vectortiles",
+    "rastertiles",
+    "mvt",
+    "pbf"
   ]
 }