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

Add support for torque tiles and attributes fetching

Browse Source 
Retargets self to 1.7.0
Upgrades Windshaft to 0.16.0

Closes #118 -- CDB-1525 #resolve
Closes #112 -- CDB-1329 #resolve
This commit is contained in:
Sandro Santilli
2014-02-04 13:30:59 +01:00
parent db478579c5
commit b01570924d
4 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS.md
+7 -2
View File
@@ -1,9 +1,14 @@
1.6.4 -- 2014-MM-DD
1.7.0 -- 2014-MM-DD
-------------------
New features:
* Add support for torque tiles (#112)
* Add attributes service (#118)
Enhancements:
* Allow specifying fixed sqlapi host address (#117)
* Allow specifying fixed sqlapi host address (#117)
1.6.3 -- 2014-01-30
-------------------
npm-shrinkwrap.json
Generated
+60 -35
View File
@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "1.6.3",
"version": "1.7.0",
"dependencies": {
"node-varnish": {
"version": "0.1.1"
@@ -9,39 +9,11 @@
"version": "1.3.3"
},
"windshaft": {
"version": "0.15.1",
"version": "0.16.0",
"dependencies": {
"grainstore": {
"version": "0.16.0",
"version": "0.17.0",
"dependencies": {
"carto": {
"version": "0.9.5-cdb2",
"from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
"dependencies": {
"underscore": {
"version": "1.4.4"
},
"xml2js": {
"version": "0.2.8",
"dependencies": {
"sax": {
"version": "0.5.8"
}
}
},
"optimist": {
"version": "0.6.0",
"dependencies": {
"wordwrap": {
"version": "0.0.2"
},
"minimist": {
"version": "0.0.5"
}
}
}
}
},
"mapnik-reference": {
"version": "5.0.7"
},
@@ -257,7 +229,7 @@
}
},
"deep-extend": {
"version": "0.2.6"
"version": "0.2.8"
},
"ini": {
"version": "1.1.0"
@@ -349,6 +321,59 @@
},
"lru-cache": {
"version": "2.3.1"
},
"carto": {
"version": "0.9.5-cdb2",
"from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
"dependencies": {
"underscore": {
"version": "1.4.4"
},
"mapnik-reference": {
"version": "5.0.7"
},
"xml2js": {
"version": "0.2.8",
"dependencies": {
"sax": {
"version": "0.5.8"
}
}
},
"optimist": {
"version": "0.6.0",
"dependencies": {
"wordwrap": {
"version": "0.0.2"
},
"minimist": {
"version": "0.0.5"
}
}
}
}
},
"underscore.string": {
"version": "1.1.6",
"dependencies": {
"underscore": {
"version": "1.1.7"
}
}
},
"pg": {
"version": "2.6.2",
"dependencies": {
"generic-pool": {
"version": "2.0.3"
},
"buffer-writer": {
"version": "1.0.0"
}
}
},
"torque.js": {
"version": "2.2.00"
}
}
},
@@ -383,15 +408,15 @@
"lzma": {
"version": "1.2.3"
},
"strftime": {
"version": "0.6.2"
},
"semver": {
"version": "1.1.4"
},
"redis": {
"version": "0.8.6"
},
"strftime": {
"version": "0.6.2"
},
"mocha": {
"version": "1.14.0",
"dependencies": {
package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "1.6.4",
"version": "1.7.0",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@@ -24,7 +24,7 @@
"dependencies": {
"node-varnish": "0.1.1",
"underscore" : "~1.3.3",
"windshaft" : "~0.15.1",
"windshaft" : "~0.16.0",
"step": "0.0.x",
"request": "2.9.202",
"cartodb-redis": "~0.3.0",
test/acceptance/multilayer.js
+13 -13
View File
@@ -58,7 +58,7 @@ suite('multilayer', function() {
]
};
var expected_token = "e34dd7e235138a062f8ba7ad051aa3a7";
var expected_token; // = "e34dd7e235138a062f8ba7ad051aa3a7";
Step(
function do_post()
{
@@ -83,7 +83,7 @@ suite('multilayer', function() {
if ( expected_token ) {
assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
}
else expected_token = parsedBody.layergroupid;
else expected_token = parsedBody.layergroupid.split(':')[0];
next(null, res);
});
},
@@ -164,7 +164,7 @@ suite('multilayer', function() {
errors.push(err.message);
console.log("Error: " + err);
}
redis_client.keys("map_style|test_cartodb_user_1_db|~" + expected_token, function(err, matches) {
redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
if ( err ) errors.push(err.message);
assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
redis_client.del(matches, function(err) {
@@ -193,7 +193,7 @@ suite('multilayer', function() {
]
};
var expected_token = "6d8e4ad5458e2d25cf0eef38e38717a6";
var expected_token; // = "6d8e4ad5458e2d25cf0eef38e38717a6";
Step(
function do_post()
{
@@ -217,7 +217,7 @@ suite('multilayer', function() {
if ( expected_token ) {
assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
}
else expected_token = parsedBody.layergroupid;
else expected_token = parsedBody.layergroupid.split(':')[0];
next(null, res);
});
},
@@ -329,7 +329,7 @@ suite('multilayer', function() {
errors.push(err.message);
console.log("Error: " + err);
}
redis_client.keys("map_style|test_cartodb_user_1_db|~" + expected_token, function(err, matches) {
redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
if ( err ) errors.push(err.message);
assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
redis_client.del(matches, function(err) {
@@ -425,7 +425,7 @@ suite('multilayer', function() {
var next = this;
// trip epoch
expected_token = expected_token.split(':')[0];
redis_client.keys("map_style|test_cartodb_user_1_db|~" + expected_token, function(err, matches) {
redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
redis_client.del(matches, next);
});
},
@@ -517,7 +517,7 @@ suite('multilayer', function() {
]
};
var expected_token = "b4ed64d93a411a59f330ab3d798e4009";
var expected_token; // = "b4ed64d93a411a59f330ab3d798e4009";
Step(
function do_post()
{
@@ -542,7 +542,7 @@ suite('multilayer', function() {
if ( expected_token ) {
assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
}
else expected_token = parsedBody.layergroupid;
else expected_token = parsedBody.layergroupid.split(':')[0];
next(null, res);
});
},
@@ -650,7 +650,7 @@ suite('multilayer', function() {
errors.push(err.message);
console.log("Error: " + err);
}
redis_client.keys("map_style|test_cartodb_user_1_db|~" + expected_token, function(err, matches) {
redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
if ( err ) errors.push(err.message);
assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
redis_client.del(matches, function(err) {
@@ -805,7 +805,7 @@ suite('multilayer', function() {
errors.push(err.message);
console.log("Error: " + err);
}
redis_client.keys("map_style|test_cartodb_user_1_db|~" + expected_token, function(err, matches) {
redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
if ( err ) errors.push(err.message);
assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
redis_client.del(matches, function(err) {
@@ -880,7 +880,7 @@ suite('multilayer', function() {
if ( err ) errors.push(err.message);
if ( ! expected_token ) return null;
var next = this;
redis_client.keys("map_style|test_cartodb_user_1_db|~" + expected_token, function(err, matches) {
redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
if ( err ) errors.push(err.message);
assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
redis_client.del(matches, function(err) {
@@ -947,7 +947,7 @@ suite('multilayer', function() {
if ( err ) errors.push(err.message);
if ( ! expected_token ) return null;
var next = this;
redis_client.keys("map_style|test_cartodb_user_1_db|~" + expected_token, function(err, matches) {
redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
if ( err ) errors.push(err.message);
assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
redis_client.del(matches, function(err) {