Commit Graph
100 Commits
Author SHA1 Message Date
Dave Leaver e96388d6cb Merge pull request #506 from stevewillard/patch-1
Adding repository field to package.json
2015-06-03 13:25:45 +12:00
Dave Leaver 9f975fa0a9 Merge pull request #487 from franckl/patch-1
Update for README.md
2015-04-18 09:26:09 +12:00
Dave Leaver 3c97c40b0e Merge pull request #484 from SamuelBolduc/master
Added "main" property to bower.json to make it compatible with wiredep
2015-04-16 10:07:29 +12:00
Dave Leaver 1659237628 Merge pull request #444 from MazeMap/master
On becoming visible, markers retain their original opacity.
2015-03-27 11:28:54 +13:00
Dave Leaver 3d3f0020e1 Merge pull request #466 from weftio/polyline-options-attempt2
Spiderleg Polyline options - attempt - 2
2015-03-26 12:57:32 +13:00
Dave Leaver 7ab96aeb6c Merge pull request #463 from ChALkeR/master
bower.json: ignore tests and examples.
2015-03-16 12:45:03 +13:00
Dave Leaver e63f39e5fc Merge pull request #440 from IvanSanchez/master
Added dependencies in bower.json
2015-02-02 17:18:17 +13:00
Dave Leaver c5864dbfca Update README.md 2015-01-09 10:10:20 +13:00
Dave Leaver 5e2eda7677 Merge pull request #358 from Grsmto/spiderified-removelayers
RemoveLayers() when spiderified bug fix
2014-12-16 09:12:24 +13:00
Dave Leaver 37cdfca01d Merge pull request #415 from rdenniston/master
made a minor change to _zoomOrSpiderfy to Spiderfy without zooming
2014-11-02 15:17:30 +13:00
Dave Leaver e85282a015 Merge pull request #413 from maackle/master
adds additional events to README
2014-10-29 08:55:14 +13:00
danzel c0b5778dbc Update build 2014-10-28 09:26:13 +13:00
danzel ba0c2146ca Return the whole map bounds instead of our size for _getExpandedVisibleBounds so they are always valid 2014-10-28 09:26:04 +13:00
Dave Leaver ac0b77b16f Merge pull request #353 from wiggin/master
Added css and changed to non-minified js in bower spec
2014-08-31 13:55:09 +12:00
Dave Leaver 1c62494d74 Merge pull request #378 from fureigh/master
Fix typo in README (recieve --> receive)
2014-08-14 09:07:54 +12:00
danzel fe3bbd3760 Update build 2014-05-28 11:01:36 +12:00
danzel 254198ad47 Do an intersects test rather than a contains when testing for a zoom in. Fixes #344 2014-04-23 10:15:46 +12:00
danzel f865dc1078 Add a test page to reproduce #344 2014-04-23 10:02:25 +12:00
danzel 339ee4abeb Fix for new bug on #286 2014-04-15 12:02:10 +12:00
danzel 332c5f897d Test for new bug on #286 2014-04-15 12:01:49 +12:00
danzel c0ffbc75a9 Add some removeLayers tests, everything seems to be working. 2014-04-07 10:56:18 +12:00
danzel 649c0efff2 Update all examples to use OSM tiles 2014-04-07 10:11:37 +12:00
danzel 4a095f58a8 Update build 2014-03-15 10:56:03 +13:00
danzel 34eb38f1a7 Fix getBounds when removeOutsideVisibleBounds: false is set. fixes #321 2014-03-03 11:47:53 +13:00
danzel 6e9ffc45ec Update build 2014-01-31 09:07:39 +13:00
danzel 4f19c14739 Make chunked=false option work. woops. 2014-01-31 09:07:26 +13:00
danzel 55cbaa625e Fire animationend event even in non-animated versions of the zoom in/out animation. Makes oldie fire the same events as modern browsers. Fixes #310 2014-01-29 10:50:01 +13:00
danzel 436caf0f6c Update build 2014-01-22 09:26:23 +13:00
danzel fb4b6d39a6 Merge branch 'better-loading'
Conflicts:
	dist/leaflet.markercluster.js
2014-01-22 09:26:06 +13:00
danzel 78ccf98665 More whitespace fixes :) 2014-01-22 09:23:55 +13:00
danzel 85120c2bcb whitespace 2014-01-21 10:39:07 +13:00
Dave Leaver cb5662ec58 Merge pull request #294 from mindplay-dk/better-loading
Better loading
2014-01-20 13:23:36 -08:00
Dave Leaver 04a50ab26f Merge pull request #307 from Wildhoney/BOWER
Bower
2014-01-19 19:59:57 -08:00
danzel caa138de4b Update build 2014-01-20 10:38:19 +13:00
danzel e78b61d1ca Little bit of tidy up, refs #298 2014-01-20 10:37:57 +13:00
Dave Leaver 2b224523d3 Merge pull request #298 from Schwanksta/patch-1
Add ability to use a function for maxClusterRadius
2014-01-19 13:32:32 -08:00
danzel 683bf4c341 Fix zoom out with a single circle marker. fixes #300 2014-01-08 10:25:33 +13:00
danzel c1d4a88728 Update build 2013-12-20 10:04:11 +13:00
danzel 289ae9059f Remove console.log lines 2013-12-20 10:03:00 +13:00
danzel e102ec0c96 Fix up a performance issue found, when adding markers we were doing a lot of unnecessary checks for duplicate markers. 2013-12-20 10:02:29 +13:00
danzel cf6f45e10e Use chunkedLoading for the 2 big examples 2013-12-20 10:01:37 +13:00
danzel 8b65285a06 Add chunkedLoading option. refs #292 2013-12-20 09:56:37 +13:00
Dave Leaver a7b91369b6 Merge pull request #291 from migmruiz/patch-1
correcting date of v0.4 changes in CHANGELOG.md
2013-12-19 00:31:27 -08:00
danzel 20cf8edd0d Update change log, bump to 0.4.0 and rebuild 2013-12-19 16:27:52 +13:00
danzel f0b1618e07 Fix some cases where zoomToShowLayer wouldn't work. Fixes #286 #228 #203 2013-12-19 16:03:55 +13:00
danzel 7e31b27f68 Slow the animation down, looks better :) 2013-12-19 15:38:50 +13:00
danzel c5efb23338 Fix quick zoom in/out in firefox making everything disappear. Fixes #140 Fixes #272 2013-12-19 15:34:20 +13:00
danzel 21ba129a78 Lowercase the name, waiting on #230 2013-12-18 14:20:40 +13:00
danzel 653b42004c Bump required leaflet version (as of the ie css changes) 2013-12-18 14:10:00 +13:00
danzel 5e2d10346f Update the changelog too! 2013-12-18 14:07:24 +13:00
danzel 9be0747010 Update the build 2013-12-18 13:47:05 +13:00
danzel 6835a777cc use getAllChildMarkers in this example. fixes #270 2013-12-18 11:24:26 +13:00
danzel 243c484597 Implementation of LayerGroup.getLayer with really bad performance. fixes #244 2013-12-18 11:21:06 +13:00
danzel 08275bb7e6 Bumping pages to 0.7 2013-12-18 10:32:41 +13:00
danzel d525b153f4 Fix broken tests 2013-12-18 10:32:11 +13:00
danzel 6d12053b5b Prevent multiple clustermouseover/off events if the icon is made up of stacked divs. Fixes #252.
Doesn't fix this bug in IE <= 8 as they don't support relatedTarget, could fix it by looking at the event type and using fromElement/toElement, but I'm not going to.
2013-12-18 10:16:14 +13:00
danzel 957a69dc2b If fitBounds wouldn't zoom us down, zoom us down instead. Fixes #144 2013-12-18 09:26:25 +13:00
danzel 5a8872a0ab Fix code for unit tests, refs #275 2013-12-17 10:20:13 +13:00
Dave Leaver 9165b873b5 Merge pull request #275 from Zombienaute/master
Map loses focus when zooming in on cluster with keyboard
2013-12-16 13:17:20 -08:00
danzel f4e7845c8a Update build 2013-12-06 13:41:34 +13:00
danzel 59560b481f Fix this back to mobiles styles 2013-12-06 13:41:15 +13:00
Dave Leaver 882f032336 Merge pull request #280 from frankrowe/remove-ie-css
Remove IE CSS
2013-12-05 16:37:28 -08:00
danzel 53eab49a7e Fix incorrectly adding parent clusters when doing a big move that changes zoom levels. Fixes #281 2013-12-06 13:34:43 +13:00
danzel 432cd19403 Update build 2013-11-14 09:40:33 +13:00
danzel f693a49dec Change zoomToBounds to only zoom in as far as it needs to to show all child markers. Fixes #185 2013-11-13 15:26:41 +13:00
danzel 9e36a0ba62 Fix url, thanks @jonassmedegaard 2013-11-04 10:12:36 +13:00
danzel a47562c5c6 Clear _spiderfied on a zoomend unspiderfy. Fixes #268 2013-10-31 16:48:32 +13:00
danzel cf40d8aa86 Hide spiderfied markers on a big zoom. Fixes #268 2013-10-31 09:13:55 +13:00
danzel 0e73130b43 Update build. 2013-10-29 09:05:47 +13:00
danzel df054cf884 Fix getVisibleParent when no parent is visible. Add tests for getVisibleParent. Fixes #265 2013-10-23 16:58:12 +13:00
danzel 1ac2d9ef68 Add getLayers and test it. fixes #222 2013-10-21 11:02:10 +13:00
danzel 2622819366 Add travis build image 2013-10-14 16:31:21 +13:00
danzel c1211c573f Add travis config 2013-10-14 16:12:08 +13:00
danzel 2c7127bf10 Update changelog 2013-10-14 13:54:48 +13:00
danzel c5fab2342b do todo 2013-10-14 13:54:38 +13:00
danzel 1ef25fb1ae Fix for coverage polygon not being removed when we are. fixes #245 2013-10-14 13:19:02 +13:00
danzel db5f0d5725 Test for coverage polygon not being removed when we are. #245 2013-10-14 13:18:42 +13:00
danzel 23cc34156a Fix #260 - Zooming in on an area that wasn't inside what we are looking at would cause the newly visible markers not to appear. 2013-10-14 10:11:41 +13:00
danzel bfecd7c64d failing test case for #260 - marker doesn't appear after fitBounds 2013-10-14 10:11:41 +13:00
Dave Leaver 23dfa90d51 Merge pull request #253 from tmcw/simple-hull
Simplify QuickHull generation. Fixes #249
2013-10-13 14:10:44 -07:00
Dave Leaver 8275e2812b Merge pull request #248 from tmcw/quickhull-test-doc
Test and document quickhull algorithm
2013-09-18 16:59:26 -07:00
Dave Leaver 55bcde9fff Merge pull request #247 from tmcw/spec
Add distancegrid spec
2013-09-18 16:58:44 -07:00
danzel ac3e7d4fea update build 2013-08-26 15:39:46 +12:00
danzel 4f40622dfe removeLayer supports LayerGroup. Fixes #236 2013-08-26 15:39:25 +12:00
danzel 8ccd5a37ba Update build 2013-07-18 11:25:02 +12:00
danzel 31a8bb7772 Test and fix for removing and re-adding a marker while we are not on the map. 2013-07-18 11:25:02 +12:00
Dave Leaver 9b61f4b9af Merge pull request #221 from jperelli/patch-1
Improving docs
2013-07-17 13:57:45 -07:00
danzel 15ed12654a Update build 2013-07-10 11:05:07 +12:00
danzel 4ce11f3c8b Fix markers not being added on a big zoom animation. Fixes #216
If we zoomed down such that a cluster would be out of our visible bounds then any of its children would be added at its location for the animation. In this case those markers would immediately be removed as they are out of our visible bounds.
Instead we now don't animate adding markers after a zoom if they are coming from outside of our visible bounds.
2013-07-10 11:04:55 +12:00
danzel 98e76b6c66 Automated test for #216 2013-07-10 11:01:03 +12:00
danzel 9ed6a4ff8f Add failing manual test for #216 2013-07-10 10:08:16 +12:00
danzel 63e43e430f Clear our internal cluster layer when we are removed from the map so those layers aren't there when we are re-added. Fixes #211 2013-07-05 12:03:20 +12:00
danzel c4f4d81722 Update build 2013-07-05 11:28:41 +12:00
danzel 1c82702a57 Basic tests for spiderfy 2013-07-05 11:28:25 +12:00
danzel 847271498c Support spiderfying circle/circleMarker. Fixes #212 2013-07-05 11:21:55 +12:00
danzel 74e1443bb0 Throw an error if a MarkerClusterGroup is added to a map with no maxZoom. Fixes #189 2013-07-01 09:45:09 +12:00
danzel 768cb5b533 get leaflet from npm rather than git. 2013-07-01 09:35:16 +12:00
danzel 379befbbbd Point all examples at leaflet 0.6.2. Fixes #210 2013-07-01 09:04:55 +12:00
danzel 9b3bb2929f Update build 2013-06-25 09:04:01 +12:00
danzel 80e2496045 Don't try extend bounds by an invalid bounds, doesn't work on leaflet versions earlier than Leaflet/Leafet@ef17f99708, to be removed when 0.6 is released. 2013-06-25 09:03:53 +12:00