Commit Graph

384 Commits

Author SHA1 Message Date
javi
731206090a fixed property name 2014-12-19 10:12:40 +01:00
javi
2074a720a1 merged 2014-12-19 09:33:31 +01:00
javi
994aeedf95 replaces line-color with marke prefixed 2014-12-19 09:30:43 +01:00
javi
05e1137fe9 added marker-width 2014-12-19 08:00:37 +01:00
javi
b4330f68a6 fixed stroke 2014-12-19 08:00:19 +01:00
Raul Ochoa
9c5c290c4e Adds option to not fetch map when instantiating a windshaft provider.
Closes #74
2014-12-18 17:10:37 +01:00
Raul Ochoa
50605303f1 Fix marker fill opacity
Fixes #72
2014-12-17 15:34:45 +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
Francisco Dans
b1f6a46e8e uses proper condition for animation loop 2014-12-16 18:04:40 +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
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
Raul Ochoa
dd7544e4b4 Merge branch 'master' into browserify 2014-12-10 10:53:44 +01:00
Raul Ochoa
2aa4fc20ef Fixes GMaps export missing GMapsTorqueLayer 2014-12-09 18:23:16 +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
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
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
Raul Ochoa
d6a1d5d808 Makes carto dependency explicit 2014-12-09 16:00:41 +01:00
Raul Ochoa
022d46b56b Export request 2014-12-09 16:00:18 +01:00
Raul Ochoa
ee4f600da5 Replace window with global 2014-12-09 15:58:27 +01:00
Raul Ochoa
02da984769 Export mechanism for core 2014-12-09 15:57:54 +01:00
Raul Ochoa
41e9db8235 Changes export mechanism 2014-12-09 15:55:52 +01:00
Raul Ochoa
cf0143455f Make extend compatible with underscore's one 2014-12-09 15:50:27 +01:00
Raul Ochoa
e8634abc0d Replace underscore defaults/extend with torque ones 2014-12-09 15:42:05 +01:00
javi
6d993c7a87 limit the canvas bounds is rendered so firefox does not raise an exception, fix #61 2014-12-03 10:19:36 +01:00
Nicklas Gummesson
ccef5e232c Added invalidate method to L.TorqueLayer 2014-11-21 11:34:26 +01:00
javi
84046c131e added play, pause and stop events, closes #53 2014-11-01 17:37:07 +01:00
javi
32e9922f48 added dynamic_cdn option 2014-10-24 16:50:53 +02:00
javi
4df45fb5b6 don't use dump to images when using safari 2014-10-21 17:15:56 +02:00
javi
42f041a02e added support for dynamic callback generation for jsonp 2014-10-21 17:15:27 +02:00
javi
7ddd7652fe no render when maker-width = 0 or opacity = 0
there was no way to avoid rendering in some conditions, with this patch the points are not rendered when marker-width or opacity is 0. Thin lines are also not rendered, this avoid to spend extra time rendering them when there are really thin and avoid a safari rendering bug (think lines are rendered wider than they should)
2014-10-19 12:07:41 +02:00
javi
40df882eea fixed stats tag 2014-10-02 09:20:50 +02:00
javi
d8ac079929 removed useless comment 2014-10-02 09:08:04 +02:00
javi
8f101d78fc send stat_tag in the url for windshaft 2014-10-02 09:07:49 +02:00
javi santana
7ea3709bee Merge pull request #46 from CartoDB/interactivity
Interactivity
2014-09-24 12:27:34 +02:00
javi
63858fb051 fixed bounds checking cc @rochoa 2014-09-24 12:07:38 +02:00
javi
8cd8d95e60 added interactivity methods for renderer and leaflet layer 2014-09-24 11:48:10 +02:00
javi
bf514fbc47 support pixel resolution for tile bbox on mercator 2014-09-24 11:47:12 +02:00
javi santana
9fe95831cc Merge pull request #45 from ahocevar/strok-style
Fix typo - remove lines that set strokStyle
2014-09-23 14:44:36 +02:00
javi
1ca2930397 use images to cache sprites instead of canvas, seems more optimal: http://jsperf.com/draw-canvas-vs-draw-image 2014-09-22 18:30:41 +02:00
Andreas Hocevar
dafb951316 Fix typo - remove lines that set strokStyle
Looks like a typo to me, and the strokeStyle is set below conditionally as it should.
2014-09-17 15:58:59 +02:00
javi
1b7cf8f8f7 cache variables for looping 2014-09-17 11:47:08 +02:00
javi
394c8d0466 using a render cache when the map is not being animated
when the map has no animation (for example for static datasets) when the user pans the map it feels pretty slow because torque needs to render all the points again

with this change the tiles are rendered and backed to an offscreen canvas so when the map moves torque does not need to render every point, just flip the image for every tile

Code to clean cache is also added, when the user zooms or a tile is loaded the caches are cleared
2014-09-17 11:28:24 +02:00
javi
ef8b9bb1dd tile size moved to a constant 2014-09-17 11:25:37 +02:00
javi
8cf52da304 per tile back when it's paused 2014-09-09 22:50:10 +02:00
javi
6b70e9e03b missing file, refs #43 2014-08-18 10:55:20 +02:00
javi
48ed932dee added getActivePointsBBox method refs #43 2014-08-14 18:03:04 +02:00
javi
a36d1871ba added no_cdn option no windhsaft provider 2014-07-14 11:19:37 +02:00
javi
b47d0359b0 pass custom torque callback to jsonp in winshft provider 2014-07-12 12:49:31 +02:00
javi
5347593d9d allow custom callback 2014-07-12 12:49:11 +02:00
javi
c805c4cc27 use cdn_url from windshaft when present in the response 2014-07-11 14:37:18 +02:00
Raul Ochoa
59f90aad47 Adds support for several auth_token param 2014-07-07 14:50:48 +02:00
javi
175b25c7b8 fixed updating steps when sql changes in windshaft provider 2014-06-10 17:44:56 +02:00
javi
73c546e192 fixed on method on torque.Event 2014-06-04 11:21:07 +02:00
javi
6662098f48 fixed rectangle renderer #14 2014-06-02 18:05:10 +02:00
javi
91396884a6 fixed rendering when the lineWidth it's a float 2014-04-08 12:07:59 +02:00
javi
afcc3183a9 fixed panBy 2014-03-31 11:42:49 +02:00
javi
0f2bf17a51 defer profiler in order to not send a lot of stats 2014-03-25 11:50:29 +01:00
javi
fd5efd6ce2 fixed animation for leaflet 0.7.x 2014-03-24 14:57:23 +01:00
javi
c7a5799881 pause on zoom 2014-03-21 15:56:38 +01:00
javi
462fea3fd1 added some metrics 2014-03-21 15:56:30 +01:00
javi
bc97babd53 fixed leaflet canvas layer issues with resizing 2014-03-21 15:56:13 +01:00
javi
2d22276bfd fixes problem with leaks on map move 2014-03-21 13:27:04 +01:00
javi
fc09a86e51 supports arraybuffer requests 2014-03-21 12:48:47 +01:00
javi
7e86d58c61 check provider gives setCartoCSS 2014-03-21 12:48:24 +01:00
javi
f6a123667c added zoom animation 2014-03-21 12:47:56 +01:00
javi
6885e69187 Merge branch 'fix_windshaft' 2014-03-11 08:20:09 +01:00
javi
22595ec88c updated setSQL in windshaft provider 2014-03-06 13:01:52 +01:00
javi
e89b1f6513 animation zoom wip 2014-03-06 12:53:18 +01:00
javi
7545fba5e2 include canvas a a normal layer, refs #36 2014-02-28 17:22:04 +01:00
javi
185e7b3991 removed old code 2014-02-28 17:21:43 +01:00
javi
ff972a36b0 generate minimal cartocss, closes #37 2014-02-27 08:16:38 +01:00
javi
8211285a4c fixed windshaft provider with https 2014-02-25 16:04:20 +01:00
javi
6124f735d4 fixed double return 2014-02-25 09:35:28 +01:00
javi
6eb7028a61 fixed cartocss updating for windshaft provider 2014-02-25 09:32:30 +01:00
javi
c3f1918820 improved tile loading 2014-02-25 08:11:16 +01:00
javi
ee5cf66c12 changed date format to fit windshaft response 2014-02-25 07:14:10 +01:00
javi
db80b7df3b Merge branch 'master' of github.com:CartoDB/torque 2014-02-17 14:21:30 +01:00
javi
641b22adad fixed extra commas 2014-02-17 14:21:02 +01:00
Javier Arce
754e31d69f Removes pointer-events from the canvas layer 2014-02-12 11:15:07 +01:00
javi
7dc56f7414 fixed tiles refresh on cartocss update 2014-02-07 13:29:17 +01:00
javi
282be92161 fixed leaflet layer remove 2014-02-07 13:29:07 +01:00
javi
95fcbffefc using final url /api/v1/map 2014-02-06 14:25:47 +01:00
javi
526de286a6 using final urls 2014-02-05 18:45:00 +01:00
javi
9191b4be3b updated urls 2014-02-05 14:14:19 +01:00
javi
29a10e5a5a added winshaft provider 2014-02-04 18:13:44 +01:00
javi
6788237ec7 fixed windshaft provider 2014-02-04 18:13:34 +01:00
javi
f76ac44d56 added windshaft provider 2014-02-03 17:38:05 +01:00
javi
5b6fe55abb fixed index.js for browsers 2014-02-03 12:12:04 +01:00
javi
00c8fa8b27 updated package.json to include main file 2014-01-27 12:48:52 +01:00
javi
b443bafcbb updated torque reference with css properties 2014-01-27 12:48:35 +01:00
javi
0482c4126a removed console 2014-01-09 16:57:50 +01:00
javi
fd14ce8722 fixed rendering with cartocss with conditional zoom fixes #27 2014-01-09 16:52:04 +01:00
javi
8655d5cba2 updated leaflet canvas layer 2014-01-09 15:12:57 +01:00
javi
7bcb2ef2f2 added cache_policy persists 2013-12-19 12:14:25 +01:00
xavijam
f8c90b0c34 added necessary function for getting attribution from a CanvasLayer 2013-12-18 10:59:28 +01:00
javi
69db5d3bf9 added getStep method 2013-12-11 12:32:07 +01:00
javi
8de0b32e48 Merge branch 'master' of github.com:CartoDB/torque 2013-12-11 12:26:19 +01:00
Pascal
6a3018dfea allowing update of torque-aggregation-function (aka countby) 2013-12-10 18:45:42 +01:00
javi
2441f97aea fixed hidden in google maps 2013-12-05 10:53:10 +01:00
javi
ed705f1a90 fixed rendering when variables were used 2013-11-25 16:36:53 +01:00
javi
a8029b5ea9 use torque-frame-count instead of torque-steos close #21 2013-11-25 13:05:07 +01:00
javi
d2dcf7b2a1 added marker-type = rectangle 2013-11-22 16:16:32 +01:00
javi
46aa9fa2f2 fixed cumulative 2013-11-22 15:40:36 +01:00
javi
a213170a8c fixed CORS in IE9 2013-11-22 15:40:23 +01:00
javi
69db609a25 IE9 fixes 2013-11-22 15:08:54 +01:00
javi
f8f35c6a33 fixed requestAnimationFrame callback for IE9 2013-11-21 13:23:31 +01:00
javi
3de6faba75 fixed cumulative 2013-11-21 13:21:48 +01:00
javi
eb3ea211a9 fixed tests 2013-11-20 15:09:45 +01:00
javi
f5ce6e7839 cumulative working 2013-11-20 15:01:52 +01:00
javi
f3e45f523e cumulative WIP 2013-11-20 08:19:44 +01:00
javi
7baf6b175f wrong object in setSQL 2013-11-18 17:34:04 +01:00
javi
b9b83cdff4 leaflet torque layer support options configuration using cartocss #21 2013-11-18 17:30:38 +01:00
javi
c72fd4690f added setOptions method to provider.json #21 2013-11-18 17:30:13 +01:00
javi
9247f1b390 allow renderer to use a compiled shader #21 2013-11-18 17:29:32 +01:00
javi
47d1c2894d updated cartcss reference refs #21 2013-11-18 17:29:13 +01:00
javi
f55daf4886 fixe rendering when resolution > 1 2013-11-18 13:41:01 +01:00
javi
c47d957674 fixed rendered to cumulative option 2013-11-18 12:24:03 +01:00
javi
cd60c01a0d added cumulative option 2013-11-18 12:05:17 +01:00
javi
6ff52fefa1 MAX VALUE for profiler 2013-11-18 12:04:48 +01:00
javi
4f88d78cea do not use subdomains with https 2013-11-11 13:49:36 +01:00
javi
00f0b2a183 fixed onRemove for leaflet 2013-11-11 13:49:22 +01:00
javi
ca53e4f482 fixed rescale steps to animator in google maps 2013-11-11 09:46:35 +01:00
javi
14530a4ce2 return the column type used for time 2013-11-09 13:02:58 +01:00
javi
3a20b248f2 fixed canvas_layer to track map resize 2013-11-09 12:10:07 +01:00
javi
21b2c444e3 fixed rendering when tile data is empty 2013-11-09 12:09:55 +01:00
javi
2d7bbc7afe fixed provider.json using jsonp 2013-11-09 10:12:37 +01:00
javi
135aecbfc4 merged master 2013-11-08 17:12:33 +01:00
javi
721aed83fd using tiler to get last_updated 2013-11-08 17:09:19 +01:00
Javier Arce
c57472da78 Fixes start and end timestamps to show a valid date 2013-11-08 16:14:12 +01:00
javi
b627d93efa using a count aproximation to calculate the steps 2013-11-07 16:10:23 +01:00
javi
36ebc1e97d the steps for an animation are calculated 2013-11-07 15:54:03 +01:00
javi
0c7dfa37a0 added signal when steps change 2013-11-05 18:25:20 +01:00
javi
96d4e94cc0 fixed provider when there are 0 steps 2013-11-05 17:51:34 +01:00
javi
feb5d5c8c3 ie8 ie7 compatibility 2013-11-05 08:57:26 +01:00
javi
a6606c8b89 cdn option 2013-10-31 19:07:27 +01:00
javi
92aa3aa0a4 fixed regresion, user param should be accepted by provider 2013-10-31 14:41:19 +01:00
javi
9438f8c9f8 fixed provider url generation 2013-10-31 14:39:55 +01:00
javi
79becc8ae1 don't render when hidden 2013-10-31 13:14:56 +01:00
javi
f08fe5bc48 added visibility 2013-10-29 15:30:34 +01:00
javi
a481d8bc65 fixed gmaps initialization 2013-10-28 18:41:07 +01:00
javi
4ce089aceb fixes 2013-10-18 15:32:31 +02:00
javi
cf23d6c5b2 multiple fixes 2013-10-17 15:51:12 +02:00
javi
87c09a81d2 proper cleanup when layer is removed 2013-10-15 10:41:12 +02:00
javi
ba4bb63f53 save last call for improve testing 2013-10-15 10:40:53 +02:00
javi
a75aa736d0 added extra params 2013-10-15 10:40:31 +02:00
javi
7b273b3217 added set setColumn and calculate is_time on the fly 2013-10-11 17:01:54 +02:00
javi
38210c693e added setters 2013-10-10 18:16:31 +02:00
javi
2655094cdc added reload tile to tile loaders 2013-10-10 18:16:13 +02:00
javi
71ef5cee95 fixed point renderer precache size 2013-10-10 17:13:42 +02:00
javi
8436b0d964 added setBlendMode 2013-10-10 17:13:26 +02:00
javi
fe4c589dc9 resize animation duration on the fly 2013-10-10 17:13:00 +02:00
javi
483923c79a fixed gmaps cleanup fixed #18 2013-10-10 10:59:52 +02:00
javi
d0ab61ef6d fixed provider url generation 2013-10-10 10:59:25 +02:00
javi
fd03f92b83 if marker-line-width is 0 no border should be renderered fixed #16 2013-10-10 10:58:55 +02:00
javi
fe8f58fd38 marker-line is not taken into account to calculate cached sprites size fixed #15 2013-10-10 10:58:43 +02:00
javi
caf49e2a51 avoid loading leaflet layers when leaflet is not present 2013-09-30 16:31:47 +02:00
javi
f91fccf3b7 report change:bounds 2013-09-30 13:31:16 +02:00
javi
5d08c83bb0 ready callback 2013-09-30 13:31:06 +02:00
javi
9a0ac46ef3 fixed problem in google maps with wrapped maps 2013-09-30 13:30:58 +02:00
javi
1e18eebed0 added remove tiles options 2013-09-27 18:55:43 +02:00
javi
9e54881d2a fixed point renderer with resolution != 1 2013-09-27 13:34:46 +02:00
javi
4c6265b4f2 missing files 2013-09-11 13:21:44 +02:00
javi
9086919abe fixed IE fix Vizzuality/gbif#15 2013-09-11 13:21:20 +02:00
javi
f24252501c sql_api provider default for leaflet torque layer 2013-09-02 16:52:06 +02:00
javi
ee18baca27 fixed time sql when is_time = false 2013-09-02 16:51:48 +02:00
javi
803f00117c fixed option for jsonarray provider 2013-09-02 15:16:34 +02:00
javi
0668ff2a67 fixed json provider 2013-09-02 15:16:11 +02:00
javi
37785c59d6 set sql_api as default provider 2013-09-02 15:15:57 +02:00
javi
98ed9a8573 fixed point rendering 2013-08-30 15:48:55 +02:00
javi
799abb144e redraw on css change 2013-08-30 12:39:59 +02:00
javi
5feac397bd animation fixed 2013-08-30 12:15:13 +02:00
javi
463ff67642 don't load google layers when gmaps is not loaded 2013-08-29 15:21:54 +02:00
javi
6423f5f9cf set cartocss on the startup 2013-08-29 13:06:56 +02:00
javi
bd2307a4fa gmaps torque layer 2013-08-29 12:52:53 +02:00
javi
7550236682 added setTime 2013-08-29 12:52:40 +02:00
javi
974d62829f set is_time to true by default 2013-08-29 12:52:29 +02:00
javi
1e1163fccd added profiling to point renderer 2013-08-29 12:52:15 +02:00
javi
4bea810f6c fixed animator context 2013-08-28 12:38:59 +02:00
javi
9ff42f5d4d changed point renderer 2013-08-28 12:38:48 +02:00
javi
d4cf6b0f0e added some profiler metrics 2013-08-28 12:38:24 +02:00
javi
6048a15f6b return this for profiler function 2013-08-28 12:38:14 +02:00
javi
2d34fcdc23 included animation control 2013-08-23 19:15:21 +02:00
javi
af367f9aa9 add support for multiple subdomains 2013-08-23 18:00:42 +02:00