Amend Release 2.11.0
This commit is contained in:
parent
c855c1c212
commit
2af620ee74
14
dist/torque.full.js
vendored
14
dist/torque.full.js
vendored
File diff suppressed because one or more lines are too long
17
dist/torque.full.uncompressed.js
vendored
17
dist/torque.full.uncompressed.js
vendored
@ -670,6 +670,7 @@ module.exports.TorqueLayer = TorqueLayer;
|
|||||||
var types = {
|
var types = {
|
||||||
Uint8Array: typeof(global['Uint8Array']) !== 'undefined' ? global.Uint8Array : Array,
|
Uint8Array: typeof(global['Uint8Array']) !== 'undefined' ? global.Uint8Array : Array,
|
||||||
Uint32Array: typeof(global['Uint32Array']) !== 'undefined' ? global.Uint32Array : Array,
|
Uint32Array: typeof(global['Uint32Array']) !== 'undefined' ? global.Uint32Array : Array,
|
||||||
|
Int16Array: typeof(global['Int16Array']) !== 'undefined' ? global.Int16Array : Array,
|
||||||
Int32Array: typeof(global['Int32Array']) !== 'undefined' ? global.Int32Array: Array
|
Int32Array: typeof(global['Int32Array']) !== 'undefined' ? global.Int32Array: Array
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -3833,6 +3834,8 @@ var Profiler = require('../profiler');
|
|||||||
this.options.tiler_domain = options.tiler_domain || 'cartodb.com';
|
this.options.tiler_domain = options.tiler_domain || 'cartodb.com';
|
||||||
this.options.tiler_port = options.tiler_port || 80;
|
this.options.tiler_port = options.tiler_port || 80;
|
||||||
|
|
||||||
|
this.options.coordinates_data_type = this.options.coordinates_data_type || Uint8Array;
|
||||||
|
|
||||||
if (this.options.data_aggregation) {
|
if (this.options.data_aggregation) {
|
||||||
this.options.cumulative = this.options.data_aggregation === 'cumulative';
|
this.options.cumulative = this.options.data_aggregation === 'cumulative';
|
||||||
}
|
}
|
||||||
@ -3858,8 +3861,8 @@ var Profiler = require('../profiler');
|
|||||||
*/
|
*/
|
||||||
proccessTile: function(rows, coord, zoom) {
|
proccessTile: function(rows, coord, zoom) {
|
||||||
var r;
|
var r;
|
||||||
var x = new Uint8Array(rows.length);
|
var x = new this.options.coordinates_data_type(rows.length);
|
||||||
var y = new Uint8Array(rows.length);
|
var y = new this.options.coordinates_data_type(rows.length);
|
||||||
|
|
||||||
var prof_mem = Profiler.metric('torque.provider.windshaft.mem');
|
var prof_mem = Profiler.metric('torque.provider.windshaft.mem');
|
||||||
var prof_point_count = Profiler.metric('torque.provider.windshaft.points');
|
var prof_point_count = Profiler.metric('torque.provider.windshaft.points');
|
||||||
@ -3903,13 +3906,7 @@ var Profiler = require('../profiler');
|
|||||||
for (var r = 0; r < rows.length; ++r) {
|
for (var r = 0; r < rows.length; ++r) {
|
||||||
var row = rows[r];
|
var row = rows[r];
|
||||||
x[r] = row.x__uint8 * this.options.resolution;
|
x[r] = row.x__uint8 * this.options.resolution;
|
||||||
// fix value when it's in the tile EDGE
|
|
||||||
// TODO: this should be fixed in SQL query
|
|
||||||
if (row.y__uint8 === -1) {
|
|
||||||
y[r] = 0;
|
|
||||||
} else {
|
|
||||||
y[r] = row.y__uint8 * this.options.resolution;
|
y[r] = row.y__uint8 * this.options.resolution;
|
||||||
}
|
|
||||||
|
|
||||||
var dates = row.dates__uint16;
|
var dates = row.dates__uint16;
|
||||||
var vals = row.vals__uint8;
|
var vals = row.vals__uint8;
|
||||||
@ -4498,7 +4495,7 @@ var Filters = require('./torque_filters');
|
|||||||
var markerFile = st["marker-file"] || st["point-file"];
|
var markerFile = st["marker-file"] || st["point-file"];
|
||||||
var qualifiedUrl = markerFile && this._qualifyURL(markerFile);
|
var qualifiedUrl = markerFile && this._qualifyURL(markerFile);
|
||||||
|
|
||||||
if (qualifiedUrl && this._iconsToLoad <= 0) {
|
if (qualifiedUrl && this._iconsToLoad <= 0 && this._icons[qualifiedUrl]) {
|
||||||
var img = this._icons[qualifiedUrl];
|
var img = this._icons[qualifiedUrl];
|
||||||
|
|
||||||
var dWidth = st['marker-width'] * 2 || img.width;
|
var dWidth = st['marker-width'] * 2 || img.width;
|
||||||
@ -4744,6 +4741,8 @@ var Filters = require('./torque_filters');
|
|||||||
if (err) {
|
if (err) {
|
||||||
self._forcePoints = true;
|
self._forcePoints = true;
|
||||||
self.clearSpriteCache();
|
self.clearSpriteCache();
|
||||||
|
self._iconsToLoad = 0;
|
||||||
|
self.fire("allIconsLoaded");
|
||||||
if(filtered) {
|
if(filtered) {
|
||||||
console.info("Only CORS-enabled, or same domain image-files can be used in combination with image-filters");
|
console.info("Only CORS-enabled, or same domain image-files can be used in combination with image-filters");
|
||||||
}
|
}
|
||||||
|
6
dist/torque.js
vendored
6
dist/torque.js
vendored
File diff suppressed because one or more lines are too long
17
dist/torque.uncompressed.js
vendored
17
dist/torque.uncompressed.js
vendored
@ -670,6 +670,7 @@ module.exports.TorqueLayer = TorqueLayer;
|
|||||||
var types = {
|
var types = {
|
||||||
Uint8Array: typeof(global['Uint8Array']) !== 'undefined' ? global.Uint8Array : Array,
|
Uint8Array: typeof(global['Uint8Array']) !== 'undefined' ? global.Uint8Array : Array,
|
||||||
Uint32Array: typeof(global['Uint32Array']) !== 'undefined' ? global.Uint32Array : Array,
|
Uint32Array: typeof(global['Uint32Array']) !== 'undefined' ? global.Uint32Array : Array,
|
||||||
|
Int16Array: typeof(global['Int16Array']) !== 'undefined' ? global.Int16Array : Array,
|
||||||
Int32Array: typeof(global['Int32Array']) !== 'undefined' ? global.Int32Array: Array
|
Int32Array: typeof(global['Int32Array']) !== 'undefined' ? global.Int32Array: Array
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -3833,6 +3834,8 @@ var Profiler = require('../profiler');
|
|||||||
this.options.tiler_domain = options.tiler_domain || 'cartodb.com';
|
this.options.tiler_domain = options.tiler_domain || 'cartodb.com';
|
||||||
this.options.tiler_port = options.tiler_port || 80;
|
this.options.tiler_port = options.tiler_port || 80;
|
||||||
|
|
||||||
|
this.options.coordinates_data_type = this.options.coordinates_data_type || Uint8Array;
|
||||||
|
|
||||||
if (this.options.data_aggregation) {
|
if (this.options.data_aggregation) {
|
||||||
this.options.cumulative = this.options.data_aggregation === 'cumulative';
|
this.options.cumulative = this.options.data_aggregation === 'cumulative';
|
||||||
}
|
}
|
||||||
@ -3858,8 +3861,8 @@ var Profiler = require('../profiler');
|
|||||||
*/
|
*/
|
||||||
proccessTile: function(rows, coord, zoom) {
|
proccessTile: function(rows, coord, zoom) {
|
||||||
var r;
|
var r;
|
||||||
var x = new Uint8Array(rows.length);
|
var x = new this.options.coordinates_data_type(rows.length);
|
||||||
var y = new Uint8Array(rows.length);
|
var y = new this.options.coordinates_data_type(rows.length);
|
||||||
|
|
||||||
var prof_mem = Profiler.metric('torque.provider.windshaft.mem');
|
var prof_mem = Profiler.metric('torque.provider.windshaft.mem');
|
||||||
var prof_point_count = Profiler.metric('torque.provider.windshaft.points');
|
var prof_point_count = Profiler.metric('torque.provider.windshaft.points');
|
||||||
@ -3903,13 +3906,7 @@ var Profiler = require('../profiler');
|
|||||||
for (var r = 0; r < rows.length; ++r) {
|
for (var r = 0; r < rows.length; ++r) {
|
||||||
var row = rows[r];
|
var row = rows[r];
|
||||||
x[r] = row.x__uint8 * this.options.resolution;
|
x[r] = row.x__uint8 * this.options.resolution;
|
||||||
// fix value when it's in the tile EDGE
|
|
||||||
// TODO: this should be fixed in SQL query
|
|
||||||
if (row.y__uint8 === -1) {
|
|
||||||
y[r] = 0;
|
|
||||||
} else {
|
|
||||||
y[r] = row.y__uint8 * this.options.resolution;
|
y[r] = row.y__uint8 * this.options.resolution;
|
||||||
}
|
|
||||||
|
|
||||||
var dates = row.dates__uint16;
|
var dates = row.dates__uint16;
|
||||||
var vals = row.vals__uint8;
|
var vals = row.vals__uint8;
|
||||||
@ -4498,7 +4495,7 @@ var Filters = require('./torque_filters');
|
|||||||
var markerFile = st["marker-file"] || st["point-file"];
|
var markerFile = st["marker-file"] || st["point-file"];
|
||||||
var qualifiedUrl = markerFile && this._qualifyURL(markerFile);
|
var qualifiedUrl = markerFile && this._qualifyURL(markerFile);
|
||||||
|
|
||||||
if (qualifiedUrl && this._iconsToLoad <= 0) {
|
if (qualifiedUrl && this._iconsToLoad <= 0 && this._icons[qualifiedUrl]) {
|
||||||
var img = this._icons[qualifiedUrl];
|
var img = this._icons[qualifiedUrl];
|
||||||
|
|
||||||
var dWidth = st['marker-width'] * 2 || img.width;
|
var dWidth = st['marker-width'] * 2 || img.width;
|
||||||
@ -4744,6 +4741,8 @@ var Filters = require('./torque_filters');
|
|||||||
if (err) {
|
if (err) {
|
||||||
self._forcePoints = true;
|
self._forcePoints = true;
|
||||||
self.clearSpriteCache();
|
self.clearSpriteCache();
|
||||||
|
self._iconsToLoad = 0;
|
||||||
|
self.fire("allIconsLoaded");
|
||||||
if(filtered) {
|
if(filtered) {
|
||||||
console.info("Only CORS-enabled, or same domain image-files can be used in combination with image-filters");
|
console.info("Only CORS-enabled, or same domain image-files can be used in combination with image-filters");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user