markerclustererplus-rails 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b32e8a6734028fe39f2478a8ea5660a738152c2beee31a2a48ce60fabd4387
-  data.tar.gz: cd1cc98d44e2d54c2d2fb1e169c3b17a31f81f2216f26fd0cd81ee27ff25af0e
+  metadata.gz: b5f00481294f90a206a80a5040904c7aac816d83918ca05b75f646c4dcad516f
+  data.tar.gz: 433bfe00a960b076ab7fd6ccad391f372ce573de50e252ebf06c163d0c09466a
 SHA512:
-  metadata.gz: 581d16abe06c4d41c7538037a078dc504162bdafa91e79f5e9a863cb6089d8c437fc543fe7437e546b30f52cf0b7f215731407168f3c24fdcc73ec97557f6ca8
-  data.tar.gz: 54a40e6c7893492fd5941005ef439c05ef6060f77c0530933df048689e705ecd6347bb30d5cb370470aa4b33496f5d0aaaf757d8fc45d1e52b22546d2ad4968f
+  metadata.gz: 6567fcd986e750f0366b1274275cdb23a65fd14efca975dc2e9e8500d4750f0d911d184b2925ab27a32ee31a03e9b7b23e5b085b03026597a8084120050618bd
+  data.tar.gz: 7f79209968fca8ad370324b2abf9167b5d1b3ad70b596d7800e20162da9f05b9c75da106015e92a2de06ed8e1d51782c51de02914d15e4ec6a800c40acf0b0b1

data/app/assets/javascripts/markerclusterer.js.erb

@@ -1,6 +1,6 @@
 /**
  * @name MarkerClustererPlus for Google Maps V3
- * @version 2.1.6 [February 19, 2018]
+ * @version 2.1.7 [March 3, 2018]
  * @author Gary Little
  * @fileoverview
  * The library creates and manages per-zoom-level clusters for large amounts of markers.
@@ -23,7 +23,7 @@
  * This file modified for use with the Rails asset pipeline
  * https://github.com/RogerE/markerclustererplus-rails
  * gem markerclustererplus-rails
- * gem version 2.1.6
+ * gem version 2.1.7
  * @author Roger Ertesvag
  * NOTE: to include the MarkerClustererPlus icons in the asset pipeline the gem overrides
  *       the original configuration for setting the icon properties. This means that changing
@@ -145,6 +145,11 @@ ClusterIcon.prototype.onAdd = function () {
     cMouseDownInCluster = true;
     cDraggingMapByCluster = false;
   });
+  
+// March 1, 2018: Fix for this 3.32 exp bug, https://issuetracker.google.com/issues/73571522
+  google.maps.event.addDomListener(this.div_, "touchstart", function (e) {
+  	e.stopPropagation();
+  });
 
   google.maps.event.addDomListener(this.div_, "click", function (e) {
     cMouseDownInCluster = false;
@@ -748,20 +753,25 @@ MarkerClusterer.prototype.onAdd = function () {
   this.ready_ = true;
 
   this.repaint();
+  
+  this.prevZoom_ = this.getMap().getZoom();
 
   // Add the map event listeners
   this.listeners_ = [
     google.maps.event.addListener(this.getMap(), "zoom_changed", function () {
-      cMarkerClusterer.resetViewport_(false);
-      // Workaround for this Google bug: when map is at level 0 and "-" of
-      // zoom slider is clicked, a "zoom_changed" event is fired even though
-      // the map doesn't zoom out any further. In this situation, no "idle"
-      // event is triggered so the cluster markers that have been removed
-      // do not get redrawn. Same goes for a zoom in at maxZoom.
-      if (this.getZoom() === (this.get("minZoom") || 0) || this.getZoom() === this.get("maxZoom")) {
-        google.maps.event.trigger(this, "idle");
+      // Fix for bug #407
+      // Determines map type and prevents illegal zoom levels
+      var zoom = this.getMap().getZoom();
+      var minZoom = this.getMap().minZoom || 0;
+      var maxZoom = Math.min(this.getMap().maxZoom || 100,
+                             this.getMap().mapTypes[this.getMap().getMapTypeId()].maxZoom);
+      zoom = Math.min(Math.max(zoom,minZoom),maxZoom);
+      
+      if (this.prevZoom_ != zoom) {
+        this.prevZoom_ = zoom;
+        this.resetViewport_(false);
       }
-    }),
+    }.bind(this)),
     google.maps.event.addListener(this.getMap(), "idle", function () {
       cMarkerClusterer.redraw_();
     })
@@ -846,7 +856,10 @@ MarkerClusterer.prototype.fitMapToMarkers = function () {
   var markers = this.getMarkers();
   var bounds = new google.maps.LatLngBounds();
   for (i = 0; i < markers.length; i++) {
-    bounds.extend(markers[i].getPosition());
+    // March 3, 2018: Bug fix -- honor the ignoreHidden property
+    if (markers[i].getVisible() || !this.getIgnoreHidden()) {
+      bounds.extend(markers[i].getPosition());
+    }
   }
 
   this.getMap().fitBounds(bounds);

data/lib/markerclustererplus-rails/version.rb

@@ -1,5 +1,5 @@
 module Markerclustererplus
   module Rails
-    VERSION = "2.1.6"
+    VERSION = "2.1.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markerclustererplus-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - RogerE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides the MarkerClustererPlus assets for your Rails application.
 email: