markerclustererplus-rails 2.0.16.1 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a300d6483702597fddc1e4196a765d5ad7ddaf
-  data.tar.gz: fb04716ed8084220b523ddf2946ace788bc26328
+  metadata.gz: 72e3cfc9cc563595f309c46868249ccd402a4e1f
+  data.tar.gz: 964fc86c9024fca01c07dd30fb53fe073849e6ae
 SHA512:
-  metadata.gz: d3518b1e9e7ea1e9d40f24fe8efb2a0d656373522bdfb24c62333dd3cbf713582c4bfb804df8377ba34ec90ca1d3e419f24147120b6911f0baa2ebaf3ea70783
-  data.tar.gz: 3a7f34bdb88bc5c1a05bd64901e6c1b7423184041f3c7d3f29e500be6ebf6f8bea8fe8f04f78654ea4884fbf780de42cc372821423a2d5affceba4546afff02c
+  metadata.gz: 67369f0678981ba8931af04ba1f4ccbe6499cc4ea4f78ccbca8315dfa62b3abf81622338b501965a0a7aa79865a118fbf6e0abc4202ab0dbe4232f0b6545795e
+  data.tar.gz: f90f0d75c39904a685725406e757cc9f5097553f4736149d12e1a0067bb8c1147c59904a0d6aef3aede287617e3ca101269f23a5626665af74eae0afbd31e722

data/README.md

@@ -5,7 +5,7 @@ The files will be added to the asset pipeline and available for you to use.
 
 For info on how to use the library see the original documentation:
 
-[MarkerClustererPlus for Google Maps V3](http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.16/docs/reference.html)
+[MarkerClustererPlus for Google Maps V3](http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.1/docs/reference.html)
 
 MarkerClustererPlus is an enhanced Google Maps V3 implementation of the V2 MarkerClusterer.
 

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

@@ -1,9 +1,6 @@
-/*jslint browser: true, confusion: true, sloppy: true, vars: true, nomen: false, plusplus: false, indent: 2 */
-/*global window,google */
-
 /**
  * @name MarkerClustererPlus for Google Maps V3
- * @version 2.0.16 [October 18, 2012]
+ * @version 2.1 [November 3, 2013]
  * @author Gary Little
  * @fileoverview
  * The library creates and manages per-zoom-level clusters for large amounts of markers.
@@ -15,21 +12,20 @@
  * >V3 MarkerClusterer</a> port by Luke Mahe. MarkerClustererPlus was created by Gary Little.
  * <p>
  * v2.0 release: MarkerClustererPlus v2.0 is backward compatible with MarkerClusterer v1.0. It
- *  adds support for the <code>ignoreHidden</code>, <code>title</code>, <code>printable</code>,
- *  <code>batchSizeIE</code>, and <code>calculator</code> properties as well as support for
- *  four more events. It also allows greater control over the styling of the text that appears
- *  on the cluster marker. The documentation has been significantly improved and the overall
- *  code has been simplified and polished. Very large numbers of markers can now be managed
- *  without causing Javascript timeout errors on Internet Explorer. Note that the name of the
- *  <code>clusterclick</code> event has been deprecated. The new name is <code>click</code>,
- *  so please change your application code now.
+ *  adds support for the <code>ignoreHidden</code>, <code>title</code>, <code>batchSizeIE</code>,
+ *  and <code>calculator</code> properties as well as support for four more events. It also allows
+ *  greater control over the styling of the text that appears on the cluster marker. The
+ *  documentation has been significantly improved and the overall code has been simplified and
+ *  polished. Very large numbers of markers can now be managed without causing Javascript timeout
+ *  errors on Internet Explorer. Note that the name of the <code>clusterclick</code> event has been
+ *  deprecated. The new name is <code>click</code>, so please change your application code now.
  */
 
 /**
  * This file modified for use with the Rails asset pipeline
  * https://github.com/RogerE/markerclustererplus-rails
  * gem markerclustererplus-rails
- * gem version 2.0.16.1
+ * gem version 2.1
  * @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
@@ -60,36 +56,34 @@
  *  style the cluster icon is determined by calling the <code>calculator</code> function.
  *
  * @property {string} url The URL of the cluster icon image file. Required.
- * @property {number} height The height (in pixels) of the cluster icon. Required.
- * @property {number} width The width (in pixels) of the cluster icon. Required.
- * @property {Array} [anchor] The anchor position (in pixels) of the label text to be shown on
- *  the cluster icon, relative to the top left corner of the icon.
- *  The format is <code>[yoffset, xoffset]</code>. The <code>yoffset</code> must be positive
- *  and less than <code>height</code> and the <code>xoffset</code> must be positive and less
- *  than <code>width</code>. The default is to anchor the label text so that it is centered
- *  on the icon.
+ * @property {number} height The display height (in pixels) of the cluster icon. Required.
+ * @property {number} width The display width (in pixels) of the cluster icon. Required.
+ * @property {Array} [anchorText] The position (in pixels) from the center of the cluster icon to
+ *  where the text label is to be centered and drawn. The format is <code>[yoffset, xoffset]</code>
+ *  where <code>yoffset</code> increases as you go down from center and <code>xoffset</code>
+ *  increases to the right of center. The default is <code>[0, 0]</code>.
  * @property {Array} [anchorIcon] The anchor position (in pixels) of the cluster icon. This is the
  *  spot on the cluster icon that is to be aligned with the cluster position. The format is
  *  <code>[yoffset, xoffset]</code> where <code>yoffset</code> increases as you go down and
- *  <code>xoffset</code> increases to the right. The default anchor position is the center of the
- *  cluster icon.
+ *  <code>xoffset</code> increases to the right of the top-left corner of the icon. The default
+ *  anchor position is the center of the cluster icon.
  * @property {string} [textColor="black"] The color of the label text shown on the
  *  cluster icon.
  * @property {number} [textSize=11] The size (in pixels) of the label text shown on the
  *  cluster icon.
- * @property {number} [textDecoration="none"] The value of the CSS <code>text-decoration</code>
+ * @property {string} [textDecoration="none"] The value of the CSS <code>text-decoration</code>
  *  property for the label text shown on the cluster icon.
- * @property {number} [fontWeight="bold"] The value of the CSS <code>font-weight</code>
+ * @property {string} [fontWeight="bold"] The value of the CSS <code>font-weight</code>
  *  property for the label text shown on the cluster icon.
- * @property {number} [fontStyle="normal"] The value of the CSS <code>font-style</code>
+ * @property {string} [fontStyle="normal"] The value of the CSS <code>font-style</code>
  *  property for the label text shown on the cluster icon.
- * @property {number} [fontFamily="Arial,sans-serif"] The value of the CSS <code>font-family</code>
+ * @property {string} [fontFamily="Arial,sans-serif"] The value of the CSS <code>font-family</code>
  *  property for the label text shown on the cluster icon.
  * @property {string} [backgroundPosition="0 0"] The position of the cluster icon image
  *  within the image defined by <code>url</code>. The format is <code>"xpos ypos"</code>
  *  (the same format as for the CSS <code>background-position</code> property). You must set
  *  this property appropriately when the image defined by <code>url</code> represents a sprite
- *  containing multiple images.
+ *  containing multiple images. Note that the position <i>must</i> be specified in px units.
  */
 /**
  * @name ClusterIconInfo
@@ -260,14 +254,24 @@ ClusterIcon.prototype.hide = function () {
  */
 ClusterIcon.prototype.show = function () {
   if (this.div_) {
+    var img = "";
+    // NOTE: values must be specified in px units
+    var bp = this.backgroundPosition_.split(" ");
+    var spriteH = parseInt(bp[0].trim(), 10);
+    var spriteV = parseInt(bp[1].trim(), 10);
     var pos = this.getPosFromLatLng_(this.center_);
     this.div_.style.cssText = this.createCss(pos);
-    if (this.cluster_.printable_) {
-      // (Would like to use "width: inherit;" below, but doesn't work with MSIE)
-      this.div_.innerHTML = "<img src='" + this.url_ + "'><div style='position: absolute; top: 0px; left: 0px; width: " + this.width_ + "px;'>" + this.sums_.text + "</div>";
-    } else {
-      this.div_.innerHTML = this.sums_.text;
+    img = "<img src='" + this.url_ + "' style='position: absolute; top: " + spriteV + "px; left: " + spriteH + "px; ";
+    if (!this.cluster_.getMarkerClusterer().enableRetinaIcons_) {
+      img += "clip: rect(" + (-1 * spriteV) + "px, " + ((-1 * spriteH) + this.width_) + "px, " +
+          ((-1 * spriteV) + this.height_) + "px, " + (-1 * spriteH) + "px);";
     }
+    img += "'>";
+    // (Would like to use "width: inherit;" below, but doesn't work with MSIE)
+    this.div_.innerHTML = img + "<div style='position: absolute; " +
+        "top: " + this.anchorText_[0] + "px; " +
+        "left: " + this.anchorText_[1] + "px; " +
+        "width: " + this.width_ + "px;'>" + this.sums_.text + "</div>";
     if (typeof this.sums_.title === "undefined" || this.sums_.title === "") {
       this.div_.title = this.cluster_.getMarkerClusterer().getTitle();
     } else {
@@ -292,7 +296,7 @@ ClusterIcon.prototype.useStyle = function (sums) {
   this.url_ = style.url;
   this.height_ = style.height;
   this.width_ = style.width;
-  this.anchor_ = style.anchor;
+  this.anchorText_ = style.anchorText || [0, 0];
   this.anchorIcon_ = style.anchorIcon || [parseInt(this.height_ / 2, 10), parseInt(this.width_ / 2, 10)];
   this.textColor_ = style.textColor || "black";
   this.textSize_ = style.textSize || 11;
@@ -322,38 +326,13 @@ ClusterIcon.prototype.setCenter = function (center) {
  */
 ClusterIcon.prototype.createCss = function (pos) {
   var style = [];
-  if (!this.cluster_.printable_) {
-    style.push('background-image:url(' + this.url_ + ');');
-    style.push('background-position:' + this.backgroundPosition_ + ';');
-  }
-
-  if (typeof this.anchor_ === 'object') {
-    if (typeof this.anchor_[0] === 'number' && this.anchor_[0] > 0 &&
-        this.anchor_[0] < this.height_) {
-      style.push('height:' + (this.height_ - this.anchor_[0]) +
-          'px; padding-top:' + this.anchor_[0] + 'px;');
-    } else {
-      style.push('height:' + this.height_ + 'px; line-height:' + this.height_ +
-          'px;');
-    }
-    if (typeof this.anchor_[1] === 'number' && this.anchor_[1] > 0 &&
-        this.anchor_[1] < this.width_) {
-      style.push('width:' + (this.width_ - this.anchor_[1]) +
-          'px; padding-left:' + this.anchor_[1] + 'px;');
-    } else {
-      style.push('width:' + this.width_ + 'px; text-align:center;');
-    }
-  } else {
-    style.push('height:' + this.height_ + 'px; line-height:' +
-        this.height_ + 'px; width:' + this.width_ + 'px; text-align:center;');
-  }
-
+  style.push('width:' + this.width_ + 'px; height:' + this.height_ + 'px;');
+  style.push('text-align:center; line-height:' + this.height_ + 'px;');
   style.push('cursor:pointer; top:' + pos.y + 'px; left:' +
       pos.x + 'px; color:' + this.textColor_ + '; position:absolute; font-size:' +
       this.textSize_ + 'px; font-family:' + this.fontFamily_ + '; font-weight:' +
       this.fontWeight_ + '; font-style:' + this.fontStyle_ + '; text-decoration:' +
       this.textDecoration_ + ';');
-
   return style.join("");
 };
 
@@ -368,6 +347,8 @@ ClusterIcon.prototype.getPosFromLatLng_ = function (latlng) {
   var pos = this.getProjection().fromLatLngToDivPixel(latlng);
   pos.x -= this.anchorIcon_[1];
   pos.y -= this.anchorIcon_[0];
+  pos.x = parseInt(pos.x, 10);
+  pos.y = parseInt(pos.y, 10);
   return pos;
 };
 
@@ -385,7 +366,6 @@ function Cluster(mc) {
   this.gridSize_ = mc.getGridSize();
   this.minClusterSize_ = mc.getMinimumClusterSize();
   this.averageCenter_ = mc.getAverageCenter();
-  this.printable_ = mc.getPrintable();
   this.markers_ = [];
   this.center_ = null;
   this.bounds_ = null;
@@ -627,9 +607,6 @@ Cluster.prototype.isMarkerAlreadyAdded_ = function (marker) {
  *  <code>text</code> property of the result returned by the default <code>calculator</code>).
  *  If set to <code>true</code> and you change the visibility of a marker being clustered, be
  *  sure to also call <code>MarkerClusterer.repaint()</code>.
- * @property {boolean} [printable=false] Whether to make the cluster icons printable. Do not
- *  set to <code>true</code> if the <code>url</code> fields in the <code>styles</code> array
- *  refer to image sprite files.
  * @property {string} [title=""] The tooltip to display when the mouse moves over a cluster
  *  marker. (Alternatively, you can use a custom <code>calculator</code> function to specify a
  *  different tooltip for each cluster marker.)
@@ -658,6 +635,10 @@ Cluster.prototype.isMarkerAlreadyAdded_ = function (marker) {
  *  The default is an array of {@link ClusterIconStyle} elements whose properties are derived
  *  from the values for <code>imagePath</code>, <code>imageExtension</code>, and
  *  <code>imageSizes</code>.
+ * @property {boolean} [enableRetinaIcons=false] Whether to allow the use of cluster icons that
+ * have sizes that are some multiple (typically double) of their actual display size. Icons such
+ * as these look better when viewed on high-resolution monitors such as Apple's Retina displays.
+ * Note: if this property is <code>true</code>, sprites cannot be used as cluster icons.
  * @property {number} [batchSize=MarkerClusterer.BATCH_SIZE] Set this property to the
  *  number of markers to be processed in a single batch when using a browser other than
  *  Internet Explorer (for Internet Explorer, use the batchSizeIE property instead).
@@ -721,9 +702,9 @@ function MarkerClusterer(map, opt_markers, opt_options) {
   if (opt_options.ignoreHidden !== undefined) {
     this.ignoreHidden_ = opt_options.ignoreHidden;
   }
-  this.printable_ = false;
-  if (opt_options.printable !== undefined) {
-    this.printable_ = opt_options.printable;
+  this.enableRetinaIcons_ = false;
+  if (opt_options.enableRetinaIcons !== undefined) {
+    this.enableRetinaIcons_ = opt_options.enableRetinaIcons;
   }
   this.imagePath_ = opt_options.imagePath || MarkerClusterer.IMAGE_PATH;
   this.imageExtension_ = opt_options.imageExtension || MarkerClusterer.IMAGE_EXTENSION;
@@ -1020,6 +1001,26 @@ MarkerClusterer.prototype.setIgnoreHidden = function (ignoreHidden) {
 };
 
 
+/**
+ * Returns the value of the <code>enableRetinaIcons</code> property.
+ *
+ * @return {boolean} True if enableRetinaIcons property is set.
+ */
+MarkerClusterer.prototype.getEnableRetinaIcons = function () {
+  return this.enableRetinaIcons_;
+};
+
+
+/**
+ *  Sets the value of the <code>enableRetinaIcons</code> property.
+ *
+ *  @param {boolean} enableRetinaIcons The value of the enableRetinaIcons property.
+ */
+MarkerClusterer.prototype.setEnableRetinaIcons = function (enableRetinaIcons) {
+  this.enableRetinaIcons_ = enableRetinaIcons;
+};
+
+
 /**
  * Returns the value of the <code>imageExtension</code> property.
  *
@@ -1101,26 +1102,6 @@ MarkerClusterer.prototype.setCalculator = function (calculator) {
 };
 
 
-/**
- * Returns the value of the <code>printable</code> property.
- *
- * @return {boolean} the value of the printable property.
- */
-MarkerClusterer.prototype.getPrintable = function () {
-  return this.printable_;
-};
-
-
-/**
- * Sets the value of the <code>printable</code> property.
- *
- *  @param {boolean} printable The value of the printable property.
- */
-MarkerClusterer.prototype.setPrintable = function (printable) {
-  this.printable_ = printable;
-};
-
-
 /**
  * Returns the value of the <code>batchSizeIE</code> property.
  *

data/lib/markerclustererplus-rails/version.rb

@@ -1,5 +1,5 @@
 module Markerclustererplus
   module Rails
-    VERSION = "2.0.16.1"
+    VERSION = "2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markerclustererplus-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.16.1
+  version: '2.1'
 platform: ruby
 authors:
 - RogerE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides the MarkerClustererPlus assets for your Rails application.
 email: