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

build

Browse Source
This commit is contained in:
Stuart Lynn 2015-09-14 11:28:22 -04:00
parent 7292104895
commit 69b3f97a4d
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/torque.full.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/torque.full.uncompressed.js vendored
View File

@ -3223,11 +3223,13 @@ var Profiler = require('../profiler');
var val_keys = Object.keys(row).filter(function(k){return (k.indexOf("vals__uint8") > -1) }) var val_keys = Object.keys(row).filter(function(k){return (k.indexOf("vals__uint8") > -1) })
var val_arr = [] var val_arr = []
val_keys.forEach(function(key){ val_keys.forEach(function(key){
var i = (key=='vals_uint8' ? 0 : key.match(/vals__uint8_(\d+)/)[1]) var i = (key=='vals_uint8' ? 0 : key.match(/vals__uint8_(\d+)/)[1])
val_arr[i] = row[key]; val_arr[i] = row[key];
}) })
if (!this.options.cumulative) { if (!this.options.cumulative) {
for (var j = 0, len = dates.length; j < len; ++j) { for (var j = 0, len = dates.length; j < len; ++j) {
var rr = rowsPerSlot[dates[j]] || (rowsPerSlot[dates[j]] = []); var rr = rowsPerSlot[dates[j]] || (rowsPerSlot[dates[j]] = []);
@ -4730,8 +4732,7 @@ var Filters = require('./torque_filters');
var prof = Profiler.metric('torque.renderer.point.generateSprite').start(); var prof = Profiler.metric('torque.renderer.point.generateSprite').start();
var values = {} var values = {}
if(value.length ==1){
if(value.length ==0){
values["value"] = value[0] values["value"] = value[0]
} }
else{ else{
@ -4803,7 +4804,11 @@ var Filters = require('./torque_filters');
} }
if(st['text-name']){ if(st['text-name']){
st['text-name'] = st['text-name'].replace("{{value}}",value) var captures = st['text-name'].match(/\{\{(.*)\}\}/)
captures.slice(1,captures.length).forEach(function(rep){
st['text-name'] = st['text-name'].replace("{{"+rep+"}}", values[rep])
})
// st['text-name'] = st['text-name'].replace("{{value}}",value)
cartocss.renderText(ctx,st) cartocss.renderText(ctx,st)
} }

2
dist/torque.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/torque.uncompressed.js vendored
View File

@ -3230,11 +3230,13 @@ var Profiler = require('../profiler');
var val_keys = Object.keys(row).filter(function(k){return (k.indexOf("vals__uint8") > -1) }) var val_keys = Object.keys(row).filter(function(k){return (k.indexOf("vals__uint8") > -1) })
var val_arr = [] var val_arr = []
val_keys.forEach(function(key){ val_keys.forEach(function(key){
var i = (key=='vals_uint8' ? 0 : key.match(/vals__uint8_(\d+)/)[1]) var i = (key=='vals_uint8' ? 0 : key.match(/vals__uint8_(\d+)/)[1])
val_arr[i] = row[key]; val_arr[i] = row[key];
}) })
if (!this.options.cumulative) { if (!this.options.cumulative) {
for (var j = 0, len = dates.length; j < len; ++j) { for (var j = 0, len = dates.length; j < len; ++j) {
var rr = rowsPerSlot[dates[j]] || (rowsPerSlot[dates[j]] = []); var rr = rowsPerSlot[dates[j]] || (rowsPerSlot[dates[j]] = []);
@ -4737,8 +4739,7 @@ var Filters = require('./torque_filters');
var prof = Profiler.metric('torque.renderer.point.generateSprite').start(); var prof = Profiler.metric('torque.renderer.point.generateSprite').start();
var values = {} var values = {}
if(value.length ==1){
if(value.length ==0){
values["value"] = value[0] values["value"] = value[0]
} }
else{ else{
@ -4810,7 +4811,11 @@ var Filters = require('./torque_filters');
} }
if(st['text-name']){ if(st['text-name']){
st['text-name'] = st['text-name'].replace("{{value}}",value) var captures = st['text-name'].match(/\{\{(.*)\}\}/)
captures.slice(1,captures.length).forEach(function(rep){
st['text-name'] = st['text-name'].replace("{{"+rep+"}}", values[rep])
})
// st['text-name'] = st['text-name'].replace("{{value}}",value)
cartocss.renderText(ctx,st) cartocss.renderText(ctx,st)
} }