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

cutting-room-floor · May 10, 2011 · 50aade6 · 50aade6
2 parents 6110aba + 38f30c6
commit 50aade6
Show file tree

Hide file tree

Showing 29 changed files with 4 additions and 3 deletions.
diff --git a/controllers/router.bones → controllers/Router.bones b/controllers/router.bones → controllers/Router.bones
diff --git a/models/base.bones → models/Base.bones b/models/base.bones → models/Base.bones
diff --git a/models/tileset.bones → models/Tileset.bones b/models/tileset.bones → models/Tileset.bones
diff --git a/models/tileset.server.bones → models/Tileset.server.bones b/models/tileset.server.bones → models/Tileset.server.bones
diff --git a/models/tilesets.bones → models/Tilesets.bones b/models/tilesets.bones → models/Tilesets.bones
diff --git a/models/tilesets.server.bones → models/Tilesets.server.bones b/models/tilesets.server.bones → models/Tilesets.server.bones
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "author": "Development Seed <info@developmentseed.org> (developmentseed.org)",
     "name": "tilestream",
-    "version": "0.1.0",
+    "version": "1.2.0",
     "repository": {
         "url": ""
     },
@@ -12,7 +12,7 @@
         "node": "0.4.6"
     },
     "dependencies": {
-        "bones": "1.1.x",
+        "bones": "1.2.x",
         "openlayers_slim": "https://github.com/developmentseed/openlayers_slim/tarball/master",
         "step": "0.0.4",
         "syslog": "0.1.1",

diff --git a/routers/core.bones → routers/Core.bones b/routers/core.bones → routers/Core.bones
diff --git a/routers/host.bones → routers/Host.bones b/routers/host.bones → routers/Host.bones
diff --git a/routers/syslog.bones → routers/Syslog.bones b/routers/syslog.bones → routers/Syslog.bones
diff --git a/routers/tile.bones → routers/Tile.bones b/routers/tile.bones → routers/Tile.bones
diff --git a/routers/wax.bones → routers/Wax.bones b/routers/wax.bones → routers/Wax.bones
@@ -153,7 +153,8 @@ router = Bones.Router.extend({
                             1222.99245234, 611.496226172,
                             305.748113086, 152.874056543, 76.4370282715, 38.2185141357,
                             19.1092570679, 9.55462853394, 4.77731426697, 2.38865713348,
-                            1.19432856674, 0.597164283371
+                            1.19432856674, 0.597164283371, 0.2985821417, 0.1492910708,
+                            0.0746455354, 0.0373227677
                         ],
                         'layername': layer.get('id'),
                         'isBaseLayer': index === 0,

diff --git a/servers/tile.bones → servers/Tile.bones b/servers/tile.bones → servers/Tile.bones
diff --git a/servers/ui.bones → servers/UI.bones b/servers/ui.bones → servers/UI.bones
diff --git a/templates/app._ → templates/App._ b/templates/app._ → templates/App._
diff --git a/templates/error._ → templates/Error._ b/templates/error._ → templates/Error._
diff --git a/templates/HUD_download._ → templates/HUDDownload._ b/templates/HUD_download._ → templates/HUDDownload._
diff --git a/templates/HUD_info._ → templates/HUDInfo._ b/templates/HUD_info._ → templates/HUDInfo._
diff --git a/templates/header._ → templates/Header._ b/templates/header._ → templates/Header._
diff --git a/templates/map._ → templates/Map._ b/templates/map._ → templates/Map._
diff --git a/templates/map_thumb._ → templates/MapThumb._ b/templates/map_thumb._ → templates/MapThumb._
diff --git a/templates/maps._ → templates/Maps._ b/templates/maps._ → templates/Maps._
diff --git a/views/app.bones → views/App.bones b/views/app.bones → views/App.bones
diff --git a/views/app.server.bones → views/App.server.bones b/views/app.server.bones → views/App.server.bones
diff --git a/views/error.bones → views/Error.bones b/views/error.bones → views/Error.bones
diff --git a/views/hud.bones → views/HUD.bones b/views/hud.bones → views/HUD.bones
diff --git a/views/map.bones → views/Map.bones b/views/map.bones → views/Map.bones
diff --git a/views/map_client.bones → views/MapClient.bones b/views/map_client.bones → views/MapClient.bones
diff --git a/views/maps.bones → views/Maps.bones b/views/maps.bones → views/Maps.bones