diff --git a/NEWS.md b/NEWS.md index 8f235148..485c0291 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ ------------------- * Update cartodb-redis dependency to "~0.2.0" +* Drop /map_metadata API entry point (#101) 1.5.2 -- 2013-12-05 ------------------- diff --git a/README.md b/README.md index 676236ef..b3412579 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,15 @@ Windshaft-CartoDB [![Build Status](https://travis-ci.org/CartoDB/Windshaft-cartodb.png)](http://travis-ci.org/CartoDB/Windshaft-cartodb) -This is the CartoDB map tiler. It extends Windshaft with some extra +This is the CartoDB 2.0+ map tiler. It extends Windshaft with some extra functionality and custom filters for authentication -* reads dbname from subdomain and cartodb redis for pretty tile urls +* reads dbname from hostname and cartodb redis for pretty tile urls * configures windshaft to publish ``cartodb_id`` as the interactivity layer * gets the default geometry type from the cartodb redis store -* allows tiles to be styled individually * provides a link to varnish high speed cache * provides a infowindow endpoint for windshaft -* provides a ``map_metadata`` endpoint for windshaft +* provides support for template signed maps Requirements ------------ @@ -26,7 +25,7 @@ Requirements [for cache control] - CartoDB-SQL-API 1.0.0+ - - CartoDB 0.9.5+ (for ``CDB_QueryTables``) + - CartoDB 2.0.0+ - Varnish (https://www.varnish-cache.org) Configure diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js index b436194a..0b730751 100644 --- a/lib/cartodb/cartodb_windshaft.js +++ b/lib/cartodb/cartodb_windshaft.js @@ -55,26 +55,6 @@ var CartodbWindshaft = function(serverOptions) { }); - /** - * Helper to allow access to metadata to be used in embedded maps. - */ - ws.get(serverOptions.base_url + '/map_metadata', function(req, res){ - ws.doCORS(res); - Step( - function(){ - serverOptions.getMapMetadata(req, this); - }, - function(err, data){ - if (err){ - ws.sendError(res, {error: err.message}, 500, 'GET MAP_METADATA'); - //res.send(err.message, 500); - } else { - res.send({map_metadata: data}, 200); - } - } - ); - }); - /** * Helper API to allow per table tile cache (and sql cache) to be invalidated remotely. * TODO: Move? diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 25456154..ee6e5ec7 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -550,25 +550,6 @@ module.exports = function(){ ); }; - /** - * Little helper method to get map metadata and return to client - * @param req - * @param callback - */ - me.getMapMetadata = function(req, callback){ - var that = this; - - Step( - function(){ - that.req2params(req, this); - }, - function(err, data){ - if (err) callback(err, null); - else cartoData.getMapMetadata(data, callback); - } - ); - }; - /** * Helper to clear out tile cache on request * @param req diff --git a/test/acceptance/server.js b/test/acceptance/server.js index 33248fb5..403a17bf 100644 --- a/test/acceptance/server.js +++ b/test/acceptance/server.js @@ -1196,59 +1196,6 @@ suite('server', function() { }); }); - ///////////////////////////////////////////////////////////////////////////////// - // - // GET METADATA - // - ///////////////////////////////////////////////////////////////////////////////// - - test("does not provide metadata of private table to unauthenticated requests", function(done){ - assert.response(server, { - headers: {host: 'localhost'}, - url: '/tiles/test_table_private_1/map_metadata', - method: 'GET' - },{}, function(res) { - // FIXME: should be 401 instead - assert.equal(res.statusCode, 500, res.statusCode + ': ' + res.body); - done(); - }); - }); - - test("does provide metadata of private table to authenticated requests", function(done){ - assert.response(server, { - headers: {host: 'localhost'}, - url: '/tiles/test_table_private_1/map_metadata?map_key=1234', - method: 'GET' - },{}, function(res) { - assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body); - done(); - }); - }); - - test("does provide metadata of public table to unauthenticated requests", function(done){ - assert.response(server, { - headers: {host: 'localhost'}, - url: '/tiles/gadm4/map_metadata', - method: 'GET' - },{}, function(res) { - assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body); - // TODO: show metadata ? - done(); - }); - }); - - test("does provide metadata of public table to authenticated requests", function(done){ - assert.response(server, { - headers: {host: 'localhost'}, - url: '/tiles/gadm4/map_metadata?map_key=1234', - method: 'GET' - },{}, function(res) { - assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body); - // TODO: show metadata ? - done(); - }); - }); - ///////////////////////////////////////////////////////////////////////////////// // // DELETE CACHE