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

Fix error for invalid text-name in CartoCSS. Closes #81.

Browse Source
This commit is contained in:
Sandro Santilli 2013-09-12 17:32:10 +02:00
parent 7861852078
commit a7cc7ceeb8
4 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -4,6 +4,7 @@
* Fix "sql/table must contain zoom variable" error when using
"[ zoom > 3]" CartoCSS snippets (note the space)
* Fix backward compatibility handling of sqlapi.host configuration (#82)
* Fix error for invalid text-name in CartoCSS (#81)
1.3.4
------

53
npm-shrinkwrap.json generated
View File

@ -9,14 +9,14 @@
"version": "1.3.3"
},
"windshaft": {
"version": "0.13.5",
"version": "0.13.6",
"dependencies": {
"grainstore": {
"version": "0.13.9",
"version": "0.13.10",
"dependencies": {
"carto": {
"version": "0.9.3-cdb4",
"from": "git://github.com/CartoDB/carto.git#cdb-0.9.3-cdb4",
"version": "0.9.3-cdb5",
"from": "git://github.com/CartoDB/carto.git#cdb-0.9.3-cdb5",
"dependencies": {
"mapnik-reference": {
"version": "5.0.0-cdb1",
@ -125,7 +125,50 @@
"version": "0.4.0"
},
"sqlite3": {
"version": "2.1.15"
"version": "2.1.17",
"dependencies": {
"progress": {
"version": "1.0.1"
},
"tar.gz": {
"version": "0.1.1",
"dependencies": {
"fstream": {
"version": "0.1.24",
"dependencies": {
"rimraf": {
"version": "2.2.2"
},
"graceful-fs": {
"version": "2.0.1"
},
"inherits": {
"version": "2.0.1"
}
}
},
"tar": {
"version": "0.1.18",
"dependencies": {
"inherits": {
"version": "2.0.1"
},
"block-stream": {
"version": "0.0.7"
}
}
},
"commander": {
"version": "1.1.1",
"dependencies": {
"keypress": {
"version": "0.1.0"
}
}
}
}
}
}
},
"mime": {
"version": "1.2.11"

2
package.json
View File

@ -21,7 +21,7 @@
"dependencies": {
"node-varnish": "0.1.1",
"underscore" : "~1.3.3",
"windshaft" : "~0.13.5",
"windshaft" : "~0.13.6",
"step": "0.0.x",
"generic-pool": "~2.0.3",
"redis": "~0.8.3",

26
test/acceptance/multilayer.js
View File

@ -578,6 +578,32 @@ suite('multilayer', function() {
);
});
test("ticket #81", function(done) {
var layergroup = {
version: '1.0.1',
layers: [
{ options: {
sql: "select 1 as cartodb_id, 'SRID=3857;POINT(0 0)'::geometry as the_geom_webmercator",
cartocss: '#sample { text-name: cartodb_id; text-face-name: "Dejagnu"; }',
cartocss_version: '2.1.1',
} }
]
};
assert.response(server, {
url: '/tiles/layergroup?',
method: 'POST',
headers: {host: 'localhost', 'Content-Type': 'application/json' },
data: JSON.stringify(layergroup)
}, {}, function(res) {
assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body);
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed, {"errors":["style0:1:10 Invalid value for text-name, the type expression is expected. cartodb_id (of type keyword) was given."]});
done();
});
});
suiteTeardown(function(done) {
// This test will add map_style records, like