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

commenting and removal of bogus config. also disable cache in test environment

Browse Source
This commit is contained in:
Simon Tokumine 2012-06-06 15:24:44 +01:00
parent a382b9f601
commit 98e5bab8e4
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/environments/development.js
View File

@ -14,7 +14,6 @@ var config = {
extent: "-180,-90,180,90", extent: "-180,-90,180,90",
srid: 4326, srid: 4326,
*/ */
/* max_size: 0, */ /* see https://github.com/Vizzuality/Windshaft-cartodb/issues/16 */
simplify: true simplify: true
} }
,redis: { ,redis: {

2
config/environments/test.js
View File

@ -3,7 +3,7 @@ var config = {
,port: 8888 ,port: 8888
,host: '127.0.0.1' ,host: '127.0.0.1'
,enable_cors: true ,enable_cors: true
,cache_enabled: true ,cache_enabled: false
,postgres: { ,postgres: {
user: "tileuser", user: "tileuser",
host: '127.0.0.1', host: '127.0.0.1',

2
lib/cartodb/cache_validator.js
View File

@ -38,7 +38,7 @@ function generateCacheChannel(req, callback){
if (!_.isNull(channelCache[sql_md5]) && !_.isUndefined(channelCache[sql_md5])) { if (!_.isNull(channelCache[sql_md5]) && !_.isUndefined(channelCache[sql_md5])) {
callback(channelCache[sql_md5]); callback(channelCache[sql_md5]);
} else{ } else{
// strip out windshaft/mapnik inserted sql // strip out windshaft/mapnik inserted sql if present
var sql = req.params.sql.match(/^\((.*)\)\sas\scdbq$/); var sql = req.params.sql.match(/^\((.*)\)\sas\scdbq$/);
sql = (sql != null) ? sql[1] : req.params.sql; sql = (sql != null) ? sql[1] : req.params.sql;

6
test/acceptance/server.js
View File

@ -193,4 +193,8 @@ tests["get'ing a tile with default style and complex sql should return a constra
status: 200, status: 200,
headers: { 'Content-Type': 'image/png' } headers: { 'Content-Type': 'image/png' }
}); });
}; };