e_markerclusterer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1489323debd64bfb939394b1bdc427c31351e98
-  data.tar.gz: 15d65bb4366e620b7b585a2c8a6e5e025b15023f
+  metadata.gz: adb8964e0a1d00b825c188f308350747b7212eda
+  data.tar.gz: b0fddf464e27d75b54dfa3d9b930e33e45653c9d
 SHA512:
-  metadata.gz: b5c07bf56fd4ed292ee2e60d10f4a1ea680f52c93ccba2ece944e02a962394644374d0ff2c1eef8c2b6b457423d2a6c83952a582ecd369b1515baffb72306162
-  data.tar.gz: 3e54885a102f6bbaac0666fb3440224f134c139820687d9eb95be7e03f513a894f4aef8784e2f3f45d8db915321f24122c31c5e6feb56a5f8636ee2ac70d8209
+  metadata.gz: a6b5c734018423ede5c883a02df7c40495ba0ef81670b48788978df23b9e1139a446fa1acdc8eb04818dbbd4119b2eea975407f64881ebf14c52999f812bb142
+  data.tar.gz: 4d7ea8b93567b2c3ee823e03736e25a321bef7bff98519de2e4be9f59d85497116a82b2464d59e096f4652635c90caa1c5588e8ce36486ed663b98a4ee5ce908

data/CHANGELOG.md

@@ -1,5 +1,10 @@
   Note: This is in reverse chronological order, so newer entries are added to the top.
 
+## Enhanced MarkerClusterer 0.0.5
+
+######2016. 8. 1
+* A bug not to show a chart of last created cluster is fixed.
+
 ## Enhanced MarkerClusterer 0.0.4
 
 ######2016. 7. 25

data/lib/assets/javascripts/e_markerclusterer.js

@@ -1635,7 +1635,7 @@ MarkerClusterer.prototype.getExtendedBounds = function (bounds) {
  * Redraws all the clusters.
  */
 MarkerClusterer.prototype.redraw_ = function () {
-  this.createClusters_(0);
+  this.createClusters_();
 };
 
 
@@ -1736,31 +1736,95 @@ MarkerClusterer.prototype.addToClosestCluster_ = function (marker) {
  * @param {number} iFirst The index of the first marker in the batch of
  *  markers to be added to clusters.
  */
-MarkerClusterer.prototype.createClusters_ = function (iFirst) {
-  var i, marker;
-  var mapBounds;
+//MarkerClusterer.prototype.createClusters_ = function (iFirst) {
+//  var i, marker;
+//  var mapBounds;
+//  var cMarkerClusterer = this;
+//  if (!this.ready_) {
+//    return;
+//  }
+//
+//  // Cancel previous batch processing if we're working on the first batch:
+//  if (iFirst === 0) {
+//    /**
+//     * This event is fired when the <code>MarkerClusterer</code> begins
+//     *  clustering markers.
+//     * @name MarkerClusterer#clusteringbegin
+//     * @param {MarkerClusterer} mc The MarkerClusterer whose markers are being clustered.
+//     * @event
+//     */
+//    google.maps.event.trigger(this, "clusteringbegin", this);
+//
+//    if (typeof this.timerRefStatic !== "undefined") {
+//      clearTimeout(this.timerRefStatic);
+//      delete this.timerRefStatic;
+//    }
+//  }
+//
+//  // Get our current map view bounds.
+//  // Create a new bounds object so we don't affect the map.
+//  //
+//  // See Comments 9 & 11 on Issue 3651 relating to this workaround for a Google Maps bug:
+//  if (this.getMap().getZoom() > 3) {
+//    mapBounds = new google.maps.LatLngBounds(this.getMap().getBounds().getSouthWest(),
+//      this.getMap().getBounds().getNorthEast());
+//  } else {
+//    mapBounds = new google.maps.LatLngBounds(new google.maps.LatLng(85.02070771743472, -178.48388434375), new google.maps.LatLng(-85.08136444384544, 178.00048865625));
+//  }
+//  var bounds = this.getExtendedBounds(mapBounds);
+//
+//  var iLast = Math.min(iFirst + this.batchSize_, this.markers_.length);
+//
+//  for (i = iFirst; i < iLast; i++) {
+//    marker = this.markers_[i];
+//    if (!marker.isAdded && this.isMarkerInBounds_(marker, bounds)) {
+//      if (!this.ignoreHidden_ || (this.ignoreHidden_ && marker.getVisible())) {
+//        this.addToClosestCluster_(marker);
+//      }
+//    }
+//  }
+//
+//  if (iLast < this.markers_.length) {
+//    this.timerRefStatic = setTimeout(function () {
+//      cMarkerClusterer.createClusters_(iLast);
+//    }, 0);
+//  } else {
+//    delete this.timerRefStatic;
+//
+//    /**
+//     * This event is fired when the <code>MarkerClusterer</code> stops
+//     *  clustering markers.
+//     * @name MarkerClusterer#clusteringend
+//     * @param {MarkerClusterer} mc The MarkerClusterer whose markers are being clustered.
+//     * @event
+//     */
+//    google.maps.event.trigger(this, "clusteringend", this);
+//  }
+//};
+MarkerClusterer.prototype.createClusters_ = function () {
   var cMarkerClusterer = this;
+  
   if (!this.ready_) {
     return;
   }
-
-  // Cancel previous batch processing if we're working on the first batch:
-  if (iFirst === 0) {
-    /**
-     * This event is fired when the <code>MarkerClusterer</code> begins
-     *  clustering markers.
-     * @name MarkerClusterer#clusteringbegin
-     * @param {MarkerClusterer} mc The MarkerClusterer whose markers are being clustered.
-     * @event
-     */
-    google.maps.event.trigger(this, "clusteringbegin", this);
-
-    if (typeof this.timerRefStatic !== "undefined") {
-      clearTimeout(this.timerRefStatic);
-      delete this.timerRefStatic;
+  
+  /**
+   * This event is fired when the <code>MarkerClusterer</code> begins
+   *  clustering markers.
+   * @name MarkerClusterer#clusteringbegin
+   * @param {MarkerClusterer} mc The MarkerClusterer whose markers are being clustered.
+   * @event
+   */
+  google.maps.event.trigger(this, "clusteringbegin", this);
+  
+  // set timers to cancel redundant jobs
+  if (typeof this.timerRefs !== "undefined") {
+    for (var i = 0; i < this.timerRefs.length; i++) {
+      clearTimeout(this.timerRefs[i]);
     }
+    delete this.timerRefs;    
   }
-
+  
   // Get our current map view bounds.
   // Create a new bounds object so we don't affect the map.
   //
@@ -1771,37 +1835,36 @@ MarkerClusterer.prototype.createClusters_ = function (iFirst) {
   } else {
     mapBounds = new google.maps.LatLngBounds(new google.maps.LatLng(85.02070771743472, -178.48388434375), new google.maps.LatLng(-85.08136444384544, 178.00048865625));
   }
-  var bounds = this.getExtendedBounds(mapBounds);
-
-  var iLast = Math.min(iFirst + this.batchSize_, this.markers_.length);
-
-  for (i = iFirst; i < iLast; i++) {
-    marker = this.markers_[i];
-    if (!marker.isAdded && this.isMarkerInBounds_(marker, bounds)) {
-      if (!this.ignoreHidden_ || (this.ignoreHidden_ && marker.getVisible())) {
-        this.addToClosestCluster_(marker);
+  var bounds = this.getExtendedBounds(mapBounds);  
+  
+  for (i = 0, s = 0, this.timerRefs = []; i < this.markers_.length; i += this.batchSize_, s++) {
+    //this.timerRefStatic = setTimeout(this.createClustersCore_(bounds, i), 0);
+    this.timerRefs[s] = setTimeout(function(position) {
+      var marker;
+      
+      var last = Math.min(position + cMarkerClusterer.batchSize_, cMarkerClusterer.markers_.length);
+      for (var j = position; j < last; j++) {
+        marker = cMarkerClusterer.markers_[j];
+        if (!marker.isAdded && cMarkerClusterer.isMarkerInBounds_(marker, bounds)) {
+          if (!cMarkerClusterer.ignoreHidden_ || (cMarkerClusterer.ignoreHidden_ && marker.getVisible())) {
+            cMarkerClusterer.addToClosestCluster_(marker);
+          }
+        }
       }
-    }
-  }
-
-  if (iLast < this.markers_.length) {
-    this.timerRefStatic = setTimeout(function () {
-      cMarkerClusterer.createClusters_(iLast);
-    }, 0);
-  } else {
-    delete this.timerRefStatic;
-
-    /**
-     * This event is fired when the <code>MarkerClusterer</code> stops
-     *  clustering markers.
-     * @name MarkerClusterer#clusteringend
-     * @param {MarkerClusterer} mc The MarkerClusterer whose markers are being clustered.
-     * @event
-     */
-    google.maps.event.trigger(this, "clusteringend", this);
+    }(i), 0)
   }
-};
-
+  
+  delete this.timerRefs;
+  
+  /**
+   * This event is fired when the <code>MarkerClusterer</code> stops
+   *  clustering markers.
+   * @name MarkerClusterer#clusteringend
+   * @param {MarkerClusterer} mc The MarkerClusterer whose markers are being clustered.
+   * @event
+   */
+  google.maps.event.trigger(this, "clusteringend", this);
+}
 
 /**
  * Extends an object's prototype by another's.

data/lib/e_markerclusterer/version.rb

@@ -1,3 +1,3 @@
 module EMarkerclusterer
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: e_markerclusterer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sung Gon Yi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails