Commit Graph

804 Commits

Author SHA1 Message Date
Stuart Lynn
dc389b7f1b build 2015-09-28 13:15:56 -04:00
Stuart Lynn
69b3f97a4d build 2015-09-14 11:28:22 -04:00
Stuart Lynn
7292104895 use sql_api 2015-09-14 11:28:05 -04:00
Stuart Lynn
a27e8f88ff allow any values to be used in the text renderer 2015-09-14 11:27:51 -04:00
Stuart Lynn
a47279e11a Merge branch 'point_labels' into multi_variable_with_scaling 2015-09-11 13:07:18 -04:00
Stuart Lynn
120e383630 build 2015-09-11 13:05:36 -04:00
Stuart Lynn
f41d79a045 correcting typo 2015-09-11 13:00:59 -04:00
Stuart Lynn
29220a16ec examples updates 2015-09-11 13:00:41 -04:00
Stuart Lynn
dfc8345f35 build 2015-09-09 18:30:26 -04:00
Stuart Lynn
ed585820ac tweak example 2015-09-09 18:30:19 -04:00
Stuart Lynn
3964b32b2e add properties to scale 2015-09-09 18:30:05 -04:00
Stuart Lynn
05aa3db45c Merge branch 'vector_marker' into multi_variable_with_scaling 2015-09-09 14:47:38 -04:00
Stuart Lynn
1b93a6c67e example file for vector field 2015-09-09 14:46:12 -04:00
Stuart Lynn
70c34d2d30 build 2015-09-09 14:45:46 -04:00
Stuart Lynn
3a9f47b9f2 adding vector renderer for torque 2015-09-09 14:45:36 -04:00
Stuart Lynn
25d0fb77a5 build 2015-09-09 11:14:06 -04:00
Stuart Lynn
73ed8bdfd7 mutli variable scaling function example 2015-09-09 11:06:26 -04:00
Stuart Lynn
cd7bb694bf Merge branch 'multi_variable_json_torque_test' into multi_variable_with_scaling 2015-09-09 10:49:35 -04:00
Stuart Lynn
73e2a3736c fix problem when there is only one variable requested. Default that having index 0 in the renderData array 2015-09-09 10:48:53 -04:00
Stuart Lynn
5763feb0bd Merge branch 'scale_functions_for_variables' into multi_variable_with_scaling 2015-09-09 10:41:12 -04:00
Stuart Lynn
a2f7ce04ea build 2015-09-09 10:38:37 -04:00
Stuart Lynn
b24b4b0db9 Apply the scaling functions to different variables 2015-09-09 10:38:17 -04:00
Stuart Lynn
266919ad1b updating example 2015-09-09 10:37:27 -04:00
Stuart Lynn
c75271dacf Merge branch 'scale_functions_for_variables' into multi_variable_with_scaling 2015-09-09 10:12:59 -04:00
Stuart Lynn
e9bde54840 build 2015-09-09 09:58:08 -04:00
Stuart Lynn
b9bcb1b33f more sensible mapping for the multiple values 2015-09-09 09:57:50 -04:00
Stuart Lynn
35e1044f1a adding in example 2015-09-08 18:08:05 -04:00
Stuart Lynn
17f2c2aee0 build 2015-09-08 18:07:54 -04:00
Stuart Lynn
6b0e946e41 Adding some support for multiple variables in Torque. This is a test for just now 2015-09-08 18:07:45 -04:00
Stuart Lynn
e2bcae0c84 adding text render example 2015-09-08 12:00:21 -04:00
Stuart Lynn
a03f9ca4e2 compile 2015-09-08 12:00:05 -04:00
Stuart Lynn
2a47541cc5 adding redner text function to cartocss_render 2015-09-08 11:58:55 -04:00
Stuart Lynn
85f11a73c8 Proof of concept of how CartoCSS could be extended to allow properties to be set using scaling functions that take value, zoom or frame-offset as variables. 2015-09-04 15:58:59 -04:00
javi santana
cd66a811d8 updated link to torque cubes reference, fixes #50 2015-08-25 10:06:01 +02:00
Francisco Dans
1ec0dc6585 Merge pull request #211 from CartoDB/fix-examples
Fixes/removes outdated examples
2015-08-05 17:15:22 +02:00
Francisco Dans
f02dd5a710 removes leaflet.html -- outdated 2015-08-05 16:22:07 +02:00
Francisco Dans
07d03735a7 removes wim.html -- outdated 2015-08-05 16:19:46 +02:00
Francisco Dans
87df24e914 fixes interaction examples 2015-08-05 16:18:33 +02:00
Francisco Dans
e68e7d3d37 actual dists 2015-08-05 15:56:36 +02:00
Francisco Dans
95453ab4b3 Merge branch 'master' of github.com:CartoDB/torque 2015-08-05 15:23:47 +02:00
Francisco Dans
84f7537969 removes js.gz 2015-08-05 15:23:18 +02:00
Francisco Dans
10589b2d28 bumps version in package.json 2015-08-05 15:22:49 +02:00
Francisco Dans
d4c994b6d2 bumps version in dist 2015-08-05 15:22:27 +02:00
Francisco Dans
e4a913cbad updates dist for 2.11.4 2015-08-05 15:21:41 +02:00
Francisco Dans
d5948c8009 updates news for 2.11.4 2015-08-05 15:20:58 +02:00
Francisco Dans
4385c6ad9a Merge pull request #209 from CartoDB/pause-fix
Checks if animator is running before resuming it on rescale
2015-08-05 14:49:14 +02:00
Francisco Dans
39773b3151 puts tests in module 2015-08-05 14:40:52 +02:00
Francisco Dans
3a10865f09 fixes range test 2015-08-05 14:36:59 +02:00
Francisco Dans
e46de301f5 reduces posibility of race condition 2015-08-05 14:27:29 +02:00
Francisco Dans
b3c8cd76c6 de-asyncs another test 2015-08-05 12:55:34 +02:00