Update leaflet.markercluster to v1.4.0.

2025-11-28 11:04:07 +01:00 · 2018-08-23 15:38:28 +02:00
parent 44d1cf9550
commit 3b187d0d95
10 changed files with 95 additions and 31 deletions
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ This package contains following packages:

 - [leaflet 1.3.4](http://leafletjs.com)
 - [Leaflet-providers 1.3.1](http://leaflet-extras.github.io/leaflet-providers)
- - [Leaflet.markercluster 1.3.0](https://github.com/Leaflet/Leaflet.markercluster)
+ - [Leaflet.markercluster 1.4.0](https://github.com/Leaflet/Leaflet.markercluster)
 - [Leaflet-omnivore 0.3.4](https://github.com/mapbox/leaflet-omnivore)
 - [Leaflet.loading 0.1.24](https://github.com/ebrelsford/Leaflet.loading)
 - [Leaflet.Control.FullScreen 1.4.3](https://github.com/brunob/leaflet.fullscreen)
--- a/assets/leaflet-markercluster/CHANGELOG.md
+++ b/assets/leaflet-markercluster/CHANGELOG.md
@@ -3,6 +3,47 @@ Leaflet.markercluster

 (all changes without author notice are by [@danzel](https://github.com/danzel))

+## 1.4.0 (2018-08-22)
+
+Required leaflet version bumped to 1.3.1
+
+### Improvements
+
+ * Tests run against leaflet 1.1.0+ [#863](https://github.com/Leaflet/Leaflet.markercluster/issues/863)
+
+### Bugfixes
+
+ * Fix clearLayers not removing removed markers [#860](https://github.com/Leaflet/Leaflet.markercluster/issues/860)
+ * Remember opacity 0 correctly (by [@r-yanyo](https://github.com/r-yanyo)) [#890](https://github.com/Leaflet/Leaflet.markercluster/pull/890)
+ * Fix chunkedLoading LatLngBounds.intersects() (by [@boldtrn](https://github.com/boldtrn))  [#743](https://github.com/Leaflet/Leaflet.markercluster/issues/743) [#891](https://github.com/Leaflet/Leaflet.markercluster/pull/891)
+ 
+## 1.3.0 (2018-01-19)
+
+### Improvements
+
+ * Use Rollup for builds (by [@IvanSanchez](https://github.com/IvanSanchez)) [#769](https://github.com/Leaflet/Leaflet.markercluster/pull/769)
+
+### Bugfixes
+
+ * Fix Spiderfier positioning for small markers (by [@ghybs](https://github.com/ghybs)) [#846](https://github.com/Leaflet/Leaflet.markercluster/pull/846)
+ * Fix anchor usage with latest leaflet version [#861](https://github.com/Leaflet/Leaflet.markercluster/issues/861)
+
+## 1.2.0 (2017-11-06)
+
+### Improvements
+
+ * Move `clusterPane` option in to `options` field (by [@ghybs](https://github.com/ghybs)) [#832](https://github.com/Leaflet/Leaflet.markercluster/pull/832)
+
+### Bugfixes
+
+ * Fix very small `maxClusterRadius` hanging the browser (by [@lucaswerkmeister](https://github.com/lucaswerkmeister)) [#838](https://github.com/Leaflet/Leaflet.markercluster/pull/838)
+
+## 1.1.0 (2017-08-27)
+
+### Improvements
+
+ * Add `clusterPane` option to allow putting clusters in a different pane (by [@ckrahe](https://github.com/ckrahe)) [#819](https://github.com/Leaflet/Leaflet.markercluster/issues/819)
+ 
 ## 1.0.6 (2017-06-19)

 ### Bugfixes
--- a/assets/leaflet-markercluster/README.md
+++ b/assets/leaflet-markercluster/README.md
@@ -48,8 +48,8 @@ removed link to h1 and indented back 2 spaces all links.

 ## Using the plugin
 Include the plugin CSS and JS files on your page after Leaflet files, using your method of choice:
-* [Download the `v1.1.0` release](https://github.com/Leaflet/Leaflet.markercluster/archive/v1.1.0.zip)
-* Use unpkg CDN: `https://unpkg.com/leaflet.markercluster@1.1.0/dist/`
+* [Download the `v1.4.0` release](https://github.com/Leaflet/Leaflet.markercluster/archive/v1.4.0.zip)
+* Use unpkg CDN: `https://unpkg.com/leaflet.markercluster@1.4.0/dist/`
 * Install with npm: `npm install leaflet.markercluster`

 In each case, use files in the `dist` folder:
@@ -289,3 +289,4 @@ Check also the below sub-plugins:
 | [Leaflet.MarkerCluster.LayerSupport](https://github.com/ghybs/Leaflet.MarkerCluster.LayerSupport) | Brings compatibility with L.Control.Layers and other Leaflet plugins. I.e. everything that uses direct calls to map.addLayer and map.removeLayer. | [ghybs](https://github.com/ghybs) |
 | [Leaflet.MarkerCluster.Freezable](https://github.com/ghybs/Leaflet.MarkerCluster.Freezable) | Adds the ability to freeze clusters at a specified zoom. E.g. freezing at maxZoom + 1 makes as if clustering was programmatically disabled. | [ghybs](https://github.com/ghybs) |
 | [Leaflet.MarkerCluster.PlacementStrategies](https://github.com/adammertel/Leaflet.MarkerCluster.PlacementStrategies) | Implements new strategies to position clustered markers (eg: clock, concentric circles, ...). Recommended to use with circleMarkers. [Demo](https://adammertel.github.io/Leaflet.MarkerCluster.PlacementStrategies/demo/demo1.html) | [adammertel](https://github.com/adammertel) / [UNIVIE](http://carto.univie.ac.at/) |
+| [Leaflet.MarkerCluster.List](https://github.com/adammertel/Leaflet.MarkerCluster.List) | Displays child elements in a list. Suitable for mobile devices. [Demo](https://adammertel.github.io/Leaflet.MarkerCluster.List/demo/demo1.html) | [adammertel](https://github.com/adammertel) / [UNIVIE](http://carto.univie.ac.at/) |
--- a/assets/leaflet-markercluster/bower.json
+++ b/assets/leaflet-markercluster/bower.json
@@ -1,6 +1,6 @@
 {
    "name": "leaflet.markercluster",
-    "version": "1.0.6",
+    "version": "1.4.0",
    "homepage": "https://github.com/Leaflet/Leaflet.markercluster",
    "authors": [
        "Dave Leaver <danzel@localhost.geek.nz>"
@@ -22,6 +22,6 @@
        "tests"
    ],
    "dependencies": {
-        "leaflet": ">= 1.0.3"
+        "leaflet": ">= 1.3.1"
    }
 }
--- a/assets/leaflet-markercluster/leaflet.markercluster-src.js
+++ b/assets/leaflet-markercluster/leaflet.markercluster-src.js
@@ -1,5 +1,5 @@
 /*
- * Leaflet.markercluster 1.3.0+master.5b36e91,
+ * Leaflet.markercluster 1.4.0+master.458cf75,
 * Provides Beautiful Animated Marker Clustering functionality for Leaflet, a JS library for interactive maps.
 * https://github.com/Leaflet/Leaflet.markercluster
 * (c) 2012-2017, Dave Leaver, smartrak
@@ -428,6 +428,7 @@ var MarkerClusterGroup = L.MarkerClusterGroup = L.FeatureGroup.extend({
 		//If we aren't on the map (yet), blow away the markers we know of
 		if (!this._map) {
 			this._needsClustering = [];
+			this._needsRemoving = [];
 			delete this._gridClusters;
 			delete this._gridUnclustered;
 		}
@@ -1769,6 +1770,9 @@ var MarkerCluster = L.MarkerCluster = L.Marker.extend({
 		if (zoom < zoomLevelToStart || zoom < zoomLevelToStop) {
 			for (i = childClusters.length - 1; i >= 0; i--) {
 				c = childClusters[i];
+				if (c._boundsNeedUpdate) {
+					c._recalculateBounds();
+				}
 				if (boundsToApplyTo.intersects(c._bounds)) {
 					c._recursively(boundsToApplyTo, zoomLevelToStart, zoomLevelToStop, runAtEveryLevel, runAtBottomLevel);
 				}
@@ -1787,24 +1791,21 @@ var MarkerCluster = L.MarkerCluster = L.Marker.extend({
 * Extends L.Marker to include two extra methods: clusterHide and clusterShow.
 * 
 * They work as setOpacity(0) and setOpacity(1) respectively, but
-* they will remember the marker's opacity when hiding and showing it again.
+* don't overwrite the options.opacity
 * 
 */

-
 L.Marker.include({
-	
 	clusterHide: function () {
-		this.options.opacityWhenUnclustered = this.options.opacity || 1;
-		return this.setOpacity(0);
+		var backup = this.options.opacity;
+		this.setOpacity(0);
+		this.options.opacity = backup;
+		return this;
 	},
 	
 	clusterShow: function () {
-		var ret = this.setOpacity(this.options.opacity || this.options.opacityWhenUnclustered);
-		delete this.options.opacityWhenUnclustered;
-		return ret;
+		return this.setOpacity(this.options.opacity);
 	}
-	
 });

 L.DistanceGrid = function (cellSize) {
--- a/assets/leaflet-markercluster/leaflet.markercluster-src.js.map
+++ b/assets/leaflet-markercluster/leaflet.markercluster-src.js.map
--- a/assets/leaflet-markercluster/leaflet.markercluster.js
+++ b/assets/leaflet-markercluster/leaflet.markercluster.js
--- a/assets/leaflet-markercluster/leaflet.markercluster.js.map
+++ b/assets/leaflet-markercluster/leaflet.markercluster.js.map
--- a/assets/leaflet-markercluster/package.json
+++ b/assets/leaflet-markercluster/package.json
@@ -1,22 +1,43 @@
 {
 	"name": "leaflet.markercluster",
 	"repository": "https://github.com/Leaflet/Leaflet.markercluster",
-	"version": "1.1.0",
+	"version": "1.4.0",
 	"description": "Provides Beautiful Animated Marker Clustering functionality for Leaflet",
 	"devDependencies": {
-		"jshint": "~2.1.3",
-		"mocha": "~1.10.0",
-		"karma": "~0.8.5",
-		"uglify-js": "~2.3.6",
+		"git-rev-sync": "^1.8.0",
+		"happen": "^0.3.1",
 		"jake": "~0.5.16",
-		"magic-string": "^0.7.0",
-		"leaflet": "~1.0.3"
+		"jshint": "^2.9.4",
+		"karma": "^1.5.0",
+		"karma-chrome-launcher": "^2.0.0",
+		"karma-coverage": "^1.1.1",
+		"karma-firefox-launcher": "^1.0.1",
+		"karma-mocha": "^1.3.0",
+		"karma-phantomjs-launcher": "^1.0.4",
+		"karma-rollup-plugin": "^0.2.4",
+		"karma-safari-launcher": "^1.0.0",
+		"leaflet": "^1.3.1",
+		"mocha": "~1.10.0",
+		"phantomjs-prebuilt": "^2.1.14",
+		"rollup": "^0.41.4",
+		"rollup-plugin-git-version": "0.2.1",
+		"rollup-plugin-json": "^2.1.0",
+		"uglify-js": "~2.3.6"
 	},
-	"main": "dist/leaflet.markercluster.js",
+	"peerDependencies": {
+		"leaflet": "~1.3.1"
+	},
+	"main": "dist/leaflet.markercluster-src.js",
 	"scripts": {
-		"test": "jake test",
-		"prepublish": "jake"
+		"test": "karma start ./spec/karma.conf.js",
+		"prepublish": "jake",
+		"rollup": "rollup -c build/rollup-config.js",
+		"uglify": "uglifyjs dist/leaflet.markercluster-src.js -c -m -o dist/leaflet.markercluster.js --source-map dist/leaflet.markercluster.js.map --in-source-map dist/leaflet.markercluster-src.js.map --source-map-url leaflet.markercluster.js.map"
 	},
-	"keywords": ["gis", "map"],
+	"keywords": [
+		"gis",
+		"map",
+		"cluster"
+	],
 	"license": "MIT"
 }
--- a/module/config/config.php
+++ b/module/config/config.php
@@ -36,7 +36,7 @@ $GLOBALS['LEAFLET_LIBRARIES']['leaflet-providers'] = array
 $GLOBALS['LEAFLET_LIBRARIES']['leaflet-markercluster'] = array
 (
    'name'       => 'Leaflet.markercluster',
-    'version'    => '1.3.0',
+    'version'    => '1.4.0',
    'license'    => '<a href="https://github.com/Leaflet/Leaflet.markercluster/blob/master/MIT-LICENCE.txt" target="_blank">MIT</a>',
    'homepage'   => 'https://github.com/Leaflet/Leaflet.markercluster',
    'css'        => 'assets/leaflet/libs/leaflet-markercluster/MarkerCluster.css',