cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses backend-foundations branch to use createLayergroup from backend

Browse Source
This commit is contained in:
Raul Ochoa 2015-06-29 18:58:58 +02:00
parent 837da45f4f
commit 4f87796e9c
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cartodb/cartodb_windshaft.js
View File

@ -164,6 +164,7 @@ var CartodbWindshaft = function(serverOptions) {
serverOptions, serverOptions,
templateMaps, templateMaps,
cartoData, cartoData,
ws.mapBackend,
template_baseurl, template_baseurl,
surrogateKeysCache surrogateKeysCache
); );
@ -177,6 +178,7 @@ var CartodbWindshaft = function(serverOptions) {
ws, ws,
serverOptions, serverOptions,
templateMaps, templateMaps,
ws.mapBackend,
ws.staticMapBackend, ws.staticMapBackend,
surrogateKeysCache, surrogateKeysCache,
tablesExtentApi tablesExtentApi

6
lib/cartodb/controllers/named_maps.js
View File

@ -5,11 +5,13 @@ var templateName = require('../backends/template_maps').templateName;
var CdbRequest = require('../models/cdb_request'); var CdbRequest = require('../models/cdb_request');
var NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
function NamedMapsController(app, serverOptions, templateMaps, metadataBackend, templateBaseUrl, surrogateKeysCache) { function NamedMapsController(app, serverOptions, templateMaps, metadataBackend, mapBackend, templateBaseUrl,
surrogateKeysCache) {
this.app = app; this.app = app;
this.serverOptions = serverOptions; this.serverOptions = serverOptions;
this.templateMaps = templateMaps; this.templateMaps = templateMaps;
this.metadataBackend = metadataBackend; this.metadataBackend = metadataBackend;
this.mapBackend = mapBackend;
this.templateBaseUrl = templateBaseUrl; this.templateBaseUrl = templateBaseUrl;
this.surrogateKeysCache = surrogateKeysCache; this.surrogateKeysCache = surrogateKeysCache;
} }
@ -317,7 +319,7 @@ NamedMapsController.prototype.instantiateTemplate = function(req, res, template_
if ( req.profiler ) req.profiler.done('getUserMapKey'); if ( req.profiler ) req.profiler.done('getUserMapKey');
if ( err ) throw err; if ( err ) throw err;
fakereq.params.api_key = val; fakereq.params.api_key = val;
self.app.createLayergroup(layergroup, fakereq, this); self.mapBackend.createLayergroup(layergroup, fakereq, this);
}, },
function prepareResponse(err, layergroup) { function prepareResponse(err, layergroup) {
if ( err ) { if ( err ) {

5
lib/cartodb/controllers/named_static_maps.js
View File

@ -5,11 +5,12 @@ var CdbRequest = require('../models/cdb_request');
var NamedMapsCacheEntry = require('../cache/model/named_maps_entry'); var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
var _ = require('underscore'); var _ = require('underscore');
function NamedStaticMapsController(app, serverOptions, templateMaps, staticMapBackend, surrogateKeysCache, function NamedStaticMapsController(app, serverOptions, templateMaps, mapBackend, staticMapBackend, surrogateKeysCache,
tablesExtentApi) { tablesExtentApi) {
this.app = app; this.app = app;
this.serverOptions = serverOptions; this.serverOptions = serverOptions;
this.templateMaps = templateMaps; this.templateMaps = templateMaps;
this.mapBackend = mapBackend;
this.staticMapBackend = staticMapBackend; this.staticMapBackend = staticMapBackend;
this.surrogateKeysCache = surrogateKeysCache; this.surrogateKeysCache = surrogateKeysCache;
this.tablesExtentApi = tablesExtentApi; this.tablesExtentApi = tablesExtentApi;
@ -114,7 +115,7 @@ NamedStaticMapsController.prototype.named = function(req, res) {
}, },
function setApiKey(err){ function setApiKey(err){
assert.ifError(err); assert.ifError(err);
self.app.createLayergroup(layergroupConfig, fakeReq, this); self.mapBackend.createLayergroup(layergroupConfig, fakeReq, this);
}, },
function prepareResponse(err, layergroup) { function prepareResponse(err, layergroup) {
assert.ifError(err); assert.ifError(err);

26
npm-shrinkwrap.json generated
View File

@ -134,19 +134,19 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc1.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc1.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "1.2.1", "version": "1.3.0",
"from": "async@^1.2.1", "from": "async@^1.2.1",
"resolved": "https://registry.npmjs.org/async/-/async-1.2.1.tgz" "resolved": "https://registry.npmjs.org/async/-/async-1.3.0.tgz"
}, },
"mime-types": { "mime-types": {
"version": "2.1.1", "version": "2.1.2",
"from": "mime-types@^2.1.1", "from": "mime-types@^2.1.1",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.2.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
"version": "1.13.0", "version": "1.14.0",
"from": "mime-db@~1.13.0", "from": "mime-db@~1.14.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz"
} }
} }
} }
@ -271,13 +271,13 @@
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
}, },
"har-validator": { "har-validator": {
"version": "1.7.1", "version": "1.8.0",
"from": "har-validator@^1.6.1", "from": "har-validator@^1.6.1",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
"dependencies": { "dependencies": {
"bluebird": { "bluebird": {
"version": "2.9.30", "version": "2.9.30",
"from": "bluebird@^2.9.26", "from": "bluebird@^2.9.30",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz" "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz"
}, },
"chalk": { "chalk": {
@ -491,9 +491,9 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
}, },
"windshaft": { "windshaft": {
"version": "0.45.0", "version": "0.45.1",
"from": "windshaft@0.45.0", "from": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.45.0.tgz", "resolved": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
"dependencies": { "dependencies": {
"chronograph": { "chronograph": {
"version": "0.1.0", "version": "0.1.0",

2
package.json
View File

@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"underscore" : "~1.6.0", "underscore" : "~1.6.0",
"dot": "~1.0.2", "dot": "~1.0.2",
"windshaft": "0.45.0", "windshaft": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
"step": "~0.0.5", "step": "~0.0.5",
"queue-async": "~1.0.7", "queue-async": "~1.0.7",
"request": "~2.9.203", "request": "~2.9.203",