Commit Graph

458 Commits

Author SHA1 Message Date
Francisco Dans
3fbd6ca7a9 couple modifications to examples 2014-12-22 15:38:30 +01:00
javi
57d3d169a1 heatmaps 2014-12-19 08:41:12 +01:00
javi
306afd8b92 test heat 2014-12-18 08:04:49 +01:00
javi santana
20b88a72ff Merge pull request #73 from CartoDB/fix-marker-opacity
Fix marker fill opacity
2014-12-17 15:36:57 +01:00
Raul Ochoa
50605303f1 Fix marker fill opacity
Fixes #72
2014-12-17 15:34:45 +01:00
javi santana
2e79d7ee90 Merge pull request #71 from CartoDB/clear_color
Clear color
2014-12-17 11:44:25 +01:00
javi
27bba39f07 cartoons -> global composite operation mapping 2014-12-17 11:22:19 +01:00
javi
c3b159b64d use a function to transform comp-op to composite operation 2014-12-17 08:48:23 +01:00
javi
e9f738914c fixes cartocss comp-op conversion and adds clear color :D 2014-12-17 08:31:46 +01:00
Francisco Dans
d25011681a Merge pull request #69 from CartoDB/68-fix_extra_frame
check loop condition before render
2014-12-16 18:34:29 +01:00
javi santana
90de3db461 Merge pull request #70 from CartoDB/loop-by-default
Loop by default
2014-12-16 18:31:25 +01:00
Francisco Dans
68c68f3a02 reverts changes to dist in d82fe9d057 2014-12-16 18:29:59 +01:00
Francisco Dans
495082c29e Merge branch 'master' of https://github.com/cartodb/torque into loop-by-default 2014-12-16 18:25:38 +01:00
Francisco Dans
b1f6a46e8e uses proper condition for animation loop 2014-12-16 18:04:40 +01:00
Francisco Dans
08b66b3119 removes stupid console.log 2014-12-16 17:54:13 +01:00
Francisco Dans
d82fe9d057 sets loop to true by default 2014-12-16 17:52:17 +01:00
javi
8a8455922d check loop condition before render 2014-12-16 17:42:35 +01:00
Francisco Dans
f002f3d9d4 Merge pull request #67 from CartoDB/loop-option-14
Adding functionality to the loop option
2014-12-16 10:33:05 +01:00
Francisco Dans
43a3c64d21 uses stop function instead of pause to prevent looping 2014-12-16 09:45:23 +01:00
Francisco Dans
88ea3bee66 pauses animation at end if loop is false 2014-12-15 16:05:51 +01:00
Francisco Dans
ba1ae9856c adds loop option to gui 2014-12-15 16:04:53 +01:00
Raul Ochoa
a3916038e1 Merge pull request #66 from CartoDB/browserify
Library browserify
2014-12-11 16:56:49 +01:00
Raul Ochoa
dd7544e4b4 Merge branch 'master' into browserify 2014-12-10 10:53:44 +01:00
Raul Ochoa
df5acbb96c Adds travis badge 2014-12-10 10:52:01 +01:00
Raul Ochoa
34c5fba9d9 Use project's browserify 2014-12-09 18:45:26 +01:00
Raul Ochoa
502b200234 Make all 2014-12-09 18:23:38 +01:00
Raul Ochoa
2aa4fc20ef Fixes GMaps export missing GMapsTorqueLayer 2014-12-09 18:23:16 +01:00
Raul Ochoa
a8d9311f88 Update news 2014-12-09 18:17:04 +01:00
Raul Ochoa
e86fd7fb44 Make all 2014-12-09 18:12:50 +01:00
Raul Ochoa
b98efc112e bumps version 2014-12-09 18:11:24 +01:00
Raul Ochoa
d2dd3353d3 Fixes json provider test 2014-12-09 18:11:10 +01:00
Raul Ochoa
f7d81998fc Fixes request test 2014-12-09 18:11:00 +01:00
Raul Ochoa
9f35092943 Fixes call to carto's getStyle 2014-12-09 18:10:09 +01:00
Raul Ochoa
6c45a805d2 Fixes requires 2014-12-09 18:09:45 +01:00
Raul Ochoa
40f6a4913f Add travis config to run tests 2014-12-09 18:08:54 +01:00
Raul Ochoa
e8fee1659b Fix suite, use make prepare-test-suite and open test/suite.html or
run `npm test`.
2014-12-09 18:06:56 +01:00
Raul Ochoa
1e83584d12 Use global carto if present, otherwise fallback to require. 2014-12-09 18:05:11 +01:00
Raul Ochoa
d44b2db551 Expose public interfaces 2014-12-09 17:59:59 +01:00
Raul Ochoa
e1e928733f Make gmaps check at high level 2014-12-09 17:59:19 +01:00
Raul Ochoa
29bdbd29c6 Make leaflet check at high level 2014-12-09 17:57:37 +01:00
Raul Ochoa
410037d4a2 Adds carto in examples vendor directory 2014-12-09 17:53:06 +01:00
Raul Ochoa
6ecf054ac0 gmaps has to receive torque so it can auto-register 2014-12-09 16:34:37 +01:00
Raul Ochoa
4f251cd8cc Change from canvas to cartocss properties 2014-12-09 16:27:14 +01:00
Raul Ochoa
5efdf16c61 Call to cartocss renderer 2014-12-09 16:25:03 +01:00
Raul Ochoa
7499e8cf6a Abstract canvas/image creation, if a class is provided it will use that as constructor.
Otherwise it will fallback to browser implementation.
2014-12-09 16:23:18 +01:00
Raul Ochoa
3471a2ac6d Remove underscore 2014-12-09 16:21:50 +01:00
Raul Ochoa
a44b93e251 Fix dependencies 2014-12-09 16:21:13 +01:00
Raul Ochoa
2e8813c9ff Export renderers 2014-12-09 16:20:29 +01:00
Raul Ochoa
7463b461e6 Export providers 2014-12-09 16:12:38 +01:00
Raul Ochoa
7d3d325d7a Move providers to their own directory 2014-12-09 16:07:26 +01:00