Merge branch 'dev' of github.com:mapbox/tilestream into dev

Conflicts: routers/Core.bones
cutting-room-floor · May 12, 2011 · d7cbd16 · d7cbd16
2 parents d73592d + 0f6291e
commit d7cbd16
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/lib/tileset.js b/lib/tileset.js
@@ -154,7 +154,7 @@ var load = function (filepath, callback) {
                 }
             } else {
                 tilesets[filepath] = data;
-                tilelive.acquire(filepath, {}, this);
+                tilelive.acquire(filepath, this);
             }
         },
         function(err, mbtiles) {

diff --git a/routers/Tile.bones b/routers/Tile.bones
@@ -50,8 +50,7 @@ router = Bones.Router.extend({
             format: req.params[0] ? req.params[0] : 'layer.json',
             x: req.param('x'),
             y: req.param('y'),
-            z: req.param('z'),
-            jsonp: req.query.callback || 'grid'
+            z: req.param('z')
         };
         tilelive.serve(options, function(err, data) {
             if (!err) {

diff --git a/templates/App._ b/templates/App._
@@ -8,7 +8,7 @@
     var basepath = '<%= basepath %>';
     location.href.indexOf('#') === -1 &&
     window.location.pathname !== basepath &&
-    (window.location = basepath + '#' + window.location.pathname.substr(basepath.length - 1));
+    (window.location = basepath + '#!' + window.location.pathname.substr(basepath.length - 1));
 
     // Server-side request info.
     var req = { query: {

diff --git a/test/tilestream.test.js b/test/tilestream.test.js
@@ -48,15 +48,15 @@ exports['error tile'] = function() {
 exports['grid tile'] = function() {
     assert.response(
         command.servers['UI'].server,
-        { url: '/1.0.0/waxtest/0/0/0.grid.json' },
+        { url: '/1.0.0/waxtest/0/0/0.grid.json?callback=grid' },
         { status: 200, body: /grid\(/ }
     );
 };
 
 exports['layer json'] = function() {
     assert.response(
         command.servers['UI'].server,
-        { url: '/1.0.0/waxtest/layer.json' },
+        { url: '/1.0.0/waxtest/layer.json?callback=grid' },
         { status: 200, body: /grid\(/ }
     );
 };