Francisco Dans
|
2652f6c6d8
|
adds error handling to gmaps
|
2015-04-15 11:20:20 +02:00 |
|
Francisco Dans
|
7626ebe3b6
|
runs callback where there are errors
|
2015-04-15 10:57:48 +02:00 |
|
Francisco Dans
|
3134aa828c
|
adds error function to torqueLayer api
|
2015-04-15 10:56:48 +02:00 |
|
Francisco Dans
|
c04ab74a97
|
on errors, halts torque and displays them
|
2015-04-14 17:45:22 +02:00 |
|
javi
|
a0417d8bc3
|
fixed user
|
2015-03-31 17:09:52 +02:00 |
|
javi
|
a434bd8640
|
add support for maps_api_template
|
2015-03-31 15:20:35 +02:00 |
|
Francisco Dans
|
c3dd3af184
|
Merge pull request #156 from CartoDB/data-peek
Adds getValueForBbox
|
2015-03-17 14:59:50 +01:00 |
|
Francisco Dans
|
ce6351a2c4
|
Merge pull request #157 from CartoDB/fill-opacity
Allows for zero marker-fill-opacity
|
2015-03-17 12:01:09 +01:00 |
|
Francisco Dans
|
219a3f5888
|
removes unnecessary globalalpha set
|
2015-03-17 11:48:19 +01:00 |
|
Francisco Dans
|
a244fa183c
|
passes logic upstairs
|
2015-03-17 11:44:44 +01:00 |
|
Francisco Dans
|
131f116487
|
prioritizes marker-opacity
|
2015-03-17 11:30:08 +01:00 |
|
Francisco Dans
|
f63b037d0e
|
sets marker-opacity as preliminary global opacity value
|
2015-03-16 17:29:48 +01:00 |
|
Francisco Dans
|
35e28b22c7
|
uses for instead of while because ñiñiñi
|
2015-03-16 16:37:57 +01:00 |
|
Francisco Dans
|
a2696195f4
|
Merge branch 'master' of github.com:CartoDB/torque into data-peek
|
2015-03-13 19:01:35 +01:00 |
|
Francisco Dans
|
e657f349df
|
adds getValueForBBox for gmaps
|
2015-03-13 18:59:41 +01:00 |
|
Francisco Dans
|
567511f694
|
adds getValueForPos in gmaps
|
2015-03-13 18:48:08 +01:00 |
|
Francisco Dans
|
3ead777645
|
resets x value with each row
|
2015-03-11 18:56:11 +01:00 |
|
Francisco Dans
|
6232e16002
|
replaces falsy check with greater or equal
|
2015-03-11 18:01:38 +01:00 |
|
Francisco Dans
|
086c77c379
|
removes redundant decs
|
2015-03-11 17:45:59 +01:00 |
|
Francisco Dans
|
f04b149b23
|
adds getValueForBbox
|
2015-03-11 16:50:53 +01:00 |
|
Francisco Dans
|
d04eb9576c
|
adds applyfilters call to gmaps layer
|
2015-03-10 12:48:32 +01:00 |
|
Raul Ochoa
|
d360dffe28
|
Fix reference to torque.providers.JsonArray provider
|
2015-03-10 11:47:08 +01:00 |
|
Raul Ochoa
|
734e6e119a
|
Merge pull request #150 from CartoDB/149-windshaft-coordinates-type
Optional data type for coordinates in Windshaft provider
|
2015-03-05 17:58:59 +01:00 |
|
Raul Ochoa
|
fae792067e
|
Windshaft provider accepts an optional data type for coordinates
closes #149
|
2015-03-05 16:25:38 +01:00 |
|
Raul Ochoa
|
204ed0903c
|
Do not fix values in the edge. Closes #147
|
2015-03-05 15:34:50 +01:00 |
|
Raul Ochoa
|
a7ff63edfc
|
Only try to render image sprite if icon exists
|
2015-03-04 19:36:25 +01:00 |
|
Raul Ochoa
|
7958c81c24
|
Reset icons to load counter and fire all icons loaded when any fails
|
2015-03-04 19:35:42 +01:00 |
|
Raul Ochoa
|
cfc702f98d
|
renderSprite should take marker width as a point radius
|
2015-03-04 12:10:57 +01:00 |
|
Raul Ochoa
|
1c25e13cec
|
Rendering sprites for marker files scales the image to the size of the marker
renderPoint and renderRectangle keeps previous behaviour
|
2015-03-04 11:08:09 +01:00 |
|
Raul Ochoa
|
ac3df42b15
|
This gets interesting: renderTile defers the rendering until all icons are loaded
|
2015-03-04 11:05:26 +01:00 |
|
Raul Ochoa
|
c0131cdebf
|
Icon preloading now downloads a set of URLs so if there are duplicated URLs it won't request the same image multiple times
Image loading can be provided and defaults to previous behaviour: client side `src = url`.
|
2015-03-04 11:03:46 +01:00 |
|
Raul Ochoa
|
656d082568
|
Trigger allIconsLoaded when there are no icons to load
|
2015-03-04 10:54:30 +01:00 |
|
Raul Ochoa
|
2ceeba0d82
|
Renderer.renderTile now accepts an optional {Function} callback parameter that will be called when it finish rendering
|
2015-03-04 10:49:52 +01:00 |
|
Raul Ochoa
|
f2a4c22dc7
|
Make torque_filters accept options param to add canvasClass
|
2015-03-04 10:46:02 +01:00 |
|
Francisco Dans
|
6ba2e42625
|
Merge pull request #138 from CartoDB/onesteppause
Makes sure that animation is paused when steps === one
|
2015-03-02 17:19:43 +01:00 |
|
javi santana
|
d744c9a497
|
Merge pull request #141 from abenrob/loop-pause-max
animation loop option to pause on max frame, not reset to beginning
|
2015-03-02 15:09:58 +01:00 |
|
abenrob
|
fa8a9bbc2b
|
removed uneccesary frame update request
|
2015-03-02 14:09:09 +01:00 |
|
Francisco Dans
|
9a1571d79e
|
precalculates anchor
|
2015-03-02 14:00:25 +01:00 |
|
Francisco Dans
|
5006d6495d
|
adds half the resolution size to x and y positions
|
2015-03-02 12:43:17 +01:00 |
|
abenrob
|
d5e8007dce
|
animation loop option to pause on max frame, not reset to beginning
|
2015-03-02 11:56:25 +01:00 |
|
Francisco Dans
|
767fae6272
|
adds start in animator rescale
|
2015-03-02 11:43:18 +01:00 |
|
Francisco Dans
|
5a27243f07
|
makes sure that animation is paused when steps is one
|
2015-02-26 16:10:18 +01:00 |
|
Francisco Dans
|
da7cf9d244
|
makes gettimespan actually return an object
|
2015-02-17 16:38:47 +01:00 |
|
Francisco Dans
|
db41e24b42
|
Merge pull request #128 from CartoDB/timetostep
Adds timeToStep() method
|
2015-02-17 16:22:24 +01:00 |
|
Raul Ochoa
|
847f3fc2f4
|
Merge pull request #114 from CartoDB/nodefix
Replaces direct call to document with abstraction
|
2015-02-17 15:01:23 +01:00 |
|
Francisco Dans
|
dfc8c982d9
|
adds timetostep method to torque layer
|
2015-02-17 14:39:17 +01:00 |
|
Francisco Dans
|
8dffb1a8d2
|
OCD
|
2015-02-13 17:16:50 +01:00 |
|
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 |
|