Commit Graph
67 Commits
Author SHA1 Message Date
danzel d8317c04ba Pass the right zoom level in so that clustering happens at the right scale 2012-07-20 16:27:33 +12:00
danzel 55d221c9e1 Fix-Fix double childCount adding bug. Fix broken icon after add bug 2012-07-20 16:15:07 +12:00
danzel a944d7de44 Fix child counting bug 2012-07-20 16:03:14 +12:00
danzel fb80032942 Refactor out the animation code and add a non animated addLayer animation 2012-07-20 15:35:22 +12:00
danzel bd4780cc1e _recursivelyAddLayer works, possible still some small bugs. 2012-07-20 15:22:17 +12:00
danzel a39f71fad5 More work towards _recursivelyAddLayer. Still some bugs 2012-07-20 14:44:21 +12:00
danzel cc677f0ce9 Simplify cluster function 2012-07-20 14:20:46 +12:00
danzel 96e3a8cbf7 Fixing up _recursivelyAddLayer to work correctly. This supports adding markers to existing clusters better. 2012-07-20 14:07:31 +12:00
danzel 003fceab14 removeLayer works now. addLayer still needs fixing to be clustering aware 2012-07-20 11:49:40 +12:00
danzel 603e985d58 removeLayer mostly works! Sometimes the resulting markers don't end up in parent clusters. (Hit remove 1 lots then zoom out lots) 2012-07-20 11:30:20 +12:00
danzel eb94ab1959 Rename _recursivelyAddChildMarker -> _recursivelyAddLayer 2012-07-20 11:11:28 +12:00
danzel f5cac38268 Get addLayer after clustering going. _recursivelyAddChildMarker still has some TODOs that need doing 2012-07-20 09:58:31 +12:00
danzel 6a55a17e95 Starting on addLayer after clustering, mostly works now, stops working after a zoom out 2012-07-20 09:40:34 +12:00
danzel d1b1df7cae A few small bug fixes and code tidy ups. Add/Remove marker (after clustering) should be all that is broken now. 2012-07-20 09:15:02 +12:00
danzel a1bab91ebd Fix _recursivelyRemoveChildrenAndAddNowVisibleMarkers 2012-07-19 16:49:33 +12:00
danzel ca214556d6 Working on animated zoom in. mostly works 2012-07-19 15:32:50 +12:00
danzel 17186c36f7 Get non animated versions going again 2012-07-19 13:35:54 +12:00
danzel 04c4956751 Fix zoom but don't change workaround 2012-07-19 13:26:22 +12:00
danzel 6766b1a875 Removing commented out bits etc 2012-07-19 13:23:47 +12:00
danzel a7d784b105 _recursivelyAnimateChildrenIn -> _recursively 2012-07-19 12:03:34 +12:00
danzel 21df359613 Fix multi zoom out not positioning and removing some children correctly 2012-07-19 11:57:47 +12:00
danzel 0de9245d70 Move _recursivelyAnimateChildrenInAndAddSelfToMap _recursivelyBecomeVisible to use _recursively 2012-07-19 11:51:58 +12:00
danzel de35c09a01 Add _recursively and refactor _recursivelyRemoveChildrenFromMap to use it 2012-07-19 11:43:02 +12:00
danzel 7e75986edf Fix up some zoom out issues including when the icon doesn't change (100 -> 100) 2012-07-19 11:16:44 +12:00
danzel 3f668910bf Fix up zoom out not always removing child clusters. 2012-07-19 10:56:18 +12:00
danzel 6b0e08b534 Fix animated multi zoom out 2012-07-19 10:35:13 +12:00
danzel 1fcec54dcf Getting animated animationZoomOut working. Still breaks on a multizoom 2012-07-19 10:32:25 +12:00
danzel 92abbfd3b2 Work on refactoring. Zoom in/out without animations works (Unless you zoom below the initial level). Deleting old code is so good! 2012-07-18 17:57:00 +12:00
danzel 898ae51527 Move _cluster changes out of _cluster, so that _cluster is just clustering 2012-07-18 16:25:01 +12:00
danzel 5bca61db7f Starting to refactor to keep everything only in a tree. Currently zoom out on IE works 2012-07-18 15:05:58 +12:00
danzel 0a29135aec Working towards fixing adding/removing. Think I'm going to have to bite the bullet and tree this up harder. 2012-07-18 14:09:15 +12:00
danzel 12e6eb0133 Working on fixing adding/removing. This fixes the case where you have 2 markers clustered, then zoom out twice, then delete one. 2012-07-18 13:33:45 +12:00
danzel e0bcc5e56c Readme/Example updates 2012-07-18 11:55:21 +12:00
danzel db3b7f2fc2 Tidy up examples. Add a -everything example which shows boundarys on mouse over and zooms on click. 2012-07-18 11:46:51 +12:00
danzel d8219a81ef Refactor QuickHull to use L.LatLng internally to save copying everything back and forth 2012-07-18 11:37:33 +12:00
danzel 9da6156fd4 tidy up JS 2012-07-18 11:01:54 +12:00
danzel f03acfaecf Should probably have this code compiling before I go refactoring 2012-07-18 11:00:05 +12:00
danzel e32c4de14c Add QuickHull and use it for calculating convex hulls. (From http://en.literateprograms.org/Quickhull_(Javascript)?oldid=18434 - Referenced in code) Needs tidying up to use LatLng objects rather than having to change back and forth 2012-07-18 10:52:47 +12:00
danzel 71662891aa Don't fade between 2 clusters when zooming if they are the same 2012-07-17 16:52:59 +12:00
danzel 808b58738f Update leaflet (https://github.com/CloudMade/Leaflet/pull/810) 2012-07-17 15:12:56 +12:00
danzel d29edf7e73 Fade out old clusters on zoom in 2012-07-17 15:09:34 +12:00
danzel 8f97ecf963 Fade markers in during a zoom in. 2012-07-17 14:43:44 +12:00
danzel 4e5c29f28a Add an example for zoomToBounds 2012-07-17 14:09:45 +12:00
danzel 02adc3a1b1 Add zoomToBounds to MarkerCluster. Fixes #6 2012-07-17 14:07:52 +12:00
danzel 9161de52cc Add MIT Licence and update the readme 2012-07-16 16:33:57 +12:00
danzel 5c6520c81e Move default styles out to a CSS file. Tidy up example a bit 2012-07-16 16:17:49 +12:00
danzel 9211aba187 Remove some redundant bits. 2012-07-16 10:40:53 +12:00
danzel 630d7ec0cd Fade markers as they are moved in 2012-07-16 10:40:39 +12:00
danzel 9ae3667b14 Remove console.log calls 2012-07-13 16:44:26 +12:00
danzel 9447fc468f Make _inZoomAnimation a counter rather than a boolean to allow for overlapping zoom animations. 2012-07-13 16:18:09 +12:00