Francisco Dans
da7144a7fd
includes stat_tag correctly
2015-02-13 16:04:04 +01:00
Francisco Dans
81054b657a
adds params to request in named maps
2015-02-13 15:52:03 +01:00
Francisco Dans
5ec6054487
Merge branch 'master' into nodefix
...
Conflicts:
lib/torque/renderer/point.js
2015-02-10 18:27:50 +01:00
Francisco Dans
959f216e82
removes console.log
2015-02-10 14:39:47 +01:00
Francisco Dans
d27f9b0919
Merge pull request #122 from CartoDB/cors-check
...
Checks for image-filters when preloading image-file
2015-02-10 14:17:52 +01:00
Francisco Dans
c82c55affd
runs custom url qualifier if there is one provided
2015-02-10 13:30:35 +01:00
Francisco Dans
038777c8cc
better error message for CORS disabled
2015-02-10 12:29:14 +01:00
Francisco Dans
45a3b57946
makes check for image-filters in all layers
2015-02-10 11:23:12 +01:00
Francisco Dans
f0b7f09140
adds image filters check to add crossOrigin attribute or not
2015-02-09 17:49:23 +01:00
Francisco Dans
117f13c5e9
clears cache when setCartoCSS is called
2015-02-05 18:27:59 +01:00
Francisco Dans
395edc39e0
checks itemstoload to be equal or lower than zero, just in case
2015-02-02 18:43:33 +01:00
Francisco Dans
9b421d7d7f
Merge pull request #113 from CartoDB/loading-queue-fix
...
Fixes itemstoload negative issue
2015-02-02 18:20:39 +01:00
Francisco Dans
3f33dc3428
replaces direct call to document with abstraction
2015-02-02 18:20:11 +01:00
Francisco Dans
cd75867254
sums 1 to itemstoload previous to load trigger
2015-02-02 18:13:06 +01:00
Francisco Dans
a56d4fe627
puts corrected x in local var
2015-02-02 18:00:57 +01:00
Francisco Dans
d7ebab04d5
substitutes inherited functions from leaflet to own correction
2015-02-02 17:57:13 +01:00
Francisco Dans
dc81b7a335
adds smarter hashing for gradients and style
2015-01-29 13:19:51 +01:00
Francisco Dans
aca16f2549
updates css when step is 1
2015-01-29 13:19:13 +01:00
Francisco Dans
42ef4bcd48
corrects the size of the image asset to renderer
2015-01-28 19:32:36 +01:00
Francisco Dans
446bd632c8
removes a bit more unneeded code from simpleheat
2015-01-21 16:36:04 +01:00
Francisco Dans
4e5b1929c7
caches gradient generation
2015-01-21 16:24:40 +01:00
Francisco Dans
47a14ed7d3
- pos from renderTiles
2015-01-21 16:12:15 +01:00
Francisco Dans
135400043e
removes unnecessary args
2015-01-21 16:10:20 +01:00
Francisco Dans
4bf358f59e
changes name from simpleheat to torque_filters
2015-01-21 16:08:04 +01:00
Francisco Dans
b73d687141
removes unnecessary code in simpleheat
2015-01-21 15:55:20 +01:00
Francisco Dans
cd7146f6e0
uses alpha specified in style for image assets
2015-01-21 15:38:58 +01:00
Francisco Dans
ea79f007a2
passes style to sprite rendering
2015-01-21 15:38:18 +01:00
Francisco Dans
fdc63548d4
usses applyfilters instead of event
2015-01-21 15:37:47 +01:00
Francisco Dans
b2c37b1310
adds event call to leaflet
2015-01-20 18:24:51 +01:00
Francisco Dans
d85189b7f4
adds simpleheat, modifies draw method to avoid processing data
2015-01-20 18:24:06 +01:00
Francisco Dans
0ea62d36e7
fixes problem in img name mismatch
2015-01-20 18:23:24 +01:00
Francisco Dans
24413a706f
adds colorization for whole canvas
2015-01-20 18:22:58 +01:00
Francisco Dans
9c5859be41
empties _icons every time preload is run, assumes _icons is empty
2015-01-16 11:36:06 +01:00
Francisco Dans
019ac452f0
inits _icons before setCartoCSS is called
2015-01-15 18:15:10 +01:00
Francisco Dans
508b75e4da
moves icon preloading to setShader
2015-01-15 17:52:17 +01:00
Francisco Dans
70a55ebfba
makes it always fallback to rendering points or rectangles
2015-01-15 17:39:59 +01:00
Francisco Dans
dac3246fcd
style
2015-01-12 16:53:01 +01:00
Francisco Dans
1e106b23b9
removes adjusting methods from mixin (this time for realsies)
2015-01-12 16:28:45 +01:00
Francisco Dans
bfcd6ca06f
url always uses corrected values from tile object
2015-01-12 16:23:38 +01:00
Francisco Dans
1c0057b0ed
adds corrected tile values to tile object in order to for the URL correctly
2015-01-12 16:22:47 +01:00
Francisco Dans
1a2c6f2ab0
removes adjust operations from tileloader_mixin
2015-01-12 16:21:52 +01:00
Francisco Dans
fbeddab4a3
Merge branch 'master' of github.com:CartoDB/torque into coord-wrap
2015-01-12 11:05:46 +01:00
Francisco Dans
224c14783f
style
2015-01-08 18:33:12 +01:00
Francisco Dans
b95ab3bac5
refactors icon preloading to its own private method
2015-01-08 18:27:53 +01:00
Francisco Dans
45e577c872
defaults to point rendering in case marker-file errors, shows error in console
2015-01-08 18:09:55 +01:00
Francisco Dans
434684df09
removes a check I added previously by accident
2015-01-08 17:57:12 +01:00
Francisco Dans
368f5b1526
merge
2015-01-08 16:51:21 +01:00
Francisco Dans
b295bdbd5f
fixes method call
2015-01-08 16:45:09 +01:00
Francisco Dans
d1c224ff13
preloads all icons before the animation is started
2015-01-08 16:25:42 +01:00
Francisco Dans
8241bd6c8c
removes getIcons call
2015-01-08 16:25:02 +01:00
Francisco Dans
91b056329b
removes regex icon parsing
2015-01-08 15:54:42 +01:00
Francisco Dans
37c35732d7
loads async icon files as they are needed
2015-01-07 17:42:50 +01:00
Francisco Dans
1113a100d1
gets icon filenames via regex
2015-01-07 17:42:19 +01:00
Francisco Dans
06ed46f6b8
extends events in pointrenderer
2015-01-07 17:41:37 +01:00
Francisco Dans
d98402d9cd
adds icon preload before animation
2015-01-05 16:54:53 +01:00
Francisco Dans
5dc39a5e32
only start animator if assets are ready
2015-01-05 16:54:14 +01:00
Francisco Dans
3c41470d7a
adjusts tile xy value when coordinates are out of bounds
2015-01-05 11:15:18 +01:00
Francisco Dans
c21c715bf4
removes img name declaration from condition statement
2015-01-02 10:43:43 +01:00
Francisco Dans
e9cece69bd
🐴
2014-12-30 15:37:10 +01:00
Francisco Dans
a30d5fc269
changes drawImage call to align svgs centre-centre
2014-12-30 15:33:40 +01:00
Francisco Dans
fc3584b01f
saves svg icons in an object instead of loading them with every draw
2014-12-30 12:42:46 +01:00
Francisco Dans
2f8443fe6e
removes ratio, since it'll never be called
2014-12-30 11:00:26 +01:00
Francisco Dans
ead86bad00
makes image object instead of passing just the name
2014-12-30 10:53:46 +01:00
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
