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

fixed windshaft provider with https

Browse Source
This commit is contained in:
javi 2014-02-25 16:04:20 +01:00
parent 920d22ad70
commit 8211285a4c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/torque/provider.windshaft.js
View File

@ -331,7 +331,10 @@
if (!this.options.cdn_url) {
return this._tilerHost();
}
var h = protocol + "://{s}.";
var h = protocol + "://"
if (protocol === 'http') {
h += "{s}.";
}
var cdn_host = opts.cdn_url;
if(!cdn_host.http && !cdn_host.https) {
throw new Error("cdn_host should contain http and/or https entries");

8
test/provider.windshaft.test.js
View File

@ -38,7 +38,7 @@ module('provider.windshaft', {
"layers": [{
"type": "torque",
"options": {
"cartocss_version": "2.1.1",
"cartocss_version": "1.0.0",
"cartocss": '#test{}',
"sql": 'test'
}
@ -60,6 +60,12 @@ module('provider.windshaft', {
equal(windshaft.url(), "http://{s}.cartocdn.com/rambo");
});
test("url cdn https", function() {
windshaft.options.tiler_protocol = 'https';
windshaft.options.cdn_url = { https: 'cartocdn.com' };
equal(windshaft.url(), "https://cartocdn.com/rambo");
});
test("named map", function() {
windshaft_named = new torque.providers.windshaft({
table: 'test',