var name change

This commit is contained in:
Francisco Dans 2015-10-01 18:46:33 +02:00
parent 9cc7779858
commit aa8c61b442

View File

@ -1,6 +1,6 @@
var torque = require('../lib/torque/core'); var torque = require('../lib/torque/core');
var windshaft, url; var tilejsonprovider, url;
var lastCall; var lastCall;
var old_net; var old_net;
QUnit.module('provider.tilejson', { QUnit.module('provider.tilejson', {
@ -16,7 +16,7 @@ QUnit.module('provider.tilejson', {
var tilejson = '{"tiles": ["./{z}/{x}/{y}.json.torque"], "end": 903000, "column_type": "number", "start": 1000, "data_steps": 1, "resolution": 32}'; var tilejson = '{"tiles": ["./{z}/{x}/{y}.json.torque"], "end": 903000, "column_type": "number", "start": 1000, "data_steps": 1, "resolution": 32}';
callback({response: tilejson}); callback({response: tilejson});
}; };
windshaft = new torque.providers.tileJSON({ tilejsonprovider = new torque.providers.tileJSON({
tileJSON: 'http://what.ev.er/tilejson.json', tileJSON: 'http://what.ev.er/tilejson.json',
cartocss: '#test{}', cartocss: '#test{}',
resolution: 1, resolution: 1,
@ -30,8 +30,8 @@ QUnit.module('provider.tilejson', {
}); });
test("tile urls should be correctly formed for relative urls", function() { test("tile urls should be correctly formed for relative urls", function() {
windshaft._ready = true; tilejsonprovider._ready = true;
windshaft.getTileData({x: 0, y: 1, corrected: {x: 0, y: 1}}, 2, function() {}); tilejsonprovider.getTileData({x: 0, y: 1, corrected: {x: 0, y: 1}}, 2, function() {});
equal(lastCall,"http://what.ev.er/./2/0/1.json.torque"); equal(lastCall,"http://what.ev.er/./2/0/1.json.torque");
}); });
@ -45,13 +45,13 @@ test("tile urls should be correctly formed for absolute urls", function() {
var tilejson = '{"tiles": ["http://ca.ta.pam/{z}/{x}/{y}.json.torque"], "end": 903000, "column_type": "number", "start": 1000, "data_steps": 1, "resolution": 32}'; var tilejson = '{"tiles": ["http://ca.ta.pam/{z}/{x}/{y}.json.torque"], "end": 903000, "column_type": "number", "start": 1000, "data_steps": 1, "resolution": 32}';
callback({response: tilejson}); callback({response: tilejson});
}; };
windshaft = new torque.providers.tileJSON({ tilejsonprovider = new torque.providers.tileJSON({
tileJSON: 'http://what.ev.er/tilejson.json', tileJSON: 'http://what.ev.er/tilejson.json',
cartocss: '#test{}', cartocss: '#test{}',
resolution: 1, resolution: 1,
steps: 10 steps: 10
}); });
windshaft._ready = true; tilejsonprovider._ready = true;
windshaft.getTileData({x: 0, y: 1, corrected: {x: 0, y: 1}}, 2, function() {}); tilejsonprovider.getTileData({x: 0, y: 1, corrected: {x: 0, y: 1}}, 2, function() {});
equal(lastCall,"http://ca.ta.pam/2/0/1.json.torque"); equal(lastCall,"http://ca.ta.pam/2/0/1.json.torque");
}); });