From cec2253b82b3a3861e8e5875f256d6ec10835160 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 26 Jun 2013 17:27:32 +0100 Subject: [PATCH] Update Leaflet to 0.6 --- Vendorfile | 2 +- vendor/assets/leaflet/images/layers-2x.png | Bin 0 -> 2898 bytes vendor/assets/leaflet/images/layers.png | Bin 973 -> 1502 bytes ...{marker-icon@2x.png => marker-icon-2x.png} | Bin vendor/assets/leaflet/leaflet.css | 138 +- vendor/assets/leaflet/leaflet.ie.css | 6 - vendor/assets/leaflet/leaflet.js | 2880 ++++++++++------- 7 files changed, 1786 insertions(+), 1240 deletions(-) create mode 100644 vendor/assets/leaflet/images/layers-2x.png rename vendor/assets/leaflet/images/{marker-icon@2x.png => marker-icon-2x.png} (100%) diff --git a/Vendorfile b/Vendorfile index a7cada67a..3f86bb184 100644 --- a/Vendorfile +++ b/Vendorfile @@ -1,6 +1,6 @@ folder 'vendor/assets' do folder 'leaflet' do - from 'git://github.com/Leaflet/Leaflet.git', :tag => 'v0.5' do + from 'git://github.com/Leaflet/Leaflet.git', :tag => 'v0.6' do file 'leaflet.css', 'dist/leaflet.css' file 'leaflet.ie.css', 'dist/leaflet.ie.css' file 'leaflet.js', 'dist/leaflet-src.js' diff --git a/vendor/assets/leaflet/images/layers-2x.png b/vendor/assets/leaflet/images/layers-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a2cf7f9efef65d2e021f382f47ef50d51d51a0df GIT binary patch literal 2898 zcmV-Y3$65tP)?AfzNU07Ji0>J$I zyy*J%>jA&t|KY2zz8cz!dNXf;;xfzYhMv6otBB#?C3IqawZEtV)Ws@UgL!F(S zVuQi(g3)MfC@U-DvZ*wkrlzJCm&-NacDq09>gq~l5}T2sGiS~m&}cNz)Ya8VDT)#l zNC*+dVzFibkV>Wf6h#RdO+pCebUI^xzyIT7$BqeRmmotYPo7ln-o5)Lb#-+Wt4tB1 zL?WS%$KwYGA#wnqC~8q6kz5js#Q~u?=I7@{PN#EXe0=;bLfDnk&?-~(di{aQ%F2}6 z@Otq)pTDxQa)9Ug-O2u^X?k2HlU<@|dP!(bpU+2oJf2JG*tMadci(-tUaeLiZfIyI zNXL}*ZH>iZbu7y^5kgWvyHOOC5Q#)KsZ{C&ASge}vh={fz(ODpIRDBkuQ-zCz2DG@ z6DQ<4o$iRqWHRj7u|x2JWLdT}9*;l4^Za(9F#tf*^mh`8#Vh4?g(dDVl2B@enN;WQv=CFQPhf9EWRp{ zNIXJgB9Vy5;c(oXn3y=%-rnw`&Ye4V)Mzv|l$VzaHo|e-_E;?T1kdxO*)=`2Xqpa6 zrP7NG!+a++W^!^;hrf`@B%%6jB1%hvEb zFJ>4fL{U`QO=E0qtk7<^KSgzPbPxbBg+g)p>8GEbC@wBeYV3ZdJSwGQ*R5N(WS@NU zNkupuZUrD^T3cIt2q6ce(P*R7=`5L>n_JN7bW0RVDKOzL<*owE|)*| z=9_Ph+_P37C(~njkHQ666opafyd+FS(c>%d`Sp- z`JH#(8C@+SS|9N2v(JVZh6&ubaf8_Hc6w-N2$PeOXliOgb#?V4H?UqKBO|ccY?z;) zhfF4;&1N%EsZ;@u*D=RA~Dk?%tOA8c=4VUv}hGC8|TCMgUDwV34 zrs<>$B{w%0TCEl`nGC^T5K~iA2m}Ji&(FuUZQHiQ%*4b5KL7l4_AkZ2nK`j`Fyy2 z`!Kkw^p=FJ44nUmup2m!VRr@Z^(ELa9_@6(h;y^ZEL^ySv4Ui;H!u96I#v zx8Iulet&Oyc{weSNRq-+EEYqhQlX@z1T!-;2nK`jdc6PurBeA&W*iO&zWVAbghCjHZwG}lrH7Pr5d3kyIv(G*o9v>e!1DK_0`Y=TZ!5eS9AzNHr{1t#-0$?jED{U<; zEss+aCE6$%&+`}>8iL#H2FGzIEiJ{qefu&t77B&X)6;`sFbIZWU@#a^TU(oQjS@oG zzP`RIKA*1%cXsNx<#PF3ufP8K%7z@u%gc+I&1Px31}-ctz-F@{6beBs7DKPs-EPOq$_fe#3sbV|KBl0tu@My&6)E$_Vlnjh z_hWK$5)z37)z#HdDwY2N(B9V8Hu->|?(XjA0i48L4zVl?uh+Ylz+^I^s;VmG;!MXb z0Ze&7gb<95j$&|d5UU-m)9D}*t*wS70KWlns;#Y!r7m2!Py^tP0KT6r;ljcKTrL+D z7Z-)F0KkLns;#XB01OQc31!LydE|0Aj7DRsDR~{hPnqiK>c8#Sv12d8FgeLeNu^Sh zm6bsvksuTb!RPZK8jWJ-&Yc@B++^&Uo}L!W6qaRSx7%T}*^o#iP*qh0qtOVNY~vSW zj^pG`r&CXLbaW&DENHb_w??CRe8ULbna3WF2RCotL{3f)_U_#awOXAj1kq>|cDo$_ z(Ae0BoSdZnwx&QJfNR&Tt#z7SuTQ&vr>Cd;T`pHCA*77z=;&wz@E(9lu~_VEYHG@t z%jK1+5`@EH3=a>lRcbbyk)NNRveI-~T3SMHZ|_=X)zs9aos!XLblPUKO-7?pGXNie zmnlLBEEbClz$%C6l9G}ud-m*UVHjq^dBO8M{C+h5~JRXF@VdUrMqot)qFkC~S5c>N1u(Y%Ug+c+nUXQ%Iyp%EFaCp$+a7a0hs{-&P zfS0XSYjO^)Gxi*S-vij0latfi)YMd-lasS6UE@YZMj(V;8!#oMkwhXfXSdsj78Vv- z0n7mSxz%d@`~BrMJPNj0EQJ8N02~7lEh{Ut84QM$k3;F$C4ebO<@ft9kByDh0N4iL z41i9n)jFT7Y}(rgi^bA>H%SA-Fr)SL^)ZD)VM-N~j9maSVG00XadFXSv)Pssi9{WM z0RYFWR%?H%7(v%57K?=ea2&vI0musq3NAM`Hr9&8;tgM42_cxAoW$7J7 zXf#RRbXT>?E&v%b1;9T6{LE^#3O>ls>W2i^;i8Gi-<005~MzCV_|S*E^l&Yo9;Xs000GBNkl!>2O#u)-K)t-b7_ z4;_qQVO+!wMxifbbbXMOZa$PzSqGbO(wN3ZhpEBbgrat>S~Xe|bN~GIP~y~S)o#Dn z?>Xmle&?LuA3`a`e%7T+mk0oKb#?8_k?aT5+uK{?cDvsNfK)2=Lq|u)#QzHF?(Qyb zY-~K^a=Dt#W`8pPV0CpB>2x|AjYe;Fc6L7h&!E1(zLV9})u*ghYw33S?Ck9Fgo=++wEZ(=B3H#x{g#TB~MOH_MSa^c4|)`Ns{=6hK6>J$8)^2 zw3OYbQA&$)x!mgjU^1EhAcSN$>dVW^nk>r$u~@866o1A1j-Xq&ZZo_Fkad)d~E z^7(wNq9`qtQX>EmLe>lh!w}E&<6CWKW@etrvi#%e)2E}GK-aEatEjE5J>zn@4)Z*} zX^WbsRjjS8ozQjt;C3Zp80Igd(fB*dvU6J!Bk6Q{bbNgL=DBm{=E&{ax8L%5y>AGD zVA@h9!++Y^TC=LE^#ESpBtYjlZp>&jh6y3cMqy!LA(u=he`Vcn_jgXGb4d^cy&x)z z;>qQ5Z|S=31VDCy007Z-{h+FT)INYo#%4dX9ik_aH*K}R)TU}i} ze(cyW;`Mr8f$`5uCX={#?;bUq%>xX>w4XnJevw3@(UX+Ys{s5dGZ9oU=UWT zb=_xfZVr)1gt9C<$n$*rg$oy+kvn(pv;w#apnhd#1@U+s<>lo#a^whj{>9)?N)eC8 zAtgtbeTH zIIfuIdD!iCWV2aBqfrdC8xVVVc)>hc<_H~FX%NQCOLV0;P zYHDg=G#U$VGCVw7OD^UcnH-d5xs+0RnSW49A&O!#fXf`moeBg3oFEAPg7w0}0uqS?91aKS z>+9DiP}g;gjg4VyY6?D|4}u_UgiqeTe?Oxr$}a#umn7-=rrTQ-#X11r2!en>AQ0d< zuC&mjbUKZvPoE+X2mk;^Mn+IsSqYcRwO&3=(^g}#*znxk90l;PBuRf3Vt@bZJrYHc z0C=AeBKmy3#j2{RmV%bcAKzn;9E(OHU-}Cg%w4y z9Ke@Gqw#Ps7_=4_7gud(m(6BpB9X|WY&JU%;8RJG=C`xk_0J%RVjCgkE1S)hsjI7N zVHm~;0F+WS9*+-BPfwdErBI!cB!ylUXHUN%Q4~1X*U3L xOOmAS7Gq!kI#Cpz0KNu50em7!(xbil{tcM#ah;kQ-Ddy*002ovPDHLkV1jDt%$EQF delta 962 zcmV;z13moS3(W_R8Gi!+005qpy!-$F0j*F>R7DL94G#|w5D*X%5fKs+5)>2^6%`d2 z7#JBD85|rO9UUDXA0HzlBPb{+F)=YTG&D6eH8wUjI5;>tIXOByIy*Z%K0ZD_KR-Y~ zKtVx4LqkJFMMX$RNK8yjO-)T%Sy@_IT4rWu|NsB1tE;uOwSR|)hmMYpsHmu#nwp)R zov^U5xw*N7goKNWiLwZOo@ zZfmgfPjE+Z*Q=$u)V##d3kwWUS3~cUuI@zXlQ6`Y;0|9ZEkLEZ*OmL zadCWne0_a=et&*`f`WpBgM)>Ig@%TPii(Pjjg6C&la!Q{m6es3mzS8Bn46oMo}Qkc zpP!(hprN6mqN1Xysi~@}s;sQ6uCA`HudlJOv9q(Yw6wIfwY9dkwz#;sy1Kf(y}iD^ zzQ4b}!NI}9!^6bH#KpzM$H&LX$;ryf%FD~k%*@Qr&VSC&&(F}%(9+V<)6>({)z#M4 z*4Nk9+1c6J+S=RO+uYpT-QC^a-{0cm;^gGy=jZ3>=;-b3?e6aG^Yioc^z?CB%1QtL z07P_BPE!B?000000000000000000000000000000000000000001^@x7Z)fkLqkYN zNKJ^0jDL)f#KgzR>+9_7?C$vc`}_PTZaRMe00E0hL_t(2&ux-RPr^VDfM;7;-rZ8D z5jki`xXR6VQsWOd>dBCBAR1pJ1Y;0Mp>#`mZE4rth9Zc2X{O)K&bK>*st_+ffq|@6 zERNAHO5IaVkYrqz6!3?4HeH50NHea|5`X`O^IO}YOSVBNd{K~5w1)-bdoq~^ zEJBKQUP_9T0A!K496s3If^k&P&NKlSl^|3_Zs<1Lfrn0Uy&z(?U(UfT}8lj@2jpKm#A@NLJ8VgZTk-zR8=Y1<8XfHWcw21omw*9elF2#;VN< z8Gk9@wd8O%Mzuu4eS%n{(^qp`fGs>)uKv-O_PksMW?rt6-Pf3W_@Er;*BVXO(fER+ zSmQN%!&pO(%Z kyoCSEVMnS%YXbm&03F%b-edQm+W-In07*qoM6N<$f~hjp5dZ)H diff --git a/vendor/assets/leaflet/images/marker-icon@2x.png b/vendor/assets/leaflet/images/marker-icon-2x.png similarity index 100% rename from vendor/assets/leaflet/images/marker-icon@2x.png rename to vendor/assets/leaflet/images/marker-icon-2x.png diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css index ea3da3907..ddb7e6b8b 100644 --- a/vendor/assets/leaflet/leaflet.css +++ b/vendor/assets/leaflet/leaflet.css @@ -5,6 +5,7 @@ .leaflet-marker-icon, .leaflet-marker-shadow, .leaflet-tile-pane, +.leaflet-tile-container, .leaflet-overlay-pane, .leaflet-shadow-pane, .leaflet-marker-pane, @@ -27,6 +28,7 @@ -webkit-user-select: none; -moz-user-select: none; user-select: none; + -webkit-user-drag: none; } .leaflet-marker-icon, .leaflet-marker-shadow { @@ -191,104 +193,108 @@ /* general toolbar styles */ .leaflet-bar { - box-shadow: 0 0 8px rgba(0,0,0,0.4); - border: 1px solid #888; - -webkit-border-radius: 5px; - border-radius: 5px; + box-shadow: 0 1px 7px rgba(0,0,0,0.65); + -webkit-border-radius: 4px; + border-radius: 4px; } -.leaflet-bar-part { - background-color: rgba(255, 255, 255, 0.8); - border-bottom: 1px solid #aaa; +.leaflet-bar a { + background-color: #fff; + border-bottom: 1px solid #ccc; + width: 26px; + height: 26px; + line-height: 26px; + display: block; + text-align: center; + text-decoration: none; + color: black; } -.leaflet-bar-part-top { - -webkit-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; +.leaflet-bar a, +.leaflet-control-layers-toggle { + background-position: 50% 50%; + background-repeat: no-repeat; + display: block; } -.leaflet-bar-part-bottom { - -webkit-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; +.leaflet-bar a:hover { + background-color: #f4f4f4; + } +.leaflet-bar a:first-child { + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + } +.leaflet-bar a:last-child { + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; border-bottom: none; } +.leaflet-bar a.leaflet-disabled { + cursor: default; + background-color: #f4f4f4; + color: #bbb; + } .leaflet-touch .leaflet-bar { -webkit-border-radius: 10px; border-radius: 10px; } -.leaflet-touch .leaflet-bar-part { - border-bottom: 4px solid rgba(0,0,0,0.3); - } -.leaflet-touch .leaflet-bar-part-top { - -webkit-border-radius: 7px 7px 0 0; - border-radius: 7px 7px 0 0; +.leaflet-touch .leaflet-bar a { + width: 30px; + height: 30px; } -.leaflet-touch .leaflet-bar-part-bottom { - -webkit-border-radius: 0 0 7px 7px; - border-radius: 0 0 7px 7px; +.leaflet-touch .leaflet-bar a:first-child { + -webkit-border-top-left-radius: 7px; + border-top-left-radius: 7px; + -webkit-border-top-right-radius: 7px; + border-top-right-radius: 7px; + } +.leaflet-touch .leaflet-bar a:last-child { + -webkit-border-bottom-left-radius: 7px; + border-bottom-left-radius: 7px; + -webkit-border-bottom-right-radius: 7px; + border-bottom-right-radius: 7px; border-bottom: none; } /* zoom control */ -.leaflet-container .leaflet-control-zoom { - margin-left: 13px; - margin-top: 12px; - } -.leaflet-control-zoom a { - width: 22px; - height: 22px; - text-align: center; - text-decoration: none; - color: black; - } -.leaflet-control-zoom a, -.leaflet-control-layers-toggle { - background-position: 50% 50%; - background-repeat: no-repeat; - display: block; - } -.leaflet-control-zoom a:hover { - background-color: #fff; - color: #777; - } .leaflet-control-zoom-in { - font: bold 18px/24px Arial, Helvetica, sans-serif; + font: bold 18px 'Lucida Console', Monaco, monospace; } .leaflet-control-zoom-out { - font: bold 23px/20px Tahoma, Verdana, sans-serif; - } -.leaflet-control-zoom a.leaflet-control-zoom-disabled { - cursor: default; - background-color: rgba(255, 255, 255, 0.8); - color: #bbb; + font: bold 22px 'Lucida Console', Monaco, monospace; } -.leaflet-touch .leaflet-control-zoom a { - width: 30px; - height: 30px; - } .leaflet-touch .leaflet-control-zoom-in { - font-size: 24px; - line-height: 29px; + font-size: 22px; + line-height: 30px; } .leaflet-touch .leaflet-control-zoom-out { font-size: 28px; - line-height: 24px; + line-height: 30px; } + /* layers control */ .leaflet-control-layers { box-shadow: 0 1px 7px rgba(0,0,0,0.4); background: #f8f8f9; - -webkit-border-radius: 8px; - border-radius: 8px; + -webkit-border-radius: 5px; + border-radius: 5px; } .leaflet-control-layers-toggle { background-image: url(images/layers.png); width: 36px; height: 36px; } +.leaflet-retina .leaflet-control-layers-toggle { + background-image: url(images/layers-2x.png); + background-size: 26px 26px; + } .leaflet-touch .leaflet-control-layers-toggle { width: 44px; height: 44px; @@ -386,11 +392,11 @@ .leaflet-popup-content-wrapper { padding: 1px; text-align: left; - -webkit-border-radius: 20px; - border-radius: 20px; + -webkit-border-radius: 12px; + border-radius: 12px; } .leaflet-popup-content { - margin: 14px 20px; + margin: 13px 19px; line-height: 1.4; } .leaflet-popup-content p { @@ -404,11 +410,11 @@ overflow: hidden; } .leaflet-popup-tip { - width: 15px; - height: 15px; + width: 17px; + height: 17px; padding: 1px; - margin: -8px auto 0; + margin: -10px auto 0; -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); @@ -425,7 +431,7 @@ position: absolute; top: 0; right: 0; - padding: 4px 5px 0 0; + padding: 4px 4px 0 0; text-align: center; width: 18px; height: 14px; diff --git a/vendor/assets/leaflet/leaflet.ie.css b/vendor/assets/leaflet/leaflet.ie.css index b59c8144e..14b84b691 100644 --- a/vendor/assets/leaflet/leaflet.ie.css +++ b/vendor/assets/leaflet/leaflet.ie.css @@ -35,12 +35,6 @@ .leaflet-control-layers { border: 3px solid #999; } -.leaflet-control-zoom a { - background-color: #eee; - } -.leaflet-control-zoom a:hover { - background-color: #fff; - } .leaflet-control-layers-toggle { } .leaflet-control-attribution, diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js index 2da1987df..0795a7de9 100644 --- a/vendor/assets/leaflet/leaflet.js +++ b/vendor/assets/leaflet/leaflet.js @@ -1,29 +1,31 @@ /* Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com - (c) 2010-2013, Vladimir Agafonkin, CloudMade + (c) 2010-2013, Vladimir Agafonkin + (c) 2010-2011, CloudMade */ -(function (window, document, undefined) {/* - * The L namespace contains all Leaflet classes and functions. - * This code allows you to handle any possible namespace conflicts. - */ - -var L, originalL; +(function (window, document, undefined) { +var oldL = window.L, + L = {}; -if (typeof exports !== undefined + '') { - L = exports; -} else { - originalL = window.L; - L = {}; +L.version = '0.6'; - L.noConflict = function () { - window.L = originalL; - return this; - }; +// define Leaflet for Node module pattern loaders, including Browserify +if (typeof module === 'object' && typeof module.exports === 'object') { + module.exports = L; - window.L = L; +// define Leaflet as an AMD module +} else if (typeof define === 'function' && define.amd) { + define(L); } -L.version = '0.5'; +// define Leaflet as a global L variable, saving the original L to restore later if needed + +L.noConflict = function () { + window.L = oldL; + return this; +}; + +window.L = L; /* @@ -54,13 +56,29 @@ L.Util = { }, stamp: (function () { - var lastId = 0, key = '_leaflet_id'; - return function (/*Object*/ obj) { + var lastId = 0, + key = '_leaflet_id'; + return function (obj) { obj[key] = obj[key] || ++lastId; return obj[key]; }; }()), + invokeEach: function (obj, method, context) { + var i, args; + + if (typeof obj === 'object') { + args = Array.prototype.slice.call(arguments, 3); + + for (i in obj) { + method.apply(context, [i, obj[i]].concat(args)); + } + return true; + } + + return false; + }, + limitExecByInterval: function (fn, time, context) { var lock, execOnUnlock; @@ -96,8 +114,12 @@ L.Util = { return Math.round(num * pow) / pow; }, + trim: function (str) { + return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, ''); + }, + splitWords: function (str) { - return str.replace(/^\s+|\s+$/g, '').split(/\s+/); + return L.Util.trim(str).split(/\s+/); }, setOptions: function (obj, options) { @@ -105,12 +127,10 @@ L.Util = { return obj.options; }, - getParamString: function (obj, existingUrl) { + getParamString: function (obj, existingUrl, uppercase) { var params = []; for (var i in obj) { - if (obj.hasOwnProperty(i)) { - params.push(i + '=' + obj[i]); - } + params.push(encodeURIComponent(uppercase ? i.toUpperCase() : i) + '=' + encodeURIComponent(obj[i])); } return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&'); }, @@ -118,8 +138,10 @@ L.Util = { template: function (str, data) { return str.replace(/\{ *([\w_]+) *\}/g, function (str, key) { var value = data[key]; - if (!data.hasOwnProperty(key)) { + if (value === undefined) { throw new Error('No value provided for variable ' + str); + } else if (typeof value === 'function') { + value = value(data); } return value; }); @@ -253,6 +275,9 @@ L.Class.extend = function (props) { proto._initHooks = []; var parent = this; + // jshint camelcase: false + NewClass.__super__ = parent.prototype; + // add method for calling all hooks proto.callInitHooks = function () { @@ -300,71 +325,111 @@ L.Class.addInitHook = function (fn) { // (Function) || (String, args...) * L.Mixin.Events is used to add custom events functionality to Leaflet classes. */ -var key = '_leaflet_events'; +var eventsKey = '_leaflet_events'; L.Mixin = {}; L.Mixin.Events = { addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object]) - var events = this[key] = this[key] || {}, - type, i, len; - - // Types can be a map of types/handlers - if (typeof types === 'object') { - for (type in types) { - if (types.hasOwnProperty(type)) { - this.addEventListener(type, types[type], fn); - } - } - return this; - } + // types can be a map of types/handlers + if (L.Util.invokeEach(types, this.addEventListener, this, fn, context)) { return this; } + var events = this[eventsKey] = this[eventsKey] || {}, + contextId = context && L.stamp(context), + i, len, event, type, indexKey, indexLenKey, typeIndex; + + // types can be a string of space-separated words types = L.Util.splitWords(types); for (i = 0, len = types.length; i < len; i++) { - events[types[i]] = events[types[i]] || []; - events[types[i]].push({ + event = { action: fn, context: context || this - }); + }; + type = types[i]; + + if (context) { + // store listeners of a particular context in a separate hash (if it has an id) + // gives a major performance boost when removing thousands of map layers + + indexKey = type + '_idx'; + indexLenKey = indexKey + '_len'; + + typeIndex = events[indexKey] = events[indexKey] || {}; + + if (!typeIndex[contextId]) { + typeIndex[contextId] = []; + + // keep track of the number of keys in the index to quickly check if it's empty + events[indexLenKey] = (events[indexLenKey] || 0) + 1; + } + + typeIndex[contextId].push(event); + + + } else { + events[type] = events[type] || []; + events[type].push(event); + } } return this; }, hasEventListeners: function (type) { // (String) -> Boolean - return (key in this) && (type in this[key]) && (this[key][type].length > 0); + var events = this[eventsKey]; + return !!events && ((type in events && events[type].length > 0) || + (type + '_idx' in events && events[type + '_idx_len'] > 0)); }, - removeEventListener: function (types, fn, context) { // (String[, Function, Object]) or (Object[, Object]) - var events = this[key], - type, i, len, listeners, j; - - if (typeof types === 'object') { - for (type in types) { - if (types.hasOwnProperty(type)) { - this.removeEventListener(type, types[type], fn); - } - } + removeEventListener: function (types, fn, context) { // ([String, Function, Object]) or (Object[, Object]) + if (!this[eventsKey]) { return this; } + if (!types) { + return this.clearAllEventListeners(); + } + + if (L.Util.invokeEach(types, this.removeEventListener, this, fn, context)) { return this; } + + var events = this[eventsKey], + contextId = context && L.stamp(context), + i, len, type, listeners, j, indexKey, indexLenKey, typeIndex, removed; + types = L.Util.splitWords(types); for (i = 0, len = types.length; i < len; i++) { + type = types[i]; + indexKey = type + '_idx'; + indexLenKey = indexKey + '_len'; + + typeIndex = events[indexKey]; - if (this.hasEventListeners(types[i])) { - listeners = events[types[i]]; + if (!fn) { + // clear all listeners for a type if function isn't specified + delete events[type]; + delete events[indexKey]; + + } else { + listeners = context && typeIndex ? typeIndex[contextId] : events[type]; + + if (listeners) { + for (j = listeners.length - 1; j >= 0; j--) { + if ((listeners[j].action === fn) && (!context || (listeners[j].context === context))) { + removed = listeners.splice(j, 1); + // set the old action to a no-op, because it is possible + // that the listener is being iterated over as part of a dispatch + removed[0].action = L.Util.falseFn; + } + } - for (j = listeners.length - 1; j >= 0; j--) { - if ( - (!fn || listeners[j].action === fn) && - (!context || (listeners[j].context === context)) - ) { - listeners.splice(j, 1); + if (context && typeIndex && (listeners.length === 0)) { + delete typeIndex[contextId]; + events[indexLenKey]--; } } } @@ -373,28 +438,65 @@ L.Mixin.Events = { return this; }, + clearAllEventListeners: function () { + delete this[eventsKey]; + return this; + }, + fireEvent: function (type, data) { // (String[, Object]) if (!this.hasEventListeners(type)) { return this; } - var event = L.extend({ - type: type, - target: this - }, data); + var event = L.Util.extend({}, data, { type: type, target: this }); + + var events = this[eventsKey], + listeners, i, len, typeIndex, contextId; + + if (events[type]) { + // make sure adding/removing listeners inside other listeners won't cause infinite loop + listeners = events[type].slice(); + + for (i = 0, len = listeners.length; i < len; i++) { + listeners[i].action.call(listeners[i].context || this, event); + } + } + + // fire event for the context-indexed listeners as well + typeIndex = events[type + '_idx']; - var listeners = this[key][type].slice(); + for (contextId in typeIndex) { + listeners = typeIndex[contextId].slice(); - for (var i = 0, len = listeners.length; i < len; i++) { - listeners[i].action.call(listeners[i].context || this, event); + if (listeners) { + for (i = 0, len = listeners.length; i < len; i++) { + listeners[i].action.call(listeners[i].context || this, event); + } + } } return this; + }, + + addOneTimeEventListener: function (types, fn, context) { + + if (L.Util.invokeEach(types, this.addOneTimeEventListener, this, fn, context)) { return this; } + + var handler = L.bind(function () { + this + .removeEventListener(types, fn, context) + .removeEventListener(types, handler, context); + }, this); + + return this + .addEventListener(types, fn, context) + .addEventListener(types, handler, context); } }; L.Mixin.Events.on = L.Mixin.Events.addEventListener; L.Mixin.Events.off = L.Mixin.Events.removeEventListener; +L.Mixin.Events.once = L.Mixin.Events.addOneTimeEventListener; L.Mixin.Events.fire = L.Mixin.Events.fireEvent; @@ -407,11 +509,13 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent; var ie = !!window.ActiveXObject, ie6 = ie && !window.XMLHttpRequest, ie7 = ie && !document.querySelector, + ielt9 = ie && !document.addEventListener, // terrible browser detection to work around Safari / iOS / Android browser bugs ua = navigator.userAgent.toLowerCase(), webkit = ua.indexOf('webkit') !== -1, chrome = ua.indexOf('chrome') !== -1, + phantomjs = ua.indexOf('phantom') !== -1, android = ua.indexOf('android') !== -1, android23 = ua.search('android [23]') !== -1, @@ -427,10 +531,13 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent; webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()), gecko3d = 'MozPerspective' in doc.style, opera3d = 'OTransition' in doc.style, - any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d); + any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d) && !phantomjs; + + // PhantomJS has 'ontouchstart' in document.documentElement, but doesn't actually support touch. + // https://github.com/Leaflet/Leaflet/pull/1434#issuecomment-13843151 - var touch = !window.L_NO_TOUCH && (function () { + var touch = !window.L_NO_TOUCH && !phantomjs && (function () { var startName = 'ontouchstart'; @@ -463,6 +570,7 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent; ie: ie, ie6: ie6, ie7: ie7, + ielt9: ielt9, webkit: webkit, android: android, @@ -577,10 +685,19 @@ L.Point.prototype = { }, equals: function (point) { + point = L.point(point); + return point.x === this.x && point.y === this.y; }, + contains: function (point) { + point = L.point(point); + + return Math.abs(point.x) <= Math.abs(this.x) && + Math.abs(point.y) <= Math.abs(this.y); + }, + toString: function () { return 'Point(' + L.Util.formatNum(this.x) + ', ' + @@ -595,7 +712,7 @@ L.point = function (x, y, round) { if (L.Util.isArray(x)) { return new L.Point(x[0], x[1]); } - if (isNaN(x)) { + if (x === undefined || x === null) { return x; } return new L.Point(x, y, round); @@ -763,6 +880,7 @@ L.DomUtil = { left = 0, el = element, docBody = document.body, + docEl = document.documentElement, pos, ie7 = L.Browser.ie7; @@ -771,18 +889,34 @@ L.DomUtil = { left += el.offsetLeft || 0; //add borders - top += parseInt(L.DomUtil.getStyle(el, "borderTopWidth"), 10) || 0; - left += parseInt(L.DomUtil.getStyle(el, "borderLeftWidth"), 10) || 0; + top += parseInt(L.DomUtil.getStyle(el, 'borderTopWidth'), 10) || 0; + left += parseInt(L.DomUtil.getStyle(el, 'borderLeftWidth'), 10) || 0; pos = L.DomUtil.getStyle(el, 'position'); if (el.offsetParent === docBody && pos === 'absolute') { break; } if (pos === 'fixed') { - top += docBody.scrollTop || 0; - left += docBody.scrollLeft || 0; + top += docBody.scrollTop || docEl.scrollTop || 0; + left += docBody.scrollLeft || docEl.scrollLeft || 0; + break; + } + + if (pos === 'relative' && !el.offsetLeft) { + var width = L.DomUtil.getStyle(el, 'width'), + maxWidth = L.DomUtil.getStyle(el, 'max-width'), + r = el.getBoundingClientRect(); + + if (width !== 'none' || maxWidth !== 'none') { + left += r.left + el.clientLeft; + } + + //calculate full y offset since we're breaking out of the loop + top += r.top + (docBody.scrollTop || docEl.scrollTop || 0); + break; } + el = el.offsetParent; } while (el); @@ -817,7 +951,7 @@ L.DomUtil = { documentIsLtr: function () { if (!L.DomUtil._docIsLtrCached) { L.DomUtil._docIsLtrCached = true; - L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === "ltr"; + L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === 'ltr'; } return L.DomUtil._docIsLtr; }, @@ -834,26 +968,9 @@ L.DomUtil = { return el; }, - disableTextSelection: function () { - if (document.selection && document.selection.empty) { - document.selection.empty(); - } - if (!this._onselectstart) { - this._onselectstart = document.onselectstart || null; - document.onselectstart = L.Util.falseFn; - } - }, - - enableTextSelection: function () { - if (document.onselectstart === L.Util.falseFn) { - document.onselectstart = this._onselectstart; - this._onselectstart = null; - } - }, - hasClass: function (el, name) { return (el.className.length > 0) && - new RegExp("(^|\\s)" + name + "(\\s|$)").test(el.className); + new RegExp('(^|\\s)' + name + '(\\s|$)').test(el.className); }, addClass: function (el, name) { @@ -863,15 +980,7 @@ L.DomUtil = { }, removeClass: function (el, name) { - - function replaceFn(w, match) { - if (match === name) { return ''; } - return w; - } - - el.className = el.className - .replace(/(\S+)\s*/g, replaceFn) - .replace(/(^\s+|\s+$)/, ''); + el.className = L.Util.trim((' ' + el.className + ' ').replace(' ' + name + ' ', ' ')); }, setOpacity: function (el, value) { @@ -885,7 +994,13 @@ L.DomUtil = { filterName = 'DXImageTransform.Microsoft.Alpha'; // filters collection throws an error if we try to retrieve a filter that doesn't exist - try { filter = el.filters.item(filterName); } catch (e) {} + try { + filter = el.filters.item(filterName); + } catch (e) { + // don't set opacity to 1 if we haven't already set an opacity, + // it isn't needed and breaks transparent pngs. + if (value === 1) { return; } + } value = Math.round(value * 100); @@ -932,6 +1047,7 @@ L.DomUtil = { setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean]) + // jshint camelcase: false el._leaflet_pos = point; if (!disable3D && L.Browser.any3d) { @@ -950,6 +1066,8 @@ L.DomUtil = { getPosition: function (el) { // this method is only used for elements previously positioned using setPosition, // so it's safe to cache the position for performance + + // jshint camelcase: false return el._leaflet_pos; } }; @@ -970,6 +1088,54 @@ L.DomUtil.TRANSITION_END = L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ? L.DomUtil.TRANSITION + 'End' : 'transitionend'; +(function () { + var userSelectProperty = L.DomUtil.testProp( + ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']); + + var userDragProperty = L.DomUtil.testProp( + ['userDrag', 'WebkitUserDrag', 'OUserDrag', 'MozUserDrag', 'msUserDrag']); + + L.extend(L.DomUtil, { + disableTextSelection: function () { + if (userSelectProperty) { + var style = document.documentElement.style; + this._userSelect = style[userSelectProperty]; + style[userSelectProperty] = 'none'; + } else { + L.DomEvent.on(window, 'selectstart', L.DomEvent.stop); + } + }, + + enableTextSelection: function () { + if (userSelectProperty) { + document.documentElement.style[userSelectProperty] = this._userSelect; + delete this._userSelect; + } else { + L.DomEvent.off(window, 'selectstart', L.DomEvent.stop); + } + }, + + disableImageDrag: function () { + if (userDragProperty) { + var style = document.documentElement.style; + this._userDrag = style[userDragProperty]; + style[userDragProperty] = 'none'; + } else { + L.DomEvent.on(window, 'dragstart', L.DomEvent.stop); + } + }, + + enableImageDrag: function () { + if (userDragProperty) { + document.documentElement.style[userDragProperty] = this._userDrag; + delete this._userDrag; + } else { + L.DomEvent.off(window, 'dragstart', L.DomEvent.stop); + } + } + }); +})(); + /* * L.LatLng represents a geographical point with latitude and longitude coordinates. @@ -1050,9 +1216,12 @@ L.latLng = function (a, b) { // (LatLng) or ([Number, Number]) or (Number, Numbe if (L.Util.isArray(a)) { return new L.LatLng(a[0], a[1]); } - if (isNaN(a)) { + if (a === undefined || a === null) { return a; } + if (typeof a === 'object' && 'lat' in a) { + return new L.LatLng(a.lat, 'lng' in a ? a.lng : a.lon); + } return new L.LatLng(a, b); }; @@ -1075,6 +1244,8 @@ L.LatLngBounds = function (southWest, northEast) { // (LatLng, LatLng) or (LatLn L.LatLngBounds.prototype = { // extend the bounds to contain the given point or bounds extend: function (obj) { // (LatLng) or (LatLngBounds) + if (!obj) { return this; } + if (typeof obj[0] === 'number' || typeof obj[0] === 'string' || obj instanceof L.LatLng) { obj = L.latLng(obj); } else { @@ -1126,11 +1297,27 @@ L.LatLngBounds.prototype = { }, getNorthWest: function () { - return new L.LatLng(this._northEast.lat, this._southWest.lng); + return new L.LatLng(this.getNorth(), this.getWest()); }, getSouthEast: function () { - return new L.LatLng(this._southWest.lat, this._northEast.lng); + return new L.LatLng(this.getSouth(), this.getEast()); + }, + + getWest: function () { + return this._southWest.lng; + }, + + getSouth: function () { + return this._southWest.lat; + }, + + getEast: function () { + return this._northEast.lng; + }, + + getNorth: function () { + return this._northEast.lat; }, contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean @@ -1170,10 +1357,7 @@ L.LatLngBounds.prototype = { }, toBBoxString: function () { - var sw = this._southWest, - ne = this._northEast; - - return [sw.lng, sw.lat, ne.lng, ne.lat].join(','); + return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(','); }, equals: function (bounds) { // (LatLngBounds) @@ -1356,7 +1540,6 @@ L.Map = L.Class.extend({ this._initContainer(id); this._initLayout(); - this.callInitHooks(); this._initEvents(); if (options.maxBounds) { @@ -1364,10 +1547,18 @@ L.Map = L.Class.extend({ } if (options.center && options.zoom !== undefined) { - this.setView(L.latLng(options.center), options.zoom, true); + this.setView(L.latLng(options.center), options.zoom, {reset: true}); } - this._initLayers(options.layers); + this._handlers = []; + + this._layers = {}; + this._zoomBoundLayers = {}; + this._tileLayersNum = 0; + + this.callInitHooks(); + + this._addLayers(options.layers); }, @@ -1379,32 +1570,53 @@ L.Map = L.Class.extend({ return this; }, - setZoom: function (zoom) { // (Number) - return this.setView(this.getCenter(), zoom); + setZoom: function (zoom, options) { + return this.setView(this.getCenter(), zoom, {zoom: options}); }, - zoomIn: function (delta) { - return this.setZoom(this._zoom + (delta || 1)); + zoomIn: function (delta, options) { + return this.setZoom(this._zoom + (delta || 1), options); }, - zoomOut: function (delta) { - return this.setZoom(this._zoom - (delta || 1)); + zoomOut: function (delta, options) { + return this.setZoom(this._zoom - (delta || 1), options); }, - fitBounds: function (bounds) { // (LatLngBounds) - var zoom = this.getBoundsZoom(bounds); - return this.setView(L.latLngBounds(bounds).getCenter(), zoom); + setZoomAround: function (latlng, zoom, options) { + var scale = this.getZoomScale(zoom), + viewHalf = this.getSize().divideBy(2), + containerPoint = latlng instanceof L.Point ? latlng : this.latLngToContainerPoint(latlng), + + centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale), + newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset)); + + return this.setView(newCenter, zoom, {zoom: options}); }, - fitWorld: function () { - var sw = new L.LatLng(-60, -170), - ne = new L.LatLng(85, 179); + fitBounds: function (bounds, options) { + + options = options || {}; + bounds = bounds.getBounds ? bounds.getBounds() : L.latLngBounds(bounds); + + var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]), + paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]), + + zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)), + paddingOffset = paddingBR.subtract(paddingTL).divideBy(2), + + swPoint = this.project(bounds.getSouthWest(), zoom), + nePoint = this.project(bounds.getNorthEast(), zoom), + center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom); + + return this.setView(center, zoom, options); + }, - return this.fitBounds(new L.LatLngBounds(sw, ne)); + fitWorld: function (options) { + return this.fitBounds([[-90, -180], [90, 180]], options); }, - panTo: function (center) { // (LatLng) - return this.setView(center, this._zoom); + panTo: function (center, options) { // (LatLng) + return this.setView(center, this._zoom, {pan: options}); }, panBy: function (offset) { // (Point) @@ -1424,6 +1636,7 @@ L.Map = L.Class.extend({ if (!bounds) { this._boundsMinZoom = null; + this.off('moveend', this._panInsideMaxBounds, this); return this; } @@ -1439,34 +1652,40 @@ L.Map = L.Class.extend({ } } + this.on('moveend', this._panInsideMaxBounds, this); + return this; }, panInsideBounds: function (bounds) { bounds = L.latLngBounds(bounds); - var viewBounds = this.getBounds(), - viewSw = this.project(viewBounds.getSouthWest()), - viewNe = this.project(viewBounds.getNorthEast()), + var viewBounds = this.getPixelBounds(), + viewSw = viewBounds.getBottomLeft(), + viewNe = viewBounds.getTopRight(), sw = this.project(bounds.getSouthWest()), ne = this.project(bounds.getNorthEast()), dx = 0, dy = 0; if (viewNe.y < ne.y) { // north - dy = ne.y - viewNe.y; + dy = Math.ceil(ne.y - viewNe.y); } if (viewNe.x > ne.x) { // east - dx = ne.x - viewNe.x; + dx = Math.floor(ne.x - viewNe.x); } if (viewSw.y > sw.y) { // south - dy = sw.y - viewSw.y; + dy = Math.floor(sw.y - viewSw.y); } if (viewSw.x < sw.x) { // west - dx = sw.x - viewSw.x; + dx = Math.ceil(sw.x - viewSw.x); + } + + if (dx || dy) { + return this.panBy([dx, dy]); } - return this.panBy(new L.Point(dx, dy, true)); + return this; }, addLayer: function (layer) { @@ -1487,14 +1706,13 @@ L.Map = L.Class.extend({ // TODO looks ugly, refactor!!! if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) { this._tileLayersNum++; - this._tileLayersToLoad++; - layer.on('load', this._onTileLayerLoad, this); + this._tileLayersToLoad++; + layer.on('load', this._onTileLayerLoad, this); } - this.whenReady(function () { - layer.onAdd(this); - this.fire('layeradd', {layer: layer}); - }, this); + if (this._loaded) { + this._layerAdd(layer); + } return this; }, @@ -1504,7 +1722,10 @@ L.Map = L.Class.extend({ if (!this._layers[id]) { return; } - layer.onRemove(this); + if (this._loaded) { + layer.onRemove(this); + this.fire('layerremove', {layer: layer}); + } delete this._layers[id]; if (this._zoomBoundLayers[id]) { @@ -1515,21 +1736,33 @@ L.Map = L.Class.extend({ // TODO looks ugly, refactor if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) { this._tileLayersNum--; - this._tileLayersToLoad--; - layer.off('load', this._onTileLayerLoad, this); + this._tileLayersToLoad--; + layer.off('load', this._onTileLayerLoad, this); } - return this.fire('layerremove', {layer: layer}); + return this; }, hasLayer: function (layer) { - var id = L.stamp(layer); - return this._layers.hasOwnProperty(id); + if (!layer) { return false; } + + return (L.stamp(layer) in this._layers); }, - invalidateSize: function (animate) { - var oldSize = this.getSize(); + eachLayer: function (method, context) { + for (var i in this._layers) { + method.call(context, this._layers[i]); + } + return this; + }, + invalidateSize: function (options) { + options = L.extend({ + animate: false, + pan: true + }, options === true ? {animate: true} : options); + + var oldSize = this.getSize(); this._sizeChanged = true; if (this.options.maxBounds) { @@ -1538,31 +1771,63 @@ L.Map = L.Class.extend({ if (!this._loaded) { return this; } - var offset = oldSize._subtract(this.getSize())._divideBy(2)._round(); + var newSize = this.getSize(), + offset = oldSize.subtract(newSize).divideBy(2).round(); - if (animate === true) { + if (!offset.x && !offset.y) { return this; } + + if (options.animate && options.pan) { this.panBy(offset); + } else { - this._rawPanBy(offset); + if (options.pan) { + this._rawPanBy(offset); + } this.fire('move'); + // make sure moveend is not fired too often on resize clearTimeout(this._sizeTimer); this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200); } - return this; + + return this.fire('resize', { + oldSize: oldSize, + newSize: newSize + }); }, // TODO handler.addTo addHandler: function (name, HandlerClass) { if (!HandlerClass) { return; } - this[name] = new HandlerClass(this); + var handler = this[name] = new HandlerClass(this); + + this._handlers.push(handler); if (this.options[name]) { - this[name].enable(); + handler.enable(); + } + + return this; + }, + + remove: function () { + if (this._loaded) { + this.fire('unload'); + } + + this._initEvents('off'); + + delete this._container._leaflet; + + this._clearPanes(); + if (this._clearControlPos) { + this._clearControlPos(); } + this._clearHandlers(); + return this; }, @@ -1570,6 +1835,11 @@ L.Map = L.Class.extend({ // public methods for getting map state getCenter: function () { // (Boolean) -> LatLng + this._checkIfLoaded(); + + if (!this._moved()) { + return this._initialCenter; + } return this.layerPointToLatLng(this._getCenterLayerPoint()); }, @@ -1600,37 +1870,26 @@ L.Map = L.Class.extend({ return Math.min(z1, z2); }, - getBoundsZoom: function (bounds, inside) { // (LatLngBounds, Boolean) -> Number + getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number bounds = L.latLngBounds(bounds); - var size = this.getSize(), - zoom = this.options.minZoom || 0, + var zoom = this.getMinZoom() - (inside ? 1 : 0), maxZoom = this.getMaxZoom(), - ne = bounds.getNorthEast(), - sw = bounds.getSouthWest(), - boundsSize, - nePoint, - swPoint, - zoomNotFound = true; + size = this.getSize(), - if (inside) { - zoom--; - } + nw = bounds.getNorthWest(), + se = bounds.getSouthEast(), + + zoomNotFound = true, + boundsSize; + + padding = L.point(padding || [0, 0]); do { zoom++; - nePoint = this.project(ne, zoom); - swPoint = this.project(sw, zoom); - - boundsSize = new L.Point( - Math.abs(nePoint.x - swPoint.x), - Math.abs(swPoint.y - nePoint.y)); + boundsSize = this.project(se, zoom).subtract(this.project(nw, zoom)).add(padding); + zoomNotFound = !inside ? size.contains(boundsSize) : boundsSize.x < size.x || boundsSize.y < size.y; - if (!inside) { - zoomNotFound = boundsSize.x <= size.x && boundsSize.y <= size.y; - } else { - zoomNotFound = boundsSize.x < size.x || boundsSize.y < size.y; - } } while (zoomNotFound && zoom <= maxZoom); if (zoomNotFound && inside) { @@ -1657,6 +1916,7 @@ L.Map = L.Class.extend({ }, getPixelOrigin: function () { + this._checkIfLoaded(); return this._initialTopLeftPoint; }, @@ -1694,13 +1954,13 @@ L.Map = L.Class.extend({ }, layerPointToLatLng: function (point) { // (Point) - var projectedPoint = L.point(point).add(this._initialTopLeftPoint); + var projectedPoint = L.point(point).add(this.getPixelOrigin()); return this.unproject(projectedPoint); }, latLngToLayerPoint: function (latlng) { // (LatLng) var projectedPoint = this.project(L.latLng(latlng))._round(); - return projectedPoint._subtract(this._initialTopLeftPoint); + return projectedPoint._subtract(this.getPixelOrigin()); }, containerPointToLayerPoint: function (point) { // (Point) @@ -1738,8 +1998,10 @@ L.Map = L.Class.extend({ _initContainer: function (id) { var container = this._container = L.DomUtil.get(id); - if (container._leaflet) { - throw new Error("Map container is already initialized."); + if (!container) { + throw new Error('Map container not found.'); + } else if (container._leaflet) { + throw new Error('Map container is already initialized.'); } container._leaflet = true; @@ -1748,15 +2010,10 @@ L.Map = L.Class.extend({ _initLayout: function () { var container = this._container; - L.DomUtil.addClass(container, 'leaflet-container'); - - if (L.Browser.touch) { - L.DomUtil.addClass(container, 'leaflet-touch'); - } - - if (this.options.fadeAnimation) { - L.DomUtil.addClass(container, 'leaflet-fade-anim'); - } + L.DomUtil.addClass(container, 'leaflet-container' + + (L.Browser.touch ? ' leaflet-touch' : '') + + (L.Browser.retina ? ' leaflet-retina' : '') + + (this.options.fadeAnimation ? ' leaflet-fade-anim' : '')); var position = L.DomUtil.getStyle(container, 'position'); @@ -1796,16 +2053,14 @@ L.Map = L.Class.extend({ return L.DomUtil.create('div', className, container || this._panes.objectsPane); }, - _initLayers: function (layers) { - layers = layers ? (L.Util.isArray(layers) ? layers : [layers]) : []; - - this._layers = {}; - this._zoomBoundLayers = {}; - this._tileLayersNum = 0; + _clearPanes: function () { + this._container.removeChild(this._mapPane); + }, - var i, len; + _addLayers: function (layers) { + layers = layers ? (L.Util.isArray(layers) ? layers : [layers]) : []; - for (i = 0, len = layers.length; i < len; i++) { + for (var i = 0, len = layers.length; i < len; i++) { this.addLayer(layers[i]); } }, @@ -1826,6 +2081,7 @@ L.Map = L.Class.extend({ } this._zoom = zoom; + this._initialCenter = center; this._initialTopLeftPoint = this._getNewTopLeftPoint(center); @@ -1840,6 +2096,11 @@ L.Map = L.Class.extend({ var loading = !this._loaded; this._loaded = true; + if (loading) { + this.fire('load'); + this.eachLayer(this._layerAdd, this); + } + this.fire('viewreset', {hard: !preserveMapOffset}); this.fire('move'); @@ -1849,30 +2110,29 @@ L.Map = L.Class.extend({ } this.fire('moveend', {hard: !preserveMapOffset}); - - if (loading) { - this.fire('load'); - } }, _rawPanBy: function (offset) { L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset)); }, + _getZoomSpan: function () { + return this.getMaxZoom() - this.getMinZoom(); + }, + _updateZoomLevels: function () { var i, minZoom = Infinity, - maxZoom = -Infinity; + maxZoom = -Infinity, + oldZoomSpan = this._getZoomSpan(); for (i in this._zoomBoundLayers) { - if (this._zoomBoundLayers.hasOwnProperty(i)) { - var layer = this._zoomBoundLayers[i]; - if (!isNaN(layer.options.minZoom)) { - minZoom = Math.min(minZoom, layer.options.minZoom); - } - if (!isNaN(layer.options.maxZoom)) { - maxZoom = Math.max(maxZoom, layer.options.maxZoom); - } + var layer = this._zoomBoundLayers[i]; + if (!isNaN(layer.options.minZoom)) { + minZoom = Math.min(minZoom, layer.options.minZoom); + } + if (!isNaN(layer.options.maxZoom)) { + maxZoom = Math.max(maxZoom, layer.options.maxZoom); } } @@ -1882,25 +2142,41 @@ L.Map = L.Class.extend({ this._layersMaxZoom = maxZoom; this._layersMinZoom = minZoom; } + + if (oldZoomSpan !== this._getZoomSpan()) { + this.fire('zoomlevelschange'); + } + }, + + _panInsideMaxBounds: function () { + this.panInsideBounds(this.options.maxBounds); + }, + + _checkIfLoaded: function () { + if (!this._loaded) { + throw new Error('Set map center and zoom first.'); + } }, // map events - _initEvents: function () { + _initEvents: function (onOff) { if (!L.DomEvent) { return; } - L.DomEvent.on(this._container, 'click', this._onMouseClick, this); + onOff = onOff || 'on'; + + L.DomEvent[onOff](this._container, 'click', this._onMouseClick, this); var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'mousemove', 'contextmenu'], i, len; for (i = 0, len = events.length; i < len; i++) { - L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this); + L.DomEvent[onOff](this._container, events[i], this._fireMouseEvent, this); } if (this.options.trackResize) { - L.DomEvent.on(window, 'resize', this._onResize, this); + L.DomEvent[onOff](window, 'resize', this._onResize, this); } }, @@ -1911,14 +2187,16 @@ L.Map = L.Class.extend({ }, _onMouseClick: function (e) { - if (!this._loaded || (this.dragging && this.dragging.moved())) { return; } + // jshint camelcase: false + if (!this._loaded || (!e._simulated && this.dragging && this.dragging.moved()) || e._leaflet_stop) { return; } this.fire('preclick'); this._fireMouseEvent(e); }, _fireMouseEvent: function (e) { - if (!this._loaded) { return; } + // jshint camelcase: false + if (!this._loaded || e._leaflet_stop) { return; } var type = e.type; @@ -1943,12 +2221,15 @@ L.Map = L.Class.extend({ }, _onTileLayerLoad: function () { - // TODO super-ugly, refactor!!! - // clear scaled tiles after all new tiles are loaded (for performance) this._tileLayersToLoad--; - if (this._tileLayersNum && !this._tileLayersToLoad && this._tileBg) { - clearTimeout(this._clearTileBgTimer); - this._clearTileBgTimer = setTimeout(L.bind(this._clearTileBg, this), 500); + if (this._tileLayersNum && !this._tileLayersToLoad) { + this.fire('tilelayersload'); + } + }, + + _clearHandlers: function () { + for (var i = 0, len = this._handlers.length; i < len; i++) { + this._handlers[i].disable(); } }, @@ -1961,6 +2242,11 @@ L.Map = L.Class.extend({ return this; }, + _layerAdd: function (layer) { + layer.onAdd(this); + this.fire('layeradd', {layer: layer}); + }, + // private methods for getting map state @@ -1968,12 +2254,13 @@ L.Map = L.Class.extend({ return L.DomUtil.getPosition(this._mapPane); }, - _getTopLeftPoint: function () { - if (!this._loaded) { - throw new Error('Set map center and zoom first.'); - } + _moved: function () { + var pos = this._getMapPanePos(); + return pos && !pos.equals([0, 0]); + }, - return this._initialTopLeftPoint.subtract(this._getMapPanePos()); + _getTopLeftPoint: function () { + return this.getPixelOrigin().subtract(this._getMapPanePos()); }, _getNewTopLeftPoint: function (center, zoom) { @@ -1987,12 +2274,14 @@ L.Map = L.Class.extend({ return this.project(latlng, newZoom)._subtract(topLeft); }, + // layer point of the current center _getCenterLayerPoint: function () { return this.containerPointToLayerPoint(this.getSize()._divideBy(2)); }, - _getCenterOffset: function (center) { - return this.latLngToLayerPoint(center).subtract(this._getCenterLayerPoint()); + // offset of the specified place to the current center in pixels + _getCenterOffset: function (latlng) { + return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint()); }, _limitZoom: function (zoom) { @@ -2016,7 +2305,7 @@ L.map = function (id, options) { L.Projection.Mercator = { MAX_LATITUDE: 85.0840591556, - R_MINOR: 6356752.3142, + R_MINOR: 6356752.314245179, R_MAJOR: 6378137, project: function (latlng) { // (LatLng) -> Point @@ -2034,7 +2323,7 @@ L.Projection.Mercator = { con = Math.pow((1 - con) / (1 + con), eccent * 0.5); var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con; - y = -r2 * Math.log(ts); + y = -r * Math.log(ts); return new L.Point(x, y); }, @@ -2106,6 +2395,7 @@ L.TileLayer = L.Class.extend({ zoomReverse: false, detectRetina: false, reuseTiles: false, + bounds: false, */ unloadInvisibleTiles: L.Browser.mobile, updateWhenIdle: L.Browser.mobile @@ -2126,6 +2416,10 @@ L.TileLayer = L.Class.extend({ this.options.maxZoom--; } + if (options.bounds) { + options.bounds = L.latLngBounds(options.bounds); + } + this._url = url; var subdomains = this.options.subdomains; @@ -2137,6 +2431,7 @@ L.TileLayer = L.Class.extend({ onAdd: function (map) { this._map = map; + this._animated = map._zoomAnimated; // create a container div for tiles this._initContainer(); @@ -2146,10 +2441,17 @@ L.TileLayer = L.Class.extend({ // set up events map.on({ - 'viewreset': this._resetCallback, + 'viewreset': this._reset, 'moveend': this._update }, this); + if (this._animated) { + map.on({ + 'zoomanim': this._animateZoom, + 'zoomend': this._endZoomAnim + }, this); + } + if (!this.options.updateWhenIdle) { this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this); map.on('move', this._limitedUpdate, this); @@ -2168,10 +2470,17 @@ L.TileLayer = L.Class.extend({ this._container.parentNode.removeChild(this._container); map.off({ - 'viewreset': this._resetCallback, + 'viewreset': this._reset, 'moveend': this._update }, this); + if (this._animated) { + map.off({ + 'zoomanim': this._animateZoom, + 'zoomend': this._endZoomAnim + }, this); + } + if (!this.options.updateWhenIdle) { map.off('move', this._limitedUpdate, this); } @@ -2206,7 +2515,11 @@ L.TileLayer = L.Class.extend({ return this.options.attribution; }, - setOpacity: function (opacity) { + getContainer: function () { + return this._container; + }, + + setOpacity: function (opacity) { this.options.opacity = opacity; if (this._map) { @@ -2235,8 +2548,7 @@ L.TileLayer = L.Class.extend({ redraw: function () { if (this._map) { - this._map._panes.tilePane.empty = false; - this._reset(true); + this._reset({hard: true}); this._update(); } return this; @@ -2270,29 +2582,39 @@ L.TileLayer = L.Class.extend({ }, _updateOpacity: function () { - L.DomUtil.setOpacity(this._container, this.options.opacity); - - // stupid webkit hack to force redrawing of tiles var i, tiles = this._tiles; - if (L.Browser.webkit) { + if (L.Browser.ielt9) { for (i in tiles) { - if (tiles.hasOwnProperty(i)) { - tiles[i].style.webkitTransform += ' translate(0,0)'; - } + L.DomUtil.setOpacity(tiles[i], this.options.opacity); } + } else { + L.DomUtil.setOpacity(this._container, this.options.opacity); } }, _initContainer: function () { var tilePane = this._map._panes.tilePane; - if (!this._container || tilePane.empty) { + if (!this._container) { this._container = L.DomUtil.create('div', 'leaflet-layer'); this._updateZIndex(); + if (this._animated) { + var className = 'leaflet-tile-container leaflet-zoom-animated'; + + this._bgBuffer = L.DomUtil.create('div', className, this._container); + this._bgBuffer.style.zIndex = 1; + + this._tileContainer = L.DomUtil.create('div', className, this._container); + this._tileContainer.style.zIndex = 2; + + } else { + this._tileContainer = this._container; + } + tilePane.appendChild(this._container); if (this.options.opacity < 1) { @@ -2301,17 +2623,9 @@ L.TileLayer = L.Class.extend({ } }, - _resetCallback: function (e) { - this._reset(e.hard); - }, - - _reset: function (clearOldContainer) { - var tiles = this._tiles; - - for (var key in tiles) { - if (tiles.hasOwnProperty(key)) { - this.fire('tileunload', {tile: tiles[key]}); - } + _reset: function (e) { + for (var key in this._tiles) { + this.fire('tileunload', {tile: this._tiles[key]}); } this._tiles = {}; @@ -2321,8 +2635,10 @@ L.TileLayer = L.Class.extend({ this._unusedTiles = []; } - if (clearOldContainer && this._container) { - this._container.innerHTML = ""; + this._tileContainer.innerHTML = ''; + + if (this._animated && e && e.hard) { + this._clearBgBuffer(); } this._initContainer(); @@ -2340,15 +2656,9 @@ L.TileLayer = L.Class.extend({ return; } - var nwTilePoint = new L.Point( - Math.floor(bounds.min.x / tileSize), - Math.floor(bounds.min.y / tileSize)), - - seTilePoint = new L.Point( - Math.floor(bounds.max.x / tileSize), - Math.floor(bounds.max.y / tileSize)), - - tileBounds = new L.Bounds(nwTilePoint, seTilePoint); + var tileBounds = L.bounds( + bounds.min.divideBy(tileSize)._floor(), + bounds.max.divideBy(tileSize)._floor()); this._addTilesFromCenterOut(tileBounds); @@ -2395,7 +2705,7 @@ L.TileLayer = L.Class.extend({ this._addTile(queue[i], fragment); } - this._container.appendChild(fragment); + this._tileContainer.appendChild(fragment); }, _tileShouldBeLoaded: function (tilePoint) { @@ -2403,13 +2713,31 @@ L.TileLayer = L.Class.extend({ return false; // already loaded } - if (!this.options.continuousWorld) { + var options = this.options; + + if (!options.continuousWorld) { var limit = this._getWrapTileNum(); - if (this.options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit) || - tilePoint.y < 0 || tilePoint.y >= limit) { - return false; // exceeds world bounds + // don't load if exceeds world bounds + if ((options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit)) || + tilePoint.y < 0 || tilePoint.y >= limit) { return false; } + } + + if (options.bounds) { + var tileSize = options.tileSize, + nwPoint = tilePoint.multiplyBy(tileSize), + sePoint = nwPoint.add([tileSize, tileSize]), + nw = this._map.unproject(nwPoint), + se = this._map.unproject(sePoint); + + // TODO temporary hack, will be removed after refactoring projections + // https://github.com/Leaflet/Leaflet/issues/1618 + if (!options.continuousWorld && !options.noWrap) { + nw = nw.wrap(); + se = se.wrap(); } + + if (!options.bounds.intersects([nw, se])) { return false; } } return true; @@ -2419,15 +2747,13 @@ L.TileLayer = L.Class.extend({ var kArr, x, y, key; for (key in this._tiles) { - if (this._tiles.hasOwnProperty(key)) { - kArr = key.split(':'); - x = parseInt(kArr[0], 10); - y = parseInt(kArr[1], 10); - - // remove tile if it's out of bounds - if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) { - this._removeTile(key); - } + kArr = key.split(':'); + x = parseInt(kArr[0], 10); + y = parseInt(kArr[1], 10); + + // remove tile if it's out of bounds + if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) { + this._removeTile(key); } } }, @@ -2435,18 +2761,19 @@ L.TileLayer = L.Class.extend({ _removeTile: function (key) { var tile = this._tiles[key]; - this.fire("tileunload", {tile: tile, url: tile.src}); + this.fire('tileunload', {tile: tile, url: tile.src}); if (this.options.reuseTiles) { L.DomUtil.removeClass(tile, 'leaflet-tile-loaded'); this._unusedTiles.push(tile); - } else if (tile.parentNode === this._container) { - this._container.removeChild(tile); + } else if (tile.parentNode === this._tileContainer) { + this._tileContainer.removeChild(tile); } // for https://github.com/CloudMade/Leaflet/issues/137 if (!L.Browser.android) { + tile.onload = null; tile.src = L.Util.emptyImageUrl; } @@ -2462,7 +2789,6 @@ L.TileLayer = L.Class.extend({ /* Chrome 20 layouts much faster with top/left (verify with timeline, frames) Android 4 browser has display issues with top/left and requires transform instead - Android 3 browser not tested Android 2 browser requires top/left or tiles disappear on load or first drag (reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866 (other browsers don't currently care) - see debug/hacks/jitter.html for an example @@ -2473,7 +2799,7 @@ L.TileLayer = L.Class.extend({ this._loadTile(tile, tilePoint); - if (tile.parentNode !== this._container) { + if (tile.parentNode !== this._tileContainer) { container.appendChild(tile); } }, @@ -2500,11 +2826,9 @@ L.TileLayer = L.Class.extend({ // image-specific code (override to implement e.g. Canvas or SVG tile layer) getTileUrl: function (tilePoint) { - this._adjustTilePoint(tilePoint); - return L.Util.template(this._url, L.extend({ s: this._getSubdomain(tilePoint), - z: this._getZoomForUrl(), + z: tilePoint.z, x: tilePoint.x, y: tilePoint.y }, this.options)); @@ -2527,10 +2851,12 @@ L.TileLayer = L.Class.extend({ if (this.options.tms) { tilePoint.y = limit - tilePoint.y - 1; } + + tilePoint.z = this._getZoomForUrl(); }, _getSubdomain: function (tilePoint) { - var index = (tilePoint.x + tilePoint.y) % this.options.subdomains.length; + var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length; return this.options.subdomains[index]; }, @@ -2555,6 +2881,10 @@ L.TileLayer = L.Class.extend({ _createTile: function () { var tile = this._tileImg.cloneNode(false); tile.onselectstart = tile.onmousemove = L.Util.falseFn; + + if (L.Browser.ielt9 && this.options.opacity !== undefined) { + L.DomUtil.setOpacity(tile, this.options.opacity); + } return tile; }, @@ -2563,15 +2893,22 @@ L.TileLayer = L.Class.extend({ tile.onload = this._tileOnLoad; tile.onerror = this._tileOnError; + this._adjustTilePoint(tilePoint); tile.src = this.getTileUrl(tilePoint); }, - _tileLoaded: function () { - this._tilesToLoad--; - if (!this._tilesToLoad) { - this.fire('load'); - } - }, + _tileLoaded: function () { + this._tilesToLoad--; + if (!this._tilesToLoad) { + this.fire('load'); + + if (this._animated) { + // clear scaled tiles after all new tiles are loaded (for performance) + clearTimeout(this._clearBgBufferTimer); + this._clearBgBufferTimer = setTimeout(L.bind(this._clearBgBuffer, this), 500); + } + } + }, _tileOnLoad: function () { var layer = this._layer; @@ -2602,8 +2939,8 @@ L.TileLayer = L.Class.extend({ this.src = newUrl; } - layer._tileLoaded(); - } + layer._tileLoaded(); + } }); L.tileLayer = function (url, options) { @@ -2631,17 +2968,18 @@ L.TileLayer.WMS = L.TileLayer.extend({ this._url = url; - var wmsParams = L.extend({}, this.defaultWmsParams); + var wmsParams = L.extend({}, this.defaultWmsParams), + tileSize = options.tileSize || this.options.tileSize; if (options.detectRetina && L.Browser.retina) { - wmsParams.width = wmsParams.height = this.options.tileSize * 2; + wmsParams.width = wmsParams.height = tileSize * 2; } else { - wmsParams.width = wmsParams.height = this.options.tileSize; + wmsParams.width = wmsParams.height = tileSize; } for (var i in options) { // all keys that are not TileLayer options go to WMS params - if (!this.options.hasOwnProperty(i)) { + if (!this.options.hasOwnProperty(i) && i !== 'crs') { wmsParams[i] = options[i]; } } @@ -2653,31 +2991,30 @@ L.TileLayer.WMS = L.TileLayer.extend({ onAdd: function (map) { + this._crs = this.options.crs || map.options.crs; + var projectionKey = parseFloat(this.wmsParams.version) >= 1.3 ? 'crs' : 'srs'; - this.wmsParams[projectionKey] = map.options.crs.code; + this.wmsParams[projectionKey] = this._crs.code; L.TileLayer.prototype.onAdd.call(this, map); }, getTileUrl: function (tilePoint, zoom) { // (Point, Number) -> String - this._adjustTilePoint(tilePoint); - var map = this._map, - crs = map.options.crs, tileSize = this.options.tileSize, nwPoint = tilePoint.multiplyBy(tileSize), - sePoint = nwPoint.add(new L.Point(tileSize, tileSize)), + sePoint = nwPoint.add([tileSize, tileSize]), - nw = crs.project(map.unproject(nwPoint, zoom)), - se = crs.project(map.unproject(sePoint, zoom)), + nw = this._crs.project(map.unproject(nwPoint, zoom)), + se = this._crs.project(map.unproject(sePoint, zoom)), bbox = [nw.x, se.y, se.x, nw.y].join(','), url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)}); - return url + L.Util.getParamString(this.wmsParams, url) + "&bbox=" + bbox; + return url + L.Util.getParamString(this.wmsParams, url, true) + '&BBOX=' + bbox; }, setParams: function (params, noRedraw) { @@ -2712,13 +3049,10 @@ L.TileLayer.Canvas = L.TileLayer.extend({ }, redraw: function () { - var tiles = this._tiles; - - for (var i in tiles) { - if (tiles.hasOwnProperty(i)) { - this._redrawTile(tiles[i]); - } + for (var i in this._tiles) { + this._redrawTile(this._tiles[i]); } + return this; }, _redrawTile: function (tile) { @@ -2908,7 +3242,7 @@ L.Icon = L.Class.extend({ iconSize: (Point) (can be set through CSS) iconAnchor: (Point) (centered by default, can be set in CSS with negative margins) popupAnchor: (Point) (if not specified, popup opens in the anchor point) - shadowUrl: (Point) (no shadow by default) + shadowUrl: (String) (no shadow by default) shadowRetinaUrl: (String) (optional, used for retina devices if detected) shadowSize: (Point) shadowAnchor: (Point) @@ -2920,25 +3254,30 @@ L.Icon = L.Class.extend({ L.setOptions(this, options); }, - createIcon: function () { - return this._createIcon('icon'); + createIcon: function (oldIcon) { + return this._createIcon('icon', oldIcon); }, - createShadow: function () { - return this._createIcon('shadow'); + createShadow: function (oldIcon) { + return this._createIcon('shadow', oldIcon); }, - _createIcon: function (name) { + _createIcon: function (name, oldIcon) { var src = this._getIconUrl(name); if (!src) { if (name === 'icon') { - throw new Error("iconUrl not set in Icon options (see the docs)."); + throw new Error('iconUrl not set in Icon options (see the docs).'); } return null; } - var img = this._createImg(src); + var img; + if (!oldIcon || oldIcon.tagName !== 'IMG') { + img = this._createImg(src); + } else { + img = this._createImg(src, oldIcon); + } this._setIconStyles(img, name); return img; @@ -2972,14 +3311,17 @@ L.Icon = L.Class.extend({ } }, - _createImg: function (src) { - var el; + _createImg: function (src, el) { if (!L.Browser.ie6) { - el = document.createElement('img'); + if (!el) { + el = document.createElement('img'); + } el.src = src; } else { - el = document.createElement('div'); + if (!el) { + el = document.createElement('div'); + } el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")'; } @@ -3006,11 +3348,11 @@ L.icon = function (options) { L.Icon.Default = L.Icon.extend({ options: { - iconSize: new L.Point(25, 41), - iconAnchor: new L.Point(12, 41), - popupAnchor: new L.Point(1, -34), + iconSize: [25, 41], + iconAnchor: [12, 41], + popupAnchor: [1, -34], - shadowSize: new L.Point(41, 41) + shadowSize: [41, 41] }, _getIconUrl: function (name) { @@ -3021,13 +3363,13 @@ L.Icon.Default = L.Icon.extend({ } if (L.Browser.retina && name === 'icon') { - name += '@2x'; + name += '-2x'; } var path = L.Icon.Default.imagePath; if (!path) { - throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually."); + throw new Error('Couldn\'t autodetect L.Icon.Default.imagePath, set it manually.'); } return path + '/marker-' + name + '.png'; @@ -3036,16 +3378,17 @@ L.Icon.Default = L.Icon.extend({ L.Icon.Default.imagePath = (function () { var scripts = document.getElementsByTagName('script'), - leafletRe = /\/?leaflet[\-\._]?([\w\-\._]*)\.js\??/; + leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/; - var i, len, src, matches; + var i, len, src, matches, path; for (i = 0, len = scripts.length; i < len; i++) { src = scripts[i].src; matches = src.match(leafletRe); if (matches) { - return src.split(leafletRe)[0] + '/images'; + path = src.split(leafletRe)[0]; + return (path ? path + '/' : '') + 'images'; } } }()); @@ -3064,6 +3407,7 @@ L.Marker = L.Class.extend({ title: '', clickable: true, draggable: false, + keyboard: true, zIndexOffset: 0, opacity: 1, riseOnHover: false, @@ -3094,7 +3438,12 @@ L.Marker = L.Class.extend({ }, onRemove: function (map) { + if (this.dragging) { + this.dragging.disable(); + } + this._removeIcon(); + this._removeShadow(); this.fire('remove'); @@ -3126,9 +3475,6 @@ L.Marker = L.Class.extend({ }, setIcon: function (icon) { - if (this._map) { - this._removeIcon(); - } this.options.icon = icon; @@ -3153,66 +3499,86 @@ L.Marker = L.Class.extend({ var options = this.options, map = this._map, animation = (map.options.zoomAnimation && map.options.markerZoomAnimation), - classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide', - needOpacityUpdate = false; + classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide'; + + var icon = options.icon.createIcon(this._icon), + addIcon = false; - if (!this._icon) { - this._icon = options.icon.createIcon(); + // if we're not reusing the icon, remove the old one and init new one + if (icon !== this._icon) { + if (this._icon) { + this._removeIcon(); + } + addIcon = true; if (options.title) { - this._icon.title = options.title; + icon.title = options.title; } + } - this._initInteraction(); - needOpacityUpdate = (this.options.opacity < 1); + L.DomUtil.addClass(icon, classToAdd); - L.DomUtil.addClass(this._icon, classToAdd); + if (options.keyboard) { + icon.tabIndex = '0'; + } - if (options.riseOnHover) { - L.DomEvent - .on(this._icon, 'mouseover', this._bringToFront, this) - .on(this._icon, 'mouseout', this._resetZIndex, this); - } + this._icon = icon; + + this._initInteraction(); + + if (options.riseOnHover) { + L.DomEvent + .on(icon, 'mouseover', this._bringToFront, this) + .on(icon, 'mouseout', this._resetZIndex, this); } - if (!this._shadow) { - this._shadow = options.icon.createShadow(); + var newShadow = options.icon.createShadow(this._shadow), + addShadow = false; - if (this._shadow) { - L.DomUtil.addClass(this._shadow, classToAdd); - needOpacityUpdate = (this.options.opacity < 1); + if (newShadow !== this._shadow) { + this._removeShadow(); + addShadow = true; + + if (newShadow) { + L.DomUtil.addClass(newShadow, classToAdd); } } + this._shadow = newShadow; + - if (needOpacityUpdate) { + if (options.opacity < 1) { this._updateOpacity(); } + var panes = this._map._panes; - panes.markerPane.appendChild(this._icon); + if (addIcon) { + panes.markerPane.appendChild(this._icon); + } - if (this._shadow) { + if (newShadow && addShadow) { panes.shadowPane.appendChild(this._shadow); } }, _removeIcon: function () { - var panes = this._map._panes; - if (this.options.riseOnHover) { L.DomEvent .off(this._icon, 'mouseover', this._bringToFront) .off(this._icon, 'mouseout', this._resetZIndex); } - panes.markerPane.removeChild(this._icon); + this._map._panes.markerPane.removeChild(this._icon); + + this._icon = null; + }, + _removeShadow: function () { if (this._shadow) { - panes.shadowPane.removeChild(this._shadow); + this._map._panes.shadowPane.removeChild(this._shadow); } - - this._icon = this._shadow = null; + this._shadow = null; }, _setPos: function (pos) { @@ -3248,6 +3614,7 @@ L.Marker = L.Class.extend({ L.DomUtil.addClass(icon, 'leaflet-clickable'); L.DomEvent.on(icon, 'click', this._onMouseClick, this); + L.DomEvent.on(icon, 'keypress', this._onKeyPress, this); for (var i = 0; i < events.length; i++) { L.DomEvent.on(icon, events[i], this._fireMouseEvent, this); @@ -3274,14 +3641,25 @@ L.Marker = L.Class.extend({ if ((!this.dragging || !this.dragging._enabled) && this._map.dragging && this._map.dragging.moved()) { return; } this.fire(e.type, { - originalEvent: e + originalEvent: e, + latlng: this._latlng }); }, + _onKeyPress: function (e) { + if (e.keyCode === 13) { + this.fire('click', { + originalEvent: e, + latlng: this._latlng + }); + } + }, + _fireMouseEvent: function (e) { this.fire(e.type, { - originalEvent: e + originalEvent: e, + latlng: this._latlng }); // TODO proper custom event propagation @@ -3291,6 +3669,8 @@ L.Marker = L.Class.extend({ } if (e.type !== 'mousedown') { L.DomEvent.stopPropagation(e); + } else { + L.DomEvent.preventDefault(e); } }, @@ -3329,22 +3709,25 @@ L.marker = function (latlng, options) { L.DivIcon = L.Icon.extend({ options: { - iconSize: new L.Point(12, 12), // also can be set through CSS + iconSize: [12, 12], // also can be set through CSS /* iconAnchor: (Point) popupAnchor: (Point) html: (String) bgPos: (Point) */ - className: 'leaflet-div-icon' + className: 'leaflet-div-icon', + html: false }, - createIcon: function () { - var div = document.createElement('div'), + createIcon: function (oldIcon) { + var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'), options = this.options; - if (options.html) { + if (options.html !== false) { div.innerHTML = options.html; + } else { + div.innerHTML = ''; } if (options.bgPos) { @@ -3383,8 +3766,9 @@ L.Popup = L.Class.extend({ maxHeight: null, autoPan: true, closeButton: true, - offset: new L.Point(0, 6), - autoPanPadding: new L.Point(5, 5), + offset: [0, 7], + autoPanPadding: [5, 5], + keepInView: false, className: '', zoomAnimation: true }, @@ -3394,6 +3778,7 @@ L.Popup = L.Class.extend({ this._source = source; this._animated = L.Browser.any3d && this.options.zoomAnimation; + this._isOpen = false; }, onAdd: function (map) { @@ -3411,21 +3796,21 @@ L.Popup = L.Class.extend({ } map._panes.popupPane.appendChild(this._container); - map.on('viewreset', this._updatePosition, this); - - if (this._animated) { - map.on('zoomanim', this._zoomAnimation, this); - } - - if (map.options.closePopupOnClick) { - map.on('preclick', this._close, this); - } + map.on(this._getEvents(), this); this._update(); if (animFade) { L.DomUtil.setOpacity(this._container, 1); } + + this.fire('open'); + + map.fire('popupopen', {popup: this}); + + if (this._source) { + this._source.fire('popupopen', {popup: this}); + } }, addTo: function (map) { @@ -3443,17 +3828,21 @@ L.Popup = L.Class.extend({ L.Util.falseFn(this._container.offsetWidth); // force reflow - map.off({ - viewreset: this._updatePosition, - preclick: this._close, - zoomanim: this._zoomAnimation - }, this); + map.off(this._getEvents(), this); if (map.options.fadeAnimation) { L.DomUtil.setOpacity(this._container, 0); } this._map = null; + + this.fire('close'); + + map.fire('popupclose', {popup: this}); + + if (this._source) { + this._source.fire('popupclose', {popup: this}); + } }, setLatLng: function (latlng) { @@ -3468,15 +3857,27 @@ L.Popup = L.Class.extend({ return this; }, - _close: function () { - var map = this._map; + _getEvents: function () { + var events = { + viewreset: this._updatePosition + }; - if (map) { - map._popup = null; + if (this._animated) { + events.zoomanim = this._zoomAnimation; + } + if ('closeOnClick' in this.options ? this.options.closeOnClick : this._map.options.closePopupOnClick) { + events.preclick = this._close; + } + if (this.options.keepInView) { + events.moveend = this._adjustPan; + } - map - .removeLayer(this) - .fire('popupclose', {popup: this}); + return events; + }, + + _close: function () { + if (this._map) { + this._map.closePopup(this); } }, @@ -3492,6 +3893,7 @@ L.Popup = L.Class.extend({ L.DomUtil.create('a', prefix + '-close-button', container); closeButton.href = '#close'; closeButton.innerHTML = '×'; + L.DomEvent.disableClickPropagation(closeButton); L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this); } @@ -3501,8 +3903,8 @@ L.Popup = L.Class.extend({ L.DomEvent.disableClickPropagation(wrapper); this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper); - L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation); - + L.DomEvent.on(this._contentNode, 'wheel', L.DomEvent.stopPropagation); + L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation); this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container); this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer); }, @@ -3570,7 +3972,7 @@ L.Popup = L.Class.extend({ var pos = this._map.latLngToLayerPoint(this._latlng), animated = this._animated, - offset = this.options.offset; + offset = L.point(this.options.offset); if (animated) { L.DomUtil.setPosition(this._container, pos); @@ -3579,7 +3981,7 @@ L.Popup = L.Class.extend({ this._containerBottom = -offset.y - (animated ? 0 : pos.y); this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (animated ? 0 : pos.x); - //Bottom position the popup in case the height of the popup changes (images loading etc) + // bottom position the popup in case the height of the popup changes (images loading etc) this._container.style.bottom = this._containerBottom + 'px'; this._container.style.left = this._containerLeft + 'px'; }, @@ -3604,26 +4006,28 @@ L.Popup = L.Class.extend({ } var containerPos = map.layerPointToContainerPoint(layerPos), - padding = this.options.autoPanPadding, + padding = L.point(this.options.autoPanPadding), size = map.getSize(), dx = 0, dy = 0; - if (containerPos.x < 0) { - dx = containerPos.x - padding.x; - } - if (containerPos.x + containerWidth > size.x) { + if (containerPos.x + containerWidth > size.x) { // right dx = containerPos.x + containerWidth - size.x + padding.x; } - if (containerPos.y < 0) { - dy = containerPos.y - padding.y; + if (containerPos.x - dx < 0) { // left + dx = containerPos.x - padding.x; } - if (containerPos.y + containerHeight > size.y) { + if (containerPos.y + containerHeight > size.y) { // bottom dy = containerPos.y + containerHeight - size.y + padding.y; } + if (containerPos.y - dy < 0) { // top + dy = containerPos.y - padding.y; + } if (dx || dy) { - map.panBy(new L.Point(dx, dy)); + map + .fire('autopanstart') + .panBy([dx, dy]); } }, @@ -3638,13 +4042,44 @@ L.popup = function (options, source) { }; +L.Map.include({ + openPopup: function (popup, latlng, options) { // (Popup) or (String || HTMLElement, LatLng[, Object]) + this.closePopup(); + + if (!(popup instanceof L.Popup)) { + var content = popup; + + popup = new L.Popup(options) + .setLatLng(latlng) + .setContent(content); + } + popup._isOpen = true; + + this._popup = popup; + return this.addLayer(popup); + }, + + closePopup: function (popup) { + if (!popup || popup === this._popup) { + popup = this._popup; + this._popup = null; + } + if (popup) { + this.removeLayer(popup); + popup._isOpen = false; + } + return this; + } +}); + + /* * Popup extension to L.Marker, adding popup-related methods. */ L.Marker.include({ openPopup: function () { - if (this._popup && this._map) { + if (this._popup && this._map && !this._map.hasLayer(this._popup)) { this._popup.setLatLng(this._latlng); this._map.openPopup(this._popup); } @@ -3659,8 +4094,19 @@ L.Marker.include({ return this; }, + togglePopup: function () { + if (this._popup) { + if (this._popup._isOpen) { + this.closePopup(); + } else { + this.openPopup(); + } + } + return this; + }, + bindPopup: function (content, options) { - var anchor = L.point(this.options.icon.options.popupAnchor) || new L.Point(0, 0); + var anchor = L.point(this.options.icon.options.popupAnchor || [0, 0]); anchor = anchor.add(L.Popup.prototype.options.offset); @@ -3672,14 +4118,26 @@ L.Marker.include({ if (!this._popup) { this - .on('click', this.openPopup, this) + .on('click', this.togglePopup, this) .on('remove', this.closePopup, this) .on('move', this._movePopup, this); } - this._popup = new L.Popup(options, this) - .setContent(content); + if (content instanceof L.Popup) { + L.setOptions(content, options); + this._popup = content; + } else { + this._popup = new L.Popup(options, this) + .setContent(content); + } + + return this; + }, + setPopupContent: function (content) { + if (this._popup) { + this._popup.setContent(content); + } return this; }, @@ -3687,7 +4145,7 @@ L.Marker.include({ if (this._popup) { this._popup = null; this - .off('click', this.openPopup) + .off('click', this.togglePopup) .off('remove', this.closePopup) .off('move', this._movePopup); } @@ -3700,30 +4158,6 @@ L.Marker.include({ }); -/* - * Adds popup-related methods to L.Map. - */ - -L.Map.include({ - openPopup: function (popup) { - this.closePopup(); - - this._popup = popup; - - return this - .addLayer(popup) - .fire('popupopen', {popup: this._popup}); - }, - - closePopup: function () { - if (this._popup) { - this._popup._close(); - } - return this; - } -}); - - /* * L.LayerGroup is a class to combine several layers into one so that * you can manipulate the group (e.g. add/remove it) as one layer. @@ -3743,7 +4177,7 @@ L.LayerGroup = L.Class.extend({ }, addLayer: function (layer) { - var id = L.stamp(layer); + var id = this.getLayerId(layer); this._layers[id] = layer; @@ -3755,17 +4189,23 @@ L.LayerGroup = L.Class.extend({ }, removeLayer: function (layer) { - var id = L.stamp(layer); - - delete this._layers[id]; + var id = layer in this._layers ? layer : this.getLayerId(layer); - if (this._map) { - this._map.removeLayer(layer); + if (this._map && this._layers[id]) { + this._map.removeLayer(this._layers[id]); } + delete this._layers[id]; + return this; }, + hasLayer: function (layer) { + if (!layer) { return false; } + + return (layer in this._layers || this.getLayerId(layer) in this._layers); + }, + clearLayers: function () { this.eachLayer(this.removeLayer, this); return this; @@ -3776,12 +4216,10 @@ L.LayerGroup = L.Class.extend({ i, layer; for (i in this._layers) { - if (this._layers.hasOwnProperty(i)) { - layer = this._layers[i]; + layer = this._layers[i]; - if (layer[methodName]) { - layer[methodName].apply(layer, args); - } + if (layer[methodName]) { + layer[methodName].apply(layer, args); } } @@ -3805,14 +4243,30 @@ L.LayerGroup = L.Class.extend({ eachLayer: function (method, context) { for (var i in this._layers) { - if (this._layers.hasOwnProperty(i)) { - method.call(context, this._layers[i]); - } + method.call(context, this._layers[i]); + } + return this; + }, + + getLayer: function (id) { + return this._layers[id]; + }, + + getLayers: function () { + var layers = []; + + for (var i in this._layers) { + layers.push(this._layers[i]); } + return layers; }, setZIndex: function (zIndex) { return this.invoke('setZIndex', zIndex); + }, + + getLayerId: function (layer) { + return L.stamp(layer); } }); @@ -3830,11 +4284,11 @@ L.FeatureGroup = L.LayerGroup.extend({ includes: L.Mixin.Events, statics: { - EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu' + EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose' }, addLayer: function (layer) { - if (this._layers[L.stamp(layer)]) { + if (this.hasLayer(layer)) { return this; } @@ -3850,11 +4304,14 @@ L.FeatureGroup = L.LayerGroup.extend({ }, removeLayer: function (layer) { + if (layer in this._layers) { + layer = this._layers[layer]; + } + layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this); L.LayerGroup.prototype.removeLayer.call(this, layer); - if (this._popupContent) { this.invoke('unbindPopup'); } @@ -3891,7 +4348,9 @@ L.FeatureGroup = L.LayerGroup.extend({ }, _propagateEvent: function (e) { - e.layer = e.target; + if (!e.layer) { + e.layer = e.target; + } e.target = this; this.fire(e.type, e); @@ -4083,6 +4542,12 @@ L.Path = L.Path.extend({ if (this.options.fill) { this._path.setAttribute('fill-rule', 'evenodd'); } + if (this.options.pointerEvents) { + this._path.setAttribute('pointer-events', this.options.pointerEvents); + } + if (!this.options.clickable && !this.options.pointerEvents) { + this._path.setAttribute('pointer-events', 'none'); + } this._updateStyle(); }, @@ -4243,12 +4708,15 @@ L.Path.include({ bindPopup: function (content, options) { - if (!this._popup || options) { - this._popup = new L.Popup(options, this); + if (content instanceof L.Popup) { + this._popup = content; + } else { + if (!this._popup || options) { + this._popup = new L.Popup(options, this); + } + this._popup.setContent(content); } - this._popup.setContent(content); - if (!this._popupHandlersAdded) { this .on('click', this._openPopup, this) @@ -4379,7 +4847,7 @@ L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({ if (options.dashArray) { stroke.dashStyle = options.dashArray instanceof Array ? options.dashArray.join(' ') : - options.dashArray.replace(/ *, */g, ' '); + options.dashArray.replace(/( *, *)/g, ' '); } else { stroke.dashStyle = ''; } @@ -4466,6 +4934,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path : if (this.options.clickable) { this._map.off('click', this._onClick, this); + this._map.off('mousemove', this._onMouseMove, this); } this._requestUpdate(); @@ -4551,20 +5020,31 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path : _initEvents: function () { if (this.options.clickable) { - // TODO hand cursor - // TODO mouseover, mouseout, dblclick + // TODO dblclick + this._map.on('mousemove', this._onMouseMove, this); this._map.on('click', this._onClick, this); } }, _onClick: function (e) { if (this._containsPoint(e.layerPoint)) { - this.fire('click', { - latlng: e.latlng, - layerPoint: e.layerPoint, - containerPoint: e.containerPoint, - originalEvent: e - }); + this.fire('click', e); + } + }, + + _onMouseMove: function (e) { + if (!this._map || this._map._animatingZoom) { return; } + + // TODO don't do on each move + if (this._containsPoint(e.layerPoint)) { + this._ctx.canvas.style.cursor = 'pointer'; + this._mouseInside = true; + this.fire('mouseover', e); + + } else if (this._mouseInside) { + this._ctx.canvas.style.cursor = ''; + this._mouseInside = false; + this.fire('mouseout', e); } } }); @@ -4575,12 +5055,12 @@ L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {} ctx; if (!root) { - root = this._pathRoot = document.createElement("canvas"); + root = this._pathRoot = document.createElement('canvas'); root.style.position = 'absolute'; ctx = this._canvasCtx = root.getContext('2d'); - ctx.lineCap = "round"; - ctx.lineJoin = "round"; + ctx.lineCap = 'round'; + ctx.lineJoin = 'round'; this._panes.overlayPane.appendChild(root); @@ -4732,8 +5212,8 @@ L.LineUtil = { return false; // other cases } else { - codeOut = codeA || codeB, - p = this._getEdgeIntersection(a, b, codeOut, bounds), + codeOut = codeA || codeB; + p = this._getEdgeIntersection(a, b, codeOut, bounds); newCode = this._getBitCode(p, bounds); if (codeOut === codeA) { @@ -4818,7 +5298,7 @@ L.LineUtil = { /* - * L.Polygon is used to display polylines on a map. + * L.Polyline is used to display polylines on a map. */ L.Polyline = L.Path.extend({ @@ -4866,7 +5346,7 @@ L.Polyline = L.Path.extend({ spliceLatLngs: function () { // (Number index, Number howMany) var removed = [].splice.apply(this._latlngs, arguments); - this._convertLatLngs(this._latlngs); + this._convertLatLngs(this._latlngs, true); this.redraw(); return removed; }, @@ -4893,26 +5373,19 @@ L.Polyline = L.Path.extend({ }, getBounds: function () { - var bounds = new L.LatLngBounds(), - latLngs = this.getLatLngs(), - i, len; - - for (i = 0, len = latLngs.length; i < len; i++) { - bounds.extend(latLngs[i]); - } - - return bounds; + return new L.LatLngBounds(this.getLatLngs()); }, - _convertLatLngs: function (latlngs) { - var i, len; + _convertLatLngs: function (latlngs, overwrite) { + var i, len, target = overwrite ? latlngs : []; + for (i = 0, len = latlngs.length; i < len; i++) { if (L.Util.isArray(latlngs[i]) && typeof latlngs[i][0] !== 'number') { return; } - latlngs[i] = L.latLng(latlngs[i]); + target[i] = L.latLng(latlngs[i]); } - return latlngs; + return target; }, _initEvents: function () { @@ -5057,11 +5530,27 @@ L.Polygon = L.Polyline.extend({ }, initialize: function (latlngs, options) { + var i, len, hole; + L.Polyline.prototype.initialize.call(this, latlngs, options); if (latlngs && L.Util.isArray(latlngs[0]) && (typeof latlngs[0][0] !== 'number')) { this._latlngs = this._convertLatLngs(latlngs[0]); this._holes = latlngs.slice(1); + + for (i = 0, len = this._holes.length; i < len; i++) { + hole = this._holes[i] = this._convertLatLngs(this._holes[i]); + if (hole[0].equals(hole[hole.length - 1])) { + hole.pop(); + } + } + } + + // filter out last point if its equal to the first one + latlngs = this._latlngs; + + if (latlngs.length >= 2 && latlngs[0].equals(latlngs[latlngs.length - 1])) { + latlngs.pop(); } }, @@ -5220,21 +5709,21 @@ L.Circle = L.Path.extend({ projectLatlngs: function () { var lngRadius = this._getLngRadius(), - latlng2 = new L.LatLng(this._latlng.lat, this._latlng.lng - lngRadius), - point2 = this._map.latLngToLayerPoint(latlng2); + latlng = this._latlng, + pointLeft = this._map.latLngToLayerPoint([latlng.lat, latlng.lng - lngRadius]); - this._point = this._map.latLngToLayerPoint(this._latlng); - this._radius = Math.max(Math.round(this._point.x - point2.x), 1); + this._point = this._map.latLngToLayerPoint(latlng); + this._radius = Math.max(this._point.x - pointLeft.x, 1); }, getBounds: function () { var lngRadius = this._getLngRadius(), latRadius = (this._mRadius / 40075017) * 360, - latlng = this._latlng, - sw = new L.LatLng(latlng.lat - latRadius, latlng.lng - lngRadius), - ne = new L.LatLng(latlng.lat + latRadius, latlng.lng + lngRadius); + latlng = this._latlng; - return new L.LatLngBounds(sw, ne); + return new L.LatLngBounds( + [latlng.lat - latRadius, latlng.lng - lngRadius], + [latlng.lat + latRadius, latlng.lng + lngRadius]); }, getLatLng: function () { @@ -5250,13 +5739,13 @@ L.Circle = L.Path.extend({ } if (L.Browser.svg) { - return "M" + p.x + "," + (p.y - r) + - "A" + r + "," + r + ",0,1,1," + - (p.x - 0.1) + "," + (p.y - r) + " z"; + return 'M' + p.x + ',' + (p.y - r) + + 'A' + r + ',' + r + ',0,1,1,' + + (p.x - 0.1) + ',' + (p.y - r) + ' z'; } else { p._round(); r = Math.round(r); - return "AL " + p.x + "," + p.y + " " + r + "," + r + " 0," + (65535 * 360); + return 'AL ' + p.x + ',' + p.y + ' ' + r + ',' + r + ' 0,' + (65535 * 360); } }, @@ -5310,14 +5799,14 @@ L.CircleMarker = L.Circle.extend({ projectLatlngs: function () { this._point = this._map.latLngToLayerPoint(this._latlng); }, - + _updateStyle : function () { L.Circle.prototype._updateStyle.call(this); this.setRadius(this.options.radius); }, setRadius: function (radius) { - this._radius = radius; + this.options.radius = this._radius = radius; return this.redraw(); } }); @@ -5418,6 +5907,17 @@ L.Circle.include(!L.Path.CANVAS ? {} : { }); +/* + * CircleMarker canvas specific drawing parts. + */ + +L.CircleMarker.include(!L.Path.CANVAS ? {} : { + _updateStyle: function () { + L.Path.prototype._updateStyle.call(this); + } +}); + + /* * L.GeoJSON turns any GeoJSON data into a Leaflet layer. */ @@ -5441,7 +5941,7 @@ L.GeoJSON = L.FeatureGroup.extend({ if (features) { for (i = 0, len = features.length; i < len; i++) { // Only add this if geometry or geometries are set and not null - if (features[i].geometries || features[i].geometry) { + if (features[i].geometries || features[i].geometry || features[i].features) { this.addData(features[i]); } } @@ -5452,8 +5952,8 @@ L.GeoJSON = L.FeatureGroup.extend({ if (options.filter && !options.filter(geojson)) { return; } - var layer = L.GeoJSON.geometryToLayer(geojson, options.pointToLayer); - layer.feature = geojson; + var layer = L.GeoJSON.geometryToLayer(geojson, options.pointToLayer, options.coordsToLatLng); + layer.feature = L.GeoJSON.asFeature(geojson); layer.defaultOptions = layer.options; this.resetStyle(layer); @@ -5492,48 +5992,52 @@ L.GeoJSON = L.FeatureGroup.extend({ }); L.extend(L.GeoJSON, { - geometryToLayer: function (geojson, pointToLayer) { + geometryToLayer: function (geojson, pointToLayer, coordsToLatLng) { var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson, coords = geometry.coordinates, layers = [], latlng, latlngs, i, len, layer; + coordsToLatLng = coordsToLatLng || this.coordsToLatLng; + switch (geometry.type) { case 'Point': - latlng = this.coordsToLatLng(coords); + latlng = coordsToLatLng(coords); return pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng); case 'MultiPoint': for (i = 0, len = coords.length; i < len; i++) { - latlng = this.coordsToLatLng(coords[i]); + latlng = coordsToLatLng(coords[i]); layer = pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng); layers.push(layer); } return new L.FeatureGroup(layers); case 'LineString': - latlngs = this.coordsToLatLngs(coords); + latlngs = this.coordsToLatLngs(coords, 0, coordsToLatLng); return new L.Polyline(latlngs); case 'Polygon': - latlngs = this.coordsToLatLngs(coords, 1); + latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng); return new L.Polygon(latlngs); case 'MultiLineString': - latlngs = this.coordsToLatLngs(coords, 1); + latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng); return new L.MultiPolyline(latlngs); case 'MultiPolygon': - latlngs = this.coordsToLatLngs(coords, 2); + latlngs = this.coordsToLatLngs(coords, 2, coordsToLatLng); return new L.MultiPolygon(latlngs); case 'GeometryCollection': for (i = 0, len = geometry.geometries.length; i < len; i++) { + layer = this.geometryToLayer({ geometry: geometry.geometries[i], type: 'Feature', properties: geojson.properties - }, pointToLayer); + }, pointToLayer, coordsToLatLng); + layers.push(layer); } return new L.FeatureGroup(layers); @@ -5543,31 +6047,140 @@ L.extend(L.GeoJSON, { } }, - coordsToLatLng: function (coords, reverse) { // (Array, Boolean) -> LatLng - var lat = parseFloat(coords[reverse ? 0 : 1]), - lng = parseFloat(coords[reverse ? 1 : 0]); - - return new L.LatLng(lat, lng); + coordsToLatLng: function (coords) { // (Array[, Boolean]) -> LatLng + return new L.LatLng(coords[1], coords[0]); }, - coordsToLatLngs: function (coords, levelsDeep, reverse) { // (Array, Number, Boolean) -> Array - var latlng, - latlngs = [], - i, len; + coordsToLatLngs: function (coords, levelsDeep, coordsToLatLng) { // (Array[, Number, Function]) -> Array + var latlng, i, len, + latlngs = []; for (i = 0, len = coords.length; i < len; i++) { latlng = levelsDeep ? - this.coordsToLatLngs(coords[i], levelsDeep - 1, reverse) : - this.coordsToLatLng(coords[i], reverse); + this.coordsToLatLngs(coords[i], levelsDeep - 1, coordsToLatLng) : + (coordsToLatLng || this.coordsToLatLng)(coords[i]); latlngs.push(latlng); } return latlngs; - } -}); + }, -L.geoJson = function (geojson, options) { + latLngToCoords: function (latLng) { + return [latLng.lng, latLng.lat]; + }, + + latLngsToCoords: function (latLngs) { + var coords = []; + + for (var i = 0, len = latLngs.length; i < len; i++) { + coords.push(L.GeoJSON.latLngToCoords(latLngs[i])); + } + + return coords; + }, + + getFeature: function (layer, newGeometry) { + return layer.feature ? L.extend({}, layer.feature, {geometry: newGeometry}) : L.GeoJSON.asFeature(newGeometry); + }, + + asFeature: function (geoJSON) { + if (geoJSON.type === 'Feature') { + return geoJSON; + } + + return { + type: 'Feature', + properties: {}, + geometry: geoJSON + }; + } +}); + +var PointToGeoJSON = { + toGeoJSON: function () { + return L.GeoJSON.getFeature(this, { + type: 'Point', + coordinates: L.GeoJSON.latLngToCoords(this.getLatLng()) + }); + } +}; + +L.Marker.include(PointToGeoJSON); +L.Circle.include(PointToGeoJSON); +L.CircleMarker.include(PointToGeoJSON); + +L.Polyline.include({ + toGeoJSON: function () { + return L.GeoJSON.getFeature(this, { + type: 'LineString', + coordinates: L.GeoJSON.latLngsToCoords(this.getLatLngs()) + }); + } +}); + +L.Polygon.include({ + toGeoJSON: function () { + var coords = [L.GeoJSON.latLngsToCoords(this.getLatLngs())], + i, len, hole; + + coords[0].push(coords[0][0]); + + if (this._holes) { + for (i = 0, len = this._holes.length; i < len; i++) { + hole = L.GeoJSON.latLngsToCoords(this._holes[i]); + hole.push(hole[0]); + coords.push(hole); + } + } + + return L.GeoJSON.getFeature(this, { + type: 'Polygon', + coordinates: coords + }); + } +}); + +(function () { + function includeMulti(Klass, type) { + Klass.include({ + toGeoJSON: function () { + var coords = []; + + this.eachLayer(function (layer) { + coords.push(layer.toGeoJSON().geometry.coordinates); + }); + + return L.GeoJSON.getFeature(this, { + type: type, + coordinates: coords + }); + } + }); + } + + includeMulti(L.MultiPolyline, 'MultiLineString'); + includeMulti(L.MultiPolygon, 'MultiPolygon'); +}()); + +L.LayerGroup.include({ + toGeoJSON: function () { + var features = []; + + this.eachLayer(function (layer) { + if (layer.toGeoJSON) { + features.push(L.GeoJSON.asFeature(layer.toGeoJSON())); + } + }); + + return { + type: 'FeatureCollection', + features: features + }; + } +}); + +L.geoJson = function (geojson, options) { return new L.GeoJSON(geojson, options); }; @@ -5577,6 +6190,11 @@ L.geoJson = function (geojson, options) { */ L.DomEvent = { + WHEEL: + 'onwheel' in document ? 'wheel' : + 'onmousewheel' in document ? 'mousewheel' : + 'MozMousePixelScroll', + /* inspired by John Resig, Dean Edwards and YUI addEvent implementations */ addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object]) @@ -5597,13 +6215,13 @@ L.DomEvent = { this.addDoubleTapListener(obj, handler, id); } - if ('addEventListener' in obj) { + if (type === 'wheel' || type === 'mousewheel') { + type = L.DomEvent.WHEEL; + } - if (type === 'mousewheel') { - obj.addEventListener('DOMMouseScroll', handler, false); - obj.addEventListener(type, handler, false); + if ('addEventListener' in obj) { - } else if ((type === 'mouseenter') || (type === 'mouseleave')) { + if ((type === 'mouseenter') || (type === 'mouseleave')) { originalHandler = handler; newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout'); @@ -5615,12 +6233,19 @@ L.DomEvent = { obj.addEventListener(newType, handler, false); + } else if (type === 'click' && L.Browser.android) { + originalHandler = handler; + handler = function (e) { + return L.DomEvent._filterClick(e, originalHandler); + }; + + obj.addEventListener(type, handler, false); } else { obj.addEventListener(type, handler, false); } } else if ('attachEvent' in obj) { - obj.attachEvent("on" + type, handler); + obj.attachEvent('on' + type, handler); } obj[key] = handler; @@ -5634,7 +6259,11 @@ L.DomEvent = { key = '_leaflet_' + type + id, handler = obj[key]; - if (!handler) { return; } + if (!handler) { return this; } + + if (type === 'wheel' || type === 'mousewheel') { + type = L.DomEvent.WHEEL; + } if (L.Browser.msTouch && type.indexOf('touch') === 0) { this.removeMsTouchListener(obj, type, id); @@ -5643,17 +6272,13 @@ L.DomEvent = { } else if ('removeEventListener' in obj) { - if (type === 'mousewheel') { - obj.removeEventListener('DOMMouseScroll', handler, false); - obj.removeEventListener(type, handler, false); - - } else if ((type === 'mouseenter') || (type === 'mouseleave')) { + if ((type === 'mouseenter') || (type === 'mouseleave')) { obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false); } else { obj.removeEventListener(type, handler, false); } } else if ('detachEvent' in obj) { - obj.detachEvent("on" + type, handler); + obj.detachEvent('on' + type, handler); } obj[key] = null; @@ -5672,7 +6297,6 @@ L.DomEvent = { }, disableClickPropagation: function (el) { - var stop = L.DomEvent.stopPropagation; for (var i = L.Draggable.START.length - 1; i >= 0; i--) { @@ -5680,7 +6304,7 @@ L.DomEvent = { } return L.DomEvent - .addListener(el, 'click', stop) + .addListener(el, 'click', L.DomEvent._fakeStop) .addListener(el, 'dblclick', stop); }, @@ -5710,18 +6334,25 @@ L.DomEvent = { }, getWheelDelta: function (e) { - var delta = 0; - if (e.wheelDelta) { + if (e.type === 'wheel') { + delta = -e.deltaY / (e.deltaMode ? 1 : 120); + } else if (e.type === 'mousewheel') { delta = e.wheelDelta / 120; + } else if (e.type === 'MozMousePixelScroll') { + delta = -e.detail; } - if (e.detail) { - delta = -e.detail / 3; - } + return delta; }, + _fakeStop: function stop(e) { + // fakes stopPropagation by setting a special event flag checked in Map mouse events handler + // jshint camelcase: false + e._leaflet_stop = true; + }, + // check if element really left/entered the event target (for mouseenter/mouseleave) _checkMouse: function (el, e) { @@ -5753,6 +6384,25 @@ L.DomEvent = { } } return e; + }, + + // this is a horrible workaround for a bug in Android where a single touch triggers two click events + _filterClick: function (e, handler) { + var timeStamp = (e.timeStamp || e.originalEvent.timeStamp), + elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick); + + // are they closer together than 1000ms yet more than 100ms? + // Android typically triggers them ~300ms apart while multiple listeners + // on the same event should be triggered far faster; + // or check if click is simulated on the element, and if it is, reject any non-simulated events + + if ((elapsed && elapsed > 100 && elapsed < 1000) || (e.target._simulatedClick && !e._simulated)) { + L.DomEvent.stop(e); + return; + } + L.DomEvent._lastClick = timeStamp; + + return handler(e); } }; @@ -5778,14 +6428,12 @@ L.Draggable = L.Class.extend({ mousedown: 'mousemove', touchstart: 'touchmove', MSPointerDown: 'touchmove' - }, - TAP_TOLERANCE: 15 + } }, - initialize: function (element, dragStartTarget, longPress) { + initialize: function (element, dragStartTarget) { this._element = element; this._dragStartTarget = dragStartTarget || element; - this._longPress = longPress && !L.Browser.msTouch; }, enable: function () { @@ -5794,6 +6442,7 @@ L.Draggable = L.Class.extend({ for (var i = L.Draggable.START.length - 1; i >= 0; i--) { L.DomEvent.on(this._dragStartTarget, L.Draggable.START[i], this._onDown, this); } + this._enabled = true; }, @@ -5803,55 +6452,39 @@ L.Draggable = L.Class.extend({ for (var i = L.Draggable.START.length - 1; i >= 0; i--) { L.DomEvent.off(this._dragStartTarget, L.Draggable.START[i], this._onDown, this); } + this._enabled = false; this._moved = false; }, _onDown: function (e) { - if ((!L.Browser.touch && e.shiftKey) || - ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; } + if (e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; } - L.DomEvent.preventDefault(e); - L.DomEvent.stopPropagation(e); + L.DomEvent + .stopPropagation(e); if (L.Draggable._disabled) { return; } - this._simulateClick = true; - - if (e.touches && e.touches.length > 1) { - this._simulateClick = false; - clearTimeout(this._longPressTimeout); - return; - } + L.DomUtil.disableImageDrag(); - var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e), + var first = e.touches ? e.touches[0] : e, el = first.target; + // if touching a link, highlight it if (L.Browser.touch && el.tagName.toLowerCase() === 'a') { L.DomUtil.addClass(el, 'leaflet-active'); } this._moved = false; + if (this._moving) { return; } this._startPoint = new L.Point(first.clientX, first.clientY); this._startPos = this._newPos = L.DomUtil.getPosition(this._element); - //Touch contextmenu event emulation - if (e.touches && e.touches.length === 1 && L.Browser.touch && this._longPress) { - this._longPressTimeout = setTimeout(L.bind(function () { - var dist = (this._newPos && this._newPos.distanceTo(this._startPos)) || 0; - - if (dist < L.Draggable.TAP_TOLERANCE) { - this._simulateClick = false; - this._onUp(); - this._simulateEvent('contextmenu', first); - } - }, this), 1000); - } - - L.DomEvent.on(document, L.Draggable.MOVE[e.type], this._onMove, this); - L.DomEvent.on(document, L.Draggable.END[e.type], this._onUp, this); + L.DomEvent + .on(document, L.Draggable.MOVE[e.type], this._onMove, this) + .on(document, L.Draggable.END[e.type], this._onUp, this); }, _onMove: function (e) { @@ -5859,25 +6492,25 @@ L.Draggable = L.Class.extend({ var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e), newPoint = new L.Point(first.clientX, first.clientY), - diffVec = newPoint.subtract(this._startPoint); + offset = newPoint.subtract(this._startPoint); - if (!diffVec.x && !diffVec.y) { return; } + if (!offset.x && !offset.y) { return; } L.DomEvent.preventDefault(e); if (!this._moved) { this.fire('dragstart'); - this._moved = true; - this._startPos = L.DomUtil.getPosition(this._element).subtract(diffVec); + this._moved = true; + this._startPos = L.DomUtil.getPosition(this._element).subtract(offset); if (!L.Browser.touch) { L.DomUtil.disableTextSelection(); - this._setMovingCursor(); + L.DomUtil.addClass(document.body, 'leaflet-dragging'); } } - this._newPos = this._startPos.add(diffVec); + this._newPos = this._startPos.add(offset); this._moving = true; L.Util.cancelAnimFrame(this._animRequest); @@ -5890,67 +6523,28 @@ L.Draggable = L.Class.extend({ this.fire('drag'); }, - _onUp: function (e) { - var simulateClickTouch; - clearTimeout(this._longPressTimeout); - if (this._simulateClick && e.changedTouches) { - var first = e.changedTouches[0], - el = first.target, - dist = (this._newPos && this._newPos.distanceTo(this._startPos)) || 0; - - if (el.tagName.toLowerCase() === 'a') { - L.DomUtil.removeClass(el, 'leaflet-active'); - } - - if (dist < L.Draggable.TAP_TOLERANCE) { - simulateClickTouch = first; - } - } - + _onUp: function () { if (!L.Browser.touch) { L.DomUtil.enableTextSelection(); - this._restoreCursor(); + L.DomUtil.removeClass(document.body, 'leaflet-dragging'); } for (var i in L.Draggable.MOVE) { - if (L.Draggable.MOVE.hasOwnProperty(i)) { - L.DomEvent.off(document, L.Draggable.MOVE[i], this._onMove); - L.DomEvent.off(document, L.Draggable.END[i], this._onUp); - } + L.DomEvent + .off(document, L.Draggable.MOVE[i], this._onMove) + .off(document, L.Draggable.END[i], this._onUp); } + L.DomUtil.enableImageDrag(); + if (this._moved) { // ensure drag is not fired after dragend L.Util.cancelAnimFrame(this._animRequest); this.fire('dragend'); } - this._moving = false; - - if (simulateClickTouch) { - this._moved = false; - this._simulateEvent('click', simulateClickTouch); - } - }, - - _setMovingCursor: function () { - L.DomUtil.addClass(document.body, 'leaflet-dragging'); - }, - - _restoreCursor: function () { - L.DomUtil.removeClass(document.body, 'leaflet-dragging'); - }, - - _simulateEvent: function (type, e) { - var simulatedEvent = document.createEvent('MouseEvents'); - - simulatedEvent.initMouseEvent( - type, true, true, window, 1, - e.screenX, e.screenY, - e.clientX, e.clientY, - false, false, false, false, 0, null); - e.target.dispatchEvent(simulatedEvent); + this._moving = false; } }); @@ -5998,8 +6592,6 @@ L.Map.mergeOptions({ inertiaThreshold: L.Browser.touch ? 32 : 18, // ms easeLinearity: 0.25, - longPress: true, - // TODO refactor, move to CRS worldCopyJump: false }); @@ -6009,7 +6601,7 @@ L.Map.Drag = L.Handler.extend({ if (!this._draggable) { var map = this._map; - this._draggable = new L.Draggable(map._mapPane, map._container, map.options.longPress); + this._draggable = new L.Draggable(map._mapPane, map._container); this._draggable.on({ 'dragstart': this._onDragStart, @@ -6072,10 +6664,10 @@ L.Map.Drag = L.Handler.extend({ _onViewReset: function () { // TODO fix hardcoded Earth values var pxCenter = this._map.getSize()._divideBy(2), - pxWorldCenter = this._map.latLngToLayerPoint(new L.LatLng(0, 0)); + pxWorldCenter = this._map.latLngToLayerPoint([0, 0]); this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x; - this._worldWidth = this._map.project(new L.LatLng(0, 180)).x; + this._worldWidth = this._map.project([0, 180]).x; }, _onPreDrag: function () { @@ -6098,6 +6690,8 @@ L.Map.Drag = L.Handler.extend({ noInertia = !options.inertia || delay > options.inertiaThreshold || !this._positions[0]; + map.fire('dragend'); + if (noInertia) { map.fire('moveend'); @@ -6108,7 +6702,7 @@ L.Map.Drag = L.Handler.extend({ ease = options.easeLinearity, speedVector = direction.multiplyBy(ease / duration), - speed = speedVector.distanceTo(new L.Point(0, 0)), + speed = speedVector.distanceTo([0, 0]), limitedSpeed = Math.min(options.inertiaMaxSpeed, speed), limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed), @@ -6116,21 +6710,19 @@ L.Map.Drag = L.Handler.extend({ decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease), offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round(); - L.Util.requestAnimFrame(function () { - map.panBy(offset, decelerationDuration, ease); - }); - } - - map.fire('dragend'); + if (!offset.x || !offset.y) { + map.fire('moveend'); - if (options.maxBounds) { - // TODO predrag validation instead of animation - L.Util.requestAnimFrame(this._panInsideMaxBounds, map, true, map._container); + } else { + L.Util.requestAnimFrame(function () { + map.panBy(offset, { + duration: decelerationDuration, + easeLinearity: ease, + noMoveStart: true + }); + }); + } } - }, - - _panInsideMaxBounds: function () { - this.panInsideBounds(this.options.maxBounds); } }); @@ -6155,7 +6747,7 @@ L.Map.DoubleClickZoom = L.Handler.extend({ }, _onDoubleClick: function (e) { - this.setView(e.latlng, this._zoom + 1); + this.setZoomAround(e.containerPoint, this._zoom + 1); } }); @@ -6172,12 +6764,12 @@ L.Map.mergeOptions({ L.Map.ScrollWheelZoom = L.Handler.extend({ addHooks: function () { - L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this); + L.DomEvent.on(this._map._container, 'wheel', this._onWheelScroll, this); this._delta = 0; }, removeHooks: function () { - L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll); + L.DomEvent.off(this._map._container, 'wheel', this._onWheelScroll); }, _onWheelScroll: function (e) { @@ -6204,30 +6796,16 @@ L.Map.ScrollWheelZoom = L.Handler.extend({ delta = this._delta, zoom = map.getZoom(); - delta = delta > 0 ? Math.ceil(delta) : Math.round(delta); + delta = delta > 0 ? Math.ceil(delta) : Math.floor(delta); delta = Math.max(Math.min(delta, 4), -4); delta = map._limitZoom(zoom + delta) - zoom; this._delta = 0; - this._startTime = null; if (!delta) { return; } - var newZoom = zoom + delta, - newCenter = this._getCenterForScrollWheelZoom(newZoom); - - map.setView(newCenter, newZoom); - }, - - _getCenterForScrollWheelZoom: function (newZoom) { - var map = this._map, - scale = map.getZoomScale(newZoom), - viewHalf = map.getSize()._divideBy(2), - centerOffset = this._lastMousePos._subtract(viewHalf)._multiplyBy(1 - 1 / scale), - newCenterPoint = map._getTopLeftPoint()._add(viewHalf)._add(centerOffset); - - return map.unproject(newCenterPoint); + map.setZoomAround(this._lastMousePos, zoom + delta); } }); @@ -6256,6 +6834,7 @@ L.extend(L.DomEvent, { function onTouchStart(e) { var count; + if (L.Browser.msTouch) { trackedTouches.push(e.pointerId); count = trackedTouches.length; @@ -6275,7 +6854,6 @@ L.extend(L.DomEvent, { } function onTouchEnd(e) { - /*jshint forin:false */ if (L.Browser.msTouch) { var idx = trackedTouches.indexOf(e.pointerId); if (idx === -1) { @@ -6286,10 +6864,11 @@ L.extend(L.DomEvent, { if (doubleTap) { if (L.Browser.msTouch) { - //Work around .type being readonly with MSPointer* events + // work around .type being readonly with MSPointer* events var newTouch = { }, prop; + // jshint forin:false for (var i in touch) { prop = touch[i]; if (typeof prop === 'function') { @@ -6308,25 +6887,31 @@ L.extend(L.DomEvent, { obj[pre + touchstart + id] = onTouchStart; obj[pre + touchend + id] = onTouchEnd; - //On msTouch we need to listen on the document otherwise a drag starting on the map and moving off screen will not come through to us - // so we will lose track of how many touches are ongoing + // on msTouch we need to listen on the document, otherwise a drag starting on the map and moving off screen + // will not come through to us, so we will lose track of how many touches are ongoing var endElement = L.Browser.msTouch ? document.documentElement : obj; obj.addEventListener(touchstart, onTouchStart, false); endElement.addEventListener(touchend, onTouchEnd, false); + if (L.Browser.msTouch) { endElement.addEventListener('MSPointerCancel', onTouchEnd, false); } + return this; }, removeDoubleTapListener: function (obj, id) { var pre = '_leaflet_'; + obj.removeEventListener(this._touchstart, obj[pre + this._touchstart + id], false); - (L.Browser.msTouch ? document.documentElement : obj).removeEventListener(this._touchend, obj[pre + this._touchend + id], false); + (L.Browser.msTouch ? document.documentElement : obj).removeEventListener( + this._touchend, obj[pre + this._touchend + id], false); + if (L.Browser.msTouch) { document.documentElement.removeEventListener('MSPointerCancel', obj[pre + this._touchend + id], false); } + return this; } }); @@ -6526,10 +7111,10 @@ L.Map.TouchZoom = L.Handler.extend({ }, _onTouchMove: function (e) { - if (!e.touches || e.touches.length !== 2) { return; } - var map = this._map; + if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; } + var p1 = map.mouseEventToLayerPoint(e.touches[0]), p2 = map.mouseEventToLayerPoint(e.touches[1]); @@ -6539,12 +7124,11 @@ L.Map.TouchZoom = L.Handler.extend({ if (this._scale === 1) { return; } if (!this._moved) { - L.DomUtil.addClass(map._mapPane, 'leaflet-zoom-anim leaflet-touching'); + L.DomUtil.addClass(map._mapPane, 'leaflet-touching'); map .fire('movestart') - .fire('zoomstart') - ._prepareTileBg(); + .fire('zoomstart'); this._moved = true; } @@ -6559,28 +7143,23 @@ L.Map.TouchZoom = L.Handler.extend({ _updateOnMove: function () { var map = this._map, origin = this._getScaleOrigin(), - center = map.layerPointToLatLng(origin); - - map.fire('zoomanim', { - center: center, - zoom: map.getScaleZoom(this._scale) - }); - - // Used 2 translates instead of transform-origin because of a very strange bug - - // it didn't count the origin on the first touch-zoom but worked correctly afterwards + center = map.layerPointToLatLng(origin), + zoom = map.getScaleZoom(this._scale); - map._tileBg.style[L.DomUtil.TRANSFORM] = - L.DomUtil.getTranslateString(this._delta) + ' ' + - L.DomUtil.getScaleString(this._scale, this._startCenter); + map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta); }, _onTouchEnd: function () { - if (!this._moved || !this._zooming) { return; } + if (!this._moved || !this._zooming) { + this._zooming = false; + return; + } var map = this._map; this._zooming = false; L.DomUtil.removeClass(map._mapPane, 'leaflet-touching'); + L.Util.cancelAnimFrame(this._animRequest); L.DomEvent .off(document, 'touchmove', this._onTouchMove) @@ -6594,14 +7173,10 @@ L.Map.TouchZoom = L.Handler.extend({ roundZoomDelta = (floatZoomDelta > 0 ? Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)), - zoom = map._limitZoom(oldZoom + roundZoomDelta); - - map.fire('zoomanim', { - center: center, - zoom: zoom - }); + zoom = map._limitZoom(oldZoom + roundZoomDelta), + scale = map.getZoomScale(zoom) / this._scale; - map._runAnimation(center, zoom, map.getZoomScale(zoom) / this._scale, origin, true); + map._animateZoom(center, zoom, origin, scale); }, _getScaleOrigin: function () { @@ -6613,6 +7188,115 @@ L.Map.TouchZoom = L.Handler.extend({ L.Map.addInitHook('addHandler', 'touchZoom', L.Map.TouchZoom); +/* + * L.Map.Tap is used to enable mobile hacks like quick taps and long hold. + */ + +L.Map.mergeOptions({ + tap: true, + tapTolerance: 15 +}); + +L.Map.Tap = L.Handler.extend({ + addHooks: function () { + L.DomEvent.on(this._map._container, 'touchstart', this._onDown, this); + }, + + removeHooks: function () { + L.DomEvent.off(this._map._container, 'touchstart', this._onDown, this); + }, + + _onDown: function (e) { + if (!e.touches) { return; } + + L.DomEvent.preventDefault(e); + + this._fireClick = true; + + // don't simulate click or track longpress if more than 1 touch + if (e.touches.length > 1) { + this._fireClick = false; + clearTimeout(this._holdTimeout); + return; + } + + var first = e.touches[0], + el = first.target; + + this._startPos = this._newPos = new L.Point(first.clientX, first.clientY); + + // if touching a link, highlight it + if (el.tagName.toLowerCase() === 'a') { + L.DomUtil.addClass(el, 'leaflet-active'); + } + + // simulate long hold but setting a timeout + this._holdTimeout = setTimeout(L.bind(function () { + if (this._isTapValid()) { + this._fireClick = false; + this._onUp(); + this._simulateEvent('contextmenu', first); + } + }, this), 1000); + + L.DomEvent + .on(document, 'touchmove', this._onMove, this) + .on(document, 'touchend', this._onUp, this); + }, + + _onUp: function (e) { + clearTimeout(this._holdTimeout); + + L.DomEvent + .off(document, 'touchmove', this._onMove, this) + .off(document, 'touchend', this._onUp, this); + + if (this._fireClick && e && e.changedTouches) { + + var first = e.changedTouches[0], + el = first.target; + + if (el.tagName.toLowerCase() === 'a') { + L.DomUtil.removeClass(el, 'leaflet-active'); + } + + // simulate click if the touch didn't move too much + if (this._isTapValid()) { + this._simulateEvent('click', first); + } + } + }, + + _isTapValid: function () { + return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance; + }, + + _onMove: function (e) { + var first = e.touches[0]; + this._newPos = new L.Point(first.clientX, first.clientY); + }, + + _simulateEvent: function (type, e) { + var simulatedEvent = document.createEvent('MouseEvents'); + + simulatedEvent._simulated = true; + e.target._simulatedClick = true; + + simulatedEvent.initMouseEvent( + type, true, true, window, 1, + e.screenX, e.screenY, + e.clientX, e.clientY, + false, false, false, false, 0, null); + + e.target.dispatchEvent(simulatedEvent); + } +}); + +if (L.Browser.touch && !L.Browser.msTouch) { + L.Map.addInitHook('addHandler', 'tap', L.Map.Tap); +} + + /* * L.Handler.ShiftDragZoom is used to add shift-drag zoom interaction to the map * (zoom to a selected bounding box), enabled by default. @@ -6641,6 +7325,7 @@ L.Map.BoxZoom = L.Handler.extend({ if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; } L.DomUtil.disableTextSelection(); + L.DomUtil.disableImageDrag(); this._startLayerPoint = this._map.mouseEventToLayerPoint(e); @@ -6653,9 +7338,9 @@ L.Map.BoxZoom = L.Handler.extend({ L.DomEvent .on(document, 'mousemove', this._onMouseMove, this) .on(document, 'mouseup', this._onMouseUp, this) - .preventDefault(e); + .on(document, 'keydown', this._onKeyDown, this); - this._map.fire("boxzoomstart"); + this._map.fire('boxzoomstart'); }, _onMouseMove: function (e) { @@ -6676,15 +7361,22 @@ L.Map.BoxZoom = L.Handler.extend({ box.style.height = (Math.max(0, Math.abs(offset.y) - 4)) + 'px'; }, - _onMouseUp: function (e) { + _finish: function () { this._pane.removeChild(this._box); this._container.style.cursor = ''; L.DomUtil.enableTextSelection(); + L.DomUtil.enableImageDrag(); L.DomEvent .off(document, 'mousemove', this._onMouseMove) - .off(document, 'mouseup', this._onMouseUp); + .off(document, 'mouseup', this._onMouseUp) + .off(document, 'keydown', this._onKeyDown); + }, + + _onMouseUp: function (e) { + + this._finish(); var map = this._map, layerPoint = map.mouseEventToLayerPoint(e); @@ -6697,9 +7389,15 @@ L.Map.BoxZoom = L.Handler.extend({ map.fitBounds(bounds); - map.fire("boxzoomend", { + map.fire('boxzoomend', { boxZoomBounds: bounds }); + }, + + _onKeyDown: function (e) { + if (e.keyCode === 27) { + this._finish(); + } } }); @@ -6739,7 +7437,7 @@ L.Map.Keyboard = L.Handler.extend({ // make the container focusable by tabbing if (container.tabIndex === -1) { - container.tabIndex = "0"; + container.tabIndex = '0'; } L.DomEvent @@ -6768,9 +7466,16 @@ L.Map.Keyboard = L.Handler.extend({ }, _onMouseDown: function () { - if (!this._focused) { - this._map._container.focus(); - } + if (this._focused) { return; } + + var body = document.body, + docEl = document.documentElement, + top = body.scrollTop || docEl.scrollTop, + left = body.scrollTop || docEl.scrollLeft; + + this._map._container.focus(); + + window.scrollTo(left, top); }, _onFocus: function () { @@ -6827,14 +7532,17 @@ L.Map.Keyboard = L.Handler.extend({ var key = e.keyCode, map = this._map; - if (this._panKeys.hasOwnProperty(key)) { + if (key in this._panKeys) { + + if (map._panAnim && map._panAnim._inProgress) { return; } + map.panBy(this._panKeys[key]); if (map.options.maxBounds) { map.panInsideBounds(map.options.maxBounds); } - } else if (this._zoomKeys.hasOwnProperty(key)) { + } else if (key in this._zoomKeys) { map.setZoom(map.getZoom() + this._zoomKeys[key]); } else { @@ -6860,15 +7568,22 @@ L.Handler.MarkerDrag = L.Handler.extend({ addHooks: function () { var icon = this._marker._icon; if (!this._draggable) { - this._draggable = new L.Draggable(icon, icon) - .on('dragstart', this._onDragStart, this) - .on('drag', this._onDrag, this) - .on('dragend', this._onDragEnd, this); + this._draggable = new L.Draggable(icon, icon); } + + this._draggable + .on('dragstart', this._onDragStart, this) + .on('drag', this._onDrag, this) + .on('dragend', this._onDragEnd, this); this._draggable.enable(); }, removeHooks: function () { + this._draggable + .off('dragstart', this._onDragStart, this) + .off('drag', this._onDrag, this) + .off('dragend', this._onDragEnd, this); + this._draggable.disable(); }, @@ -6909,257 +7624,6 @@ L.Handler.MarkerDrag = L.Handler.extend({ }); -/* - * L.Handler.PolyEdit is an editing handler for polylines and polygons. - */ - -L.Handler.PolyEdit = L.Handler.extend({ - options: { - icon: new L.DivIcon({ - iconSize: new L.Point(8, 8), - className: 'leaflet-div-icon leaflet-editing-icon' - }) - }, - - initialize: function (poly, options) { - this._poly = poly; - L.setOptions(this, options); - }, - - addHooks: function () { - if (this._poly._map) { - if (!this._markerGroup) { - this._initMarkers(); - } - this._poly._map.addLayer(this._markerGroup); - } - }, - - removeHooks: function () { - if (this._poly._map) { - this._poly._map.removeLayer(this._markerGroup); - delete this._markerGroup; - delete this._markers; - } - }, - - updateMarkers: function () { - this._markerGroup.clearLayers(); - this._initMarkers(); - }, - - _initMarkers: function () { - if (!this._markerGroup) { - this._markerGroup = new L.LayerGroup(); - } - this._markers = []; - - var latlngs = this._poly._latlngs, - i, j, len, marker; - - // TODO refactor holes implementation in Polygon to support it here - - for (i = 0, len = latlngs.length; i < len; i++) { - - marker = this._createMarker(latlngs[i], i); - marker.on('click', this._onMarkerClick, this); - this._markers.push(marker); - } - - var markerLeft, markerRight; - - for (i = 0, j = len - 1; i < len; j = i++) { - if (i === 0 && !(L.Polygon && (this._poly instanceof L.Polygon))) { - continue; - } - - markerLeft = this._markers[j]; - markerRight = this._markers[i]; - - this._createMiddleMarker(markerLeft, markerRight); - this._updatePrevNext(markerLeft, markerRight); - } - }, - - _createMarker: function (latlng, index) { - var marker = new L.Marker(latlng, { - draggable: true, - icon: this.options.icon - }); - - marker._origLatLng = latlng; - marker._index = index; - - marker.on('drag', this._onMarkerDrag, this); - marker.on('dragend', this._fireEdit, this); - - this._markerGroup.addLayer(marker); - - return marker; - }, - - _fireEdit: function () { - this._poly.fire('edit'); - }, - - _onMarkerDrag: function (e) { - var marker = e.target; - - L.extend(marker._origLatLng, marker._latlng); - - if (marker._middleLeft) { - marker._middleLeft.setLatLng(this._getMiddleLatLng(marker._prev, marker)); - } - if (marker._middleRight) { - marker._middleRight.setLatLng(this._getMiddleLatLng(marker, marker._next)); - } - - this._poly.redraw(); - }, - - _onMarkerClick: function (e) { - // we want to remove the marker on click, but if latlng count < 3, polyline would be invalid - if (this._poly._latlngs.length < 3) { return; } - - var marker = e.target, - i = marker._index; - - // remove the marker - this._markerGroup.removeLayer(marker); - this._markers.splice(i, 1); - this._poly.spliceLatLngs(i, 1); - this._updateIndexes(i, -1); - - // update prev/next links of adjacent markers - this._updatePrevNext(marker._prev, marker._next); - - // remove ghost markers near the removed marker - if (marker._middleLeft) { - this._markerGroup.removeLayer(marker._middleLeft); - } - if (marker._middleRight) { - this._markerGroup.removeLayer(marker._middleRight); - } - - // create a ghost marker in place of the removed one - if (marker._prev && marker._next) { - this._createMiddleMarker(marker._prev, marker._next); - - } else if (!marker._prev) { - marker._next._middleLeft = null; - - } else if (!marker._next) { - marker._prev._middleRight = null; - } - - this._poly.fire('edit'); - }, - - _updateIndexes: function (index, delta) { - this._markerGroup.eachLayer(function (marker) { - if (marker._index > index) { - marker._index += delta; - } - }); - }, - - _createMiddleMarker: function (marker1, marker2) { - var latlng = this._getMiddleLatLng(marker1, marker2), - marker = this._createMarker(latlng), - onClick, - onDragStart, - onDragEnd; - - marker.setOpacity(0.6); - - marker1._middleRight = marker2._middleLeft = marker; - - onDragStart = function () { - var i = marker2._index; - - marker._index = i; - - marker - .off('click', onClick) - .on('click', this._onMarkerClick, this); - - latlng.lat = marker.getLatLng().lat; - latlng.lng = marker.getLatLng().lng; - this._poly.spliceLatLngs(i, 0, latlng); - this._markers.splice(i, 0, marker); - - marker.setOpacity(1); - - this._updateIndexes(i, 1); - marker2._index++; - this._updatePrevNext(marker1, marker); - this._updatePrevNext(marker, marker2); - }; - - onDragEnd = function () { - marker.off('dragstart', onDragStart, this); - marker.off('dragend', onDragEnd, this); - - this._createMiddleMarker(marker1, marker); - this._createMiddleMarker(marker, marker2); - }; - - onClick = function () { - onDragStart.call(this); - onDragEnd.call(this); - this._poly.fire('edit'); - }; - - marker - .on('click', onClick, this) - .on('dragstart', onDragStart, this) - .on('dragend', onDragEnd, this); - - this._markerGroup.addLayer(marker); - }, - - _updatePrevNext: function (marker1, marker2) { - if (marker1) { - marker1._next = marker2; - } - if (marker2) { - marker2._prev = marker1; - } - }, - - _getMiddleLatLng: function (marker1, marker2) { - var map = this._poly._map, - p1 = map.latLngToLayerPoint(marker1.getLatLng()), - p2 = map.latLngToLayerPoint(marker2.getLatLng()); - - return map.layerPointToLatLng(p1._add(p2)._divideBy(2)); - } -}); - -L.Polyline.addInitHook(function () { - - if (L.Handler.PolyEdit) { - this.editing = new L.Handler.PolyEdit(this); - - if (this.options.editable) { - this.editing.enable(); - } - } - - this.on('add', function () { - if (this.editing && this.editing.enabled()) { - this.editing.addHooks(); - } - }); - - this.on('remove', function () { - if (this.editing && this.editing.enabled()) { - this.editing.removeHooks(); - } - }); -}); - - /* * L.Control is a base class for implementing map controls. Handles positioning. * All other controls extend from this class. @@ -7194,6 +7658,10 @@ L.Control = L.Class.extend({ return this; }, + getContainer: function () { + return this._container; + }, + addTo: function (map) { this._map = map; @@ -7232,9 +7700,7 @@ L.control = function (options) { }; -/* - * Adds control-related methods to L.Map. - */ +// adds control-related methods to L.Map L.Map.include({ addControl: function (control) { @@ -7263,6 +7729,10 @@ L.Map.include({ createCorner('top', 'right'); createCorner('bottom', 'left'); createCorner('bottom', 'right'); + }, + + _clearControlPos: function () { + this._container.removeChild(this._controlContainer); } }); @@ -7278,31 +7748,22 @@ L.Control.Zoom = L.Control.extend({ onAdd: function (map) { var zoomName = 'leaflet-control-zoom', - barName = 'leaflet-bar', - partName = barName + '-part', - container = L.DomUtil.create('div', zoomName + ' ' + barName); + container = L.DomUtil.create('div', zoomName + ' leaflet-bar'); this._map = map; - this._zoomInButton = this._createButton('+', 'Zoom in', - zoomName + '-in ' + - partName + ' ' + - partName + '-top', - container, this._zoomIn, this); + this._zoomInButton = this._createButton( + '+', 'Zoom in', zoomName + '-in', container, this._zoomIn, this); + this._zoomOutButton = this._createButton( + '-', 'Zoom out', zoomName + '-out', container, this._zoomOut, this); - this._zoomOutButton = this._createButton('-', 'Zoom out', - zoomName + '-out ' + - partName + ' ' + - partName + '-bottom', - container, this._zoomOut, this); - - map.on('zoomend', this._updateDisabled, this); + map.on('zoomend zoomlevelschange', this._updateDisabled, this); return container; }, onRemove: function (map) { - map.off('zoomend', this._updateDisabled, this); + map.off('zoomend zoomlevelschange', this._updateDisabled, this); }, _zoomIn: function (e) { @@ -7333,7 +7794,7 @@ L.Control.Zoom = L.Control.extend({ _updateDisabled: function () { var map = this._map, - className = 'leaflet-control-zoom-disabled'; + className = 'leaflet-disabled'; L.DomUtil.removeClass(this._zoomInButton, className); L.DomUtil.removeClass(this._zoomOutButton, className); @@ -7371,7 +7832,7 @@ L.control.zoom = function (options) { L.Control.Attribution = L.Control.extend({ options: { position: 'bottomright', - prefix: 'Powered by Leaflet' + prefix: 'Leaflet' }, initialize: function (options) { @@ -7422,8 +7883,10 @@ L.Control.Attribution = L.Control.extend({ removeAttribution: function (text) { if (!text) { return; } - this._attributions[text]--; - this._update(); + if (this._attributions[text]) { + this._attributions[text]--; + this._update(); + } return this; }, @@ -7434,7 +7897,7 @@ L.Control.Attribution = L.Control.extend({ var attribs = []; for (var i in this._attributions) { - if (this._attributions.hasOwnProperty(i) && this._attributions[i]) { + if (this._attributions[i]) { attribs.push(i); } } @@ -7448,7 +7911,7 @@ L.Control.Attribution = L.Control.extend({ prefixAndAttribs.push(attribs.join(', ')); } - this._container.innerHTML = prefixAndAttribs.join(' — '); + this._container.innerHTML = prefixAndAttribs.join(' | '); }, _onLayerAdd: function (e) { @@ -7612,15 +8075,11 @@ L.Control.Layers = L.Control.extend({ this._handlingClick = false; for (var i in baseLayers) { - if (baseLayers.hasOwnProperty(i)) { - this._addLayer(baseLayers[i], i); - } + this._addLayer(baseLayers[i], i); } for (i in overlays) { - if (overlays.hasOwnProperty(i)) { - this._addLayer(overlays[i], i, true); - } + this._addLayer(overlays[i], i, true); } }, @@ -7664,9 +8123,12 @@ L.Control.Layers = L.Control.extend({ var className = 'leaflet-control-layers', container = this._container = L.DomUtil.create('div', className); + //Makes this work on IE10 Touch devices by stopping it from firing a mouseout event when the touch is released + container.setAttribute('aria-haspopup', true); + if (!L.Browser.touch) { L.DomEvent.disableClickPropagation(container); - L.DomEvent.on(container, 'mousewheel', L.DomEvent.stopPropagation); + L.DomEvent.on(container, 'wheel', L.DomEvent.stopPropagation); } else { L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation); } @@ -7674,25 +8136,25 @@ L.Control.Layers = L.Control.extend({ var form = this._form = L.DomUtil.create('form', className + '-list'); if (this.options.collapsed) { - L.DomEvent - .on(container, 'mouseover', this._expand, this) - .on(container, 'mouseout', this._collapse, this); - + if (!L.Browser.android) { + L.DomEvent + .on(container, 'mouseover', this._expand, this) + .on(container, 'mouseout', this._collapse, this); + } var link = this._layersLink = L.DomUtil.create('a', className + '-toggle', container); link.href = '#'; link.title = 'Layers'; if (L.Browser.touch) { L.DomEvent - .on(link, 'click', L.DomEvent.stopPropagation) - .on(link, 'click', L.DomEvent.preventDefault) + .on(link, 'click', L.DomEvent.stop) .on(link, 'click', this._expand, this); } else { L.DomEvent.on(link, 'focus', this._expand, this); } - this._map.on('movestart', this._collapse, this); + this._map.on('click', this._collapse, this); // TODO keyboard accessibility } else { this._expand(); @@ -7729,26 +8191,35 @@ L.Control.Layers = L.Control.extend({ this._overlaysList.innerHTML = ''; var baseLayersPresent = false, - overlaysPresent = false; + overlaysPresent = false, + i, obj; - for (var i in this._layers) { - if (this._layers.hasOwnProperty(i)) { - var obj = this._layers[i]; - this._addItem(obj); - overlaysPresent = overlaysPresent || obj.overlay; - baseLayersPresent = baseLayersPresent || !obj.overlay; - } + for (i in this._layers) { + obj = this._layers[i]; + this._addItem(obj); + overlaysPresent = overlaysPresent || obj.overlay; + baseLayersPresent = baseLayersPresent || !obj.overlay; } - this._separator.style.display = (overlaysPresent && baseLayersPresent ? '' : 'none'); + this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none'; }, _onLayerChange: function (e) { - var id = L.stamp(e.layer); + var obj = this._layers[L.stamp(e.layer)]; + + if (!obj) { return; } - if (this._layers[id] && !this._handlingClick) { + if (!this._handlingClick) { this._update(); } + + var type = obj.overlay ? + (e.type === 'layeradd' ? 'overlayadd' : 'overlayremove') : + (e.type === 'layeradd' ? 'baselayerchange' : null); + + if (type) { + this._map.fire(type, obj); + } }, // IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see http://bit.ly/PqYLBe) @@ -7799,8 +8270,7 @@ L.Control.Layers = L.Control.extend({ _onInputClick: function () { var i, input, obj, inputs = this._form.getElementsByTagName('input'), - inputsLen = inputs.length, - baseLayer; + inputsLen = inputs.length; this._handlingClick = true; @@ -7810,19 +8280,12 @@ L.Control.Layers = L.Control.extend({ if (input.checked && !this._map.hasLayer(obj.layer)) { this._map.addLayer(obj.layer); - if (!obj.overlay) { - baseLayer = obj.layer; - } + } else if (!input.checked && this._map.hasLayer(obj.layer)) { this._map.removeLayer(obj.layer); } } - if (baseLayer) { - this._map.setZoom(this._map.getZoom()); - this._map.fire('baselayerchange', {layer: baseLayer}); - } - this._handlingClick = false; }, @@ -7852,6 +8315,7 @@ L.PosAnimation = L.Class.extend({ this._el = el; this._inProgress = true; + this._newPos = newPos; this.fire('start'); @@ -7865,7 +8329,7 @@ L.PosAnimation = L.Class.extend({ L.Util.falseFn(el.offsetWidth); // there's no native way to track value updates of transitioned properties, so we imitate this - this._stepTimer = setInterval(L.bind(this.fire, this, 'step'), 50); + this._stepTimer = setInterval(L.bind(this._onStep, this), 50); }, stop: function () { @@ -7879,10 +8343,18 @@ L.PosAnimation = L.Class.extend({ L.Util.falseFn(this._el.offsetWidth); // force reflow in case we are about to start a new animation }, + _onStep: function () { + // jshint camelcase: false + // make L.DomUtil.getPosition return intermediate position value during animation + this._el._leaflet_pos = this._getPos(); + + this.fire('step'); + }, + // you can't easily get intermediate values of properties animated with CSS3 Transitions, // we need to parse computed style (in case of transform it returns matrix string) - _transformRe: /(-?[\d\.]+), (-?[\d\.]+)\)/, + _transformRe: /([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/, _getPos: function () { var left, top, matches, @@ -7891,8 +8363,8 @@ L.PosAnimation = L.Class.extend({ if (L.Browser.any3d) { matches = style[L.DomUtil.TRANSFORM].match(this._transformRe); - left = parseFloat(matches[1]); - top = parseFloat(matches[2]); + left = matches ? parseFloat(matches[1]) : 0; + top = matches ? parseFloat(matches[2]) : 0; } else { left = parseFloat(style.left); top = parseFloat(style.top); @@ -7909,6 +8381,10 @@ L.PosAnimation = L.Class.extend({ this._el.style[L.DomUtil.TRANSITION] = ''; + // jshint camelcase: false + // make sure L.DomUtil.getPosition returns the final position value after animation + this._el._leaflet_pos = this._newPos; + clearInterval(this._stepTimer); this.fire('step').fire('end'); @@ -7923,38 +8399,46 @@ L.PosAnimation = L.Class.extend({ L.Map.include({ - setView: function (center, zoom, forceReset) { + setView: function (center, zoom, options) { + zoom = this._limitZoom(zoom); + center = L.latLng(center); + options = options || {}; - var zoomChanged = (this._zoom !== zoom); + if (this._panAnim) { + this._panAnim.stop(); + } - if (this._loaded && !forceReset && this._layers) { + if (this._loaded && !options.reset && options !== true) { - if (this._panAnim) { - this._panAnim.stop(); + if (options.animate !== undefined) { + options.zoom = L.extend({animate: options.animate}, options.zoom); + options.pan = L.extend({animate: options.animate}, options.pan); } - var done = (zoomChanged ? - this._zoomToIfClose && this._zoomToIfClose(center, zoom) : - this._panByIfClose(center)); + // try animating pan or zoom + var animated = (this._zoom !== zoom) ? + this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) : + this._tryAnimatedPan(center, options.pan); - // exit if animated pan or zoom started - if (done) { + if (animated) { + // prevent resize handler call, the view will refresh after animation anyway clearTimeout(this._sizeTimer); return this; } } - // reset the map view + // animation didn't start, just reset the map view this._resetView(center, zoom); return this; }, - panBy: function (offset, duration, easeLinearity) { - offset = L.point(offset); + panBy: function (offset, options) { + offset = L.point(offset).round(); + options = options || {}; - if (!(offset.x || offset.y)) { + if (!offset.x && !offset.y) { return this; } @@ -7967,12 +8451,21 @@ L.Map.include({ }, this); } - this.fire('movestart'); + // don't fire movestart if animating inertia + if (!options.noMoveStart) { + this.fire('movestart'); + } - L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim'); + // animate pan unless animate: false specified + if (options.animate !== false) { + L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim'); - var newPos = L.DomUtil.getPosition(this._mapPane).subtract(offset)._round(); - this._panAnim.run(this._mapPane, newPos, duration || 0.25, easeLinearity); + var newPos = this._getMapPanePos().subtract(offset); + this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity); + } else { + this._rawPanBy(offset); + this.fire('move').fire('moveend'); + } return this; }, @@ -7986,23 +8479,16 @@ L.Map.include({ this.fire('moveend'); }, - _panByIfClose: function (center) { + _tryAnimatedPan: function (center, options) { // difference between the new and current centers in pixels var offset = this._getCenterOffset(center)._floor(); - if (this._offsetIsWithinView(offset)) { - this.panBy(offset); - return true; - } - return false; - }, + // don't animate too far unless animate: true specified in options + if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; } - _offsetIsWithinView: function (offset, multiplyFactor) { - var m = multiplyFactor || 1, - size = this.getSize(); + this.panBy(offset, options); - return (Math.abs(offset.x) <= size.x * m) && - (Math.abs(offset.y) <= size.y * m); + return true; } }); @@ -8081,112 +8567,188 @@ L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({ */ L.Map.mergeOptions({ - zoomAnimation: L.DomUtil.TRANSITION && !L.Browser.android23 && !L.Browser.mobileOpera + zoomAnimation: true, + zoomAnimationThreshold: 4 }); if (L.DomUtil.TRANSITION) { + L.Map.addInitHook(function () { - L.DomEvent.on(this._mapPane, L.DomUtil.TRANSITION_END, this._catchTransitionEnd, this); + // don't animate on browsers without hardware-accelerated transitions or old Android/Opera + this._zoomAnimated = this.options.zoomAnimation && L.DomUtil.TRANSITION && + L.Browser.any3d && !L.Browser.android23 && !L.Browser.mobileOpera; + + // zoom transitions run with the same duration for all layers, so if one of transitionend events + // happens after starting zoom animation (propagating to the map pane), we know that it ended globally + if (this._zoomAnimated) { + L.DomEvent.on(this._mapPane, L.DomUtil.TRANSITION_END, this._catchTransitionEnd, this); + } }); } L.Map.include(!L.DomUtil.TRANSITION ? {} : { - _zoomToIfClose: function (center, zoom) { + _catchTransitionEnd: function () { + if (this._animatingZoom) { + this._onZoomTransitionEnd(); + } + }, + + _tryAnimatedZoom: function (center, zoom, options) { if (this._animatingZoom) { return true; } - if (!this.options.zoomAnimation) { return false; } + options = options || {}; - var scale = this.getZoomScale(zoom), - offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale); + // don't animate if disabled, not supported or zoom difference is too large + if (!this._zoomAnimated || options.animate === false || + Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; } - // if offset does not exceed half of the view - if (!this._offsetIsWithinView(offset, 1)) { return false; } + // offset is the pixel coords of the zoom origin relative to the current center + var scale = this.getZoomScale(zoom), + offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale), + origin = this._getCenterLayerPoint()._add(offset); - L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim'); + // don't animate if the zoom origin isn't within one screen from the current center, unless forced + if (options.animate !== true && !this.getSize().contains(offset)) { return false; } this .fire('movestart') .fire('zoomstart'); - this.fire('zoomanim', { - center: center, - zoom: zoom - }); - - var origin = this._getCenterLayerPoint().add(offset); - - this._prepareTileBg(); - this._runAnimation(center, zoom, scale, origin); + this._animateZoom(center, zoom, origin, scale, null, true); return true; }, - _catchTransitionEnd: function () { - if (this._animatingZoom) { - this._onZoomTransitionEnd(); - } - }, + _animateZoom: function (center, zoom, origin, scale, delta, backwards) { + + this._animatingZoom = true; + + // put transform transition on all layers with leaflet-zoom-animated class + L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim'); - _runAnimation: function (center, zoom, scale, origin, backwardsTransform) { + // remember what center/zoom to set after animation this._animateToCenter = center; this._animateToZoom = zoom; - this._animatingZoom = true; + // disable any dragging during animation if (L.Draggable) { L.Draggable._disabled = true; } - var transform = L.DomUtil.TRANSFORM, - tileBg = this._tileBg; + this.fire('zoomanim', { + center: center, + zoom: zoom, + origin: origin, + scale: scale, + delta: delta, + backwards: backwards + }); + }, + + _onZoomTransitionEnd: function () { - clearTimeout(this._clearTileBgTimer); + this._animatingZoom = false; - L.Util.falseFn(tileBg.offsetWidth); //hack to make sure transform is updated before running animation + L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim'); - var scaleStr = L.DomUtil.getScaleString(scale, origin), - oldTransform = tileBg.style[transform]; + this._resetView(this._animateToCenter, this._animateToZoom, true, true); - tileBg.style[transform] = backwardsTransform ? - oldTransform + ' ' + scaleStr : - scaleStr + ' ' + oldTransform; - }, + if (L.Draggable) { + L.Draggable._disabled = false; + } + } +}); - _prepareTileBg: function () { - var tilePane = this._tilePane, - tileBg = this._tileBg; - // If foreground layer doesn't have many tiles but bg layer does, keep the existing bg layer and just zoom it some more - if (tileBg && this._getLoadedTilesPercentage(tileBg) > 0.5 && - this._getLoadedTilesPercentage(tilePane) < 0.5) { +/* + Zoom animation logic for L.TileLayer. +*/ - tilePane.style.visibility = 'hidden'; - tilePane.empty = true; - this._stopLoadingImages(tilePane); - return; +L.TileLayer.include({ + _animateZoom: function (e) { + var firstFrame = false; + + if (!this._animating) { + this._animating = true; + firstFrame = true; } - if (!tileBg) { - tileBg = this._tileBg = this._createPane('leaflet-tile-pane', this._mapPane); - tileBg.style.zIndex = 1; + if (firstFrame) { + this._prepareBgBuffer(); } - // prepare the background pane to become the main tile pane - tileBg.style[L.DomUtil.TRANSFORM] = ''; - tileBg.style.visibility = 'hidden'; + var bg = this._bgBuffer; - // tells tile layers to reinitialize their containers - tileBg.empty = true; //new FG - tilePane.empty = false; //new BG + if (firstFrame) { + //prevent bg buffer from clearing right after zoom + clearTimeout(this._clearBgBufferTimer); - //Switch out the current layer to be the new bg layer (And vice-versa) - this._tilePane = this._panes.tilePane = tileBg; - var newTileBg = this._tileBg = tilePane; + // hack to make sure transform is updated before running animation + L.Util.falseFn(bg.offsetWidth); + } - L.DomUtil.addClass(newTileBg, 'leaflet-zoom-animated'); + var transform = L.DomUtil.TRANSFORM, + initialTransform = e.delta ? L.DomUtil.getTranslateString(e.delta) : bg.style[transform], + scaleStr = L.DomUtil.getScaleString(e.scale, e.origin); - this._stopLoadingImages(newTileBg); + bg.style[transform] = e.backwards ? + scaleStr + ' ' + initialTransform : + initialTransform + ' ' + scaleStr; + }, + + _endZoomAnim: function () { + var front = this._tileContainer, + bg = this._bgBuffer; + + front.style.visibility = ''; + front.style.zIndex = 2; + + bg.style.zIndex = 1; + + // force reflow + L.Util.falseFn(bg.offsetWidth); + + this._animating = false; + }, + + _clearBgBuffer: function () { + var map = this._map; + + if (map && !map._animatingZoom && !map.touchZoom._zooming) { + this._bgBuffer.innerHTML = ''; + this._bgBuffer.style[L.DomUtil.TRANSFORM] = ''; + } + }, + + _prepareBgBuffer: function () { + + var front = this._tileContainer, + bg = this._bgBuffer; + + // if foreground layer doesn't have many tiles but bg layer does, + // keep the existing bg layer and just zoom it some more + + var bgLoaded = this._getLoadedTilesPercentage(bg), + frontLoaded = this._getLoadedTilesPercentage(front); + + if (bg && bgLoaded > 0.5 && frontLoaded < 0.5) { + + front.style.visibility = 'hidden'; + this._stopLoadingImages(front); + return; + } + + // prepare the buffer to become the front tile pane + bg.style.visibility = 'hidden'; + bg.style[L.DomUtil.TRANSFORM] = ''; + + // switch out the current layer to be the new bg layer (and vice-versa) + this._tileContainer = bg; + bg = this._bgBuffer = front; + + this._stopLoadingImages(bg); }, _getLoadedTilesPercentage: function (container) { @@ -8217,32 +8779,6 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : { tile.parentNode.removeChild(tile); } } - }, - - _onZoomTransitionEnd: function () { - this._restoreTileFront(); - - L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim'); - L.Util.falseFn(this._tileBg.offsetWidth); // force reflow - this._animatingZoom = false; - this._resetView(this._animateToCenter, this._animateToZoom, true, true); - - if (L.Draggable) { - L.Draggable._disabled = false; - } - }, - - _restoreTileFront: function () { - this._tilePane.innerHTML = ''; - this._tilePane.style.visibility = ''; - this._tilePane.style.zIndex = 2; - this._tileBg.style.zIndex = 1; - }, - - _clearTileBg: function () { - if (!this._animatingZoom && !this.touchZoom._zooming) { - this._tileBg.innerHTML = ''; - } } }); @@ -8263,12 +8799,12 @@ L.Map.include({ locate: function (/*Object*/ options) { - options = this._locationOptions = L.extend(this._defaultLocateOptions, options); + options = this._locateOptions = L.extend(this._defaultLocateOptions, options); if (!navigator.geolocation) { this._handleGeolocationError({ code: 0, - message: "Geolocation not supported." + message: 'Geolocation not supported.' }); return this; } @@ -8289,51 +8825,61 @@ L.Map.include({ if (navigator.geolocation) { navigator.geolocation.clearWatch(this._locationWatchId); } + if (this._locateOptions) { + this._locateOptions.setView = false; + } return this; }, _handleGeolocationError: function (error) { var c = error.code, message = error.message || - (c === 1 ? "permission denied" : - (c === 2 ? "position unavailable" : "timeout")); + (c === 1 ? 'permission denied' : + (c === 2 ? 'position unavailable' : 'timeout')); - if (this._locationOptions.setView && !this._loaded) { + if (this._locateOptions.setView && !this._loaded) { this.fitWorld(); } this.fire('locationerror', { code: c, - message: "Geolocation error: " + message + "." + message: 'Geolocation error: ' + message + '.' }); }, _handleGeolocationResponse: function (pos) { - var latAccuracy = 180 * pos.coords.accuracy / 4e7, - lngAccuracy = latAccuracy * 2, - - lat = pos.coords.latitude, + var lat = pos.coords.latitude, lng = pos.coords.longitude, latlng = new L.LatLng(lat, lng), - sw = new L.LatLng(lat - latAccuracy, lng - lngAccuracy), - ne = new L.LatLng(lat + latAccuracy, lng + lngAccuracy), - bounds = new L.LatLngBounds(sw, ne), + latAccuracy = 180 * pos.coords.accuracy / 40075017, + lngAccuracy = latAccuracy / Math.cos(L.LatLng.DEG_TO_RAD * lat), + + bounds = L.latLngBounds( + [lat - latAccuracy, lng - lngAccuracy], + [lat + latAccuracy, lng + lngAccuracy]), - options = this._locationOptions; + options = this._locateOptions; if (options.setView) { var zoom = Math.min(this.getBoundsZoom(bounds), options.maxZoom); this.setView(latlng, zoom); } - this.fire('locationfound', { + var data = { latlng: latlng, bounds: bounds, - accuracy: pos.coords.accuracy - }); + }; + + for (var i in pos.coords) { + if (typeof pos.coords[i] === 'number') { + data[i] = pos.coords[i]; + } + } + + this.fire('locationfound', data); } }); -}(this, document)); \ No newline at end of file +}(window, document)); \ No newline at end of file -- 2.39.5