[Pkg-javascript-commits] [leaflet-markercluster] 42/49: Imported Upstream version 0.4~dfsg
Jonas Smedegaard
js at moszumanska.debian.org
Tue Jan 28 17:54:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository leaflet-markercluster.
commit 781016e1c0003e1b879678158e3883e598f5f39d
Author: Jonas Smedegaard <dr at jones.dk>
Date: Tue Jan 28 16:40:54 2014 +0100
Imported Upstream version 0.4~dfsg
---
.travis.yml | 3 +
CHANGELOG.md | 69 +-
Jakefile.js | 73 +-
README.md | 58 +-
build/build.html | 243 --
build/build.js | 174 +-
build/hint.js | 30 -
build/hintrc.js | 52 +-
dist/MarkerCluster.Default.css | 22 +
dist/MarkerCluster.Default.ie.css | 22 -
dist/MarkerCluster.css | 8 +-
example/geojson-sample.js | 53 +
example/geojson.html | 55 +
example/marker-clustering-convexhull.html | 20 +-
example/marker-clustering-custom.html | 29 +-
example/marker-clustering-everything.html | 22 +-
example/marker-clustering-geojson.html | 69 +
.../marker-clustering-realworld-maxzoom.388.html | 16 +-
.../marker-clustering-realworld-mobile.388.html | 16 +-
example/marker-clustering-realworld.10000.html | 16 +-
example/marker-clustering-realworld.388.html | 16 +-
example/marker-clustering-realworld.50000.html | 31 +-
example/marker-clustering-singlemarkermode.html | 18 +-
example/marker-clustering-spiderfier.html | 18 +-
example/marker-clustering-zoomtobounds.html | 18 +-
example/marker-clustering-zoomtoshowlayer.html | 16 +-
example/marker-clustering.html | 6 +-
example/old-bugs/add-1000-after.html | 6 +-
example/old-bugs/add-markers-offscreen.html | 6 +-
example/old-bugs/add-remove-before-addtomap.html | 6 +-
...kers-offscreen.html => animationless-zoom.html} | 33 +-
.../old-bugs/disappearing-marker-from-spider.html | 107 +
.../doesnt-update-cluster-on-bottom-level.html | 68 +
example/old-bugs/remove-add-clustering.html | 6 +-
example/old-bugs/remove-when-spiderfied.html | 8 +-
.../removelayer-after-remove-from-map.html | 66 +
example/old-bugs/setView-doesnt-remove.html | 6 +-
.../zoomtoshowlayer-doesnt-need-to-zoom.html | 6 +-
package.json | 21 +
spec/after.js | 2 +
spec/expect.js | 1253 ++++++
spec/happen.js | 93 +
spec/index.html | 62 +
spec/karma.conf.js | 67 +
spec/sinon.js | 4223 ++++++++++++++++++++
spec/suites/AddLayer.MultipleSpec.js | 114 +
spec/suites/AddLayer.SingleSpec.js | 78 +
spec/suites/AddLayersSpec.js | 85 +
spec/suites/ChildChangingIconSupportSpec.js | 45 +
spec/suites/CircleMarkerSupportSpec.js | 121 +
spec/suites/CircleSupportSpec.js | 118 +
spec/suites/DistanceGridSpec.js | 21 +
spec/suites/LeafletSpec.js | 6 +
spec/suites/NonPointSpec.js | 199 +
spec/suites/QuickHullSpec.js | 35 +
spec/suites/RemoveLayerSpec.js | 161 +
spec/suites/SpecHelper.js | 26 +
spec/suites/clearLayersSpec.js | 44 +
spec/suites/eachLayerSpec.js | 54 +
spec/suites/eventsSpec.js | 159 +
spec/suites/getBoundsSpec.js | 118 +
spec/suites/getLayersSpec.js | 48 +
spec/suites/getVisibleParentSpec.js | 59 +
spec/suites/onAddSpec.js | 55 +
spec/suites/onRemoveSpec.js | 42 +
spec/suites/spiderfySpec.js | 92 +
spec/suites/zoomAnimationSpec.js | 95 +
src/DistanceGrid.js | 20 +-
src/MarkerCluster.QuickHull.js | 51 +-
src/MarkerCluster.Spiderfier.js | 142 +-
src/MarkerCluster.js | 54 +-
src/MarkerClusterGroup.js | 575 ++-
src/copyright.js | 5 +
73 files changed, 8970 insertions(+), 864 deletions(-)
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..4cee540
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+ - 0.10
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1b71a5..534d638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,75 @@ Leaflet.markercluster
(all changes without author notice are by [@danzel](https://github.com/danzel))
+## Master
+
+##0.4 (2012-12-19)
+
+### Improvements
+
+ * Fix Quick Zoom in/out causing everything to disappear in Firefox (Reported by [@paulovieira](https://github.com/paulovieira)) [#140](https://github.com/Leaflet/Leaflet.markercluster/issues/140)
+ * Slow the expand/contract animation down from 200ms to 300ms
+
+### Bugfixes
+
+ * Fix some cases zoomToShowLayer wouldn't work (Reported by [@absemetov](https://github.com/absemetov)) [#203](https://github.com/Leaflet/Leaflet.markercluster/issues/203) [#228](https://github.com/Leaflet/Leaflet.markercluster/issues/228) [#286](https://github.com/Leaflet/Leaflet.markercluster/issues/286)
+
+##0.3 (2013-12-18)
+
+### Improvements
+
+ * Work better with custom projections (by [@andersarstrand](https://github.com/andersarstrand)) [#74](https://github.com/Leaflet/Leaflet.markercluster/issues/74)
+ * Add custom getBounds that works (Reported by [@2803media](https://github.com/2803media))
+ * Allow spacing spiderfied icons further apart (Reported by [@stevevance](https://github.com/stevevance)) [#100](https://github.com/Leaflet/Leaflet.markercluster/issues/100)
+ * Add custom eachLayer that works (Reported by [@cilogi](https://github.com/cilogi)) [#102](https://github.com/Leaflet/Leaflet.markercluster/issues/102)
+ * Add an option (removeOutsideVisibleBounds) to prevent removing clusters that are outside of the visible bounds (by [@wildhoney](https://github.com/wildhoney)) [#103](https://github.com/Leaflet/Leaflet.markercluster/issues/103)
+ * Add getBounds method to cluster (Reported by [@nderambure](https://github.com/nderambure)) [#88](https://github.com/Leaflet/Leaflet.markercluster/issues/88)
+ * Lots of unit tests
+ * Support having Circle / CircleMarker as child markers
+ * Add factory methods (Reported by [@mourner](https://github.com/mourner)) [#21](https://github.com/Leaflet/Leaflet.markercluster/issues/21)
+ * Add getVisibleParent method to allow getting the visible parent cluster or the marker if it is visible. (By [@littleiffel](https://github.com/littleiffel)) [#102](https://github.com/Leaflet/Leaflet.markercluster/issues/102)
+ * Allow adding non-clusterable things to a MarkerClusterGroup, we don't cluster them. (Reported by [@benbalter](https://github.com/benbalter)) [#195](https://github.com/Leaflet/Leaflet.markercluster/issues/195)
+ * removeLayer supports taking a FeatureGroup (Reported by [@pabloalcaraz](https://github.com/pabloalcaraz)) [#236](https://github.com/Leaflet/Leaflet.markercluster/issues/236)
+ * DistanceGrid tests, QuickHull tests and improvements (By [@tmcw](https://github.com/tmcw)) [#247](https://github.com/Leaflet/Leaflet.markercluster/issues/247) [#248](https://github.com/Leaflet/Leaflet.markercluster/issues/248) [#249](https://github.com/Leaflet/Leaflet.markercluster/issues/249)
+ * Implemented getLayers (Reported by [@metajungle](https://github.com/metajungle)) [#222](https://github.com/Leaflet/Leaflet.markercluster/issues/222)
+ * zoomToBounds now only zooms in as far as it needs to to get all of the markers on screen if this is less zoom than zooming to the actual bounds would be (Reported by [@adamyonk](https://github.com/adamyonk)) [#185](https://github.com/Leaflet/Leaflet.markercluster/issues/185)
+ * Keyboard accessibility improvements (By [@Zombienaute](https://github.com/Zombienaute)) [#273](https://github.com/Leaflet/Leaflet.markercluster/issues/273)
+ * IE Specific css in the default styles is no longer a separate file (By [@frankrowe](https://github.com/frankrowe)) [#280](https://github.com/Leaflet/Leaflet.markercluster/issues/280)
+ * Improve usability with small maps (Reported by [@JSCSJSCS](https://github.com/JSCSJSCS)) [#144](https://github.com/Leaflet/Leaflet.markercluster/issues/144)
+ * Implement FeatureGroup.getLayer (Reported by [@newmanw](https://github.com/newmanw)) [#244](https://github.com/Leaflet/Leaflet.markercluster/issues/244)
+
+### Bugfixes
+
+ * Fix singleMarkerMode when you aren't on the map (by [@duncanparkes](https://github.com/duncanparkes)) [#77](https://github.com/Leaflet/Leaflet.markercluster/issues/77)
+ * Fix clearLayers when you aren't on the map (by [@duncanparkes](https://github.com/duncanparkes)) [#79](https://github.com/Leaflet/Leaflet.markercluster/issues/79)
+ * IE10 Bug fix (Reported by [@theLundquist](https://github.com/theLundquist)) [#86](https://github.com/Leaflet/Leaflet.markercluster/issues/86)
+ * Fixes for hasLayer after removing a layer (Reported by [@cvisto](https://github.com/cvisto)) [#44](https://github.com/Leaflet/Leaflet.markercluster/issues/44)
+ * Fix clearLayers not unsetting __parent of the markers, preventing them from being re-added. (Reported by [@apuntovanini](https://github.com/apuntovanini)) [#99](https://github.com/Leaflet/Leaflet.markercluster/issues/99)
+ * Fix map.removeLayer(markerClusterGroup) not working (Reported by [@Driklyn](https://github.com/Driklyn)) [#108](https://github.com/Leaflet/Leaflet.markercluster/issues/108)
+ * Fix map.addLayers not updating cluster icons (Reported by [@Driklyn](https://github.com/Driklyn)) [#114](https://github.com/Leaflet/Leaflet.markercluster/issues/114)
+ * Fix spiderfied clusters breaking if a marker is added to them (Reported by [@Driklyn](https://github.com/Driklyn)) [#114](https://github.com/Leaflet/Leaflet.markercluster/issues/114)
+ * Don't show coverage for spiderfied clusters as it will be wrong. (Reported by [@ajbeaven](https://github.com/ajbeaven)) [#95](https://github.com/Leaflet/Leaflet.markercluster/issues/95)
+ * Improve zoom in/out immediately making all everything disappear, still issues in Firefox [#140](https://github.com/Leaflet/Leaflet.markercluster/issues/140)
+ * Fix animation not stopping with only one marker. (Reported by [@Driklyn](https://github.com/Driklyn)) [#146](https://github.com/Leaflet/Leaflet.markercluster/issues/146)
+ * Various fixes for new leaflet (Reported by [@PeterAronZentai](https://github.com/PeterAronZentai)) [#159](https://github.com/Leaflet/Leaflet.markercluster/issues/159)
+ * Fix clearLayers when we are spiderfying (Reported by [@skullbooks](https://github.com/skullbooks)) [#162](https://github.com/Leaflet/Leaflet.markercluster/issues/162)
+ * Fix removing layers in certain situations (Reported by [@bpavot](https://github.com/bpavot)) [#160](https://github.com/Leaflet/Leaflet.markercluster/issues/160)
+ * Support calling hasLayer with null (by [@l0c0luke](https://github.com/l0c0luke)) [#170](https://github.com/Leaflet/Leaflet.markercluster/issues/170)
+ * Lots of fixes for removing a MarkerClusterGroup from the map (Reported by [@annetdeboer](https://github.com/annetdeboer)) [#200](https://github.com/Leaflet/Leaflet.markercluster/issues/200)
+ * Throw error when being added to a map with no maxZoom.
+ * Fixes for markers not appearing after a big zoom (Reported by [@arnoldbird](https://github.com/annetdeboer)) [#216](https://github.com/Leaflet/Leaflet.markercluster/issues/216) (Reported by [@mathilde-pellerin](https://github.com/mathilde-pellerin)) [#260](https://github.com/Leaflet/Leaflet.markercluster/issues/260)
+ * Fix coverage polygon not being removed when a MarkerClusterGroup is removed (Reported by [@ZeusTheTrueGod](https://github.com/ZeusTheTrueGod)) [#245](https://github.com/Leaflet/Leaflet.markercluster/issues/245)
+ * Fix getVisibleParent when no parent is visible (Reported by [@ajbeaven](https://github.com/ajbeaven)) [#265](https://github.com/Leaflet/Leaflet.markercluster/issues/265)
+ * Fix spiderfied markers not hiding on a big zoom (Reported by [@Vaesive](https://github.com/Vaesive)) [#268](https://github.com/Leaflet/Leaflet.markercluster/issues/268)
+ * Fix clusters not hiding on a big zoom (Reported by [@versusvoid](https://github.com/versusvoid)) [#281](https://github.com/Leaflet/Leaflet.markercluster/issues/281)
+ * Don't fire multiple clustermouseover/off events due to child divs in the cluster marker (Reported by [@heidemn](https://github.com/heidemn)) [#252](https://github.com/Leaflet/Leaflet.markercluster/issues/252)
+
## 0.2 (2012-10-11)
### Improvements
* Add addLayers/removeLayers bulk add and remove functions that perform better than the individual methods
- * Allow customising the polygon generated for showing the area a cluster covers (by [@yohanboniface](https://github.com/yohanboniface)) [#68](https://github.com/danzel/Leaflet.markercluster/issues/68)
+ * Allow customising the polygon generated for showing the area a cluster covers (by [@yohanboniface](https://github.com/yohanboniface)) [#68](https://github.com/Leaflet/Leaflet.markercluster/issues/68)
* Add zoomToShowLayer method to zoom down to a marker then call a callback once it is visible
* Add animateAddingMarkers to allow disabling animations caused when adding/removing markers
* Add hasLayer
@@ -17,7 +80,7 @@ Leaflet.markercluster
* Allow disabling clustering at a given zoom level
* Allow styling markers that are added like they were clusters of size 1
-
+
### Bugfixes
* Support when leaflet is configured to use canvas rather than SVG
@@ -26,4 +89,4 @@ Leaflet.markercluster
## 0.1 (2012-08-16)
-Initial Release!
\ No newline at end of file
+Initial Release!
diff --git a/Jakefile.js b/Jakefile.js
index db873d4..4af806d 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -1,67 +1,26 @@
-var build = require('./build/build.js'),
- lint = require('./build/hint.js');
+/*
+Leaflet.markercluster building, testing and linting scripts.
-var COPYRIGHT = '/*\n Copyright (c) 2012, Smartrak, David Leaver\n' +
- ' Leaflet.markercluster is an open-source JavaScript library for Marker Clustering on leaflet powered maps.\n' +
- ' https://github.com/danzel/Leaflet.markercluster\n*/\n';
+To use, install Node, then run the following commands in the project root:
-desc('Check Leaflet.markercluster source for errors with JSHint');
-task('lint', function () {
+ npm install -g jake
+ npm install
- var files = build.getFiles();
+To check the code for errors and build Leaflet from source, run "jake".
+To run the tests, run "jake test".
- console.log('Checking for JS errors...');
+For a custom build, open build/build.html in the browser and follow the instructions.
+*/
- var errorsFound = lint.jshint(files);
+var build = require('./build/build.js');
- if (errorsFound > 0) {
- console.log(errorsFound + ' error(s) found.\n');
- fail();
- } else {
- console.log('\tCheck passed');
- }
-});
+desc('Check Leaflet.markercluster source for errors with JSHint');
+task('lint', build.lint);
desc('Combine and compress Leaflet.markercluster source files');
-task('build', ['lint'], function (compsBase32, buildName) {
-
- var files = build.getFiles(compsBase32);
-
- console.log('Concatenating ' + files.length + ' files...');
-
- var content = build.combineFiles(files),
- newSrc = COPYRIGHT + content,
-
- pathPart = 'dist/leaflet.markercluster' + (buildName ? '-' + buildName : ''),
- srcPath = pathPart + '-src.js',
-
- oldSrc = build.load(srcPath),
- srcDelta = build.getSizeDelta(newSrc, oldSrc);
-
- console.log('\tUncompressed size: ' + newSrc.length + ' bytes (' + srcDelta + ')');
-
- if (newSrc === oldSrc) {
- console.log('\tNo changes');
- } else {
- build.save(srcPath, newSrc);
- console.log('\tSaved to ' + srcPath);
- }
-
- console.log('Compressing...');
-
- var path = pathPart + '.js',
- oldCompressed = build.load(path),
- newCompressed = COPYRIGHT + build.uglify(content),
- delta = build.getSizeDelta(newCompressed, oldCompressed);
-
- console.log('\tCompressed size: ' + newCompressed.length + ' bytes (' + delta + ')');
+task('build', ['lint'], build.build);
- if (newCompressed === oldCompressed) {
- console.log('\tNo changes');
- } else {
- build.save(path, newCompressed);
- console.log('\tSaved to ' + path);
- }
-});
+desc('Run PhantomJS tests');
+task('test', ['lint'], build.test);
-task('default', ['build']);
+task('default', ['build']);
\ No newline at end of file
diff --git a/README.md b/README.md
index 1e6d287..88bc51e 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,18 @@
Leaflet.markercluster
=====================
-Provides Beautiful Animated Marker Clustering functionality for Leaflet
+Provides Beautiful Animated Marker Clustering functionality for [Leaflet](http://leafletjs.com), a JS library for interactive maps.
-*Requires Leaflet 0.4.2 or newer*
+*Requires Leaflet 0.7.0 or newer.*
+
+For a Leaflet 0.5 compatible version, [Download b128e950](https://github.com/Leaflet/Leaflet.markercluster/archive/b128e950d8f5d7da5b60bd0aa9a88f6d3dd17c98.zip)<br>
+For a Leaflet 0.4 compatible version, [Download the 0.2 release](https://github.com/Leaflet/Leaflet.markercluster/archive/0.2.zip)
## Using the plugin
See the included examples for usage.
-The [realworld example](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-realworld.388.html) is a good place to start, it uses all of the defaults of the clusterer.
-Or check out the [custom example](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-custom.html) for how to customise the behaviour and appearance of the clusterer
+The [realworld example](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-realworld.388.html) is a good place to start, it uses all of the defaults of the clusterer.
+Or check out the [custom example](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-custom.html) for how to customise the behaviour and appearance of the clusterer
### Usage
Create a new MarkerClusterGroup, add your markers to it, then add it to the map
@@ -23,9 +26,10 @@ map.addLayer(markers);
### Defaults
By default the Clusterer enables some nice defaults for you:
-zoomToBoundsOnClick: When you mouse over a cluster it shows the bounds of its markers.
-showCoverageOnHover: When you click a cluster we zoom to its bounds.
-spiderfyOnMaxZoom: When you click a cluster at the bottom zoom level we spiderfy it so you can see all of its markers.
+* **showCoverageOnHover**: When you mouse over a cluster it shows the bounds of its markers.
+* **zoomToBoundsOnClick**: When you click a cluster we zoom to its bounds.
+* **spiderfyOnMaxZoom**: When you click a cluster at the bottom zoom level we spiderfy it so you can see all of its markers.
+* **removeOutsideVisibleBounds**: Clusters and markers too far from the viewport are removed from the map for performance.
You can disable any of these as you want in the options when you create the MarkerClusterGroup:
```javascript
@@ -39,26 +43,29 @@ You do not need to include the .Default css if you go this way.
You are passed a MarkerCluster object, you'll probably want to use getChildCount() or getAllChildMarkers() to work out the icon to show
```javascript
-var markers = new L.MarkerClusterGroup({ options: {
+var markers = new L.MarkerClusterGroup({
iconCreateFunction: function(cluster) {
return new L.DivIcon({ html: '<b>' + cluster.getChildCount() + '</b>' });
}
-}});
+});
```
-Check out the [custom example](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-custom.html) for an example of this.
+Check out the [custom example](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-custom.html) for an example of this.
### All Options
Enabled by default (boolean options):
-* **zoomToBoundsOnClick**: When you mouse over a cluster it shows the bounds of its markers.
-* **showCoverageOnHover**: When you click a cluster we zoom to its bounds.
+* **showCoverageOnHover**: When you mouse over a cluster it shows the bounds of its markers.
+* **zoomToBoundsOnClick**: When you click a cluster we zoom to its bounds.
* **spiderfyOnMaxZoom**: When you click a cluster at the bottom zoom level we spiderfy it so you can see all of its markers.
+* **removeOutsideVisibleBounds**: Clusters and markers too far from the viewport are removed from the map for performance.
Other options
-* **animateAddingMarkers**: If set to true then adding individual markers to the MarkerClusterGroup after it has been added to the map will add the marker and animate it in to the cluster. Defaults to false as this gives better performance when bulk adding markers.
-* **disableClusteringAtZoom**: If set, at this zoom level and below markers will not be clustered. This defaults to disabled. [See Example](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-realworld-maxzoom.388.html)
+* **animateAddingMarkers**: If set to true then adding individual markers to the MarkerClusterGroup after it has been added to the map will add the marker and animate it in to the cluster. Defaults to false as this gives better performance when bulk adding markers. addLayers does not support this, only addLayer with individual Markers.
+* **disableClusteringAtZoom**: If set, at this zoom level and below markers will not be clustered. This defaults to disabled. [See Example](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-realworld-maxzoom.388.html)
* **maxClusterRadius**: The maximum radius that a cluster will cover from the central marker (in pixels). Default 80. Decreasing will make more smaller clusters.
-* **polygonOptions**: Options to pass when creating the L.Polygon to show the bounds of a cluster
+* **polygonOptions**: Options to pass when creating the L.Polygon(points, options) to show the bounds of a cluster
* **singleMarkerMode**: If set to true, overrides the icon for all added markers to make them appear as a 1 size cluster
+* **spiderfyDistanceMultiplier**: Increase from 1 to increase the distance away from the center that spiderfied markers are placed. Use if you are using big marker icons (Default:1)
+* **iconCreateFunction**: Function used to create the cluster icon [See default as example](https://github.com/Leaflet/Leaflet.markercluster/blob/15ed12654acdc54a4521789c498e4603fe4bf781/src/MarkerClusterGroup.js#L542).
## Events
If you register for click, mouseover, etc events just related to Markers in the cluster.
@@ -80,7 +87,7 @@ markers.on('clusterclick', function (a) {
### Getting the bounds of a cluster
When you recieve an event from a cluster you can query it for the bounds.
-See [example/marker-clustering-convexhull.html](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-convexhull.html) for a working example.
+See [example/marker-clustering-convexhull.html](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-convexhull.html) for a working example.
```javascript
markers.on('clusterclick', function (a) {
map.addLayer(new L.Polygon(a.layer.getConvexHull()));
@@ -89,20 +96,29 @@ markers.on('clusterclick', function (a) {
### Zooming to the bounds of a cluster
When you recieve an event from a cluster you can zoom to its bounds in one easy step.
-See [marker-clustering-zoomtobounds.html](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-zoomtobounds.html) for a working example.
+If all of the markers will appear at a higher zoom level, that zoom level is zoomed to instead.
+See [marker-clustering-zoomtobounds.html](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-zoomtobounds.html) for a working example.
```javascript
markers.on('clusterclick', function (a) {
a.layer.zoomToBounds();
});
```
+### Getting the visible parent of a marker
+If you have a marker in your MarkerClusterGroup and you want to get the visible parent of it (Either itself or a cluster it is contained in that is currently visible on the map).
+This will return null if the marker and its parent clusters are not visible currently (they are not near the visible viewpoint)
+```
+var visibleOne = markerClusterGroup.getVisibleParent(myMarker);
+console.log(visibleOne.getLatLng());
+```
+
### Adding and removing Markers
addLayer, removeLayer and clearLayers are supported and they should work for most uses.
### Bulk adding and removing Markers
addLayers and removeLayers are bulk methods for adding and removing markers and should be favoured over the single versions when doing bulk addition/removal of markers. Each takes an array of markers
-If you are removing a lot of markers it will almost definitely be better to call clearLayers then call addLayers to add the markers you don't want to remove back in. See [#59](https://github.com/danzel/Leaflet.markercluster/issues/59#issuecomment-9320628) for details.
+If you are removing a lot of markers it will almost definitely be better to call clearLayers then call addLayers to add the markers you don't want to remove back in. See [#59](https://github.com/Leaflet/Leaflet.markercluster/issues/59#issuecomment-9320628) for details.
### Other Methods
````
@@ -114,10 +130,12 @@ removeLayers(layerArray): Removes the markers in the given array from the Marker
## Handling LOTS of markers
The Clusterer can handle 10000 or even 50000 markers (in chrome). IE9 has some issues with 50000.
-[realworld 10000 example](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-realworld.10000.html)
-[realworld 50000 example](http://danzel.github.com/Leaflet.markercluster/example/marker-clustering-realworld.50000.html)
+[realworld 10000 example](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-realworld.10000.html)
+[realworld 50000 example](http://leaflet.github.com/Leaflet.markercluster/example/marker-clustering-realworld.50000.html)
Performance optimizations could be done so these are handled more gracefully (Running the initial clustering over multiple JS calls rather than locking the browser for a long time)
### License
Leaflet.markercluster is free software, and may be redistributed under the MIT-LICENSE.
+
+[](https://travis-ci.org/Leaflet/Leaflet.markercluster)
\ No newline at end of file
diff --git a/build/build.html b/build/build.html
deleted file mode 100644
index bf94db3..0000000
--- a/build/build.html
+++ /dev/null
@@ -1,243 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Leaflet.markercluster Build Helper</title>
-
- <script type="text/javascript" src="deps.js"></script>
-
- <style type="text/css">
- body {
- font: 12px/1.4 Verdana, sans-serif;
- text-align: center;
- padding: 2em 0;
- }
- #container {
- text-align: left;
- margin: 0 auto;
- width: 780px;
- }
- #deplist {
- list-style: none;
- padding: 0;
- }
- #deplist li {
- padding-top: 7px;
- padding-bottom: 7px;
- border-bottom: 1px solid #ddd;
- }
- #deplist li.heading {
- border: none;
- background: #ddd;
- padding: 5px 10px;
- margin-top: 25px;
- border-radius: 5px;
- }
- #deplist input {
- float: left;
- margin-right: 5px;
- display: inline;
- }
- #deplist label {
- float: left;
- width: 160px;
- font-weight: bold;
- }
- #deplist div {
- display: table-cell;
- height: 1%;
- }
- #deplist .desc {
- }
-
- #deplist .deps {
- color: #777;
- }
-
- #command {
- width: 100%;
- }
- #command2 {
- width: 200px;
- }
-
- #toolbar {
- padding-bottom: 10px;
- border-bottom: 1px solid #ddd;
- }
-
- h2 {
- margin-top: 2em;
- }
- </style>
-</head>
-<body>
- <div id="container">
- <h1>Leaflet.markercluster Build Helper</h1>
-
- <p id="toolbar">
- <a id="select-all" href="#all">Select All</a> |
- <a id="deselect-all" href="#none">Deselect All</a>
- </p>
-
- <ul id="deplist"></ul>
-
- <h2>Building using Node and UglifyJS</h2>
- <ol>
- <li><a href="http://nodejs.org/#download">Download and install Node</a></li>
- <li>Run this in the command line:<br />
- <pre><code>npm install -g jake
-npm install jshint
-npm install uglify-js</code></pre></li>
- <li>Run this command inside the Leaflet.markercluster directory: <br /><input type="text" id="command2" />
- </ol>
- <h2>Building using Closure Compiler</h2>
- <ol>
- <li><a href="http://closure-compiler.googlecode.com/files/compiler-latest.zip">Download Closure Compiler</a>, extract it into <code>closure-compiler</code> directory</li>
- <li>Run this command in the root Leaflet directory: <br /><input type="text" id="command" /></li>
- </ol>
- </div>
-
- <script type="text/javascript">
- var deplist = document.getElementById('deplist'),
- commandInput = document.getElementById('command'),
- commandInput2 = document.getElementById('command2');
-
- document.getElementById('select-all').onclick = function() {
- var checks = deplist.getElementsByTagName('input');
- for (var i = 0; i < checks.length; i++) {
- checks[i].checked = true;
- }
- updateCommand();
- return false;
- };
-
- document.getElementById('deselect-all').onclick = function() {
- var checks = deplist.getElementsByTagName('input');
- for (var i = 0; i < checks.length; i++) {
- if (!checks[i].disabled) {
- checks[i].checked = false;
- }
- }
- updateCommand();
- return false;
- };
-
- function updateCommand() {
- var files = {};
- var checks = deplist.getElementsByTagName('input');
- var compsStr = '';
-
- for (var i = 0, len = checks.length; i < len; i++) {
- if (checks[i].checked) {
- var srcs = deps[checks[i].id].src;
- for (var j = 0, len2 = srcs.length; j < len2; j++) {
- files[srcs[j]] = true;
- }
- compsStr = '1' + compsStr;
- } else {
- compsStr = '0' + compsStr;
- }
- }
-
- var command = 'java -jar closure-compiler/compiler.jar ';
- for (var src in files) {
- command += '--js src/' + src + ' ';
- }
- command += '--js_output_file dist/leaflet-custom.js';
-
- commandInput.value = command;
-
- commandInput2.value = 'jake build[' + parseInt(compsStr, 2).toString(32) + ',custom]';
- }
-
- function inputSelect() {
- this.focus();
- this.select();
- };
-
- commandInput.onclick = inputSelect;
- commandInput2.onclick = inputSelect;
-
- function onCheckboxChange() {
- if (this.checked) {
- var depDeps = deps[this.id].deps;
- if (depDeps) {
- for (var i = 0; i < depDeps.length; i++) {
- var check = document.getElementById(depDeps[i]);
- if (!check.checked) {
- check.checked = true;
- check.onchange();
- }
- }
- }
- } else {
- var checks = deplist.getElementsByTagName('input');
- for (var i = 0; i < checks.length; i++) {
- var dep = deps[checks[i].id];
- if (!dep.deps) { continue; }
- for (var j = 0; j < dep.deps.length; j++) {
- if (dep.deps[j] === this.id) {
- if (checks[i].checked) {
- checks[i].checked = false;
- checks[i].onchange();
- }
- }
- }
- }
- }
- updateCommand();
- }
-
- for (var name in deps) {
- var li = document.createElement('li');
-
- if (deps[name].heading) {
- var heading = document.createElement('li');
- heading.className = 'heading';
- heading.appendChild(document.createTextNode(deps[name].heading));
- deplist.appendChild(heading);
- }
-
- var div = document.createElement('div');
-
- var label = document.createElement('label');
-
- var check = document.createElement('input');
- check.type = 'checkbox';
- check.id = name;
- label.appendChild(check);
- check.onchange = onCheckboxChange;
-
- if (name == 'Core') {
- check.checked = true;
- check.disabled = true;
- }
-
- label.appendChild(document.createTextNode(name));
- label.htmlFor = name;
-
- li.appendChild(label);
-
- var desc = document.createElement('span');
- desc.className = 'desc';
- desc.appendChild(document.createTextNode(deps[name].desc));
-
- var depText = deps[name].deps && deps[name].deps.join(', ');
- if (depText) {
- var depspan = document.createElement('span');
- depspan.className = 'deps';
- depspan.appendChild(document.createTextNode('Deps: ' + depText));
- }
-
- div.appendChild(desc);
- div.appendChild(document.createElement('br'));
- if (depText) { div.appendChild(depspan); }
-
- li.appendChild(div);
-
- deplist.appendChild(li);
- }
- updateCommand();
- </script>
-</body>
-</html>
diff --git a/build/build.js b/build/build.js
index 355e740..5fd41a7 100644
--- a/build/build.js
+++ b/build/build.js
@@ -1,14 +1,38 @@
var fs = require('fs'),
- uglifyjs = require('uglify-js'),
- deps = require('./deps.js').deps;
+ jshint = require('jshint'),
+ UglifyJS = require('uglify-js'),
-exports.getFiles = function (compsBase32) {
+ deps = require('./deps.js').deps,
+ hintrc = require('./hintrc.js').config;
+
+function lintFiles(files) {
+
+ var errorsFound = 0,
+ i, j, len, len2, src, errors, e;
+
+ for (i = 0, len = files.length; i < len; i++) {
+
+ jshint.JSHINT(fs.readFileSync(files[i], 'utf8'), hintrc, i ? {L: true} : null);
+ errors = jshint.JSHINT.errors;
+
+ for (j = 0, len2 = errors.length; j < len2; j++) {
+ e = errors[j];
+ console.log(files[i] + '\tline ' + e.line + '\tcol ' + e.character + '\t ' + e.reason);
+ }
+
+ errorsFound += len2;
+ }
+
+ return errorsFound;
+}
+
+function getFiles(compsBase32) {
var memo = {},
- comps;
+ comps;
if (compsBase32) {
comps = parseInt(compsBase32, 32).toString(2).split('');
- console.log('Managing dependencies...')
+ console.log('Managing dependencies...');
}
function addFiles(srcs) {
@@ -37,43 +61,133 @@ exports.getFiles = function (compsBase32) {
}
return files;
-};
+}
-exports.uglify = function (code) {
- var pro = uglifyjs.uglify;
+exports.getFiles = getFiles;
- var ast = uglifyjs.parser.parse(code);
- ast = pro.ast_mangle(ast, {mangle: true});
- ast = pro.ast_squeeze(ast);
- ast = pro.ast_squeeze_more(ast);
+exports.lint = function () {
- return pro.gen_code(ast) + ';';
-};
+ var files = getFiles();
-exports.combineFiles = function (files) {
- var content = '(function (window, undefined) {\n\n';
- for (var i = 0, len = files.length; i < len; i++) {
- content += fs.readFileSync(files[i], 'utf8') + '\n\n';
+ console.log('Checking for JS errors...');
+
+ var errorsFound = lintFiles(files);
+
+ if (errorsFound > 0) {
+ console.log(errorsFound + ' error(s) found.\n');
+ fail();
+ } else {
+ console.log('\tCheck passed');
}
- return content + '\n\n}(this));';
};
-exports.save = function (savePath, compressed) {
- return fs.writeFileSync(savePath, compressed, 'utf8');
-};
-exports.load = function (loadPath) {
+function getSizeDelta(newContent, oldContent) {
+ if (!oldContent) {
+ return 'new';
+ }
+ var newLen = newContent.replace(/\r\n?/g, '\n').length,
+ oldLen = oldContent.replace(/\r\n?/g, '\n').length,
+ delta = newLen - oldLen;
+
+ return (delta >= 0 ? '+' : '') + delta;
+}
+
+function loadSilently(path) {
try {
- return fs.readFileSync(loadPath, 'utf8');
+ return fs.readFileSync(path, 'utf8');
} catch (e) {
return null;
}
+}
+
+function combineFiles(files) {
+ var content = '';
+ for (var i = 0, len = files.length; i < len; i++) {
+ content += fs.readFileSync(files[i], 'utf8') + '\n\n';
+ }
+ return content;
+}
+
+exports.build = function (compsBase32, buildName) {
+
+ var files = getFiles(compsBase32);
+
+ console.log('Concatenating ' + files.length + ' files...');
+
+ var copy = fs.readFileSync('src/copyright.js', 'utf8'),
+ intro = '(function (window, document, undefined) {',
+ outro = '}(window, document));',
+ newSrc = copy + intro + combineFiles(files) + outro,
+
+ pathPart = 'dist/leaflet.markercluster' + (buildName ? '-' + buildName : ''),
+ srcPath = pathPart + '-src.js',
+
+ oldSrc = loadSilently(srcPath),
+ srcDelta = getSizeDelta(newSrc, oldSrc);
+
+ console.log('\tUncompressed size: ' + newSrc.length + ' bytes (' + srcDelta + ')');
+
+ if (newSrc === oldSrc) {
+ console.log('\tNo changes');
+ } else {
+ fs.writeFileSync(srcPath, newSrc);
+ console.log('\tSaved to ' + srcPath);
+ }
+
+ console.log('Compressing...');
+
+ var path = pathPart + '.js',
+ oldCompressed = loadSilently(path),
+ newCompressed = copy + UglifyJS.minify(newSrc, {
+ warnings: true,
+ fromString: true
+ }).code,
+ delta = getSizeDelta(newCompressed, oldCompressed);
+
+ console.log('\tCompressed size: ' + newCompressed.length + ' bytes (' + delta + ')');
+
+ if (newCompressed === oldCompressed) {
+ console.log('\tNo changes');
+ } else {
+ fs.writeFileSync(path, newCompressed);
+ console.log('\tSaved to ' + path);
+ }
};
-exports.getSizeDelta = function (newContent, oldContent) {
- if (!oldContent) {
- return 'new';
+exports.test = function() {
+ var karma = require('karma'),
+ testConfig = {configFile : __dirname + '/../spec/karma.conf.js'};
+
+ testConfig.browsers = ['PhantomJS'];
+
+ if (isArgv('--chrome')) {
+ testConfig.browsers.push('Chrome');
}
- var delta = newContent.length - oldContent.length;
- return (delta >= 0 ? '+' : '') + delta;
-};
\ No newline at end of file
+ if (isArgv('--safari')) {
+ testConfig.browsers.push('Safari');
+ }
+ if (isArgv('--ff')) {
+ testConfig.browsers.push('Firefox');
+ }
+ if (isArgv('--ie')) {
+ testConfig.browsers.push('IE');
+ }
+
+ if (isArgv('--cov')) {
+ testConfig.preprocessors = {
+ '../src/**/*.js': 'coverage'
+ };
+ testConfig.coverageReporter = {
+ type : 'html',
+ dir : 'coverage/'
+ };
+ testConfig.reporters = ['coverage'];
+ }
+
+ karma.server.start(testConfig);
+
+ function isArgv(optName) {
+ return process.argv.indexOf(optName) !== -1;
+ }
+};
diff --git a/build/hint.js b/build/hint.js
deleted file mode 100644
index 464bbe1..0000000
--- a/build/hint.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var jshint = require('jshint').JSHINT,
- fs = require('fs'),
- config = require('./hintrc.js').config;
-
-function jshintSrc(path, src) {
- jshint(src, config);
-
- var errors = jshint.errors,
- i, len, e, line;
-
- for (i = 0, len = errors.length; i < len; i++) {
- e = errors[i];
- //console.log(e.evidence);
- console.log(path + '\tline ' + e.line + '\tcol ' + e.character + '\t ' + e.reason);
- }
-
- return len;
-}
-
-exports.jshint = function (files) {
- var errorsFound = 0;
-
- for (var i = 0, len = files.length; i < len; i++) {
- var src = fs.readFileSync(files[i], 'utf8');
-
- errorsFound += jshintSrc(files[i], src);
- }
-
- return errorsFound;
-};
\ No newline at end of file
diff --git a/build/hintrc.js b/build/hintrc.js
index d05d406..55bfb36 100644
--- a/build/hintrc.js
+++ b/build/hintrc.js
@@ -1,47 +1,37 @@
exports.config = {
+
+ // environment
"browser": true,
"node": true,
- "predef": ["L"],
-
- "debug": false,
- "devel": false,
-
- "es5": false,
+ "predef": ['L', 'define'],
"strict": false,
- "globalstrict": false,
- "asi": false,
- "laxbreak": false,
+ // code style
"bitwise": true,
- "boss": false,
+ "camelcase": true,
"curly": true,
- "eqnull": false,
- "evil": false,
- "expr": false,
- "forin": true,
+ "eqeqeq": true,
+ "forin": false,
"immed": true,
"latedef": true,
- "loopfunc": false,
- "noarg": true,
- "regexp": true,
- "regexdash": false,
- "scripturl": false,
- "shadow": false,
- "supernew": false,
- "undef": true,
- "funcscope": false,
-
"newcap": true,
+ "noarg": true,
"noempty": true,
"nonew": true,
- "nomen": false,
- "onevar": false,
- "plusplus": false,
- "sub": false,
- "indent": 4,
+ "undef": true,
+ "unused": true,
+ //"quotmark": "single",
- "eqeqeq": true,
+ // whitespace
+ "indent": 4,
"trailing": true,
"white": true,
- "smarttabs": true
+ "smarttabs": true,
+ //"maxlen": 120
+
+ // code simplicity - not enforced but nice to check from time to time
+ // "maxstatements": 20,
+ // "maxcomplexity": 5
+ // "maxparams": 4,
+ // "maxdepth": 4
};
diff --git a/dist/MarkerCluster.Default.css b/dist/MarkerCluster.Default.css
index 90558dd..bbc8c9f 100644
--- a/dist/MarkerCluster.Default.css
+++ b/dist/MarkerCluster.Default.css
@@ -19,6 +19,28 @@
background-color: rgba(241, 128, 23, 0.6);
}
+ /* IE 6-8 fallback colors */
+.leaflet-oldie .marker-cluster-small {
+ background-color: rgb(181, 226, 140);
+ }
+.leaflet-oldie .marker-cluster-small div {
+ background-color: rgb(110, 204, 57);
+ }
+
+.leaflet-oldie .marker-cluster-medium {
+ background-color: rgb(241, 211, 87);
+ }
+.leaflet-oldie .marker-cluster-medium div {
+ background-color: rgb(240, 194, 12);
+ }
+
+.leaflet-oldie .marker-cluster-large {
+ background-color: rgb(253, 156, 115);
+ }
+.leaflet-oldie .marker-cluster-large div {
+ background-color: rgb(241, 128, 23);
+}
+
.marker-cluster {
background-clip: padding-box;
border-radius: 20px;
diff --git a/dist/MarkerCluster.Default.ie.css b/dist/MarkerCluster.Default.ie.css
deleted file mode 100644
index 1d0de51..0000000
--- a/dist/MarkerCluster.Default.ie.css
+++ /dev/null
@@ -1,22 +0,0 @@
- /* IE 6-8 fallback colors */
-.marker-cluster-small {
- background-color: rgb(181, 226, 140);
- }
-.marker-cluster-small div {
- background-color: rgb(110, 204, 57);
- }
-
-.marker-cluster-medium {
- background-color: rgb(241, 211, 87);
- }
-.marker-cluster-medium div {
- background-color: rgb(240, 194, 12);
- }
-
-.marker-cluster-large {
- background-color: rgb(253, 156, 115);
- }
-.marker-cluster-large div {
- background-color: rgb(241, 128, 23);
-}
-
diff --git a/dist/MarkerCluster.css b/dist/MarkerCluster.css
index a915c1a..00b0edd 100644
--- a/dist/MarkerCluster.css
+++ b/dist/MarkerCluster.css
@@ -1,6 +1,6 @@
.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
- -webkit-transition: -webkit-transform 0.25s ease-out, opacity 0.25s ease-in;
- -moz-transition: -moz-transform 0.25s ease-out, opacity 0.25s ease-in;
- -o-transition: -o-transform 0.25s ease-out, opacity 0.25s ease-in;
- transition: transform 0.25s ease-out, opacity 0.25s ease-in;
+ -webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
+ -moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
+ -o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
+ transition: transform 0.3s ease-out, opacity 0.3s ease-in;
}
diff --git a/example/geojson-sample.js b/example/geojson-sample.js
new file mode 100644
index 0000000..37a2266
--- /dev/null
+++ b/example/geojson-sample.js
@@ -0,0 +1,53 @@
+var geojsonSample = {
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [102.0, 0.5]
+ },
+ "properties": {
+ "prop0": "value0",
+ "color": "blue"
+ }
+ },
+
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]]
+ },
+ "properties": {
+ "color": "red",
+ "prop1": 0.0
+ }
+ },
+
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]]
+ },
+ "properties": {
+ "color": "green",
+ "prop1": {
+ "this": "that"
+ }
+ }
+ },
+
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "MultiPolygon",
+ "coordinates": [[[[100.0, 1.5], [100.5, 1.5], [100.5, 2.0], [100.0, 2.0], [100.0, 1.5]]], [[[100.5, 2.0], [100.5, 2.5], [101.0, 2.5], [101.0, 2.0], [100.5, 2.0]]]]
+ },
+ "properties": {
+ "color": "purple"
+ }
+ }
+ ]
+};
diff --git a/example/geojson.html b/example/geojson.html
new file mode 100644
index 0000000..4a3652d
--- /dev/null
+++ b/example/geojson.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Leaflet debug page</title>
+
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="screen.css" />
+
+ <link rel="stylesheet" href="../dist/MarkerCluster.css" />
+ <link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
+ <script src="../dist/leaflet.markercluster-src.js"></script>
+</head>
+<body>
+
+ <div id="map"></div>
+
+ <script type="text/javascript">
+
+ var geoJsonData = {
+ "type": "FeatureCollection",
+ "features": [
+ { "type": "Feature", "id":"1", "properties": { "address": "2" }, "geometry": { "type": "Point", "coordinates": [175.2209316333,-37.8210922667 ] } },
+ { "type": "Feature", "id":"2", "properties": { "address": "151" }, "geometry": { "type": "Point", "coordinates": [175.2238417833,-37.80975435 ] } },
+ { "type": "Feature", "id":"3", "properties": { "address": "21" }, "geometry": { "type": "Point", "coordinates": [175.2169955667,-37.818193 ] } },
+ { "type": "Feature", "id":"4", "properties": { "address": "14" }, "geometry": { "type": "Point", "coordinates": [175.2240856667,-37.8216963 ] } },
+ { "type": "Feature", "id":"5", "properties": { "address": "38B" }, "geometry": { "type": "Point", "coordinates": [175.2196982333,-37.8188702167 ] } },
+ { "type": "Feature", "id":"6", "properties": { "address": "38" }, "geometry": { "type": "Point", "coordinates": [175.2209942 ,-37.8192782833 ] } }
+ ]
+ };
+
+ var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/997/256/{z}/{x}/{y}.png', {
+ maxZoom: 18,
+ attribution: 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
+ key: 'BC9A493B41014CAABB98F0471D759707'
+ });
+
+ var map = L.map('map')
+ .addLayer(cloudmade);
+
+ var markers = L.markerClusterGroup();
+
+ var geoJsonLayer = L.geoJson(geoJsonData, {
+ onEachFeature: function (feature, layer) {
+ layer.bindPopup(feature.properties.address);
+ }
+ });
+ markers.addLayer(geoJsonLayer);
+
+ map.addLayer(markers);
+ map.fitBounds(markers.getBounds());
+ </script>
+</body>
+</html>
diff --git a/example/marker-clustering-convexhull.html b/example/marker-clustering-convexhull.html
index e7c7ac8..b26d5cc 100644
--- a/example/marker-clustering-convexhull.html
+++ b/example/marker-clustering-convexhull.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
</head>
<body>
@@ -24,16 +22,16 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(50.5, 30.51);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(50.5, 30.51);
- var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup({ spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false });
+ var markers = L.markerClusterGroup({ spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false });
function populate() {
for (var i = 0; i < 100; i++) {
- var m = new L.Marker(getRandomLatLng(map));
+ var m = L.marker(getRandomLatLng(map));
markers.addLayer(m);
}
return false;
@@ -45,7 +43,7 @@
lngSpan = northEast.lng - southWest.lng,
latSpan = northEast.lat - southWest.lat;
- return new L.LatLng(
+ return L.latLng(
southWest.lat + latSpan * Math.random(),
southWest.lng + lngSpan * Math.random());
}
@@ -56,7 +54,7 @@
if (polygon) {
map.removeLayer(polygon);
}
- polygon = new L.Polygon(a.layer.getConvexHull());
+ polygon = L.polygon(a.layer.getConvexHull());
map.addLayer(polygon);
});
diff --git a/example/marker-clustering-custom.html b/example/marker-clustering-custom.html
index 7b836ea..107916a 100644
--- a/example/marker-clustering-custom.html
+++ b/example/marker-clustering-custom.html
@@ -3,9 +3,8 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
@@ -31,17 +30,22 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(50.5, 30.51);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(50.5, 30.51);
- var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
//Custom radius and icon create function
- var markers = new L.MarkerClusterGroup({
+ var markers = L.markerClusterGroup({
maxClusterRadius: 120,
iconCreateFunction: function (cluster) {
- return new L.DivIcon({ html: cluster.getChildCount(), className: 'mycluster', iconSize: new L.Point(40, 40) });
+ var markers = cluster.getAllChildMarkers();
+ var n = 0;
+ for (var i = 0; i < markers.length; i++) {
+ n += markers[i].number;
+ }
+ return L.divIcon({ html: n, className: 'mycluster', iconSize: L.point(40, 40) });
},
//Disable all of the defaults:
spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false
@@ -50,7 +54,8 @@
function populate() {
for (var i = 0; i < 100; i++) {
- var m = new L.Marker(getRandomLatLng(map));
+ var m = L.marker(getRandomLatLng(map), { title: i });
+ m.number = i;
markers.addLayer(m);
}
return false;
@@ -59,7 +64,7 @@
for (var i = 0, latlngs = [], len = 20; i < len; i++) {
latlngs.push(getRandomLatLng(map));
}
- var path = new L.Polyline(latlngs);
+ var path = L.polyline(latlngs);
map.addLayer(path);
}
function getRandomLatLng(map) {
@@ -69,7 +74,7 @@
lngSpan = northEast.lng - southWest.lng,
latSpan = northEast.lat - southWest.lat;
- return new L.LatLng(
+ return L.latLng(
southWest.lat + latSpan * Math.random(),
southWest.lng + lngSpan * Math.random());
}
@@ -97,7 +102,7 @@
a.layer.setOpacity(0.2);
shownLayer = a.layer;
- polygon = new L.Polygon(a.layer.getConvexHull());
+ polygon = L.polygon(a.layer.getConvexHull());
map.addLayer(polygon);
});
markers.on('clustermouseout', removePolygon);
diff --git a/example/marker-clustering-everything.html b/example/marker-clustering-everything.html
index f63b0bb..eab39c5 100644
--- a/example/marker-clustering-everything.html
+++ b/example/marker-clustering-everything.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
</head>
<body>
@@ -24,17 +22,17 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(50.5, 30.51);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(50.5, 30.51);
- var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup({ animateAddingMarkers : true });
+ var markers = L.markerClusterGroup({ animateAddingMarkers : true });
var markersList = [];
function populate() {
for (var i = 0; i < 100; i++) {
- var m = new L.Marker(getRandomLatLng(map));
+ var m = L.marker(getRandomLatLng(map));
markersList.push(m);
markers.addLayer(m);
}
@@ -47,7 +45,7 @@
lngSpan = northEast.lng - southWest.lng,
latSpan = northEast.lat - southWest.lat;
- return new L.LatLng(
+ return L.latLng(
southWest.lat + latSpan * Math.random(),
southWest.lng + lngSpan * Math.random());
}
@@ -66,9 +64,9 @@
northEast = bounds.getNorthEast(),
lngSpan = northEast.lng - southWest.lng,
latSpan = northEast.lat - southWest.lat;
- var m = new L.Marker(new L.LatLng(
+ var m = L.marker([
southWest.lat + latSpan * 0.5,
- southWest.lng + lngSpan * 0.5));
+ southWest.lng + lngSpan * 0.5]);
markersList.push(m);
markers.addLayer(m);
};
diff --git a/example/marker-clustering-geojson.html b/example/marker-clustering-geojson.html
new file mode 100644
index 0000000..f7287bb
--- /dev/null
+++ b/example/marker-clustering-geojson.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Leaflet debug page</title>
+
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="screen.css" />
+
+ <link rel="stylesheet" href="../dist/MarkerCluster.css" />
+ <link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
+ <script src="../dist/leaflet.markercluster-src.js"></script>
+ <script type="text/javascript" src="geojson-sample.js"></script>
+
+</head>
+<body>
+
+ <div id="map"></div>
+ <span>Mouse over a cluster to see the bounds of its children and click a cluster to zoom to those bounds</span>
+ <script type="text/javascript">
+
+ var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
+ cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade, Points © 2012 LINZ',
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(0.78, 102.37);
+
+ var map = L.map('map', {center: latlng, zoom: 7, layers: [cloudmade]});
+
+
+ var geojson = L.geoJson(geojsonSample, {
+
+ style: function (feature) {
+ return {color: feature.properties.color};
+ },
+
+ onEachFeature: function (feature, layer) {
+ var popupText = 'geometry type: ' + feature.geometry.type;
+
+ if (feature.properties.color) {
+ popupText += '<br/>color: ' + feature.properties.color
+ }
+
+ layer.bindPopup(popupText);
+ }
+ });
+
+ geojson.addLayer(new L.Marker(new L.LatLng(2.745530718801952, 105.194091796875)))
+
+ var eye1 = new L.Marker(new L.LatLng(-0.7250783020332547, 101.8212890625));
+ var eye2 = new L.Marker(new L.LatLng(-0.7360637370492077, 103.2275390625));
+ var nose = new L.Marker(new L.LatLng(-1.3292264529974207, 102.5463867187));
+ var mouth = new L.Polyline([
+ new L.LatLng(-1.3841426927920029, 101.7333984375),
+ new L.LatLng(-1.6037944300589726, 101.964111328125),
+ new L.LatLng(-1.6806671337507222, 102.249755859375),
+ new L.LatLng(-1.7355743631421197, 102.67822265625),
+ new L.LatLng(-1.5928123762763, 103.0078125),
+ new L.LatLng(-1.3292264529974207, 103.3154296875)
+ ]);
+
+ var markers = L.markerClusterGroup();
+ markers.addLayer(geojson).addLayers([eye1,eye2,nose,mouth]);
+
+ map.addLayer(markers);
+
+ </script>
+</body>
+</html>
diff --git a/example/marker-clustering-realworld-maxzoom.388.html b/example/marker-clustering-realworld-maxzoom.388.html
index b6d9ecb..bcf4a3d 100644
--- a/example/marker-clustering-realworld-maxzoom.388.html
+++ b/example/marker-clustering-realworld-maxzoom.388.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
<script src="realworld.388.js"></script>
@@ -24,17 +22,17 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade, Points © 2012 LINZ',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(-37.82, 175.24);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(-37.82, 175.24);
- var map = new L.Map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup({ disableClusteringAtZoom: 17 });
+ var markers = L.markerClusterGroup({ disableClusteringAtZoom: 17 });
for (var i = 0; i < addressPoints.length; i++) {
var a = addressPoints[i];
var title = a[2];
- var marker = new L.Marker(new L.LatLng(a[0], a[1]), { title: title });
+ var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
marker.bindPopup(title);
markers.addLayer(marker);
}
diff --git a/example/marker-clustering-realworld-mobile.388.html b/example/marker-clustering-realworld-mobile.388.html
index 39aad98..982f346 100644
--- a/example/marker-clustering-realworld-mobile.388.html
+++ b/example/marker-clustering-realworld-mobile.388.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="mobile.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
<script src="realworld.388.js"></script>
</head>
@@ -23,17 +21,17 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade, Points © 2012 LINZ',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(-37.821, 175.22);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(-37.821, 175.22);
- var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup();
+ var markers = L.markerClusterGroup();
for (var i = 0; i < addressPoints.length; i++) {
var a = addressPoints[i];
var title = a[2];
- var marker = new L.Marker(new L.LatLng(a[0], a[1]), { title: title });
+ var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
marker.bindPopup(title);
markers.addLayer(marker);
}
diff --git a/example/marker-clustering-realworld.10000.html b/example/marker-clustering-realworld.10000.html
index d6108af..873a0f6 100644
--- a/example/marker-clustering-realworld.10000.html
+++ b/example/marker-clustering-realworld.10000.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
<script src="realworld.10000.js"></script>
@@ -25,16 +23,16 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade, Points © 2012 LINZ',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(-37.89, 175.46);
- var map = new L.Map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(-37.89, 175.46);
+ var map = L.map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup();
+ var markers = L.markerClusterGroup();
for (var i = 0; i < addressPoints.length; i++) {
var a = addressPoints[i];
var title = a[2];
- var marker = new L.Marker(new L.LatLng(a[0], a[1]), { title: title });
+ var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
marker.bindPopup(title);
markers.addLayer(marker);
}
diff --git a/example/marker-clustering-realworld.388.html b/example/marker-clustering-realworld.388.html
index d7c5855..1431d59 100644
--- a/example/marker-clustering-realworld.388.html
+++ b/example/marker-clustering-realworld.388.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
<script src="realworld.388.js"></script>
@@ -24,17 +22,17 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade, Points © 2012 LINZ',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(-37.82, 175.24);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(-37.82, 175.24);
- var map = new L.Map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup();
+ var markers = L.markerClusterGroup();
for (var i = 0; i < addressPoints.length; i++) {
var a = addressPoints[i];
var title = a[2];
- var marker = new L.Marker(new L.LatLng(a[0], a[1]), { title: title });
+ var marker = L.marker(new L.LatLng(a[0], a[1]), { title: title });
marker.bindPopup(title);
markers.addLayer(marker);
}
diff --git a/example/marker-clustering-realworld.50000.html b/example/marker-clustering-realworld.50000.html
index 185b154..0f7c7e6 100644
--- a/example/marker-clustering-realworld.50000.html
+++ b/example/marker-clustering-realworld.50000.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
<script src="realworld.50000.1.js"></script>
@@ -25,29 +23,38 @@
<script type="text/javascript">
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade, Points © 2012 LINZ',
- cloudmade = new L.TileLayer(cloudmadeUrl, { maxZoom: 17, attribution: cloudmadeAttribution }),
- latlng = new L.LatLng(-37.79, 175.27);
+ cloudmade = L.tileLayer(cloudmadeUrl, { maxZoom: 17, attribution: cloudmadeAttribution }),
+ latlng = L.latLng(-37.79, 175.27);
- var map = new L.Map('map', { center: latlng, zoom: 13, layers: [cloudmade] });
+ var map = L.map('map', { center: latlng, zoom: 13, layers: [cloudmade] });
- var markers = new L.MarkerClusterGroup();
+ var markers = L.markerClusterGroup();
+ var markerList = [];
+
+ //console.log('start creating markers: ' + window.performance.now());
+
for (var i = 0; i < addressPoints.length; i++) {
var a = addressPoints[i];
var title = a[2];
- var marker = new L.Marker(new L.LatLng(a[0], a[1]), { title: title });
+ var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
marker.bindPopup(title);
- markers.addLayer(marker);
+ markerList.push(marker);
}
for (var i = 0; i < addressPoints2.length; i++) {
var a = addressPoints[i];
var title = a[2];
- var marker = new L.Marker(new L.LatLng(a[0], a[1]), { title: title });
+ var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
marker.bindPopup(title);
- markers.addLayer(marker);
+ markerList.push(marker);
}
+ //console.log('start clustering: ' + window.performance.now());
+
+ markers.addLayers(markerList);
map.addLayer(markers);
+
+ //console.log('end clustering: ' + window.performance.now());
</script>
</body>
</html>
diff --git a/example/marker-clustering-singlemarkermode.html b/example/marker-clustering-singlemarkermode.html
index 60eef82..ab71f1c 100644
--- a/example/marker-clustering-singlemarkermode.html
+++ b/example/marker-clustering-singlemarkermode.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
</head>
<body>
@@ -23,16 +21,16 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(50.5, 30.51);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(50.5, 30.51);
- var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup({ singleMarkerMode: true});
+ var markers = L.markerClusterGroup({ singleMarkerMode: true});
function populate() {
for (var i = 0; i < 100; i++) {
- var m = new L.Marker(getRandomLatLng(map));
+ var m = L.marker(getRandomLatLng(map));
markers.addLayer(m);
}
return false;
@@ -44,7 +42,7 @@
lngSpan = northEast.lng - southWest.lng,
latSpan = northEast.lat - southWest.lat;
- return new L.LatLng(
+ return L.latLng(
southWest.lat + latSpan * Math.random(),
southWest.lng + lngSpan * Math.random());
}
diff --git a/example/marker-clustering-spiderfier.html b/example/marker-clustering-spiderfier.html
index c0d60a0..bfa3170 100644
--- a/example/marker-clustering-spiderfier.html
+++ b/example/marker-clustering-spiderfier.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
</head>
<body>
@@ -24,16 +22,16 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(50.5, 30.51);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(50.5, 30.51);
- var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup({ spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false });
+ var markers = L.markerClusterGroup({ spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false });
function populate() {
for (var i = 0; i < 100; i++) {
- var m = new L.Marker(getRandomLatLng(map));
+ var m = L.marker(getRandomLatLng(map));
markers.addLayer(m);
}
return false;
@@ -45,7 +43,7 @@
lngSpan = northEast.lng - southWest.lng,
latSpan = northEast.lat - southWest.lat;
- return new L.LatLng(
+ return L.latLng(
southWest.lat + latSpan * Math.random(),
southWest.lng + lngSpan * Math.random());
}
diff --git a/example/marker-clustering-zoomtobounds.html b/example/marker-clustering-zoomtobounds.html
index b5fb002..45b5480 100644
--- a/example/marker-clustering-zoomtobounds.html
+++ b/example/marker-clustering-zoomtobounds.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
</head>
<body>
@@ -23,16 +21,16 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(50.5, 30.51);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(50.5, 30.51);
- var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup({spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false});
+ var markers = L.markerClusterGroup({spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false});
function populate() {
for (var i = 0; i < 100; i++) {
- var m = new L.Marker(getRandomLatLng(map));
+ var m = L.marker(getRandomLatLng(map));
markers.addLayer(m);
}
return false;
@@ -44,7 +42,7 @@
lngSpan = northEast.lng - southWest.lng,
latSpan = northEast.lat - southWest.lat;
- return new L.LatLng(
+ return L.latLng(
southWest.lat + latSpan * Math.random(),
southWest.lng + lngSpan * Math.random());
}
diff --git a/example/marker-clustering-zoomtoshowlayer.html b/example/marker-clustering-zoomtoshowlayer.html
index 2b35229..08d763b 100644
--- a/example/marker-clustering-zoomtoshowlayer.html
+++ b/example/marker-clustering-zoomtoshowlayer.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
<script src="realworld.388.js"></script>
@@ -25,19 +23,19 @@
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade, Points © 2012 LINZ',
- cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(-37.82, 175.24);
+ cloudmade = L.tileLayer(cloudmadeUrl, {maxZoom: 17, attribution: cloudmadeAttribution}),
+ latlng = L.latLng(-37.82, 175.24);
- var map = new L.Map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
+ var map = L.map('map', {center: latlng, zoom: 13, layers: [cloudmade]});
- var markers = new L.MarkerClusterGroup();
+ var markers = L.markerClusterGroup();
var markerList = [];
function populate() {
for (var i = 0; i < addressPoints.length; i++) {
var a = addressPoints[i];
var title = a[2];
- var marker = new L.Marker(new L.LatLng(a[0], a[1]), { title: title });
+ var marker = L.marker(L.latLng(a[0], a[1]), { title: title });
marker.bindPopup(title);
markers.addLayer(marker);
markerList.push(marker);
diff --git a/example/marker-clustering.html b/example/marker-clustering.html
index cc18fb9..82accd4 100644
--- a/example/marker-clustering.html
+++ b/example/marker-clustering.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="screen.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../dist/leaflet.markercluster-src.js"></script>
</head>
<body>
diff --git a/example/old-bugs/add-1000-after.html b/example/old-bugs/add-1000-after.html
index 03fbb88..75707d5 100644
--- a/example/old-bugs/add-1000-after.html
+++ b/example/old-bugs/add-1000-after.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
diff --git a/example/old-bugs/add-markers-offscreen.html b/example/old-bugs/add-markers-offscreen.html
index f0573db..ca7b098 100644
--- a/example/old-bugs/add-markers-offscreen.html
+++ b/example/old-bugs/add-markers-offscreen.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
diff --git a/example/old-bugs/add-remove-before-addtomap.html b/example/old-bugs/add-remove-before-addtomap.html
index 2de3a7f..f829946 100644
--- a/example/old-bugs/add-remove-before-addtomap.html
+++ b/example/old-bugs/add-remove-before-addtomap.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
diff --git a/example/old-bugs/add-markers-offscreen.html b/example/old-bugs/animationless-zoom.html
similarity index 52%
copy from example/old-bugs/add-markers-offscreen.html
copy to example/old-bugs/animationless-zoom.html
index f0573db..169feac 100644
--- a/example/old-bugs/add-markers-offscreen.html
+++ b/example/old-bugs/animationless-zoom.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
@@ -21,33 +19,28 @@
<body>
<div id="map"></div>
- <button id="populate">Populate 1 marker</button>
- <span>Bug <a href="https://github.com/danzel/Leaflet.markercluster/issues/69">#69</a>. Click the button 2+ times. Zoom out. Should just be a single cluster but instead one of the child markers is still visible.</span><br/>
+ <button id="doit">Zoom in</button><br/>
+ <span>Bug <a href="https://github.com/leaflet/Leaflet.markercluster/issues/216">#216</a>. Click the button. It will zoom in, leaflet will not do an animation for the zoom. A marker should be visible.</span><br/>
+ <span id="time"></span>
<script type="text/javascript">
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
- latlng = new L.LatLng(50.5, 30.51);
+ latlng = new L.LatLng(-37.36142550190516, 174.254150390625);
- var map = new L.Map('map', {center: new L.LatLng(50.41, 30.51), zoom: 17, layers: [cloudmade]});
-
- var markers = new L.MarkerClusterGroup({ animateAddingMarkers : true });
- var markersList = [];
-
- function populate() {
- var m = new L.Marker(latlng);
- markersList.push(m);
- markers.addLayer(m);
- return false;
- }
+ var map = new L.Map('map', {center: latlng, zoom: 7, layers: [cloudmade]});
+ var markers = new L.MarkerClusterGroup();
+ markers.addLayer(new L.Marker([-37.77852090603777, 175.3103667497635])); //The one we zoom in on
+ markers.addLayer(new L.Marker([-37.711800591811055, 174.50034790039062])); //Marker that we cluster with at the top zoom level, but not 1 level down
map.addLayer(markers);
//Ugly add/remove code
- L.DomUtil.get('populate').onclick = function () {
- populate();
+ L.DomUtil.get('doit').onclick = function () {
+ map.setView([-37.77852090603777, 175.3103667497635], 15);
};
+
</script>
</body>
</html>
diff --git a/example/old-bugs/disappearing-marker-from-spider.html b/example/old-bugs/disappearing-marker-from-spider.html
new file mode 100644
index 0000000..71e9fec
--- /dev/null
+++ b/example/old-bugs/disappearing-marker-from-spider.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Leaflet debug page</title>
+
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="../screen.css" />
+
+ <link rel="stylesheet" href="../../dist/MarkerCluster.css" />
+ <link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
+ <script src="../../dist/leaflet.markercluster-src.js"></script>
+</head>
+<body style="font-family: verdana; font-size: 80%;">
+
+ <div id="map"></div>
+ Click on the cluster to <strong>spiderfy</strong> and then <button id="moveTrain">move train</button><br/>
+ <br/>
+ <div style="color: #888;"><strong>Note:</strong> The marker on the old cluster position comes back on next move or on map scrolling.</div>
+
+ <script type="text/javascript">
+
+ var stationJson = {
+ "type":"FeatureCollection",
+ "features":[
+ {"type":"Feature","id":1,"properties":{"type":"station","name":"Appenzell"},"geometry":{"type":"Point","coordinates":[9.40991,47.32849]}},
+ {"type":"Feature","id":2,"properties":{"type":"station","name":"Gais"},"geometry":{"type":"Point","coordinates":[9.45107,47.36073]}},
+ {"type":"Feature","id":3,"properties":{"type":"station","name":"St. Gallen"},"geometry":{"type":"Point","coordinates":[9.36901,47.42208]}},
+ {"type":"Feature","id":4,"properties":{"type":"station","name":"Teufen"},"geometry":{"type":"Point","coordinates":[9.390178,47.390157]}}
+ ]};
+
+ var trainJson = [{
+ "type":"FeatureCollection",
+ "features":[
+ {"type":"Feature","id":10,"properties":{"type":"train","name":"Testtrain"},"geometry":{"type":"Point","coordinates":[9.36901,47.42208]}}
+ ]},{
+ "type":"FeatureCollection",
+ "features":[
+ {"type":"Feature","id":10,"properties":{"type":"train","name":"Testtrain"},"geometry":{"type":"Point","coordinates":[9.390178,47.390157]}}
+ ]},{
+ "type":"FeatureCollection",
+ "features":[
+ {"type":"Feature","id":10,"properties":{"type":"train","name":"Testtrain"},"geometry":{"type":"Point","coordinates":[9.45107,47.36073]}}
+ ]},{
+ "type":"FeatureCollection",
+ "features":[
+ {"type":"Feature","id":10,"properties":{"type":"train","name":"Testtrain"},"geometry":{"type":"Point","coordinates":[9.40991,47.32849]}}
+ ]}];
+
+ var trainPosition = 0,
+ trainDirection = 'up';
+
+ var cloudmadeLayer = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/997/256/{z}/{x}/{y}.png', {
+ maxZoom: 18,
+ attribution: 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
+ key: 'BC9A493B41014CAABB98F0471D759707'
+ }),
+ map = new L.Map('map', {zoom: 15, layers: [cloudmadeLayer]}),
+ markers = new L.MarkerClusterGroup({ spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false });
+
+ var stationGeoJsonLayer = L.geoJson(stationJson, {
+ onEachFeature: function (feature, layer) {
+ layer.bindPopup(feature.properties.name);
+ }
+ }),
+ trainGeoJsonLayer = L.geoJson(trainJson[trainPosition], {
+ onEachFeature: function (feature, layer) {
+ layer.bindPopup(feature.properties.name);
+ }
+ });
+
+ // initial load
+ markers.addLayer(stationGeoJsonLayer);
+ markers.addLayer(trainGeoJsonLayer);
+ map.fitBounds(markers.getBounds());
+
+ markers.on('clusterclick', function (a) {
+ a.layer.spiderfy();
+ });
+
+ map.addLayer(markers);
+
+ /**
+ * Demonstration method that simulates that we got a new geoJson object with updated train positions.
+ */
+ function moveTrain() {
+ if (trainDirection == 'up') trainPosition++;
+ else if (trainDirection == 'down') trainPosition--;
+ if (trainPosition == trainJson.length-1) trainDirection = 'down';
+ else if (trainPosition == 0) trainDirection = 'up';
+
+ // build a new geoJson layer with the new train information
+ trainGeoJsonLayer = L.geoJson(trainJson[trainPosition], {});
+
+ // update the cluster markers with both layers (stations first so that the station marker is always the first on spider.
+ markers.clearLayers();
+ markers.addLayer(stationGeoJsonLayer);
+ markers.addLayer(trainGeoJsonLayer);
+ }
+
+ L.DomUtil.get('moveTrain').onclick = function () {
+ moveTrain();
+ };
+ </script>
+</body>
+</html>
diff --git a/example/old-bugs/doesnt-update-cluster-on-bottom-level.html b/example/old-bugs/doesnt-update-cluster-on-bottom-level.html
new file mode 100644
index 0000000..7153d2c
--- /dev/null
+++ b/example/old-bugs/doesnt-update-cluster-on-bottom-level.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Leaflet debug page</title>
+
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="../screen.css" />
+
+ <link rel="stylesheet" href="../../dist/MarkerCluster.css" />
+ <link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
+ <script src="../../src/DistanceGrid.js"></script>
+ <script src="../../src/MarkerCluster.js"></script>
+ <script src="../../src/MarkerClusterGroup.js"></script>
+ <script src="../../src/MarkerCluster.QuickHull.js"></script>
+ <script src="../../src/MarkerCluster.Spiderfier.js"></script>
+</head>
+<body>
+
+ <div id="map"></div>
+ <button id="doit">AddMarker</button><button id="doit2">Add by Timer</button><br/>
+ <span>Bug <a href="https://github.com/danzel/Leaflet.markercluster/issues/114">#114</a>. Markers are added to the map periodically using addLayers. Bug was that after becoming a cluster (size 2 or 3 usually) they would never change again even if more markers were added to them.</span><br/>
+
+ <script type="text/javascript">
+
+ var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
+ cloudmadeAttribution = 'Map data © 2011 OpenStreetMap contributors, Imagery © 2011 CloudMade',
+ cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+ latlng = new L.LatLng(40.782982, -73.969452);
+
+ var map = new L.Map('map', {
+ center: latlng,
+ zoom: 12,
+ maxZoom: 12,
+ layers: [cloudmade]
+ });
+
+ var markerCluster = new L.MarkerClusterGroup();
+ map.addLayer(markerCluster);
+
+ function getRandomLatLng() {
+ return [
+ 40.782982 + (Math.random() > 0.5 ? 0.5 : -0.5) * Math.random(),
+ -73.969452 + (Math.random() > 0.5 ? 0.5 : -0.5) * Math.random()
+ ];
+ }
+
+ document.getElementById('doit').onclick = function () {
+ markerCluster.addLayers([new L.Marker(map.getCenter())]);
+ };
+ document.getElementById('doit2').onclick = function () {
+ setInterval(function () {
+ var n = 100;
+ var markers = new Array();
+
+ for (var i = 0; i < n; i++) {
+ markers.push(L.marker(getRandomLatLng()));
+ }
+
+ markerCluster.addLayers(markers);
+
+ }, 1000);
+ };
+
+ </script>
+</body>
+</html>
diff --git a/example/old-bugs/remove-add-clustering.html b/example/old-bugs/remove-add-clustering.html
index 7ee36fc..0c4cd82 100644
--- a/example/old-bugs/remove-add-clustering.html
+++ b/example/old-bugs/remove-add-clustering.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
diff --git a/example/old-bugs/remove-when-spiderfied.html b/example/old-bugs/remove-when-spiderfied.html
index 6c674b5..c7ee262 100644
--- a/example/old-bugs/remove-when-spiderfied.html
+++ b/example/old-bugs/remove-when-spiderfied.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
@@ -23,7 +21,7 @@
<div id="map"></div>
<button id="doit">Remove and add direct to map</button><button id="doit2">clearLayers</button><br/>
<span>Bug <a href="https://github.com/danzel/Leaflet.markercluster/issues/54">#54</a>. Spiderfy the cluster then click the button. Should result in 2 markers right beside each other on the map.</span><br/>
- <span>Bug <a href="https://github.com/danzel/Leaflet.markercluster/issues/53">#53</a>. Spiderfy the cluster then click the button. Spider lines remain on the map.</span>
+ <span>Bug <a href="https://github.com/danzel/Leaflet.markercluster/issues/53">#53</a>. Spiderfy the cluster then click the button. Spider lines remain on the map.</span><br/>
<span>Bug <a href="https://github.com/danzel/Leaflet.markercluster/issues/49">#49</a>. Spiderfy the cluster then click the second button. Spider lines remain on the map. Click the map to get an error.</span>
<script type="text/javascript">
diff --git a/example/old-bugs/removelayer-after-remove-from-map.html b/example/old-bugs/removelayer-after-remove-from-map.html
new file mode 100644
index 0000000..691e8f4
--- /dev/null
+++ b/example/old-bugs/removelayer-after-remove-from-map.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Leaflet debug page</title>
+
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="../screen.css" />
+
+ <link rel="stylesheet" href="../../dist/MarkerCluster.css" />
+ <link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
+ <script src="../../src/DistanceGrid.js"></script>
+ <script src="../../src/MarkerCluster.js"></script>
+ <script src="../../src/MarkerClusterGroup.js"></script>
+ <script src="../../src/MarkerCluster.QuickHull.js"></script>
+ <script src="../../src/MarkerCluster.Spiderfier.js"></script>
+</head>
+<body>
+
+ <div id="map"></div>
+ <a href="#" onclick="swapLayers()">1 - Swap layers</a><br>
+ <a href="#" onclick="removeMarker()">2 - Remove all markers</a><br>
+ <a href="#" onclick="swapLayers()">3 - Swap layers again => Marker is still there<a/></br>
+
+ <span>Bug <a href="https://github.com/danzel/Leaflet.markercluster/issues/160">#160</a>. Click 1,2,3. There should be nothing on the map.</span><br/>
+ <script type="text/javascript">
+
+ var map = new L.Map('map');
+
+ var tilesLayer = new L.TileLayer('http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png');
+ map.addLayer(tilesLayer);
+
+ var objectBounds = [[44.98131207805678, 6.0726203025917], [44.981459751363204, 6.073026722623153]];
+ map.fitBounds(new L.LatLngBounds(objectBounds));
+
+ var markers1 = new L.MarkerClusterGroup();
+ var markers2 = new L.MarkerClusterGroup();
+
+ map.addLayer(markers1);
+
+ var aMarker = new L.Marker(new L.LatLng(44.9813, 6.072620));
+ var anotherMarker = new L.Marker(new L.LatLng(44.9814, 6.072621));
+
+ markers1.addLayer(aMarker);
+ markers2.addLayer(anotherMarker);
+
+ swapLayers = function(){
+ if (map.hasLayer(markers1)){
+ map.removeLayer(markers1);
+ map.addLayer(markers2);
+ }else{
+ map.removeLayer(markers2);
+ map.addLayer(markers1);
+ }
+ };
+
+ removeMarker = function(){
+ markers1.removeLayer(aMarker);
+ markers2.removeLayer(anotherMarker);
+ };
+
+
+ </script>
+</body>
+</html>
diff --git a/example/old-bugs/setView-doesnt-remove.html b/example/old-bugs/setView-doesnt-remove.html
index 2bca678..eb3bd25 100644
--- a/example/old-bugs/setView-doesnt-remove.html
+++ b/example/old-bugs/setView-doesnt-remove.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
diff --git a/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html b/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html
index 1fefae5..9097a12 100644
--- a/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html
+++ b/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html
@@ -3,15 +3,13 @@
<head>
<title>Leaflet debug page</title>
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
- <script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
+ <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
+ <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
- <!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..2bd70c2
--- /dev/null
+++ b/package.json
@@ -0,0 +1,21 @@
+{
+ "name": "leaflet.markercluster",
+ "version": "0.4.0",
+ "description": "Provides Beautiful Animated Marker Clustering functionality for Leaflet",
+ "dependencies": {
+ "leaflet": "~0.7.1"
+ },
+ "devDependencies": {
+ "jshint": "~2.1.3",
+ "mocha": "~1.10.0",
+ "karma": "~0.8.5",
+ "uglify-js": "~2.3.6",
+ "jake": "~0.5.16"
+ },
+ "main": "dist/leaflet.markercluster.js",
+ "scripts": {
+ "test": "jake test",
+ "prepublish": "jake"
+ },
+ "keywords": ["gis", "map"]
+}
\ No newline at end of file
diff --git a/spec/after.js b/spec/after.js
new file mode 100644
index 0000000..7dcd1d9
--- /dev/null
+++ b/spec/after.js
@@ -0,0 +1,2 @@
+// put after Leaflet files as imagePath can't be detected in a PhantomJS env
+L.Icon.Default.imagePath = "../dist/images";
diff --git a/spec/expect.js b/spec/expect.js
new file mode 100644
index 0000000..58c7049
--- /dev/null
+++ b/spec/expect.js
@@ -0,0 +1,1253 @@
+
+(function (global, module) {
+
+ if ('undefined' == typeof module) {
+ var module = { exports: {} }
+ , exports = module.exports
+ }
+
+ /**
+ * Exports.
+ */
+
+ module.exports = expect;
+ expect.Assertion = Assertion;
+
+ /**
+ * Exports version.
+ */
+
+ expect.version = '0.1.2';
+
+ /**
+ * Possible assertion flags.
+ */
+
+ var flags = {
+ not: ['to', 'be', 'have', 'include', 'only']
+ , to: ['be', 'have', 'include', 'only', 'not']
+ , only: ['have']
+ , have: ['own']
+ , be: ['an']
+ };
+
+ function expect (obj) {
+ return new Assertion(obj);
+ }
+
+ /**
+ * Constructor
+ *
+ * @api private
+ */
+
+ function Assertion (obj, flag, parent) {
+ this.obj = obj;
+ this.flags = {};
+
+ if (undefined != parent) {
+ this.flags[flag] = true;
+
+ for (var i in parent.flags) {
+ if (parent.flags.hasOwnProperty(i)) {
+ this.flags[i] = true;
+ }
+ }
+ }
+
+ var $flags = flag ? flags[flag] : keys(flags)
+ , self = this
+
+ if ($flags) {
+ for (var i = 0, l = $flags.length; i < l; i++) {
+ // avoid recursion
+ if (this.flags[$flags[i]]) continue;
+
+ var name = $flags[i]
+ , assertion = new Assertion(this.obj, name, this)
+
+ if ('function' == typeof Assertion.prototype[name]) {
+ // clone the function, make sure we dont touch the prot reference
+ var old = this[name];
+ this[name] = function () {
+ return old.apply(self, arguments);
+ }
+
+ for (var fn in Assertion.prototype) {
+ if (Assertion.prototype.hasOwnProperty(fn) && fn != name) {
+ this[name][fn] = bind(assertion[fn], assertion);
+ }
+ }
+ } else {
+ this[name] = assertion;
+ }
+ }
+ }
+ };
+
+ /**
+ * Performs an assertion
+ *
+ * @api private
+ */
+
+ Assertion.prototype.assert = function (truth, msg, error) {
+ var msg = this.flags.not ? error : msg
+ , ok = this.flags.not ? !truth : truth;
+
+ if (!ok) {
+ throw new Error(msg.call(this));
+ }
+
+ this.and = new Assertion(this.obj);
+ };
+
+ /**
+ * Check if the value is truthy
+ *
+ * @api public
+ */
+
+ Assertion.prototype.ok = function () {
+ this.assert(
+ !!this.obj
+ , function(){ return 'expected ' + i(this.obj) + ' to be truthy' }
+ , function(){ return 'expected ' + i(this.obj) + ' to be falsy' });
+ };
+
+ /**
+ * Assert that the function throws.
+ *
+ * @param {Function|RegExp} callback, or regexp to match error string against
+ * @api public
+ */
+
+ Assertion.prototype.throwError =
+ Assertion.prototype.throwException = function (fn) {
+ expect(this.obj).to.be.a('function');
+
+ var thrown = false
+ , not = this.flags.not
+
+ try {
+ this.obj();
+ } catch (e) {
+ if ('function' == typeof fn) {
+ fn(e);
+ } else if ('object' == typeof fn) {
+ var subject = 'string' == typeof e ? e : e.message;
+ if (not) {
+ expect(subject).to.not.match(fn);
+ } else {
+ expect(subject).to.match(fn);
+ }
+ }
+ thrown = true;
+ }
+
+ if ('object' == typeof fn && not) {
+ // in the presence of a matcher, ensure the `not` only applies to
+ // the matching.
+ this.flags.not = false;
+ }
+
+ var name = this.obj.name || 'fn';
+ this.assert(
+ thrown
+ , function(){ return 'expected ' + name + ' to throw an exception' }
+ , function(){ return 'expected ' + name + ' not to throw an exception' });
+ };
+
+ /**
+ * Checks if the array is empty.
+ *
+ * @api public
+ */
+
+ Assertion.prototype.empty = function () {
+ var expectation;
+
+ if ('object' == typeof this.obj && null !== this.obj && !isArray(this.obj)) {
+ if ('number' == typeof this.obj.length) {
+ expectation = !this.obj.length;
+ } else {
+ expectation = !keys(this.obj).length;
+ }
+ } else {
+ if ('string' != typeof this.obj) {
+ expect(this.obj).to.be.an('object');
+ }
+
+ expect(this.obj).to.have.property('length');
+ expectation = !this.obj.length;
+ }
+
+ this.assert(
+ expectation
+ , function(){ return 'expected ' + i(this.obj) + ' to be empty' }
+ , function(){ return 'expected ' + i(this.obj) + ' to not be empty' });
+ return this;
+ };
+
+ /**
+ * Checks if the obj exactly equals another.
+ *
+ * @api public
+ */
+
+ Assertion.prototype.be =
+ Assertion.prototype.equal = function (obj) {
+ this.assert(
+ obj === this.obj
+ , function(){ return 'expected ' + i(this.obj) + ' to equal ' + i(obj) }
+ , function(){ return 'expected ' + i(this.obj) + ' to not equal ' + i(obj) });
+ return this;
+ };
+
+ /**
+ * Checks if the obj sortof equals another.
+ *
+ * @api public
+ */
+
+ Assertion.prototype.eql = function (obj) {
+ this.assert(
+ expect.eql(obj, this.obj)
+ , function(){ return 'expected ' + i(this.obj) + ' to sort of equal ' + i(obj) }
+ , function(){ return 'expected ' + i(this.obj) + ' to sort of not equal ' + i(obj) });
+ return this;
+ };
+
+ /**
+ * Assert within start to finish (inclusive).
+ *
+ * @param {Number} start
+ * @param {Number} finish
+ * @api public
+ */
+
+ Assertion.prototype.within = function (start, finish) {
+ var range = start + '..' + finish;
+ this.assert(
+ this.obj >= start && this.obj <= finish
+ , function(){ return 'expected ' + i(this.obj) + ' to be within ' + range }
+ , function(){ return 'expected ' + i(this.obj) + ' to not be within ' + range });
+ return this;
+ };
+
+ /**
+ * Assert typeof / instance of
+ *
+ * @api public
+ */
+
+ Assertion.prototype.a =
+ Assertion.prototype.an = function (type) {
+ if ('string' == typeof type) {
+ // proper english in error msg
+ var n = /^[aeiou]/.test(type) ? 'n' : '';
+
+ // typeof with support for 'array'
+ this.assert(
+ 'array' == type ? isArray(this.obj) :
+ 'object' == type
+ ? 'object' == typeof this.obj && null !== this.obj
+ : type == typeof this.obj
+ , function(){ return 'expected ' + i(this.obj) + ' to be a' + n + ' ' + type }
+ , function(){ return 'expected ' + i(this.obj) + ' not to be a' + n + ' ' + type });
+ } else {
+ // instanceof
+ var name = type.name || 'supplied constructor';
+ this.assert(
+ this.obj instanceof type
+ , function(){ return 'expected ' + i(this.obj) + ' to be an instance of ' + name }
+ , function(){ return 'expected ' + i(this.obj) + ' not to be an instance of ' + name });
+ }
+
+ return this;
+ };
+
+ /**
+ * Assert numeric value above _n_.
+ *
+ * @param {Number} n
+ * @api public
+ */
+
+ Assertion.prototype.greaterThan =
+ Assertion.prototype.above = function (n) {
+ this.assert(
+ this.obj > n
+ , function(){ return 'expected ' + i(this.obj) + ' to be above ' + n }
+ , function(){ return 'expected ' + i(this.obj) + ' to be below ' + n });
+ return this;
+ };
+
+ /**
+ * Assert numeric value below _n_.
+ *
+ * @param {Number} n
+ * @api public
+ */
+
+ Assertion.prototype.lessThan =
+ Assertion.prototype.below = function (n) {
+ this.assert(
+ this.obj < n
+ , function(){ return 'expected ' + i(this.obj) + ' to be below ' + n }
+ , function(){ return 'expected ' + i(this.obj) + ' to be above ' + n });
+ return this;
+ };
+
+ /**
+ * Assert string value matches _regexp_.
+ *
+ * @param {RegExp} regexp
+ * @api public
+ */
+
+ Assertion.prototype.match = function (regexp) {
+ this.assert(
+ regexp.exec(this.obj)
+ , function(){ return 'expected ' + i(this.obj) + ' to match ' + regexp }
+ , function(){ return 'expected ' + i(this.obj) + ' not to match ' + regexp });
+ return this;
+ };
+
+ /**
+ * Assert property "length" exists and has value of _n_.
+ *
+ * @param {Number} n
+ * @api public
+ */
+
+ Assertion.prototype.length = function (n) {
+ expect(this.obj).to.have.property('length');
+ var len = this.obj.length;
+ this.assert(
+ n == len
+ , function(){ return 'expected ' + i(this.obj) + ' to have a length of ' + n + ' but got ' + len }
+ , function(){ return 'expected ' + i(this.obj) + ' to not have a length of ' + len });
+ return this;
+ };
+
+ /**
+ * Assert property _name_ exists, with optional _val_.
+ *
+ * @param {String} name
+ * @param {Mixed} val
+ * @api public
+ */
+
+ Assertion.prototype.property = function (name, val) {
+ if (this.flags.own) {
+ this.assert(
+ Object.prototype.hasOwnProperty.call(this.obj, name)
+ , function(){ return 'expected ' + i(this.obj) + ' to have own property ' + i(name) }
+ , function(){ return 'expected ' + i(this.obj) + ' to not have own property ' + i(name) });
+ return this;
+ }
+
+ if (this.flags.not && undefined !== val) {
+ if (undefined === this.obj[name]) {
+ throw new Error(i(this.obj) + ' has no property ' + i(name));
+ }
+ } else {
+ var hasProp;
+ try {
+ hasProp = name in this.obj
+ } catch (e) {
+ hasProp = undefined !== this.obj[name]
+ }
+
+ this.assert(
+ hasProp
+ , function(){ return 'expected ' + i(this.obj) + ' to have a property ' + i(name) }
+ , function(){ return 'expected ' + i(this.obj) + ' to not have a property ' + i(name) });
+ }
+
+ if (undefined !== val) {
+ this.assert(
+ val === this.obj[name]
+ , function(){ return 'expected ' + i(this.obj) + ' to have a property ' + i(name)
+ + ' of ' + i(val) + ', but got ' + i(this.obj[name]) }
+ , function(){ return 'expected ' + i(this.obj) + ' to not have a property ' + i(name)
+ + ' of ' + i(val) });
+ }
+
+ this.obj = this.obj[name];
+ return this;
+ };
+
+ /**
+ * Assert that the array contains _obj_ or string contains _obj_.
+ *
+ * @param {Mixed} obj|string
+ * @api public
+ */
+
+ Assertion.prototype.string =
+ Assertion.prototype.contain = function (obj) {
+ if ('string' == typeof this.obj) {
+ this.assert(
+ ~this.obj.indexOf(obj)
+ , function(){ return 'expected ' + i(this.obj) + ' to contain ' + i(obj) }
+ , function(){ return 'expected ' + i(this.obj) + ' to not contain ' + i(obj) });
+ } else {
+ this.assert(
+ ~indexOf(this.obj, obj)
+ , function(){ return 'expected ' + i(this.obj) + ' to contain ' + i(obj) }
+ , function(){ return 'expected ' + i(this.obj) + ' to not contain ' + i(obj) });
+ }
+ return this;
+ };
+
+ /**
+ * Assert exact keys or inclusion of keys by using
+ * the `.own` modifier.
+ *
+ * @param {Array|String ...} keys
+ * @api public
+ */
+
+ Assertion.prototype.key =
+ Assertion.prototype.keys = function ($keys) {
+ var str
+ , ok = true;
+
+ $keys = isArray($keys)
+ ? $keys
+ : Array.prototype.slice.call(arguments);
+
+ if (!$keys.length) throw new Error('keys required');
+
+ var actual = keys(this.obj)
+ , len = $keys.length;
+
+ // Inclusion
+ ok = every($keys, function (key) {
+ return ~indexOf(actual, key);
+ });
+
+ // Strict
+ if (!this.flags.not && this.flags.only) {
+ ok = ok && $keys.length == actual.length;
+ }
+
+ // Key string
+ if (len > 1) {
+ $keys = map($keys, function (key) {
+ return i(key);
+ });
+ var last = $keys.pop();
+ str = $keys.join(', ') + ', and ' + last;
+ } else {
+ str = i($keys[0]);
+ }
+
+ // Form
+ str = (len > 1 ? 'keys ' : 'key ') + str;
+
+ // Have / include
+ str = (!this.flags.only ? 'include ' : 'only have ') + str;
+
+ // Assertion
+ this.assert(
+ ok
+ , function(){ return 'expected ' + i(this.obj) + ' to ' + str }
+ , function(){ return 'expected ' + i(this.obj) + ' to not ' + str });
+
+ return this;
+ };
+ /**
+ * Assert a failure.
+ *
+ * @param {String ...} custom message
+ * @api public
+ */
+ Assertion.prototype.fail = function (msg) {
+ msg = msg || "explicit failure";
+ this.assert(false, msg, msg);
+ return this;
+ };
+
+ /**
+ * Function bind implementation.
+ */
+
+ function bind (fn, scope) {
+ return function () {
+ return fn.apply(scope, arguments);
+ }
+ }
+
+ /**
+ * Array every compatibility
+ *
+ * @see bit.ly/5Fq1N2
+ * @api public
+ */
+
+ function every (arr, fn, thisObj) {
+ var scope = thisObj || global;
+ for (var i = 0, j = arr.length; i < j; ++i) {
+ if (!fn.call(scope, arr[i], i, arr)) {
+ return false;
+ }
+ }
+ return true;
+ };
+
+ /**
+ * Array indexOf compatibility.
+ *
+ * @see bit.ly/a5Dxa2
+ * @api public
+ */
+
+ function indexOf (arr, o, i) {
+ if (Array.prototype.indexOf) {
+ return Array.prototype.indexOf.call(arr, o, i);
+ }
+
+ if (arr.length === undefined) {
+ return -1;
+ }
+
+ for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0
+ ; i < j && arr[i] !== o; i++);
+
+ return j <= i ? -1 : i;
+ };
+
+ // https://gist.github.com/1044128/
+ var getOuterHTML = function(element) {
+ if ('outerHTML' in element) return element.outerHTML;
+ var ns = "http://www.w3.org/1999/xhtml";
+ var container = document.createElementNS(ns, '_');
+ var elemProto = (window.HTMLElement || window.Element).prototype;
+ var xmlSerializer = new XMLSerializer();
+ var html;
+ if (document.xmlVersion) {
+ return xmlSerializer.serializeToString(element);
+ } else {
+ container.appendChild(element.cloneNode(false));
+ html = container.innerHTML.replace('><', '>' + element.innerHTML + '<');
+ container.innerHTML = '';
+ return html;
+ }
+ };
+
+ // Returns true if object is a DOM element.
+ var isDOMElement = function (object) {
+ if (typeof HTMLElement === 'object') {
+ return object instanceof HTMLElement;
+ } else {
+ return object &&
+ typeof object === 'object' &&
+ object.nodeType === 1 &&
+ typeof object.nodeName === 'string';
+ }
+ };
+
+ /**
+ * Inspects an object.
+ *
+ * @see taken from node.js `util` module (copyright Joyent, MIT license)
+ * @api private
+ */
+
+ function i (obj, showHidden, depth) {
+ var seen = [];
+
+ function stylize (str) {
+ return str;
+ };
+
+ function format (value, recurseTimes) {
+ // Provide a hook for user-specified inspect functions.
+ // Check that value is an object with an inspect function on it
+ if (value && typeof value.inspect === 'function' &&
+ // Filter out the util module, it's inspect function is special
+ value !== exports &&
+ // Also filter out any prototype objects using the circular check.
+ !(value.constructor && value.constructor.prototype === value)) {
+ return value.inspect(recurseTimes);
+ }
+
+ // Primitive types cannot have properties
+ switch (typeof value) {
+ case 'undefined':
+ return stylize('undefined', 'undefined');
+
+ case 'string':
+ var simple = '\'' + json.stringify(value).replace(/^"|"$/g, '')
+ .replace(/'/g, "\\'")
+ .replace(/\\"/g, '"') + '\'';
+ return stylize(simple, 'string');
+
+ case 'number':
+ return stylize('' + value, 'number');
+
+ case 'boolean':
+ return stylize('' + value, 'boolean');
+ }
+ // For some reason typeof null is "object", so special case here.
+ if (value === null) {
+ return stylize('null', 'null');
+ }
+
+ if (isDOMElement(value)) {
+ return getOuterHTML(value);
+ }
+
+ // Look up the keys of the object.
+ var visible_keys = keys(value);
+ var $keys = showHidden ? Object.getOwnPropertyNames(value) : visible_keys;
+
+ // Functions without properties can be shortcutted.
+ if (typeof value === 'function' && $keys.length === 0) {
+ if (isRegExp(value)) {
+ return stylize('' + value, 'regexp');
+ } else {
+ var name = value.name ? ': ' + value.name : '';
+ return stylize('[Function' + name + ']', 'special');
+ }
+ }
+
+ // Dates without properties can be shortcutted
+ if (isDate(value) && $keys.length === 0) {
+ return stylize(value.toUTCString(), 'date');
+ }
+
+ var base, type, braces;
+ // Determine the object type
+ if (isArray(value)) {
+ type = 'Array';
+ braces = ['[', ']'];
+ } else {
+ type = 'Object';
+ braces = ['{', '}'];
+ }
+
+ // Make functions say that they are functions
+ if (typeof value === 'function') {
+ var n = value.name ? ': ' + value.name : '';
+ base = (isRegExp(value)) ? ' ' + value : ' [Function' + n + ']';
+ } else {
+ base = '';
+ }
+
+ // Make dates with properties first say the date
+ if (isDate(value)) {
+ base = ' ' + value.toUTCString();
+ }
+
+ if ($keys.length === 0) {
+ return braces[0] + base + braces[1];
+ }
+
+ if (recurseTimes < 0) {
+ if (isRegExp(value)) {
+ return stylize('' + value, 'regexp');
+ } else {
+ return stylize('[Object]', 'special');
+ }
+ }
+
+ seen.push(value);
+
+ var output = map($keys, function (key) {
+ var name, str;
+ if (value.__lookupGetter__) {
+ if (value.__lookupGetter__(key)) {
+ if (value.__lookupSetter__(key)) {
+ str = stylize('[Getter/Setter]', 'special');
+ } else {
+ str = stylize('[Getter]', 'special');
+ }
+ } else {
+ if (value.__lookupSetter__(key)) {
+ str = stylize('[Setter]', 'special');
+ }
+ }
+ }
+ if (indexOf(visible_keys, key) < 0) {
+ name = '[' + key + ']';
+ }
+ if (!str) {
+ if (indexOf(seen, value[key]) < 0) {
+ if (recurseTimes === null) {
+ str = format(value[key]);
+ } else {
+ str = format(value[key], recurseTimes - 1);
+ }
+ if (str.indexOf('\n') > -1) {
+ if (isArray(value)) {
+ str = map(str.split('\n'), function (line) {
+ return ' ' + line;
+ }).join('\n').substr(2);
+ } else {
+ str = '\n' + map(str.split('\n'), function (line) {
+ return ' ' + line;
+ }).join('\n');
+ }
+ }
+ } else {
+ str = stylize('[Circular]', 'special');
+ }
+ }
+ if (typeof name === 'undefined') {
+ if (type === 'Array' && key.match(/^\d+$/)) {
+ return str;
+ }
+ name = json.stringify('' + key);
+ if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+ name = name.substr(1, name.length - 2);
+ name = stylize(name, 'name');
+ } else {
+ name = name.replace(/'/g, "\\'")
+ .replace(/\\"/g, '"')
+ .replace(/(^"|"$)/g, "'");
+ name = stylize(name, 'string');
+ }
+ }
+
+ return name + ': ' + str;
+ });
+
+ seen.pop();
+
+ var numLinesEst = 0;
+ var length = reduce(output, function (prev, cur) {
+ numLinesEst++;
+ if (indexOf(cur, '\n') >= 0) numLinesEst++;
+ return prev + cur.length + 1;
+ }, 0);
+
+ if (length > 50) {
+ output = braces[0] +
+ (base === '' ? '' : base + '\n ') +
+ ' ' +
+ output.join(',\n ') +
+ ' ' +
+ braces[1];
+
+ } else {
+ output = braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+ }
+
+ return output;
+ }
+ return format(obj, (typeof depth === 'undefined' ? 2 : depth));
+ };
+
+ function isArray (ar) {
+ return Object.prototype.toString.call(ar) == '[object Array]';
+ };
+
+ function isRegExp(re) {
+ var s;
+ try {
+ s = '' + re;
+ } catch (e) {
+ return false;
+ }
+
+ return re instanceof RegExp || // easy case
+ // duck-type for context-switching evalcx case
+ typeof(re) === 'function' &&
+ re.constructor.name === 'RegExp' &&
+ re.compile &&
+ re.test &&
+ re.exec &&
+ s.match(/^\/.*\/[gim]{0,3}$/);
+ };
+
+ function isDate(d) {
+ if (d instanceof Date) return true;
+ return false;
+ };
+
+ function keys (obj) {
+ if (Object.keys) {
+ return Object.keys(obj);
+ }
+
+ var keys = [];
+
+ for (var i in obj) {
+ if (Object.prototype.hasOwnProperty.call(obj, i)) {
+ keys.push(i);
+ }
+ }
+
+ return keys;
+ }
+
+ function map (arr, mapper, that) {
+ if (Array.prototype.map) {
+ return Array.prototype.map.call(arr, mapper, that);
+ }
+
+ var other= new Array(arr.length);
+
+ for (var i= 0, n = arr.length; i<n; i++)
+ if (i in arr)
+ other[i] = mapper.call(that, arr[i], i, arr);
+
+ return other;
+ };
+
+ function reduce (arr, fun) {
+ if (Array.prototype.reduce) {
+ return Array.prototype.reduce.apply(
+ arr
+ , Array.prototype.slice.call(arguments, 1)
+ );
+ }
+
+ var len = +this.length;
+
+ if (typeof fun !== "function")
+ throw new TypeError();
+
+ // no value to return if no initial value and an empty array
+ if (len === 0 && arguments.length === 1)
+ throw new TypeError();
+
+ var i = 0;
+ if (arguments.length >= 2) {
+ var rv = arguments[1];
+ } else {
+ do {
+ if (i in this) {
+ rv = this[i++];
+ break;
+ }
+
+ // if array contains no values, no initial value to return
+ if (++i >= len)
+ throw new TypeError();
+ } while (true);
+ }
+
+ for (; i < len; i++) {
+ if (i in this)
+ rv = fun.call(null, rv, this[i], i, this);
+ }
+
+ return rv;
+ };
+
+ /**
+ * Asserts deep equality
+ *
+ * @see taken from node.js `assert` module (copyright Joyent, MIT license)
+ * @api private
+ */
+
+ expect.eql = function eql (actual, expected) {
+ // 7.1. All identical values are equivalent, as determined by ===.
+ if (actual === expected) {
+ return true;
+ } else if ('undefined' != typeof Buffer
+ && Buffer.isBuffer(actual) && Buffer.isBuffer(expected)) {
+ if (actual.length != expected.length) return false;
+
+ for (var i = 0; i < actual.length; i++) {
+ if (actual[i] !== expected[i]) return false;
+ }
+
+ return true;
+
+ // 7.2. If the expected value is a Date object, the actual value is
+ // equivalent if it is also a Date object that refers to the same time.
+ } else if (actual instanceof Date && expected instanceof Date) {
+ return actual.getTime() === expected.getTime();
+
+ // 7.3. Other pairs that do not both pass typeof value == "object",
+ // equivalence is determined by ==.
+ } else if (typeof actual != 'object' && typeof expected != 'object') {
+ return actual == expected;
+
+ // 7.4. For all other Object pairs, including Array objects, equivalence is
+ // determined by having the same number of owned properties (as verified
+ // with Object.prototype.hasOwnProperty.call), the same set of keys
+ // (although not necessarily the same order), equivalent values for every
+ // corresponding key, and an identical "prototype" property. Note: this
+ // accounts for both named and indexed properties on Arrays.
+ } else {
+ return objEquiv(actual, expected);
+ }
+ }
+
+ function isUndefinedOrNull (value) {
+ return value === null || value === undefined;
+ }
+
+ function isArguments (object) {
+ return Object.prototype.toString.call(object) == '[object Arguments]';
+ }
+
+ function objEquiv (a, b) {
+ if (isUndefinedOrNull(a) || isUndefinedOrNull(b))
+ return false;
+ // an identical "prototype" property.
+ if (a.prototype !== b.prototype) return false;
+ //~~~I've managed to break Object.keys through screwy arguments passing.
+ // Converting to array solves the problem.
+ if (isArguments(a)) {
+ if (!isArguments(b)) {
+ return false;
+ }
+ a = pSlice.call(a);
+ b = pSlice.call(b);
+ return expect.eql(a, b);
+ }
+ try{
+ var ka = keys(a),
+ kb = keys(b),
+ key, i;
+ } catch (e) {//happens when one is a string literal and the other isn't
+ return false;
+ }
+ // having the same number of owned properties (keys incorporates hasOwnProperty)
+ if (ka.length != kb.length)
+ return false;
+ //the same set of keys (although not necessarily the same order),
+ ka.sort();
+ kb.sort();
+ //~~~cheap key test
+ for (i = ka.length - 1; i >= 0; i--) {
+ if (ka[i] != kb[i])
+ return false;
+ }
+ //equivalent values for every corresponding key, and
+ //~~~possibly expensive deep test
+ for (i = ka.length - 1; i >= 0; i--) {
+ key = ka[i];
+ if (!expect.eql(a[key], b[key]))
+ return false;
+ }
+ return true;
+ }
+
+ var json = (function () {
+ "use strict";
+
+ if ('object' == typeof JSON && JSON.parse && JSON.stringify) {
+ return {
+ parse: nativeJSON.parse
+ , stringify: nativeJSON.stringify
+ }
+ }
+
+ var JSON = {};
+
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ function date(d, key) {
+ return isFinite(d.valueOf()) ?
+ d.getUTCFullYear() + '-' +
+ f(d.getUTCMonth() + 1) + '-' +
+ f(d.getUTCDate()) + 'T' +
+ f(d.getUTCHours()) + ':' +
+ f(d.getUTCMinutes()) + ':' +
+ f(d.getUTCSeconds()) + 'Z' : null;
+ };
+
+ var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ gap,
+ indent,
+ meta = { // table of character substitutions
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '\\': '\\\\'
+ },
+ rep;
+
+
+ function quote(string) {
+
+ // If the string contains no control characters, no quote characters, and no
+ // backslash characters, then we can safely slap some quotes around it.
+ // Otherwise we must also replace the offending characters with safe escape
+ // sequences.
+
+ escapable.lastIndex = 0;
+ return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+ var c = meta[a];
+ return typeof c === 'string' ? c :
+ '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ }) + '"' : '"' + string + '"';
+ }
+
+
+ function str(key, holder) {
+
+ // Produce a string from holder[key].
+
+ var i, // The loop counter.
+ k, // The member key.
+ v, // The member value.
+ length,
+ mind = gap,
+ partial,
+ value = holder[key];
+
+ // If the value has a toJSON method, call it to obtain a replacement value.
+
+ if (value instanceof Date) {
+ value = date(key);
+ }
+
+ // If we were called with a replacer function, then call the replacer to
+ // obtain a replacement value.
+
+ if (typeof rep === 'function') {
+ value = rep.call(holder, key, value);
+ }
+
+ // What happens next depends on the value's type.
+
+ switch (typeof value) {
+ case 'string':
+ return quote(value);
+
+ case 'number':
+
+ // JSON numbers must be finite. Encode non-finite numbers as null.
+
+ return isFinite(value) ? String(value) : 'null';
+
+ case 'boolean':
+ case 'null':
+
+ // If the value is a boolean or null, convert it to a string. Note:
+ // typeof null does not produce 'null'. The case is included here in
+ // the remote chance that this gets fixed someday.
+
+ return String(value);
+
+ // If the type is 'object', we might be dealing with an object or an array or
+ // null.
+
+ case 'object':
+
+ // Due to a specification blunder in ECMAScript, typeof null is 'object',
+ // so watch out for that case.
+
+ if (!value) {
+ return 'null';
+ }
+
+ // Make an array to hold the partial results of stringifying this object value.
+
+ gap += indent;
+ partial = [];
+
+ // Is the value an array?
+
+ if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+ // The value is an array. Stringify every element. Use null as a placeholder
+ // for non-JSON values.
+
+ length = value.length;
+ for (i = 0; i < length; i += 1) {
+ partial[i] = str(i, value) || 'null';
+ }
+
+ // Join all of the elements together, separated with commas, and wrap them in
+ // brackets.
+
+ v = partial.length === 0 ? '[]' : gap ?
+ '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
+ '[' + partial.join(',') + ']';
+ gap = mind;
+ return v;
+ }
+
+ // If the replacer is an array, use it to select the members to be stringified.
+
+ if (rep && typeof rep === 'object') {
+ length = rep.length;
+ for (i = 0; i < length; i += 1) {
+ if (typeof rep[i] === 'string') {
+ k = rep[i];
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ } else {
+
+ // Otherwise, iterate through all of the keys in the object.
+
+ for (k in value) {
+ if (Object.prototype.hasOwnProperty.call(value, k)) {
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ }
+
+ // Join all of the member texts together, separated with commas,
+ // and wrap them in braces.
+
+ v = partial.length === 0 ? '{}' : gap ?
+ '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
+ '{' + partial.join(',') + '}';
+ gap = mind;
+ return v;
+ }
+ }
+
+ // If the JSON object does not yet have a stringify method, give it one.
+
+ JSON.stringify = function (value, replacer, space) {
+
+ // The stringify method takes a value and an optional replacer, and an optional
+ // space parameter, and returns a JSON text. The replacer can be a function
+ // that can replace values, or an array of strings that will select the keys.
+ // A default replacer method can be provided. Use of the space parameter can
+ // produce text that is more easily readable.
+
+ var i;
+ gap = '';
+ indent = '';
+
+ // If the space parameter is a number, make an indent string containing that
+ // many spaces.
+
+ if (typeof space === 'number') {
+ for (i = 0; i < space; i += 1) {
+ indent += ' ';
+ }
+
+ // If the space parameter is a string, it will be used as the indent string.
+
+ } else if (typeof space === 'string') {
+ indent = space;
+ }
+
+ // If there is a replacer, it must be a function or an array.
+ // Otherwise, throw an error.
+
+ rep = replacer;
+ if (replacer && typeof replacer !== 'function' &&
+ (typeof replacer !== 'object' ||
+ typeof replacer.length !== 'number')) {
+ throw new Error('JSON.stringify');
+ }
+
+ // Make a fake root object containing our value under the key of ''.
+ // Return the result of stringifying the value.
+
+ return str('', {'': value});
+ };
+
+ // If the JSON object does not yet have a parse method, give it one.
+
+ JSON.parse = function (text, reviver) {
+ // The parse method takes a text and an optional reviver function, and returns
+ // a JavaScript value if the text is a valid JSON text.
+
+ var j;
+
+ function walk(holder, key) {
+
+ // The walk method is used to recursively walk the resulting structure so
+ // that modifications can be made.
+
+ var k, v, value = holder[key];
+ if (value && typeof value === 'object') {
+ for (k in value) {
+ if (Object.prototype.hasOwnProperty.call(value, k)) {
+ v = walk(value, k);
+ if (v !== undefined) {
+ value[k] = v;
+ } else {
+ delete value[k];
+ }
+ }
+ }
+ }
+ return reviver.call(holder, key, value);
+ }
+
+
+ // Parsing happens in four stages. In the first stage, we replace certain
+ // Unicode characters with escape sequences. JavaScript handles many characters
+ // incorrectly, either silently deleting them, or treating them as line endings.
+
+ text = String(text);
+ cx.lastIndex = 0;
+ if (cx.test(text)) {
+ text = text.replace(cx, function (a) {
+ return '\\u' +
+ ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ });
+ }
+
+ // In the second stage, we run the text against regular expressions that look
+ // for non-JSON patterns. We are especially concerned with '()' and 'new'
+ // because they can cause invocation, and '=' because it can cause mutation.
+ // But just to be safe, we want to reject all unexpected forms.
+
+ // We split the second stage into 4 regexp operations in order to work around
+ // crippling inefficiencies in IE's and Safari's regexp engines. First we
+ // replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+ // replace all simple value tokens with ']' characters. Third, we delete all
+ // open brackets that follow a colon or comma or that begin the text. Finally,
+ // we look to see that the remaining characters are only whitespace or ']' or
+ // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+ if (/^[\],:{}\s]*$/
+ .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+ .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+ .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+ // In the third stage we use the eval function to compile the text into a
+ // JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+ // in JavaScript: it can begin a block or an object literal. We wrap the text
+ // in parens to eliminate the ambiguity.
+
+ j = eval('(' + text + ')');
+
+ // In the optional fourth stage, we recursively walk the new structure, passing
+ // each name/value pair to a reviver function for possible transformation.
+
+ return typeof reviver === 'function' ?
+ walk({'': j}, '') : j;
+ }
+
+ // If the text is not JSON parseable, then a SyntaxError is thrown.
+
+ throw new SyntaxError('JSON.parse');
+ };
+
+ return JSON;
+ })();
+
+ if ('undefined' != typeof window) {
+ window.expect = module.exports;
+ }
+
+})(
+ this
+ , 'undefined' != typeof module ? module : {}
+ , 'undefined' != typeof exports ? exports : {}
+);
diff --git a/spec/happen.js b/spec/happen.js
new file mode 100644
index 0000000..874285f
--- /dev/null
+++ b/spec/happen.js
@@ -0,0 +1,93 @@
+// https://github.com/tmcw/happen
+
+!(function(context) {
+ var h = {};
+
+ // Make inheritance bearable: clone one level of properties
+ function extend(child, parent) {
+ for (var property in parent) {
+ if (typeof child[property] == 'undefined') {
+ child[property] = parent[property];
+ }
+ }
+ return child;
+ }
+
+ h.once = function(x, o) {
+ var evt;
+
+ if (o.type.slice(0, 3) === 'key') {
+ if (typeof Event === 'function') {
+ evt = new Event(o.type);
+ evt.keyCode = o.keyCode || 0;
+ evt.charCode = o.charCode || 0;
+ evt.shift = o.shift || false;
+ evt.meta = o.meta || false;
+ evt.ctrl = o.ctrl || false;
+ evt.alt = o.alt || false;
+ } else {
+ evt = document.createEvent('KeyboardEvent');
+ // https://developer.mozilla.org/en/DOM/event.initKeyEvent
+ // https://developer.mozilla.org/en/DOM/KeyboardEvent
+ evt[(evt.initKeyEvent) ? 'initKeyEvent'
+ : 'initKeyboardEvent'](
+ o.type, // in DOMString typeArg,
+ true, // in boolean canBubbleArg,
+ true, // in boolean cancelableArg,
+ null, // in nsIDOMAbstractView viewArg, Specifies UIEvent.view. This value may be null.
+ o.ctrl || false, // in boolean ctrlKeyArg,
+ o.alt || false, // in boolean altKeyArg,
+ o.shift || false, // in boolean shiftKeyArg,
+ o.meta || false, // in boolean metaKeyArg,
+ o.keyCode || 0, // in unsigned long keyCodeArg,
+ o.charCode || 0 // in unsigned long charCodeArg);
+ );
+ }
+ } else {
+ evt = document.createEvent('MouseEvents');
+ // https://developer.mozilla.org/en/DOM/event.initMouseEvent
+ evt.initMouseEvent(o.type,
+ true, // canBubble
+ true, // cancelable
+ window, // 'AbstractView'
+ o.clicks || 0, // click count
+ o.screenX || 0, // screenX
+ o.screenY || 0, // screenY
+ o.clientX || 0, // clientX
+ o.clientY || 0, // clientY
+ o.ctrl || 0, // ctrl
+ o.alt || false, // alt
+ o.shift || false, // shift
+ o.meta || false, // meta
+ o.button || false, // mouse button
+ null // relatedTarget
+ );
+ }
+
+ x.dispatchEvent(evt);
+ };
+
+ var shortcuts = ['click', 'mousedown', 'mouseup', 'mousemove', 'keydown', 'keyup', 'keypress'],
+ s, i = 0;
+
+ while (s = shortcuts[i++]) {
+ h[s] = (function(s) {
+ return function(x, o) {
+ h.once(x, extend(o || {}, { type: s }));
+ };
+ })(s);
+ }
+
+ h.dblclick = function(x, o) {
+ h.once(x, extend(o || {}, {
+ type: 'dblclick',
+ clicks: 2
+ }));
+ };
+
+ this.happen = h;
+
+ if (typeof module !== 'undefined') {
+ module.exports = this.happen;
+ }
+})(this);
diff --git a/spec/index.html b/spec/index.html
new file mode 100644
index 0000000..42ad45b
--- /dev/null
+++ b/spec/index.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Spec Runner</title>
+ <link rel="stylesheet" type="text/css" href="../node_modules/mocha/mocha.css">
+</head>
+<body>
+ <div id="mocha"></div>
+ <script src="expect.js"></script>
+ <script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
+ <script type="text/javascript" src="happen.js"></script>
+ <script type="text/javascript" src="sinon.js"></script>
+ <script type="text/javascript" src="../node_modules/leaflet/dist/leaflet-src.js"></script>
+
+ <!-- source files -->
+ <script type="text/javascript" src="../src/DistanceGrid.js"></script>
+ <script type="text/javascript" src="../src/MarkerCluster.js"></script>
+ <script type="text/javascript" src="../src/MarkerClusterGroup.js"></script>
+ <script type="text/javascript" src="../src/MarkerCluster.QuickHull.js"></script>
+ <script type="text/javascript" src="../src/MarkerCluster.Spiderfier.js"></script>
+
+ <script>
+ mocha.setup('bdd');
+ mocha.ignoreLeaks();
+ </script>
+
+ <!-- spec files -->
+
+ <script type="text/javascript" src="suites/SpecHelper.js"></script>
+
+ <script type="text/javascript" src="suites/LeafletSpec.js"></script>
+
+ <script type="text/javascript" src="suites/AddLayer.MultipleSpec.js"></script>
+ <script type="text/javascript" src="suites/AddLayer.SingleSpec.js"></script>
+ <script type="text/javascript" src="suites/AddLayersSpec.js"></script>
+
+ <script type="text/javascript" src="suites/ChildChangingIconSupportSpec.js"></script>
+
+ <script type="text/javascript" src="suites/CircleMarkerSupportSpec.js"></script>
+ <script type="text/javascript" src="suites/CircleSupportSpec.js"></script>
+
+ <script type="text/javascript" src="suites/onAddSpec.js"></script>
+ <script type="text/javascript" src="suites/onRemoveSpec.js"></script>
+ <script type="text/javascript" src="suites/clearLayersSpec.js"></script>
+ <script type="text/javascript" src="suites/eachLayerSpec.js"></script>
+ <script type="text/javascript" src="suites/eventsSpec.js"></script>
+ <script type="text/javascript" src="suites/getBoundsSpec.js"></script>
+ <script type="text/javascript" src="suites/getLayersSpec.js"></script>
+ <script type="text/javascript" src="suites/getVisibleParentSpec.js"></script>
+
+ <script type="text/javascript" src="suites/NonPointSpec.js"></script>
+
+ <script type="text/javascript" src="suites/RemoveLayerSpec.js"></script>
+ <script type="text/javascript" src="suites/spiderfySpec.js"></script>
+ <script type="text/javascript" src="suites/zoomAnimationSpec.js"></script>
+
+ <script>
+ (window.mochaPhantomJS || window.mocha).run();
+ </script>
+</body>
+</html>
diff --git a/spec/karma.conf.js b/spec/karma.conf.js
new file mode 100644
index 0000000..dc64d62
--- /dev/null
+++ b/spec/karma.conf.js
@@ -0,0 +1,67 @@
+// Karma configuration
+var libSources = require(__dirname+'/../build/build.js').getFiles();
+var leafletSources = require(__dirname+'/../node_modules/leaflet/build/build.js').getFiles();
+
+// base path, that will be used to resolve files and exclude
+basePath = '';
+
+for (var i=0; i < libSources.length; i++) {
+ libSources[i] = "../" + libSources[i];
+}
+for (var i=0; i < leafletSources.length; i++) {
+ leafletSources[i] = "../node_modules/leaflet/" + leafletSources[i];
+}
+
+// list of files / patterns to load in the browser
+files = [].concat([
+ "../node_modules/mocha/mocha.js",
+ MOCHA_ADAPTER,
+ "sinon.js",
+ "expect.js"
+], leafletSources, libSources, [
+ "after.js",
+ "happen.js",
+ "suites/SpecHelper.js",
+ "suites/**/*.js"
+]);
+
+// list of files to exclude
+exclude = [
+];
+
+// test results reporter to use
+// possible values: 'dots', 'progress', 'junit'
+reporters = ['dots'];
+
+// web server port
+port = 8080;
+
+// cli runner port
+runnerPort = 9100;
+
+// enable / disable colors in the output (reporters and logs)
+colors = true;
+
+// level of logging
+// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
+logLevel = LOG_WARN;
+
+// enable / disable watching file and executing tests whenever any file changes
+autoWatch = false;
+
+// Start these browsers, currently available:
+// - Chrome
+// - ChromeCanary
+// - Firefox
+// - Opera
+// - Safari (only Mac)
+// - PhantomJS
+// - IE (only Windows)
+browsers = ['PhantomJS'];
+
+// If browser does not capture in given timeout [ms], kill it
+captureTimeout = 5000;
+
+// Continuous Integration mode
+// if true, it capture browsers, run tests and exit
+singleRun = true;
diff --git a/spec/sinon.js b/spec/sinon.js
new file mode 100644
index 0000000..d08a0e0
--- /dev/null
+++ b/spec/sinon.js
@@ -0,0 +1,4223 @@
+/**
+ * Sinon.JS 1.6.0, 2013/02/18
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
+ *
+ * (The BSD License)
+ *
+ * Copyright (c) 2010-2013, Christian Johansen, christian at cjohansen.no
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of Christian Johansen nor the names of his contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var sinon = (function () {
+"use strict";
+
+var buster = (function (setTimeout, B) {
+ var isNode = typeof require == "function" && typeof module == "object";
+ var div = typeof document != "undefined" && document.createElement("div");
+ var F = function () {};
+
+ var buster = {
+ bind: function bind(obj, methOrProp) {
+ var method = typeof methOrProp == "string" ? obj[methOrProp] : methOrProp;
+ var args = Array.prototype.slice.call(arguments, 2);
+ return function () {
+ var allArgs = args.concat(Array.prototype.slice.call(arguments));
+ return method.apply(obj, allArgs);
+ };
+ },
+
+ partial: function partial(fn) {
+ var args = [].slice.call(arguments, 1);
+ return function () {
+ return fn.apply(this, args.concat([].slice.call(arguments)));
+ };
+ },
+
+ create: function create(object) {
+ F.prototype = object;
+ return new F();
+ },
+
+ extend: function extend(target) {
+ if (!target) { return; }
+ for (var i = 1, l = arguments.length, prop; i < l; ++i) {
+ for (prop in arguments[i]) {
+ target[prop] = arguments[i][prop];
+ }
+ }
+ return target;
+ },
+
+ nextTick: function nextTick(callback) {
+ if (typeof process != "undefined" && process.nextTick) {
+ return process.nextTick(callback);
+ }
+ setTimeout(callback, 0);
+ },
+
+ functionName: function functionName(func) {
+ if (!func) return "";
+ if (func.displayName) return func.displayName;
+ if (func.name) return func.name;
+ var matches = func.toString().match(/function\s+([^\(]+)/m);
+ return matches && matches[1] || "";
+ },
+
+ isNode: function isNode(obj) {
+ if (!div) return false;
+ try {
+ obj.appendChild(div);
+ obj.removeChild(div);
+ } catch (e) {
+ return false;
+ }
+ return true;
+ },
+
+ isElement: function isElement(obj) {
+ return obj && obj.nodeType === 1 && buster.isNode(obj);
+ },
+
+ isArray: function isArray(arr) {
+ return Object.prototype.toString.call(arr) == "[object Array]";
+ },
+
+ flatten: function flatten(arr) {
+ var result = [], arr = arr || [];
+ for (var i = 0, l = arr.length; i < l; ++i) {
+ result = result.concat(buster.isArray(arr[i]) ? flatten(arr[i]) : arr[i]);
+ }
+ return result;
+ },
+
+ each: function each(arr, callback) {
+ for (var i = 0, l = arr.length; i < l; ++i) {
+ callback(arr[i]);
+ }
+ },
+
+ map: function map(arr, callback) {
+ var results = [];
+ for (var i = 0, l = arr.length; i < l; ++i) {
+ results.push(callback(arr[i]));
+ }
+ return results;
+ },
+
+ parallel: function parallel(fns, callback) {
+ function cb(err, res) {
+ if (typeof callback == "function") {
+ callback(err, res);
+ callback = null;
+ }
+ }
+ if (fns.length == 0) { return cb(null, []); }
+ var remaining = fns.length, results = [];
+ function makeDone(num) {
+ return function done(err, result) {
+ if (err) { return cb(err); }
+ results[num] = result;
+ if (--remaining == 0) { cb(null, results); }
+ };
+ }
+ for (var i = 0, l = fns.length; i < l; ++i) {
+ fns[i](makeDone(i));
+ }
+ },
+
+ series: function series(fns, callback) {
+ function cb(err, res) {
+ if (typeof callback == "function") {
+ callback(err, res);
+ }
+ }
+ var remaining = fns.slice();
+ var results = [];
+ function callNext() {
+ if (remaining.length == 0) return cb(null, results);
+ var promise = remaining.shift()(next);
+ if (promise && typeof promise.then == "function") {
+ promise.then(buster.partial(next, null), next);
+ }
+ }
+ function next(err, result) {
+ if (err) return cb(err);
+ results.push(result);
+ callNext();
+ }
+ callNext();
+ },
+
+ countdown: function countdown(num, done) {
+ return function () {
+ if (--num == 0) done();
+ };
+ }
+ };
+
+ if (typeof process === "object" &&
+ typeof require === "function" && typeof module === "object") {
+ var crypto = require("crypto");
+ var path = require("path");
+
+ buster.tmpFile = function (fileName) {
+ var hashed = crypto.createHash("sha1");
+ hashed.update(fileName);
+ var tmpfileName = hashed.digest("hex");
+
+ if (process.platform == "win32") {
+ return path.join(process.env["TEMP"], tmpfileName);
+ } else {
+ return path.join("/tmp", tmpfileName);
+ }
+ };
+ }
+
+ if (Array.prototype.some) {
+ buster.some = function (arr, fn, thisp) {
+ return arr.some(fn, thisp);
+ };
+ } else {
+ // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+ buster.some = function (arr, fun, thisp) {
+ if (arr == null) { throw new TypeError(); }
+ arr = Object(arr);
+ var len = arr.length >>> 0;
+ if (typeof fun !== "function") { throw new TypeError(); }
+
+ for (var i = 0; i < len; i++) {
+ if (arr.hasOwnProperty(i) && fun.call(thisp, arr[i], i, arr)) {
+ return true;
+ }
+ }
+
+ return false;
+ };
+ }
+
+ if (Array.prototype.filter) {
+ buster.filter = function (arr, fn, thisp) {
+ return arr.filter(fn, thisp);
+ };
+ } else {
+ // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/filter
+ buster.filter = function (fn, thisp) {
+ if (this == null) { throw new TypeError(); }
+
+ var t = Object(this);
+ var len = t.length >>> 0;
+ if (typeof fn != "function") { throw new TypeError(); }
+
+ var res = [];
+ for (var i = 0; i < len; i++) {
+ if (i in t) {
+ var val = t[i]; // in case fun mutates this
+ if (fn.call(thisp, val, i, t)) { res.push(val); }
+ }
+ }
+
+ return res;
+ };
+ }
+
+ if (isNode) {
+ module.exports = buster;
+ buster.eventEmitter = require("./buster-event-emitter");
+ Object.defineProperty(buster, "defineVersionGetter", {
+ get: function () {
+ return require("./define-version-getter");
+ }
+ });
+ }
+
+ return buster.extend(B || {}, buster);
+}(setTimeout, buster));
+if (typeof buster === "undefined") {
+ var buster = {};
+}
+
+if (typeof module === "object" && typeof require === "function") {
+ buster = require("buster-core");
+}
+
+buster.format = buster.format || {};
+buster.format.excludeConstructors = ["Object", /^.$/];
+buster.format.quoteStrings = true;
+
+buster.format.ascii = (function () {
+
+ var hasOwn = Object.prototype.hasOwnProperty;
+
+ var specialObjects = [];
+ if (typeof global != "undefined") {
+ specialObjects.push({ obj: global, value: "[object global]" });
+ }
+ if (typeof document != "undefined") {
+ specialObjects.push({ obj: document, value: "[object HTMLDocument]" });
+ }
+ if (typeof window != "undefined") {
+ specialObjects.push({ obj: window, value: "[object Window]" });
+ }
+
+ function keys(object) {
+ var k = Object.keys && Object.keys(object) || [];
+
+ if (k.length == 0) {
+ for (var prop in object) {
+ if (hasOwn.call(object, prop)) {
+ k.push(prop);
+ }
+ }
+ }
+
+ return k.sort();
+ }
+
+ function isCircular(object, objects) {
+ if (typeof object != "object") {
+ return false;
+ }
+
+ for (var i = 0, l = objects.length; i < l; ++i) {
+ if (objects[i] === object) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ function ascii(object, processed, indent) {
+ if (typeof object == "string") {
+ var quote = typeof this.quoteStrings != "boolean" || this.quoteStrings;
+ return processed || quote ? '"' + object + '"' : object;
+ }
+
+ if (typeof object == "function" && !(object instanceof RegExp)) {
+ return ascii.func(object);
+ }
+
+ processed = processed || [];
+
+ if (isCircular(object, processed)) {
+ return "[Circular]";
+ }
+
+ if (Object.prototype.toString.call(object) == "[object Array]") {
+ return ascii.array.call(this, object, processed);
+ }
+
+ if (!object) {
+ return "" + object;
+ }
+
+ if (buster.isElement(object)) {
+ return ascii.element(object);
+ }
+
+ if (typeof object.toString == "function" &&
+ object.toString !== Object.prototype.toString) {
+ return object.toString();
+ }
+
+ for (var i = 0, l = specialObjects.length; i < l; i++) {
+ if (object === specialObjects[i].obj) {
+ return specialObjects[i].value;
+ }
+ }
+
+ return ascii.object.call(this, object, processed, indent);
+ }
+
+ ascii.func = function (func) {
+ return "function " + buster.functionName(func) + "() {}";
+ };
+
+ ascii.array = function (array, processed) {
+ processed = processed || [];
+ processed.push(array);
+ var pieces = [];
+
+ for (var i = 0, l = array.length; i < l; ++i) {
+ pieces.push(ascii.call(this, array[i], processed));
+ }
+
+ return "[" + pieces.join(", ") + "]";
+ };
+
+ ascii.object = function (object, processed, indent) {
+ processed = processed || [];
+ processed.push(object);
+ indent = indent || 0;
+ var pieces = [], properties = keys(object), prop, str, obj;
+ var is = "";
+ var length = 3;
+
+ for (var i = 0, l = indent; i < l; ++i) {
+ is += " ";
+ }
+
+ for (i = 0, l = properties.length; i < l; ++i) {
+ prop = properties[i];
+ obj = object[prop];
+
+ if (isCircular(obj, processed)) {
+ str = "[Circular]";
+ } else {
+ str = ascii.call(this, obj, processed, indent + 2);
+ }
+
+ str = (/\s/.test(prop) ? '"' + prop + '"' : prop) + ": " + str;
+ length += str.length;
+ pieces.push(str);
+ }
+
+ var cons = ascii.constructorName.call(this, object);
+ var prefix = cons ? "[" + cons + "] " : ""
+
+ return (length + indent) > 80 ?
+ prefix + "{\n " + is + pieces.join(",\n " + is) + "\n" + is + "}" :
+ prefix + "{ " + pieces.join(", ") + " }";
+ };
+
+ ascii.element = function (element) {
+ var tagName = element.tagName.toLowerCase();
+ var attrs = element.attributes, attribute, pairs = [], attrName;
+
+ for (var i = 0, l = attrs.length; i < l; ++i) {
+ attribute = attrs.item(i);
+ attrName = attribute.nodeName.toLowerCase().replace("html:", "");
+
+ if (attrName == "contenteditable" && attribute.nodeValue == "inherit") {
+ continue;
+ }
+
+ if (!!attribute.nodeValue) {
+ pairs.push(attrName + "=\"" + attribute.nodeValue + "\"");
+ }
+ }
+
+ var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
+ var content = element.innerHTML;
+
+ if (content.length > 20) {
+ content = content.substr(0, 20) + "[...]";
+ }
+
+ var res = formatted + pairs.join(" ") + ">" + content + "</" + tagName + ">";
+
+ return res.replace(/ contentEditable="inherit"/, "");
+ };
+
+ ascii.constructorName = function (object) {
+ var name = buster.functionName(object && object.constructor);
+ var excludes = this.excludeConstructors || buster.format.excludeConstructors || [];
+
+ for (var i = 0, l = excludes.length; i < l; ++i) {
+ if (typeof excludes[i] == "string" && excludes[i] == name) {
+ return "";
+ } else if (excludes[i].test && excludes[i].test(name)) {
+ return "";
+ }
+ }
+
+ return name;
+ };
+
+ return ascii;
+}());
+
+if (typeof module != "undefined") {
+ module.exports = buster.format;
+}
+/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
+/*global module, require, __dirname, document*/
+/**
+ * Sinon core utilities. For internal use only.
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+var sinon = (function (buster) {
+ var div = typeof document != "undefined" && document.createElement("div");
+ var hasOwn = Object.prototype.hasOwnProperty;
+
+ function isDOMNode(obj) {
+ var success = false;
+
+ try {
+ obj.appendChild(div);
+ success = div.parentNode == obj;
+ } catch (e) {
+ return false;
+ } finally {
+ try {
+ obj.removeChild(div);
+ } catch (e) {
+ // Remove failed, not much we can do about that
+ }
+ }
+
+ return success;
+ }
+
+ function isElement(obj) {
+ return div && obj && obj.nodeType === 1 && isDOMNode(obj);
+ }
+
+ function isFunction(obj) {
+ return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
+ }
+
+ function mirrorProperties(target, source) {
+ for (var prop in source) {
+ if (!hasOwn.call(target, prop)) {
+ target[prop] = source[prop];
+ }
+ }
+ }
+
+ var sinon = {
+ wrapMethod: function wrapMethod(object, property, method) {
+ if (!object) {
+ throw new TypeError("Should wrap property of object");
+ }
+
+ if (typeof method != "function") {
+ throw new TypeError("Method wrapper should be function");
+ }
+
+ var wrappedMethod = object[property];
+
+ if (!isFunction(wrappedMethod)) {
+ throw new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
+ property + " as function");
+ }
+
+ if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
+ throw new TypeError("Attempted to wrap " + property + " which is already wrapped");
+ }
+
+ if (wrappedMethod.calledBefore) {
+ var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
+ throw new TypeError("Attempted to wrap " + property + " which is already " + verb);
+ }
+
+ // IE 8 does not support hasOwnProperty on the window object.
+ var owned = hasOwn.call(object, property);
+ object[property] = method;
+ method.displayName = property;
+
+ method.restore = function () {
+ // For prototype properties try to reset by delete first.
+ // If this fails (ex: localStorage on mobile safari) then force a reset
+ // via direct assignment.
+ if (!owned) {
+ delete object[property];
+ }
+ if (object[property] === method) {
+ object[property] = wrappedMethod;
+ }
+ };
+
+ method.restore.sinon = true;
+ mirrorProperties(method, wrappedMethod);
+
+ return method;
+ },
+
+ extend: function extend(target) {
+ for (var i = 1, l = arguments.length; i < l; i += 1) {
+ for (var prop in arguments[i]) {
+ if (arguments[i].hasOwnProperty(prop)) {
+ target[prop] = arguments[i][prop];
+ }
+
+ // DONT ENUM bug, only care about toString
+ if (arguments[i].hasOwnProperty("toString") &&
+ arguments[i].toString != target.toString) {
+ target.toString = arguments[i].toString;
+ }
+ }
+ }
+
+ return target;
+ },
+
+ create: function create(proto) {
+ var F = function () {};
+ F.prototype = proto;
+ return new F();
+ },
+
+ deepEqual: function deepEqual(a, b) {
+ if (sinon.match && sinon.match.isMatcher(a)) {
+ return a.test(b);
+ }
+ if (typeof a != "object" || typeof b != "object") {
+ return a === b;
+ }
+
+ if (isElement(a) || isElement(b)) {
+ return a === b;
+ }
+
+ if (a === b) {
+ return true;
+ }
+
+ if ((a === null && b !== null) || (a !== null && b === null)) {
+ return false;
+ }
+
+ var aString = Object.prototype.toString.call(a);
+ if (aString != Object.prototype.toString.call(b)) {
+ return false;
+ }
+
+ if (aString == "[object Array]") {
+ if (a.length !== b.length) {
+ return false;
+ }
+
+ for (var i = 0, l = a.length; i < l; i += 1) {
+ if (!deepEqual(a[i], b[i])) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ var prop, aLength = 0, bLength = 0;
+
+ for (prop in a) {
+ aLength += 1;
+
+ if (!deepEqual(a[prop], b[prop])) {
+ return false;
+ }
+ }
+
+ for (prop in b) {
+ bLength += 1;
+ }
+
+ if (aLength != bLength) {
+ return false;
+ }
+
+ return true;
+ },
+
+ functionName: function functionName(func) {
+ var name = func.displayName || func.name;
+
+ // Use function decomposition as a last resort to get function
+ // name. Does not rely on function decomposition to work - if it
+ // doesn't debugging will be slightly less informative
+ // (i.e. toString will say 'spy' rather than 'myFunc').
+ if (!name) {
+ var matches = func.toString().match(/function ([^\s\(]+)/);
+ name = matches && matches[1];
+ }
+
+ return name;
+ },
+
+ functionToString: function toString() {
+ if (this.getCall && this.callCount) {
+ var thisValue, prop, i = this.callCount;
+
+ while (i--) {
+ thisValue = this.getCall(i).thisValue;
+
+ for (prop in thisValue) {
+ if (thisValue[prop] === this) {
+ return prop;
+ }
+ }
+ }
+ }
+
+ return this.displayName || "sinon fake";
+ },
+
+ getConfig: function (custom) {
+ var config = {};
+ custom = custom || {};
+ var defaults = sinon.defaultConfig;
+
+ for (var prop in defaults) {
+ if (defaults.hasOwnProperty(prop)) {
+ config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
+ }
+ }
+
+ return config;
+ },
+
+ format: function (val) {
+ return "" + val;
+ },
+
+ defaultConfig: {
+ injectIntoThis: true,
+ injectInto: null,
+ properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+ useFakeTimers: true,
+ useFakeServer: true
+ },
+
+ timesInWords: function timesInWords(count) {
+ return count == 1 && "once" ||
+ count == 2 && "twice" ||
+ count == 3 && "thrice" ||
+ (count || 0) + " times";
+ },
+
+ calledInOrder: function (spies) {
+ for (var i = 1, l = spies.length; i < l; i++) {
+ if (!spies[i - 1].calledBefore(spies[i]) || !spies[i].called) {
+ return false;
+ }
+ }
+
+ return true;
+ },
+
+ orderByFirstCall: function (spies) {
+ return spies.sort(function (a, b) {
+ // uuid, won't ever be equal
+ var aCall = a.getCall(0);
+ var bCall = b.getCall(0);
+ var aId = aCall && aCall.callId || -1;
+ var bId = bCall && bCall.callId || -1;
+
+ return aId < bId ? -1 : 1;
+ });
+ },
+
+ log: function () {},
+
+ logError: function (label, err) {
+ var msg = label + " threw exception: "
+ sinon.log(msg + "[" + err.name + "] " + err.message);
+ if (err.stack) { sinon.log(err.stack); }
+
+ setTimeout(function () {
+ err.message = msg + err.message;
+ throw err;
+ }, 0);
+ },
+
+ typeOf: function (value) {
+ if (value === null) {
+ return "null";
+ }
+ else if (value === undefined) {
+ return "undefined";
+ }
+ var string = Object.prototype.toString.call(value);
+ return string.substring(8, string.length - 1).toLowerCase();
+ },
+
+ createStubInstance: function (constructor) {
+ if (typeof constructor !== "function") {
+ throw new TypeError("The constructor should be a function.");
+ }
+ return sinon.stub(sinon.create(constructor.prototype));
+ }
+ };
+
+ var isNode = typeof module == "object" && typeof require == "function";
+
+ if (isNode) {
+ try {
+ buster = { format: require("buster-format") };
+ } catch (e) {}
+ module.exports = sinon;
+ module.exports.spy = require("./sinon/spy");
+ module.exports.stub = require("./sinon/stub");
+ module.exports.mock = require("./sinon/mock");
+ module.exports.collection = require("./sinon/collection");
+ module.exports.assert = require("./sinon/assert");
+ module.exports.sandbox = require("./sinon/sandbox");
+ module.exports.test = require("./sinon/test");
+ module.exports.testCase = require("./sinon/test_case");
+ module.exports.assert = require("./sinon/assert");
+ module.exports.match = require("./sinon/match");
+ }
+
+ if (buster) {
+ var formatter = sinon.create(buster.format);
+ formatter.quoteStrings = false;
+ sinon.format = function () {
+ return formatter.ascii.apply(formatter, arguments);
+ };
+ } else if (isNode) {
+ try {
+ var util = require("util");
+ sinon.format = function (value) {
+ return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
+ };
+ } catch (e) {
+ /* Node, but no util module - would be very old, but better safe than
+ sorry */
+ }
+ }
+
+ return sinon;
+}(typeof buster == "object" && buster));
+
+/* @depend ../sinon.js */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Match functions
+ *
+ * @author Maximilian Antoni (mail at maxantoni.de)
+ * @license BSD
+ *
+ * Copyright (c) 2012 Maximilian Antoni
+ */
+
+(function (sinon) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon) {
+ return;
+ }
+
+ function assertType(value, type, name) {
+ var actual = sinon.typeOf(value);
+ if (actual !== type) {
+ throw new TypeError("Expected type of " + name + " to be " +
+ type + ", but was " + actual);
+ }
+ }
+
+ var matcher = {
+ toString: function () {
+ return this.message;
+ }
+ };
+
+ function isMatcher(object) {
+ return matcher.isPrototypeOf(object);
+ }
+
+ function matchObject(expectation, actual) {
+ if (actual === null || actual === undefined) {
+ return false;
+ }
+ for (var key in expectation) {
+ if (expectation.hasOwnProperty(key)) {
+ var exp = expectation[key];
+ var act = actual[key];
+ if (match.isMatcher(exp)) {
+ if (!exp.test(act)) {
+ return false;
+ }
+ } else if (sinon.typeOf(exp) === "object") {
+ if (!matchObject(exp, act)) {
+ return false;
+ }
+ } else if (!sinon.deepEqual(exp, act)) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ matcher.or = function (m2) {
+ if (!isMatcher(m2)) {
+ throw new TypeError("Matcher expected");
+ }
+ var m1 = this;
+ var or = sinon.create(matcher);
+ or.test = function (actual) {
+ return m1.test(actual) || m2.test(actual);
+ };
+ or.message = m1.message + ".or(" + m2.message + ")";
+ return or;
+ };
+
+ matcher.and = function (m2) {
+ if (!isMatcher(m2)) {
+ throw new TypeError("Matcher expected");
+ }
+ var m1 = this;
+ var and = sinon.create(matcher);
+ and.test = function (actual) {
+ return m1.test(actual) && m2.test(actual);
+ };
+ and.message = m1.message + ".and(" + m2.message + ")";
+ return and;
+ };
+
+ var match = function (expectation, message) {
+ var m = sinon.create(matcher);
+ var type = sinon.typeOf(expectation);
+ switch (type) {
+ case "object":
+ if (typeof expectation.test === "function") {
+ m.test = function (actual) {
+ return expectation.test(actual) === true;
+ };
+ m.message = "match(" + sinon.functionName(expectation.test) + ")";
+ return m;
+ }
+ var str = [];
+ for (var key in expectation) {
+ if (expectation.hasOwnProperty(key)) {
+ str.push(key + ": " + expectation[key]);
+ }
+ }
+ m.test = function (actual) {
+ return matchObject(expectation, actual);
+ };
+ m.message = "match(" + str.join(", ") + ")";
+ break;
+ case "number":
+ m.test = function (actual) {
+ return expectation == actual;
+ };
+ break;
+ case "string":
+ m.test = function (actual) {
+ if (typeof actual !== "string") {
+ return false;
+ }
+ return actual.indexOf(expectation) !== -1;
+ };
+ m.message = "match(\"" + expectation + "\")";
+ break;
+ case "regexp":
+ m.test = function (actual) {
+ if (typeof actual !== "string") {
+ return false;
+ }
+ return expectation.test(actual);
+ };
+ break;
+ case "function":
+ m.test = expectation;
+ if (message) {
+ m.message = message;
+ } else {
+ m.message = "match(" + sinon.functionName(expectation) + ")";
+ }
+ break;
+ default:
+ m.test = function (actual) {
+ return sinon.deepEqual(expectation, actual);
+ };
+ }
+ if (!m.message) {
+ m.message = "match(" + expectation + ")";
+ }
+ return m;
+ };
+
+ match.isMatcher = isMatcher;
+
+ match.any = match(function () {
+ return true;
+ }, "any");
+
+ match.defined = match(function (actual) {
+ return actual !== null && actual !== undefined;
+ }, "defined");
+
+ match.truthy = match(function (actual) {
+ return !!actual;
+ }, "truthy");
+
+ match.falsy = match(function (actual) {
+ return !actual;
+ }, "falsy");
+
+ match.same = function (expectation) {
+ return match(function (actual) {
+ return expectation === actual;
+ }, "same(" + expectation + ")");
+ };
+
+ match.typeOf = function (type) {
+ assertType(type, "string", "type");
+ return match(function (actual) {
+ return sinon.typeOf(actual) === type;
+ }, "typeOf(\"" + type + "\")");
+ };
+
+ match.instanceOf = function (type) {
+ assertType(type, "function", "type");
+ return match(function (actual) {
+ return actual instanceof type;
+ }, "instanceOf(" + sinon.functionName(type) + ")");
+ };
+
+ function createPropertyMatcher(propertyTest, messagePrefix) {
+ return function (property, value) {
+ assertType(property, "string", "property");
+ var onlyProperty = arguments.length === 1;
+ var message = messagePrefix + "(\"" + property + "\"";
+ if (!onlyProperty) {
+ message += ", " + value;
+ }
+ message += ")";
+ return match(function (actual) {
+ if (actual === undefined || actual === null ||
+ !propertyTest(actual, property)) {
+ return false;
+ }
+ return onlyProperty || sinon.deepEqual(value, actual[property]);
+ }, message);
+ };
+ }
+
+ match.has = createPropertyMatcher(function (actual, property) {
+ if (typeof actual === "object") {
+ return property in actual;
+ }
+ return actual[property] !== undefined;
+ }, "has");
+
+ match.hasOwn = createPropertyMatcher(function (actual, property) {
+ return actual.hasOwnProperty(property);
+ }, "hasOwn");
+
+ match.bool = match.typeOf("boolean");
+ match.number = match.typeOf("number");
+ match.string = match.typeOf("string");
+ match.object = match.typeOf("object");
+ match.func = match.typeOf("function");
+ match.array = match.typeOf("array");
+ match.regexp = match.typeOf("regexp");
+ match.date = match.typeOf("date");
+
+ if (commonJSModule) {
+ module.exports = match;
+ } else {
+ sinon.match = match;
+ }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend match.js
+ */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Spy functions
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+ var spyCall;
+ var callId = 0;
+ var push = [].push;
+ var slice = Array.prototype.slice;
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon) {
+ return;
+ }
+
+ function spy(object, property) {
+ if (!property && typeof object == "function") {
+ return spy.create(object);
+ }
+
+ if (!object && !property) {
+ return spy.create(function () { });
+ }
+
+ var method = object[property];
+ return sinon.wrapMethod(object, property, spy.create(method));
+ }
+
+ sinon.extend(spy, (function () {
+
+ function delegateToCalls(api, method, matchAny, actual, notCalled) {
+ api[method] = function () {
+ if (!this.called) {
+ if (notCalled) {
+ return notCalled.apply(this, arguments);
+ }
+ return false;
+ }
+
+ var currentCall;
+ var matches = 0;
+
+ for (var i = 0, l = this.callCount; i < l; i += 1) {
+ currentCall = this.getCall(i);
+
+ if (currentCall[actual || method].apply(currentCall, arguments)) {
+ matches += 1;
+
+ if (matchAny) {
+ return true;
+ }
+ }
+ }
+
+ return matches === this.callCount;
+ };
+ }
+
+ function matchingFake(fakes, args, strict) {
+ if (!fakes) {
+ return;
+ }
+
+ var alen = args.length;
+
+ for (var i = 0, l = fakes.length; i < l; i++) {
+ if (fakes[i].matches(args, strict)) {
+ return fakes[i];
+ }
+ }
+ }
+
+ function incrementCallCount() {
+ this.called = true;
+ this.callCount += 1;
+ this.notCalled = false;
+ this.calledOnce = this.callCount == 1;
+ this.calledTwice = this.callCount == 2;
+ this.calledThrice = this.callCount == 3;
+ }
+
+ function createCallProperties() {
+ this.firstCall = this.getCall(0);
+ this.secondCall = this.getCall(1);
+ this.thirdCall = this.getCall(2);
+ this.lastCall = this.getCall(this.callCount - 1);
+ }
+
+ var vars = "a,b,c,d,e,f,g,h,i,j,k,l";
+ function createProxy(func) {
+ // Retain the function length:
+ var p;
+ if (func.length) {
+ eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
+ ") { return p.invoke(func, this, slice.call(arguments)); });");
+ }
+ else {
+ p = function proxy() {
+ return p.invoke(func, this, slice.call(arguments));
+ };
+ }
+ return p;
+ }
+
+ var uuid = 0;
+
+ // Public API
+ var spyApi = {
+ reset: function () {
+ this.called = false;
+ this.notCalled = true;
+ this.calledOnce = false;
+ this.calledTwice = false;
+ this.calledThrice = false;
+ this.callCount = 0;
+ this.firstCall = null;
+ this.secondCall = null;
+ this.thirdCall = null;
+ this.lastCall = null;
+ this.args = [];
+ this.returnValues = [];
+ this.thisValues = [];
+ this.exceptions = [];
+ this.callIds = [];
+ if (this.fakes) {
+ for (var i = 0; i < this.fakes.length; i++) {
+ this.fakes[i].reset();
+ }
+ }
+ },
+
+ create: function create(func) {
+ var name;
+
+ if (typeof func != "function") {
+ func = function () { };
+ } else {
+ name = sinon.functionName(func);
+ }
+
+ var proxy = createProxy(func);
+
+ sinon.extend(proxy, spy);
+ delete proxy.create;
+ sinon.extend(proxy, func);
+
+ proxy.reset();
+ proxy.prototype = func.prototype;
+ proxy.displayName = name || "spy";
+ proxy.toString = sinon.functionToString;
+ proxy._create = sinon.spy.create;
+ proxy.id = "spy#" + uuid++;
+
+ return proxy;
+ },
+
+ invoke: function invoke(func, thisValue, args) {
+ var matching = matchingFake(this.fakes, args);
+ var exception, returnValue;
+
+ incrementCallCount.call(this);
+ push.call(this.thisValues, thisValue);
+ push.call(this.args, args);
+ push.call(this.callIds, callId++);
+
+ try {
+ if (matching) {
+ returnValue = matching.invoke(func, thisValue, args);
+ } else {
+ returnValue = (this.func || func).apply(thisValue, args);
+ }
+ } catch (e) {
+ push.call(this.returnValues, undefined);
+ exception = e;
+ throw e;
+ } finally {
+ push.call(this.exceptions, exception);
+ }
+
+ push.call(this.returnValues, returnValue);
+
+ createCallProperties.call(this);
+
+ return returnValue;
+ },
+
+ getCall: function getCall(i) {
+ if (i < 0 || i >= this.callCount) {
+ return null;
+ }
+
+ return spyCall.create(this, this.thisValues[i], this.args[i],
+ this.returnValues[i], this.exceptions[i],
+ this.callIds[i]);
+ },
+
+ calledBefore: function calledBefore(spyFn) {
+ if (!this.called) {
+ return false;
+ }
+
+ if (!spyFn.called) {
+ return true;
+ }
+
+ return this.callIds[0] < spyFn.callIds[spyFn.callIds.length - 1];
+ },
+
+ calledAfter: function calledAfter(spyFn) {
+ if (!this.called || !spyFn.called) {
+ return false;
+ }
+
+ return this.callIds[this.callCount - 1] > spyFn.callIds[spyFn.callCount - 1];
+ },
+
+ withArgs: function () {
+ var args = slice.call(arguments);
+
+ if (this.fakes) {
+ var match = matchingFake(this.fakes, args, true);
+
+ if (match) {
+ return match;
+ }
+ } else {
+ this.fakes = [];
+ }
+
+ var original = this;
+ var fake = this._create();
+ fake.matchingAguments = args;
+ push.call(this.fakes, fake);
+
+ fake.withArgs = function () {
+ return original.withArgs.apply(original, arguments);
+ };
+
+ for (var i = 0; i < this.args.length; i++) {
+ if (fake.matches(this.args[i])) {
+ incrementCallCount.call(fake);
+ push.call(fake.thisValues, this.thisValues[i]);
+ push.call(fake.args, this.args[i]);
+ push.call(fake.returnValues, this.returnValues[i]);
+ push.call(fake.exceptions, this.exceptions[i]);
+ push.call(fake.callIds, this.callIds[i]);
+ }
+ }
+ createCallProperties.call(fake);
+
+ return fake;
+ },
+
+ matches: function (args, strict) {
+ var margs = this.matchingAguments;
+
+ if (margs.length <= args.length &&
+ sinon.deepEqual(margs, args.slice(0, margs.length))) {
+ return !strict || margs.length == args.length;
+ }
+ },
+
+ printf: function (format) {
+ var spy = this;
+ var args = slice.call(arguments, 1);
+ var formatter;
+
+ return (format || "").replace(/%(.)/g, function (match, specifyer) {
+ formatter = spyApi.formatters[specifyer];
+
+ if (typeof formatter == "function") {
+ return formatter.call(null, spy, args);
+ } else if (!isNaN(parseInt(specifyer), 10)) {
+ return sinon.format(args[specifyer - 1]);
+ }
+
+ return "%" + specifyer;
+ });
+ }
+ };
+
+ delegateToCalls(spyApi, "calledOn", true);
+ delegateToCalls(spyApi, "alwaysCalledOn", false, "calledOn");
+ delegateToCalls(spyApi, "calledWith", true);
+ delegateToCalls(spyApi, "calledWithMatch", true);
+ delegateToCalls(spyApi, "alwaysCalledWith", false, "calledWith");
+ delegateToCalls(spyApi, "alwaysCalledWithMatch", false, "calledWithMatch");
+ delegateToCalls(spyApi, "calledWithExactly", true);
+ delegateToCalls(spyApi, "alwaysCalledWithExactly", false, "calledWithExactly");
+ delegateToCalls(spyApi, "neverCalledWith", false, "notCalledWith",
+ function () { return true; });
+ delegateToCalls(spyApi, "neverCalledWithMatch", false, "notCalledWithMatch",
+ function () { return true; });
+ delegateToCalls(spyApi, "threw", true);
+ delegateToCalls(spyApi, "alwaysThrew", false, "threw");
+ delegateToCalls(spyApi, "returned", true);
+ delegateToCalls(spyApi, "alwaysReturned", false, "returned");
+ delegateToCalls(spyApi, "calledWithNew", true);
+ delegateToCalls(spyApi, "alwaysCalledWithNew", false, "calledWithNew");
+ delegateToCalls(spyApi, "callArg", false, "callArgWith", function () {
+ throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+ });
+ spyApi.callArgWith = spyApi.callArg;
+ delegateToCalls(spyApi, "callArgOn", false, "callArgOnWith", function () {
+ throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+ });
+ spyApi.callArgOnWith = spyApi.callArgOn;
+ delegateToCalls(spyApi, "yield", false, "yield", function () {
+ throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+ });
+ // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
+ spyApi.invokeCallback = spyApi.yield;
+ delegateToCalls(spyApi, "yieldOn", false, "yieldOn", function () {
+ throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+ });
+ delegateToCalls(spyApi, "yieldTo", false, "yieldTo", function (property) {
+ throw new Error(this.toString() + " cannot yield to '" + property +
+ "' since it was not yet invoked.");
+ });
+ delegateToCalls(spyApi, "yieldToOn", false, "yieldToOn", function (property) {
+ throw new Error(this.toString() + " cannot yield to '" + property +
+ "' since it was not yet invoked.");
+ });
+
+ spyApi.formatters = {
+ "c": function (spy) {
+ return sinon.timesInWords(spy.callCount);
+ },
+
+ "n": function (spy) {
+ return spy.toString();
+ },
+
+ "C": function (spy) {
+ var calls = [];
+
+ for (var i = 0, l = spy.callCount; i < l; ++i) {
+ var stringifiedCall = " " + spy.getCall(i).toString();
+ if (/\n/.test(calls[i - 1])) {
+ stringifiedCall = "\n" + stringifiedCall;
+ }
+ push.call(calls, stringifiedCall);
+ }
+
+ return calls.length > 0 ? "\n" + calls.join("\n") : "";
+ },
+
+ "t": function (spy) {
+ var objects = [];
+
+ for (var i = 0, l = spy.callCount; i < l; ++i) {
+ push.call(objects, sinon.format(spy.thisValues[i]));
+ }
+
+ return objects.join(", ");
+ },
+
+ "*": function (spy, args) {
+ var formatted = [];
+
+ for (var i = 0, l = args.length; i < l; ++i) {
+ push.call(formatted, sinon.format(args[i]));
+ }
+
+ return formatted.join(", ");
+ }
+ };
+
+ return spyApi;
+ }()));
+
+ spyCall = (function () {
+
+ function throwYieldError(proxy, text, args) {
+ var msg = sinon.functionName(proxy) + text;
+ if (args.length) {
+ msg += " Received [" + slice.call(args).join(", ") + "]";
+ }
+ throw new Error(msg);
+ }
+
+ var callApi = {
+ create: function create(spy, thisValue, args, returnValue, exception, id) {
+ var proxyCall = sinon.create(spyCall);
+ delete proxyCall.create;
+ proxyCall.proxy = spy;
+ proxyCall.thisValue = thisValue;
+ proxyCall.args = args;
+ proxyCall.returnValue = returnValue;
+ proxyCall.exception = exception;
+ proxyCall.callId = typeof id == "number" && id || callId++;
+
+ return proxyCall;
+ },
+
+ calledOn: function calledOn(thisValue) {
+ if (sinon.match && sinon.match.isMatcher(thisValue)) {
+ return thisValue.test(this.thisValue);
+ }
+ return this.thisValue === thisValue;
+ },
+
+ calledWith: function calledWith() {
+ for (var i = 0, l = arguments.length; i < l; i += 1) {
+ if (!sinon.deepEqual(arguments[i], this.args[i])) {
+ return false;
+ }
+ }
+
+ return true;
+ },
+
+ calledWithMatch: function calledWithMatch() {
+ for (var i = 0, l = arguments.length; i < l; i += 1) {
+ var actual = this.args[i];
+ var expectation = arguments[i];
+ if (!sinon.match || !sinon.match(expectation).test(actual)) {
+ return false;
+ }
+ }
+ return true;
+ },
+
+ calledWithExactly: function calledWithExactly() {
+ return arguments.length == this.args.length &&
+ this.calledWith.apply(this, arguments);
+ },
+
+ notCalledWith: function notCalledWith() {
+ return !this.calledWith.apply(this, arguments);
+ },
+
+ notCalledWithMatch: function notCalledWithMatch() {
+ return !this.calledWithMatch.apply(this, arguments);
+ },
+
+ returned: function returned(value) {
+ return sinon.deepEqual(value, this.returnValue);
+ },
+
+ threw: function threw(error) {
+ if (typeof error == "undefined" || !this.exception) {
+ return !!this.exception;
+ }
+
+ if (typeof error == "string") {
+ return this.exception.name == error;
+ }
+
+ return this.exception === error;
+ },
+
+ calledWithNew: function calledWithNew(thisValue) {
+ return this.thisValue instanceof this.proxy;
+ },
+
+ calledBefore: function (other) {
+ return this.callId < other.callId;
+ },
+
+ calledAfter: function (other) {
+ return this.callId > other.callId;
+ },
+
+ callArg: function (pos) {
+ this.args[pos]();
+ },
+
+ callArgOn: function (pos, thisValue) {
+ this.args[pos].apply(thisValue);
+ },
+
+ callArgWith: function (pos) {
+ this.callArgOnWith.apply(this, [pos, null].concat(slice.call(arguments, 1)));
+ },
+
+ callArgOnWith: function (pos, thisValue) {
+ var args = slice.call(arguments, 2);
+ this.args[pos].apply(thisValue, args);
+ },
+
+ "yield": function () {
+ this.yieldOn.apply(this, [null].concat(slice.call(arguments, 0)));
+ },
+
+ yieldOn: function (thisValue) {
+ var args = this.args;
+ for (var i = 0, l = args.length; i < l; ++i) {
+ if (typeof args[i] === "function") {
+ args[i].apply(thisValue, slice.call(arguments, 1));
+ return;
+ }
+ }
+ throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
+ },
+
+ yieldTo: function (prop) {
+ this.yieldToOn.apply(this, [prop, null].concat(slice.call(arguments, 1)));
+ },
+
+ yieldToOn: function (prop, thisValue) {
+ var args = this.args;
+ for (var i = 0, l = args.length; i < l; ++i) {
+ if (args[i] && typeof args[i][prop] === "function") {
+ args[i][prop].apply(thisValue, slice.call(arguments, 2));
+ return;
+ }
+ }
+ throwYieldError(this.proxy, " cannot yield to '" + prop +
+ "' since no callback was passed.", args);
+ },
+
+ toString: function () {
+ var callStr = this.proxy.toString() + "(";
+ var args = [];
+
+ for (var i = 0, l = this.args.length; i < l; ++i) {
+ push.call(args, sinon.format(this.args[i]));
+ }
+
+ callStr = callStr + args.join(", ") + ")";
+
+ if (typeof this.returnValue != "undefined") {
+ callStr += " => " + sinon.format(this.returnValue);
+ }
+
+ if (this.exception) {
+ callStr += " !" + this.exception.name;
+
+ if (this.exception.message) {
+ callStr += "(" + this.exception.message + ")";
+ }
+ }
+
+ return callStr;
+ }
+ };
+ callApi.invokeCallback = callApi.yield;
+ return callApi;
+ }());
+
+ spy.spyCall = spyCall;
+
+ // This steps outside the module sandbox and will be removed
+ sinon.spyCall = spyCall;
+
+ if (commonJSModule) {
+ module.exports = spy;
+ } else {
+ sinon.spy = spy;
+ }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend spy.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global module, require, sinon*/
+/**
+ * Stub functions
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon) {
+ return;
+ }
+
+ function stub(object, property, func) {
+ if (!!func && typeof func != "function") {
+ throw new TypeError("Custom stub should be function");
+ }
+
+ var wrapper;
+
+ if (func) {
+ wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
+ } else {
+ wrapper = stub.create();
+ }
+
+ if (!object && !property) {
+ return sinon.stub.create();
+ }
+
+ if (!property && !!object && typeof object == "object") {
+ for (var prop in object) {
+ if (typeof object[prop] === "function") {
+ stub(object, prop);
+ }
+ }
+
+ return object;
+ }
+
+ return sinon.wrapMethod(object, property, wrapper);
+ }
+
+ function getChangingValue(stub, property) {
+ var index = stub.callCount - 1;
+ var values = stub[property];
+ var prop = index in values ? values[index] : values[values.length - 1];
+ stub[property + "Last"] = prop;
+
+ return prop;
+ }
+
+ function getCallback(stub, args) {
+ var callArgAt = getChangingValue(stub, "callArgAts");
+
+ if (callArgAt < 0) {
+ var callArgProp = getChangingValue(stub, "callArgProps");
+
+ for (var i = 0, l = args.length; i < l; ++i) {
+ if (!callArgProp && typeof args[i] == "function") {
+ return args[i];
+ }
+
+ if (callArgProp && args[i] &&
+ typeof args[i][callArgProp] == "function") {
+ return args[i][callArgProp];
+ }
+ }
+
+ return null;
+ }
+
+ return args[callArgAt];
+ }
+
+ var join = Array.prototype.join;
+
+ function getCallbackError(stub, func, args) {
+ if (stub.callArgAtsLast < 0) {
+ var msg;
+
+ if (stub.callArgPropsLast) {
+ msg = sinon.functionName(stub) +
+ " expected to yield to '" + stub.callArgPropsLast +
+ "', but no object with such a property was passed."
+ } else {
+ msg = sinon.functionName(stub) +
+ " expected to yield, but no callback was passed."
+ }
+
+ if (args.length > 0) {
+ msg += " Received [" + join.call(args, ", ") + "]";
+ }
+
+ return msg;
+ }
+
+ return "argument at index " + stub.callArgAtsLast + " is not a function: " + func;
+ }
+
+ var nextTick = (function () {
+ if (typeof process === "object" && typeof process.nextTick === "function") {
+ return process.nextTick;
+ } else if (typeof setImmediate === "function") {
+ return setImmediate;
+ } else {
+ return function (callback) {
+ setTimeout(callback, 0);
+ };
+ }
+ })();
+
+ function callCallback(stub, args) {
+ if (stub.callArgAts.length > 0) {
+ var func = getCallback(stub, args);
+
+ if (typeof func != "function") {
+ throw new TypeError(getCallbackError(stub, func, args));
+ }
+
+ var callbackArguments = getChangingValue(stub, "callbackArguments");
+ var callbackContext = getChangingValue(stub, "callbackContexts");
+
+ if (stub.callbackAsync) {
+ nextTick(function() {
+ func.apply(callbackContext, callbackArguments);
+ });
+ } else {
+ func.apply(callbackContext, callbackArguments);
+ }
+ }
+ }
+
+ var uuid = 0;
+
+ sinon.extend(stub, (function () {
+ var slice = Array.prototype.slice, proto;
+
+ function throwsException(error, message) {
+ if (typeof error == "string") {
+ this.exception = new Error(message || "");
+ this.exception.name = error;
+ } else if (!error) {
+ this.exception = new Error("Error");
+ } else {
+ this.exception = error;
+ }
+
+ return this;
+ }
+
+ proto = {
+ create: function create() {
+ var functionStub = function () {
+
+ callCallback(functionStub, arguments);
+
+ if (functionStub.exception) {
+ throw functionStub.exception;
+ } else if (typeof functionStub.returnArgAt == 'number') {
+ return arguments[functionStub.returnArgAt];
+ } else if (functionStub.returnThis) {
+ return this;
+ }
+ return functionStub.returnValue;
+ };
+
+ functionStub.id = "stub#" + uuid++;
+ var orig = functionStub;
+ functionStub = sinon.spy.create(functionStub);
+ functionStub.func = orig;
+
+ functionStub.callArgAts = [];
+ functionStub.callbackArguments = [];
+ functionStub.callbackContexts = [];
+ functionStub.callArgProps = [];
+
+ sinon.extend(functionStub, stub);
+ functionStub._create = sinon.stub.create;
+ functionStub.displayName = "stub";
+ functionStub.toString = sinon.functionToString;
+
+ return functionStub;
+ },
+
+ resetBehavior: function () {
+ var i;
+
+ this.callArgAts = [];
+ this.callbackArguments = [];
+ this.callbackContexts = [];
+ this.callArgProps = [];
+
+ delete this.returnValue;
+ delete this.returnArgAt;
+ this.returnThis = false;
+
+ if (this.fakes) {
+ for (i = 0; i < this.fakes.length; i++) {
+ this.fakes[i].resetBehavior();
+ }
+ }
+ },
+
+ returns: function returns(value) {
+ this.returnValue = value;
+
+ return this;
+ },
+
+ returnsArg: function returnsArg(pos) {
+ if (typeof pos != "number") {
+ throw new TypeError("argument index is not number");
+ }
+
+ this.returnArgAt = pos;
+
+ return this;
+ },
+
+ returnsThis: function returnsThis() {
+ this.returnThis = true;
+
+ return this;
+ },
+
+ "throws": throwsException,
+ throwsException: throwsException,
+
+ callsArg: function callsArg(pos) {
+ if (typeof pos != "number") {
+ throw new TypeError("argument index is not number");
+ }
+
+ this.callArgAts.push(pos);
+ this.callbackArguments.push([]);
+ this.callbackContexts.push(undefined);
+ this.callArgProps.push(undefined);
+
+ return this;
+ },
+
+ callsArgOn: function callsArgOn(pos, context) {
+ if (typeof pos != "number") {
+ throw new TypeError("argument index is not number");
+ }
+ if (typeof context != "object") {
+ throw new TypeError("argument context is not an object");
+ }
+
+ this.callArgAts.push(pos);
+ this.callbackArguments.push([]);
+ this.callbackContexts.push(context);
+ this.callArgProps.push(undefined);
+
+ return this;
+ },
+
+ callsArgWith: function callsArgWith(pos) {
+ if (typeof pos != "number") {
+ throw new TypeError("argument index is not number");
+ }
+
+ this.callArgAts.push(pos);
+ this.callbackArguments.push(slice.call(arguments, 1));
+ this.callbackContexts.push(undefined);
+ this.callArgProps.push(undefined);
+
+ return this;
+ },
+
+ callsArgOnWith: function callsArgWith(pos, context) {
+ if (typeof pos != "number") {
+ throw new TypeError("argument index is not number");
+ }
+ if (typeof context != "object") {
+ throw new TypeError("argument context is not an object");
+ }
+
+ this.callArgAts.push(pos);
+ this.callbackArguments.push(slice.call(arguments, 2));
+ this.callbackContexts.push(context);
+ this.callArgProps.push(undefined);
+
+ return this;
+ },
+
+ yields: function () {
+ this.callArgAts.push(-1);
+ this.callbackArguments.push(slice.call(arguments, 0));
+ this.callbackContexts.push(undefined);
+ this.callArgProps.push(undefined);
+
+ return this;
+ },
+
+ yieldsOn: function (context) {
+ if (typeof context != "object") {
+ throw new TypeError("argument context is not an object");
+ }
+
+ this.callArgAts.push(-1);
+ this.callbackArguments.push(slice.call(arguments, 1));
+ this.callbackContexts.push(context);
+ this.callArgProps.push(undefined);
+
+ return this;
+ },
+
+ yieldsTo: function (prop) {
+ this.callArgAts.push(-1);
+ this.callbackArguments.push(slice.call(arguments, 1));
+ this.callbackContexts.push(undefined);
+ this.callArgProps.push(prop);
+
+ return this;
+ },
+
+ yieldsToOn: function (prop, context) {
+ if (typeof context != "object") {
+ throw new TypeError("argument context is not an object");
+ }
+
+ this.callArgAts.push(-1);
+ this.callbackArguments.push(slice.call(arguments, 2));
+ this.callbackContexts.push(context);
+ this.callArgProps.push(prop);
+
+ return this;
+ }
+ };
+
+ // create asynchronous versions of callsArg* and yields* methods
+ for (var method in proto) {
+ // need to avoid creating anotherasync versions of the newly added async methods
+ if (proto.hasOwnProperty(method) &&
+ method.match(/^(callsArg|yields|thenYields$)/) &&
+ !method.match(/Async/)) {
+ proto[method + 'Async'] = (function (syncFnName) {
+ return function () {
+ this.callbackAsync = true;
+ return this[syncFnName].apply(this, arguments);
+ };
+ })(method);
+ }
+ }
+
+ return proto;
+
+ }()));
+
+ if (commonJSModule) {
+ module.exports = stub;
+ } else {
+ sinon.stub = stub;
+ }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false*/
+/*global module, require, sinon*/
+/**
+ * Mock functions.
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+ var push = [].push;
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon) {
+ return;
+ }
+
+ function mock(object) {
+ if (!object) {
+ return sinon.expectation.create("Anonymous mock");
+ }
+
+ return mock.create(object);
+ }
+
+ sinon.mock = mock;
+
+ sinon.extend(mock, (function () {
+ function each(collection, callback) {
+ if (!collection) {
+ return;
+ }
+
+ for (var i = 0, l = collection.length; i < l; i += 1) {
+ callback(collection[i]);
+ }
+ }
+
+ return {
+ create: function create(object) {
+ if (!object) {
+ throw new TypeError("object is null");
+ }
+
+ var mockObject = sinon.extend({}, mock);
+ mockObject.object = object;
+ delete mockObject.create;
+
+ return mockObject;
+ },
+
+ expects: function expects(method) {
+ if (!method) {
+ throw new TypeError("method is falsy");
+ }
+
+ if (!this.expectations) {
+ this.expectations = {};
+ this.proxies = [];
+ }
+
+ if (!this.expectations[method]) {
+ this.expectations[method] = [];
+ var mockObject = this;
+
+ sinon.wrapMethod(this.object, method, function () {
+ return mockObject.invokeMethod(method, this, arguments);
+ });
+
+ push.call(this.proxies, method);
+ }
+
+ var expectation = sinon.expectation.create(method);
+ push.call(this.expectations[method], expectation);
+
+ return expectation;
+ },
+
+ restore: function restore() {
+ var object = this.object;
+
+ each(this.proxies, function (proxy) {
+ if (typeof object[proxy].restore == "function") {
+ object[proxy].restore();
+ }
+ });
+ },
+
+ verify: function verify() {
+ var expectations = this.expectations || {};
+ var messages = [], met = [];
+
+ each(this.proxies, function (proxy) {
+ each(expectations[proxy], function (expectation) {
+ if (!expectation.met()) {
+ push.call(messages, expectation.toString());
+ } else {
+ push.call(met, expectation.toString());
+ }
+ });
+ });
+
+ this.restore();
+
+ if (messages.length > 0) {
+ sinon.expectation.fail(messages.concat(met).join("\n"));
+ } else {
+ sinon.expectation.pass(messages.concat(met).join("\n"));
+ }
+
+ return true;
+ },
+
+ invokeMethod: function invokeMethod(method, thisValue, args) {
+ var expectations = this.expectations && this.expectations[method];
+ var length = expectations && expectations.length || 0, i;
+
+ for (i = 0; i < length; i += 1) {
+ if (!expectations[i].met() &&
+ expectations[i].allowsCall(thisValue, args)) {
+ return expectations[i].apply(thisValue, args);
+ }
+ }
+
+ var messages = [], available, exhausted = 0;
+
+ for (i = 0; i < length; i += 1) {
+ if (expectations[i].allowsCall(thisValue, args)) {
+ available = available || expectations[i];
+ } else {
+ exhausted += 1;
+ }
+ push.call(messages, " " + expectations[i].toString());
+ }
+
+ if (exhausted === 0) {
+ return available.apply(thisValue, args);
+ }
+
+ messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
+ proxy: method,
+ args: args
+ }));
+
+ sinon.expectation.fail(messages.join("\n"));
+ }
+ };
+ }()));
+
+ var times = sinon.timesInWords;
+
+ sinon.expectation = (function () {
+ var slice = Array.prototype.slice;
+ var _invoke = sinon.spy.invoke;
+
+ function callCountInWords(callCount) {
+ if (callCount == 0) {
+ return "never called";
+ } else {
+ return "called " + times(callCount);
+ }
+ }
+
+ function expectedCallCountInWords(expectation) {
+ var min = expectation.minCalls;
+ var max = expectation.maxCalls;
+
+ if (typeof min == "number" && typeof max == "number") {
+ var str = times(min);
+
+ if (min != max) {
+ str = "at least " + str + " and at most " + times(max);
+ }
+
+ return str;
+ }
+
+ if (typeof min == "number") {
+ return "at least " + times(min);
+ }
+
+ return "at most " + times(max);
+ }
+
+ function receivedMinCalls(expectation) {
+ var hasMinLimit = typeof expectation.minCalls == "number";
+ return !hasMinLimit || expectation.callCount >= expectation.minCalls;
+ }
+
+ function receivedMaxCalls(expectation) {
+ if (typeof expectation.maxCalls != "number") {
+ return false;
+ }
+
+ return expectation.callCount == expectation.maxCalls;
+ }
+
+ return {
+ minCalls: 1,
+ maxCalls: 1,
+
+ create: function create(methodName) {
+ var expectation = sinon.extend(sinon.stub.create(), sinon.expectation);
+ delete expectation.create;
+ expectation.method = methodName;
+
+ return expectation;
+ },
+
+ invoke: function invoke(func, thisValue, args) {
+ this.verifyCallAllowed(thisValue, args);
+
+ return _invoke.apply(this, arguments);
+ },
+
+ atLeast: function atLeast(num) {
+ if (typeof num != "number") {
+ throw new TypeError("'" + num + "' is not number");
+ }
+
+ if (!this.limitsSet) {
+ this.maxCalls = null;
+ this.limitsSet = true;
+ }
+
+ this.minCalls = num;
+
+ return this;
+ },
+
+ atMost: function atMost(num) {
+ if (typeof num != "number") {
+ throw new TypeError("'" + num + "' is not number");
+ }
+
+ if (!this.limitsSet) {
+ this.minCalls = null;
+ this.limitsSet = true;
+ }
+
+ this.maxCalls = num;
+
+ return this;
+ },
+
+ never: function never() {
+ return this.exactly(0);
+ },
+
+ once: function once() {
+ return this.exactly(1);
+ },
+
+ twice: function twice() {
+ return this.exactly(2);
+ },
+
+ thrice: function thrice() {
+ return this.exactly(3);
+ },
+
+ exactly: function exactly(num) {
+ if (typeof num != "number") {
+ throw new TypeError("'" + num + "' is not a number");
+ }
+
+ this.atLeast(num);
+ return this.atMost(num);
+ },
+
+ met: function met() {
+ return !this.failed && receivedMinCalls(this);
+ },
+
+ verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
+ if (receivedMaxCalls(this)) {
+ this.failed = true;
+ sinon.expectation.fail(this.method + " already called " + times(this.maxCalls));
+ }
+
+ if ("expectedThis" in this && this.expectedThis !== thisValue) {
+ sinon.expectation.fail(this.method + " called with " + thisValue + " as thisValue, expected " +
+ this.expectedThis);
+ }
+
+ if (!("expectedArguments" in this)) {
+ return;
+ }
+
+ if (!args) {
+ sinon.expectation.fail(this.method + " received no arguments, expected " +
+ sinon.format(this.expectedArguments));
+ }
+
+ if (args.length < this.expectedArguments.length) {
+ sinon.expectation.fail(this.method + " received too few arguments (" + sinon.format(args) +
+ "), expected " + sinon.format(this.expectedArguments));
+ }
+
+ if (this.expectsExactArgCount &&
+ args.length != this.expectedArguments.length) {
+ sinon.expectation.fail(this.method + " received too many arguments (" + sinon.format(args) +
+ "), expected " + sinon.format(this.expectedArguments));
+ }
+
+ for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+ if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+ sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
+ ", expected " + sinon.format(this.expectedArguments));
+ }
+ }
+ },
+
+ allowsCall: function allowsCall(thisValue, args) {
+ if (this.met() && receivedMaxCalls(this)) {
+ return false;
+ }
+
+ if ("expectedThis" in this && this.expectedThis !== thisValue) {
+ return false;
+ }
+
+ if (!("expectedArguments" in this)) {
+ return true;
+ }
+
+ args = args || [];
+
+ if (args.length < this.expectedArguments.length) {
+ return false;
+ }
+
+ if (this.expectsExactArgCount &&
+ args.length != this.expectedArguments.length) {
+ return false;
+ }
+
+ for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+ if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+ return false;
+ }
+ }
+
+ return true;
+ },
+
+ withArgs: function withArgs() {
+ this.expectedArguments = slice.call(arguments);
+ return this;
+ },
+
+ withExactArgs: function withExactArgs() {
+ this.withArgs.apply(this, arguments);
+ this.expectsExactArgCount = true;
+ return this;
+ },
+
+ on: function on(thisValue) {
+ this.expectedThis = thisValue;
+ return this;
+ },
+
+ toString: function () {
+ var args = (this.expectedArguments || []).slice();
+
+ if (!this.expectsExactArgCount) {
+ push.call(args, "[...]");
+ }
+
+ var callStr = sinon.spyCall.toString.call({
+ proxy: this.method || "anonymous mock expectation",
+ args: args
+ });
+
+ var message = callStr.replace(", [...", "[, ...") + " " +
+ expectedCallCountInWords(this);
+
+ if (this.met()) {
+ return "Expectation met: " + message;
+ }
+
+ return "Expected " + message + " (" +
+ callCountInWords(this.callCount) + ")";
+ },
+
+ verify: function verify() {
+ if (!this.met()) {
+ sinon.expectation.fail(this.toString());
+ } else {
+ sinon.expectation.pass(this.toString());
+ }
+
+ return true;
+ },
+
+ pass: function(message) {
+ sinon.assert.pass(message);
+ },
+ fail: function (message) {
+ var exception = new Error(message);
+ exception.name = "ExpectationError";
+
+ throw exception;
+ }
+ };
+ }());
+
+ if (commonJSModule) {
+ module.exports = mock;
+ } else {
+ sinon.mock = mock;
+ }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true*/
+/*global module, require, sinon*/
+/**
+ * Collections of stubs, spies and mocks.
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+ var push = [].push;
+ var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon) {
+ return;
+ }
+
+ function getFakes(fakeCollection) {
+ if (!fakeCollection.fakes) {
+ fakeCollection.fakes = [];
+ }
+
+ return fakeCollection.fakes;
+ }
+
+ function each(fakeCollection, method) {
+ var fakes = getFakes(fakeCollection);
+
+ for (var i = 0, l = fakes.length; i < l; i += 1) {
+ if (typeof fakes[i][method] == "function") {
+ fakes[i][method]();
+ }
+ }
+ }
+
+ function compact(fakeCollection) {
+ var fakes = getFakes(fakeCollection);
+ var i = 0;
+ while (i < fakes.length) {
+ fakes.splice(i, 1);
+ }
+ }
+
+ var collection = {
+ verify: function resolve() {
+ each(this, "verify");
+ },
+
+ restore: function restore() {
+ each(this, "restore");
+ compact(this);
+ },
+
+ verifyAndRestore: function verifyAndRestore() {
+ var exception;
+
+ try {
+ this.verify();
+ } catch (e) {
+ exception = e;
+ }
+
+ this.restore();
+
+ if (exception) {
+ throw exception;
+ }
+ },
+
+ add: function add(fake) {
+ push.call(getFakes(this), fake);
+ return fake;
+ },
+
+ spy: function spy() {
+ return this.add(sinon.spy.apply(sinon, arguments));
+ },
+
+ stub: function stub(object, property, value) {
+ if (property) {
+ var original = object[property];
+
+ if (typeof original != "function") {
+ if (!hasOwnProperty.call(object, property)) {
+ throw new TypeError("Cannot stub non-existent own property " + property);
+ }
+
+ object[property] = value;
+
+ return this.add({
+ restore: function () {
+ object[property] = original;
+ }
+ });
+ }
+ }
+ if (!property && !!object && typeof object == "object") {
+ var stubbedObj = sinon.stub.apply(sinon, arguments);
+
+ for (var prop in stubbedObj) {
+ if (typeof stubbedObj[prop] === "function") {
+ this.add(stubbedObj[prop]);
+ }
+ }
+
+ return stubbedObj;
+ }
+
+ return this.add(sinon.stub.apply(sinon, arguments));
+ },
+
+ mock: function mock() {
+ return this.add(sinon.mock.apply(sinon, arguments));
+ },
+
+ inject: function inject(obj) {
+ var col = this;
+
+ obj.spy = function () {
+ return col.spy.apply(col, arguments);
+ };
+
+ obj.stub = function () {
+ return col.stub.apply(col, arguments);
+ };
+
+ obj.mock = function () {
+ return col.mock.apply(col, arguments);
+ };
+
+ return obj;
+ }
+ };
+
+ if (commonJSModule) {
+ module.exports = collection;
+ } else {
+ sinon.collection = collection;
+ }
+}(typeof sinon == "object" && sinon || null));
+
+/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
+/*global module, require, window*/
+/**
+ * Fake timer API
+ * setTimeout
+ * setInterval
+ * clearTimeout
+ * clearInterval
+ * tick
+ * reset
+ * Date
+ *
+ * Inspired by jsUnitMockTimeOut from JsUnit
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+ var sinon = {};
+}
+
+(function (global) {
+ var id = 1;
+
+ function addTimer(args, recurring) {
+ if (args.length === 0) {
+ throw new Error("Function requires at least 1 parameter");
+ }
+
+ var toId = id++;
+ var delay = args[1] || 0;
+
+ if (!this.timeouts) {
+ this.timeouts = {};
+ }
+
+ this.timeouts[toId] = {
+ id: toId,
+ func: args[0],
+ callAt: this.now + delay,
+ invokeArgs: Array.prototype.slice.call(args, 2)
+ };
+
+ if (recurring === true) {
+ this.timeouts[toId].interval = delay;
+ }
+
+ return toId;
+ }
+
+ function parseTime(str) {
+ if (!str) {
+ return 0;
+ }
+
+ var strings = str.split(":");
+ var l = strings.length, i = l;
+ var ms = 0, parsed;
+
+ if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
+ throw new Error("tick only understands numbers and 'h:m:s'");
+ }
+
+ while (i--) {
+ parsed = parseInt(strings[i], 10);
+
+ if (parsed >= 60) {
+ throw new Error("Invalid time " + str);
+ }
+
+ ms += parsed * Math.pow(60, (l - i - 1));
+ }
+
+ return ms * 1000;
+ }
+
+ function createObject(object) {
+ var newObject;
+
+ if (Object.create) {
+ newObject = Object.create(object);
+ } else {
+ var F = function () {};
+ F.prototype = object;
+ newObject = new F();
+ }
+
+ newObject.Date.clock = newObject;
+ return newObject;
+ }
+
+ sinon.clock = {
+ now: 0,
+
+ create: function create(now) {
+ var clock = createObject(this);
+
+ if (typeof now == "number") {
+ clock.now = now;
+ }
+
+ if (!!now && typeof now == "object") {
+ throw new TypeError("now should be milliseconds since UNIX epoch");
+ }
+
+ return clock;
+ },
+
+ setTimeout: function setTimeout(callback, timeout) {
+ return addTimer.call(this, arguments, false);
+ },
+
+ clearTimeout: function clearTimeout(timerId) {
+ if (!this.timeouts) {
+ this.timeouts = [];
+ }
+
+ if (timerId in this.timeouts) {
+ delete this.timeouts[timerId];
+ }
+ },
+
+ setInterval: function setInterval(callback, timeout) {
+ return addTimer.call(this, arguments, true);
+ },
+
+ clearInterval: function clearInterval(timerId) {
+ this.clearTimeout(timerId);
+ },
+
+ tick: function tick(ms) {
+ ms = typeof ms == "number" ? ms : parseTime(ms);
+ var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
+ var timer = this.firstTimerInRange(tickFrom, tickTo);
+
+ var firstException;
+ while (timer && tickFrom <= tickTo) {
+ if (this.timeouts[timer.id]) {
+ tickFrom = this.now = timer.callAt;
+ try {
+ this.callTimer(timer);
+ } catch (e) {
+ firstException = firstException || e;
+ }
+ }
+
+ timer = this.firstTimerInRange(previous, tickTo);
+ previous = tickFrom;
+ }
+
+ this.now = tickTo;
+
+ if (firstException) {
+ throw firstException;
+ }
+
+ return this.now;
+ },
+
+ firstTimerInRange: function (from, to) {
+ var timer, smallest, originalTimer;
+
+ for (var id in this.timeouts) {
+ if (this.timeouts.hasOwnProperty(id)) {
+ if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
+ continue;
+ }
+
+ if (!smallest || this.timeouts[id].callAt < smallest) {
+ originalTimer = this.timeouts[id];
+ smallest = this.timeouts[id].callAt;
+
+ timer = {
+ func: this.timeouts[id].func,
+ callAt: this.timeouts[id].callAt,
+ interval: this.timeouts[id].interval,
+ id: this.timeouts[id].id,
+ invokeArgs: this.timeouts[id].invokeArgs
+ };
+ }
+ }
+ }
+
+ return timer || null;
+ },
+
+ callTimer: function (timer) {
+ if (typeof timer.interval == "number") {
+ this.timeouts[timer.id].callAt += timer.interval;
+ } else {
+ delete this.timeouts[timer.id];
+ }
+
+ try {
+ if (typeof timer.func == "function") {
+ timer.func.apply(null, timer.invokeArgs);
+ } else {
+ eval(timer.func);
+ }
+ } catch (e) {
+ var exception = e;
+ }
+
+ if (!this.timeouts[timer.id]) {
+ if (exception) {
+ throw exception;
+ }
+ return;
+ }
+
+ if (exception) {
+ throw exception;
+ }
+ },
+
+ reset: function reset() {
+ this.timeouts = {};
+ },
+
+ Date: (function () {
+ var NativeDate = Date;
+
+ function ClockDate(year, month, date, hour, minute, second, ms) {
+ // Defensive and verbose to avoid potential harm in passing
+ // explicit undefined when user does not pass argument
+ switch (arguments.length) {
+ case 0:
+ return new NativeDate(ClockDate.clock.now);
+ case 1:
+ return new NativeDate(year);
+ case 2:
+ return new NativeDate(year, month);
+ case 3:
+ return new NativeDate(year, month, date);
+ case 4:
+ return new NativeDate(year, month, date, hour);
+ case 5:
+ return new NativeDate(year, month, date, hour, minute);
+ case 6:
+ return new NativeDate(year, month, date, hour, minute, second);
+ default:
+ return new NativeDate(year, month, date, hour, minute, second, ms);
+ }
+ }
+
+ return mirrorDateProperties(ClockDate, NativeDate);
+ }())
+ };
+
+ function mirrorDateProperties(target, source) {
+ if (source.now) {
+ target.now = function now() {
+ return target.clock.now;
+ };
+ } else {
+ delete target.now;
+ }
+
+ if (source.toSource) {
+ target.toSource = function toSource() {
+ return source.toSource();
+ };
+ } else {
+ delete target.toSource;
+ }
+
+ target.toString = function toString() {
+ return source.toString();
+ };
+
+ target.prototype = source.prototype;
+ target.parse = source.parse;
+ target.UTC = source.UTC;
+ target.prototype.toUTCString = source.prototype.toUTCString;
+ return target;
+ }
+
+ var methods = ["Date", "setTimeout", "setInterval",
+ "clearTimeout", "clearInterval"];
+
+ function restore() {
+ var method;
+
+ for (var i = 0, l = this.methods.length; i < l; i++) {
+ method = this.methods[i];
+ if (global[method].hadOwnProperty) {
+ global[method] = this["_" + method];
+ } else {
+ delete global[method];
+ }
+ }
+
+ // Prevent multiple executions which will completely remove these props
+ this.methods = [];
+ }
+
+ function stubGlobal(method, clock) {
+ clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
+ clock["_" + method] = global[method];
+
+ if (method == "Date") {
+ var date = mirrorDateProperties(clock[method], global[method]);
+ global[method] = date;
+ } else {
+ global[method] = function () {
+ return clock[method].apply(clock, arguments);
+ };
+
+ for (var prop in clock[method]) {
+ if (clock[method].hasOwnProperty(prop)) {
+ global[method][prop] = clock[method][prop];
+ }
+ }
+ }
+
+ global[method].clock = clock;
+ }
+
+ sinon.useFakeTimers = function useFakeTimers(now) {
+ var clock = sinon.clock.create(now);
+ clock.restore = restore;
+ clock.methods = Array.prototype.slice.call(arguments,
+ typeof now == "number" ? 1 : 0);
+
+ if (clock.methods.length === 0) {
+ clock.methods = methods;
+ }
+
+ for (var i = 0, l = clock.methods.length; i < l; i++) {
+ stubGlobal(clock.methods[i], clock);
+ }
+
+ return clock;
+ };
+}(typeof global != "undefined" && typeof global !== "function" ? global : this));
+
+sinon.timers = {
+ setTimeout: setTimeout,
+ clearTimeout: clearTimeout,
+ setInterval: setInterval,
+ clearInterval: clearInterval,
+ Date: Date
+};
+
+if (typeof module == "object" && typeof require == "function") {
+ module.exports = sinon;
+}
+
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Minimal Event interface implementation
+ *
+ * Original implementation by Sven Fuchs: https://gist.github.com/995028
+ * Modifications and tests by Christian Johansen.
+ *
+ * @author Sven Fuchs (svenfuchs at artweb-design.de)
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2011 Sven Fuchs, Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+ this.sinon = {};
+}
+
+(function () {
+ var push = [].push;
+
+ sinon.Event = function Event(type, bubbles, cancelable) {
+ this.initEvent(type, bubbles, cancelable);
+ };
+
+ sinon.Event.prototype = {
+ initEvent: function(type, bubbles, cancelable) {
+ this.type = type;
+ this.bubbles = bubbles;
+ this.cancelable = cancelable;
+ },
+
+ stopPropagation: function () {},
+
+ preventDefault: function () {
+ this.defaultPrevented = true;
+ }
+ };
+
+ sinon.EventTarget = {
+ addEventListener: function addEventListener(event, listener, useCapture) {
+ this.eventListeners = this.eventListeners || {};
+ this.eventListeners[event] = this.eventListeners[event] || [];
+ push.call(this.eventListeners[event], listener);
+ },
+
+ removeEventListener: function removeEventListener(event, listener, useCapture) {
+ var listeners = this.eventListeners && this.eventListeners[event] || [];
+
+ for (var i = 0, l = listeners.length; i < l; ++i) {
+ if (listeners[i] == listener) {
+ return listeners.splice(i, 1);
+ }
+ }
+ },
+
+ dispatchEvent: function dispatchEvent(event) {
+ var type = event.type;
+ var listeners = this.eventListeners && this.eventListeners[type] || [];
+
+ for (var i = 0; i < listeners.length; i++) {
+ if (typeof listeners[i] == "function") {
+ listeners[i].call(this, event);
+ } else {
+ listeners[i].handleEvent(event);
+ }
+ }
+
+ return !!event.defaultPrevented;
+ }
+ };
+}());
+
+/**
+ * @depend ../../sinon.js
+ * @depend event.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Fake XMLHttpRequest object
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+ this.sinon = {};
+}
+sinon.xhr = { XMLHttpRequest: this.XMLHttpRequest };
+
+// wrapper for global
+(function(global) {
+ var xhr = sinon.xhr;
+ xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
+ xhr.GlobalActiveXObject = global.ActiveXObject;
+ xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
+ xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
+ xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
+ ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
+
+ /*jsl:ignore*/
+ var unsafeHeaders = {
+ "Accept-Charset": true,
+ "Accept-Encoding": true,
+ "Connection": true,
+ "Content-Length": true,
+ "Cookie": true,
+ "Cookie2": true,
+ "Content-Transfer-Encoding": true,
+ "Date": true,
+ "Expect": true,
+ "Host": true,
+ "Keep-Alive": true,
+ "Referer": true,
+ "TE": true,
+ "Trailer": true,
+ "Transfer-Encoding": true,
+ "Upgrade": true,
+ "User-Agent": true,
+ "Via": true
+ };
+ /*jsl:end*/
+
+ function FakeXMLHttpRequest() {
+ this.readyState = FakeXMLHttpRequest.UNSENT;
+ this.requestHeaders = {};
+ this.requestBody = null;
+ this.status = 0;
+ this.statusText = "";
+
+ if (typeof FakeXMLHttpRequest.onCreate == "function") {
+ FakeXMLHttpRequest.onCreate(this);
+ }
+ }
+
+ function verifyState(xhr) {
+ if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
+ throw new Error("INVALID_STATE_ERR");
+ }
+
+ if (xhr.sendFlag) {
+ throw new Error("INVALID_STATE_ERR");
+ }
+ }
+
+ // filtering to enable a white-list version of Sinon FakeXhr,
+ // where whitelisted requests are passed through to real XHR
+ function each(collection, callback) {
+ if (!collection) return;
+ for (var i = 0, l = collection.length; i < l; i += 1) {
+ callback(collection[i]);
+ }
+ }
+ function some(collection, callback) {
+ for (var index = 0; index < collection.length; index++) {
+ if(callback(collection[index]) === true) return true;
+ };
+ return false;
+ }
+ // largest arity in XHR is 5 - XHR#open
+ var apply = function(obj,method,args) {
+ switch(args.length) {
+ case 0: return obj[method]();
+ case 1: return obj[method](args[0]);
+ case 2: return obj[method](args[0],args[1]);
+ case 3: return obj[method](args[0],args[1],args[2]);
+ case 4: return obj[method](args[0],args[1],args[2],args[3]);
+ case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
+ };
+ };
+
+ FakeXMLHttpRequest.filters = [];
+ FakeXMLHttpRequest.addFilter = function(fn) {
+ this.filters.push(fn)
+ };
+ var IE6Re = /MSIE 6/;
+ FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
+ var xhr = new sinon.xhr.workingXHR();
+ each(["open","setRequestHeader","send","abort","getResponseHeader",
+ "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
+ function(method) {
+ fakeXhr[method] = function() {
+ return apply(xhr,method,arguments);
+ };
+ });
+
+ var copyAttrs = function(args) {
+ each(args, function(attr) {
+ try {
+ fakeXhr[attr] = xhr[attr]
+ } catch(e) {
+ if(!IE6Re.test(navigator.userAgent)) throw e;
+ }
+ });
+ };
+
+ var stateChange = function() {
+ fakeXhr.readyState = xhr.readyState;
+ if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
+ copyAttrs(["status","statusText"]);
+ }
+ if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
+ copyAttrs(["responseText"]);
+ }
+ if(xhr.readyState === FakeXMLHttpRequest.DONE) {
+ copyAttrs(["responseXML"]);
+ }
+ if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr);
+ };
+ if(xhr.addEventListener) {
+ for(var event in fakeXhr.eventListeners) {
+ if(fakeXhr.eventListeners.hasOwnProperty(event)) {
+ each(fakeXhr.eventListeners[event],function(handler) {
+ xhr.addEventListener(event, handler);
+ });
+ }
+ }
+ xhr.addEventListener("readystatechange",stateChange);
+ } else {
+ xhr.onreadystatechange = stateChange;
+ }
+ apply(xhr,"open",xhrArgs);
+ };
+ FakeXMLHttpRequest.useFilters = false;
+
+ function verifyRequestSent(xhr) {
+ if (xhr.readyState == FakeXMLHttpRequest.DONE) {
+ throw new Error("Request done");
+ }
+ }
+
+ function verifyHeadersReceived(xhr) {
+ if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
+ throw new Error("No headers received");
+ }
+ }
+
+ function verifyResponseBodyType(body) {
+ if (typeof body != "string") {
+ var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
+ body + ", which is not a string.");
+ error.name = "InvalidBodyException";
+ throw error;
+ }
+ }
+
+ sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
+ async: true,
+
+ open: function open(method, url, async, username, password) {
+ this.method = method;
+ this.url = url;
+ this.async = typeof async == "boolean" ? async : true;
+ this.username = username;
+ this.password = password;
+ this.responseText = null;
+ this.responseXML = null;
+ this.requestHeaders = {};
+ this.sendFlag = false;
+ if(sinon.FakeXMLHttpRequest.useFilters === true) {
+ var xhrArgs = arguments;
+ var defake = some(FakeXMLHttpRequest.filters,function(filter) {
+ return filter.apply(this,xhrArgs)
+ });
+ if (defake) {
+ return sinon.FakeXMLHttpRequest.defake(this,arguments);
+ }
+ }
+ this.readyStateChange(FakeXMLHttpRequest.OPENED);
+ },
+
+ readyStateChange: function readyStateChange(state) {
+ this.readyState = state;
+
+ if (typeof this.onreadystatechange == "function") {
+ try {
+ this.onreadystatechange();
+ } catch (e) {
+ sinon.logError("Fake XHR onreadystatechange handler", e);
+ }
+ }
+
+ this.dispatchEvent(new sinon.Event("readystatechange"));
+ },
+
+ setRequestHeader: function setRequestHeader(header, value) {
+ verifyState(this);
+
+ if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
+ throw new Error("Refused to set unsafe header \"" + header + "\"");
+ }
+
+ if (this.requestHeaders[header]) {
+ this.requestHeaders[header] += "," + value;
+ } else {
+ this.requestHeaders[header] = value;
+ }
+ },
+
+ // Helps testing
+ setResponseHeaders: function setResponseHeaders(headers) {
+ this.responseHeaders = {};
+
+ for (var header in headers) {
+ if (headers.hasOwnProperty(header)) {
+ this.responseHeaders[header] = headers[header];
+ }
+ }
+
+ if (this.async) {
+ this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
+ } else {
+ this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
+ }
+ },
+
+ // Currently treats ALL data as a DOMString (i.e. no Document)
+ send: function send(data) {
+ verifyState(this);
+
+ if (!/^(get|head)$/i.test(this.method)) {
+ if (this.requestHeaders["Content-Type"]) {
+ var value = this.requestHeaders["Content-Type"].split(";");
+ this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
+ } else {
+ this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
+ }
+
+ this.requestBody = data;
+ }
+
+ this.errorFlag = false;
+ this.sendFlag = this.async;
+ this.readyStateChange(FakeXMLHttpRequest.OPENED);
+
+ if (typeof this.onSend == "function") {
+ this.onSend(this);
+ }
+ },
+
+ abort: function abort() {
+ this.aborted = true;
+ this.responseText = null;
+ this.errorFlag = true;
+ this.requestHeaders = {};
+
+ if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
+ this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
+ this.sendFlag = false;
+ }
+
+ this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
+ },
+
+ getResponseHeader: function getResponseHeader(header) {
+ if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+ return null;
+ }
+
+ if (/^Set-Cookie2?$/i.test(header)) {
+ return null;
+ }
+
+ header = header.toLowerCase();
+
+ for (var h in this.responseHeaders) {
+ if (h.toLowerCase() == header) {
+ return this.responseHeaders[h];
+ }
+ }
+
+ return null;
+ },
+
+ getAllResponseHeaders: function getAllResponseHeaders() {
+ if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+ return "";
+ }
+
+ var headers = "";
+
+ for (var header in this.responseHeaders) {
+ if (this.responseHeaders.hasOwnProperty(header) &&
+ !/^Set-Cookie2?$/i.test(header)) {
+ headers += header + ": " + this.responseHeaders[header] + "\r\n";
+ }
+ }
+
+ return headers;
+ },
+
+ setResponseBody: function setResponseBody(body) {
+ verifyRequestSent(this);
+ verifyHeadersReceived(this);
+ verifyResponseBodyType(body);
+
+ var chunkSize = this.chunkSize || 10;
+ var index = 0;
+ this.responseText = "";
+
+ do {
+ if (this.async) {
+ this.readyStateChange(FakeXMLHttpRequest.LOADING);
+ }
+
+ this.responseText += body.substring(index, index + chunkSize);
+ index += chunkSize;
+ } while (index < body.length);
+
+ var type = this.getResponseHeader("Content-Type");
+
+ if (this.responseText &&
+ (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
+ try {
+ this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
+ } catch (e) {
+ // Unable to parse XML - no biggie
+ }
+ }
+
+ if (this.async) {
+ this.readyStateChange(FakeXMLHttpRequest.DONE);
+ } else {
+ this.readyState = FakeXMLHttpRequest.DONE;
+ }
+ },
+
+ respond: function respond(status, headers, body) {
+ this.setResponseHeaders(headers || {});
+ this.status = typeof status == "number" ? status : 200;
+ this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
+ this.setResponseBody(body || "");
+ }
+ });
+
+ sinon.extend(FakeXMLHttpRequest, {
+ UNSENT: 0,
+ OPENED: 1,
+ HEADERS_RECEIVED: 2,
+ LOADING: 3,
+ DONE: 4
+ });
+
+ // Borrowed from JSpec
+ FakeXMLHttpRequest.parseXML = function parseXML(text) {
+ var xmlDoc;
+
+ if (typeof DOMParser != "undefined") {
+ var parser = new DOMParser();
+ xmlDoc = parser.parseFromString(text, "text/xml");
+ } else {
+ xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+ xmlDoc.async = "false";
+ xmlDoc.loadXML(text);
+ }
+
+ return xmlDoc;
+ };
+
+ FakeXMLHttpRequest.statusCodes = {
+ 100: "Continue",
+ 101: "Switching Protocols",
+ 200: "OK",
+ 201: "Created",
+ 202: "Accepted",
+ 203: "Non-Authoritative Information",
+ 204: "No Content",
+ 205: "Reset Content",
+ 206: "Partial Content",
+ 300: "Multiple Choice",
+ 301: "Moved Permanently",
+ 302: "Found",
+ 303: "See Other",
+ 304: "Not Modified",
+ 305: "Use Proxy",
+ 307: "Temporary Redirect",
+ 400: "Bad Request",
+ 401: "Unauthorized",
+ 402: "Payment Required",
+ 403: "Forbidden",
+ 404: "Not Found",
+ 405: "Method Not Allowed",
+ 406: "Not Acceptable",
+ 407: "Proxy Authentication Required",
+ 408: "Request Timeout",
+ 409: "Conflict",
+ 410: "Gone",
+ 411: "Length Required",
+ 412: "Precondition Failed",
+ 413: "Request Entity Too Large",
+ 414: "Request-URI Too Long",
+ 415: "Unsupported Media Type",
+ 416: "Requested Range Not Satisfiable",
+ 417: "Expectation Failed",
+ 422: "Unprocessable Entity",
+ 500: "Internal Server Error",
+ 501: "Not Implemented",
+ 502: "Bad Gateway",
+ 503: "Service Unavailable",
+ 504: "Gateway Timeout",
+ 505: "HTTP Version Not Supported"
+ };
+
+ sinon.useFakeXMLHttpRequest = function () {
+ sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
+ if (xhr.supportsXHR) {
+ global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
+ }
+
+ if (xhr.supportsActiveX) {
+ global.ActiveXObject = xhr.GlobalActiveXObject;
+ }
+
+ delete sinon.FakeXMLHttpRequest.restore;
+
+ if (keepOnCreate !== true) {
+ delete sinon.FakeXMLHttpRequest.onCreate;
+ }
+ };
+ if (xhr.supportsXHR) {
+ global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
+ }
+
+ if (xhr.supportsActiveX) {
+ global.ActiveXObject = function ActiveXObject(objId) {
+ if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
+
+ return new sinon.FakeXMLHttpRequest();
+ }
+
+ return new xhr.GlobalActiveXObject(objId);
+ };
+ }
+
+ return sinon.FakeXMLHttpRequest;
+ };
+
+ sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
+})(this);
+
+if (typeof module == "object" && typeof require == "function") {
+ module.exports = sinon;
+}
+
+/**
+ * @depend fake_xml_http_request.js
+ */
+/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
+/*global module, require, window*/
+/**
+ * The Sinon "server" mimics a web server that receives requests from
+ * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
+ * both synchronously and asynchronously. To respond synchronuously, canned
+ * answers have to be provided upfront.
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+ var sinon = {};
+}
+
+sinon.fakeServer = (function () {
+ var push = [].push;
+ function F() {}
+
+ function create(proto) {
+ F.prototype = proto;
+ return new F();
+ }
+
+ function responseArray(handler) {
+ var response = handler;
+
+ if (Object.prototype.toString.call(handler) != "[object Array]") {
+ response = [200, {}, handler];
+ }
+
+ if (typeof response[2] != "string") {
+ throw new TypeError("Fake server response body should be string, but was " +
+ typeof response[2]);
+ }
+
+ return response;
+ }
+
+ var wloc = typeof window !== "undefined" ? window.location : {};
+ var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
+
+ function matchOne(response, reqMethod, reqUrl) {
+ var rmeth = response.method;
+ var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
+ var url = response.url;
+ var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
+
+ return matchMethod && matchUrl;
+ }
+
+ function match(response, request) {
+ var requestMethod = this.getHTTPMethod(request);
+ var requestUrl = request.url;
+
+ if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
+ requestUrl = requestUrl.replace(rCurrLoc, "");
+ }
+
+ if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
+ if (typeof response.response == "function") {
+ var ru = response.url;
+ var args = [request].concat(!ru ? [] : requestUrl.match(ru).slice(1));
+ return response.response.apply(response, args);
+ }
+
+ return true;
+ }
+
+ return false;
+ }
+
+ function log(response, request) {
+ var str;
+
+ str = "Request:\n" + sinon.format(request) + "\n\n";
+ str += "Response:\n" + sinon.format(response) + "\n\n";
+
+ sinon.log(str);
+ }
+
+ return {
+ create: function () {
+ var server = create(this);
+ this.xhr = sinon.useFakeXMLHttpRequest();
+ server.requests = [];
+
+ this.xhr.onCreate = function (xhrObj) {
+ server.addRequest(xhrObj);
+ };
+
+ return server;
+ },
+
+ addRequest: function addRequest(xhrObj) {
+ var server = this;
+ push.call(this.requests, xhrObj);
+
+ xhrObj.onSend = function () {
+ server.handleRequest(this);
+ };
+
+ if (this.autoRespond && !this.responding) {
+ setTimeout(function () {
+ server.responding = false;
+ server.respond();
+ }, this.autoRespondAfter || 10);
+
+ this.responding = true;
+ }
+ },
+
+ getHTTPMethod: function getHTTPMethod(request) {
+ if (this.fakeHTTPMethods && /post/i.test(request.method)) {
+ var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
+ return !!matches ? matches[1] : request.method;
+ }
+
+ return request.method;
+ },
+
+ handleRequest: function handleRequest(xhr) {
+ if (xhr.async) {
+ if (!this.queue) {
+ this.queue = [];
+ }
+
+ push.call(this.queue, xhr);
+ } else {
+ this.processRequest(xhr);
+ }
+ },
+
+ respondWith: function respondWith(method, url, body) {
+ if (arguments.length == 1 && typeof method != "function") {
+ this.response = responseArray(method);
+ return;
+ }
+
+ if (!this.responses) { this.responses = []; }
+
+ if (arguments.length == 1) {
+ body = method;
+ url = method = null;
+ }
+
+ if (arguments.length == 2) {
+ body = url;
+ url = method;
+ method = null;
+ }
+
+ push.call(this.responses, {
+ method: method,
+ url: url,
+ response: typeof body == "function" ? body : responseArray(body)
+ });
+ },
+
+ respond: function respond() {
+ if (arguments.length > 0) this.respondWith.apply(this, arguments);
+ var queue = this.queue || [];
+ var request;
+
+ while(request = queue.shift()) {
+ this.processRequest(request);
+ }
+ },
+
+ processRequest: function processRequest(request) {
+ try {
+ if (request.aborted) {
+ return;
+ }
+
+ var response = this.response || [404, {}, ""];
+
+ if (this.responses) {
+ for (var i = 0, l = this.responses.length; i < l; i++) {
+ if (match.call(this, this.responses[i], request)) {
+ response = this.responses[i].response;
+ break;
+ }
+ }
+ }
+
+ if (request.readyState != 4) {
+ log(response, request);
+
+ request.respond(response[0], response[1], response[2]);
+ }
+ } catch (e) {
+ sinon.logError("Fake server request processing", e);
+ }
+ },
+
+ restore: function restore() {
+ return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
+ }
+ };
+}());
+
+if (typeof module == "object" && typeof require == "function") {
+ module.exports = sinon;
+}
+
+/**
+ * @depend fake_server.js
+ * @depend fake_timers.js
+ */
+/*jslint browser: true, eqeqeq: false, onevar: false*/
+/*global sinon*/
+/**
+ * Add-on for sinon.fakeServer that automatically handles a fake timer along with
+ * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
+ * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
+ * it polls the object for completion with setInterval. Dispite the direct
+ * motivation, there is nothing jQuery-specific in this file, so it can be used
+ * in any environment where the ajax implementation depends on setInterval or
+ * setTimeout.
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function () {
+ function Server() {}
+ Server.prototype = sinon.fakeServer;
+
+ sinon.fakeServerWithClock = new Server();
+
+ sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
+ if (xhr.async) {
+ if (typeof setTimeout.clock == "object") {
+ this.clock = setTimeout.clock;
+ } else {
+ this.clock = sinon.useFakeTimers();
+ this.resetClock = true;
+ }
+
+ if (!this.longestTimeout) {
+ var clockSetTimeout = this.clock.setTimeout;
+ var clockSetInterval = this.clock.setInterval;
+ var server = this;
+
+ this.clock.setTimeout = function (fn, timeout) {
+ server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+ return clockSetTimeout.apply(this, arguments);
+ };
+
+ this.clock.setInterval = function (fn, timeout) {
+ server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+ return clockSetInterval.apply(this, arguments);
+ };
+ }
+ }
+
+ return sinon.fakeServer.addRequest.call(this, xhr);
+ };
+
+ sinon.fakeServerWithClock.respond = function respond() {
+ var returnVal = sinon.fakeServer.respond.apply(this, arguments);
+
+ if (this.clock) {
+ this.clock.tick(this.longestTimeout || 0);
+ this.longestTimeout = 0;
+
+ if (this.resetClock) {
+ this.clock.restore();
+ this.resetClock = false;
+ }
+ }
+
+ return returnVal;
+ };
+
+ sinon.fakeServerWithClock.restore = function restore() {
+ if (this.clock) {
+ this.clock.restore();
+ }
+
+ return sinon.fakeServer.restore.apply(this, arguments);
+ };
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend collection.js
+ * @depend util/fake_timers.js
+ * @depend util/fake_server_with_clock.js
+ */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global require, module*/
+/**
+ * Manages fake collections as well as fake utilities such as Sinon's
+ * timers and fake XHR implementation in one convenient object.
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+if (typeof module == "object" && typeof require == "function") {
+ var sinon = require("../sinon");
+ sinon.extend(sinon, require("./util/fake_timers"));
+}
+
+(function () {
+ var push = [].push;
+
+ function exposeValue(sandbox, config, key, value) {
+ if (!value) {
+ return;
+ }
+
+ if (config.injectInto) {
+ config.injectInto[key] = value;
+ } else {
+ push.call(sandbox.args, value);
+ }
+ }
+
+ function prepareSandboxFromConfig(config) {
+ var sandbox = sinon.create(sinon.sandbox);
+
+ if (config.useFakeServer) {
+ if (typeof config.useFakeServer == "object") {
+ sandbox.serverPrototype = config.useFakeServer;
+ }
+
+ sandbox.useFakeServer();
+ }
+
+ if (config.useFakeTimers) {
+ if (typeof config.useFakeTimers == "object") {
+ sandbox.useFakeTimers.apply(sandbox, config.useFakeTimers);
+ } else {
+ sandbox.useFakeTimers();
+ }
+ }
+
+ return sandbox;
+ }
+
+ sinon.sandbox = sinon.extend(sinon.create(sinon.collection), {
+ useFakeTimers: function useFakeTimers() {
+ this.clock = sinon.useFakeTimers.apply(sinon, arguments);
+
+ return this.add(this.clock);
+ },
+
+ serverPrototype: sinon.fakeServer,
+
+ useFakeServer: function useFakeServer() {
+ var proto = this.serverPrototype || sinon.fakeServer;
+
+ if (!proto || !proto.create) {
+ return null;
+ }
+
+ this.server = proto.create();
+ return this.add(this.server);
+ },
+
+ inject: function (obj) {
+ sinon.collection.inject.call(this, obj);
+
+ if (this.clock) {
+ obj.clock = this.clock;
+ }
+
+ if (this.server) {
+ obj.server = this.server;
+ obj.requests = this.server.requests;
+ }
+
+ return obj;
+ },
+
+ create: function (config) {
+ if (!config) {
+ return sinon.create(sinon.sandbox);
+ }
+
+ var sandbox = prepareSandboxFromConfig(config);
+ sandbox.args = sandbox.args || [];
+ var prop, value, exposed = sandbox.inject({});
+
+ if (config.properties) {
+ for (var i = 0, l = config.properties.length; i < l; i++) {
+ prop = config.properties[i];
+ value = exposed[prop] || prop == "sandbox" && sandbox;
+ exposeValue(sandbox, config, prop, value);
+ }
+ } else {
+ exposeValue(sandbox, config, "sandbox", value);
+ }
+
+ return sandbox;
+ }
+ });
+
+ sinon.sandbox.useFakeXMLHttpRequest = sinon.sandbox.useFakeServer;
+
+ if (typeof module == "object" && typeof require == "function") {
+ module.exports = sinon.sandbox;
+ }
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ * @depend sandbox.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Test function, sandboxes fakes
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon) {
+ return;
+ }
+
+ function test(callback) {
+ var type = typeof callback;
+
+ if (type != "function") {
+ throw new TypeError("sinon.test needs to wrap a test function, got " + type);
+ }
+
+ return function () {
+ var config = sinon.getConfig(sinon.config);
+ config.injectInto = config.injectIntoThis && this || config.injectInto;
+ var sandbox = sinon.sandbox.create(config);
+ var exception, result;
+ var args = Array.prototype.slice.call(arguments).concat(sandbox.args);
+
+ try {
+ result = callback.apply(this, args);
+ } catch (e) {
+ exception = e;
+ }
+
+ if (typeof exception !== "undefined") {
+ sandbox.restore();
+ throw exception;
+ }
+ else {
+ sandbox.verifyAndRestore();
+ }
+
+ return result;
+ };
+ }
+
+ test.config = {
+ injectIntoThis: true,
+ injectInto: null,
+ properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+ useFakeTimers: true,
+ useFakeServer: true
+ };
+
+ if (commonJSModule) {
+ module.exports = test;
+ } else {
+ sinon.test = test;
+ }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend test.js
+ */
+/*jslint eqeqeq: false, onevar: false, eqeqeq: false*/
+/*global module, require, sinon*/
+/**
+ * Test case, sandboxes all test functions
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon || !Object.prototype.hasOwnProperty) {
+ return;
+ }
+
+ function createTest(property, setUp, tearDown) {
+ return function () {
+ if (setUp) {
+ setUp.apply(this, arguments);
+ }
+
+ var exception, result;
+
+ try {
+ result = property.apply(this, arguments);
+ } catch (e) {
+ exception = e;
+ }
+
+ if (tearDown) {
+ tearDown.apply(this, arguments);
+ }
+
+ if (exception) {
+ throw exception;
+ }
+
+ return result;
+ };
+ }
+
+ function testCase(tests, prefix) {
+ /*jsl:ignore*/
+ if (!tests || typeof tests != "object") {
+ throw new TypeError("sinon.testCase needs an object with test functions");
+ }
+ /*jsl:end*/
+
+ prefix = prefix || "test";
+ var rPrefix = new RegExp("^" + prefix);
+ var methods = {}, testName, property, method;
+ var setUp = tests.setUp;
+ var tearDown = tests.tearDown;
+
+ for (testName in tests) {
+ if (tests.hasOwnProperty(testName)) {
+ property = tests[testName];
+
+ if (/^(setUp|tearDown)$/.test(testName)) {
+ continue;
+ }
+
+ if (typeof property == "function" && rPrefix.test(testName)) {
+ method = property;
+
+ if (setUp || tearDown) {
+ method = createTest(property, setUp, tearDown);
+ }
+
+ methods[testName] = sinon.test(method);
+ } else {
+ methods[testName] = tests[testName];
+ }
+ }
+ }
+
+ return methods;
+ }
+
+ if (commonJSModule) {
+ module.exports = testCase;
+ } else {
+ sinon.testCase = testCase;
+ }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Assertions matching the test spy retrieval interface.
+ *
+ * @author Christian Johansen (christian at cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2013 Christian Johansen
+ */
+
+(function (sinon, global) {
+ var commonJSModule = typeof module == "object" && typeof require == "function";
+ var slice = Array.prototype.slice;
+ var assert;
+
+ if (!sinon && commonJSModule) {
+ sinon = require("../sinon");
+ }
+
+ if (!sinon) {
+ return;
+ }
+
+ function verifyIsStub() {
+ var method;
+
+ for (var i = 0, l = arguments.length; i < l; ++i) {
+ method = arguments[i];
+
+ if (!method) {
+ assert.fail("fake is not a spy");
+ }
+
+ if (typeof method != "function") {
+ assert.fail(method + " is not a function");
+ }
+
+ if (typeof method.getCall != "function") {
+ assert.fail(method + " is not stubbed");
+ }
+ }
+ }
+
+ function failAssertion(object, msg) {
+ object = object || global;
+ var failMethod = object.fail || assert.fail;
+ failMethod.call(object, msg);
+ }
+
+ function mirrorPropAsAssertion(name, method, message) {
+ if (arguments.length == 2) {
+ message = method;
+ method = name;
+ }
+
+ assert[name] = function (fake) {
+ verifyIsStub(fake);
+
+ var args = slice.call(arguments, 1);
+ var failed = false;
+
+ if (typeof method == "function") {
+ failed = !method(fake);
+ } else {
+ failed = typeof fake[method] == "function" ?
+ !fake[method].apply(fake, args) : !fake[method];
+ }
+
+ if (failed) {
+ failAssertion(this, fake.printf.apply(fake, [message].concat(args)));
+ } else {
+ assert.pass(name);
+ }
+ };
+ }
+
+ function exposedName(prefix, prop) {
+ return !prefix || /^fail/.test(prop) ? prop :
+ prefix + prop.slice(0, 1).toUpperCase() + prop.slice(1);
+ };
+
+ assert = {
+ failException: "AssertError",
+
+ fail: function fail(message) {
+ var error = new Error(message);
+ error.name = this.failException || assert.failException;
+
+ throw error;
+ },
+
+ pass: function pass(assertion) {},
+
+ callOrder: function assertCallOrder() {
+ verifyIsStub.apply(null, arguments);
+ var expected = "", actual = "";
+
+ if (!sinon.calledInOrder(arguments)) {
+ try {
+ expected = [].join.call(arguments, ", ");
+ actual = sinon.orderByFirstCall(slice.call(arguments)).join(", ");
+ } catch (e) {
+ // If this fails, we'll just fall back to the blank string
+ }
+
+ failAssertion(this, "expected " + expected + " to be " +
+ "called in order but were called as " + actual);
+ } else {
+ assert.pass("callOrder");
+ }
+ },
+
+ callCount: function assertCallCount(method, count) {
+ verifyIsStub(method);
+
+ if (method.callCount != count) {
+ var msg = "expected %n to be called " + sinon.timesInWords(count) +
+ " but was called %c%C";
+ failAssertion(this, method.printf(msg));
+ } else {
+ assert.pass("callCount");
+ }
+ },
+
+ expose: function expose(target, options) {
+ if (!target) {
+ throw new TypeError("target is null or undefined");
+ }
+
+ var o = options || {};
+ var prefix = typeof o.prefix == "undefined" && "assert" || o.prefix;
+ var includeFail = typeof o.includeFail == "undefined" || !!o.includeFail;
+
+ for (var method in this) {
+ if (method != "export" && (includeFail || !/^(fail)/.test(method))) {
+ target[exposedName(prefix, method)] = this[method];
+ }
+ }
+
+ return target;
+ }
+ };
+
+ mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
+ mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
+ "expected %n to not have been called but was called %c%C");
+ mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
+ mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
+ mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
+ mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
+ mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
+ mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
+ mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
+ mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
+ mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
+ mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
+ mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
+ mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
+ mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
+ mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
+ mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
+ mirrorPropAsAssertion("threw", "%n did not throw exception%C");
+ mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
+
+ if (commonJSModule) {
+ module.exports = assert;
+ } else {
+ sinon.assert = assert;
+ }
+}(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : global));
+
+return sinon;}.call(typeof window != 'undefined' && window || {}));
diff --git a/spec/suites/AddLayer.MultipleSpec.js b/spec/suites/AddLayer.MultipleSpec.js
new file mode 100644
index 0000000..f2ab534
--- /dev/null
+++ b/spec/suites/AddLayer.MultipleSpec.js
@@ -0,0 +1,114 @@
+describe('addLayer adding multiple markers', function () {
+ var map, div, clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ clock.restore();
+ document.body.removeChild(div);
+ });
+
+ it('creates a cluster when 2 overlapping markers are added before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ map.addLayer(group);
+
+ expect(marker._icon).to.be(undefined);
+ expect(marker2._icon).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+ });
+ it('creates a cluster when 2 overlapping markers are added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ expect(marker._icon).to.be(null); //Null as was added and then removed
+ expect(marker2._icon).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+ });
+ it('creates a cluster with an animation when 2 overlapping markers are added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup({ animateAddingMarkers: true });
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(3);
+
+ //Run the the animation
+ clock.tick(1000);
+
+ //Then markers should be removed from map
+ expect(marker._icon).to.be(null);
+ expect(marker2._icon).to.be(null);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+ });
+
+ it('creates a cluster and marker when 2 overlapping markers and one non-overlapping are added before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+ var marker3 = new L.Marker([3.0, 1.5]);
+
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ group.addLayer(marker3);
+ map.addLayer(group);
+
+ expect(marker._icon).to.be(undefined);
+ expect(marker2._icon).to.be(undefined);
+ expect(marker3._icon.parentNode).to.be(map._panes.markerPane);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(2);
+ });
+ it('creates a cluster and marker when 2 overlapping markers and one non-overlapping are added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+ var marker3 = new L.Marker([3.0, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ group.addLayer(marker3);
+
+ expect(marker._icon).to.be(null); //Null as was added and then removed
+ expect(marker2._icon).to.be(undefined);
+ expect(marker3._icon.parentNode).to.be(map._panes.markerPane);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(2);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/AddLayer.SingleSpec.js b/spec/suites/AddLayer.SingleSpec.js
new file mode 100644
index 0000000..1b78f6d
--- /dev/null
+++ b/spec/suites/AddLayer.SingleSpec.js
@@ -0,0 +1,78 @@
+describe('addLayer adding a single marker', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+
+ it('appears when added to the group before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._icon).to.not.be(undefined);
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ });
+ it('appears when added to the group after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+
+ expect(marker._icon).to.not.be(undefined);
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ });
+ it('appears (using animations) when added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup({ animateAddingMarkers: true });
+ var marker = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+
+ expect(marker._icon).to.not.be(undefined);
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ });
+
+
+ it('does not appear when too far away when added before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([3.5, 1.5]);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._icon).to.be(undefined);
+ });
+ it('does not appear when too far away when added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([3.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+
+ expect(marker._icon).to.be(undefined);
+ });
+
+
+});
diff --git a/spec/suites/AddLayersSpec.js b/spec/suites/AddLayersSpec.js
new file mode 100644
index 0000000..dfa0066
--- /dev/null
+++ b/spec/suites/AddLayersSpec.js
@@ -0,0 +1,85 @@
+describe('addLayers adding multiple markers', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+ it('creates a cluster when 2 overlapping markers are added before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ expect(marker._icon).to.be(undefined);
+ expect(marker2._icon).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+ });
+
+ it('creates a cluster when 2 overlapping markers are added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayers([marker, marker2]);
+
+ expect(marker._icon).to.be(undefined);
+ expect(marker2._icon).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+ });
+
+
+
+ it('creates a cluster and marker when 2 overlapping markers and one non-overlapping are added before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+ var marker3 = new L.Marker([3.0, 1.5]);
+
+ group.addLayers([marker, marker2, marker3]);
+ map.addLayer(group);
+
+ expect(marker._icon).to.be(undefined);
+ expect(marker2._icon).to.be(undefined);
+ expect(marker3._icon.parentNode).to.be(map._panes.markerPane);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(2);
+ });
+ it('creates a cluster and marker when 2 overlapping markers and one non-overlapping are added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+ var marker3 = new L.Marker([3.0, 1.5]);
+
+ map.addLayer(group);
+ group.addLayers([marker, marker2, marker3]);
+
+ expect(marker._icon).to.be(undefined);
+ expect(marker2._icon).to.be(undefined);
+ expect(marker3._icon.parentNode).to.be(map._panes.markerPane);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(2);
+ });
+
+});
\ No newline at end of file
diff --git a/spec/suites/ChildChangingIconSupportSpec.js b/spec/suites/ChildChangingIconSupportSpec.js
new file mode 100644
index 0000000..2814a16
--- /dev/null
+++ b/spec/suites/ChildChangingIconSupportSpec.js
@@ -0,0 +1,45 @@
+describe('support child markers changing icon', function () {
+ var map, div, clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ clock.restore();
+ document.body.removeChild(div);
+ });
+
+ it('child markers end up with the right icon after becoming unclustered', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5], { icon: new L.DivIcon({html: 'Inner1Text' }) });
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker._icon.innerHTML).to.contain('Inner1Text');
+
+ group.addLayer(marker2);
+
+ expect(marker._icon).to.be(null); //Have been removed from the map
+
+ marker.setIcon(new L.DivIcon({ html: 'Inner2Text' })); //Change the icon
+
+ group.removeLayer(marker2); //Remove the other marker, so we'll become unclustered
+
+ expect(marker._icon.innerHTML).to.contain('Inner2Text');
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/CircleMarkerSupportSpec.js b/spec/suites/CircleMarkerSupportSpec.js
new file mode 100644
index 0000000..04b667a
--- /dev/null
+++ b/spec/suites/CircleMarkerSupportSpec.js
@@ -0,0 +1,121 @@
+describe('support for CircleMarker elements', function () {
+ var map, div, clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ clock.restore();
+ document.body.removeChild(div);
+ });
+
+ it('appears when added to the group before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.CircleMarker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._container).to.not.be(undefined);
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+
+ clock.tick(1000);
+ });
+ it('appears when added to the group after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.CircleMarker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._container).to.not.be(undefined);
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+
+ clock.tick(1000);
+ });
+ it('appears animated when added to the group after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup({ animateAddingMarkers: true });
+ var marker = new L.CircleMarker([1.5, 1.5]);
+ var marker2 = new L.CircleMarker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+ expect(marker2._container.parentNode).to.be(map._pathRoot);
+
+ clock.tick(1000);
+
+ expect(marker._container.parentNode).to.be(null);
+ expect(marker2._container.parentNode).to.be(null);
+ });
+
+
+ it('creates a cluster when 2 overlapping markers are added before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.CircleMarker([1.5, 1.5]);
+ var marker2 = new L.CircleMarker([1.5, 1.5]);
+
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ expect(marker._container).to.be(undefined);
+ expect(marker2._container).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+
+ clock.tick(1000);
+ });
+ it('creates a cluster when 2 overlapping markers are added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.CircleMarker([1.5, 1.5]);
+ var marker2 = new L.CircleMarker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ expect(marker._container.parentNode).to.be(null); //Removed then re-added, so null
+ expect(marker2._container).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+
+ clock.tick(1000);
+ });
+
+ it('disappears when removed from the group', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.CircleMarker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._container).to.not.be(undefined);
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+
+ group.removeLayer(marker);
+
+ expect(marker._container.parentNode).to.be(null);
+
+ clock.tick(1000);
+ });
+
+});
\ No newline at end of file
diff --git a/spec/suites/CircleSupportSpec.js b/spec/suites/CircleSupportSpec.js
new file mode 100644
index 0000000..245951a
--- /dev/null
+++ b/spec/suites/CircleSupportSpec.js
@@ -0,0 +1,118 @@
+describe('support for Circle elements', function () {
+ var map, div, clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ clock.restore();
+ document.body.removeChild(div);
+ });
+
+ it('appears when added to the group before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Circle([1.5, 1.5], 200);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._container).to.not.be(undefined);
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+
+ clock.tick(1000);
+ });
+ it('appears when added to the group after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Circle([1.5, 1.5], 200);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._container).to.not.be(undefined);
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+
+ clock.tick(1000);
+ });
+ it('appears animated when added to the group after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup({ animateAddingMarkers: true });
+ var marker = new L.Circle([1.5, 1.5], 200);
+ var marker2 = new L.Circle([1.5, 1.5], 200);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+ expect(marker2._container.parentNode).to.be(map._pathRoot);
+
+ clock.tick(1000);
+ });
+
+
+ it('creates a cluster when 2 overlapping markers are added before the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Circle([1.5, 1.5], 200);
+ var marker2 = new L.Circle([1.5, 1.5], 200);
+
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ expect(marker._container).to.be(undefined);
+ expect(marker2._container).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+
+ clock.tick(1000);
+ });
+ it('creates a cluster when 2 overlapping markers are added after the group is added to the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Circle([1.5, 1.5], 200);
+ var marker2 = new L.Circle([1.5, 1.5], 200);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ expect(marker._container.parentNode).to.be(null); //Removed then re-added, so null
+ expect(marker2._container).to.be(undefined);
+
+ expect(map._panes.markerPane.childNodes.length).to.be(1);
+
+ clock.tick(1000);
+ });
+
+ it('disappears when removed from the group', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Circle([1.5, 1.5], 200);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ expect(marker._container).to.not.be(undefined);
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+
+ group.removeLayer(marker);
+
+ expect(marker._container.parentNode).to.be(null);
+
+ clock.tick(1000);
+ });
+
+});
\ No newline at end of file
diff --git a/spec/suites/DistanceGridSpec.js b/spec/suites/DistanceGridSpec.js
new file mode 100644
index 0000000..118dbec
--- /dev/null
+++ b/spec/suites/DistanceGridSpec.js
@@ -0,0 +1,21 @@
+describe('distance grid', function () {
+ it('addObject', function () {
+ var grid = new L.DistanceGrid(100),
+ obj = {};
+
+ expect(grid.addObject(obj, { x: 0, y: 0 })).to.eql(undefined);
+ expect(grid.removeObject(obj, { x: 0, y: 0 })).to.eql(true);
+ });
+
+ it('eachObject', function (done) {
+ var grid = new L.DistanceGrid(100),
+ obj = {};
+
+ expect(grid.addObject(obj, { x: 0, y: 0 })).to.eql(undefined);
+
+ grid.eachObject(function(o) {
+ expect(o).to.eql(obj);
+ done();
+ });
+ });
+});
diff --git a/spec/suites/LeafletSpec.js b/spec/suites/LeafletSpec.js
new file mode 100644
index 0000000..9e954d9
--- /dev/null
+++ b/spec/suites/LeafletSpec.js
@@ -0,0 +1,6 @@
+describe('L#noConflict', function() {
+ it('restores the previous L value and returns Leaflet namespace', function(){
+
+ expect(L.version).to.be.ok();
+ });
+});
diff --git a/spec/suites/NonPointSpec.js b/spec/suites/NonPointSpec.js
new file mode 100644
index 0000000..561167e
--- /dev/null
+++ b/spec/suites/NonPointSpec.js
@@ -0,0 +1,199 @@
+describe('adding non point data works', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+ it('Allows adding a polygon before via addLayer', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0,2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ map.addLayer(group);
+
+ expect(polygon._container).to.not.be(undefined);
+ expect(polygon._container.parentNode).to.be(map._pathRoot);
+
+ expect(group.hasLayer(polygon));
+ });
+
+ it('Allows adding a polygon before via addLayers([])', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayers([polygon]);
+ map.addLayer(group);
+
+ expect(polygon._container).to.not.be(undefined);
+ expect(polygon._container.parentNode).to.be(map._pathRoot);
+ });
+
+ it('Removes polygons from map when removed', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ map.addLayer(group);
+ map.removeLayer(group);
+
+ expect(polygon._container.parentNode).to.be(null);
+ });
+
+ describe('hasLayer', function () {
+ it('returns false when not added', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ expect(group.hasLayer(polygon)).to.be(false);
+
+ map.addLayer(group);
+
+ expect(group.hasLayer(polygon)).to.be(false);
+
+ map.addLayer(polygon);
+
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+
+ it('returns true before adding to map', function() {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayers([polygon]);
+
+ expect(group.hasLayer(polygon)).to.be(true);
+ });
+
+ it('returns true after adding to map after adding polygon', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ map.addLayer(group);
+
+ expect(group.hasLayer(polygon)).to.be(true);
+ });
+
+ it('returns true after adding to map before adding polygon', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ map.addLayer(group);
+ group.addLayer(polygon);
+
+ expect(group.hasLayer(polygon)).to.be(true);
+ });
+ });
+
+ describe('removeLayer', function() {
+ it('removes before adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+
+ it('removes before adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayers([polygon]);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+
+ it('removes after adding to map after adding polygon', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ map.addLayer(group);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+
+ it('removes after adding to map before adding polygon', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ map.addLayer(group);
+ group.addLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+ });
+
+ describe('removeLayers', function () {
+ it('removes before adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayers([polygon]);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+
+ it('removes before adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayers([polygon]);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayers([polygon]);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+
+ it('removes after adding to map after adding polygon', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ map.addLayer(group);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayers([polygon]);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+
+ it('removes after adding to map before adding polygon', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ map.addLayer(group);
+ group.addLayer(polygon);
+ expect(group.hasLayer(polygon)).to.be(true);
+
+ group.removeLayers([polygon]);
+ expect(group.hasLayer(polygon)).to.be(false);
+ });
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/QuickHullSpec.js b/spec/suites/QuickHullSpec.js
new file mode 100644
index 0000000..a11325f
--- /dev/null
+++ b/spec/suites/QuickHullSpec.js
@@ -0,0 +1,35 @@
+describe('quickhull', function () {
+ describe('getDistant', function () {
+ it('zero distance', function () {
+ var bl = [
+ { lat: 0, lng: 0 },
+ { lat: 0, lng: 10 }
+ ];
+ expect(L.QuickHull.getDistant({ lat: 0, lng: 0 }, bl)).to.eql(0);
+ });
+ it('non-zero distance', function () {
+ var bl = [
+ { lat: 0, lng: 0 },
+ { lat: 0, lng: 10 }
+ ];
+ expect(L.QuickHull.getDistant({ lat: 5, lng: 5 }, bl)).to.eql(-50);
+ });
+ });
+
+ describe('getConvexHull', function () {
+ it('creates a hull', function () {
+ expect(L.QuickHull.getConvexHull([
+ { lat: 0, lng: 0 },
+ { lat: 10, lng: 0 },
+ { lat: 10, lng: 10 },
+ { lat: 0, lng: 10 },
+ { lat: 5, lng: 5 },
+ ])).to.eql([
+ { lat: 0, lng: 10 },
+ { lat: 10, lng: 10 },
+ { lat: 10, lng: 0 },
+ { lat: 0, lng: 0 },
+ ]);
+ });
+ });
+});
diff --git a/spec/suites/RemoveLayerSpec.js b/spec/suites/RemoveLayerSpec.js
new file mode 100644
index 0000000..52f014c
--- /dev/null
+++ b/spec/suites/RemoveLayerSpec.js
@@ -0,0 +1,161 @@
+describe('removeLayer', function () {
+ var map, div, clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ clock.restore();
+ document.body.removeChild(div);
+ });
+
+ it('removes a layer that was added to it', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+
+ group.addLayer(marker);
+
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+
+ group.removeLayer(marker);
+
+ expect(marker._icon).to.be(null);
+ });
+
+ it('doesnt remove a layer not added to it', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+
+ map.addLayer(marker);
+
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+
+ group.removeLayer(marker);
+
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ });
+
+ it('removes a layer that was added to it (before being on the map) that is shown in a cluster', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ group.removeLayer(marker);
+
+ expect(marker._icon).to.be(undefined);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+ });
+
+ it('removes a layer that was added to it (after being on the map) that is shown in a cluster', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ group.removeLayer(marker);
+
+ expect(marker._icon).to.be(null);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+ });
+
+ it('removes a layer that was added to it (before being on the map) that is individually', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1, 1.5]);
+ var marker2 = new L.Marker([3, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+
+ group.removeLayer(marker);
+
+ expect(marker._icon).to.be(null);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+ });
+
+ it('removes a layer (with animation) that was added to it (after being on the map) that is shown in a cluster', function () {
+
+ var group = new L.MarkerClusterGroup({ animateAddingMarkers: true });
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+ group.addLayer(marker2);
+
+ //Run the the animation
+ clock.tick(1000);
+
+ expect(marker._icon).to.be(null);
+ expect(marker2._icon).to.be(null);
+
+ group.removeLayer(marker);
+
+ //Run the the animation
+ clock.tick(1000);
+
+ expect(marker._icon).to.be(null);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+ });
+
+ it('removes the layers that are in the given LayerGroup', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayers([marker, marker2]);
+
+ var layer = L.layerGroup();
+ layer.addLayer(marker2);
+ group.removeLayer(layer);
+
+ expect(marker._icon).to.not.be(undefined);
+ expect(marker2._icon).to.be(undefined);
+ });
+
+ it('removes the layers that are in the given LayerGroup when not on the map', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([marker, marker2]);
+
+ var layer = L.layerGroup();
+ layer.addLayer(marker2);
+ group.removeLayer(layer);
+
+ expect(group.hasLayer(marker)).to.be(true);
+ expect(group.hasLayer(marker2)).to.be(false);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/SpecHelper.js b/spec/suites/SpecHelper.js
new file mode 100644
index 0000000..037dc2c
--- /dev/null
+++ b/spec/suites/SpecHelper.js
@@ -0,0 +1,26 @@
+function noSpecs() {
+ xit('has no specs');
+}
+
+if (!Array.prototype.map) {
+ Array.prototype.map = function(fun /*, thisp */) {
+ "use strict";
+
+ if (this === void 0 || this === null)
+ throw new TypeError();
+
+ var t = Object(this);
+ var len = t.length >>> 0;
+ if (typeof fun !== "function")
+ throw new TypeError();
+
+ var res = new Array(len);
+ var thisp = arguments[1];
+ for (var i = 0; i < len; i++) {
+ if (i in t)
+ res[i] = fun.call(thisp, t[i], i, t);
+ }
+
+ return res;
+ };
+}
\ No newline at end of file
diff --git a/spec/suites/clearLayersSpec.js b/spec/suites/clearLayersSpec.js
new file mode 100644
index 0000000..3dde762
--- /dev/null
+++ b/spec/suites/clearLayersSpec.js
@@ -0,0 +1,44 @@
+describe('clearLayer', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+ it('clears everything before adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([polygon, marker]);
+ group.clearLayers();
+
+ expect(group.hasLayer(polygon)).to.be(false);
+ expect(group.hasLayer(marker)).to.be(false);
+ });
+
+ it('hits polygons and markers after adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([polygon, marker]);
+ map.addLayer(group);
+ group.clearLayers();
+
+ expect(group.hasLayer(polygon)).to.be(false);
+ expect(group.hasLayer(marker)).to.be(false);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/eachLayerSpec.js b/spec/suites/eachLayerSpec.js
new file mode 100644
index 0000000..0b10a92
--- /dev/null
+++ b/spec/suites/eachLayerSpec.js
@@ -0,0 +1,54 @@
+describe('eachLayer', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+ it('hits polygons and markers before adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([polygon, marker]);
+
+ var layers = [];
+ group.eachLayer(function (l) {
+ layers.push(l);
+ });
+
+ expect(layers.length).to.be(2);
+ expect(layers).to.contain(marker);
+ expect(layers).to.contain(polygon);
+ });
+
+ it('hits polygons and markers after adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([polygon, marker]);
+ map.addLayer(group);
+
+ var layers = [];
+ group.eachLayer(function (l) {
+ layers.push(l);
+ });
+
+ expect(layers.length).to.be(2);
+ expect(layers).to.contain(marker);
+ expect(layers).to.contain(polygon);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/eventsSpec.js b/spec/suites/eventsSpec.js
new file mode 100644
index 0000000..38599b8
--- /dev/null
+++ b/spec/suites/eventsSpec.js
@@ -0,0 +1,159 @@
+describe('events', function() {
+ var map, div;
+ beforeEach(function() {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function() {
+ document.body.removeChild(div);
+ });
+
+ it('is fired for a single child marker', function () {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.on('click', callback);
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ marker.fire('click');
+
+ expect(callback.called).to.be(true);
+ });
+
+ it('is fired for a child polygon', function () {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.on('click', callback);
+ group.addLayer(polygon);
+ map.addLayer(group);
+
+ polygon.fire('click');
+
+ expect(callback.called).to.be(true);
+ });
+
+ it('is fired for a cluster click', function () {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.on('clusterclick', callback);
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ var cluster = group.getVisibleParent(marker);
+ expect(cluster instanceof L.MarkerCluster).to.be(true);
+
+ cluster.fire('click');
+
+ expect(callback.called).to.be(true);
+ });
+
+ describe('after being added, removed, re-added from the map', function() {
+ it('still fires events for nonpoint data', function() {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.on('click', callback);
+ group.addLayer(polygon);
+ map.addLayer(group);
+ map.removeLayer(group);
+ map.addLayer(group);
+
+ polygon.fire('click');
+
+ expect(callback.called).to.be(true);
+ });
+
+ it('still fires events for point data', function() {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.on('click', callback);
+ group.addLayer(marker);
+ map.addLayer(group);
+ map.removeLayer(group);
+ map.addLayer(group);
+
+ marker.fire('click');
+
+ expect(callback.called).to.be(true);
+ });
+
+ it('still fires cluster events', function() {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.on('clusterclick', callback);
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ map.removeLayer(group);
+ map.addLayer(group);
+
+ var cluster = group.getVisibleParent(marker);
+ expect(cluster instanceof L.MarkerCluster).to.be(true);
+
+ cluster.fire('click');
+
+ expect(callback.called).to.be(true);
+ });
+
+ it('doesnt break map events', function () {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ map.on('zoomend', callback);
+ map.addLayer(group);
+
+ map.removeLayer(group);
+ map.addLayer(group);
+
+ map.fire('zoomend');
+
+ expect(callback.called).to.be(true);
+ });
+ });
+ /*
+ //No normal events can be fired by a clustered marker, so probably don't need this.
+ it('is fired for a clustered child marker', function() {
+ var callback = sinon.spy();
+ var group = new L.MarkerClusterGroup();
+
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.on('click', callback);
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ marker.fire('click');
+
+ expect(callback.called).to.be(true);
+ });
+ */
+});
\ No newline at end of file
diff --git a/spec/suites/getBoundsSpec.js b/spec/suites/getBoundsSpec.js
new file mode 100644
index 0000000..b4976f9
--- /dev/null
+++ b/spec/suites/getBoundsSpec.js
@@ -0,0 +1,118 @@
+describe('getBounds', function() {
+ var map, div;
+ beforeEach(function() {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function() {
+ document.body.removeChild(div);
+ });
+
+ describe('polygon layer', function() {
+ it('returns the correct bounds before adding to the map', function() {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+
+ expect(group.getBounds().equals(polygon.getBounds())).to.be(true);
+ });
+
+ it('returns the correct bounds after adding to the map after adding polygon', function() {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayer(polygon);
+ map.addLayer(group);
+
+ expect(group.getBounds().equals(polygon.getBounds())).to.be(true);
+ });
+
+ it('returns the correct bounds after adding to the map before adding polygon', function() {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ map.addLayer(group);
+ group.addLayer(polygon);
+
+ expect(group.getBounds().equals(polygon.getBounds())).to.be(true);
+ });
+ });
+
+ describe('marker layers', function () {
+ it('returns the correct bounds before adding to the map', function () {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.0, 5.0]);
+ var marker3 = new L.Marker([6.0, 2.0]);
+
+ group.addLayers([marker, marker2, marker3]);
+
+ expect(group.getBounds().equals(L.latLngBounds([1.0, 5.0], [6.0, 1.5]))).to.be(true);
+ });
+
+ it('returns the correct bounds after adding to the map after adding markers', function () {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.0, 5.0]);
+ var marker3 = new L.Marker([6.0, 2.0]);
+
+ group.addLayers([marker, marker2, marker3]);
+ map.addLayer(group);
+
+ expect(group.getBounds().equals(L.latLngBounds([1.0, 5.0], [6.0, 1.5]))).to.be(true);
+ });
+
+ it('returns the correct bounds after adding to the map before adding markers', function () {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.0, 5.0]);
+ var marker3 = new L.Marker([6.0, 2.0]);
+
+ map.addLayer(group);
+ group.addLayers([marker, marker2, marker3]);
+
+ expect(group.getBounds().equals(L.latLngBounds([1.0, 5.0], [6.0, 1.5]))).to.be(true);
+ });
+ });
+
+ describe('marker and polygon layers', function() {
+ it('returns the correct bounds before adding to the map', function() {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([6.0, 3.0]);
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ group.addLayers([marker, polygon]);
+
+ expect(group.getBounds().equals(L.latLngBounds([1.5, 1.5], [6.0, 3.0]))).to.be(true);
+ });
+
+ it('returns the correct bounds after adding to the map', function () {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([6.0, 3.0]);
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+
+ map.addLayer(group);
+ group.addLayers([marker, polygon]);
+
+ expect(group.getBounds().equals(L.latLngBounds([1.5, 1.5], [6.0, 3.0]))).to.be(true);
+ });
+ });
+
+ describe('blank layer', function () {
+ it('returns a blank bounds', function () {
+ var group = new L.MarkerClusterGroup();
+
+ expect(group.getBounds().isValid()).to.be(false);
+ });
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/getLayersSpec.js b/spec/suites/getLayersSpec.js
new file mode 100644
index 0000000..1c45096
--- /dev/null
+++ b/spec/suites/getLayersSpec.js
@@ -0,0 +1,48 @@
+describe('getLayers', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+ it('hits polygons and markers before adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([polygon, marker]);
+
+ var layers = group.getLayers();
+
+ expect(layers.length).to.be(2);
+ expect(layers).to.contain(marker);
+ expect(layers).to.contain(polygon);
+ });
+
+ it('hits polygons and markers after adding to map', function () {
+ var group = new L.MarkerClusterGroup();
+ var polygon = new L.Polygon([[1.5, 1.5], [2.0, 1.5], [2.0, 2.0], [1.5, 2.0]]);
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([polygon, marker]);
+ map.addLayer(group);
+
+ var layers = group.getLayers();
+
+ expect(layers.length).to.be(2);
+ expect(layers).to.contain(marker);
+ expect(layers).to.contain(polygon);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/getVisibleParentSpec.js b/spec/suites/getVisibleParentSpec.js
new file mode 100644
index 0000000..7318184
--- /dev/null
+++ b/spec/suites/getVisibleParentSpec.js
@@ -0,0 +1,59 @@
+describe('getVisibleParent', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+ it('gets the marker if the marker is visible', function () {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ map.addLayer(group);
+
+ var vp = group.getVisibleParent(marker);
+
+ expect(vp).to.be(marker);
+ });
+
+ it('gets the visible cluster if it is clustered', function () {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ var vp = group.getVisibleParent(marker);
+
+ expect(vp).to.be.a(L.MarkerCluster);
+ expect(vp._icon).to.not.be(null);
+ expect(vp._icon).to.not.be(undefined);
+ });
+
+ it('returns null if the marker and parents are all not visible', function () {
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([5.5, 1.5]);
+ var marker2 = new L.Marker([5.5, 1.5]);
+
+ group.addLayers([marker, marker2]);
+ map.addLayer(group);
+
+ var vp = group.getVisibleParent(marker);
+
+ expect(vp).to.be(null);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/onAddSpec.js b/spec/suites/onAddSpec.js
new file mode 100644
index 0000000..336e45a
--- /dev/null
+++ b/spec/suites/onAddSpec.js
@@ -0,0 +1,55 @@
+describe('onAdd', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div);
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+
+ it('throws an error if maxZoom is not specified', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+
+ group.addLayer(marker);
+
+ var ex = null;
+ try {
+ map.addLayer(group);
+ } catch (e) {
+ ex = e;
+ }
+
+ expect(ex).to.not.be(null);
+ });
+
+ it('successfully handles removing and re-adding a layer while not on the map', function () {
+ map.options.maxZoom = 18;
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+
+ map.addLayer(group);
+ group.addLayer(marker);
+
+ map.removeLayer(group);
+ group.removeLayer(marker);
+ group.addLayer(marker);
+
+ map.addLayer(group);
+
+ expect(map.hasLayer(group)).to.be(true);
+ expect(group.hasLayer(marker)).to.be(true);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/onRemoveSpec.js b/spec/suites/onRemoveSpec.js
new file mode 100644
index 0000000..a1dae43
--- /dev/null
+++ b/spec/suites/onRemoveSpec.js
@@ -0,0 +1,42 @@
+describe('onRemove', function () {
+ var map, div;
+ beforeEach(function () {
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ document.body.removeChild(div);
+ });
+
+
+ it('removes the shown coverage polygon', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+ var marker3 = new L.Marker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ group.addLayer(marker3);
+
+ map.addLayer(group);
+
+ group._showCoverage({ layer: group._topClusterLevel });
+
+ expect(group._shownPolygon).to.not.be(null);
+
+ map.removeLayer(group);
+
+ expect(group._shownPolygon).to.be(null);
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/spiderfySpec.js b/spec/suites/spiderfySpec.js
new file mode 100644
index 0000000..366bf1a
--- /dev/null
+++ b/spec/suites/spiderfySpec.js
@@ -0,0 +1,92 @@
+describe('spiderfy', function () {
+ var map, div, clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+
+ map.fitBounds(new L.LatLngBounds([
+ [1, 1],
+ [2, 2]
+ ]));
+ });
+ afterEach(function () {
+ clock.restore();
+ document.body.removeChild(div);
+ });
+
+ it('Spiderfies 2 Markers', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Marker([1.5, 1.5]);
+ var marker2 = new L.Marker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ map.addLayer(group);
+
+ marker.__parent.spiderfy();
+
+ expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+ });
+
+ it('Spiderfies 2 CircleMarkers', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.CircleMarker([1.5, 1.5]);
+ var marker2 = new L.CircleMarker([1.5, 1.5]);
+
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ map.addLayer(group);
+
+ marker.__parent.spiderfy();
+
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+ expect(marker2._container.parentNode).to.be(map._pathRoot);
+ });
+
+ it('Spiderfies 2 Circles', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Circle([1.5, 1.5], 10);
+ var marker2 = new L.Circle([1.5, 1.5], 10);
+
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ map.addLayer(group);
+
+ marker.__parent.spiderfy();
+
+ expect(marker._container.parentNode).to.be(map._pathRoot);
+ expect(marker2._container.parentNode).to.be(map._pathRoot);
+ });
+
+ describe('zoomend event listener', function () {
+ it('unspiderfies correctly', function () {
+
+ var group = new L.MarkerClusterGroup();
+ var marker = new L.Circle([1.5, 1.5], 10);
+ var marker2 = new L.Circle([1.5, 1.5], 10);
+
+ group.addLayer(marker);
+ group.addLayer(marker2);
+ map.addLayer(group);
+
+ marker.__parent.spiderfy();
+
+ expect(group._spiderfied).to.not.be(null);
+
+ map.fire('zoomend');
+
+ //We should unspiderfy with no animation, so this should be null
+ expect(group._spiderfied).to.be(null);
+ });
+ });
+});
\ No newline at end of file
diff --git a/spec/suites/zoomAnimationSpec.js b/spec/suites/zoomAnimationSpec.js
new file mode 100644
index 0000000..dbf60f9
--- /dev/null
+++ b/spec/suites/zoomAnimationSpec.js
@@ -0,0 +1,95 @@
+describe('zoomAnimation', function () {
+ var map, div, clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+
+ div = document.createElement('div');
+ div.style.width = '200px';
+ div.style.height = '200px';
+ document.body.appendChild(div);
+
+ map = L.map(div, { maxZoom: 18 });
+ });
+ afterEach(function () {
+ clock.restore();
+
+ document.body.removeChild(div);
+ });
+
+ it('adds the visible marker to the map when zooming in', function () {
+ map.setView(new L.LatLng(-37.36142550190516, 174.254150390625), 7);
+
+ var markers = new L.MarkerClusterGroup({
+ showCoverageOnHover: true,
+ maxClusterRadius: 20,
+ disableClusteringAtZoom: 15
+ });
+ var marker = new L.Marker([-37.77852090603777, 175.3103667497635]);
+ markers.addLayer(marker); //The one we zoom in on
+ markers.addLayer(new L.Marker([-37.711800591811055, 174.50034790039062])); //Marker that we cluster with at the top zoom level, but not 1 level down
+ map.addLayer(markers);
+
+ clock.tick(1000);
+ map.setView([-37.77852090603777, 175.3103667497635], 15);
+
+ //Run the the animation
+ clock.tick(1000);
+
+ expect(marker._icon).to.not.be(undefined);
+ expect(marker._icon).to.not.be(null);
+ });
+
+ it('adds the visible marker to the map when jumping around', function () {
+
+ var markers = new L.MarkerClusterGroup();
+ var marker1 = new L.Marker([48.858280181884766, 2.2945759296417236]);
+ var marker2 = new L.Marker([16.02359962463379, -61.70280075073242]);
+ markers.addLayer(marker1); //The one we zoom in on first
+ markers.addLayer(marker2); //Marker that we cluster with at the top zoom level, but not 1 level down
+ map.addLayer(markers);
+
+ //show the first
+ map.fitBounds(new L.LatLngBounds(new L.LatLng(41.371582, -5.142222), new L.LatLng(51.092804, 9.561556)));
+
+ clock.tick(1000);
+
+ map.fitBounds(new L.LatLngBounds(new L.LatLng(15.830972671508789, -61.807167053222656), new L.LatLng(16.516849517822266, -61.0)));
+
+ //Run the the animation
+ clock.tick(1000);
+
+ //Now the second one should be visible on the map
+ expect(marker2._icon).to.not.be(undefined);
+ expect(marker2._icon).to.not.be(null);
+ });
+
+ it('adds the visible markers to the map, but not parent clusters when jumping around', function () {
+
+ var markers = new L.MarkerClusterGroup(),
+ marker1 = new L.Marker([59.9520, 30.3307]),
+ marker2 = new L.Marker([59.9516, 30.3308]),
+ marker3 = new L.Marker([59.9513, 30.3312]);
+
+ markers.addLayer(marker1);
+ markers.addLayer(marker2);
+ markers.addLayer(marker3);
+ map.addLayer(markers);
+
+ //Show none of them
+ map.setView([53.0676, 170.6835], 16);
+
+ clock.tick(1000);
+
+ //Zoom so that all the markers will be visible (Same as zoomToShowLayer)
+ map.setView(marker1.getLatLng(), 18);
+
+ //Run the the animation
+ clock.tick(1000);
+
+ //Now the markers should all be visible, and there should be no visible clusters
+ expect(marker1._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker3._icon.parentNode).to.be(map._panes.markerPane);
+ expect(map._panes.markerPane.childNodes.length).to.be(3);
+ });
+});
\ No newline at end of file
diff --git a/src/DistanceGrid.js b/src/DistanceGrid.js
index 8235c61..5670c49 100644
--- a/src/DistanceGrid.js
+++ b/src/DistanceGrid.js
@@ -57,20 +57,16 @@ L.DistanceGrid.prototype = {
grid = this._grid;
for (i in grid) {
- if (grid.hasOwnProperty(i)) {
- row = grid[i];
+ row = grid[i];
- for (j in row) {
- if (row.hasOwnProperty(j)) {
- cell = row[j];
+ for (j in row) {
+ cell = row[j];
- for (k = 0, len = cell.length; k < len; k++) {
- removed = fn.call(context, cell[k]);
- if (removed) {
- k--;
- len--;
- }
- }
+ for (k = 0, len = cell.length; k < len; k++) {
+ removed = fn.call(context, cell[k]);
+ if (removed) {
+ k--;
+ len--;
}
}
}
diff --git a/src/MarkerCluster.QuickHull.js b/src/MarkerCluster.QuickHull.js
index 8f033bc..b0819d5 100644
--- a/src/MarkerCluster.QuickHull.js
+++ b/src/MarkerCluster.QuickHull.js
@@ -26,13 +26,26 @@ Retrieved from: http://en.literateprograms.org/Quickhull_(Javascript)?oldid=1843
(function () {
L.QuickHull = {
+
+ /*
+ * @param {Object} cpt a point to be measured from the baseline
+ * @param {Array} bl the baseline, as represented by a two-element
+ * array of latlng objects.
+ * @returns {Number} an approximate distance measure
+ */
getDistant: function (cpt, bl) {
var vY = bl[1].lat - bl[0].lat,
vX = bl[0].lng - bl[1].lng;
return (vX * (cpt.lat - bl[0].lat) + vY * (cpt.lng - bl[0].lng));
},
-
+ /*
+ * @param {Array} baseLine a two-element array of latlng objects
+ * representing the baseline to project from
+ * @param {Array} latLngs an array of latlng objects
+ * @returns {Object} the maximum point and all new points to stay
+ * in consideration for the hull.
+ */
findMostDistantPointFromBaseLine: function (baseLine, latLngs) {
var maxD = 0,
maxPt = null,
@@ -53,11 +66,19 @@ Retrieved from: http://en.literateprograms.org/Quickhull_(Javascript)?oldid=1843
maxD = d;
maxPt = pt;
}
-
}
- return { 'maxPoint': maxPt, 'newPoints': newPoints };
+
+ return { maxPoint: maxPt, newPoints: newPoints };
},
+
+ /*
+ * Given a baseline, compute the convex hull of latLngs as an array
+ * of latLngs.
+ *
+ * @param {Array} latLngs
+ * @returns {Array}
+ */
buildConvexHull: function (baseLine, latLngs) {
var convexHullBaseLines = [],
t = this.findMostDistantPointFromBaseLine(baseLine, latLngs);
@@ -73,12 +94,19 @@ Retrieved from: http://en.literateprograms.org/Quickhull_(Javascript)?oldid=1843
);
return convexHullBaseLines;
} else { // if there is no more point "outside" the base line, the current base line is part of the convex hull
- return [baseLine];
+ return [baseLine[0]];
}
},
+ /*
+ * Given an array of latlngs, compute a convex hull as an array
+ * of latlngs
+ *
+ * @param {Array} latLngs
+ * @returns {Array}
+ */
getConvexHull: function (latLngs) {
- //find first baseline
+ // find first baseline
var maxLat = false, minLat = false,
maxPt = null, minPt = null,
i;
@@ -105,20 +133,13 @@ L.MarkerCluster.include({
getConvexHull: function () {
var childMarkers = this.getAllChildMarkers(),
points = [],
- hullLatLng = [],
- hull, p, i;
+ p, i;
for (i = childMarkers.length - 1; i >= 0; i--) {
p = childMarkers[i].getLatLng();
points.push(p);
}
- hull = L.QuickHull.getConvexHull(points);
-
- for (i = hull.length - 1; i >= 0; i--) {
- hullLatLng.push(hull[i][0]);
- }
-
- return hullLatLng;
+ return L.QuickHull.getConvexHull(points);
}
-});
\ No newline at end of file
+});
diff --git a/src/MarkerCluster.Spiderfier.js b/src/MarkerCluster.Spiderfier.js
index 2b52a2f..ead03b4 100644
--- a/src/MarkerCluster.Spiderfier.js
+++ b/src/MarkerCluster.Spiderfier.js
@@ -51,7 +51,7 @@ L.MarkerCluster.include({
},
_generatePointsCircle: function (count, centerPt) {
- var circumference = this._circleFootSeparation * (2 + count),
+ var circumference = this._group.options.spiderfyDistanceMultiplier * this._circleFootSeparation * (2 + count),
legLength = circumference / this._2PI, //radius from circumference
angleStep = this._2PI / count,
res = [],
@@ -68,7 +68,9 @@ L.MarkerCluster.include({
},
_generatePointsSpiral: function (count, centerPt) {
- var legLength = this._spiralLengthStart,
+ var legLength = this._group.options.spiderfyDistanceMultiplier * this._spiralLengthStart,
+ separation = this._group.options.spiderfyDistanceMultiplier * this._spiralFootSeparation,
+ lengthFactor = this._group.options.spiderfyDistanceMultiplier * this._spiralLengthFactor,
angle = 0,
res = [],
i;
@@ -76,11 +78,41 @@ L.MarkerCluster.include({
res.length = count;
for (i = count - 1; i >= 0; i--) {
- angle += this._spiralFootSeparation / legLength + i * 0.0005;
+ angle += separation / legLength + i * 0.0005;
res[i] = new L.Point(centerPt.x + legLength * Math.cos(angle), centerPt.y + legLength * Math.sin(angle))._round();
- legLength += this._2PI * this._spiralLengthFactor / angle;
+ legLength += this._2PI * lengthFactor / angle;
}
return res;
+ },
+
+ _noanimationUnspiderfy: function () {
+ var group = this._group,
+ map = group._map,
+ fg = group._featureGroup,
+ childMarkers = this.getAllChildMarkers(),
+ m, i;
+
+ this.setOpacity(1);
+ for (i = childMarkers.length - 1; i >= 0; i--) {
+ m = childMarkers[i];
+
+ fg.removeLayer(m);
+
+ if (m._preSpiderfyLatlng) {
+ m.setLatLng(m._preSpiderfyLatlng);
+ delete m._preSpiderfyLatlng;
+ }
+ if (m.setZIndexOffset) {
+ m.setZIndexOffset(0);
+ }
+
+ if (m._spiderLeg) {
+ map.removeLayer(m._spiderLeg);
+ delete m._spiderLeg;
+ }
+ }
+
+ group._spiderfied = null;
}
});
@@ -89,6 +121,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
_animationSpiderfy: function (childMarkers, positions) {
var group = this._group,
map = group._map,
+ fg = group._featureGroup,
i, m, leg, newPos;
for (i = childMarkers.length - 1; i >= 0; i--) {
@@ -97,9 +130,11 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
m._preSpiderfyLatlng = m._latlng;
m.setLatLng(newPos);
- m.setZIndexOffset(1000000); //Make these appear on top of EVERYTHING
+ if (m.setZIndexOffset) {
+ m.setZIndexOffset(1000000); //Make these appear on top of EVERYTHING
+ }
- L.FeatureGroup.prototype.addLayer.call(group, m);
+ fg.addLayer(m);
leg = new L.Polyline([this._latlng, newPos], { weight: 1.5, color: '#222' });
@@ -111,31 +146,19 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
},
_animationUnspiderfy: function () {
- var group = this._group,
- map = group._map,
- childMarkers = this.getAllChildMarkers(),
- m, i;
-
- this.setOpacity(1);
- for (i = childMarkers.length - 1; i >= 0; i--) {
- m = childMarkers[i];
-
- L.FeatureGroup.prototype.removeLayer.call(group, m);
-
- m.setLatLng(m._preSpiderfyLatlng);
- delete m._preSpiderfyLatlng;
- m.setZIndexOffset(0);
-
- map.removeLayer(m._spiderLeg);
- delete m._spiderLeg;
- }
+ this._noanimationUnspiderfy();
}
} : {
//Animated versions here
+ SVG_ANIMATION: (function () {
+ return document.createElementNS('http://www.w3.org/2000/svg', 'animate').toString().indexOf('SVGAnimate') > -1;
+ }()),
+
_animationSpiderfy: function (childMarkers, positions) {
var me = this,
group = this._group,
map = group._map,
+ fg = group._featureGroup,
thisLayerPos = map.latLngToLayerPoint(this._latlng),
i, m, leg, newPos;
@@ -143,12 +166,18 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
for (i = childMarkers.length - 1; i >= 0; i--) {
m = childMarkers[i];
- m.setZIndexOffset(1000000); //Make these appear on top of EVERYTHING
- m.setOpacity(0);
-
- L.FeatureGroup.prototype.addLayer.call(group, m);
-
- m._setPos(thisLayerPos);
+ //If it is a marker, add it now and we'll animate it out
+ if (m.setOpacity) {
+ m.setZIndexOffset(1000000); //Make these appear on top of EVERYTHING
+ m.setOpacity(0);
+
+ fg.addLayer(m);
+
+ m._setPos(thisLayerPos);
+ } else {
+ //Vectors just get immediately added
+ fg.addLayer(m);
+ }
}
group._forceLayout();
@@ -165,7 +194,10 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
//Move marker to new position
m._preSpiderfyLatlng = m._latlng;
m.setLatLng(newPos);
- m.setOpacity(1);
+
+ if (m.setOpacity) {
+ m.setOpacity(1);
+ }
//Add Legs.
@@ -174,7 +206,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
m._spiderLeg = leg;
//Following animations don't work for canvas
- if (!L.Path.SVG) {
+ if (!L.Path.SVG || !this.SVG_ANIMATION) {
continue;
}
@@ -225,31 +257,40 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
setTimeout(function () {
group._animationEnd();
group.fire('spiderfied');
- }, 250);
+ }, 200);
},
_animationUnspiderfy: function (zoomDetails) {
var group = this._group,
map = group._map,
+ fg = group._featureGroup,
thisLayerPos = zoomDetails ? map._latLngToNewLayerPoint(this._latlng, zoomDetails.zoom, zoomDetails.center) : map.latLngToLayerPoint(this._latlng),
childMarkers = this.getAllChildMarkers(),
- svg = L.Path.SVG,
+ svg = L.Path.SVG && this.SVG_ANIMATION,
m, i, a;
group._animationStart();
-
+
//Make us visible and bring the child markers back in
this.setOpacity(1);
for (i = childMarkers.length - 1; i >= 0; i--) {
m = childMarkers[i];
+ //Marker was added to us after we were spidified
+ if (!m._preSpiderfyLatlng) {
+ continue;
+ }
+
//Fix up the location to the real one
m.setLatLng(m._preSpiderfyLatlng);
delete m._preSpiderfyLatlng;
//Hack override the location to be our center
- m._setPos(thisLayerPos);
-
- m.setOpacity(0);
+ if (m.setOpacity) {
+ m._setPos(thisLayerPos);
+ m.setOpacity(0);
+ } else {
+ fg.removeLayer(m);
+ }
//Animate the spider legs back in
if (svg) {
@@ -287,18 +328,20 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
}
- m.setOpacity(1);
- m.setZIndexOffset(0);
+ if (m.setOpacity) {
+ m.setOpacity(1);
+ m.setZIndexOffset(0);
+ }
if (stillThereChildCount > 1) {
- L.FeatureGroup.prototype.removeLayer.call(group, m);
+ fg.removeLayer(m);
}
map.removeLayer(m._spiderLeg);
delete m._spiderLeg;
}
group._animationEnd();
- }, 250);
+ }, 200);
}
});
@@ -312,10 +355,9 @@ L.MarkerClusterGroup.include({
if (this._map.options.zoomAnimation) {
this._map.on('zoomstart', this._unspiderfyZoomStart, this);
- } else {
- //Browsers without zoomAnimation don't fire zoomstart
- this._map.on('zoomend', this._unspiderfyWrapper, this);
}
+ //Browsers without zoomAnimation or a big zoom don't fire zoomstart
+ this._map.on('zoomend', this._noanimationUnspiderfy, this);
if (L.Path.SVG && !L.Browser.touch) {
this._map._initPathRoot();
@@ -365,10 +407,16 @@ L.MarkerClusterGroup.include({
}
},
+ _noanimationUnspiderfy: function () {
+ if (this._spiderfied) {
+ this._spiderfied._noanimationUnspiderfy();
+ }
+ },
+
//If the given layer is currently being spiderfied then we unspiderfy it so it isn't on the map anymore etc
_unspiderfyLayer: function (layer) {
if (layer._spiderLeg) {
- L.FeatureGroup.prototype.removeLayer.call(this, layer);
+ this._featureGroup.removeLayer(layer);
layer.setOpacity(1);
//Position will be fixed up immediately in _animationUnspiderfy
@@ -378,4 +426,4 @@ L.MarkerClusterGroup.include({
delete layer._spiderLeg;
}
}
-});
\ No newline at end of file
+});
diff --git a/src/MarkerCluster.js b/src/MarkerCluster.js
index b83bf81..a3a7d67 100644
--- a/src/MarkerCluster.js
+++ b/src/MarkerCluster.js
@@ -42,11 +42,39 @@ L.MarkerCluster = L.Marker.extend({
return this._childCount;
},
- //Zoom to the extents of this cluster
+ //Zoom to the minimum of showing all of the child markers, or the extents of this cluster
zoomToBounds: function () {
- this._group._map.fitBounds(this._bounds);
+ var childClusters = this._childClusters.slice(),
+ map = this._group._map,
+ boundsZoom = map.getBoundsZoom(this._bounds),
+ zoom = this._zoom + 1,
+ mapZoom = map.getZoom(),
+ i;
+
+ //calculate how fare we need to zoom down to see all of the markers
+ while (childClusters.length > 0 && boundsZoom > zoom) {
+ zoom++;
+ var newClusters = [];
+ for (i = 0; i < childClusters.length; i++) {
+ newClusters = newClusters.concat(childClusters[i]._childClusters);
+ }
+ childClusters = newClusters;
+ }
+
+ if (boundsZoom > zoom) {
+ this._group._map.setView(this._latlng, zoom);
+ } else if (boundsZoom <= mapZoom) { //If fitBounds wouldn't zoom us down, zoom us down instead
+ this._group._map.setView(this._latlng, mapZoom + 1);
+ } else {
+ this._group._map.fitBounds(this._bounds);
+ }
},
+ getBounds: function () {
+ var bounds = new L.LatLngBounds();
+ bounds.extend(this._bounds);
+ return bounds;
+ },
_updateIcon: function () {
this._iconNeedsUpdate = true;
@@ -127,9 +155,9 @@ L.MarkerCluster = L.Marker.extend({
this._backupLatlng = this._latlng;
this.setLatLng(startPos);
}
- L.FeatureGroup.prototype.addLayer.call(this._group, this);
+ this._group._featureGroup.addLayer(this);
},
-
+
_recursivelyAnimateChildrenIn: function (bounds, center, maxZoom) {
this._recursively(bounds, 0, maxZoom - 1,
function (c) {
@@ -203,10 +231,12 @@ L.MarkerCluster = L.Marker.extend({
nm._backupLatlng = nm.getLatLng();
nm.setLatLng(startPos);
- nm.setOpacity(0);
+ if (nm.setOpacity) {
+ nm.setOpacity(0);
+ }
}
- L.FeatureGroup.prototype.addLayer.call(c._group, nm);
+ c._group._featureGroup.addLayer(nm);
}
},
function (c) {
@@ -253,8 +283,10 @@ L.MarkerCluster = L.Marker.extend({
for (i = c._markers.length - 1; i >= 0; i--) {
m = c._markers[i];
if (!exceptBounds || !exceptBounds.contains(m._latlng)) {
- L.FeatureGroup.prototype.removeLayer.call(c._group, m);
- m.setOpacity(1);
+ c._group._featureGroup.removeLayer(m);
+ if (m.setOpacity) {
+ m.setOpacity(1);
+ }
}
}
},
@@ -263,8 +295,10 @@ L.MarkerCluster = L.Marker.extend({
for (i = c._childClusters.length - 1; i >= 0; i--) {
m = c._childClusters[i];
if (!exceptBounds || !exceptBounds.contains(m._latlng)) {
- L.FeatureGroup.prototype.removeLayer.call(c._group, m);
- m.setOpacity(1);
+ c._group._featureGroup.removeLayer(m);
+ if (m.setOpacity) {
+ m.setOpacity(1);
+ }
}
}
}
diff --git a/src/MarkerClusterGroup.js b/src/MarkerClusterGroup.js
index ac80665..7f8f0fb 100644
--- a/src/MarkerClusterGroup.js
+++ b/src/MarkerClusterGroup.js
@@ -16,10 +16,17 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
disableClusteringAtZoom: null,
+ // Setting this to false prevents the removal of any clusters outside of the viewpoint, which
+ // is the default behaviour for performance reasons.
+ removeOutsideVisibleBounds: true,
+
//Whether to animate adding markers after adding the MarkerClusterGroup to the map
// If you are adding individual markers set to true, if adding bulk markers leave false for massive performance gains.
animateAddingMarkers: false,
+ //Increase to increase the distance away that spiderfied markers appear from the center
+ spiderfyDistanceMultiplier: 1,
+
//Options to pass to the L.Polygon constructor
polygonOptions: {}
},
@@ -30,12 +37,19 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
this.options.iconCreateFunction = this._defaultIconCreateFunction;
}
- L.FeatureGroup.prototype.initialize.call(this, []);
+ this._featureGroup = L.featureGroup();
+ this._featureGroup.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+
+ this._nonPointGroup = L.featureGroup();
+ this._nonPointGroup.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
this._inZoomAnimation = 0;
this._needsClustering = [];
+ this._needsRemoving = []; //Markers removed while we aren't on the map need to be kept track of
//The bounds of the currently shown area (from _getExpandedVisibleBounds) Updated on zoom/move
this._currentShownBounds = null;
+
+ this._queue = [];
},
addLayer: function (layer) {
@@ -43,22 +57,15 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
if (layer instanceof L.LayerGroup) {
var array = [];
for (var i in layer._layers) {
- if (layer._layers.hasOwnProperty(i)) {
- array.push(layer._layers[i]);
- }
+ array.push(layer._layers[i]);
}
return this.addLayers(array);
}
- if (this.options.singleMarkerMode) {
- layer.options.icon = this.options.iconCreateFunction({
- getChildCount: function () {
- return 1;
- },
- getAllChildMarkers: function () {
- return [layer];
- }
- });
+ //Don't cluster non point data
+ if (!layer.getLatLng) {
+ this._nonPointGroup.addLayer(layer);
+ return this;
}
if (!this._map) {
@@ -70,6 +77,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
return this;
}
+
//If we have already clustered we'll need to add this one to a cluster
if (this._unspiderfy) {
@@ -99,8 +107,25 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
removeLayer: function (layer) {
+ if (layer instanceof L.LayerGroup)
+ {
+ var array = [];
+ for (var i in layer._layers) {
+ array.push(layer._layers[i]);
+ }
+ return this.removeLayers(array);
+ }
+
+ //Non point layers
+ if (!layer.getLatLng) {
+ this._nonPointGroup.removeLayer(layer);
+ return this;
+ }
+
if (!this._map) {
- this._arraySplice(this._needsClustering, layer);
+ if (!this._arraySplice(this._needsClustering, layer) && this.hasLayer(layer)) {
+ this._needsRemoving.push(layer);
+ }
return this;
}
@@ -116,22 +141,41 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
//Remove the marker from clusters
this._removeLayer(layer, true);
- if (layer._icon) {
- L.FeatureGroup.prototype.removeLayer.call(this, layer);
- layer.setOpacity(1);
+ if (this._featureGroup.hasLayer(layer)) {
+ this._featureGroup.removeLayer(layer);
+ if (layer.setOpacity) {
+ layer.setOpacity(1);
+ }
}
+
return this;
},
//Takes an array of markers and adds them in bulk
addLayers: function (layersArray) {
- if (!this._map) {
- this._needsClustering = this._needsClustering.concat(layersArray);
- return this;
- }
+ var i, l, m,
+ onMap = this._map,
+ fg = this._featureGroup,
+ npg = this._nonPointGroup;
+
+ for (i = 0, l = layersArray.length; i < l; i++) {
+ m = layersArray[i];
+
+ //Not point data, can't be clustered
+ if (!m.getLatLng) {
+ npg.addLayer(m);
+ continue;
+ }
+
+ if (this.hasLayer(m)) {
+ continue;
+ }
+
+ if (!onMap) {
+ this._needsClustering.push(m);
+ continue;
+ }
- for (var i = 0, l = layersArray.length; i < l; i++) {
- var m = layersArray[i];
this._addLayer(m, this._maxZoom);
//If we just made a cluster of size 2 then we need to remove the other marker from the map (if it is) or we never will
@@ -139,47 +183,66 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
if (m.__parent.getChildCount() === 2) {
var markers = m.__parent.getAllChildMarkers(),
otherMarker = markers[0] === m ? markers[1] : markers[0];
- L.FeatureGroup.prototype.removeLayer.call(this, otherMarker);
+ fg.removeLayer(otherMarker);
}
}
}
- this._topClusterLevel._recursivelyAddChildrenToMap(null, this._zoom, this._currentShownBounds);
+
+ if (onMap) {
+ //Update the icons of all those visible clusters that were affected
+ fg.eachLayer(function (c) {
+ if (c instanceof L.MarkerCluster && c._iconNeedsUpdate) {
+ c._updateIcon();
+ }
+ });
+
+ this._topClusterLevel._recursivelyAddChildrenToMap(null, this._zoom, this._currentShownBounds);
+ }
return this;
},
//Takes an array of markers and removes them in bulk
removeLayers: function (layersArray) {
- var i, l, m;
+ var i, l, m,
+ fg = this._featureGroup,
+ npg = this._nonPointGroup;
if (!this._map) {
for (i = 0, l = layersArray.length; i < l; i++) {
- this._arraySplice(this._needsClustering, layersArray[i]);
+ m = layersArray[i];
+ this._arraySplice(this._needsClustering, m);
+ npg.removeLayer(m);
}
return this;
}
for (i = 0, l = layersArray.length; i < l; i++) {
m = layersArray[i];
+
+ if (!m.__parent) {
+ npg.removeLayer(m);
+ continue;
+ }
+
this._removeLayer(m, true, true);
- if (m._icon) {
- L.FeatureGroup.prototype.removeLayer.call(this, m);
- m.setOpacity(1);
+ if (fg.hasLayer(m)) {
+ fg.removeLayer(m);
+ if (m.setOpacity) {
+ m.setOpacity(1);
+ }
}
}
//Fix up the clusters and markers on the map
this._topClusterLevel._recursivelyAddChildrenToMap(null, this._zoom, this._currentShownBounds);
- for (i in this._layers) {
- if (this._layers.hasOwnProperty(i)) {
- m = this._layers[i];
- if (m instanceof L.MarkerCluster) {
- m._updateIcon();
- }
+ fg.eachLayer(function (c) {
+ if (c instanceof L.MarkerCluster) {
+ c._updateIcon();
}
- }
+ });
return this;
},
@@ -188,41 +251,109 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
clearLayers: function () {
//Need our own special implementation as the LayerGroup one doesn't work for us
- //If we aren't on the map yet, just blow away the markers we know of
+ //If we aren't on the map (yet), blow away the markers we know of
if (!this._map) {
this._needsClustering = [];
- return this;
+ delete this._gridClusters;
+ delete this._gridUnclustered;
}
- if (this._unspiderfy) {
- this._unspiderfy();
+ if (this._noanimationUnspiderfy) {
+ this._noanimationUnspiderfy();
}
//Remove all the visible layers
- for (var i in this._layers) {
- if (this._layers.hasOwnProperty(i)) {
- L.FeatureGroup.prototype.removeLayer.call(this, this._layers[i]);
+ this._featureGroup.clearLayers();
+ this._nonPointGroup.clearLayers();
+
+ this.eachLayer(function (marker) {
+ delete marker.__parent;
+ });
+
+ if (this._map) {
+ //Reset _topClusterLevel and the DistanceGrids
+ this._generateInitialClusters();
+ }
+
+ return this;
+ },
+
+ //Override FeatureGroup.getBounds as it doesn't work
+ getBounds: function () {
+ var bounds = new L.LatLngBounds();
+ if (this._topClusterLevel) {
+ bounds.extend(this._topClusterLevel._bounds);
+ } else {
+ for (var i = this._needsClustering.length - 1; i >= 0; i--) {
+ bounds.extend(this._needsClustering[i].getLatLng());
}
}
- //Reset _topClusterLevel and the DistanceGrids
- this._generateInitialClusters();
+ bounds.extend(this._nonPointGroup.getBounds());
- return this;
+ return bounds;
+ },
+
+ //Overrides LayerGroup.eachLayer
+ eachLayer: function (method, context) {
+ var markers = this._needsClustering.slice(),
+ i;
+
+ if (this._topClusterLevel) {
+ this._topClusterLevel.getAllChildMarkers(markers);
+ }
+
+ for (i = markers.length - 1; i >= 0; i--) {
+ method.call(context, markers[i]);
+ }
+
+ this._nonPointGroup.eachLayer(method, context);
+ },
+
+ //Overrides LayerGroup.getLayers
+ getLayers: function () {
+ var layers = [];
+ this.eachLayer(function (l) {
+ layers.push(l);
+ });
+ return layers;
+ },
+
+ //Overrides LayerGroup.getLayer, WARNING: Really bad performance
+ getLayer: function (id) {
+ var result = null;
+
+ this.eachLayer(function (l) {
+ if (L.stamp(l) === id) {
+ result = l;
+ }
+ });
+
+ return result;
},
//Returns true if the given layer is in this MarkerClusterGroup
hasLayer: function (layer) {
- if (this._needsClustering.length > 0) {
- var anArray = this._needsClustering;
- for (var i = anArray.length - 1; i >= 0; i--) {
- if (anArray[i] === layer) {
- return true;
- }
+ if (!layer) {
+ return false;
+ }
+
+ var i, anArray = this._needsClustering;
+
+ for (i = anArray.length - 1; i >= 0; i--) {
+ if (anArray[i] === layer) {
+ return true;
+ }
+ }
+
+ anArray = this._needsRemoving;
+ for (i = anArray.length - 1; i >= 0; i--) {
+ if (anArray[i] === layer) {
+ return false;
}
}
- return !!(layer.__parent && layer.__parent._group === this);
+ return !!(layer.__parent && layer.__parent._group === this) || this._nonPointGroup.hasLayer(layer);
},
//Zoom down to show the given layer (spiderfying if necessary) then calls the callback
@@ -247,14 +378,12 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
}
};
- if (layer._icon) {
+ if (layer._icon && this._map.getBounds().contains(layer.getLatLng())) {
callback();
} else if (layer.__parent._zoom < this._map.getZoom()) {
//Layer should be visible now but isn't on screen, just pan over to it
this._map.on('moveend', showMarker, this);
- if (!layer._icon) {
- this._map.panTo(layer.getLatLng());
- }
+ this._map.panTo(layer.getLatLng());
} else {
this._map.on('moveend', showMarker, this);
this.on('animationend', showMarker, this);
@@ -265,17 +394,44 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
//Overrides FeatureGroup.onAdd
onAdd: function (map) {
- L.FeatureGroup.prototype.onAdd.call(this, map);
+ this._map = map;
+ var i, l, layer;
+
+ if (!isFinite(this._map.getMaxZoom())) {
+ throw "Map has no maxZoom specified";
+ }
+
+ this._featureGroup.onAdd(map);
+ this._nonPointGroup.onAdd(map);
if (!this._gridClusters) {
this._generateInitialClusters();
}
- for (var i = 0, l = this._needsClustering.length; i < l; i++) {
- this._addLayer(this._needsClustering[i], this._maxZoom);
+ for (i = 0, l = this._needsRemoving.length; i < l; i++) {
+ layer = this._needsRemoving[i];
+ this._removeLayer(layer, true);
+ }
+ this._needsRemoving = [];
+
+ for (i = 0, l = this._needsClustering.length; i < l; i++) {
+ layer = this._needsClustering[i];
+
+ //If the layer doesn't have a getLatLng then we can't cluster it, so add it to our child featureGroup
+ if (!layer.getLatLng) {
+ this._featureGroup.addLayer(layer);
+ continue;
+ }
+
+
+ if (layer.__parent) {
+ continue;
+ }
+ this._addLayer(layer, this._maxZoom);
}
this._needsClustering = [];
+
this._map.on('zoomend', this._zoomEnd, this);
this._map.on('moveend', this._moveEnd, this);
@@ -298,8 +454,10 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
//Overrides FeatureGroup.onRemove
onRemove: function (map) {
- this._map.off('zoomend', this._zoomEnd, this);
- this._map.off('moveend', this._moveEnd, this);
+ map.off('zoomend', this._zoomEnd, this);
+ map.off('moveend', this._moveEnd, this);
+
+ this._unbindEvents();
//In case we are in a cluster animation
this._map._mapPane.className = this._map._mapPane.className.replace(' leaflet-cluster-anim', '');
@@ -308,16 +466,32 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
this._spiderfierOnRemove();
}
- L.FeatureGroup.prototype.onRemove.call(this, map);
+
+
+ //Clean up all the layers we added to the map
+ this._hideCoverage();
+ this._featureGroup.onRemove(map);
+ this._nonPointGroup.onRemove(map);
+
+ this._featureGroup.clearLayers();
+
+ this._map = null;
},
+ getVisibleParent: function (marker) {
+ var vMarker = marker;
+ while (vMarker && !vMarker._icon) {
+ vMarker = vMarker.__parent;
+ }
+ return vMarker || null;
+ },
//Remove the given object from the given array
_arraySplice: function (anArray, obj) {
for (var i = anArray.length - 1; i >= 0; i--) {
if (anArray[i] === obj) {
anArray.splice(i, 1);
- return;
+ return true;
}
}
},
@@ -327,6 +501,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
_removeLayer: function (marker, removeFromDistanceGrid, dontUpdateMap) {
var gridClusters = this._gridClusters,
gridUnclustered = this._gridUnclustered,
+ fg = this._featureGroup,
map = this._map;
//Remove the marker from distance clusters it might be in
@@ -367,9 +542,9 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
if (cluster._icon) {
//Cluster is currently on the map, need to put the marker on the map instead
- L.FeatureGroup.prototype.removeLayer.call(this, cluster);
+ fg.removeLayer(cluster);
if (!dontUpdateMap) {
- L.FeatureGroup.prototype.addLayer.call(this, otherMarker);
+ fg.addLayer(otherMarker);
}
}
} else {
@@ -381,14 +556,30 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
cluster = cluster.__parent;
}
+
+ delete marker.__parent;
+ },
+
+ _isOrIsParent: function (el, oel) {
+ while (oel) {
+ if (el === oel) {
+ return true;
+ }
+ oel = oel.parentNode;
+ }
+ return false;
},
- //Overrides FeatureGroup._propagateEvent
_propagateEvent: function (e) {
- if (e.target instanceof L.MarkerCluster) {
+ if (e.layer instanceof L.MarkerCluster) {
+ //Prevent multiple clustermouseover/off events if the icon is made up of stacked divs (Doesn't work in ie <= 8, no relatedTarget)
+ if (e.originalEvent && this._isOrIsParent(e.layer._icon, e.originalEvent.relatedTarget)) {
+ return;
+ }
e.type = 'cluster' + e.type;
}
- L.FeatureGroup.prototype._propagateEvent.call(this, e);
+
+ this.fire(e.type, e);
},
//Default functionality
@@ -408,58 +599,74 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
},
_bindEvents: function () {
- var shownPolygon = null,
- map = this._map,
-
- spiderfyOnMaxZoom = this.options.spiderfyOnMaxZoom,
- showCoverageOnHover = this.options.showCoverageOnHover,
- zoomToBoundsOnClick = this.options.zoomToBoundsOnClick;
+ var map = this._map,
+ spiderfyOnMaxZoom = this.options.spiderfyOnMaxZoom,
+ showCoverageOnHover = this.options.showCoverageOnHover,
+ zoomToBoundsOnClick = this.options.zoomToBoundsOnClick;
//Zoom on cluster click or spiderfy if we are at the lowest level
if (spiderfyOnMaxZoom || zoomToBoundsOnClick) {
- this.on('clusterclick', function (a) {
- if (map.getMaxZoom() === map.getZoom()) {
- if (spiderfyOnMaxZoom) {
- a.layer.spiderfy();
- }
- } else if (zoomToBoundsOnClick) {
- a.layer.zoomToBounds();
- }
- }, this);
+ this.on('clusterclick', this._zoomOrSpiderfy, this);
}
//Show convex hull (boundary) polygon on mouse over
if (showCoverageOnHover) {
- this.on('clustermouseover', function (a) {
- if (this._inZoomAnimation) {
- return;
- }
- if (shownPolygon) {
- map.removeLayer(shownPolygon);
- }
- if (a.layer.getChildCount() > 2) {
- shownPolygon = new L.Polygon(a.layer.getConvexHull(), this.options.polygonOptions);
- map.addLayer(shownPolygon);
- }
- }, this);
- this.on('clustermouseout', function () {
- if (shownPolygon) {
- map.removeLayer(shownPolygon);
- shownPolygon = null;
- }
- }, this);
- map.on('zoomend', function () {
- if (shownPolygon) {
- map.removeLayer(shownPolygon);
- shownPolygon = null;
- }
- }, this);
- map.on('layerremove', function (opt) {
- if (shownPolygon && opt.layer === this) {
- map.removeLayer(shownPolygon);
- shownPolygon = null;
- }
- }, this);
+ this.on('clustermouseover', this._showCoverage, this);
+ this.on('clustermouseout', this._hideCoverage, this);
+ map.on('zoomend', this._hideCoverage, this);
+ }
+ },
+
+ _zoomOrSpiderfy: function (e) {
+ var map = this._map;
+ if (map.getMaxZoom() === map.getZoom()) {
+ if (this.options.spiderfyOnMaxZoom) {
+ e.layer.spiderfy();
+ }
+ } else if (this.options.zoomToBoundsOnClick) {
+ e.layer.zoomToBounds();
+ }
+
+ // Focus the map again for keyboard users.
+ if (e.originalEvent && e.originalEvent.keyCode === 13) {
+ map._container.focus();
+ }
+ },
+
+ _showCoverage: function (e) {
+ var map = this._map;
+ if (this._inZoomAnimation) {
+ return;
+ }
+ if (this._shownPolygon) {
+ map.removeLayer(this._shownPolygon);
+ }
+ if (e.layer.getChildCount() > 2 && e.layer !== this._spiderfied) {
+ this._shownPolygon = new L.Polygon(e.layer.getConvexHull(), this.options.polygonOptions);
+ map.addLayer(this._shownPolygon);
+ }
+ },
+
+ _hideCoverage: function () {
+ if (this._shownPolygon) {
+ this._map.removeLayer(this._shownPolygon);
+ this._shownPolygon = null;
+ }
+ },
+
+ _unbindEvents: function () {
+ var spiderfyOnMaxZoom = this.options.spiderfyOnMaxZoom,
+ showCoverageOnHover = this.options.showCoverageOnHover,
+ zoomToBoundsOnClick = this.options.zoomToBoundsOnClick,
+ map = this._map;
+
+ if (spiderfyOnMaxZoom || zoomToBoundsOnClick) {
+ this.off('clusterclick', this._zoomOrSpiderfy, this);
+ }
+ if (showCoverageOnHover) {
+ this.off('clustermouseover', this._showCoverage, this);
+ this.off('clustermouseout', this._hideCoverage, this);
+ map.off('zoomend', this._hideCoverage, this);
}
},
@@ -481,7 +688,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
var newBounds = this._getExpandedVisibleBounds();
this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds, this._zoom, newBounds);
- this._topClusterLevel._recursivelyAddChildrenToMap(null, this._zoom, newBounds);
+ this._topClusterLevel._recursivelyAddChildrenToMap(null, this._map._zoom, newBounds);
this._currentShownBounds = newBounds;
return;
@@ -513,6 +720,17 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
gridUnclustered = this._gridUnclustered,
markerPoint, z;
+ if (this.options.singleMarkerMode) {
+ layer.options.icon = this.options.iconCreateFunction({
+ getChildCount: function () {
+ return 1;
+ },
+ getAllChildMarkers: function () {
+ return [layer];
+ }
+ });
+ }
+
//Find the lowest zoom level to slot this one in
for (; zoom >= 0; zoom--) {
markerPoint = this._map.project(layer.getLatLng(), zoom); // calculate pixel position
@@ -528,10 +746,10 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
//Try find a marker close by to form a new cluster with
closest = gridUnclustered[zoom].getNearObject(markerPoint);
if (closest) {
- if (closest.__parent) {
+ var parent = closest.__parent;
+ if (parent) {
this._removeLayer(closest, false);
}
- var parent = closest.__parent;
//Create new cluster with these 2 in it
@@ -557,7 +775,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
return;
}
-
+
//Didn't manage to cluster in at this zoom, record us as a marker here and continue upwards
gridUnclustered[zoom].addObject(layer, markerPoint);
}
@@ -568,9 +786,29 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
return;
},
+ //Enqueue code to fire after the marker expand/contract has happened
+ _enqueue: function (fn) {
+ this._queue.push(fn);
+ if (!this._queueTimeout) {
+ this._queueTimeout = setTimeout(L.bind(this._processQueue, this), 300);
+ }
+ },
+ _processQueue: function () {
+ for (var i = 0; i < this._queue.length; i++) {
+ this._queue[i].call(this);
+ }
+ this._queue.length = 0;
+ clearTimeout(this._queueTimeout);
+ this._queueTimeout = null;
+ },
+
//Merge and split any existing clusters that are too big or small
_mergeSplitClusters: function () {
- if (this._zoom < this._map._zoom) { //Zoom in, split
+
+ //Incase we are starting to split before the animation finished
+ this._processQueue();
+
+ if (this._zoom < this._map._zoom && this._currentShownBounds.contains(this._getExpandedVisibleBounds())) { //Zoom in, split
this._animationStart();
//Remove clusters now off screen
this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds, this._zoom, this._getExpandedVisibleBounds());
@@ -585,29 +823,35 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
this._moveEnd();
}
},
-
+
//Gets the maps visible bounds expanded in each direction by the size of the screen (so the user cannot see an area we do not cover in one pan)
_getExpandedVisibleBounds: function () {
- var map = this._map,
- bounds = map.getPixelBounds(),
- width = L.Browser.mobile ? 0 : Math.abs(bounds.max.x - bounds.min.x),
- height = L.Browser.mobile ? 0 : Math.abs(bounds.max.y - bounds.min.y),
- sw = map.unproject(new L.Point(bounds.min.x - width, bounds.min.y - height)),
- ne = map.unproject(new L.Point(bounds.max.x + width, bounds.max.y + height));
+ if (!this.options.removeOutsideVisibleBounds) {
+ return this.getBounds();
+ }
- return new L.LatLngBounds(sw, ne);
+ var map = this._map,
+ bounds = map.getBounds(),
+ sw = bounds._southWest,
+ ne = bounds._northEast,
+ latDiff = L.Browser.mobile ? 0 : Math.abs(sw.lat - ne.lat),
+ lngDiff = L.Browser.mobile ? 0 : Math.abs(sw.lng - ne.lng);
+
+ return new L.LatLngBounds(
+ new L.LatLng(sw.lat - latDiff, sw.lng - lngDiff, true),
+ new L.LatLng(ne.lat + latDiff, ne.lng + lngDiff, true));
},
//Shared animation code
_animationAddLayerNonAnimated: function (layer, newCluster) {
if (newCluster === layer) {
- L.FeatureGroup.prototype.addLayer.call(this, layer);
+ this._featureGroup.addLayer(layer);
} else if (newCluster._childCount === 2) {
newCluster._addToMap();
var markers = newCluster.getAllChildMarkers();
- L.FeatureGroup.prototype.removeLayer.call(this, markers[0]);
- L.FeatureGroup.prototype.removeLayer.call(this, markers[1]);
+ this._featureGroup.removeLayer(markers[0]);
+ this._featureGroup.removeLayer(markers[1]);
} else {
newCluster._updateIcon();
}
@@ -646,8 +890,8 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
this.fire('animationend');
},
_animationZoomIn: function (previousZoomLevel, newZoomLevel) {
- var me = this,
- bounds = this._getExpandedVisibleBounds(),
+ var bounds = this._getExpandedVisibleBounds(),
+ fg = this._featureGroup,
i;
//Add all children of current clusters to map and remove those clusters from map
@@ -656,8 +900,12 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
markers = c._markers,
m;
+ if (!bounds.contains(startPos)) {
+ startPos = null;
+ }
+
if (c._isSingleParent() && previousZoomLevel + 1 === newZoomLevel) { //Immediately add the new child and remove us
- L.FeatureGroup.prototype.removeLayer.call(me, c);
+ fg.removeLayer(c);
c._recursivelyAddChildrenToMap(null, newZoomLevel, bounds);
} else {
//Fade out old cluster
@@ -670,44 +918,38 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
for (i = markers.length - 1; i >= 0; i--) {
m = markers[i];
if (!bounds.contains(m._latlng)) {
- L.FeatureGroup.prototype.removeLayer.call(me, m);
+ fg.removeLayer(m);
}
}
});
this._forceLayout();
- var j, n;
//Update opacities
- me._topClusterLevel._recursivelyBecomeVisible(bounds, newZoomLevel);
+ this._topClusterLevel._recursivelyBecomeVisible(bounds, newZoomLevel);
//TODO Maybe? Update markers in _recursivelyBecomeVisible
- for (j in me._layers) {
- if (me._layers.hasOwnProperty(j)) {
- n = me._layers[j];
-
- if (!(n instanceof L.MarkerCluster) && n._icon) {
- n.setOpacity(1);
- }
+ fg.eachLayer(function (n) {
+ if (!(n instanceof L.MarkerCluster) && n._icon) {
+ n.setOpacity(1);
}
- }
+ });
//update the positions of the just added clusters/markers
- me._topClusterLevel._recursively(bounds, previousZoomLevel, newZoomLevel, function (c) {
+ this._topClusterLevel._recursively(bounds, previousZoomLevel, newZoomLevel, function (c) {
c._recursivelyRestoreChildPositions(newZoomLevel);
});
//Remove the old clusters and close the zoom animation
-
- setTimeout(function () {
+ this._enqueue(function () {
//update the positions of the just added clusters/markers
- me._topClusterLevel._recursively(bounds, previousZoomLevel, 0, function (c) {
- L.FeatureGroup.prototype.removeLayer.call(me, c);
+ this._topClusterLevel._recursively(bounds, previousZoomLevel, 0, function (c) {
+ fg.removeLayer(c);
c.setOpacity(1);
});
- me._animationEnd();
- }, 250);
+ this._animationEnd();
+ });
},
_animationZoomOut: function (previousZoomLevel, newZoomLevel) {
@@ -732,7 +974,7 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
//TODO: Maybe use the transition timing stuff to make this more reliable
//When the animations are done, tidy up
- setTimeout(function () {
+ this._enqueue(function () {
//This cluster stopped being a cluster before the timeout fired
if (cluster._childCount === 1) {
@@ -740,20 +982,19 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
//If we were in a cluster animation at the time then the opacity and position of our child could be wrong now, so fix it
m.setLatLng(m.getLatLng());
m.setOpacity(1);
-
- return;
+ } else {
+ cluster._recursively(bounds, newZoomLevel, 0, function (c) {
+ c._recursivelyRemoveChildrenFromMap(bounds, previousZoomLevel + 1);
+ });
}
-
- cluster._recursively(bounds, newZoomLevel, 0, function (c) {
- c._recursivelyRemoveChildrenFromMap(bounds, previousZoomLevel + 1);
- });
me._animationEnd();
- }, 250);
+ });
},
_animationAddLayer: function (layer, newCluster) {
- var me = this;
+ var me = this,
+ fg = this._featureGroup;
- L.FeatureGroup.prototype.addLayer.call(this, layer);
+ fg.addLayer(layer);
if (newCluster !== layer) {
if (newCluster._childCount > 2) { //Was already a cluster
@@ -764,12 +1005,12 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
layer._setPos(this._map.latLngToLayerPoint(newCluster.getLatLng()));
layer.setOpacity(0);
- setTimeout(function () {
- L.FeatureGroup.prototype.removeLayer.call(me, layer);
+ this._enqueue(function () {
+ fg.removeLayer(layer);
layer.setOpacity(1);
me._animationEnd();
- }, 250);
+ });
} else { //Just became a cluster
this._forceLayout();
@@ -789,3 +1030,7 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
L.Util.falseFn(document.body.offsetWidth);
}
});
+
+L.markerClusterGroup = function (options) {
+ return new L.MarkerClusterGroup(options);
+};
diff --git a/src/copyright.js b/src/copyright.js
new file mode 100644
index 0000000..2fdcec9
--- /dev/null
+++ b/src/copyright.js
@@ -0,0 +1,5 @@
+/*
+ Leaflet.markercluster, Provides Beautiful Animated Marker Clustering functionality for Leaflet, a JS library for interactive maps.
+ https://github.com/Leaflet/Leaflet.markercluster
+ (c) 2012-2013, Dave Leaver, smartrak
+*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git
More information about the Pkg-javascript-commits
mailing list