From bfb283c5ba2c5027e2a952b6997df73010212ce3 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Fri, 28 Apr 2017 14:46:36 +0200 Subject: [PATCH] wip --- .../adapter/mapconfig-named-layers-adapter.js | 1 - .../mapconfig/adapter/mapconfig-named-map-adapter.js | 11 +++++++++++ lib/cartodb/server.js | 1 + test/acceptance/buffer-size-format.js | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 lib/cartodb/models/mapconfig/adapter/mapconfig-named-map-adapter.js diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js index fd00e344..17c2059f 100644 --- a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js @@ -43,7 +43,6 @@ MapConfigNamedLayersAdapter.prototype.getMapConfig = function (user, requestMapC if (nestedNamedLayers.length > 0) { var nestedNamedMapsError = new Error('Nested named layers are not allowed'); - // nestedNamedMapsError.http_status = 400; return done(nestedNamedMapsError); } diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-map-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-map-adapter.js new file mode 100644 index 00000000..605ea5f5 --- /dev/null +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-map-adapter.js @@ -0,0 +1,11 @@ +var queue = require('queue-async'); +var _ = require('underscore'); +var Datasource = require('windshaft').model.Datasource; + +function MapConfigNamedMapAdapter() { +} + +module.exports = MapConfigNamedMapAdapter; + +MapConfigNamedMapAdapter.prototype.getMapConfig = function (user, requestMapConfig, params, context, callback) { +}; diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index b695a367..b04229a1 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -155,6 +155,7 @@ module.exports = function(serverOptions) { var mapConfigAdapter = new MapConfigAdapter( new MapConfigNamedLayersAdapter(templateMaps, pgConnection), + new MapConfigNamedMapAdapter(), new SqlWrapMapConfigAdapter(), new DataviewsWidgetsAdapter(), new AnalysisMapConfigAdapter(analysisBackend), diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js index 50a11329..d6c44964 100644 --- a/test/acceptance/buffer-size-format.js +++ b/test/acceptance/buffer-size-format.js @@ -140,7 +140,7 @@ describe('buffer size per format for named maps', function () { coords: { z: 7, x: 64, y: 48 }, format: 'png', fixturePath: './test/fixtures/buffer-size/tile-7.64.48-buffer-size-0.png', - template: createBufferSizeTemplate('named-default-buffer-size', '<%= buffersize %>'), + template: createBufferSizeTemplate('named-default-buffer-size', {png: '<%= buffersize %>'}), assert: function (tile, callback) { assert.imageIsSimilarToFile(tile, this.fixturePath, IMAGE_TOLERANCE_PER_MIL, callback); }