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

Use grainstore 0.9.7 for mapnik version dependent default styles

Browse Source
This commit is contained in:
Sandro Santilli 2012-11-14 10:40:48 +01:00
parent 33e68d9069
commit f9b78e2cb2
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -1,5 +1,6 @@
1.1.3 (DD//MM//YY) 1.1.3 (DD//MM//YY)
----- -----
* Mapnik-version dependent default styles
1.1.2 (DD//MM//YY) 1.1.2 (DD//MM//YY)
----- -----

7
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "1.1.0", "version": "1.1.3",
"dependencies": { "dependencies": {
"cluster2": { "cluster2": {
"version": "0.3.5-cdb02", "version": "0.3.5-cdb02",
@ -182,7 +182,7 @@
"version": "1.3.3" "version": "1.3.3"
}, },
"grainstore": { "grainstore": {
"version": "0.9.6", "version": "0.9.7",
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "1.1.0" "version": "1.1.0"
@ -323,6 +323,9 @@
"mapnik": { "mapnik": {
"version": "0.7.16" "version": "0.7.16"
}, },
"semver": {
"version": "1.1.0"
},
"mocha": { "mocha": {
"version": "1.2.1", "version": "1.2.1",
"dependencies": { "dependencies": {

5
package.json
View File

@ -21,7 +21,7 @@
"cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production", "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
"node-varnish": "0.1.1", "node-varnish": "0.1.1",
"underscore" : "~1.3.3", "underscore" : "~1.3.3",
"grainstore" : "~0.9.6", "grainstore" : "~0.9.7",
"windshaft" : "~0.7.0", "windshaft" : "~0.7.0",
"step": "0.0.x", "step": "0.0.x",
"generic-pool": "1.0.x", "generic-pool": "1.0.x",
@ -31,7 +31,8 @@
"mapnik": "~0.7.14" "mapnik": "~0.7.14"
}, },
"devDependencies": { "devDependencies": {
"mocha": "1.2.1" "mocha": "1.2.1",
"semver": "~1.1.0"
}, },
"scripts": { "scripts": {
"test": "make check" "test": "make check"

23
test/acceptance/server.js
View File

@ -3,6 +3,9 @@ var tests = module.exports = {};
var _ = require('underscore'); var _ = require('underscore');
var redis = require('redis'); var redis = require('redis');
var querystring = require('querystring'); var querystring = require('querystring');
var semver = require('semver');
var mapnik = require('mapnik');
require(__dirname + '/../support/test_helper'); require(__dirname + '/../support/test_helper');
var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/cartodb_windshaft'); var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/cartodb_windshaft');
@ -13,6 +16,15 @@ server.setMaxListeners(0);
suite('server', function() { suite('server', function() {
var redis_client = redis.createClient(global.environment.redis.port); var redis_client = redis.createClient(global.environment.redis.port);
var default_style = semver.satisfies(mapnik.versions.mapnik, '<2.1.0')
?
// 2.0.0 default
'#<%= table %>{marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}'
:
// 2.1.0 default
'#<%= table %>[mapnik-geometry-type=1] {marker-fill: #FF6600;marker-opacity: 1;marker-width: 16;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}#<%= table %>[mapnik-geometry-type=2] {line-color:#FF6600; line-width:1; line-opacity: 0.7;}#<%= table %>[mapnik-geometry-type=3] {polygon-fill:#FF6600; polygon-opacity: 0.7; line-opacity:1; line-color: #FFFFFF;}';
suiteSetup(function(){ suiteSetup(function(){
}); });
@ -78,8 +90,8 @@ suite('server', function() {
headers: { 'X-Cache-Channel': 'cartodb_test_user_1_db:my_table' }, headers: { 'X-Cache-Channel': 'cartodb_test_user_1_db:my_table' },
}, function(res) { }, function(res) {
var parsed = JSON.parse(res.body); var parsed = JSON.parse(res.body);
assert.equal(parsed.style, "#my_table {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}"); assert.equal(parsed.style, _.template(default_style, {table: 'my_table'}));
assert.equal(parsed.style_version, '2.0.0'); assert.equal(parsed.style_version, mapnik.versions.mapnik);
done(); done();
}); });
}); });
@ -128,8 +140,9 @@ suite('server', function() {
}, function(res) { }, function(res) {
assert.equal(res.statusCode, 200, res.body); assert.equal(res.statusCode, 200, res.body);
var parsed = JSON.parse(res.body); var parsed = JSON.parse(res.body);
assert.equal(parsed.style, "#test_table_private_1 {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}"); var style = _.template(default_style, {table: 'test_table_private_1'});
assert.equal(parsed.style_version, '2.0.0'); assert.equal(parsed.style, style);
assert.equal(parsed.style_version, mapnik.versions.mapnik);
done(); done();
}); });
}); });
@ -319,7 +332,7 @@ suite('server', function() {
test("delete'ing style returns 200 then getting returns default style", function(done){ test("delete'ing style returns 200 then getting returns default style", function(done){
// this is the default style // this is the default style
var style = '#my_table5 {marker-fill: #FF6600;marker-opacity: 1;marker-width: 8;marker-line-color: white;marker-line-width: 3;marker-line-opacity: 0.9;marker-placement: point;marker-type: ellipse;marker-allow-overlap: true;}' var style = _.template(default_style, {table: 'my_table5'});
assert.response(server, { assert.response(server, {
url: '/tiles/my_table5/style?map_key=1234', url: '/tiles/my_table5/style?map_key=1234',
method: 'DELETE', method: 'DELETE',