Merge pull request #44 from mapbox/038-fix-namespace

Fix source namespace
mapbox · Jun 28, 2016 · 5816b56 · 5816b56
2 parents 470ab9c + a7b8042
commit 5816b56
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/mbview.js b/mbview.js
@@ -25,7 +25,7 @@ module.exports = {
           console.log(data);
         }
         // Save reference to tiles
-        tilesets[data.name] = tiles;
+        tilesets[data.basename] = tiles;
         // Extends the configuration object with new parameters found
         config = objectAssign({}, config, utils.metadata(data));
         // d3-queue.defer pattern to return the result of the task

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mbview",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Watch mbtiles in your localhost",
   "bin": {
     "mbview": "./cli.js"

diff --git a/test/fixtures/038.mbtiles b/test/fixtures/038.mbtiles
diff --git a/test/mbview.test.js b/test/mbview.test.js
@@ -28,13 +28,14 @@ test('MBView.loadTiles', function (t) {
 });
 
 test('MBView.serve', function (t) {
-  t.plan(7);
+  t.plan(8);
 
   var params = {
     basemap: 'dark',
     mbtiles: [
       __dirname + '/../examples/baja-highways.mbtiles',
-      __dirname + '/fixtures/twolayers.mbtiles'
+      __dirname + '/fixtures/twolayers.mbtiles',
+      __dirname + '/fixtures/038.mbtiles'
     ],
     port: 9000
   };
@@ -68,7 +69,15 @@ test('MBView.serve', function (t) {
       .get('/baja-highways.mbtiles/14/2864/6624.pbf')
       .expect('Content-Type', 'application/x-protobuf')
       .end(function (err) {
-        t.error(err, 'serves protobufs');
+        t.error(err, 'serves protobufs for ' + source);
+      });
+
+    var source = Object.keys(config.sources)[2];
+    request('localhost:9000')
+      .get('/' + source + '/14/2864/6624.pbf')
+      .expect(200)
+      .end(function (err) {
+        t.error(err, 'serves protobufs for ' + source);
       });
   });
 });

diff --git a/test/utils.test.js b/test/utils.test.js
@@ -9,6 +9,7 @@ var fixtures = {
 
 function mockMetadata (name) {
   return objectAssign({}, fixtures.metadata, {
+    basename: name + '.mbtiles',
     name: name + '.mbtiles',
     vector_layers: [{ id: name }]
   });

diff --git a/utils.js b/utils.js
@@ -14,7 +14,7 @@ module.exports.metadata = function (data) {
     center: meta.center,
     sources: {}
   };
-  res.sources[meta.name] = { layers: meta.vector_layers };
+  res.sources[meta.basename] = { layers: meta.vector_layers };
   return res;
 };