diff --git a/docs/examples.html b/docs/examples.html index 51c09b3..ac56ecf 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -66,13 +66,13 @@

MarkerClustererPlus Examples

var map = new google.maps.Map(document.getElementById("map"), options); var mcOptions = {gridSize: 50, maxZoom: 15}; -var markers = [...]; // Create the markers you want to add and collect them into a array. +var markers = [...]; // Create the markers you want to add and collect them into an array. var mc = new MarkerClusterer(map, markers, mcOptions);

Simple Example

-

This example will show 100 markers on map.

+

This example will show 100 markers on a map.

 var center = new google.maps.LatLng(37.4419, -122.1419);
diff --git a/docs/reference.html b/docs/reference.html
index dcdd051..739f09d 100644
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -2,7 +2,7 @@
 
   
     
-    MarkerClustererPlus for Google Maps V3 v2.1 [November 3, 2013] Reference
+    MarkerClustererPlus for Google Maps V3 v2.1.1 [November 4, 2013] Reference
     
     
   
diff --git a/examples/advanced_example.html b/examples/advanced_example.html
index 7f3ac06..4cdf129 100644
--- a/examples/advanced_example.html
+++ b/examples/advanced_example.html
@@ -70,7 +70,6 @@
         url: '../images/people55.png',
         width: 55,
         height: 55,
-        backgroundPosition: "0 0",
         textColor: '#ffffff',
         textSize: 12
       }], [{
@@ -206,7 +205,6 @@ 

An example of MarkerClustererPlus

- Cluster size: - - Clear + + + + Clear diff --git a/src/markerclusterer.js b/src/markerclusterer.js index 0206e30..65cbe8b 100644 --- a/src/markerclusterer.js +++ b/src/markerclusterer.js @@ -1,6 +1,6 @@ /** * @name MarkerClustererPlus for Google Maps V3 - * @version 2.1 [November 3, 2013] + * @version 2.1.1 [November 4, 2013] * @author Gary Little * @fileoverview * The library creates and manages per-zoom-level clusters for large amounts of markers. @@ -254,11 +254,20 @@ ClusterIcon.prototype.show = function () { ((-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 + "
" + this.sums_.text + "
"; + this.div_.innerHTML = img + "
" + this.sums_.text + "
"; if (typeof this.sums_.title === "undefined" || this.sums_.title === "") { this.div_.title = this.cluster_.getMarkerClusterer().getTitle(); } else { @@ -313,13 +322,9 @@ ClusterIcon.prototype.setCenter = function (center) { */ ClusterIcon.prototype.createCss = function (pos) { var style = []; - 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_ + ';'); + style.push("cursor: pointer;"); + style.push("position: absolute; top: " + pos.y + "px; left: " + pos.x + "px;"); + style.push("width: " + this.width_ + "px; height: " + this.height_ + "px;"); return style.join(""); }; @@ -1183,10 +1188,12 @@ MarkerClusterer.prototype.addMarker = function (marker, opt_nodraw) { * @param {boolean} [opt_nodraw] Set to true to prevent redrawing. */ MarkerClusterer.prototype.addMarkers = function (markers, opt_nodraw) { - var i; - for (i = 0; i < markers.length; i++) { - this.pushMarkerTo_(markers[i]); - } + var key; + for (key in markers) { + if (markers.hasOwnProperty(key)) { + this.pushMarkerTo_(markers[key]); + } + } if (!opt_nodraw) { this.redraw_(); } diff --git a/src/markerclusterer_packed.js b/src/markerclusterer_packed.js index 439911b..862d07a 100644 --- a/src/markerclusterer_packed.js +++ b/src/markerclusterer_packed.js @@ -1 +1 @@ -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('5 F(b,a){b.S().12(F,o.n.2Y);4.H=b;4.2A=b.S().2r();4.L=a;4.B=t;4.q=t;4.16=t;4.1k=s;4.I(b.v())}F.6.2B=5(){7 d=4;7 g;7 f;4.q=3w.3q("21");4.q.5l=4.2A;9(4.1k){4.2b()}4.4H().4D.4y(4.q);4.2V=o.n.u.1E(4.v(),"47",5(){f=g});o.n.u.1C(4.q,"3V",5(){g=G;f=s});o.n.u.1C(4.q,"2I",5(e){g=s;9(!f){7 c;7 b;7 a=d.H.S();o.n.u.Y(a,"2I",d.H);o.n.u.Y(a,"3O",d.H);9(a.2x()){b=a.1w();c=d.H.1v();a.v().1P(c);1T(5(){a.v().1P(c);9(b!==t&&(a.v().15()>b)){a.v().3B(b+1)}},3v)}e.3s=G;9(e.2L){e.2L()}}});o.n.u.1C(4.q,"2T",5(){7 a=d.H.S();o.n.u.Y(a,"2T",d.H)});o.n.u.1C(4.q,"2O",5(){7 a=d.H.S();o.n.u.Y(a,"2O",d.H)})};F.6.2Q=5(){9(4.q&&4.q.3e){4.1K();o.n.u.3a(4.2V);o.n.u.4Y(4.q);4.q.3e.4R(4.q);4.q=t}};F.6.34=5(){9(4.1k){7 a=4.28(4.B);4.q.Q.1J=a.y+"A";4.q.Q.1F=a.x+"A"}};F.6.1K=5(){9(4.q){4.q.Q.3f="2U"}4.1k=s};F.6.2b=5(){9(4.q){7 e="";7 c=4.39.4e(" ");7 b=Z(c[0].2R(),10);7 d=Z(c[1].2R(),10);7 a=4.28(4.B);4.q.Q.3W=4.2N(a);e="<3U 3T=\'"+4.2K+"\' Q=\'1Z: 1Y; 1J: "+d+"A; 1F: "+b+"A; ";9(!4.H.S().1h){e+="3S: 3R("+(-1*d)+"A, "+((-1*b)+4.1m)+"A, "+((-1*d)+4.1g)+"A, "+(-1*b)+"A);"}e+="\'>";4.q.3P=e+"<21 Q=\'1Z: 1Y; "+"1J: "+4.1W[0]+"A; "+"1F: "+4.1W[1]+"A; "+"1x: "+4.1m+"A;\'>"+4.16.1z+"";9(2l 4.16.X==="17"||4.16.X===""){4.q.X=4.H.S().2u()}K{4.q.X=4.16.X}4.q.Q.3f=""}4.1k=G};F.6.2q=5(a){4.16=a;7 b=z.3F(0,a.2o-1);b=z.1R(4.L.p-1,b);7 c=4.L[b];4.2K=c.2k;4.1g=c.1r;4.1m=c.1x;4.1W=c.3z||[0,0];4.1U=c.3u||[Z(4.1g/2,10),Z(4.1m/2,10)];4.2h=c.3r||"3p";4.2f=c.3n||11;4.2d=c.3j||"2U";4.2M=c.3g||"5k";4.3d=c.5d||"5a";4.3b=c.52||"4W,4U-4Q";4.39=c.4O||"0 0"};F.6.35=5(a){4.B=a};F.6.2N=5(b){7 a=[];a.V(\'1x:\'+4.1m+\'A; 1r:\'+4.1g+\'A;\');a.V(\'1z-4G:1d; 4F-1r:\'+4.1g+\'A;\');a.V(\'4E:4C; 1J:\'+b.y+\'A; 1F:\'+b.x+\'A; 4A:\'+4.2h+\'; 1Z:1Y; 1M-1j:\'+4.2f+\'A; 1M-4x:\'+4.3b+\'; 1M-4v:\'+4.2M+\'; 1M-Q:\'+4.3d+\'; 1z-4u:\'+4.2d+\';\');j a.4r("")};F.6.28=5(b){7 a=4.37().29(b);a.x-=4.1U[1];a.y-=4.1U[0];a.x=Z(a.x,10);a.y=Z(a.y,10);j a};5 D(a){4.U=a;4.T=a.v();4.M=a.38();4.13=a.2S();4.18=a.3c();4.k=[];4.B=t;4.2c=t;4.W=E F(4,a.22())}D.6.40=5(){j 4.k.p};D.6.1B=5(){j 4.k};D.6.2P=5(){j 4.B};D.6.v=5(){j 4.T};D.6.S=5(){j 4.U};D.6.1v=5(){7 i;7 b=E o.n.1i(4.B,4.B);7 a=4.1B();w(i=0;ib){9(e.v()!==4.T){e.I(4.T)}}K 9(c<4.13){9(e.v()!==4.T){e.I(4.T)}}K 9(c===4.13){w(i=0;ia){4.W.1K();j}9(c<4.13){4.W.1K();j}7 b=4.U.22().p;7 d=4.U.2D()(4.k,b);4.W.35(4.B);4.W.2q(d);4.W.2b()};D.6.2J=5(a){7 i;9(4.k.1b){j 4.k.1b(a)!==-1}K{w(i=0;i<4.k.p;i++){9(a===4.k[i]){j G}}}j s};5 8(a,c,b){4.12(8,o.n.2Y);c=c||[];b=b||{};4.k=[];4.C=[];4.1f=[];4.1n=t;4.1q=s;4.M=b.3N||3M;4.13=b.3J||2;4.1V=b.2y||t;4.L=b.3I||[];4.1N=b.X||"";4.1s=G;9(b.2w!==17){4.1s=b.2w}4.18=s;9(b.2v!==17){4.18=b.2v}4.14=s;9(b.2t!==17){4.14=b.2t}4.1h=s;9(b.2s!==17){4.1h=b.2s}4.1u=b.3H||8.2e;4.1t=b.3G||8.2p;4.1a=b.3E||8.2n;4.1S=b.3D||8.2m;4.1Q=b.3C||8.2j;4.1y=b.3A||8.2i;4.1O=b.3y||"O";9(3x.3K.3L().1b("3t")!==-1){4.1Q=4.1y}4.2z();4.2C(c,G);4.I(a)}8.6.2B=5(){7 a=4;4.1n=4.v();4.1q=G;4.1o();4.1f=[o.n.u.1E(4.v(),"3Q",5(){a.1L(s);9(4.15()===(4.2g("3o")||0)||4.15()===4.2g("2y")){o.n.u.Y(4,"2H")}}),o.n.u.1E(4.v(),"2H",5(){a.1c()})]};8.6.2Q=5(){7 i;w(i=0;i<4.k.p;i++){9(4.k[i].v()!==4.1n){4.k[i].I(4.1n)}}w(i=0;i<4.C.p;i++){4.C[i].1D()}4.C=[];w(i=0;i<4.1f.p;i++){o.n.u.3a(4.1f[i])}4.1f=[];4.1n=t;4.1q=s};8.6.34=5(){};8.6.2z=5(){7 i,1j;9(4.L.p>0){j}w(i=0;i<4.1a.p;i++){1j=4.1a[i];4.L.V({2k:4.1u+(i+1)+"."+4.1t,1r:1j,1x:1j})}};8.6.3m=5(){7 i;7 a=4.1B();7 b=E o.n.1i();w(i=0;i3){d=E o.n.1i(4.v().1v().23(),4.v().1v().24())}K{d=E o.n.1i(E o.n.1e(36.4s,-33.4q),E o.n.1e(-36.4p,33.4o))}7 a=4.1X(d);7 b=z.1R(e+4.1Q,4.k.p);w(i=e;i35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('5 F(b,a){b.T().13(F,n.o.2Z);4.G=b;4.2D=b.T().2v();4.S=a;4.B=s;4.q=s;4.14=s;4.1m=t;4.J(b.v())}F.6.2E=5(){7 d=4;7 g;7 f;4.q=3y.3s("20");4.q.5m=4.2D;9(4.1m){4.29()}4.4L().4E.4y(4.q);4.2X=n.o.u.1H(4.v(),"48",5(){f=g});n.o.u.1G(4.q,"3Z",5(){g=H;f=t});n.o.u.1G(4.q,"2K",5(e){g=t;9(!f){7 c;7 b;7 a=d.G.T();n.o.u.U(a,"2K",d.G);n.o.u.U(a,"3T",d.G);9(a.2z()){b=a.1A();c=d.G.1r();a.v().1N(c);1S(5(){a.v().1N(c);9(b!==s&&(a.v().16()>b)){a.v().3D(b+1)}},3x)}e.3u=H;9(e.2h){e.2h()}}});n.o.u.1G(4.q,"2J",5(){7 a=d.G.T();n.o.u.U(a,"2J",d.G)});n.o.u.1G(4.q,"2T",5(){7 a=d.G.T();n.o.u.U(a,"2T",d.G)})};F.6.2R=5(){9(4.q&&4.q.3e){4.1M();n.o.u.3c(4.2X);n.o.u.51(4.q);4.q.3e.4V(4.q);4.q=s}};F.6.37=5(){9(4.1m){7 a=4.27(4.B);4.q.M.1L=a.y+"z";4.q.M.1K=a.x+"z"}};F.6.1M=5(){9(4.q){4.q.M.39="2V"}4.1m=t};F.6.29=5(){9(4.q){7 e="";7 c=4.3b.4g(" ");7 b=12(c[0].3d(),10);7 d=12(c[1].3d(),10);7 a=4.27(4.B);4.q.M.41=4.2O(a);e="<3Y 3X=\'"+4.2M+"\' M=\'1X: 1W; 1L: "+d+"z; 1K: "+b+"z; ";9(!4.G.T().1h){e+="3W: 3V("+(-1*d)+"z, "+((-1*b)+4.1p)+"z, "+((-1*d)+4.1g)+"z, "+(-1*b)+"z);"}e+="\'>";4.q.3U=e+"<20 M=\'"+"1X: 1W;"+"1L: "+4.1U[0]+"z;"+"1K: "+4.1U[1]+"z;"+"3R: "+4.2B+";"+"1B-1l: "+4.2x+"z;"+"1B-3N: "+4.2s+";"+"1B-3J: "+4.2p+";"+"1B-M: "+4.2o+";"+"1v-3G: "+4.2l+";"+"1v-3C: 1e;"+"1y: "+4.1p+"z;"+"3z-1w:"+4.1g+"z;"+"\'>"+4.14.1v+"";9(2w 4.14.Z==="18"||4.14.Z===""){4.q.Z=4.G.T().2C()}K{4.q.Z=4.14.Z}4.q.M.39=""}4.1m=H};F.6.2N=5(a){4.14=a;7 b=A.3n(0,a.2P-1);b=A.1Z(4.S.p-1,b);7 c=4.S[b];4.2M=c.3f;4.1g=c.1w;4.1p=c.1y;4.1U=c.5i||[0,0];4.2c=c.5d||[12(4.1g/2,10),12(4.1p/2,10)];4.2B=c.57||"50";4.2x=c.4X||11;4.2l=c.4S||"2V";4.2p=c.4Q||"4O";4.2o=c.4K||"4H";4.2s=c.4G||"4F,4D-4C";4.3b=c.4A||"0 0"};F.6.32=5(a){4.B=a};F.6.2O=5(b){7 a=[];a.Y("4x: 4v;");a.Y("1X: 1W; 1L: "+b.y+"z; 1K: "+b.x+"z;");a.Y("1y: "+4.1p+"z; 1w: "+4.1g+"z;");j a.4s("")};F.6.27=5(b){7 a=4.38().28(b);a.x-=4.2c[1];a.y-=4.2c[0];a.x=12(a.x,10);a.y=12(a.y,10);j a};5 C(a){4.W=a;4.Q=a.v();4.O=a.2U();4.X=a.2S();4.19=a.3g();4.k=[];4.B=s;4.2b=s;4.V=E F(4,a.21())}C.6.42=5(){j 4.k.p};C.6.1F=5(){j 4.k};C.6.2Q=5(){j 4.B};C.6.v=5(){j 4.Q};C.6.T=5(){j 4.W};C.6.1r=5(){7 i;7 b=E n.o.1j(4.B,4.B);7 a=4.1F();w(i=0;ib){9(e.v()!==4.Q){e.J(4.Q)}}K 9(c<4.X){9(e.v()!==4.Q){e.J(4.Q)}}K 9(c===4.X){w(i=0;ia){4.V.1M();j}9(c<4.X){4.V.1M();j}7 b=4.W.21().p;7 d=4.W.2F()(4.k,b);4.V.32(4.B);4.V.2N(d);4.V.29()};C.6.2L=5(a){7 i;9(4.k.1d){j 4.k.1d(a)!==-1}K{w(i=0;i<4.k.p;i++){9(a===4.k[i]){j H}}}j t};5 8(a,c,b){4.13(8,n.o.2Z);c=c||[];b=b||{};4.k=[];4.D=[];4.1f=[];4.1a=s;4.1b=t;4.O=b.3S||3Q;4.X=b.3P||2;4.1T=b.2A||s;4.S=b.3O||[];4.1Q=b.Z||"";4.1u=H;9(b.2y!==18){4.1u=b.2y}4.19=t;9(b.2d!==18){4.19=b.2d}4.17=t;9(b.2u!==18){4.17=b.2u}4.1h=t;9(b.2t!==18){4.1h=b.2t}4.1s=b.3L||8.2q;4.1t=b.3I||8.2e;4.1c=b.3H||8.2n;4.1R=b.3F||8.2m;4.1O=b.3E||8.2k;4.1x=b.3B||8.2j;4.1P=b.3A||"L";9(3K.3w.3M().1d("3v")!==-1){4.1O=4.1x}4.2r();4.2i(c,H);4.J(a)}8.6.2E=5(){7 a=4;4.1a=4.v();4.1b=H;4.1i();4.1f=[n.o.u.1H(4.v(),"3t",5(){a.1C(t);9(4.16()===(4.2g("3r")||0)||4.16()===4.2g("2A")){n.o.u.U(4,"2f")}}),n.o.u.1H(4.v(),"2f",5(){a.1k()})]};8.6.2R=5(){7 i;w(i=0;i<4.k.p;i++){9(4.k[i].v()!==4.1a){4.k[i].J(4.1a)}}w(i=0;i<4.D.p;i++){4.D[i].1E()}4.D=[];w(i=0;i<4.1f.p;i++){n.o.u.3c(4.1f[i])}4.1f=[];4.1a=s;4.1b=t};8.6.37=5(){};8.6.2r=5(){7 i,1l;9(4.S.p>0){j}w(i=0;i<4.1c.p;i++){1l=4.1c[i];4.S.Y({3f:4.1s+(i+1)+"."+4.1t,1w:1l,1y:1l})}};8.6.3q=5(){7 i;7 a=4.1F();7 b=E n.o.1j();w(i=0;i3){d=E n.o.1j(4.v().1r().24(),4.v().1r().25())}K{d=E n.o.1j(E n.o.1n(36.4r,-2W.4q),E n.o.1n(-36.4p,2W.4o))}7 a=4.1V(d);7 b=A.1Z(e+4.1O,4.k.p);w(i=e;i