From c14157acc29d40f5c47318e06a3df76053b2a840 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 20 Jan 2015 18:16:09 +0100 Subject: [PATCH] Moves template routing --- lib/cartodb/cartodb_windshaft.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js index 300bd3e1..9379858d 100644 --- a/lib/cartodb/cartodb_windshaft.js +++ b/lib/cartodb/cartodb_windshaft.js @@ -133,6 +133,20 @@ var CartodbWindshaft = function(serverOptions) { ws_sendError.apply(this, arguments); }; + /******************************************************************************************************************* + * Routing + ******************************************************************************************************************/ + + var TemplateMapsController = require('./controllers/template_maps'), + templateMapsController = new TemplateMapsController( + ws, serverOptions, templateMaps, serverOptions.signedMaps, cartoData, template_baseurl + ); + templateMapsController.register(ws); + + /******************************************************************************************************************* + * END Routing + ******************************************************************************************************************/ + /** * Helper to allow access to the layer to be used in the maps infowindow popup. */ @@ -198,14 +212,6 @@ var CartodbWindshaft = function(serverOptions) { ); }); - - var TemplateMapsController = require('./controllers/template_maps'), - templateMapsController = new TemplateMapsController( - ws, serverOptions, templateMaps, serverOptions.signedMaps, cartoData, template_baseurl - ); - templateMapsController.register(ws); - - var healthCheck = new HealthCheck(cartoData, Windshaft.tilelive); ws.get('/health', function(req, res) { var healthConfig = global.environment.health || {};