Simplify URL for "static"

/styles/{id}/rendered/static/... -> /styles/{id}/static/...

src/serve_rendered.js

@@ -284,7 +284,7 @@ module.exports = function(options, repo, params, id) {
   });
 
   var staticPattern =
-      '/rendered/static/%s:scale(' + SCALE_PATTERN + ')?\.:format([\\w]+)';
+      '/static/%s:scale(' + SCALE_PATTERN + ')?\.:format([\\w]+)';
 
   var centerPattern =
       util.format(':lon(%s),:lat(%s),:z(\\d+):bearing(,%s)?:pitch(,%s)?/' +

test/static.js

@@ -1,6 +1,6 @@
 var testStatic = function(prefix, q, format, status, scale, type) {
   if (scale) q += '@' + scale + 'x';
-  var path = '/styles/' + prefix + '/rendered/static/' + q + '.' + format;
+  var path = '/styles/' + prefix + '/static/' + q + '.' + format;
   it(path + ' returns ' + status, function(done) {
     var test = supertest(app).get(path);
     if (status) test.expect(status);