Pass paths to node-mbtiles in uri object.

crowdcover · Sep 4, 2014 · c6cceba · c6cceba
1 parent 2c18dc1
commit c6cceba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/cache.js b/lib/cache.js
@@ -19,15 +19,20 @@ module.exports = function(Source, cachedir) {
                 .update(source._xml || source.data.id)
                 .digest('hex')
                 .substr(0,16);
-            var cachepath = path.join(cachedir, hash + '.mbtiles?batch=1');
+            var cachepath = path.join(cachedir, hash + '.mbtiles');
 
             if (cache[cachepath]) {
                 source._mbtiles = cache[cachepath];
                 cache[cachepath]._cacheStats.hit++;
                 return callback(null, source);
             }
 
-            new MBTiles(cachepath, function(err, mbtiles) {
+            // Pass filepath to node-mbtiles in uri object to avoid
+            // url.parse() upstream mishandling windows paths.
+            new MBTiles({
+                pathname: cachepath,
+                query: { batch: 1 }
+            }, function(err, mbtiles) {
                 if (err) return callback(verbose('MBTiles ' + cachepath, err));
                 source._mbtiles = mbtiles;
                 source._mbtiles.startWriting(function(err) {

diff --git a/lib/source.js b/lib/source.js
@@ -547,7 +547,9 @@ source.mbtilesExport = function(id) {
     }
 
     function loadt() {
-        new MBTiles(tmp, function(err, t) {
+        // Pass filepath to node-mbtiles in uri object to avoid
+        // url.parse() upstream mishandling windows paths.
+        new MBTiles({ pathname:tmp }, function(err, t) {
             if (err) return prog.emit('error', err);
             tsrc = t;
             copy();