Permalinks for directions

[rails.git] / vendor / assets / leaflet / leaflet.js

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index 90c52bddf32ee8e8df5bebc0d8e0a4135b55931d..e40bfbfafdc09a82ee0b89c519f939a587a801ef 100644 (file)
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -1,39 +1,45 @@
 /*
 /*

- Copyright (c) 2010-2012, CloudMade, Vladimir Agafonkin
- Leaflet is an open-source JavaScript library for mobile-friendly interactive maps.
- http://leaflet.cloudmade.com
+ Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com
+ (c) 2010-2013, Vladimir Agafonkin
+ (c) 2010-2011, CloudMade

 */
 */

-(function (window, undefined) {
+(function (window, document, undefined) {
+var oldL = window.L,
+    L = {};

 
 

-var L, originalL;
+L.version = '0.7.2';

 
 

-if (typeof exports !== undefined + '') {
-       L = exports;
-} else {
-       originalL = window.L;
-       L = {};
+// define Leaflet for Node module pattern loaders, including Browserify
+if (typeof module === 'object' && typeof module.exports === 'object') {
+       module.exports = L;

 
 

-       L.noConflict = function () {
-               window.L = originalL;
-               return this;
-       };
-
-       window.L = L;
+// define Leaflet as an AMD module
+} else if (typeof define === 'function' && define.amd) {
+       define(L);

 }
 
 }
 

-L.version = '0.4.4';
+// 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;

 
 
 /*
 
 
 /*

- * L.Util is a namespace for various utility functions.
+ * L.Util contains various utility functions used throughout Leaflet code.

  */
 
 L.Util = {
  */
 
 L.Util = {

-       extend: function (/*Object*/ dest) /*-> Object*/ {      // merge src properties into dest
-               var sources = Array.prototype.slice.call(arguments, 1);
-               for (var j = 0, len = sources.length, src; j < len; j++) {
+       extend: function (dest) { // (Object[, Object, ...]) ->
+               var sources = Array.prototype.slice.call(arguments, 1),
+                   i, j, len, src;
+
+               for (j = 0, len = sources.length; j < len; j++) {

                        src = sources[j] || {};
                        src = sources[j] || {};

-                       for (var i in src) {
+                       for (i in src) {

                                if (src.hasOwnProperty(i)) {
                                        dest[i] = src[i];
                                }
                                if (src.hasOwnProperty(i)) {
                                        dest[i] = src[i];
                                }


@@ -50,13 +56,29 @@ L.Util = {
        },
 
        stamp: (function () {
        },
 
        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];
                };
        }()),
 
                        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;
 
        limitExecByInterval: function (fn, time, context) {
                var lock, execOnUnlock;
 


@@ -92,35 +114,42 @@ L.Util = {
                return Math.round(num * pow) / pow;
        },
 
                return Math.round(num * pow) / pow;
        },
 

+       trim: function (str) {
+               return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
+       },
+

        splitWords: function (str) {
        splitWords: function (str) {

-               return str.replace(/^\s+|\s+$/g, '').split(/\s+/);
+               return L.Util.trim(str).split(/\s+/);

        },
 
        setOptions: function (obj, options) {
        },
 
        setOptions: function (obj, options) {

-               obj.options = L.Util.extend({}, obj.options, options);
+               obj.options = L.extend({}, obj.options, options);

                return obj.options;
        },
 
                return obj.options;
        },
 

-       getParamString: function (obj) {
+       getParamString: function (obj, existingUrl, uppercase) {

                var params = [];
                for (var i in obj) {
                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 '?' + params.join('&');
+               return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');

        },
        },

-

        template: function (str, data) {
                return str.replace(/\{ *([\w_]+) *\}/g, function (str, key) {
                        var value = data[key];
        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);
                                throw new Error('No value provided for variable ' + str);

+                       } else if (typeof value === 'function') {
+                               value = value(data);

                        }
                        return value;
                });
        },
 
                        }
                        return value;
                });
        },
 

+       isArray: Array.isArray || function (obj) {
+               return (Object.prototype.toString.call(obj) === '[object Array]');
+       },
+

        emptyImageUrl: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
 };
 
        emptyImageUrl: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
 };
 


@@ -130,7 +159,7 @@ L.Util = {
 
        function getPrefixed(name) {
                var i, fn,
 
        function getPrefixed(name) {
                var i, fn,

-                       prefixes = ['webkit', 'moz', 'o', 'ms'];
+                   prefixes = ['webkit', 'moz', 'o', 'ms'];

 
                for (i = 0; i < prefixes.length && !fn; i++) {
                        fn = window[prefixes[i] + name];
 
                for (i = 0; i < prefixes.length && !fn; i++) {
                        fn = window[prefixes[i] + name];


@@ -143,25 +172,23 @@ L.Util = {
 
        function timeoutDefer(fn) {
                var time = +new Date(),
 
        function timeoutDefer(fn) {
                var time = +new Date(),

-                       timeToCall = Math.max(0, 16 - (time - lastTime));
+                   timeToCall = Math.max(0, 16 - (time - lastTime));

 
                lastTime = time + timeToCall;
                return window.setTimeout(fn, timeToCall);
        }
 
        var requestFn = window.requestAnimationFrame ||
 
                lastTime = time + timeToCall;
                return window.setTimeout(fn, timeToCall);
        }
 
        var requestFn = window.requestAnimationFrame ||

-                       getPrefixed('RequestAnimationFrame') || timeoutDefer;
+               getPrefixed('RequestAnimationFrame') || timeoutDefer;

 
        var cancelFn = window.cancelAnimationFrame ||
 
        var cancelFn = window.cancelAnimationFrame ||

-                       getPrefixed('CancelAnimationFrame') ||
-                       getPrefixed('CancelRequestAnimationFrame') ||
-                       function (id) {
-                               window.clearTimeout(id);
-                       };
+               getPrefixed('CancelAnimationFrame') ||
+               getPrefixed('CancelRequestAnimationFrame') ||
+               function (id) { window.clearTimeout(id); };

 
 
        L.Util.requestAnimFrame = function (fn, context, immediate, element) {
 
 
        L.Util.requestAnimFrame = function (fn, context, immediate, element) {

-               fn = L.Util.bind(fn, context);
+               fn = L.bind(fn, context);

 
                if (immediate && requestFn === timeoutDefer) {
                        fn();
 
                if (immediate && requestFn === timeoutDefer) {
                        fn();


@@ -178,20 +205,34 @@ L.Util = {
 
 }());
 
 
 }());
 

+// shortcuts for most used utility functions
+L.extend = L.Util.extend;
+L.bind = L.Util.bind;
+L.stamp = L.Util.stamp;
+L.setOptions = L.Util.setOptions;
+

 
 /*
 
 /*

- * Class powers the OOP facilities of the library. Thanks to John Resig and Dean Edwards for inspiration!
+ * L.Class powers the OOP facilities of the library.
+ * Thanks to John Resig and Dean Edwards for inspiration!

  */
 
 L.Class = function () {};
 
  */
 
 L.Class = function () {};
 

-L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
+L.Class.extend = function (props) {

 
        // extended class with the new prototype
        var NewClass = function () {
 
        // extended class with the new prototype
        var NewClass = function () {

+
+               // call the constructor

                if (this.initialize) {
                        this.initialize.apply(this, arguments);
                }
                if (this.initialize) {
                        this.initialize.apply(this, arguments);
                }

+
+               // call all constructor hooks
+               if (this._initHooks) {
+                       this.callInitHooks();
+               }

        };
 
        // instantiate class without calling constructor
        };
 
        // instantiate class without calling constructor


@@ -212,7 +253,7 @@ L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
 
        // mix static properties into the class
        if (props.statics) {
 
        // mix static properties into the class
        if (props.statics) {

-               L.Util.extend(NewClass, props.statics);
+               L.extend(NewClass, props.statics);

                delete props.statics;
        }
 
                delete props.statics;
        }
 


@@ -224,11 +265,33 @@ L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
 
        // merge options
        if (props.options && proto.options) {
 
        // merge options
        if (props.options && proto.options) {

-               props.options = L.Util.extend({}, proto.options, props.options);
+               props.options = L.extend({}, proto.options, props.options);

        }
 
        // mix given properties into the prototype
        }
 
        // mix given properties into the prototype

-       L.Util.extend(proto, props);
+       L.extend(proto, props);
+
+       proto._initHooks = [];
+
+       var parent = this;
+       // jshint camelcase: false
+       NewClass.__super__ = parent.prototype;
+
+       // add method for calling all hooks
+       proto.callInitHooks = function () {
+
+               if (this._initHooksCalled) { return; }
+
+               if (parent.prototype.callInitHooks) {
+                       parent.prototype.callInitHooks.call(this);
+               }
+
+               this._initHooksCalled = true;
+
+               for (var i = 0, len = proto._initHooks.length; i < len; i++) {
+                       proto._initHooks[i].call(this);
+               }
+       };

 
        return NewClass;
 };
 
        return NewClass;
 };


@@ -236,87 +299,147 @@ L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
 
 // method for adding properties to prototype
 L.Class.include = function (props) {
 
 // method for adding properties to prototype
 L.Class.include = function (props) {

-       L.Util.extend(this.prototype, props);
+       L.extend(this.prototype, props);

 };
 
 };
 

+// merge new default options to the Class

 L.Class.mergeOptions = function (options) {
 L.Class.mergeOptions = function (options) {

-       L.Util.extend(this.prototype.options, options);
+       L.extend(this.prototype.options, options);
+};
+
+// add a constructor hook
+L.Class.addInitHook = function (fn) { // (Function) || (String, args...)
+       var args = Array.prototype.slice.call(arguments, 1);
+
+       var init = typeof fn === 'function' ? fn : function () {
+               this[fn].apply(this, args);
+       };
+
+       this.prototype._initHooks = this.prototype._initHooks || [];
+       this.prototype._initHooks.push(init);

 };
 
 };
 

+

 /*
 /*

- * L.Mixin.Events adds custom events functionality to Leaflet classes
+ * 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 = {
 
 L.Mixin = {};
 
 L.Mixin.Events = {

-       
+

        addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object])
        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 && context !== this && L.stamp(context),
+                   i, len, event, type, indexKey, indexLenKey, typeIndex;
+
+               // types can be a string of space-separated words

                types = L.Util.splitWords(types);
                types = L.Util.splitWords(types);

-               
+

                for (i = 0, len = types.length; i < len; i++) {
                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
                                action: fn,
                                context: context || this

-                       });
+                       };
+                       type = types[i];
+
+                       if (contextId) {
+                               // 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 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;
                }
                        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 && context !== this && 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++) {
                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 (!fn) {
+                               // clear all listeners for a type if function isn't specified
+                               delete events[type];
+                               delete events[indexKey];
+                               delete events[indexLenKey];
+
+                       } else {
+                               listeners = contextId && 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;
+                                               }
+                                       }

 
 

-                       if (this.hasEventListeners(types[i])) {
-                               listeners = events[types[i]];
-                               
-                               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]--;

                                        }
                                }
                        }
                }
                                        }
                                }
                        }
                }

-               
+
+               return this;
+       },
+
+       clearAllEventListeners: function () {
+               delete this[eventsKey];

                return this;
        },
 
                return this;
        },
 


@@ -325,67 +448,108 @@ L.Mixin.Events = {
                        return this;
                }
 
                        return this;
                }
 

-               var event = L.Util.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, event);
+                       }
+               }

 
 

-               var listeners = this[key][type].slice();
+               // fire event for the context-indexed listeners as well
+               typeIndex = events[type + '_idx'];

 
 

-               for (var i = 0, len = listeners.length; i < len; i++) {
-                       listeners[i].action.call(listeners[i].context || this, event);
+               for (contextId in typeIndex) {
+                       listeners = typeIndex[contextId].slice();
+
+                       if (listeners) {
+                               for (i = 0, len = listeners.length; i < len; i++) {
+                                       listeners[i].action.call(listeners[i].context, event);
+                               }
+                       }

                }
 
                return this;
                }
 
                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.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;
 
 
 L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
 
 

+/*
+ * L.Browser handles different browser and feature detections for internal Leaflet use.
+ */
+

 (function () {
 
 (function () {
 

-       var ie = !!window.ActiveXObject,
-               // http://tanalin.com/en/articles/ie-version-js/
-               ie6 = ie && !window.XMLHttpRequest,
-               ie7 = ie && !document.querySelector,
+       var ie = 'ActiveXObject' in window,
+               ielt9 = ie && !document.addEventListener,

 
 

-               // terrible browser detection to work around Safari / iOS / Android browser bugs
-               // see TileLayer._addTile and debug/hacks/jitter.html
+           // 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,
+               gecko = ua.indexOf('gecko') !== -1,

 
 

-               ua = navigator.userAgent.toLowerCase(),
-               webkit = ua.indexOf("webkit") !== -1,
-               chrome = ua.indexOf("chrome") !== -1,
-               android = ua.indexOf("android") !== -1,
-               android23 = ua.search("android [23]") !== -1,
+           mobile = typeof orientation !== undefined + '',
+           msPointer = window.navigator && window.navigator.msPointerEnabled &&
+                     window.navigator.msMaxTouchPoints && !window.PointerEvent,
+               pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) ||
+                                 msPointer,
+           retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
+                    ('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
+                     window.matchMedia('(min-resolution:144dpi)').matches),

 
 

-               mobile = typeof orientation !== undefined + '',
-               msTouch = (window.navigator && window.navigator.msPointerEnabled && window.navigator.msMaxTouchPoints),
-               retina = (('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
-                               ('matchMedia' in window && window.matchMedia("(min-resolution:144dpi)").matches)),
+           doc = document.documentElement,
+           ie3d = ie && ('transition' in doc.style),
+           webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()) && !android23,
+           gecko3d = 'MozPerspective' in doc.style,
+           opera3d = 'OTransition' in doc.style,
+           any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d) && !phantomjs;

 
 

-               doc = document.documentElement,
-               ie3d = ie && ('transition' in doc.style),
-               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);

 
 

+       // 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';
 
 
                var startName = 'ontouchstart';
 

-               // IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.MsTouch) or WebKit, etc.
-               if (msTouch || (startName in doc)) {
+               // IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.Pointer) or WebKit, etc.
+               if (pointer || (startName in doc)) {

                        return true;
                }
 
                // Firefox/Gecko
                var div = document.createElement('div'),
                        return true;
                }
 
                // Firefox/Gecko
                var div = document.createElement('div'),

-                       supported = false;
+                   supported = false;

 
                if (!div.setAttribute) {
                        return false;
 
                if (!div.setAttribute) {
                        return false;


@@ -404,9 +568,10 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
 
 
        L.Browser = {
 
 
        L.Browser = {

-               ie6: ie6,
-               ie7: ie7,
+               ie: ie,
+               ielt9: ielt9,

                webkit: webkit,
                webkit: webkit,

+               gecko: gecko && !webkit && !window.opera && !ie,

 
                android: android,
                android23: android23,
 
                android: android,
                android23: android23,


@@ -425,7 +590,8 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
                mobileOpera: mobile && window.opera,
 
                touch: touch,
                mobileOpera: mobile && window.opera,
 
                touch: touch,

-               msTouch: msTouch,
+               msPointer: msPointer,
+               pointer: pointer,

 
                retina: retina
        };
 
                retina: retina
        };


@@ -514,15 +680,29 @@ L.Point.prototype = {
                point = L.point(point);
 
                var x = point.x - this.x,
                point = L.point(point);
 
                var x = point.x - this.x,

-                       y = point.y - this.y;
+                   y = point.y - this.y;

 
                return Math.sqrt(x * x + y * y);
        },
 
 
                return Math.sqrt(x * x + y * y);
        },
 

+       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(' +
        toString: function () {
                return 'Point(' +

-                               L.Util.formatNum(this.x) + ', ' +
-                               L.Util.formatNum(this.y) + ')';
+                       L.Util.formatNum(this.x) + ', ' +
+                       L.Util.formatNum(this.y) + ')';

        }
 };
 
        }
 };
 


@@ -530,10 +710,10 @@ L.point = function (x, y, round) {
        if (x instanceof L.Point) {
                return x;
        }
        if (x instanceof L.Point) {
                return x;
        }

-       if (x instanceof Array) {
+       if (L.Util.isArray(x)) {

                return new L.Point(x[0], x[1]);
        }
                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);
                return x;
        }
        return new L.Point(x, y, round);


@@ -544,18 +724,17 @@ L.point = function (x, y, round) {
  * L.Bounds represents a rectangular area on the screen in pixel coordinates.
  */
 
  * L.Bounds represents a rectangular area on the screen in pixel coordinates.
  */
 

-L.Bounds = L.Class.extend({
+L.Bounds = function (a, b) { //(Point, Point) or Point[]
+       if (!a) { return; }

 
 

-       initialize: function (a, b) {   //(Point, Point) or Point[]
-               if (!a) { return; }
+       var points = b ? [a, b] : a;

 
 

-               var points = b ? [a, b] : a;
-
-               for (var i = 0, len = points.length; i < len; i++) {
-                       this.extend(points[i]);
-               }
-       },
+       for (var i = 0, len = points.length; i < len; i++) {
+               this.extend(points[i]);
+       }
+};

 
 

+L.Bounds.prototype = {

        // extend the bounds to contain the given point
        extend: function (point) { // (Point)
                point = L.point(point);
        // extend the bounds to contain the given point
        extend: function (point) { // (Point)
                point = L.point(point);


@@ -574,8 +753,8 @@ L.Bounds = L.Class.extend({
 
        getCenter: function (round) { // (Boolean) -> Point
                return new L.Point(
 
        getCenter: function (round) { // (Boolean) -> Point
                return new L.Point(

-                               (this.min.x + this.max.x) / 2,
-                               (this.min.y + this.max.y) / 2, round);
+                       (this.min.x + this.max.x) / 2,
+                       (this.min.y + this.max.y) / 2, round);

        },
 
        getBottomLeft: function () { // -> Point
        },
 
        getBottomLeft: function () { // -> Point


@@ -586,6 +765,10 @@ L.Bounds = L.Class.extend({
                return new L.Point(this.max.x, this.min.y);
        },
 
                return new L.Point(this.max.x, this.min.y);
        },
 

+       getSize: function () {
+               return this.max.subtract(this.min);
+       },
+

        contains: function (obj) { // (Bounds) or (Point) -> Boolean
                var min, max;
 
        contains: function (obj) { // (Bounds) or (Point) -> Boolean
                var min, max;
 


@@ -603,21 +786,20 @@ L.Bounds = L.Class.extend({
                }
 
                return (min.x >= this.min.x) &&
                }
 
                return (min.x >= this.min.x) &&

-                               (max.x <= this.max.x) &&
-                               (min.y >= this.min.y) &&
-                               (max.y <= this.max.y);
+                      (max.x <= this.max.x) &&
+                      (min.y >= this.min.y) &&
+                      (max.y <= this.max.y);

        },
 
        intersects: function (bounds) { // (Bounds) -> Boolean
                bounds = L.bounds(bounds);
 
                var min = this.min,
        },
 
        intersects: function (bounds) { // (Bounds) -> Boolean
                bounds = L.bounds(bounds);
 
                var min = this.min,

-                       max = this.max,
-                       min2 = bounds.min,
-                       max2 = bounds.max;
-
-               var xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
-                       yIntersects = (max2.y >= min.y) && (min2.y <= max.y);
+                   max = this.max,
+                   min2 = bounds.min,
+                   max2 = bounds.max,
+                   xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
+                   yIntersects = (max2.y >= min.y) && (min2.y <= max.y);

 
                return xIntersects && yIntersects;
        },
 
                return xIntersects && yIntersects;
        },


@@ -625,7 +807,7 @@ L.Bounds = L.Class.extend({
        isValid: function () {
                return !!(this.min && this.max);
        }
        isValid: function () {
                return !!(this.min && this.max);
        }

-});
+};

 
 L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[])
        if (!a || a instanceof L.Bounds) {
 
 L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[])
        if (!a || a instanceof L.Bounds) {


@@ -639,33 +821,33 @@ L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[])
  * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix.
  */
 
  * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix.
  */
 

-L.Transformation = L.Class.extend({
-       initialize: function (/*Number*/ a, /*Number*/ b, /*Number*/ c, /*Number*/ d) {
-               this._a = a;
-               this._b = b;
-               this._c = c;
-               this._d = d;
-       },
+L.Transformation = function (a, b, c, d) {
+       this._a = a;
+       this._b = b;
+       this._c = c;
+       this._d = d;
+};

 
 

-       transform: function (point, scale) {
+L.Transformation.prototype = {
+       transform: function (point, scale) { // (Point, Number) -> Point

                return this._transform(point.clone(), scale);
        },
 
        // destructive transform (faster)
                return this._transform(point.clone(), scale);
        },
 
        // destructive transform (faster)

-       _transform: function (/*Point*/ point, /*Number*/ scale) /*-> Point*/ {
+       _transform: function (point, scale) {

                scale = scale || 1;
                point.x = scale * (this._a * point.x + this._b);
                point.y = scale * (this._c * point.y + this._d);
                return point;
        },
 
                scale = scale || 1;
                point.x = scale * (this._a * point.x + this._b);
                point.y = scale * (this._c * point.y + this._d);
                return point;
        },
 

-       untransform: function (/*Point*/ point, /*Number*/ scale) /*-> Point*/ {
+       untransform: function (point, scale) {

                scale = scale || 1;
                return new L.Point(
                scale = scale || 1;
                return new L.Point(

-                       (point.x / scale - this._b) / this._a,
-                       (point.y / scale - this._d) / this._c);
+                       (point.x / scale - this._b) / this._a,
+                       (point.y / scale - this._d) / this._c);

        }
        }

-});
+};

 
 
 /*
 
 
 /*


@@ -696,24 +878,45 @@ L.DomUtil = {
        getViewportOffset: function (element) {
 
                var top = 0,
        getViewportOffset: function (element) {
 
                var top = 0,

-                       left = 0,
-                       el = element,
-                       docBody = document.body,
-                       pos,
-                       ie7 = L.Browser.ie7;
+                   left = 0,
+                   el = element,
+                   docBody = document.body,
+                   docEl = document.documentElement,
+                   pos;

 
                do {
                        top  += el.offsetTop  || 0;
                        left += el.offsetLeft || 0;
 
                do {
                        top  += el.offsetTop  || 0;
                        left += el.offsetLeft || 0;

+
+                       //add borders
+                       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') {
                        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;
                        }
                                break;
                        }

+

                        el = el.offsetParent;
 
                } while (el);
                        el = el.offsetParent;
 
                } while (el);


@@ -726,18 +929,6 @@ L.DomUtil = {
                        top  -= el.scrollTop  || 0;
                        left -= el.scrollLeft || 0;
 
                        top  -= el.scrollTop  || 0;
                        left -= el.scrollLeft || 0;
 

-                       //Webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
-                       // https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
-                       if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
-                               left += el.scrollWidth - el.clientWidth;
-
-                               //ie7 shows the scrollbar by default and provides clientWidth counting it, so we need to add it back in if it is visible
-                               // Scrollbar is on the left as we are RTL
-                               if (ie7 && L.DomUtil.getStyle(el, 'overflow-y') !== 'hidden' && L.DomUtil.getStyle(el, 'overflow') !== 'hidden') {
-                                       left += 17;
-                               }
-                       }
-

                        el = el.parentNode;
                } while (el);
 
                        el = el.parentNode;
                } while (el);
 


@@ -747,7 +938,7 @@ L.DomUtil = {
        documentIsLtr: function () {
                if (!L.DomUtil._docIsLtrCached) {
                        L.DomUtil._docIsLtrCached = true;
        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;
        },
                }
                return L.DomUtil._docIsLtr;
        },


@@ -764,44 +955,45 @@ L.DomUtil = {
                return el;
        },
 
                return el;
        },
 

-       disableTextSelection: function () {
-               if (document.selection && document.selection.empty) {
-                       document.selection.empty();
-               }
-               if (!this._onselectstart) {
-                       this._onselectstart = document.onselectstart;
-                       document.onselectstart = L.Util.falseFn;
-               }
-       },
-
-       enableTextSelection: function () {
-               if (document.onselectstart === L.Util.falseFn) {
-                       document.onselectstart = this._onselectstart;
-                       this._onselectstart = null;
-               }
-       },
-

        hasClass: function (el, name) {
        hasClass: function (el, name) {

-               return (el.className.length > 0) &&
-                               new RegExp("(^|\\s)" + name + "(\\s|$)").test(el.className);
+               if (el.classList !== undefined) {
+                       return el.classList.contains(name);
+               }
+               var className = L.DomUtil._getClass(el);
+               return className.length > 0 && new RegExp('(^|\\s)' + name + '(\\s|$)').test(className);

        },
 
        addClass: function (el, name) {
        },
 
        addClass: function (el, name) {

-               if (!L.DomUtil.hasClass(el, name)) {
-                       el.className += (el.className ? ' ' : '') + name;
+               if (el.classList !== undefined) {
+                       var classes = L.Util.splitWords(name);
+                       for (var i = 0, len = classes.length; i < len; i++) {
+                               el.classList.add(classes[i]);
+                       }
+               } else if (!L.DomUtil.hasClass(el, name)) {
+                       var className = L.DomUtil._getClass(el);
+                       L.DomUtil._setClass(el, (className ? className + ' ' : '') + name);

                }
        },
 
        removeClass: function (el, name) {
                }
        },
 
        removeClass: function (el, name) {

+               if (el.classList !== undefined) {
+                       el.classList.remove(name);
+               } else {
+                       L.DomUtil._setClass(el, L.Util.trim((' ' + L.DomUtil._getClass(el) + ' ').replace(' ' + name + ' ', ' ')));
+               }
+       },

 
 

-               function replaceFn(w, match) {
-                       if (match === name) { return ''; }
-                       return w;
+       _setClass: function (el, name) {
+               if (el.className.baseVal === undefined) {
+                       el.className = name;
+               } else {
+                       // in case of SVG element
+                       el.className.baseVal = name;

                }
                }

+       },

 
 

-               el.className = el.className
-                               .replace(/(\S+)\s*/g, replaceFn)
-                               .replace(/(^\s+|\s+$)/, '');
+       _getClass: function (el) {
+               return el.className.baseVal === undefined ? el.className : el.className.baseVal;

        },
 
        setOpacity: function (el, value) {
        },
 
        setOpacity: function (el, value) {


@@ -812,10 +1004,16 @@ L.DomUtil = {
                } else if ('filter' in el.style) {
 
                        var filter = false,
                } else if ('filter' in el.style) {
 
                        var filter = false,

-                               filterName = 'DXImageTransform.Microsoft.Alpha';
+                           filterName = 'DXImageTransform.Microsoft.Alpha';

 
                        // filters collection throws an error if we try to retrieve a filter that doesn't exist
 
                        // 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);
 
 
                        value = Math.round(value * 100);
 


@@ -846,8 +1044,8 @@ L.DomUtil = {
                // (same speed either way), Opera 12 doesn't support translate3d
 
                var is3d = L.Browser.webkit3d,
                // (same speed either way), Opera 12 doesn't support translate3d
 
                var is3d = L.Browser.webkit3d,

-                       open = 'translate' + (is3d ? '3d' : '') + '(',
-                       close = (is3d ? ',0' : '') + ')';
+                   open = 'translate' + (is3d ? '3d' : '') + '(',
+                   close = (is3d ? ',0' : '') + ')';

 
                return open + point.x + 'px,' + point.y + 'px' + close;
        },
 
                return open + point.x + 'px,' + point.y + 'px' + close;
        },


@@ -862,15 +1060,11 @@ L.DomUtil = {
 
        setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean])
 
 
        setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean])
 

+               // jshint camelcase: false

                el._leaflet_pos = point;
 
                if (!disable3D && L.Browser.any3d) {
                        el.style[L.DomUtil.TRANSFORM] =  L.DomUtil.getTranslateString(point);
                el._leaflet_pos = point;
 
                if (!disable3D && L.Browser.any3d) {
                        el.style[L.DomUtil.TRANSFORM] =  L.DomUtil.getTranslateString(point);

-
-                       // workaround for Android 2/3 stability (https://github.com/CloudMade/Leaflet/issues/69)
-                       if (L.Browser.mobileWebkit3d) {
-                               el.style.WebkitBackfaceVisibility = 'hidden';
-                       }

                } else {
                        el.style.left = point.x + 'px';
                        el.style.top = point.y + 'px';
                } else {
                        el.style.left = point.x + 'px';
                        el.style.top = point.y + 'px';


@@ -880,6 +1074,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
        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;
        }
 };
                return el._leaflet_pos;
        }
 };


@@ -888,38 +1084,84 @@ L.DomUtil = {
 // prefix style property names
 
 L.DomUtil.TRANSFORM = L.DomUtil.testProp(
 // prefix style property names
 
 L.DomUtil.TRANSFORM = L.DomUtil.testProp(

-               ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+        ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+
+// webkitTransition comes first because some browser versions that drop vendor prefix don't do
+// the same for the transitionend event, in particular the Android 4.1 stock browser

 
 L.DomUtil.TRANSITION = L.DomUtil.testProp(
 
 L.DomUtil.TRANSITION = L.DomUtil.testProp(

-               ['transition', 'webkitTransition', 'OTransition', 'MozTransition', 'msTransition']);
+        ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);

 
 L.DomUtil.TRANSITION_END =
 
 L.DomUtil.TRANSITION_END =

-               L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?
-               L.DomUtil.TRANSITION + 'End' : 'transitionend';
+        L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?
+        L.DomUtil.TRANSITION + 'End' : 'transitionend';
+
+(function () {
+    if ('onselectstart' in document) {
+        L.extend(L.DomUtil, {
+            disableTextSelection: function () {
+                L.DomEvent.on(window, 'selectstart', L.DomEvent.preventDefault);
+            },
+
+            enableTextSelection: function () {
+                L.DomEvent.off(window, 'selectstart', L.DomEvent.preventDefault);
+            }
+        });
+    } else {
+        var userSelectProperty = L.DomUtil.testProp(
+            ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
+
+        L.extend(L.DomUtil, {
+            disableTextSelection: function () {
+                if (userSelectProperty) {
+                    var style = document.documentElement.style;
+                    this._userSelect = style[userSelectProperty];
+                    style[userSelectProperty] = 'none';
+                }
+            },
+
+            enableTextSelection: function () {
+                if (userSelectProperty) {
+                    document.documentElement.style[userSelectProperty] = this._userSelect;
+                    delete this._userSelect;
+                }
+            }
+        });
+    }
+
+       L.extend(L.DomUtil, {
+               disableImageDrag: function () {
+                       L.DomEvent.on(window, 'dragstart', L.DomEvent.preventDefault);
+               },
+
+               enableImageDrag: function () {
+                       L.DomEvent.off(window, 'dragstart', L.DomEvent.preventDefault);
+               }
+       });
+})();

 
 
 /*
 
 
 /*

-       CM.LatLng represents a geographical point with latitude and longtitude coordinates.
-*/
+ * L.LatLng represents a geographical point with latitude and longitude coordinates.
+ */

 
 

-L.LatLng = function (rawLat, rawLng, noWrap) { // (Number, Number[, Boolean])
-       var lat = parseFloat(rawLat),
-               lng = parseFloat(rawLng);
+L.LatLng = function (lat, lng, alt) { // (Number, Number, Number)
+       lat = parseFloat(lat);
+       lng = parseFloat(lng);

 
        if (isNaN(lat) || isNaN(lng)) {
 
        if (isNaN(lat) || isNaN(lng)) {

-               throw new Error('Invalid LatLng object: (' + rawLat + ', ' + rawLng + ')');
-       }
-
-       if (noWrap !== true) {
-               lat = Math.max(Math.min(lat, 90), -90);                                 // clamp latitude into -90..90
-               lng = (lng + 180) % 360 + ((lng < -180 || lng === 180) ? 180 : -180);   // wrap longtitude into -180..180
+               throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');

        }
 
        this.lat = lat;
        this.lng = lng;
        }
 
        this.lat = lat;
        this.lng = lng;

+
+       if (alt !== undefined) {
+               this.alt = parseFloat(alt);
+       }

 };
 
 };
 

-L.Util.extend(L.LatLng, {
+L.extend(L.LatLng, {

        DEG_TO_RAD: Math.PI / 180,
        RAD_TO_DEG: 180 / Math.PI,
        MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check
        DEG_TO_RAD: Math.PI / 180,
        RAD_TO_DEG: 180 / Math.PI,
        MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check


@@ -931,46 +1173,71 @@ L.LatLng.prototype = {
 
                obj = L.latLng(obj);
 
 
                obj = L.latLng(obj);
 

-               var margin = Math.max(Math.abs(this.lat - obj.lat), Math.abs(this.lng - obj.lng));
+               var margin = Math.max(
+                       Math.abs(this.lat - obj.lat),
+                       Math.abs(this.lng - obj.lng));
+

                return margin <= L.LatLng.MAX_MARGIN;
        },
 
                return margin <= L.LatLng.MAX_MARGIN;
        },
 

-       toString: function (precision) { // -> String
+       toString: function (precision) { // (Number) -> String

                return 'LatLng(' +
                return 'LatLng(' +

-                               L.Util.formatNum(this.lat, precision) + ', ' +
-                               L.Util.formatNum(this.lng, precision) + ')';
+                       L.Util.formatNum(this.lat, precision) + ', ' +
+                       L.Util.formatNum(this.lng, precision) + ')';

        },
 
        // Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula
        },
 
        // Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula

+       // TODO move to projection code, LatLng shouldn't know about Earth

        distanceTo: function (other) { // (LatLng) -> Number
                other = L.latLng(other);
 
                var R = 6378137, // earth radius in meters
        distanceTo: function (other) { // (LatLng) -> Number
                other = L.latLng(other);
 
                var R = 6378137, // earth radius in meters

-                       d2r = L.LatLng.DEG_TO_RAD,
-                       dLat = (other.lat - this.lat) * d2r,
-                       dLon = (other.lng - this.lng) * d2r,
-                       lat1 = this.lat * d2r,
-                       lat2 = other.lat * d2r,
-                       sin1 = Math.sin(dLat / 2),
-                       sin2 = Math.sin(dLon / 2);
+                   d2r = L.LatLng.DEG_TO_RAD,
+                   dLat = (other.lat - this.lat) * d2r,
+                   dLon = (other.lng - this.lng) * d2r,
+                   lat1 = this.lat * d2r,
+                   lat2 = other.lat * d2r,
+                   sin1 = Math.sin(dLat / 2),
+                   sin2 = Math.sin(dLon / 2);

 
                var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2);
 
                return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
 
                var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2);
 
                return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));

+       },
+
+       wrap: function (a, b) { // (Number, Number) -> LatLng
+               var lng = this.lng;
+
+               a = a || -180;
+               b = b ||  180;
+
+               lng = (lng + b) % (b - a) + (lng < a || lng === b ? b : a);
+
+               return new L.LatLng(this.lat, lng);

        }
 };
 
        }
 };
 

-L.latLng = function (a, b, c) { // (LatLng) or ([Number, Number]) or (Number, Number, Boolean)
+L.latLng = function (a, b) { // (LatLng) or ([Number, Number]) or (Number, Number)

        if (a instanceof L.LatLng) {
                return a;
        }
        if (a instanceof L.LatLng) {
                return a;
        }

-       if (a instanceof Array) {
-               return new L.LatLng(a[0], a[1]);
+       if (L.Util.isArray(a)) {
+               if (typeof a[0] === 'number' || typeof a[0] === 'string') {
+                       return new L.LatLng(a[0], a[1], a[2]);
+               } else {
+                       return null;
+               }

        }
        }

-       if (isNaN(a)) {
+       if (a === undefined || a === null) {

                return a;
        }
                return a;
        }

-       return new L.LatLng(a, b, c);
+       if (typeof a === 'object' && 'lat' in a) {
+               return new L.LatLng(a.lat, 'lng' in a ? a.lng : a.lon);
+       }
+       if (b === undefined) {
+               return null;
+       }
+       return new L.LatLng(a, b);

 };
 
 
 };
 
 


@@ -979,29 +1246,32 @@ L.latLng = function (a, b, c) { // (LatLng) or ([Number, Number]) or (Number, Nu
  * L.LatLngBounds represents a rectangular area on the map in geographical coordinates.
  */
 
  * L.LatLngBounds represents a rectangular area on the map in geographical coordinates.
  */
 

-L.LatLngBounds = L.Class.extend({
-       initialize: function (southWest, northEast) {   // (LatLng, LatLng) or (LatLng[])
-               if (!southWest) { return; }
+L.LatLngBounds = function (southWest, northEast) { // (LatLng, LatLng) or (LatLng[])
+       if (!southWest) { return; }

 
 

-               var latlngs = northEast ? [southWest, northEast] : southWest;
+       var latlngs = northEast ? [southWest, northEast] : southWest;

 
 

-               for (var i = 0, len = latlngs.length; i < len; i++) {
-                       this.extend(latlngs[i]);
-               }
-       },
+       for (var i = 0, len = latlngs.length; i < len; i++) {
+               this.extend(latlngs[i]);
+       }
+};

 
 

+L.LatLngBounds.prototype = {

        // extend the bounds to contain the given point or bounds
        extend: function (obj) { // (LatLng) or (LatLngBounds)
        // extend the bounds to contain the given point or bounds
        extend: function (obj) { // (LatLng) or (LatLngBounds)

-               if (typeof obj[0] === 'number' || obj instanceof L.LatLng) {
-                       obj = L.latLng(obj);
+               if (!obj) { return this; }
+
+               var latLng = L.latLng(obj);
+               if (latLng !== null) {
+                       obj = latLng;

                } else {
                        obj = L.latLngBounds(obj);
                }
 
                if (obj instanceof L.LatLng) {
                        if (!this._southWest && !this._northEast) {
                } else {
                        obj = L.latLngBounds(obj);
                }
 
                if (obj instanceof L.LatLng) {
                        if (!this._southWest && !this._northEast) {

-                               this._southWest = new L.LatLng(obj.lat, obj.lng, true);
-                               this._northEast = new L.LatLng(obj.lat, obj.lng, true);
+                               this._southWest = new L.LatLng(obj.lat, obj.lng);
+                               this._northEast = new L.LatLng(obj.lat, obj.lng);

                        } else {
                                this._southWest.lat = Math.min(obj.lat, this._southWest.lat);
                                this._southWest.lng = Math.min(obj.lng, this._southWest.lng);
                        } else {
                                this._southWest.lat = Math.min(obj.lat, this._southWest.lat);
                                this._southWest.lng = Math.min(obj.lng, this._southWest.lng);


@@ -1011,7 +1281,7 @@ L.LatLngBounds = L.Class.extend({
                        }
                } else if (obj instanceof L.LatLngBounds) {
                        this.extend(obj._southWest);
                        }
                } else if (obj instanceof L.LatLngBounds) {
                        this.extend(obj._southWest);

-            this.extend(obj._northEast);
+                       this.extend(obj._northEast);

                }
                return this;
        },
                }
                return this;
        },


@@ -1019,19 +1289,19 @@ L.LatLngBounds = L.Class.extend({
        // extend the bounds by a percentage
        pad: function (bufferRatio) { // (Number) -> LatLngBounds
                var sw = this._southWest,
        // extend the bounds by a percentage
        pad: function (bufferRatio) { // (Number) -> LatLngBounds
                var sw = this._southWest,

-                       ne = this._northEast,
-                       heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
-                       widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
+                   ne = this._northEast,
+                   heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
+                   widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;

 
                return new L.LatLngBounds(
 
                return new L.LatLngBounds(

-                       new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
-                       new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+                       new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+                       new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));

        },
 
        getCenter: function () { // -> LatLng
                return new L.LatLng(
        },
 
        getCenter: function () { // -> LatLng
                return new L.LatLng(

-                               (this._southWest.lat + this._northEast.lat) / 2,
-                               (this._southWest.lng + this._northEast.lng) / 2);
+                       (this._southWest.lat + this._northEast.lat) / 2,
+                       (this._southWest.lng + this._northEast.lng) / 2);

        },
 
        getSouthWest: function () {
        },
 
        getSouthWest: function () {


@@ -1043,11 +1313,27 @@ L.LatLngBounds = L.Class.extend({
        },
 
        getNorthWest: function () {
        },
 
        getNorthWest: function () {

-               return new L.LatLng(this._northEast.lat, this._southWest.lng, true);
+               return new L.LatLng(this.getNorth(), this.getWest());

        },
 
        getSouthEast: function () {
        },
 
        getSouthEast: function () {

-               return new L.LatLng(this._southWest.lat, this._northEast.lng, true);
+               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
        },
 
        contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean


@@ -1058,8 +1344,8 @@ L.LatLngBounds = L.Class.extend({
                }
 
                var sw = this._southWest,
                }
 
                var sw = this._southWest,

-                       ne = this._northEast,
-                       sw2, ne2;
+                   ne = this._northEast,
+                   sw2, ne2;

 
                if (obj instanceof L.LatLngBounds) {
                        sw2 = obj.getSouthWest();
 
                if (obj instanceof L.LatLngBounds) {
                        sw2 = obj.getSouthWest();


@@ -1069,27 +1355,25 @@ L.LatLngBounds = L.Class.extend({
                }
 
                return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
                }
 
                return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&

-                               (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
+                      (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);

        },
 
        intersects: function (bounds) { // (LatLngBounds)
                bounds = L.latLngBounds(bounds);
 
                var sw = this._southWest,
        },
 
        intersects: function (bounds) { // (LatLngBounds)
                bounds = L.latLngBounds(bounds);
 
                var sw = this._southWest,

-                       ne = this._northEast,
-                       sw2 = bounds.getSouthWest(),
-                       ne2 = bounds.getNorthEast();
+                   ne = this._northEast,
+                   sw2 = bounds.getSouthWest(),
+                   ne2 = bounds.getNorthEast(),

 
 

-               var latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
-                       lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
+                   latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+                   lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);

 
                return latIntersects && lngIntersects;
        },
 
        toBBoxString: function () {
 
                return latIntersects && lngIntersects;
        },
 
        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)
        },
 
        equals: function (bounds) { // (LatLngBounds)


@@ -1104,7 +1388,7 @@ L.LatLngBounds = L.Class.extend({
        isValid: function () {
                return !!(this._southWest && this._northEast);
        }
        isValid: function () {
                return !!(this._southWest && this._northEast);
        }

-});
+};

 
 //TODO International date line?
 
 
 //TODO International date line?
 


@@ -1123,16 +1407,20 @@ L.latLngBounds = function (a, b) { // (LatLngBounds) or (LatLng, LatLng)
 L.Projection = {};
 
 
 L.Projection = {};
 
 

+/*
+ * Spherical Mercator is the most popular map projection, used by EPSG:3857 CRS used by default.
+ */

 
 L.Projection.SphericalMercator = {
        MAX_LATITUDE: 85.0511287798,
 
        project: function (latlng) { // (LatLng) -> Point
                var d = L.LatLng.DEG_TO_RAD,
 
 L.Projection.SphericalMercator = {
        MAX_LATITUDE: 85.0511287798,
 
        project: function (latlng) { // (LatLng) -> Point
                var d = L.LatLng.DEG_TO_RAD,

-                       max = this.MAX_LATITUDE,
-                       lat = Math.max(Math.min(max, latlng.lat), -max),
-                       x = latlng.lng * d,
-                       y = lat * d;
+                   max = this.MAX_LATITUDE,
+                   lat = Math.max(Math.min(max, latlng.lat), -max),
+                   x = latlng.lng * d,
+                   y = lat * d;
+

                y = Math.log(Math.tan((Math.PI / 4) + (y / 2)));
 
                return new L.Point(x, y);
                y = Math.log(Math.tan((Math.PI / 4) + (y / 2)));
 
                return new L.Point(x, y);


@@ -1140,15 +1428,17 @@ L.Projection.SphericalMercator = {
 
        unproject: function (point) { // (Point, Boolean) -> LatLng
                var d = L.LatLng.RAD_TO_DEG,
 
        unproject: function (point) { // (Point, Boolean) -> LatLng
                var d = L.LatLng.RAD_TO_DEG,

-                       lng = point.x * d,
-                       lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;
+                   lng = point.x * d,
+                   lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;

 
 

-               // TODO refactor LatLng wrapping
-               return new L.LatLng(lat, lng, true);
+               return new L.LatLng(lat, lng);

        }
 };
 
 
        }
 };
 
 

+/*
+ * Simple equirectangular (Plate Carree) projection, used by CRS like EPSG:4326 and Simple.
+ */

 
 L.Projection.LonLat = {
        project: function (latlng) {
 
 L.Projection.LonLat = {
        project: function (latlng) {


@@ -1156,11 +1446,14 @@ L.Projection.LonLat = {
        },
 
        unproject: function (point) {
        },
 
        unproject: function (point) {

-               return new L.LatLng(point.y, point.x, true);
+               return new L.LatLng(point.y, point.x);

        }
 };
 
 
        }
 };
 
 

+/*
+ * L.CRS is a base object for all defined CRS (Coordinate Reference Systems) in Leaflet.
+ */

 
 L.CRS = {
        latLngToPoint: function (latlng, zoom) { // (LatLng, Number) -> Point
 
 L.CRS = {
        latLngToPoint: function (latlng, zoom) { // (LatLng, Number) -> Point


@@ -1183,19 +1476,35 @@ L.CRS = {
 
        scale: function (zoom) {
                return 256 * Math.pow(2, zoom);
 
        scale: function (zoom) {
                return 256 * Math.pow(2, zoom);

+       },
+
+       getSize: function (zoom) {
+               var s = this.scale(zoom);
+               return L.point(s, s);

        }
 };
 
 
        }
 };
 
 

+/*
+ * A simple CRS that can be used for flat non-Earth maps like panoramas or game maps.
+ */

 
 

-L.CRS.Simple = L.Util.extend({}, L.CRS, {
+L.CRS.Simple = L.extend({}, L.CRS, {

        projection: L.Projection.LonLat,
        projection: L.Projection.LonLat,

-       transformation: new L.Transformation(1, 0, 1, 0)
+       transformation: new L.Transformation(1, 0, -1, 0),
+
+       scale: function (zoom) {
+               return Math.pow(2, zoom);
+       }

 });
 
 
 });
 
 

+/*
+ * L.CRS.EPSG3857 (Spherical Mercator) is the most common CRS for web mapping
+ * and is used by Leaflet by default.
+ */

 
 

-L.CRS.EPSG3857 = L.Util.extend({}, L.CRS, {
+L.CRS.EPSG3857 = L.extend({}, L.CRS, {

        code: 'EPSG:3857',
 
        projection: L.Projection.SphericalMercator,
        code: 'EPSG:3857',
 
        projection: L.Projection.SphericalMercator,


@@ -1203,18 +1512,21 @@ L.CRS.EPSG3857 = L.Util.extend({}, L.CRS, {
 
        project: function (latlng) { // (LatLng) -> Point
                var projectedPoint = this.projection.project(latlng),
 
        project: function (latlng) { // (LatLng) -> Point
                var projectedPoint = this.projection.project(latlng),

-                       earthRadius = 6378137;
+                   earthRadius = 6378137;

                return projectedPoint.multiplyBy(earthRadius);
        }
 });
 
                return projectedPoint.multiplyBy(earthRadius);
        }
 });
 

-L.CRS.EPSG900913 = L.Util.extend({}, L.CRS.EPSG3857, {
+L.CRS.EPSG900913 = L.extend({}, L.CRS.EPSG3857, {

        code: 'EPSG:900913'
 });
 
 
        code: 'EPSG:900913'
 });
 
 

+/*
+ * L.CRS.EPSG4326 is a CRS popular among advanced GIS specialists.
+ */

 
 

-L.CRS.EPSG4326 = L.Util.extend({}, L.CRS, {
+L.CRS.EPSG4326 = L.extend({}, L.CRS, {

        code: 'EPSG:4326',
 
        projection: L.Projection.LonLat,
        code: 'EPSG:4326',
 
        projection: L.Projection.LonLat,


@@ -1245,11 +1557,15 @@ L.Map = L.Class.extend({
        },
 
        initialize: function (id, options) { // (HTMLElement or String, Object)
        },
 
        initialize: function (id, options) { // (HTMLElement or String, Object)

-               options = L.Util.setOptions(this, options);
+               options = L.setOptions(this, options);
+

 
                this._initContainer(id);
                this._initLayout();
 
                this._initContainer(id);
                this._initLayout();

-               this._initHooks();
+
+               // hack for https://github.com/Leaflet/Leaflet/issues/1980
+               this._onResize = L.bind(this._onResize, this);
+

                this._initEvents();
 
                if (options.maxBounds) {
                this._initEvents();
 
                if (options.maxBounds) {


@@ -1257,10 +1573,18 @@ L.Map = L.Class.extend({
                }
 
                if (options.center && options.zoom !== undefined) {
                }
 
                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);

        },
 
 
        },
 
 


@@ -1268,40 +1592,68 @@ L.Map = L.Class.extend({
 
        // replaced by animation-powered implementation in Map.PanAnimation.js
        setView: function (center, zoom) {
 
        // replaced by animation-powered implementation in Map.PanAnimation.js
        setView: function (center, zoom) {

+               zoom = zoom === undefined ? this.getZoom() : zoom;

                this._resetView(L.latLng(center), this._limitZoom(zoom));
                return this;
        },
 
                this._resetView(L.latLng(center), this._limitZoom(zoom));
                return this;
        },
 

-       setZoom: function (zoom) { // (Number)
-               return this.setView(this.getCenter(), zoom);
+       setZoom: function (zoom, options) {
+               if (!this._loaded) {
+                       this._zoom = this._limitZoom(zoom);
+                       return this;
+               }
+               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);

 
 

-               return this.fitBounds(new L.LatLngBounds(sw, ne));
+               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);
+
+               zoom = options && options.maxZoom ? Math.min(options.maxZoom, zoom) : zoom;
+
+               return this.setView(center, zoom, options);

        },
 
        },
 

-       panTo: function (center) { // (LatLng)
-               return this.setView(center, this._zoom);
+       fitWorld: function (options) {
+               return this.fitBounds([[-90, -180], [90, 180]], options);
+       },
+
+       panTo: function (center, options) { // (LatLng)
+               return this.setView(center, this._zoom, {pan: options});

        },
 
        panBy: function (offset) { // (Point)
        },
 
        panBy: function (offset) { // (Point)

-               // replaced with animated panBy in Map.Animation.js
+               // replaced with animated panBy in Map.PanAnimation.js

                this.fire('movestart');
 
                this._rawPanBy(L.point(offset));
                this.fire('movestart');
 
                this._rawPanBy(L.point(offset));


@@ -1316,144 +1668,176 @@ L.Map = L.Class.extend({
                this.options.maxBounds = bounds;
 
                if (!bounds) {
                this.options.maxBounds = bounds;
 
                if (!bounds) {

-                       this._boundsMinZoom = null;
-                       return this;
+                       return this.off('moveend', this._panInsideMaxBounds, this);

                }
 
                }
 

-               var minZoom = this.getBoundsZoom(bounds, true);
-
-               this._boundsMinZoom = minZoom;
-

                if (this._loaded) {
                if (this._loaded) {

-                       if (this._zoom < minZoom) {
-                               this.setView(bounds.getCenter(), minZoom);
-                       } else {
-                               this.panInsideBounds(bounds);
-                       }
+                       this._panInsideMaxBounds();

                }
 
                }
 

-               return this;
+               return this.on('moveend', this._panInsideMaxBounds, this);

        },
 
        },
 

-       panInsideBounds: function (bounds) {
-               bounds = L.latLngBounds(bounds);
-
-               var viewBounds = this.getBounds(),
-                   viewSw = this.project(viewBounds.getSouthWest()),
-                   viewNe = this.project(viewBounds.getNorthEast()),
-                   sw = this.project(bounds.getSouthWest()),
-                   ne = this.project(bounds.getNorthEast()),
-                   dx = 0,
-                   dy = 0;
+       panInsideBounds: function (bounds, options) {
+               var center = this.getCenter(),
+                       newCenter = this._limitCenter(center, this._zoom, bounds);

 
 

-               if (viewNe.y < ne.y) { // north
-                       dy = ne.y - viewNe.y;
-               }
-               if (viewNe.x > ne.x) { // east
-                       dx = ne.x - viewNe.x;
-               }
-               if (viewSw.y > sw.y) { // south
-                       dy = sw.y - viewSw.y;
-               }
-               if (viewSw.x < sw.x) { // west
-                       dx = sw.x - viewSw.x;
-               }
+               if (center.equals(newCenter)) { return this; }

 
 

-               return this.panBy(new L.Point(dx, dy, true));
+               return this.panTo(newCenter, options);

        },
 
        addLayer: function (layer) {
                // TODO method is too big, refactor
 
        },
 
        addLayer: function (layer) {
                // TODO method is too big, refactor
 

-               var id = L.Util.stamp(layer);
+               var id = L.stamp(layer);

 
                if (this._layers[id]) { return this; }
 
                this._layers[id] = layer;
 
                // TODO getMaxZoom, getMinZoom in ILayer (instead of options)
 
                if (this._layers[id]) { return this; }
 
                this._layers[id] = layer;
 
                // TODO getMaxZoom, getMinZoom in ILayer (instead of options)

-               if (layer.options && !isNaN(layer.options.maxZoom)) {
-                       this._layersMaxZoom = Math.max(this._layersMaxZoom || 0, layer.options.maxZoom);
-               }
-               if (layer.options && !isNaN(layer.options.minZoom)) {
-                       this._layersMinZoom = Math.min(this._layersMinZoom || Infinity, layer.options.minZoom);
+               if (layer.options && (!isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom))) {
+                       this._zoomBoundLayers[id] = layer;
+                       this._updateZoomLevels();

                }
 
                // TODO looks ugly, refactor!!!
                if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
                        this._tileLayersNum++;
                }
 
                // 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;
        },
 
        removeLayer: function (layer) {
 
                return this;
        },
 
        removeLayer: function (layer) {

-               var id = L.Util.stamp(layer);
+               var id = L.stamp(layer);

 
 

-               if (!this._layers[id]) { return; }
+               if (!this._layers[id]) { return this; }

 
 

-               layer.onRemove(this);
+               if (this._loaded) {
+                       layer.onRemove(this);
+               }

 
                delete this._layers[id];
 
 
                delete this._layers[id];
 

+               if (this._loaded) {
+                       this.fire('layerremove', {layer: layer});
+               }
+
+               if (this._zoomBoundLayers[id]) {
+                       delete this._zoomBoundLayers[id];
+                       this._updateZoomLevels();
+               }
+

                // TODO looks ugly, refactor
                if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
                        this._tileLayersNum--;
                // 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) {
        },
 
        hasLayer: function (layer) {

-               var id = L.Util.stamp(layer);
-               return this._layers.hasOwnProperty(id);
-       },
-
-       invalidateSize: function (animate) {
-               var oldSize = this.getSize();
+               if (!layer) { return false; }

 
 

-               this._sizeChanged = true;
+               return (L.stamp(layer) in this._layers);
+       },

 
 

-               if (this.options.maxBounds) {
-                       this.setMaxBounds(this.options.maxBounds);
+       eachLayer: function (method, context) {
+               for (var i in this._layers) {
+                       method.call(context, this._layers[i]);

                }
                }

+               return this;
+       },

 
 

+       invalidateSize: function (options) {

                if (!this._loaded) { return this; }
 
                if (!this._loaded) { return this; }
 

-               var offset = oldSize._subtract(this.getSize())._divideBy(2)._round();
+               options = L.extend({
+                       animate: false,
+                       pan: true
+               }, options === true ? {animate: true} : options);
+
+               var oldSize = this.getSize();
+               this._sizeChanged = true;
+               this._initialCenter = null;
+
+               var newSize = this.getSize(),
+                   oldCenter = oldSize.divideBy(2).round(),
+                   newCenter = newSize.divideBy(2).round(),
+                   offset = oldCenter.subtract(newCenter);

 
 

-               if (animate === true) {
+               if (!offset.x && !offset.y) { return this; }
+
+               if (options.animate && options.pan) {

                        this.panBy(offset);
                        this.panBy(offset);

+

                } else {
                } else {

-                       this._rawPanBy(offset);
+                       if (options.pan) {
+                               this._rawPanBy(offset);
+                       }

 
                        this.fire('move');
 
 
                        this.fire('move');
 

-                       clearTimeout(this._sizeTimer);
-                       this._sizeTimer = setTimeout(L.Util.bind(this.fire, this, 'moveend'), 200);
+                       if (options.debounceMoveend) {
+                               clearTimeout(this._sizeTimer);
+                               this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200);
+                       } else {
+                               this.fire('moveend');
+                       }

                }
                }

-               return this;
+
+               return this.fire('resize', {
+                       oldSize: oldSize,
+                       newSize: newSize
+               });

        },
 
        // TODO handler.addTo
        addHandler: function (name, HandlerClass) {
        },
 
        // TODO handler.addTo
        addHandler: function (name, HandlerClass) {

-               if (!HandlerClass) { return; }
+               if (!HandlerClass) { return this; }

 
 

-               this[name] = new HandlerClass(this);
+               var handler = this[name] = new HandlerClass(this);
+
+               this._handlers.push(handler);

 
                if (this.options[name]) {
 
                if (this.options[name]) {

-                       this[name].enable();
+                       handler.enable();
+               }
+
+               return this;
+       },
+
+       remove: function () {
+               if (this._loaded) {
+                       this.fire('unload');
+               }
+
+               this._initEvents('off');
+
+               try {
+                       // throws error in IE6-8
+                       delete this._container._leaflet;
+               } catch (e) {
+                       this._container._leaflet = undefined;

                }
 
                }
 

+               this._clearPanes();
+               if (this._clearControlPos) {
+                       this._clearControlPos();
+               }
+
+               this._clearHandlers();
+

                return this;
        },
 
                return this;
        },
 


@@ -1461,6 +1845,11 @@ L.Map = L.Class.extend({
        // public methods for getting map state
 
        getCenter: function () { // (Boolean) -> LatLng
        // public methods for getting map state
 
        getCenter: function () { // (Boolean) -> LatLng

+               this._checkIfLoaded();
+
+               if (this._initialCenter && !this._moved()) {
+                       return this._initialCenter;
+               }

                return this.layerPointToLatLng(this._getCenterLayerPoint());
        },
 
                return this.layerPointToLatLng(this._getCenterLayerPoint());
        },
 


@@ -1477,48 +1866,37 @@ L.Map = L.Class.extend({
        },
 
        getMinZoom: function () {
        },
 
        getMinZoom: function () {

-               var z1 = this.options.minZoom || 0,
-                   z2 = this._layersMinZoom || 0,
-                   z3 = this._boundsMinZoom || 0;
-
-               return Math.max(z1, z2, z3);
+               return this.options.minZoom === undefined ?
+                       (this._layersMinZoom === undefined ? 0 : this._layersMinZoom) :
+                       this.options.minZoom;

        },
 
        getMaxZoom: function () {
        },
 
        getMaxZoom: function () {

-               var z1 = this.options.maxZoom === undefined ? Infinity : this.options.maxZoom,
-                   z2 = this._layersMaxZoom  === undefined ? Infinity : this._layersMaxZoom;
-
-               return Math.min(z1, z2);
+               return this.options.maxZoom === undefined ?
+                       (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
+                       this.options.maxZoom;

        },
 
        },
 

-       getBoundsZoom: function (bounds, inside) { // (LatLngBounds, Boolean) -> Number
+       getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number

                bounds = L.latLngBounds(bounds);
 
                bounds = L.latLngBounds(bounds);
 

-               var size = this.getSize(),
-                   zoom = this.options.minZoom || 0,
+               var zoom = this.getMinZoom() - (inside ? 1 : 0),

                    maxZoom = this.getMaxZoom(),
                    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++;
 
                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) {
                } while (zoomNotFound && zoom <= maxZoom);
 
                if (zoomNotFound && inside) {


@@ -1545,6 +1923,7 @@ L.Map = L.Class.extend({
        },
 
        getPixelOrigin: function () {
        },
 
        getPixelOrigin: function () {

+               this._checkIfLoaded();

                return this._initialTopLeftPoint;
        },
 
                return this._initialTopLeftPoint;
        },
 


@@ -1582,13 +1961,13 @@ L.Map = L.Class.extend({
        },
 
        layerPointToLatLng: function (point) { // (Point)
        },
 
        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 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)
        },
 
        containerPointToLayerPoint: function (point) { // (Point)


@@ -1626,8 +2005,10 @@ L.Map = L.Class.extend({
        _initContainer: function (id) {
                var container = this._container = L.DomUtil.get(id);
 
        _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;
                }
 
                container._leaflet = true;


@@ -1636,16 +2017,11 @@ L.Map = L.Class.extend({
        _initLayout: function () {
                var container = this._container;
 
        _initLayout: function () {
                var container = this._container;
 

-               container.innerHTML = '';
-               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' : '') +
+                       (L.Browser.ielt9 ? ' leaflet-oldie' : '') +
+                       (this.options.fadeAnimation ? ' leaflet-fade-anim' : ''));

 
                var position = L.DomUtil.getStyle(container, 'position');
 
 
                var position = L.DomUtil.getStyle(container, 'position');
 


@@ -1666,8 +2042,7 @@ L.Map = L.Class.extend({
                this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);
 
                this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);
                this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);
 
                this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);

-               this._objectsPane = panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);
-
+               panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);

                panes.shadowPane = this._createPane('leaflet-shadow-pane');
                panes.overlayPane = this._createPane('leaflet-overlay-pane');
                panes.markerPane = this._createPane('leaflet-marker-pane');
                panes.shadowPane = this._createPane('leaflet-shadow-pane');
                panes.overlayPane = this._createPane('leaflet-overlay-pane');
                panes.markerPane = this._createPane('leaflet-marker-pane');


@@ -1683,27 +2058,17 @@ L.Map = L.Class.extend({
        },
 
        _createPane: function (className, container) {
        },
 
        _createPane: function (className, container) {

-               return L.DomUtil.create('div', className, container || this._objectsPane);
+               return L.DomUtil.create('div', className, container || this._panes.objectsPane);

        },
 
        },
 

-       _initializers: [],
-
-       _initHooks: function () {
-               var i, len;
-               for (i = 0, len = this._initializers.length; i < len; i++) {
-                       this._initializers[i].call(this);
-               }
+       _clearPanes: function () {
+               this._container.removeChild(this._mapPane);

        },
 
        },
 

-       _initLayers: function (layers) {
-               layers = layers ? (layers instanceof Array ? layers : [layers]) : [];
-
-               this._layers = {};
-               this._tileLayersNum = 0;
-
-               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]);
                }
        },
                        this.addLayer(layers[i]);
                }
        },


@@ -1724,6 +2089,7 @@ L.Map = L.Class.extend({
                }
 
                this._zoom = zoom;
                }
 
                this._zoom = zoom;

+               this._initialCenter = center;

 
                this._initialTopLeftPoint = this._getNewTopLeftPoint(center);
 
 
                this._initialTopLeftPoint = this._getNewTopLeftPoint(center);
 


@@ -1738,6 +2104,11 @@ L.Map = L.Class.extend({
                var loading = !this._loaded;
                this._loaded = true;
 
                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');
                this.fire('viewreset', {hard: !preserveMapOffset});
 
                this.fire('move');


@@ -1747,50 +2118,94 @@ L.Map = L.Class.extend({
                }
 
                this.fire('moveend', {hard: !preserveMapOffset});
                }
 
                this.fire('moveend', {hard: !preserveMapOffset});

-
-               if (loading) {
-                       this.fire('load');
-               }

        },
 
        _rawPanBy: function (offset) {
                L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
        },
 
        },
 
        _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,
+                       oldZoomSpan = this._getZoomSpan();
+
+               for (i in this._zoomBoundLayers) {
+                       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);
+                       }
+               }
+
+               if (i === undefined) { // we have no tilelayers
+                       this._layersMaxZoom = this._layersMinZoom = undefined;
+               } else {
+                       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
 
 
        // map events
 

-       _initEvents: function () {
+       _initEvents: function (onOff) {

                if (!L.DomEvent) { return; }
 
                if (!L.DomEvent) { return; }
 

-               L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
+               onOff = onOff || 'on';

 
 

-               var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'mousemove', 'contextmenu'],
-                       i, len;
+               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++) {
 
                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) {
                }
 
                if (this.options.trackResize) {

-                       L.DomEvent.on(window, 'resize', this._onResize, this);
+                       L.DomEvent[onOff](window, 'resize', this._onResize, this);

                }
        },
 
        _onResize: function () {
                L.Util.cancelAnimFrame(this._resizeRequest);
                }
        },
 
        _onResize: function () {
                L.Util.cancelAnimFrame(this._resizeRequest);

-               this._resizeRequest = L.Util.requestAnimFrame(this.invalidateSize, this, false, this._container);
+               this._resizeRequest = L.Util.requestAnimFrame(
+                       function () { this.invalidateSize({debounceMoveend: true}); }, this, false, this._container);

        },
 
        _onMouseClick: function (e) {
        },
 
        _onMouseClick: function (e) {

-               if (!this._loaded || (this.dragging && this.dragging.moved())) { return; }
+               if (!this._loaded || (!e._simulated &&
+                       ((this.dragging && this.dragging.moved()) ||
+                        (this.boxZoom  && this.boxZoom.moved()))) ||
+                           L.DomEvent._skipped(e)) { return; }

 
                this.fire('preclick');
                this._fireMouseEvent(e);
        },
 
        _fireMouseEvent: function (e) {
 
                this.fire('preclick');
                this._fireMouseEvent(e);
        },
 
        _fireMouseEvent: function (e) {

-               if (!this._loaded) { return; }
+               if (!this._loaded || L.DomEvent._skipped(e)) { return; }

 
                var type = e.type;
 
 
                var type = e.type;
 


@@ -1803,8 +2218,8 @@ L.Map = L.Class.extend({
                }
 
                var containerPoint = this.mouseEventToContainerPoint(e),
                }
 
                var containerPoint = this.mouseEventToContainerPoint(e),

-                       layerPoint = this.containerPointToLayerPoint(containerPoint),
-                       latlng = this.layerPointToLatLng(layerPoint);
+                   layerPoint = this.containerPointToLayerPoint(containerPoint),
+                   latlng = this.layerPointToLatLng(layerPoint);

 
                this.fire(type, {
                        latlng: latlng,
 
                this.fire(type, {
                        latlng: latlng,


@@ -1815,12 +2230,15 @@ L.Map = L.Class.extend({
        },
 
        _onTileLayerLoad: function () {
        },
 
        _onTileLayerLoad: function () {

-               // TODO super-ugly, refactor!!!
-               // clear scaled tiles after all new tiles are loaded (for performance)

                this._tileLayersToLoad--;
                this._tileLayersToLoad--;

-               if (this._tileLayersNum && !this._tileLayersToLoad && this._tileBg) {
-                       clearTimeout(this._clearTileBgTimer);
-                       this._clearTileBgTimer = setTimeout(L.Util.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();

                }
        },
 
                }
        },
 


@@ -1833,6 +2251,11 @@ L.Map = L.Class.extend({
                return this;
        },
 
                return this;
        },
 

+       _layerAdd: function (layer) {
+               layer.onAdd(this);
+               this.fire('layeradd', {layer: layer});
+       },
+

 
        // private methods for getting map state
 
 
        // private methods for getting map state
 


@@ -1840,12 +2263,13 @@ L.Map = L.Class.extend({
                return L.DomUtil.getPosition(this._mapPane);
        },
 
                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) {
        },
 
        _getNewTopLeftPoint: function (center, zoom) {


@@ -1859,102 +2283,139 @@ L.Map = L.Class.extend({
                return this.project(latlng, newZoom)._subtract(topLeft);
        },
 
                return this.project(latlng, newZoom)._subtract(topLeft);
        },
 

+       // layer point of the current center

        _getCenterLayerPoint: function () {
                return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
        },
 
        _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());
+       },
+
+       // adjust center for view to get inside bounds
+       _limitCenter: function (center, zoom, bounds) {
+
+               if (!bounds) { return center; }
+
+               var centerPoint = this.project(center, zoom),
+                   viewHalf = this.getSize().divideBy(2),
+                   viewBounds = new L.Bounds(centerPoint.subtract(viewHalf), centerPoint.add(viewHalf)),
+                   offset = this._getBoundsOffset(viewBounds, bounds, zoom);
+
+               return this.unproject(centerPoint.add(offset), zoom);
+       },
+
+       // adjust offset for view to get inside bounds
+       _limitOffset: function (offset, bounds) {
+               if (!bounds) { return offset; }
+
+               var viewBounds = this.getPixelBounds(),
+                   newBounds = new L.Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset));
+
+               return offset.add(this._getBoundsOffset(newBounds, bounds));
+       },
+
+       // returns offset needed for pxBounds to get inside maxBounds at a specified zoom
+       _getBoundsOffset: function (pxBounds, maxBounds, zoom) {
+               var nwOffset = this.project(maxBounds.getNorthWest(), zoom).subtract(pxBounds.min),
+                   seOffset = this.project(maxBounds.getSouthEast(), zoom).subtract(pxBounds.max),
+
+                   dx = this._rebound(nwOffset.x, -seOffset.x),
+                   dy = this._rebound(nwOffset.y, -seOffset.y);
+
+               return new L.Point(dx, dy);
+       },
+
+       _rebound: function (left, right) {
+               return left + right > 0 ?
+                       Math.round(left - right) / 2 :
+                       Math.max(0, Math.ceil(left)) - Math.max(0, Math.floor(right));

        },
 
        _limitZoom: function (zoom) {
                var min = this.getMinZoom(),
        },
 
        _limitZoom: function (zoom) {
                var min = this.getMinZoom(),

-                       max = this.getMaxZoom();
+                   max = this.getMaxZoom();

 
                return Math.max(min, Math.min(max, zoom));
        }
 });
 
 
                return Math.max(min, Math.min(max, zoom));
        }
 });
 

-L.Map.addInitHook = function (fn) {
-       var args = Array.prototype.slice.call(arguments, 1);
-
-       var init = typeof fn === 'function' ? fn : function () {
-               this[fn].apply(this, args);
-       };
-
-       this.prototype._initializers.push(init);
-};
-

 L.map = function (id, options) {
        return new L.Map(id, options);
 };
 
 
 L.map = function (id, options) {
        return new L.Map(id, options);
 };
 
 

+/*
+ * Mercator projection that takes into account that the Earth is not a perfect sphere.
+ * Less popular than spherical mercator; used by projections like EPSG:3395.
+ */

 
 L.Projection.Mercator = {
        MAX_LATITUDE: 85.0840591556,
 
 
 L.Projection.Mercator = {
        MAX_LATITUDE: 85.0840591556,
 

-       R_MINOR: 6356752.3142,
+       R_MINOR: 6356752.314245179,

        R_MAJOR: 6378137,
 
        project: function (latlng) { // (LatLng) -> Point
                var d = L.LatLng.DEG_TO_RAD,
        R_MAJOR: 6378137,
 
        project: function (latlng) { // (LatLng) -> Point
                var d = L.LatLng.DEG_TO_RAD,

-                       max = this.MAX_LATITUDE,
-                       lat = Math.max(Math.min(max, latlng.lat), -max),
-                       r = this.R_MAJOR,
-                       r2 = this.R_MINOR,
-                       x = latlng.lng * d * r,
-                       y = lat * d,
-                       tmp = r2 / r,
-                       eccent = Math.sqrt(1.0 - tmp * tmp),
-                       con = eccent * Math.sin(y);
+                   max = this.MAX_LATITUDE,
+                   lat = Math.max(Math.min(max, latlng.lat), -max),
+                   r = this.R_MAJOR,
+                   r2 = this.R_MINOR,
+                   x = latlng.lng * d * r,
+                   y = lat * d,
+                   tmp = r2 / r,
+                   eccent = Math.sqrt(1.0 - tmp * tmp),
+                   con = eccent * Math.sin(y);

 
                con = Math.pow((1 - con) / (1 + con), eccent * 0.5);
 
                var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con;
 
                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);
        },
 
        unproject: function (point) { // (Point, Boolean) -> LatLng
                var d = L.LatLng.RAD_TO_DEG,
 
                return new L.Point(x, y);
        },
 
        unproject: function (point) { // (Point, Boolean) -> LatLng
                var d = L.LatLng.RAD_TO_DEG,

-                       r = this.R_MAJOR,
-                       r2 = this.R_MINOR,
-                       lng = point.x * d / r,
-                       tmp = r2 / r,
-                       eccent = Math.sqrt(1 - (tmp * tmp)),
-                       ts = Math.exp(- point.y / r2),
-                       phi = (Math.PI / 2) - 2 * Math.atan(ts),
-                       numIter = 15,
-                       tol = 1e-7,
-                       i = numIter,
-                       dphi = 0.1,
-                       con;
+                   r = this.R_MAJOR,
+                   r2 = this.R_MINOR,
+                   lng = point.x * d / r,
+                   tmp = r2 / r,
+                   eccent = Math.sqrt(1 - (tmp * tmp)),
+                   ts = Math.exp(- point.y / r),
+                   phi = (Math.PI / 2) - 2 * Math.atan(ts),
+                   numIter = 15,
+                   tol = 1e-7,
+                   i = numIter,
+                   dphi = 0.1,
+                   con;

 
                while ((Math.abs(dphi) > tol) && (--i > 0)) {
                        con = eccent * Math.sin(phi);
 
                while ((Math.abs(dphi) > tol) && (--i > 0)) {
                        con = eccent * Math.sin(phi);

-                       dphi = (Math.PI / 2) - 2 * Math.atan(ts * Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi;
+                       dphi = (Math.PI / 2) - 2 * Math.atan(ts *
+                                   Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi;

                        phi += dphi;
                }
 
                        phi += dphi;
                }
 

-               return new L.LatLng(phi * d, lng, true);
+               return new L.LatLng(phi * d, lng);

        }
 };
 
 
 
        }
 };
 
 
 

-L.CRS.EPSG3395 = L.Util.extend({}, L.CRS, {
+L.CRS.EPSG3395 = L.extend({}, L.CRS, {

        code: 'EPSG:3395',
 
        projection: L.Projection.Mercator,
 
        transformation: (function () {
                var m = L.Projection.Mercator,
        code: 'EPSG:3395',
 
        projection: L.Projection.Mercator,
 
        transformation: (function () {
                var m = L.Projection.Mercator,

-                       r = m.R_MAJOR,
-                       r2 = m.R_MINOR;
+                   r = m.R_MAJOR,
+                   scale = 0.5 / (Math.PI * r);

 
 

-               return new L.Transformation(0.5 / (Math.PI * r), 0.5, -0.5 / (Math.PI * r2), 0.5);
+               return new L.Transformation(scale, 0.5, -scale, 0.5);

        }())
 });
 
        }())
 });
 


@@ -1975,7 +2436,8 @@ L.TileLayer = L.Class.extend({
                attribution: '',
                zoomOffset: 0,
                opacity: 1,
                attribution: '',
                zoomOffset: 0,
                opacity: 1,

-               /* (undefined works too)
+               /*
+               maxNativeZoom: null,

                zIndex: null,
                tms: false,
                continuousWorld: false,
                zIndex: null,
                tms: false,
                continuousWorld: false,


@@ -1983,13 +2445,14 @@ L.TileLayer = L.Class.extend({
                zoomReverse: false,
                detectRetina: false,
                reuseTiles: false,
                zoomReverse: false,
                detectRetina: false,
                reuseTiles: false,

+               bounds: false,

                */
                unloadInvisibleTiles: L.Browser.mobile,
                updateWhenIdle: L.Browser.mobile
        },
 
        initialize: function (url, options) {
                */
                unloadInvisibleTiles: L.Browser.mobile,
                updateWhenIdle: L.Browser.mobile
        },
 
        initialize: function (url, options) {

-               options = L.Util.setOptions(this, options);
+               options = L.setOptions(this, options);

 
                // detecting retina displays, adjusting tileSize and zoom levels
                if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {
 
                // detecting retina displays, adjusting tileSize and zoom levels
                if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {


@@ -2003,6 +2466,10 @@ L.TileLayer = L.Class.extend({
                        this.options.maxZoom--;
                }
 
                        this.options.maxZoom--;
                }
 

+               if (options.bounds) {
+                       options.bounds = L.latLngBounds(options.bounds);
+               }
+

                this._url = url;
 
                var subdomains = this.options.subdomains;
                this._url = url;
 
                var subdomains = this.options.subdomains;


@@ -2014,19 +2481,24 @@ L.TileLayer = L.Class.extend({
 
        onAdd: function (map) {
                this._map = map;
 
        onAdd: function (map) {
                this._map = map;

+               this._animated = map._zoomAnimated;

 
                // create a container div for tiles
                this._initContainer();
 
 
                // create a container div for tiles
                this._initContainer();
 

-               // create an image to clone for tiles
-               this._createTileProto();
-

                // set up events
                map.on({
                // set up events
                map.on({

-                       'viewreset': this._resetCallback,
+                       'viewreset': this._reset,

                        'moveend': this._update
                }, this);
 
                        '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);
                if (!this.options.updateWhenIdle) {
                        this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this);
                        map.on('move', this._limitedUpdate, this);


@@ -2042,13 +2514,20 @@ L.TileLayer = L.Class.extend({
        },
 
        onRemove: function (map) {
        },
 
        onRemove: function (map) {

-               map._panes.tilePane.removeChild(this._container);
+               this._container.parentNode.removeChild(this._container);

 
                map.off({
 
                map.off({

-                       'viewreset': this._resetCallback,
+                       'viewreset': this._reset,

                        'moveend': this._update
                }, this);
 
                        '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);
                }
                if (!this.options.updateWhenIdle) {
                        map.off('move', this._limitedUpdate, this);
                }


@@ -2083,6 +2562,10 @@ L.TileLayer = L.Class.extend({
                return this.options.attribution;
        },
 
                return this.options.attribution;
        },
 

+       getContainer: function () {
+               return this._container;
+       },
+

        setOpacity: function (opacity) {
                this.options.opacity = opacity;
 
        setOpacity: function (opacity) {
                this.options.opacity = opacity;
 


@@ -2112,8 +2595,7 @@ L.TileLayer = L.Class.extend({
 
        redraw: function () {
                if (this._map) {
 
        redraw: function () {
                if (this._map) {

-                       this._map._panes.tilePane.empty = false;
-                       this._reset(true);
+                       this._reset({hard: true});

                        this._update();
                }
                return this;
                        this._update();
                }
                return this;


@@ -2127,11 +2609,11 @@ L.TileLayer = L.Class.extend({
 
        _setAutoZIndex: function (pane, compare) {
 
 
        _setAutoZIndex: function (pane, compare) {
 

-               var layers = pane.getElementsByClassName('leaflet-layer'),
-                       edgeZIndex = -compare(Infinity, -Infinity), // -Ifinity for max, Infinity for min
-                       zIndex;
+               var layers = pane.children,
+                   edgeZIndex = -compare(Infinity, -Infinity), // -Infinity for max, Infinity for min
+                   zIndex, i, len;

 
 

-               for (var i = 0, len = layers.length; i < len; i++) {
+               for (i = 0, len = layers.length; i < len; i++) {

 
                        if (layers[i] !== this._container) {
                                zIndex = parseInt(layers[i].style.zIndex, 10);
 
                        if (layers[i] !== this._container) {
                                zIndex = parseInt(layers[i].style.zIndex, 10);


@@ -2142,33 +2624,41 @@ L.TileLayer = L.Class.extend({
                        }
                }
 
                        }
                }
 

-               this.options.zIndex = this._container.style.zIndex = (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);
+               this.options.zIndex = this._container.style.zIndex =
+                       (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);

        },
 
        _updateOpacity: function () {
        },
 
        _updateOpacity: function () {

-               L.DomUtil.setOpacity(this._container, this.options.opacity);
-
-               // stupid webkit hack to force redrawing of tiles

                var i,
                var i,

-                       tiles = this._tiles;
+                   tiles = this._tiles;

 
 

-               if (L.Browser.webkit) {
+               if (L.Browser.ielt9) {

                        for (i in tiles) {
                        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;
 
                }
        },
 
        _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();
 
                        this._container = L.DomUtil.create('div', 'leaflet-layer');
 
                        this._updateZIndex();
 

+                       if (this._animated) {
+                               var className = 'leaflet-tile-container';
+
+                               this._bgBuffer = L.DomUtil.create('div', className, this._container);
+                               this._tileContainer = L.DomUtil.create('div', className, this._container);
+
+                       } else {
+                               this._tileContainer = this._container;
+                       }
+

                        tilePane.appendChild(this._container);
 
                        if (this.options.opacity < 1) {
                        tilePane.appendChild(this._container);
 
                        if (this.options.opacity < 1) {


@@ -2177,18 +2667,9 @@ L.TileLayer = L.Class.extend({
                }
        },
 
                }
        },
 

-       _resetCallback: function (e) {
-               this._reset(e.hard);
-       },
-
-       _reset: function (clearOldContainer) {
-               var key,
-                       tiles = this._tiles;
-
-               for (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 = {};
                }
 
                this._tiles = {};


@@ -2198,32 +2679,44 @@ L.TileLayer = L.Class.extend({
                        this._unusedTiles = [];
                }
 
                        this._unusedTiles = [];
                }
 

-               if (clearOldContainer && this._container) {
-                       this._container.innerHTML = "";
+               this._tileContainer.innerHTML = '';
+
+               if (this._animated && e && e.hard) {
+                       this._clearBgBuffer();

                }
 
                this._initContainer();
        },
 
                }
 
                this._initContainer();
        },
 

-       _update: function (e) {
+       _getTileSize: function () {
+               var map = this._map,
+                   zoom = map.getZoom() + this.options.zoomOffset,
+                   zoomN = this.options.maxNativeZoom,
+                   tileSize = this.options.tileSize;
+
+               if (zoomN && zoom > zoomN) {
+                       tileSize = Math.round(map.getZoomScale(zoom) / map.getZoomScale(zoomN) * tileSize);
+               }
+
+               return tileSize;
+       },
+
+       _update: function () {

 
                if (!this._map) { return; }
 
 
                if (!this._map) { return; }
 

-               var bounds   = this._map.getPixelBounds(),
-                   zoom     = this._map.getZoom(),
-                   tileSize = this.options.tileSize;
+               var map = this._map,
+                   bounds = map.getPixelBounds(),
+                   zoom = map.getZoom(),
+                   tileSize = this._getTileSize();

 
                if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
                        return;
                }
 
 
                if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
                        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);
 
 
                this._addTilesFromCenterOut(tileBounds);
 


@@ -2234,7 +2727,7 @@ L.TileLayer = L.Class.extend({
 
        _addTilesFromCenterOut: function (bounds) {
                var queue = [],
 
        _addTilesFromCenterOut: function (bounds) {
                var queue = [],

-                       center = bounds.getCenter();
+                   center = bounds.getCenter();

 
                var j, i, point;
 
 
                var j, i, point;
 


@@ -2270,7 +2763,7 @@ L.TileLayer = L.Class.extend({
                        this._addTile(queue[i], fragment);
                }
 
                        this._addTile(queue[i], fragment);
                }
 

-               this._container.appendChild(fragment);
+               this._tileContainer.appendChild(fragment);

        },
 
        _tileShouldBeLoaded: function (tilePoint) {
        },
 
        _tileShouldBeLoaded: function (tilePoint) {


@@ -2278,13 +2771,31 @@ L.TileLayer = L.Class.extend({
                        return false; // already loaded
                }
 
                        return false; // already loaded
                }
 

-               if (!this.options.continuousWorld) {
+               var options = this.options;
+
+               if (!options.continuousWorld) {

                        var limit = this._getWrapTileNum();
 
                        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.x)) ||
+                               tilePoint.y < 0 || tilePoint.y >= limit.y) { 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;
                }
 
                return true;


@@ -2294,15 +2805,13 @@ L.TileLayer = L.Class.extend({
                var kArr, x, y, key;
 
                for (key in this._tiles) {
                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);

                        }
                }
        },
                        }
                }
        },


@@ -2310,16 +2819,19 @@ L.TileLayer = L.Class.extend({
        _removeTile: function (key) {
                var tile = this._tiles[key];
 
        _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);
 
                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);

                }
 
                }
 

-               if (!L.Browser.android) { //For https://github.com/CloudMade/Leaflet/issues/137
+               // for https://github.com/CloudMade/Leaflet/issues/137
+               if (!L.Browser.android) {
+                       tile.onload = null;

                        tile.src = L.Util.emptyImageUrl;
                }
 
                        tile.src = L.Util.emptyImageUrl;
                }
 


@@ -2332,18 +2844,18 @@ L.TileLayer = L.Class.extend({
                // get unused tile - or create a new tile
                var tile = this._getTile();
 
                // get unused tile - or create a new tile
                var tile = this._getTile();
 

-               // 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
-               L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);
+               /*
+               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
+               (other browsers don't currently care) - see debug/hacks/jitter.html for an example
+               */
+               L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome);

 
                this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
 
                this._loadTile(tile, tilePoint);
 
 
                this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
 
                this._loadTile(tile, tilePoint);
 

-               if (tile.parentNode !== this._container) {
+               if (tile.parentNode !== this._tileContainer) {

                        container.appendChild(tile);
                }
        },
                        container.appendChild(tile);
                }
        },


@@ -2351,18 +2863,20 @@ L.TileLayer = L.Class.extend({
        _getZoomForUrl: function () {
 
                var options = this.options,
        _getZoomForUrl: function () {
 
                var options = this.options,

-                       zoom = this._map.getZoom();
+                   zoom = this._map.getZoom();

 
                if (options.zoomReverse) {
                        zoom = options.maxZoom - zoom;
                }
 
 
                if (options.zoomReverse) {
                        zoom = options.maxZoom - zoom;
                }
 

-               return zoom + options.zoomOffset;
+               zoom += options.zoomOffset;
+
+               return options.maxNativeZoom ? Math.min(zoom, options.maxNativeZoom) : zoom;

        },
 
        _getTilePos: function (tilePoint) {
                var origin = this._map.getPixelOrigin(),
        },
 
        _getTilePos: function (tilePoint) {
                var origin = this._map.getPixelOrigin(),

-                       tileSize = this.options.tileSize;
+                   tileSize = this._getTileSize();

 
                return tilePoint.multiplyBy(tileSize).subtract(origin);
        },
 
                return tilePoint.multiplyBy(tileSize).subtract(origin);
        },


@@ -2370,19 +2884,18 @@ L.TileLayer = L.Class.extend({
        // image-specific code (override to implement e.g. Canvas or SVG tile layer)
 
        getTileUrl: function (tilePoint) {
        // 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.Util.extend({
+               return L.Util.template(this._url, L.extend({

                        s: this._getSubdomain(tilePoint),
                        s: this._getSubdomain(tilePoint),

-                       z: this._getZoomForUrl(),
+                       z: tilePoint.z,

                        x: tilePoint.x,
                        y: tilePoint.y
                }, this.options));
        },
 
        _getWrapTileNum: function () {
                        x: tilePoint.x,
                        y: tilePoint.y
                }, this.options));
        },
 
        _getWrapTileNum: function () {

-               // TODO refactor, limit is not valid for non-standard projections
-               return Math.pow(2, this._getZoomForUrl());
+               var crs = this._map.options.crs,
+                   size = crs.getSize(this._map.getZoom());
+               return size.divideBy(this._getTileSize())._floor();

        },
 
        _adjustTilePoint: function (tilePoint) {
        },
 
        _adjustTilePoint: function (tilePoint) {


@@ -2391,28 +2904,21 @@ L.TileLayer = L.Class.extend({
 
                // wrap tile coordinates
                if (!this.options.continuousWorld && !this.options.noWrap) {
 
                // wrap tile coordinates
                if (!this.options.continuousWorld && !this.options.noWrap) {

-                       tilePoint.x = ((tilePoint.x % limit) + limit) % limit;
+                       tilePoint.x = ((tilePoint.x % limit.x) + limit.x) % limit.x;

                }
 
                if (this.options.tms) {
                }
 
                if (this.options.tms) {

-                       tilePoint.y = limit - tilePoint.y - 1;
+                       tilePoint.y = limit.y - tilePoint.y - 1;

                }
                }

+
+               tilePoint.z = this._getZoomForUrl();

        },
 
        _getSubdomain: function (tilePoint) {
        },
 
        _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];
        },
 
                return this.options.subdomains[index];
        },
 

-       _createTileProto: function () {
-               var img = this._tileImg = L.DomUtil.create('img', 'leaflet-tile');
-               img.galleryimg = 'no';
-
-               var tileSize = this.options.tileSize;
-               img.style.width = tileSize + 'px';
-               img.style.height = tileSize + 'px';
-       },
-

        _getTile: function () {
                if (this.options.reuseTiles && this._unusedTiles.length > 0) {
                        var tile = this._unusedTiles.pop();
        _getTile: function () {
                if (this.options.reuseTiles && this._unusedTiles.length > 0) {
                        var tile = this._unusedTiles.pop();


@@ -2422,13 +2928,24 @@ L.TileLayer = L.Class.extend({
                return this._createTile();
        },
 
                return this._createTile();
        },
 

-       _resetTile: function (tile) {
-               // Override if data stored on a tile needs to be cleaned up before reuse
-       },
+       // Override if data stored on a tile needs to be cleaned up before reuse
+       _resetTile: function (/*tile*/) {},

 
        _createTile: function () {
 
        _createTile: function () {

-               var tile = this._tileImg.cloneNode(false);
+               var tile = L.DomUtil.create('img', 'leaflet-tile');
+               tile.style.width = tile.style.height = this._getTileSize() + 'px';
+               tile.galleryimg = 'no';
+

                tile.onselectstart = tile.onmousemove = L.Util.falseFn;
                tile.onselectstart = tile.onmousemove = L.Util.falseFn;

+
+               if (L.Browser.ielt9 && this.options.opacity !== undefined) {
+                       L.DomUtil.setOpacity(tile, this.options.opacity);
+               }
+               // without this hack, tiles disappear after zoom on Chrome for Android
+               // https://github.com/Leaflet/Leaflet/issues/2078
+               if (L.Browser.mobileWebkit3d) {
+                       tile.style.WebkitBackfaceVisibility = 'hidden';
+               }

                return tile;
        },
 
                return tile;
        },
 


@@ -2437,17 +2954,34 @@ L.TileLayer = L.Class.extend({
                tile.onload  = this._tileOnLoad;
                tile.onerror = this._tileOnError;
 
                tile.onload  = this._tileOnLoad;
                tile.onerror = this._tileOnError;
 

+               this._adjustTilePoint(tilePoint);

                tile.src     = this.getTileUrl(tilePoint);
                tile.src     = this.getTileUrl(tilePoint);

+
+               this.fire('tileloadstart', {
+                       tile: tile,
+                       url: tile.src
+               });

        },
 
        },
 

-    _tileLoaded: function () {
-        this._tilesToLoad--;
-        if (!this._tilesToLoad) {
-            this.fire('load');
-        }
-    },
+       _tileLoaded: function () {
+               this._tilesToLoad--;
+
+               if (this._animated) {
+                       L.DomUtil.addClass(this._tileContainer, 'leaflet-zoom-animated');
+               }
+
+               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 (e) {
+       _tileOnLoad: function () {

                var layer = this._layer;
 
                //Only if we are loading an actual image
                var layer = this._layer;
 
                //Only if we are loading an actual image


@@ -2463,7 +2997,7 @@ L.TileLayer = L.Class.extend({
                layer._tileLoaded();
        },
 
                layer._tileLoaded();
        },
 

-       _tileOnError: function (e) {
+       _tileOnError: function () {

                var layer = this._layer;
 
                layer.fire('tileerror', {
                var layer = this._layer;
 
                layer.fire('tileerror', {


@@ -2476,8 +3010,8 @@ L.TileLayer = L.Class.extend({
                        this.src = newUrl;
                }
 
                        this.src = newUrl;
                }
 

-        layer._tileLoaded();
-    }
+               layer._tileLoaded();
+       }

 });
 
 L.tileLayer = function (url, options) {
 });
 
 L.tileLayer = function (url, options) {


@@ -2485,6 +3019,10 @@ L.tileLayer = function (url, options) {
 };
 
 
 };
 
 

+/*
+ * L.TileLayer.WMS is used for putting WMS tile layers on the map.
+ */
+

 L.TileLayer.WMS = L.TileLayer.extend({
 
        defaultWmsParams: {
 L.TileLayer.WMS = L.TileLayer.extend({
 
        defaultWmsParams: {


@@ -2501,56 +3039,61 @@ L.TileLayer.WMS = L.TileLayer.extend({
 
                this._url = url;
 
 
                this._url = url;
 

-               var wmsParams = L.Util.extend({}, this.defaultWmsParams);
+               var wmsParams = L.extend({}, this.defaultWmsParams),
+                   tileSize = options.tileSize || this.options.tileSize;

 
                if (options.detectRetina && L.Browser.retina) {
 
                if (options.detectRetina && L.Browser.retina) {

-                       wmsParams.width = wmsParams.height = this.options.tileSize * 2;
+                       wmsParams.width = wmsParams.height = tileSize * 2;

                } else {
                } 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
                }
 
                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];
                        }
                }
 
                this.wmsParams = wmsParams;
 
                                wmsParams[i] = options[i];
                        }
                }
 
                this.wmsParams = wmsParams;
 

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

        },
 
        onAdd: function (map) {
 
        },
 
        onAdd: function (map) {
 

-               var projectionKey = parseFloat(this.wmsParams.version) >= 1.3 ? 'crs' : 'srs';
-               this.wmsParams[projectionKey] = map.options.crs.code;
+               this._crs = this.options.crs || map.options.crs;
+
+               this._wmsVersion = parseFloat(this.wmsParams.version);
+
+               var projectionKey = this._wmsVersion >= 1.3 ? 'crs' : 'srs';
+               this.wmsParams[projectionKey] = this._crs.code;

 
                L.TileLayer.prototype.onAdd.call(this, map);
        },
 
 
                L.TileLayer.prototype.onAdd.call(this, map);
        },
 

-       getTileUrl: function (tilePoint, zoom) { // (Point, Number) -> String
+       getTileUrl: function (tilePoint) { // (Point, Number) -> String

 
                var map = this._map,
 
                var map = this._map,

-                       crs = map.options.crs,
-                       tileSize = this.options.tileSize,
-
-                       nwPoint = tilePoint.multiplyBy(tileSize),
-                       sePoint = nwPoint.add(new L.Point(tileSize, tileSize)),
+                   tileSize = this.options.tileSize,

 
 

-                       nw = crs.project(map.unproject(nwPoint, zoom)),
-                       se = crs.project(map.unproject(sePoint, zoom)),
+                   nwPoint = tilePoint.multiplyBy(tileSize),
+                   sePoint = nwPoint.add([tileSize, tileSize]),

 
 

-                       bbox = [nw.x, se.y, se.x, nw.y].join(','),
+                   nw = this._crs.project(map.unproject(nwPoint, tilePoint.z)),
+                   se = this._crs.project(map.unproject(sePoint, tilePoint.z)),
+                   bbox = this._wmsVersion >= 1.3 && this._crs === L.CRS.EPSG4326 ?
+                       [se.y, nw.x, nw.y, se.x].join(',') :
+                       [nw.x, se.y, se.x, nw.y].join(','),

 
 

-                       url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});
+                   url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});

 
 

-               return url + L.Util.getParamString(this.wmsParams) + "&bbox=" + bbox;
+               return url + L.Util.getParamString(this.wmsParams, url, true) + '&BBOX=' + bbox;

        },
 
        setParams: function (params, noRedraw) {
 
        },
 
        setParams: function (params, noRedraw) {
 

-               L.Util.extend(this.wmsParams, params);
+               L.extend(this.wmsParams, params);

 
                if (!noRedraw) {
                        this.redraw();
 
                if (!noRedraw) {
                        this.redraw();


@@ -2565,40 +3108,39 @@ L.tileLayer.wms = function (url, options) {
 };
 
 
 };
 
 

+/*
+ * L.TileLayer.Canvas is a class that you can use as a base for creating
+ * dynamically drawn Canvas-based tile layers.
+ */
+

 L.TileLayer.Canvas = L.TileLayer.extend({
        options: {
                async: false
        },
 
        initialize: function (options) {
 L.TileLayer.Canvas = L.TileLayer.extend({
        options: {
                async: false
        },
 
        initialize: function (options) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

        },
 
        redraw: function () {
        },
 
        redraw: function () {

-               var i,
-                       tiles = this._tiles;
+               if (this._map) {
+                       this._reset({hard: true});
+                       this._update();
+               }

 
 

-               for (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) {
                this.drawTile(tile, tile._tilePoint, this._map._zoom);
        },
 
        },
 
        _redrawTile: function (tile) {
                this.drawTile(tile, tile._tilePoint, this._map._zoom);
        },
 

-       _createTileProto: function () {
-               var proto = this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile');
-
-               var tileSize = this.options.tileSize;
-               proto.width = tileSize;
-               proto.height = tileSize;
-       },
-

        _createTile: function () {
        _createTile: function () {

-               var tile = this._canvasProto.cloneNode(false);
+               var tile = L.DomUtil.create('canvas', 'leaflet-tile');
+               tile.width = tile.height = this.options.tileSize;

                tile.onselectstart = tile.onmousemove = L.Util.falseFn;
                return tile;
        },
                tile.onselectstart = tile.onmousemove = L.Util.falseFn;
                return tile;
        },


@@ -2606,7 +3148,7 @@ L.TileLayer.Canvas = L.TileLayer.extend({
        _loadTile: function (tile, tilePoint) {
                tile._layer = this;
                tile._tilePoint = tilePoint;
        _loadTile: function (tile, tilePoint) {
                tile._layer = this;
                tile._tilePoint = tilePoint;

-               
+

                this._redrawTile(tile);
 
                if (!this.options.async) {
                this._redrawTile(tile);
 
                if (!this.options.async) {


@@ -2614,7 +3156,7 @@ L.TileLayer.Canvas = L.TileLayer.extend({
                }
        },
 
                }
        },
 

-       drawTile: function (tile, tilePoint) {
+       drawTile: function (/*tile, tilePoint*/) {

                // override with rendering code
        },
 
                // override with rendering code
        },
 


@@ -2628,8 +3170,13 @@ L.tileLayer.canvas = function (options) {
        return new L.TileLayer.Canvas(options);
 };
 
        return new L.TileLayer.Canvas(options);
 };
 

-L.ImageOverlay = L.Class.extend({
-       includes: L.Mixin.Events,
+
+/*
+ * L.ImageOverlay is used to overlay images over the map (to specific geographical bounds).
+ */
+
+L.ImageOverlay = L.Class.extend({
+       includes: L.Mixin.Events,

 
        options: {
                opacity: 1
 
        options: {
                opacity: 1


@@ -2639,7 +3186,7 @@ L.ImageOverlay = L.Class.extend({
                this._url = url;
                this._bounds = L.latLngBounds(bounds);
 
                this._url = url;
                this._bounds = L.latLngBounds(bounds);
 

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

        },
 
        onAdd: function (map) {
        },
 
        onAdd: function (map) {


@@ -2697,6 +3244,15 @@ L.ImageOverlay = L.Class.extend({
                return this;
        },
 
                return this;
        },
 

+       setUrl: function (url) {
+               this._url = url;
+               this._image.src = this._url;
+       },
+
+       getAttribution: function () {
+               return this.options.attribution;
+       },
+

        _initImage: function () {
                this._image = L.DomUtil.create('img', 'leaflet-image-layer');
 
        _initImage: function () {
                this._image = L.DomUtil.create('img', 'leaflet-image-layer');
 


@@ -2709,34 +3265,34 @@ L.ImageOverlay = L.Class.extend({
                this._updateOpacity();
 
                //TODO createImage util method to remove duplication
                this._updateOpacity();
 
                //TODO createImage util method to remove duplication

-               L.Util.extend(this._image, {
+               L.extend(this._image, {

                        galleryimg: 'no',
                        onselectstart: L.Util.falseFn,
                        onmousemove: L.Util.falseFn,
                        galleryimg: 'no',
                        onselectstart: L.Util.falseFn,
                        onmousemove: L.Util.falseFn,

-                       onload: L.Util.bind(this._onImageLoad, this),
+                       onload: L.bind(this._onImageLoad, this),

                        src: this._url
                });
        },
 
        _animateZoom: function (e) {
                var map = this._map,
                        src: this._url
                });
        },
 
        _animateZoom: function (e) {
                var map = this._map,

-                       image = this._image,
+                   image = this._image,

                    scale = map.getZoomScale(e.zoom),
                    nw = this._bounds.getNorthWest(),
                    se = this._bounds.getSouthEast(),
 
                    topLeft = map._latLngToNewLayerPoint(nw, e.zoom, e.center),
                    size = map._latLngToNewLayerPoint(se, e.zoom, e.center)._subtract(topLeft),
                    scale = map.getZoomScale(e.zoom),
                    nw = this._bounds.getNorthWest(),
                    se = this._bounds.getSouthEast(),
 
                    topLeft = map._latLngToNewLayerPoint(nw, e.zoom, e.center),
                    size = map._latLngToNewLayerPoint(se, e.zoom, e.center)._subtract(topLeft),

-                   currentSize = map.latLngToLayerPoint(se)._subtract(map.latLngToLayerPoint(nw)),
-                   origin = topLeft._add(size._subtract(currentSize)._divideBy(2));
+                   origin = topLeft._add(size._multiplyBy((1 / 2) * (1 - 1 / scale)));

 
 

-               image.style[L.DomUtil.TRANSFORM] = L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';
+               image.style[L.DomUtil.TRANSFORM] =
+                       L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';

        },
 
        _reset: function () {
                var image   = this._image,
                    topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
        },
 
        _reset: function () {
                var image   = this._image,
                    topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()),

-                   size    = this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(topLeft);
+                   size = this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(topLeft);

 
                L.DomUtil.setPosition(image, topLeft);
 
 
                L.DomUtil.setPosition(image, topLeft);
 


@@ -2758,14 +3314,20 @@ L.imageOverlay = function (url, bounds, options) {
 };
 
 
 };
 
 

+/*
+ * L.Icon is an image-based icon class that you can use with L.Marker for custom markers.
+ */
+

 L.Icon = L.Class.extend({
        options: {
                /*
                iconUrl: (String) (required)
 L.Icon = L.Class.extend({
        options: {
                /*
                iconUrl: (String) (required)

+               iconRetinaUrl: (String) (optional, used for retina devices if detected)

                iconSize: (Point) (can be set through CSS)
                iconSize: (Point) (can be set through CSS)

-               iconAnchor: (Point) (centered by default if size is specified, can be set in CSS with negative margins)
+               iconAnchor: (Point) (centered by default, can be set in CSS with negative margins)

                popupAnchor: (Point) (if not specified, popup opens in the anchor point)
                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)
                */
                shadowSize: (Point)
                shadowAnchor: (Point)
                */


@@ -2773,28 +3335,33 @@ L.Icon = L.Class.extend({
        },
 
        initialize: function (options) {
        },
 
        initialize: function (options) {

-               L.Util.setOptions(this, options);
+               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') {
                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;
                }
 
                        }
                        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;
                this._setIconStyles(img, name);
 
                return img;


@@ -2802,8 +3369,8 @@ L.Icon = L.Class.extend({
 
        _setIconStyles: function (img, name) {
                var options = this.options,
 
        _setIconStyles: function (img, name) {
                var options = this.options,

-                       size = L.point(options[name + 'Size']),
-                       anchor;
+                   size = L.point(options[name + 'Size']),
+                   anchor;

 
                if (name === 'shadow') {
                        anchor = L.point(options.shadowAnchor || options.iconAnchor);
 
                if (name === 'shadow') {
                        anchor = L.point(options.shadowAnchor || options.iconAnchor);


@@ -2828,20 +3395,16 @@ L.Icon = L.Class.extend({
                }
        },
 
                }
        },
 

-       _createImg: function (src) {
-               var el;
-
-               if (!L.Browser.ie6) {
-                       el = document.createElement('img');
-                       el.src = src;
-               } else {
-                       el = document.createElement('div');
-                       el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
-               }
+       _createImg: function (src, el) {
+               el = el || document.createElement('img');
+               el.src = src;

                return el;
        },
 
        _getIconUrl: function (name) {
                return el;
        },
 
        _getIconUrl: function (name) {

+               if (L.Browser.retina && this.options[name + 'RetinaUrl']) {
+                       return this.options[name + 'RetinaUrl'];
+               }

                return this.options[name + 'Url'];
        }
 });
                return this.options[name + 'Url'];
        }
 });


@@ -2851,15 +3414,18 @@ L.icon = function (options) {
 };
 
 
 };
 
 

+/*
+ * L.Icon.Default is the blue marker icon used by default in Leaflet.
+ */

 
 L.Icon.Default = L.Icon.extend({
 
        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) {
        },
 
        _getIconUrl: function (name) {


@@ -2869,10 +3435,14 @@ L.Icon.Default = L.Icon.extend({
                        return this.options[key];
                }
 
                        return this.options[key];
                }
 

+               if (L.Browser.retina && name === 'icon') {
+                       name += '-2x';
+               }
+

                var path = L.Icon.Default.imagePath;
 
                if (!path) {
                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';
                }
 
                return path + '/marker-' + name + '.png';


@@ -2881,16 +3451,17 @@ L.Icon.Default = L.Icon.extend({
 
 L.Icon.Default.imagePath = (function () {
        var scripts = document.getElementsByTagName('script'),
 
 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) {
 
        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';

                }
        }
 }());
                }
        }
 }());


@@ -2907,8 +3478,10 @@ L.Marker = L.Class.extend({
        options: {
                icon: new L.Icon.Default(),
                title: '',
        options: {
                icon: new L.Icon.Default(),
                title: '',

+               alt: '',

                clickable: true,
                draggable: false,
                clickable: true,
                draggable: false,

+               keyboard: true,

                zIndexOffset: 0,
                opacity: 1,
                riseOnHover: false,
                zIndexOffset: 0,
                opacity: 1,
                riseOnHover: false,


@@ -2916,7 +3489,7 @@ L.Marker = L.Class.extend({
        },
 
        initialize: function (latlng, options) {
        },
 
        initialize: function (latlng, options) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

                this._latlng = L.latLng(latlng);
        },
 
                this._latlng = L.latLng(latlng);
        },
 


@@ -2927,6 +3500,7 @@ L.Marker = L.Class.extend({
 
                this._initIcon();
                this.update();
 
                this._initIcon();
                this.update();

+               this.fire('add');

 
                if (map.options.zoomAnimation && map.options.markerZoomAnimation) {
                        map.on('zoomanim', this._animateZoom, this);
 
                if (map.options.zoomAnimation && map.options.markerZoomAnimation) {
                        map.on('zoomanim', this._animateZoom, this);


@@ -2939,7 +3513,12 @@ L.Marker = L.Class.extend({
        },
 
        onRemove: function (map) {
        },
 
        onRemove: function (map) {

+               if (this.dragging) {
+                       this.dragging.disable();
+               }
+

                this._removeIcon();
                this._removeIcon();

+               this._removeShadow();

 
                this.fire('remove');
 
 
                this.fire('remove');
 


@@ -2960,18 +3539,17 @@ L.Marker = L.Class.extend({
 
                this.update();
 
 
                this.update();
 

-               this.fire('move', { latlng: this._latlng });
+               return this.fire('move', { latlng: this._latlng });

        },
 
        setZIndexOffset: function (offset) {
                this.options.zIndexOffset = offset;
                this.update();
        },
 
        setZIndexOffset: function (offset) {
                this.options.zIndexOffset = offset;
                this.update();

+
+               return this;

        },
 
        setIcon: function (icon) {
        },
 
        setIcon: function (icon) {

-               if (this._map) {
-                       this._removeIcon();
-               }

 
                this.options.icon = icon;
 
 
                this.options.icon = icon;
 


@@ -2979,79 +3557,111 @@ L.Marker = L.Class.extend({
                        this._initIcon();
                        this.update();
                }
                        this._initIcon();
                        this.update();
                }

+
+               if (this._popup) {
+                       this.bindPopup(this._popup);
+               }
+
+               return this;

        },
 
        update: function () {
        },
 
        update: function () {

-               if (!this._icon) { return; }
+               if (this._icon) {
+                       var pos = this._map.latLngToLayerPoint(this._latlng).round();
+                       this._setPos(pos);
+               }

 
 

-               var pos = this._map.latLngToLayerPoint(this._latlng).round();
-               this._setPos(pos);
+               return this;

        },
 
        _initIcon: function () {
                var options = this.options,
                    map = this._map,
                    animation = (map.options.zoomAnimation && map.options.markerZoomAnimation),
        },
 
        _initIcon: function () {
                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) {
 
                        if (options.title) {

-                               this._icon.title = options.title;
+                               icon.title = options.title;
+                       }
+                       
+                       if (options.alt) {
+                               icon.alt = options.alt;

                        }
                        }

+               }

 
 

-                       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();
                }
 
                        this._updateOpacity();
                }
 

+

                var panes = this._map._panes;
 
                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 () {
                        panes.shadowPane.appendChild(this._shadow);
                }
        },
 
        _removeIcon: function () {

-               var panes = this._map._panes;
-

                if (this.options.riseOnHover) {
                        L.DomEvent
                if (this.options.riseOnHover) {
                        L.DomEvent

-                               .off(this._icon, 'mouseover', this._bringToFront)
-                               .off(this._icon, 'mouseout', this._resetZIndex);
+                           .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) {
                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) {
        },
 
        _setPos: function (pos) {


@@ -3071,21 +3681,23 @@ L.Marker = L.Class.extend({
        },
 
        _animateZoom: function (opt) {
        },
 
        _animateZoom: function (opt) {

-               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round();

 
                this._setPos(pos);
        },
 
        _initInteraction: function () {
 
                this._setPos(pos);
        },
 
        _initInteraction: function () {

-               if (!this.options.clickable) {
-                       return;
-               }
+
+               if (!this.options.clickable) { return; }
+
+               // TODO refactor into something shared with Map/Path/etc. to DRY it up

 
                var icon = this._icon,
 
                var icon = this._icon,

-                       events = ['dblclick', 'mousedown', 'mouseover', 'mouseout'];
+                   events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'contextmenu'];

 
                L.DomUtil.addClass(icon, 'leaflet-clickable');
                L.DomEvent.on(icon, 'click', this._onMouseClick, this);
 
                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);
 
                for (var i = 0; i < events.length; i++) {
                        L.DomEvent.on(icon, events[i], this._fireMouseEvent, this);


@@ -3101,22 +3713,47 @@ L.Marker = L.Class.extend({
        },
 
        _onMouseClick: function (e) {
        },
 
        _onMouseClick: function (e) {

-               if (this.hasEventListeners(e.type)) {
+               var wasDragged = this.dragging && this.dragging.moved();
+
+               if (this.hasEventListeners(e.type) || wasDragged) {

                        L.DomEvent.stopPropagation(e);
                }
                        L.DomEvent.stopPropagation(e);
                }

-               if (this.dragging && this.dragging.moved()) { return; }
-               if (this._map.dragging && this._map.dragging.moved()) { return; }
+
+               if (wasDragged) { return; }
+
+               if ((!this.dragging || !this.dragging._enabled) && this._map.dragging && this._map.dragging.moved()) { return; }
+

                this.fire(e.type, {
                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) {
        _fireMouseEvent: function (e) {

+

                this.fire(e.type, {
                this.fire(e.type, {

-                       originalEvent: e
+                       originalEvent: e,
+                       latlng: this._latlng

                });
                });

+
+               // TODO proper custom event propagation
+               // this line will always be called if marker is in a FeatureGroup
+               if (e.type === 'contextmenu' && this.hasEventListeners(e.type)) {
+                       L.DomEvent.preventDefault(e);
+               }

                if (e.type !== 'mousedown') {
                        L.DomEvent.stopPropagation(e);
                if (e.type !== 'mousedown') {
                        L.DomEvent.stopPropagation(e);

+               } else {
+                       L.DomEvent.preventDefault(e);

                }
        },
 
                }
        },
 


@@ -3125,6 +3762,8 @@ L.Marker = L.Class.extend({
                if (this._map) {
                        this._updateOpacity();
                }
                if (this._map) {
                        this._updateOpacity();
                }

+
+               return this;

        },
 
        _updateOpacity: function () {
        },
 
        _updateOpacity: function () {


@@ -3148,29 +3787,37 @@ L.marker = function (latlng, options) {
 };
 
 
 };
 
 

+/*
+ * L.DivIcon is a lightweight HTML-based icon class (as opposed to the image-based L.Icon)
+ * to use with L.Marker.
+ */
+

 L.DivIcon = L.Icon.extend({
        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)
                */
                /*
                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;
 
                    options = this.options;
 

-               if (options.html) {
+               if (options.html !== false) {

                        div.innerHTML = options.html;
                        div.innerHTML = options.html;

+               } else {
+                       div.innerHTML = '';

                }
 
                if (options.bgPos) {
                        div.style.backgroundPosition =
                }
 
                if (options.bgPos) {
                        div.style.backgroundPosition =

-                                       (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
+                               (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';

                }
 
                this._setIconStyles(div, 'icon');
                }
 
                this._setIconStyles(div, 'icon');


@@ -3187,6 +3834,9 @@ L.divIcon = function (options) {
 };
 
 
 };
 
 

+/*
+ * L.Popup is used for displaying popups on the map.
+ */

 
 L.Map.mergeOptions({
        closePopupOnClick: true
 
 L.Map.mergeOptions({
        closePopupOnClick: true


@@ -3198,18 +3848,24 @@ L.Popup = L.Class.extend({
        options: {
                minWidth: 50,
                maxWidth: 300,
        options: {
                minWidth: 50,
                maxWidth: 300,

-               maxHeight: null,
+               // maxHeight: null,

                autoPan: true,
                closeButton: true,
                autoPan: true,
                closeButton: true,

-               offset: new L.Point(0, 6),
-               autoPanPadding: new L.Point(5, 5),
-               className: ''
+               offset: [0, 7],
+               autoPanPadding: [5, 5],
+               // autoPanPaddingTopLeft: null,
+               // autoPanPaddingBottomRight: null,
+               keepInView: false,
+               className: '',
+               zoomAnimation: true

        },
 
        initialize: function (options, source) {
        },
 
        initialize: function (options, source) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

 
                this._source = source;
 
                this._source = source;

+               this._animated = L.Browser.any3d && this.options.zoomAnimation;
+               this._isOpen = false;

        },
 
        onAdd: function (map) {
        },
 
        onAdd: function (map) {


@@ -3218,7 +3874,6 @@ L.Popup = L.Class.extend({
                if (!this._container) {
                        this._initLayout();
                }
                if (!this._container) {
                        this._initLayout();
                }

-               this._updateContent();

 
                var animFade = map.options.fadeAnimation;
 
 
                var animFade = map.options.fadeAnimation;
 


@@ -3227,20 +3882,20 @@ L.Popup = L.Class.extend({
                }
                map._panes.popupPane.appendChild(this._container);
 
                }
                map._panes.popupPane.appendChild(this._container);
 

-               map.on('viewreset', this._updatePosition, this);
+               map.on(this._getEvents(), this);

 
 

-               if (L.Browser.any3d) {
-                       map.on('zoomanim', this._zoomAnimation, this);
-               }
+               this.update();

 
 

-               if (map.options.closePopupOnClick) {
-                       map.on('preclick', this._close, this);
+               if (animFade) {
+                       L.DomUtil.setOpacity(this._container, 1);

                }
 
                }
 

-               this._update();
+               this.fire('open');

 
 

-               if (animFade) {
-                       L.DomUtil.setOpacity(this._container, 1);
+               map.fire('popupopen', {popup: this});
+
+               if (this._source) {
+                       this._source.fire('popupopen', {popup: this});

                }
        },
 
                }
        },
 


@@ -3259,80 +3914,114 @@ L.Popup = L.Class.extend({
 
                L.Util.falseFn(this._container.offsetWidth); // force reflow
 
 
                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;
 
                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});
+               }
+       },
+
+       getLatLng: function () {
+               return this._latlng;

        },
 
        setLatLng: function (latlng) {
                this._latlng = L.latLng(latlng);
        },
 
        setLatLng: function (latlng) {
                this._latlng = L.latLng(latlng);

-               this._update();
+               if (this._map) {
+                       this._updatePosition();
+                       this._adjustPan();
+               }

                return this;
        },
 
                return this;
        },
 

+       getContent: function () {
+               return this._content;
+       },
+

        setContent: function (content) {
                this._content = content;
        setContent: function (content) {
                this._content = content;

-               this._update();
+               this.update();

                return this;
        },
 
                return this;
        },
 

-       _close: function () {
-               var map = this._map;
+       update: function () {
+               if (!this._map) { return; }

 
 

-               if (map) {
-                       map._popup = null;
+               this._container.style.visibility = 'hidden';

 
 

-                       map
-                               .removeLayer(this)
-                               .fire('popupclose', {popup: this});
+               this._updateContent();
+               this._updateLayout();
+               this._updatePosition();
+
+               this._container.style.visibility = '';
+
+               this._adjustPan();
+       },
+
+       _getEvents: function () {
+               var events = {
+                       viewreset: this._updatePosition
+               };
+
+               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;
+               }
+
+               return events;
+       },
+
+       _close: function () {
+               if (this._map) {
+                       this._map.closePopup(this);

                }
        },
 
        _initLayout: function () {
                var prefix = 'leaflet-popup',
                }
        },
 
        _initLayout: function () {
                var prefix = 'leaflet-popup',

-                       container = this._container = L.DomUtil.create('div', prefix + ' ' + this.options.className + ' leaflet-zoom-animated'),
+                       containerClass = prefix + ' ' + this.options.className + ' leaflet-zoom-' +
+                               (this._animated ? 'animated' : 'hide'),
+                       container = this._container = L.DomUtil.create('div', containerClass),

                        closeButton;
 
                if (this.options.closeButton) {
                        closeButton;
 
                if (this.options.closeButton) {

-                       closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
+                       closeButton = this._closeButton =
+                               L.DomUtil.create('a', prefix + '-close-button', container);

                        closeButton.href = '#close';
                        closeButton.innerHTML = '&#215;';
                        closeButton.href = '#close';
                        closeButton.innerHTML = '&#215;';

+                       L.DomEvent.disableClickPropagation(closeButton);

 
                        L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
                }
 
 
                        L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
                }
 

-               var wrapper = this._wrapper = L.DomUtil.create('div', prefix + '-content-wrapper', container);
+               var wrapper = this._wrapper =
+                       L.DomUtil.create('div', prefix + '-content-wrapper', container);

                L.DomEvent.disableClickPropagation(wrapper);
 
                this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
                L.DomEvent.disableClickPropagation(wrapper);
 
                this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);

-               L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation);
+
+               L.DomEvent.disableScrollPropagation(this._contentNode);
+               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);
        },
 
 
                this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
                this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
        },
 

-       _update: function () {
-               if (!this._map) { return; }
-
-               this._container.style.visibility = 'hidden';
-
-               this._updateContent();
-               this._updateLayout();
-               this._updatePosition();
-
-               this._container.style.visibility = '';
-
-               this._adjustPan();
-       },
-

        _updateContent: function () {
                if (!this._content) { return; }
 
        _updateContent: function () {
                if (!this._content) { return; }
 


@@ -3349,7 +4038,7 @@ L.Popup = L.Class.extend({
 
        _updateLayout: function () {
                var container = this._contentNode,
 
        _updateLayout: function () {
                var container = this._contentNode,

-                       style = container.style;
+                   style = container.style;

 
                style.width = '';
                style.whiteSpace = 'nowrap';
 
                style.width = '';
                style.whiteSpace = 'nowrap';


@@ -3364,8 +4053,8 @@ L.Popup = L.Class.extend({
                style.height = '';
 
                var height = container.offsetHeight,
                style.height = '';
 
                var height = container.offsetHeight,

-                       maxHeight = this.options.maxHeight,
-                       scrolledClass = 'leaflet-popup-scrolled';
+                   maxHeight = this.options.maxHeight,
+                   scrolledClass = 'leaflet-popup-scrolled';

 
                if (maxHeight && height > maxHeight) {
                        style.height = maxHeight + 'px';
 
                if (maxHeight && height > maxHeight) {
                        style.height = maxHeight + 'px';


@@ -3381,17 +4070,17 @@ L.Popup = L.Class.extend({
                if (!this._map) { return; }
 
                var pos = this._map.latLngToLayerPoint(this._latlng),
                if (!this._map) { return; }
 
                var pos = this._map.latLngToLayerPoint(this._latlng),

-                       is3d = L.Browser.any3d,
-                       offset = this.options.offset;
+                   animated = this._animated,
+                   offset = L.point(this.options.offset);

 
 

-               if (is3d) {
+               if (animated) {

                        L.DomUtil.setPosition(this._container, pos);
                }
 
                        L.DomUtil.setPosition(this._container, pos);
                }
 

-               this._containerBottom = -offset.y - (is3d ? 0 : pos.y);
-               this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (is3d ? 0 : pos.x);
+               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';
        },
                this._container.style.bottom = this._containerBottom + 'px';
                this._container.style.left = this._containerLeft + 'px';
        },


@@ -3406,36 +4095,40 @@ L.Popup = L.Class.extend({
                if (!this.options.autoPan) { return; }
 
                var map = this._map,
                if (!this.options.autoPan) { return; }
 
                var map = this._map,

-                       containerHeight = this._container.offsetHeight,
-                       containerWidth = this._containerWidth,
+                   containerHeight = this._container.offsetHeight,
+                   containerWidth = this._containerWidth,

 
 

-                       layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);
+                   layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);

 
 

-               if (L.Browser.any3d) {
+               if (this._animated) {

                        layerPos._add(L.DomUtil.getPosition(this._container));
                }
 
                var containerPos = map.layerPointToContainerPoint(layerPos),
                        layerPos._add(L.DomUtil.getPosition(this._container));
                }
 
                var containerPos = map.layerPointToContainerPoint(layerPos),

-                       padding = this.options.autoPanPadding,
-                       size = map.getSize(),
-                       dx = 0,
-                       dy = 0;
+                   padding = L.point(this.options.autoPanPadding),
+                   paddingTL = L.point(this.options.autoPanPaddingTopLeft || padding),
+                   paddingBR = L.point(this.options.autoPanPaddingBottomRight || padding),
+                   size = map.getSize(),
+                   dx = 0,
+                   dy = 0;

 
 

-               if (containerPos.x < 0) {
-                       dx = containerPos.x - padding.x;
+               if (containerPos.x + containerWidth + paddingBR.x > size.x) { // right
+                       dx = containerPos.x + containerWidth - size.x + paddingBR.x;

                }
                }

-               if (containerPos.x + containerWidth > size.x) {
-                       dx = containerPos.x + containerWidth - size.x + padding.x;
+               if (containerPos.x - dx - paddingTL.x < 0) { // left
+                       dx = containerPos.x - paddingTL.x;

                }
                }

-               if (containerPos.y < 0) {
-                       dy = containerPos.y - padding.y;
+               if (containerPos.y + containerHeight + paddingBR.y > size.y) { // bottom
+                       dy = containerPos.y + containerHeight - size.y + paddingBR.y;

                }
                }

-               if (containerPos.y + containerHeight > size.y) {
-                       dy = containerPos.y + containerHeight - size.y + padding.y;
+               if (containerPos.y - dy - paddingTL.y < 0) { // top
+                       dy = containerPos.y - paddingTL.y;

                }
 
                if (dx || dy) {
                }
 
                if (dx || dy) {

-                       map.panBy(new L.Point(dx, dy));
+                       map
+                           .fire('autopanstart')
+                           .panBy([dx, dy]);

                }
        },
 
                }
        },
 


@@ -3450,13 +4143,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 openPopup & bindPopup methods.
+ * Popup extension to L.Marker, adding popup-related methods.

  */
 
 L.Marker.include({
        openPopup: function () {
  */
 
 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);
                }
                        this._popup.setLatLng(this._latlng);
                        this._map.openPopup(this._popup);
                }


@@ -3471,8 +4195,19 @@ L.Marker.include({
                return this;
        },
 
                return this;
        },
 

+       togglePopup: function () {
+               if (this._popup) {
+                       if (this._popup._isOpen) {
+                               this.closePopup();
+                       } else {
+                               this.openPopup();
+                       }
+               }
+               return this;
+       },
+

        bindPopup: function (content, options) {
        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);
 
 
                anchor = anchor.add(L.Popup.prototype.options.offset);
 


@@ -3480,18 +4215,31 @@ L.Marker.include({
                        anchor = anchor.add(options.offset);
                }
 
                        anchor = anchor.add(options.offset);
                }
 

-               options = L.Util.extend({offset: anchor}, options);
+               options = L.extend({offset: anchor}, options);

 
 

-               if (!this._popup) {
+               if (!this._popupHandlersAdded) {

                        this
                        this

-                               .on('click', this.openPopup, this)
-                               .on('remove', this.closePopup, this)
-                               .on('move', this._movePopup, this);
+                           .on('click', this.togglePopup, this)
+                           .on('remove', this.closePopup, this)
+                           .on('move', this._movePopup, this);
+                       this._popupHandlersAdded = true;
+               }
+
+               if (content instanceof L.Popup) {
+                       L.setOptions(content, options);
+                       this._popup = content;
+               } else {
+                       this._popup = new L.Popup(options, this)
+                               .setContent(content);

                }
 
                }
 

-               this._popup = new L.Popup(options, this)
-                       .setContent(content);
+               return this;
+       },

 
 

+       setPopupContent: function (content) {
+               if (this._popup) {
+                       this._popup.setContent(content);
+               }

                return this;
        },
 
                return this;
        },
 


@@ -3499,41 +4247,27 @@ L.Marker.include({
                if (this._popup) {
                        this._popup = null;
                        this
                if (this._popup) {
                        this._popup = null;
                        this

-                               .off('click', this.openPopup)
-                               .off('remove', this.closePopup)
-                               .off('move', this._movePopup);
+                           .off('click', this.togglePopup, this)
+                           .off('remove', this.closePopup, this)
+                           .off('move', this._movePopup, this);
+                       this._popupHandlersAdded = false;

                }
                return this;
        },
 
                }
                return this;
        },
 

+       getPopup: function () {
+               return this._popup;
+       },
+

        _movePopup: function (e) {
                this._popup.setLatLng(e.latlng);
        }
 });
 
 
        _movePopup: function (e) {
                this._popup.setLatLng(e.latlng);
        }
 });
 
 

-
-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 so you can manipulate the group (e.g. add/remove it) as one layer.
+ * 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.

  */
 
 L.LayerGroup = L.Class.extend({
  */
 
 L.LayerGroup = L.Class.extend({


@@ -3550,7 +4284,7 @@ L.LayerGroup = L.Class.extend({
        },
 
        addLayer: function (layer) {
        },
 
        addLayer: function (layer) {

-               var id = L.Util.stamp(layer);
+               var id = this.getLayerId(layer);

 
                this._layers[id] = layer;
 
 
                this._layers[id] = layer;
 


@@ -3562,17 +4296,23 @@ L.LayerGroup = L.Class.extend({
        },
 
        removeLayer: function (layer) {
        },
 
        removeLayer: function (layer) {

-               var id = L.Util.stamp(layer);
+               var id = layer in this._layers ? layer : this.getLayerId(layer);

 
 

-               delete this._layers[id];
-
-               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;
        },
 
                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;
        clearLayers: function () {
                this.eachLayer(this.removeLayer, this);
                return this;


@@ -3580,15 +4320,13 @@ L.LayerGroup = L.Class.extend({
 
        invoke: function (methodName) {
                var args = Array.prototype.slice.call(arguments, 1),
 
        invoke: function (methodName) {
                var args = Array.prototype.slice.call(arguments, 1),

-                       i, layer;
+                   i, layer;

 
                for (i in this._layers) {
 
                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);

                        }
                }
 
                        }
                }
 


@@ -3612,10 +4350,30 @@ L.LayerGroup = L.Class.extend({
 
        eachLayer: function (method, context) {
                for (var i in this._layers) {
 
        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);

        }
 });
 
        }
 });
 


@@ -3625,43 +4383,67 @@ L.layerGroup = function (layers) {
 
 
 /*
 
 
 /*

- * L.FeatureGroup extends L.LayerGroup by introducing mouse events and bindPopup method shared between a group of layers.
+ * L.FeatureGroup extends L.LayerGroup by introducing mouse events and additional methods
+ * shared between a group of interactive layers (like vectors or markers).

  */
 
 L.FeatureGroup = L.LayerGroup.extend({
        includes: L.Mixin.Events,
 
  */
 
 L.FeatureGroup = L.LayerGroup.extend({
        includes: L.Mixin.Events,
 

+       statics: {
+               EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose'
+       },
+

        addLayer: function (layer) {
        addLayer: function (layer) {

-               if (this._layers[L.Util.stamp(layer)]) {
+               if (this.hasLayer(layer)) {

                        return this;
                }
 
                        return this;
                }
 

-               layer.on('click dblclick mouseover mouseout mousemove contextmenu', this._propagateEvent, this);
+               if ('on' in layer) {
+                       layer.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+               }

 
                L.LayerGroup.prototype.addLayer.call(this, layer);
 
                if (this._popupContent && layer.bindPopup) {
 
                L.LayerGroup.prototype.addLayer.call(this, layer);
 
                if (this._popupContent && layer.bindPopup) {

-                       layer.bindPopup(this._popupContent);
+                       layer.bindPopup(this._popupContent, this._popupOptions);

                }
 
                }
 

-               return this;
+               return this.fire('layeradd', {layer: layer});

        },
 
        removeLayer: function (layer) {
        },
 
        removeLayer: function (layer) {

-               layer.off('click dblclick mouseover mouseout mousemove contextmenu', this._propagateEvent, this);
+               if (!this.hasLayer(layer)) {
+                       return this;
+               }
+               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) {
 
                L.LayerGroup.prototype.removeLayer.call(this, layer);
 
                if (this._popupContent) {

-                       return this.invoke('unbindPopup');
-               } else {
-                       return this;
+                       this.invoke('unbindPopup');

                }
                }

-       },

 
 

-       bindPopup: function (content) {
+               return this.fire('layerremove', {layer: layer});
+       },
+
+       bindPopup: function (content, options) {

                this._popupContent = content;
                this._popupContent = content;

-               return this.invoke('bindPopup', content);
+               this._popupOptions = options;
+               return this.invoke('bindPopup', content, options);
+       },
+
+       openPopup: function (latlng) {
+               // open popup on the first layer
+               for (var id in this._layers) {
+                       this._layers[id].openPopup(latlng);
+                       break;
+               }
+               return this;

        },
 
        setStyle: function (style) {
        },
 
        setStyle: function (style) {


@@ -3678,16 +4460,19 @@ L.FeatureGroup = L.LayerGroup.extend({
 
        getBounds: function () {
                var bounds = new L.LatLngBounds();
 
        getBounds: function () {
                var bounds = new L.LatLngBounds();

+

                this.eachLayer(function (layer) {
                        bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds());
                this.eachLayer(function (layer) {
                        bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds());

-               }, this);
+               });
+

                return bounds;
        },
 
        _propagateEvent: function (e) {
                return bounds;
        },
 
        _propagateEvent: function (e) {

-               e.layer  = e.target;
-               e.target = this;
-
+               e = L.extend({
+                       layer: e.target,
+                       target: this
+               }, e);

                this.fire(e.type, e);
        }
 });
                this.fire(e.type, e);
        }
 });


@@ -3698,7 +4483,7 @@ L.featureGroup = function (layers) {
 
 
 /*
 
 
 /*

- * L.Path is a base class for rendering vector paths on a map. It's inherited by Polyline, Circle, etc.
+ * L.Path is a base class for rendering vector paths on a map. Inherited by Polyline, Circle, etc.

  */
 
 L.Path = L.Class.extend({
  */
 
 L.Path = L.Class.extend({


@@ -3707,17 +4492,20 @@ L.Path = L.Class.extend({
        statics: {
                // how much to extend the clip area around the map view
                // (relative to its size, e.g. 0.5 is half the screen in each direction)
        statics: {
                // how much to extend the clip area around the map view
                // (relative to its size, e.g. 0.5 is half the screen in each direction)

-               // set in such way that SVG element doesn't exceed 1280px (vector layers flicker on dragend if it is)
-               CLIP_PADDING: L.Browser.mobile ?
-                       Math.max(0, Math.min(0.5,
-                               (1280 / Math.max(window.innerWidth, window.innerHeight) - 1) / 2))
-                       : 0.5
+               // set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)
+               CLIP_PADDING: (function () {
+                       var max = L.Browser.mobile ? 1280 : 2000,
+                           target = (max / Math.max(window.outerWidth, window.outerHeight) - 1) / 2;
+                       return Math.max(0, Math.min(0.5, target));
+               })()

        },
 
        options: {
                stroke: true,
                color: '#0033ff',
                dashArray: null,
        },
 
        options: {
                stroke: true,
                color: '#0033ff',
                dashArray: null,

+               lineCap: null,
+               lineJoin: null,

                weight: 5,
                opacity: 0.5,
 
                weight: 5,
                opacity: 0.5,
 


@@ -3729,7 +4517,7 @@ L.Path = L.Class.extend({
        },
 
        initialize: function (options) {
        },
 
        initialize: function (options) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

        },
 
        onAdd: function (map) {
        },
 
        onAdd: function (map) {


@@ -3747,6 +4535,8 @@ L.Path = L.Class.extend({
                        this._map._pathRoot.appendChild(this._container);
                }
 
                        this._map._pathRoot.appendChild(this._container);
                }
 

+               this.fire('add');
+

                map.on({
                        'viewreset': this.projectLatlngs,
                        'moveend': this._updatePath
                map.on({
                        'viewreset': this.projectLatlngs,
                        'moveend': this._updatePath


@@ -3761,6 +4551,8 @@ L.Path = L.Class.extend({
        onRemove: function (map) {
                map._pathRoot.removeChild(this._container);
 
        onRemove: function (map) {
                map._pathRoot.removeChild(this._container);
 

+               // Need to fire remove event before we set _map to null as the event hooks might need the object
+               this.fire('remove');

                this._map = null;
 
                if (L.Browser.vml) {
                this._map = null;
 
                if (L.Browser.vml) {


@@ -3769,8 +4561,6 @@ L.Path = L.Class.extend({
                        this._fill = null;
                }
 
                        this._fill = null;
                }
 

-               this.fire('remove');
-

                map.off({
                        'viewreset': this.projectLatlngs,
                        'moveend': this._updatePath
                map.off({
                        'viewreset': this.projectLatlngs,
                        'moveend': this._updatePath


@@ -3782,7 +4572,7 @@ L.Path = L.Class.extend({
        },
 
        setStyle: function (style) {
        },
 
        setStyle: function (style) {

-               L.Util.setOptions(this, style);
+               L.setOptions(this, style);

 
                if (this._container) {
                        this._updateStyle();
 
                if (this._container) {
                        this._updateStyle();


@@ -3803,16 +4593,20 @@ L.Path = L.Class.extend({
 L.Map.include({
        _updatePathViewport: function () {
                var p = L.Path.CLIP_PADDING,
 L.Map.include({
        _updatePathViewport: function () {
                var p = L.Path.CLIP_PADDING,

-                       size = this.getSize(),
-                       panePos = L.DomUtil.getPosition(this._mapPane),
-                       min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),
-                       max = min.add(size.multiplyBy(1 + p * 2)._round());
+                   size = this.getSize(),
+                   panePos = L.DomUtil.getPosition(this._mapPane),
+                   min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),
+                   max = min.add(size.multiplyBy(1 + p * 2)._round());

 
                this._pathViewport = new L.Bounds(min, max);
        }
 });
 
 
 
                this._pathViewport = new L.Bounds(min, max);
        }
 });
 
 

+/*
+ * Extends L.Path with SVG-specific rendering code.
+ */
+

 L.Path.SVG_NS = 'http://www.w3.org/2000/svg';
 
 L.Browser.svg = !!(document.createElementNS && document.createElementNS(L.Path.SVG_NS, 'svg').createSVGRect);
 L.Path.SVG_NS = 'http://www.w3.org/2000/svg';
 
 L.Browser.svg = !!(document.createElementNS && document.createElementNS(L.Path.SVG_NS, 'svg').createSVGRect);


@@ -3824,7 +4618,7 @@ L.Path = L.Path.extend({
 
        bringToFront: function () {
                var root = this._map._pathRoot,
 
        bringToFront: function () {
                var root = this._map._pathRoot,

-                       path = this._container;
+                   path = this._container;

 
                if (path && root.lastChild !== path) {
                        root.appendChild(path);
 
                if (path && root.lastChild !== path) {
                        root.appendChild(path);


@@ -3834,8 +4628,8 @@ L.Path = L.Path.extend({
 
        bringToBack: function () {
                var root = this._map._pathRoot,
 
        bringToBack: function () {
                var root = this._map._pathRoot,

-                       path = this._container,
-                       first = root.firstChild;
+                   path = this._container,
+                   first = root.firstChild;

 
                if (path && first !== path) {
                        root.insertBefore(path, first);
 
                if (path && first !== path) {
                        root.insertBefore(path, first);


@@ -3861,6 +4655,11 @@ L.Path = L.Path.extend({
                this._container = this._createElement('g');
 
                this._path = this._createElement('path');
                this._container = this._createElement('g');
 
                this._path = this._createElement('path');

+
+               if (this.options.className) {
+                       L.DomUtil.addClass(this._path, this.options.className);
+               }
+

                this._container.appendChild(this._path);
        },
 
                this._container.appendChild(this._path);
        },
 


@@ -3872,6 +4671,12 @@ L.Path = L.Path.extend({
                if (this.options.fill) {
                        this._path.setAttribute('fill-rule', 'evenodd');
                }
                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();
        },
 
                this._updateStyle();
        },
 


@@ -3885,6 +4690,12 @@ L.Path = L.Path.extend({
                        } else {
                                this._path.removeAttribute('stroke-dasharray');
                        }
                        } else {
                                this._path.removeAttribute('stroke-dasharray');
                        }

+                       if (this.options.lineCap) {
+                               this._path.setAttribute('stroke-linecap', this.options.lineCap);
+                       }
+                       if (this.options.lineJoin) {
+                               this._path.setAttribute('stroke-linejoin', this.options.lineJoin);
+                       }

                } else {
                        this._path.setAttribute('stroke', 'none');
                }
                } else {
                        this._path.setAttribute('stroke', 'none');
                }


@@ -3909,12 +4720,13 @@ L.Path = L.Path.extend({
        _initEvents: function () {
                if (this.options.clickable) {
                        if (L.Browser.svg || !L.Browser.vml) {
        _initEvents: function () {
                if (this.options.clickable) {
                        if (L.Browser.svg || !L.Browser.vml) {

-                               this._path.setAttribute('class', 'leaflet-clickable');
+                               L.DomUtil.addClass(this._path, 'leaflet-clickable');

                        }
 
                        L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
 
                        }
 
                        L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
 

-                       var events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'mousemove', 'contextmenu'];
+                       var events = ['dblclick', 'mousedown', 'mouseover',
+                                     'mouseout', 'mousemove', 'contextmenu'];

                        for (var i = 0; i < events.length; i++) {
                                L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
                        }
                        for (var i = 0; i < events.length; i++) {
                                L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
                        }


@@ -3922,22 +4734,18 @@ L.Path = L.Path.extend({
        },
 
        _onMouseClick: function (e) {
        },
 
        _onMouseClick: function (e) {

-               if (this._map.dragging && this._map.dragging.moved()) {
-                       return;
-               }
+               if (this._map.dragging && this._map.dragging.moved()) { return; }

 
                this._fireMouseEvent(e);
        },
 
        _fireMouseEvent: function (e) {
 
                this._fireMouseEvent(e);
        },
 
        _fireMouseEvent: function (e) {

-               if (!this.hasEventListeners(e.type)) {
-                       return;
-               }
+               if (!this.hasEventListeners(e.type)) { return; }

 
                var map = this._map,
 
                var map = this._map,

-                       containerPoint = map.mouseEventToContainerPoint(e),
-                       layerPoint = map.containerPointToLayerPoint(containerPoint),
-                       latlng = map.layerPointToLatLng(layerPoint);
+                   containerPoint = map.mouseEventToContainerPoint(e),
+                   layerPoint = map.containerPointToLayerPoint(containerPoint),
+                   latlng = map.layerPointToLatLng(layerPoint);

 
                this.fire(e.type, {
                        latlng: latlng,
 
                this.fire(e.type, {
                        latlng: latlng,


@@ -3949,7 +4757,9 @@ L.Path = L.Path.extend({
                if (e.type === 'contextmenu') {
                        L.DomEvent.preventDefault(e);
                }
                if (e.type === 'contextmenu') {
                        L.DomEvent.preventDefault(e);
                }

-               L.DomEvent.stopPropagation(e);
+               if (e.type !== 'mousemove') {
+                       L.DomEvent.stopPropagation(e);
+               }

        }
 });
 
        }
 });
 


@@ -3960,14 +4770,14 @@ L.Map.include({
                        this._panes.overlayPane.appendChild(this._pathRoot);
 
                        if (this.options.zoomAnimation && L.Browser.any3d) {
                        this._panes.overlayPane.appendChild(this._pathRoot);
 
                        if (this.options.zoomAnimation && L.Browser.any3d) {

-                               this._pathRoot.setAttribute('class', ' leaflet-zoom-animated');
+                               L.DomUtil.addClass(this._pathRoot, 'leaflet-zoom-animated');

 
                                this.on({
                                        'zoomanim': this._animatePathZoom,
                                        'zoomend': this._endPathZoom
                                });
                        } else {
 
                                this.on({
                                        'zoomanim': this._animatePathZoom,
                                        'zoomend': this._endPathZoom
                                });
                        } else {

-                               this._pathRoot.setAttribute('class', ' leaflet-zoom-hide');
+                               L.DomUtil.addClass(this._pathRoot, 'leaflet-zoom-hide');

                        }
 
                        this.on('moveend', this._updateSvgViewport);
                        }
 
                        this.on('moveend', this._updateSvgViewport);


@@ -3975,13 +4785,12 @@ L.Map.include({
                }
        },
 
                }
        },
 

-       _animatePathZoom: function (opt) {
-               var scale = this.getZoomScale(opt.zoom),
-                       offset = this._getCenterOffset(opt.center),
-                       translate = offset.multiplyBy(-scale)._add(this._pathViewport.min);
+       _animatePathZoom: function (e) {
+               var scale = this.getZoomScale(e.zoom),
+                   offset = this._getCenterOffset(e.center)._multiplyBy(-scale)._add(this._pathViewport.min);

 
                this._pathRoot.style[L.DomUtil.TRANSFORM] =
 
                this._pathRoot.style[L.DomUtil.TRANSFORM] =

-                               L.DomUtil.getTranslateString(translate) + ' scale(' + scale + ') ';
+                       L.DomUtil.getTranslateString(offset) + ' scale(' + scale + ') ';

 
                this._pathZooming = true;
        },
 
                this._pathZooming = true;
        },


@@ -3991,6 +4800,7 @@ L.Map.include({
        },
 
        _updateSvgViewport: function () {
        },
 
        _updateSvgViewport: function () {

+

                if (this._pathZooming) {
                        // Do not update SVGs while a zoom animation is going on otherwise the animation will break.
                        // When the zoom animation ends we will be updated again anyway
                if (this._pathZooming) {
                        // Do not update SVGs while a zoom animation is going on otherwise the animation will break.
                        // When the zoom animation ends we will be updated again anyway


@@ -4001,12 +4811,12 @@ L.Map.include({
                this._updatePathViewport();
 
                var vp = this._pathViewport,
                this._updatePathViewport();
 
                var vp = this._pathViewport,

-                       min = vp.min,
-                       max = vp.max,
-                       width = max.x - min.x,
-                       height = max.y - min.y,
-                       root = this._pathRoot,
-                       pane = this._panes.overlayPane;
+                   min = vp.min,
+                   max = vp.max,
+                   width = max.x - min.x,
+                   height = max.y - min.y,
+                   root = this._pathRoot,
+                   pane = this._panes.overlayPane;

 
                // Hack to make flicker on drag end on mobile webkit less irritating
                if (L.Browser.mobileWebkit) {
 
                // Hack to make flicker on drag end on mobile webkit less irritating
                if (L.Browser.mobileWebkit) {


@@ -4026,23 +4836,27 @@ L.Map.include({
 
 
 /*
 
 
 /*

- * Popup extension to L.Path (polylines, polygons, circles), adding bindPopup method.
+ * Popup extension to L.Path (polylines, polygons, circles), adding popup-related methods.

  */
 
 L.Path.include({
 
        bindPopup: function (content, options) {
 
  */
 
 L.Path.include({
 
        bindPopup: function (content, options) {
 

-               if (!this._popup || this._popup.options !== 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
                if (!this._popupHandlersAdded) {
                        this

-                               .on('click', this._openPopup, this)
-                               .on('remove', this._closePopup, this);
+                           .on('click', this._openPopup, this)
+                           .on('remove', this.closePopup, this);
+

                        this._popupHandlersAdded = true;
                }
 
                        this._popupHandlersAdded = true;
                }
 


@@ -4053,8 +4867,10 @@ L.Path.include({
                if (this._popup) {
                        this._popup = null;
                        this
                if (this._popup) {
                        this._popup = null;
                        this

-                               .off('click', this.openPopup)
-                               .off('remove', this.closePopup);
+                           .off('click', this._openPopup)
+                           .off('remove', this.closePopup);
+
+                       this._popupHandlersAdded = false;

                }
                return this;
        },
                }
                return this;
        },


@@ -4062,8 +4878,9 @@ L.Path.include({
        openPopup: function (latlng) {
 
                if (this._popup) {
        openPopup: function (latlng) {
 
                if (this._popup) {

+                       // open the popup from one of the path's points if not specified

                        latlng = latlng || this._latlng ||
                        latlng = latlng || this._latlng ||

-                                       this._latlngs[Math.floor(this._latlngs.length / 2)];
+                                this._latlngs[Math.floor(this._latlngs.length / 2)];

 
                        this._openPopup({latlng: latlng});
                }
 
                        this._openPopup({latlng: latlng});
                }


@@ -4071,13 +4888,16 @@ L.Path.include({
                return this;
        },
 
                return this;
        },
 

+       closePopup: function () {
+               if (this._popup) {
+                       this._popup._close();
+               }
+               return this;
+       },
+

        _openPopup: function (e) {
                this._popup.setLatLng(e.latlng);
                this._map.openPopup(this._popup);
        _openPopup: function (e) {
                this._popup.setLatLng(e.latlng);
                this._map.openPopup(this._popup);

-       },
-
-       _closePopup: function () {
-               this._popup._close();

        }
 });
 
        }
 });
 


@@ -4096,6 +4916,7 @@ L.Browser.vml = !L.Browser.svg && (function () {
                shape.style.behavior = 'url(#default#VML)';
 
                return shape && (typeof shape.adj === 'object');
                shape.style.behavior = 'url(#default#VML)';
 
                return shape && (typeof shape.adj === 'object');

+

        } catch (e) {
                return false;
        }
        } catch (e) {
                return false;
        }


@@ -4115,17 +4936,22 @@ L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
                        };
                } catch (e) {
                        return function (name) {
                        };
                } catch (e) {
                        return function (name) {

-                               return document.createElement('<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
+                               return document.createElement(
+                                       '<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');

                        };
                }
        }()),
 
        _initPath: function () {
                var container = this._container = this._createElement('shape');
                        };
                }
        }()),
 
        _initPath: function () {
                var container = this._container = this._createElement('shape');

-               L.DomUtil.addClass(container, 'leaflet-vml-shape');
+
+               L.DomUtil.addClass(container, 'leaflet-vml-shape' +
+                       (this.options.className ? ' ' + this.options.className : ''));
+

                if (this.options.clickable) {
                        L.DomUtil.addClass(container, 'leaflet-clickable');
                }
                if (this.options.clickable) {
                        L.DomUtil.addClass(container, 'leaflet-clickable');
                }

+

                container.coordsize = '1 1';
 
                this._path = this._createElement('path');
                container.coordsize = '1 1';
 
                this._path = this._createElement('path');


@@ -4140,9 +4966,9 @@ L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
 
        _updateStyle: function () {
                var stroke = this._stroke,
 
        _updateStyle: function () {
                var stroke = this._stroke,

-                       fill = this._fill,
-                       options = this.options,
-                       container = this._container;
+                   fill = this._fill,
+                   options = this.options,
+                   container = this._container;

 
                container.stroked = options.stroke;
                container.filled = options.fill;
 
                container.stroked = options.stroke;
                container.filled = options.fill;


@@ -4156,11 +4982,21 @@ L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
                        stroke.weight = options.weight + 'px';
                        stroke.color = options.color;
                        stroke.opacity = options.opacity;
                        stroke.weight = options.weight + 'px';
                        stroke.color = options.color;
                        stroke.opacity = options.opacity;

+

                        if (options.dashArray) {
                        if (options.dashArray) {

-                               stroke.dashStyle = options.dashArray.replace(/ *, */g, ' ');
+                               stroke.dashStyle = L.Util.isArray(options.dashArray) ?
+                                   options.dashArray.join(' ') :
+                                   options.dashArray.replace(/( *, *)/g, ' ');

                        } else {
                                stroke.dashStyle = '';
                        }
                        } else {
                                stroke.dashStyle = '';
                        }

+                       if (options.lineCap) {
+                               stroke.endcap = options.lineCap.replace('butt', 'flat');
+                       }
+                       if (options.lineJoin) {
+                               stroke.joinstyle = options.lineJoin;
+                       }
+

                } else if (stroke) {
                        container.removeChild(stroke);
                        this._stroke = null;
                } else if (stroke) {
                        container.removeChild(stroke);
                        this._stroke = null;


@@ -4173,6 +5009,7 @@ L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
                        }
                        fill.color = options.fillColor || options.color;
                        fill.opacity = options.fillOpacity;
                        }
                        fill.color = options.fillColor || options.color;
                        fill.opacity = options.fillOpacity;

+

                } else if (fill) {
                        container.removeChild(fill);
                        this._fill = null;
                } else if (fill) {
                        container.removeChild(fill);
                        this._fill = null;


@@ -4226,7 +5063,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
        },
 
        setStyle: function (style) {
        },
 
        setStyle: function (style) {

-               L.Util.setOptions(this, style);
+               L.setOptions(this, style);

 
                if (this._map) {
                        this._updateStyle();
 
                if (this._map) {
                        this._updateStyle();


@@ -4240,6 +5077,11 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
                    .off('viewreset', this.projectLatlngs, this)
                    .off('moveend', this._updatePath, this);
 
                    .off('viewreset', this.projectLatlngs, this)
                    .off('moveend', this._updatePath, this);
 

+               if (this.options.clickable) {
+                       this._map.off('click', this._onClick, this);
+                       this._map.off('mousemove', this._onMouseMove, this);
+               }
+

                this._requestUpdate();
 
                this._map = null;
                this._requestUpdate();
 
                this._map = null;


@@ -4300,23 +5142,19 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
                if (this._checkIfEmpty()) { return; }
 
                var ctx = this._ctx,
                if (this._checkIfEmpty()) { return; }
 
                var ctx = this._ctx,

-                       options = this.options;
+                   options = this.options;

 
                this._drawPath();
                ctx.save();
                this._updateStyle();
 
                if (options.fill) {
 
                this._drawPath();
                ctx.save();
                this._updateStyle();
 
                if (options.fill) {

-                       if (options.fillOpacity < 1) {
-                               ctx.globalAlpha = options.fillOpacity;
-                       }
+                       ctx.globalAlpha = options.fillOpacity;

                        ctx.fill();
                }
 
                if (options.stroke) {
                        ctx.fill();
                }
 
                if (options.stroke) {

-                       if (options.opacity < 1) {
-                               ctx.globalAlpha = options.opacity;
-                       }
+                       ctx.globalAlpha = options.opacity;

                        ctx.stroke();
                }
 
                        ctx.stroke();
                }
 


@@ -4327,8 +5165,8 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 
        _initEvents: function () {
                if (this.options.clickable) {
 
        _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);
                }
        },
                        this._map.on('click', this._onClick, this);
                }
        },


@@ -4337,21 +5175,37 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
                if (this._containsPoint(e.layerPoint)) {
                        this.fire('click', e);
                }
                if (this._containsPoint(e.layerPoint)) {
                        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);
+               }

        }
 });
 
 L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {} : {
        _initPathRoot: function () {
                var root = this._pathRoot,
        }
 });
 
 L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {} : {
        _initPathRoot: function () {
                var root = this._pathRoot,

-                       ctx;
+                   ctx;

 
                if (!root) {
 
                if (!root) {

-                       root = this._pathRoot = document.createElement("canvas");
+                       root = this._pathRoot = document.createElement('canvas');

                        root.style.position = 'absolute';
                        ctx = this._canvasCtx = root.getContext('2d');
 
                        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);
 
 
                        this._panes.overlayPane.appendChild(root);
 


@@ -4366,16 +5220,14 @@ L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {}
        },
 
        _updateCanvasViewport: function () {
        },
 
        _updateCanvasViewport: function () {

-               if (this._pathZooming) {
-                       //Don't redraw while zooming. See _updateSvgViewport for more details
-                       return;
-               }
+               // don't redraw while zooming. See _updateSvgViewport for more details
+               if (this._pathZooming) { return; }

                this._updatePathViewport();
 
                var vp = this._pathViewport,
                this._updatePathViewport();
 
                var vp = this._pathViewport,

-                       min = vp.min,
-                       size = vp.max.subtract(min),
-                       root = this._pathRoot;
+                   min = vp.min,
+                   size = vp.max.subtract(min),
+                   root = this._pathRoot;

 
                //TODO check if this works properly on mobile webkit
                L.DomUtil.setPosition(root, min);
 
                //TODO check if this works properly on mobile webkit
                L.DomUtil.setPosition(root, min);


@@ -4391,6 +5243,8 @@ L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {}
  * and polylines (clipping, simplification, distances, etc.)
  */
 
  * and polylines (clipping, simplification, distances, etc.)
  */
 

+/*jshint bitwise:false */ // allow bitwise operations for this file
+

 L.LineUtil = {
 
        // Simplify polyline with vertex reduction and Douglas-Peucker simplification.
 L.LineUtil = {
 
        // Simplify polyline with vertex reduction and Douglas-Peucker simplification.


@@ -4425,15 +5279,15 @@ L.LineUtil = {
        _simplifyDP: function (points, sqTolerance) {
 
                var len = points.length,
        _simplifyDP: function (points, sqTolerance) {
 
                var len = points.length,

-                       ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
-                       markers = new ArrayConstructor(len);
+                   ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
+                   markers = new ArrayConstructor(len);

 
                markers[0] = markers[len - 1] = 1;
 
                this._simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
 
                var i,
 
                markers[0] = markers[len - 1] = 1;
 
                this._simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
 
                var i,

-                       newPoints = [];
+                   newPoints = [];

 
                for (i = 0; i < len; i++) {
                        if (markers[i]) {
 
                for (i = 0; i < len; i++) {
                        if (markers[i]) {


@@ -4447,7 +5301,7 @@ L.LineUtil = {
        _simplifyDPStep: function (points, markers, sqTolerance, first, last) {
 
                var maxSqDist = 0,
        _simplifyDPStep: function (points, markers, sqTolerance, first, last) {
 
                var maxSqDist = 0,

-                       index, i, sqDist;
+                   index, i, sqDist;

 
                for (i = first + 1; i <= last - 1; i++) {
                        sqDist = this._sqClosestPointOnSegment(points[i], points[first], points[last], true);
 
                for (i = first + 1; i <= last - 1; i++) {
                        sqDist = this._sqClosestPointOnSegment(points[i], points[first], points[last], true);


@@ -4482,17 +5336,14 @@ L.LineUtil = {
                return reducedPoints;
        },
 
                return reducedPoints;
        },
 

-       /*jshint bitwise:false */ // temporarily allow bitwise oprations
-

        // Cohen-Sutherland line clipping algorithm.
        // Used to avoid rendering parts of a polyline that are not currently visible.
 
        clipSegment: function (a, b, bounds, useLastCode) {
        // Cohen-Sutherland line clipping algorithm.
        // Used to avoid rendering parts of a polyline that are not currently visible.
 
        clipSegment: function (a, b, bounds, useLastCode) {

-               var min = bounds.min,
-                       max = bounds.max;
-

                var codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),
                var codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),

-                       codeB = this._getBitCode(b, bounds);
+                   codeB = this._getBitCode(b, bounds),
+
+                   codeOut, p, newCode;

 
                // save 2nd code to avoid calculating it on the next segment
                this._lastCode = codeB;
 
                // save 2nd code to avoid calculating it on the next segment
                this._lastCode = codeB;


@@ -4506,9 +5357,9 @@ L.LineUtil = {
                                return false;
                        // other cases
                        } else {
                                return false;
                        // other cases
                        } else {

-                               var codeOut = codeA || codeB,
-                                       p = this._getEdgeIntersection(a, b, codeOut, bounds),
-                                       newCode = this._getBitCode(p, bounds);
+                               codeOut = codeA || codeB;
+                               p = this._getEdgeIntersection(a, b, codeOut, bounds);
+                               newCode = this._getBitCode(p, bounds);

 
                                if (codeOut === codeA) {
                                        a = p;
 
                                if (codeOut === codeA) {
                                        a = p;


@@ -4523,9 +5374,9 @@ L.LineUtil = {
 
        _getEdgeIntersection: function (a, b, code, bounds) {
                var dx = b.x - a.x,
 
        _getEdgeIntersection: function (a, b, code, bounds) {
                var dx = b.x - a.x,

-                       dy = b.y - a.y,
-                       min = bounds.min,
-                       max = bounds.max;
+                   dy = b.y - a.y,
+                   min = bounds.min,
+                   max = bounds.max;

 
                if (code & 8) { // top
                        return new L.Point(a.x + dx * (max.y - a.y) / dy, max.y);
 
                if (code & 8) { // top
                        return new L.Point(a.x + dx * (max.y - a.y) / dy, max.y);


@@ -4555,23 +5406,21 @@ L.LineUtil = {
                return code;
        },
 
                return code;
        },
 

-       /*jshint bitwise:true */
-

        // square distance (to avoid unnecessary Math.sqrt calls)
        _sqDist: function (p1, p2) {
                var dx = p2.x - p1.x,
        // square distance (to avoid unnecessary Math.sqrt calls)
        _sqDist: function (p1, p2) {
                var dx = p2.x - p1.x,

-                       dy = p2.y - p1.y;
+                   dy = p2.y - p1.y;

                return dx * dx + dy * dy;
        },
 
        // return closest point on segment or distance to that point
        _sqClosestPointOnSegment: function (p, p1, p2, sqDist) {
                var x = p1.x,
                return dx * dx + dy * dy;
        },
 
        // return closest point on segment or distance to that point
        _sqClosestPointOnSegment: function (p, p1, p2, sqDist) {
                var x = p1.x,

-                       y = p1.y,
-                       dx = p2.x - x,
-                       dy = p2.y - y,
-                       dot = dx * dx + dy * dy,
-                       t;
+                   y = p1.y,
+                   dx = p2.x - x,
+                   dy = p2.y - y,
+                   dot = dx * dx + dy * dy,
+                   t;

 
                if (dot > 0) {
                        t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
 
                if (dot > 0) {
                        t = ((p.x - x) * dx + (p.y - y) * dy) / dot;


@@ -4593,20 +5442,15 @@ L.LineUtil = {
 };
 
 
 };
 
 

+/*
+ * L.Polyline is used to display polylines on a map.
+ */
+

 L.Polyline = L.Path.extend({
        initialize: function (latlngs, options) {
                L.Path.prototype.initialize.call(this, options);
 
                this._latlngs = this._convertLatLngs(latlngs);
 L.Polyline = L.Path.extend({
        initialize: function (latlngs, options) {
                L.Path.prototype.initialize.call(this, options);
 
                this._latlngs = this._convertLatLngs(latlngs);

-
-               // TODO refactor: move to Polyline.Edit.js
-               if (L.Handler.PolyEdit) {
-                       this.editing = new L.Handler.PolyEdit(this);
-
-                       if (this.options.editable) {
-                               this.editing.enable();
-                       }
-               }

        },
 
        options: {
        },
 
        options: {


@@ -4645,9 +5489,9 @@ L.Polyline = L.Path.extend({
                return this.redraw();
        },
 
                return this.redraw();
        },
 

-       spliceLatLngs: function (index, howMany) {
+       spliceLatLngs: function () { // (Number index, Number howMany)

                var removed = [].splice.apply(this._latlngs, arguments);
                var removed = [].splice.apply(this._latlngs, arguments);

-               this._convertLatLngs(this._latlngs);
+               this._convertLatLngs(this._latlngs, true);

                this.redraw();
                return removed;
        },
                this.redraw();
                return removed;
        },


@@ -4674,40 +5518,19 @@ L.Polyline = L.Path.extend({
        },
 
        getBounds: function () {
        },
 
        getBounds: function () {

-               var b = new L.LatLngBounds();
-               var latLngs = this.getLatLngs();
-               for (var i = 0, len = latLngs.length; i < len; i++) {
-                       b.extend(latLngs[i]);
-               }
-               return b;
-       },
-
-       // TODO refactor: move to Polyline.Edit.js
-       onAdd: function (map) {
-               L.Path.prototype.onAdd.call(this, map);
-
-               if (this.editing && this.editing.enabled()) {
-                       this.editing.addHooks();
-               }
+               return new L.LatLngBounds(this.getLatLngs());

        },
 
        },
 

-       onRemove: function (map) {
-               if (this.editing && this.editing.enabled()) {
-                       this.editing.removeHooks();
-               }
-
-               L.Path.prototype.onRemove.call(this, map);
-       },
+       _convertLatLngs: function (latlngs, overwrite) {
+               var i, len, target = overwrite ? latlngs : [];

 
 

-       _convertLatLngs: function (latlngs) {
-               var i, len;

                for (i = 0, len = latlngs.length; i < len; i++) {
                for (i = 0, len = latlngs.length; i < len; i++) {

-                       if (latlngs[i] instanceof Array && typeof latlngs[i][0] !== 'number') {
+                       if (L.Util.isArray(latlngs[i]) && typeof latlngs[i][0] !== 'number') {

                                return;
                        }
                                return;
                        }

-                       latlngs[i] = L.latLng(latlngs[i]);
+                       target[i] = L.latLng(latlngs[i]);

                }
                }

-               return latlngs;
+               return target;

        },
 
        _initEvents: function () {
        },
 
        _initEvents: function () {


@@ -4729,8 +5552,8 @@ L.Polyline = L.Path.extend({
 
        _clipPoints: function () {
                var points = this._originalPoints,
 
        _clipPoints: function () {
                var points = this._originalPoints,

-                       len = points.length,
-                       i, k, segment;
+                   len = points.length,
+                   i, k, segment;

 
                if (this.options.noClip) {
                        this._parts = [points];
 
                if (this.options.noClip) {
                        this._parts = [points];


@@ -4740,8 +5563,8 @@ L.Polyline = L.Path.extend({
                this._parts = [];
 
                var parts = this._parts,
                this._parts = [];
 
                var parts = this._parts,

-                       vp = this._map._pathViewport,
-                       lu = L.LineUtil;
+                   vp = this._map._pathViewport,
+                   lu = L.LineUtil;

 
                for (i = 0, k = 0; i < len - 1; i++) {
                        segment = lu.clipSegment(points[i], points[i + 1], vp, i);
 
                for (i = 0, k = 0; i < len - 1; i++) {
                        segment = lu.clipSegment(points[i], points[i + 1], vp, i);


@@ -4763,7 +5586,7 @@ L.Polyline = L.Path.extend({
        // simplify each clipped part of the polyline
        _simplifyPoints: function () {
                var parts = this._parts,
        // simplify each clipped part of the polyline
        _simplifyPoints: function () {
                var parts = this._parts,

-                       lu = L.LineUtil;
+                   lu = L.LineUtil;

 
                for (var i = 0, len = parts.length; i < len; i++) {
                        parts[i] = lu.simplify(parts[i], this.options.smoothFactor);
 
                for (var i = 0, len = parts.length; i < len; i++) {
                        parts[i] = lu.simplify(parts[i], this.options.smoothFactor);


@@ -4786,10 +5609,10 @@ L.polyline = function (latlngs, options) {
 
 
 /*
 
 
 /*

- * L.PolyUtil contains utilify functions for polygons (clipping, etc.).
+ * L.PolyUtil contains utility functions for polygons (clipping, etc.).

  */
 
  */
 

-/*jshint bitwise:false */ // allow bitwise oprations here
+/*jshint bitwise:false */ // allow bitwise operations here

 
 L.PolyUtil = {};
 
 
 L.PolyUtil = {};
 


@@ -4798,14 +5621,12 @@ L.PolyUtil = {};
  * Used to avoid rendering parts of a polygon that are not currently visible.
  */
 L.PolyUtil.clipPolygon = function (points, bounds) {
  * Used to avoid rendering parts of a polygon that are not currently visible.
  */
 L.PolyUtil.clipPolygon = function (points, bounds) {

-       var min = bounds.min,
-               max = bounds.max,
-               clippedPoints,
-               edges = [1, 4, 2, 8],
-               i, j, k,
-               a, b,
-               len, edge, p,
-               lu = L.LineUtil;
+       var clippedPoints,
+           edges = [1, 4, 2, 8],
+           i, j, k,
+           a, b,
+           len, edge, p,
+           lu = L.LineUtil;

 
        for (i = 0, len = points.length; i < len; i++) {
                points[i]._code = lu._getBitCode(points[i], bounds);
 
        for (i = 0, len = points.length; i < len; i++) {
                points[i]._code = lu._getBitCode(points[i], bounds);


@@ -4843,8 +5664,6 @@ L.PolyUtil.clipPolygon = function (points, bounds) {
        return points;
 };
 
        return points;
 };
 

-/*jshint bitwise:true */
-

 
 /*
  * L.Polygon is used to display polygons on a map.
 
 /*
  * L.Polygon is used to display polygons on a map.


@@ -4857,10 +5676,28 @@ L.Polygon = L.Polyline.extend({
 
        initialize: function (latlngs, options) {
                L.Polyline.prototype.initialize.call(this, latlngs, options);
 
        initialize: function (latlngs, options) {
                L.Polyline.prototype.initialize.call(this, latlngs, options);

+               this._initWithHoles(latlngs);
+       },

 
 

-               if (latlngs && (latlngs[0] instanceof Array) && (typeof latlngs[0][0] !== 'number')) {
+       _initWithHoles: function (latlngs) {
+               var i, len, hole;
+               if (latlngs && L.Util.isArray(latlngs[0]) && (typeof latlngs[0][0] !== 'number')) {

                        this._latlngs = this._convertLatLngs(latlngs[0]);
                        this._holes = latlngs.slice(1);
                        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();

                }
        },
 
                }
        },
 


@@ -4871,35 +5708,41 @@ L.Polygon = L.Polyline.extend({
                // TODO move this logic to Polyline to get rid of duplication
                this._holePoints = [];
 
                // TODO move this logic to Polyline to get rid of duplication
                this._holePoints = [];
 

-               if (!this._holes) {
-                       return;
-               }
+               if (!this._holes) { return; }

 
 

-               for (var i = 0, len = this._holes.length, hole; i < len; i++) {
+               var i, j, len, len2;
+
+               for (i = 0, len = this._holes.length; i < len; i++) {

                        this._holePoints[i] = [];
 
                        this._holePoints[i] = [];
 

-                       for (var j = 0, len2 = this._holes[i].length; j < len2; j++) {
+                       for (j = 0, len2 = this._holes[i].length; j < len2; j++) {

                                this._holePoints[i][j] = this._map.latLngToLayerPoint(this._holes[i][j]);
                        }
                }
        },
 
                                this._holePoints[i][j] = this._map.latLngToLayerPoint(this._holes[i][j]);
                        }
                }
        },
 

+       setLatLngs: function (latlngs) {
+               if (latlngs && L.Util.isArray(latlngs[0]) && (typeof latlngs[0][0] !== 'number')) {
+                       this._initWithHoles(latlngs);
+                       return this.redraw();
+               } else {
+                       return L.Polyline.prototype.setLatLngs.call(this, latlngs);
+               }
+       },
+

        _clipPoints: function () {
                var points = this._originalPoints,
        _clipPoints: function () {
                var points = this._originalPoints,

-                       newParts = [];
+                   newParts = [];

 
                this._parts = [points].concat(this._holePoints);
 
 
                this._parts = [points].concat(this._holePoints);
 

-               if (this.options.noClip) {
-                       return;
-               }
+               if (this.options.noClip) { return; }

 
                for (var i = 0, len = this._parts.length; i < len; i++) {
                        var clipped = L.PolyUtil.clipPolygon(this._parts[i], this._map._pathViewport);
 
                for (var i = 0, len = this._parts.length; i < len; i++) {
                        var clipped = L.PolyUtil.clipPolygon(this._parts[i], this._map._pathViewport);

-                       if (!clipped.length) {
-                               continue;
+                       if (clipped.length) {
+                               newParts.push(clipped);

                        }
                        }

-                       newParts.push(clipped);

                }
 
                this._parts = newParts;
                }
 
                this._parts = newParts;


@@ -4922,7 +5765,9 @@ L.polygon = function (latlngs, options) {
 
 (function () {
        function createMulti(Klass) {
 
 (function () {
        function createMulti(Klass) {

+

                return L.FeatureGroup.extend({
                return L.FeatureGroup.extend({

+

                        initialize: function (latlngs, options) {
                                this._layers = {};
                                this._options = options;
                        initialize: function (latlngs, options) {
                                this._layers = {};
                                this._options = options;


@@ -4930,7 +5775,8 @@ L.polygon = function (latlngs, options) {
                        },
 
                        setLatLngs: function (latlngs) {
                        },
 
                        setLatLngs: function (latlngs) {

-                               var i = 0, len = latlngs.length;
+                               var i = 0,
+                                   len = latlngs.length;

 
                                this.eachLayer(function (layer) {
                                        if (i < len) {
 
                                this.eachLayer(function (layer) {
                                        if (i < len) {


@@ -4945,6 +5791,16 @@ L.polygon = function (latlngs, options) {
                                }
 
                                return this;
                                }
 
                                return this;

+                       },
+
+                       getLatLngs: function () {
+                               var latlngs = [];
+
+                               this.eachLayer(function (layer) {
+                                       latlngs.push(layer.getLatLngs());
+                               });
+
+                               return latlngs;

                        }
                });
        }
                        }
                });
        }


@@ -4963,7 +5819,7 @@ L.polygon = function (latlngs, options) {
 
 
 /*
 
 
 /*

- * L.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds
+ * L.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds object.

  */
 
 L.Rectangle = L.Polygon.extend({
  */
 
 L.Rectangle = L.Polygon.extend({


@@ -4977,13 +5833,12 @@ L.Rectangle = L.Polygon.extend({
 
        _boundsToLatLngs: function (latLngBounds) {
                latLngBounds = L.latLngBounds(latLngBounds);
 
        _boundsToLatLngs: function (latLngBounds) {
                latLngBounds = L.latLngBounds(latLngBounds);

-           return [
-               latLngBounds.getSouthWest(),
-               latLngBounds.getNorthWest(),
-               latLngBounds.getNorthEast(),
-               latLngBounds.getSouthEast(),
-               latLngBounds.getSouthWest()
-           ];
+               return [
+                       latLngBounds.getSouthWest(),
+                       latLngBounds.getNorthWest(),
+                       latLngBounds.getNorthEast(),
+                       latLngBounds.getSouthEast()
+               ];

        }
 });
 
        }
 });
 


@@ -5020,21 +5875,21 @@ L.Circle = L.Path.extend({
 
        projectLatlngs: function () {
                var lngRadius = this._getLngRadius(),
 
        projectLatlngs: function () {
                var lngRadius = this._getLngRadius(),

-                       latlng2 = new L.LatLng(this._latlng.lat, this._latlng.lng - lngRadius, true),
-                       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(),
        },
 
        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);
+                   latRadius = (this._mRadius / 40075017) * 360,
+                   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 () {
        },
 
        getLatLng: function () {


@@ -5043,20 +5898,20 @@ L.Circle = L.Path.extend({
 
        getPathString: function () {
                var p = this._point,
 
        getPathString: function () {
                var p = this._point,

-                       r = this._radius;
+                   r = this._radius;

 
                if (this._checkIfEmpty()) {
                        return '';
                }
 
                if (L.Browser.svg) {
 
                if (this._checkIfEmpty()) {
                        return '';
                }
 
                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);
                } 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);

                }
        },
 
                }
        },
 


@@ -5079,11 +5934,11 @@ L.Circle = L.Path.extend({
                        return false;
                }
                var vp = this._map._pathViewport,
                        return false;
                }
                var vp = this._map._pathViewport,

-                       r = this._radius,
-                       p = this._point;
+                   r = this._radius,
+                   p = this._point;

 
                return p.x - r > vp.max.x || p.y - r > vp.max.y ||
 
                return p.x - r > vp.max.x || p.y - r > vp.max.y ||

-                       p.x + r < vp.min.x || p.y + r < vp.min.y;
+                      p.x + r < vp.min.x || p.y + r < vp.min.y;

        }
 });
 
        }
 });
 


@@ -5111,9 +5966,26 @@ L.CircleMarker = L.Circle.extend({
                this._point = this._map.latLngToLayerPoint(this._latlng);
        },
 
                this._point = this._map.latLngToLayerPoint(this._latlng);
        },
 

+       _updateStyle : function () {
+               L.Circle.prototype._updateStyle.call(this);
+               this.setRadius(this.options.radius);
+       },
+
+       setLatLng: function (latlng) {
+               L.Circle.prototype.setLatLng.call(this, latlng);
+               if (this._popup && this._popup._isOpen) {
+                       this._popup.setLatLng(latlng);
+               }
+               return this;
+       },
+

        setRadius: function (radius) {
        setRadius: function (radius) {

-               this._radius = radius;
+               this.options.radius = this._radius = radius;

                return this.redraw();
                return this.redraw();

+       },
+
+       getRadius: function () {
+               return this._radius;

        }
 });
 
        }
 });
 


@@ -5122,11 +5994,14 @@ L.circleMarker = function (latlng, options) {
 };
 
 
 };
 
 

+/*
+ * Extends L.Polyline to be able to manually detect clicks on Canvas-rendered polylines.
+ */

 
 L.Polyline.include(!L.Path.CANVAS ? {} : {
        _containsPoint: function (p, closed) {
                var i, j, k, len, len2, dist, part,
 
 L.Polyline.include(!L.Path.CANVAS ? {} : {
        _containsPoint: function (p, closed) {
                var i, j, k, len, len2, dist, part,

-                       w = this.options.weight / 2;
+                   w = this.options.weight / 2;

 
                if (L.Browser.touch) {
                        w += 10; // polyline click tolerance on touch devices
 
                if (L.Browser.touch) {
                        w += 10; // polyline click tolerance on touch devices


@@ -5151,13 +6026,16 @@ L.Polyline.include(!L.Path.CANVAS ? {} : {
 });
 
 
 });
 
 

+/*
+ * Extends L.Polygon to be able to manually detect clicks on Canvas-rendered polygons.
+ */

 
 L.Polygon.include(!L.Path.CANVAS ? {} : {
        _containsPoint: function (p) {
                var inside = false,
 
 L.Polygon.include(!L.Path.CANVAS ? {} : {
        _containsPoint: function (p) {
                var inside = false,

-                       part, p1, p2,
-                       i, j, k,
-                       len, len2;
+                   part, p1, p2,
+                   i, j, k,
+                   len, len2;

 
                // TODO optimization: check if within bounds first
 
 
                // TODO optimization: check if within bounds first
 


@@ -5188,7 +6066,7 @@ L.Polygon.include(!L.Path.CANVAS ? {} : {
 
 
 /*
 
 
 /*

- * Circle canvas specific drawing parts.
+ * Extends L.Circle with Canvas-specific code.

  */
 
 L.Circle.include(!L.Path.CANVAS ? {} : {
  */
 
 L.Circle.include(!L.Path.CANVAS ? {} : {


@@ -5200,16 +6078,32 @@ L.Circle.include(!L.Path.CANVAS ? {} : {
 
        _containsPoint: function (p) {
                var center = this._point,
 
        _containsPoint: function (p) {
                var center = this._point,

-                       w2 = this.options.stroke ? this.options.weight / 2 : 0;
+                   w2 = this.options.stroke ? this.options.weight / 2 : 0;

 
                return (p.distanceTo(center) <= this._radius + w2);
        }
 });
 
 
 
                return (p.distanceTo(center) <= this._radius + w2);
        }
 });
 
 

+/*
+ * 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.
+ */
+

 L.GeoJSON = L.FeatureGroup.extend({
 L.GeoJSON = L.FeatureGroup.extend({

+

        initialize: function (geojson, options) {
        initialize: function (geojson, options) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

 
                this._layers = {};
 
 
                this._layers = {};
 


@@ -5219,12 +6113,16 @@ L.GeoJSON = L.FeatureGroup.extend({
        },
 
        addData: function (geojson) {
        },
 
        addData: function (geojson) {

-               var features = geojson instanceof Array ? geojson : geojson.features,
-                   i, len;
+               var features = L.Util.isArray(geojson) ? geojson : geojson.features,
+                   i, len, feature;

 
                if (features) {
                        for (i = 0, len = features.length; i < len; i++) {
 
                if (features) {
                        for (i = 0, len = features.length; i < len; i++) {

-                               this.addData(features[i]);
+                               // Only add this if geometry or geometries are set and not null
+                               feature = features[i];
+                               if (feature.geometries || feature.geometry || feature.features || feature.coordinates) {
+                                       this.addData(features[i]);
+                               }

                        }
                        return this;
                }
                        }
                        return this;
                }


@@ -5233,9 +6131,10 @@ L.GeoJSON = L.FeatureGroup.extend({
 
                if (options.filter && !options.filter(geojson)) { return; }
 
 
                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, options);
+               layer.feature = L.GeoJSON.asFeature(geojson);

 
 

+               layer.defaultOptions = layer.options;

                this.resetStyle(layer);
 
                if (options.onEachFeature) {
                this.resetStyle(layer);
 
                if (options.onEachFeature) {


@@ -5248,6 +6147,9 @@ L.GeoJSON = L.FeatureGroup.extend({
        resetStyle: function (layer) {
                var style = this.options.style;
                if (style) {
        resetStyle: function (layer) {
                var style = this.options.style;
                if (style) {

+                       // reset any custom styles
+                       L.Util.extend(layer.options, layer.defaultOptions);
+

                        this._setLayerStyle(layer, style);
                }
        },
                        this._setLayerStyle(layer, style);
                }
        },


@@ -5268,46 +6170,54 @@ L.GeoJSON = L.FeatureGroup.extend({
        }
 });
 
        }
 });
 

-L.Util.extend(L.GeoJSON, {
-       geometryToLayer: function (geojson, pointToLayer) {
+L.extend(L.GeoJSON, {
+       geometryToLayer: function (geojson, pointToLayer, coordsToLatLng, vectorOptions) {

                var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
                    coords = geometry.coordinates,
                    layers = [],
                var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
                    coords = geometry.coordinates,
                    layers = [],

-                   latlng, latlngs, i, len, layer;
+                   latlng, latlngs, i, len;
+
+               coordsToLatLng = coordsToLatLng || this.coordsToLatLng;

 
                switch (geometry.type) {
                case 'Point':
 
                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++) {
                        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]);
-                               layer = pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng);
-                               layers.push(layer);
+                               latlng = coordsToLatLng(coords[i]);
+                               layers.push(pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng));

                        }
                        return new L.FeatureGroup(layers);
 
                case 'LineString':
                        }
                        return new L.FeatureGroup(layers);
 
                case 'LineString':

-                       latlngs = this.coordsToLatLngs(coords);
-                       return new L.Polyline(latlngs);
+                       latlngs = this.coordsToLatLngs(coords, 0, coordsToLatLng);
+                       return new L.Polyline(latlngs, vectorOptions);

 
                case 'Polygon':
 
                case 'Polygon':

-                       latlngs = this.coordsToLatLngs(coords, 1);
-                       return new L.Polygon(latlngs);
+                       if (coords.length === 2 && !coords[1].length) {
+                               throw new Error('Invalid GeoJSON object.');
+                       }
+                       latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng);
+                       return new L.Polygon(latlngs, vectorOptions);

 
                case 'MultiLineString':
 
                case 'MultiLineString':

-                       latlngs = this.coordsToLatLngs(coords, 1);
-                       return new L.MultiPolyline(latlngs);
+                       latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng);
+                       return new L.MultiPolyline(latlngs, vectorOptions);

 
 

-               case "MultiPolygon":
-                       latlngs = this.coordsToLatLngs(coords, 2);
-                       return new L.MultiPolygon(latlngs);
+               case 'MultiPolygon':
+                       latlngs = this.coordsToLatLngs(coords, 2, coordsToLatLng);
+                       return new L.MultiPolygon(latlngs, vectorOptions);

 
 

-               case "GeometryCollection":
+               case 'GeometryCollection':

                        for (i = 0, len = geometry.geometries.length; i < len; i++) {
                        for (i = 0, len = geometry.geometries.length; i < len; i++) {

-                               layer = this.geometryToLayer(geometry.geometries[i], pointToLayer);
-                               layers.push(layer);
+
+                               layers.push(this.geometryToLayer({
+                                       geometry: geometry.geometries[i],
+                                       type: 'Feature',
+                                       properties: geojson.properties
+                               }, pointToLayer, coordsToLatLng, vectorOptions));

                        }
                        return new L.FeatureGroup(layers);
 
                        }
                        return new L.FeatureGroup(layers);
 


@@ -5316,30 +6226,159 @@ L.Util.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, true);
+       coordsToLatLng: function (coords) { // (Array[, Boolean]) -> LatLng
+               return new L.LatLng(coords[1], coords[0], coords[2]);

        },
 
        },
 

-       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 ?
 
                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;
 
                        latlngs.push(latlng);
                }
 
                return latlngs;

+       },
+
+       latLngToCoords: function (latlng) {
+               var coords = [latlng.lng, latlng.lat];
+
+               if (latlng.alt !== undefined) {
+                       coords.push(latlng.alt);
+               }
+               return coords;
+       },
+
+       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 multiToGeoJSON(type) {
+               return function () {
+                       var coords = [];
+
+                       this.eachLayer(function (layer) {
+                               coords.push(layer.toGeoJSON().geometry.coordinates);
+                       });
+
+                       return L.GeoJSON.getFeature(this, {
+                               type: type,
+                               coordinates: coords
+                       });
+               };
+       }
+
+       L.MultiPolyline.include({toGeoJSON: multiToGeoJSON('MultiLineString')});
+       L.MultiPolygon.include({toGeoJSON: multiToGeoJSON('MultiPolygon')});
+
+       L.LayerGroup.include({
+               toGeoJSON: function () {
+
+                       var geometry = this.feature && this.feature.geometry,
+                               jsons = [],
+                               json;
+
+                       if (geometry && geometry.type === 'MultiPoint') {
+                               return multiToGeoJSON('MultiPoint').call(this);
+                       }
+
+                       var isGeometryCollection = geometry && geometry.type === 'GeometryCollection';
+
+                       this.eachLayer(function (layer) {
+                               if (layer.toGeoJSON) {
+                                       json = layer.toGeoJSON();
+                                       jsons.push(isGeometryCollection ? json.geometry : L.GeoJSON.asFeature(json));
+                               }
+                       });
+
+                       if (isGeometryCollection) {
+                               return L.GeoJSON.getFeature(this, {
+                                       geometries: jsons,
+                                       type: 'GeometryCollection'
+                               });
+                       }
+
+                       return {
+                               type: 'FeatureCollection',
+                               features: jsons
+                       };
+               }
+       });
+}());
+

 L.geoJson = function (geojson, options) {
        return new L.GeoJSON(geojson, options);
 };
 L.geoJson = function (geojson, options) {
        return new L.GeoJSON(geojson, options);
 };


@@ -5350,12 +6389,12 @@ L.geoJson = function (geojson, options) {
  */
 
 L.DomEvent = {
  */
 
 L.DomEvent = {

-       /* inpired by John Resig, Dean Edwards and YUI addEvent implementations */
+       /* inspired by John Resig, Dean Edwards and YUI addEvent implementations */

        addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
 
        addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
 

-               var id = L.Util.stamp(fn),
-                       key = '_leaflet_' + type + id,
-                       handler, originalHandler, newType;
+               var id = L.stamp(fn),
+                   key = '_leaflet_' + type + id,
+                   handler, originalHandler, newType;

 
                if (obj[key]) { return this; }
 
 
                if (obj[key]) { return this; }
 


@@ -5363,13 +6402,15 @@ L.DomEvent = {
                        return fn.call(context || obj, e || L.DomEvent._getEvent());
                };
 
                        return fn.call(context || obj, e || L.DomEvent._getEvent());
                };
 

-               if (L.Browser.msTouch && type.indexOf('touch') === 0) {
-                       return this.addMsTouchListener(obj, type, handler, id);
-               } else if (L.Browser.touch && (type === 'dblclick') && this.addDoubleTapListener) {
-                       return this.addDoubleTapListener(obj, handler, id);
+               if (L.Browser.pointer && type.indexOf('touch') === 0) {
+                       return this.addPointerListener(obj, type, handler, id);
+               }
+               if (L.Browser.touch && (type === 'dblclick') && this.addDoubleTapListener) {
+                       this.addDoubleTapListener(obj, handler, id);
+               }
+
+               if ('addEventListener' in obj) {

 
 

-               } else if ('addEventListener' in obj) {
-                       

                        if (type === 'mousewheel') {
                                obj.addEventListener('DOMMouseScroll', handler, false);
                                obj.addEventListener(type, handler, false);
                        if (type === 'mousewheel') {
                                obj.addEventListener('DOMMouseScroll', handler, false);
                                obj.addEventListener(type, handler, false);


@@ -5386,12 +6427,19 @@ L.DomEvent = {
 
                                obj.addEventListener(newType, handler, false);
 
 
                                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) {
                        } else {
                                obj.addEventListener(type, handler, false);
                        }
 
                } else if ('attachEvent' in obj) {

-                       obj.attachEvent("on" + type, handler);
+                       obj.attachEvent('on' + type, handler);

                }
 
                obj[key] = handler;
                }
 
                obj[key] = handler;


@@ -5401,14 +6449,14 @@ L.DomEvent = {
 
        removeListener: function (obj, type, fn) {  // (HTMLElement, String, Function)
 
 
        removeListener: function (obj, type, fn) {  // (HTMLElement, String, Function)
 

-               var id = L.Util.stamp(fn),
-                       key = '_leaflet_' + type + id,
-                       handler = obj[key];
+               var id = L.stamp(fn),
+                   key = '_leaflet_' + type + id,
+                   handler = obj[key];

 
 

-               if (!handler) { return; }
+               if (!handler) { return this; }

 
 

-               if (L.Browser.msTouch && type.indexOf('touch') === 0) {
-                       this.removeMsTouchListener(obj, type, id);
+               if (L.Browser.pointer && type.indexOf('touch') === 0) {
+                       this.removePointerListener(obj, type, id);

                } else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {
                        this.removeDoubleTapListener(obj, id);
 
                } else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {
                        this.removeDoubleTapListener(obj, id);
 


@@ -5424,7 +6472,7 @@ L.DomEvent = {
                                obj.removeEventListener(type, handler, false);
                        }
                } else if ('detachEvent' in obj) {
                                obj.removeEventListener(type, handler, false);
                        }
                } else if ('detachEvent' in obj) {

-                       obj.detachEvent("on" + type, handler);
+                       obj.detachEvent('on' + type, handler);

                }
 
                obj[key] = null;
                }
 
                obj[key] = null;


@@ -5439,17 +6487,29 @@ L.DomEvent = {
                } else {
                        e.cancelBubble = true;
                }
                } else {
                        e.cancelBubble = true;
                }

+               L.DomEvent._skipped(e);
+

                return this;
        },
 
                return this;
        },
 

-       disableClickPropagation: function (el) {
+       disableScrollPropagation: function (el) {
+               var stop = L.DomEvent.stopPropagation;
+
+               return L.DomEvent
+                       .on(el, 'mousewheel', stop)
+                       .on(el, 'MozMousePixelScroll', stop);
+       },

 
 

+       disableClickPropagation: function (el) {

                var stop = L.DomEvent.stopPropagation;
                var stop = L.DomEvent.stopPropagation;

-               
+
+               for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
+                       L.DomEvent.on(el, L.Draggable.START[i], stop);
+               }
+

                return L.DomEvent
                return L.DomEvent

-                       .addListener(el, L.Draggable.START, stop)
-                       .addListener(el, 'click', stop)
-                       .addListener(el, 'dblclick', stop);
+                       .on(el, 'click', L.DomEvent._fakeStop)
+                       .on(el, 'dblclick', stop);

        },
 
        preventDefault: function (e) {
        },
 
        preventDefault: function (e) {


@@ -5463,18 +6523,21 @@ L.DomEvent = {
        },
 
        stop: function (e) {
        },
 
        stop: function (e) {

-               return L.DomEvent.preventDefault(e).stopPropagation(e);
+               return L.DomEvent
+                       .preventDefault(e)
+                       .stopPropagation(e);

        },
 
        getMousePosition: function (e, container) {
        },
 
        getMousePosition: function (e, container) {

+               if (!container) {
+                       return new L.Point(e.clientX, e.clientY);
+               }

 
 

-               var body = document.body,
-                       docEl = document.documentElement,
-                       x = e.pageX ? e.pageX : e.clientX + body.scrollLeft + docEl.scrollLeft,
-                       y = e.pageY ? e.pageY : e.clientY + body.scrollTop + docEl.scrollTop,
-                       pos = new L.Point(x, y);
+               var rect = container.getBoundingClientRect();

 
 

-               return (container ? pos._subtract(L.DomUtil.getViewportOffset(container)) : pos);
+               return new L.Point(
+                       e.clientX - rect.left - container.clientLeft,
+                       e.clientY - rect.top - container.clientTop);

        },
 
        getWheelDelta: function (e) {
        },
 
        getWheelDelta: function (e) {


@@ -5490,8 +6553,22 @@ L.DomEvent = {
                return delta;
        },
 
                return delta;
        },
 

-       // check if element really left/entered the event target (for mouseenter/mouseleave)
-       _checkMouse: function (el, e) {
+       _skipEvents: {},
+
+       _fakeStop: function (e) {
+               // fakes stopPropagation by setting a special event flag, checked/reset with L.DomEvent._skipped(e)
+               L.DomEvent._skipEvents[e.type] = true;
+       },
+
+       _skipped: function (e) {
+               var skipped = this._skipEvents[e.type];
+               // reset when checking, as it's only used in map container and propagates outside of the map
+               this._skipEvents[e.type] = false;
+               return skipped;
+       },
+
+       // check if element really left/entered the event target (for mouseenter/mouseleave)
+       _checkMouse: function (el, e) {

 
                var related = e.relatedTarget;
 
 
                var related = e.relatedTarget;
 


@@ -5507,9 +6584,8 @@ L.DomEvent = {
                return (related !== el);
        },
 
                return (related !== el);
        },
 

-       /*jshint noarg:false */

        _getEvent: function () { // evil magic for IE
        _getEvent: function () { // evil magic for IE

-
+               /*jshint noarg:false */

                var e = window.event;
                if (!e) {
                        var caller = arguments.callee.caller;
                var e = window.event;
                if (!e) {
                        var caller = arguments.callee.caller;


@@ -5522,13 +6598,32 @@ L.DomEvent = {
                        }
                }
                return e;
                        }
                }
                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);

        }
        }

-       /*jshint noarg:false */

 };
 
 L.DomEvent.on = L.DomEvent.addListener;
 L.DomEvent.off = L.DomEvent.removeListener;
 
 };
 
 L.DomEvent.on = L.DomEvent.addListener;
 L.DomEvent.off = L.DomEvent.removeListener;
 

+

 /*
  * L.Draggable allows you to add dragging capabilities to any element. Supports mobile devices too.
  */
 /*
  * L.Draggable allows you to add dragging capabilities to any element. Supports mobile devices too.
  */


@@ -5537,10 +6632,19 @@ L.Draggable = L.Class.extend({
        includes: L.Mixin.Events,
 
        statics: {
        includes: L.Mixin.Events,
 
        statics: {

-               START: L.Browser.touch ? 'touchstart' : 'mousedown',
-               END: L.Browser.touch ? 'touchend' : 'mouseup',
-               MOVE: L.Browser.touch ? 'touchmove' : 'mousemove',
-               TAP_TOLERANCE: 15
+               START: L.Browser.touch ? ['touchstart', 'mousedown'] : ['mousedown'],
+               END: {
+                       mousedown: 'mouseup',
+                       touchstart: 'touchend',
+                       pointerdown: 'touchend',
+                       MSPointerDown: 'touchend'
+               },
+               MOVE: {
+                       mousedown: 'mousemove',
+                       touchstart: 'touchmove',
+                       pointerdown: 'touchmove',
+                       MSPointerDown: 'touchmove'
+               }

        },
 
        initialize: function (element, dragStartTarget) {
        },
 
        initialize: function (element, dragStartTarget) {


@@ -5549,80 +6653,75 @@ L.Draggable = L.Class.extend({
        },
 
        enable: function () {
        },
 
        enable: function () {

-               if (this._enabled) {
-                       return;
+               if (this._enabled) { return; }
+
+               for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
+                       L.DomEvent.on(this._dragStartTarget, L.Draggable.START[i], this._onDown, this);

                }
                }

-               L.DomEvent.on(this._dragStartTarget, L.Draggable.START, this._onDown, this);
+

                this._enabled = true;
        },
 
        disable: function () {
                this._enabled = true;
        },
 
        disable: function () {

-               if (!this._enabled) {
-                       return;
+               if (!this._enabled) { return; }
+
+               for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
+                       L.DomEvent.off(this._dragStartTarget, L.Draggable.START[i], this._onDown, this);

                }
                }

-               L.DomEvent.off(this._dragStartTarget, L.Draggable.START, this._onDown);
+

                this._enabled = false;
                this._moved = false;
        },
 
        _onDown: function (e) {
                this._enabled = false;
                this._moved = false;
        },
 
        _onDown: function (e) {

-               if ((!L.Browser.touch && e.shiftKey) ||
-                       ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
-
-               L.DomEvent.preventDefault(e);
+               this._moved = false;

 
 

-               if (L.Draggable._disabled) { return; }
+               if (e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }

 
 

-               this._simulateClick = true;
+               L.DomEvent.stopPropagation(e);

 
 

-               if (e.touches && e.touches.length > 1) {
-                       this._simulateClick = false;
-                       return;
-               }
+               if (L.Draggable._disabled) { return; }

 
 

-               var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
-                       el = first.target;
+               L.DomUtil.disableImageDrag();
+               L.DomUtil.disableTextSelection();

 
 

-               if (L.Browser.touch && el.tagName.toLowerCase() === 'a') {
-                       L.DomUtil.addClass(el, 'leaflet-active');
-               }
+               if (this._moving) { return; }

 
 

-               this._moved = false;
-               if (this._moving) {
-                       return;
-               }
+               var first = e.touches ? e.touches[0] : e;

 
                this._startPoint = new L.Point(first.clientX, first.clientY);
                this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
 
 
                this._startPoint = new L.Point(first.clientX, first.clientY);
                this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
 

-               L.DomEvent.on(document, L.Draggable.MOVE, this._onMove, this);
-               L.DomEvent.on(document, L.Draggable.END, 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) {
        },
 
        _onMove: function (e) {

-               if (e.touches && e.touches.length > 1) { return; }
+               if (e.touches && e.touches.length > 1) {
+                       this._moved = true;
+                       return;
+               }

 
                var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
 
                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);
+                   newPoint = new L.Point(first.clientX, first.clientY),
+                   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');
 
                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');
+                       L.DomUtil.addClass((e.target || e.srcElement), 'leaflet-drag-target');

                }
 
                }
 

-               this._newPos = this._startPos.add(diffVec);
+               this._newPos = this._startPos.add(offset);

                this._moving = true;
 
                L.Util.cancelAnimFrame(this._animRequest);
                this._moving = true;
 
                L.Util.cancelAnimFrame(this._animRequest);


@@ -5636,68 +6735,36 @@ L.Draggable = L.Class.extend({
        },
 
        _onUp: function (e) {
        },
 
        _onUp: function (e) {

-               var simulateClickTouch;
-               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;
-                       }
-               }
+               L.DomUtil.removeClass(document.body, 'leaflet-dragging');
+               L.DomUtil.removeClass((e.target || e.srcElement), 'leaflet-drag-target');

 
 

-               if (!L.Browser.touch) {
-                       L.DomUtil.enableTextSelection();
-                       this._restoreCursor();
+               for (var i in L.Draggable.MOVE) {
+                       L.DomEvent
+                           .off(document, L.Draggable.MOVE[i], this._onMove)
+                           .off(document, L.Draggable.END[i], this._onUp);

                }
 
                }
 

-               L.DomEvent.off(document, L.Draggable.MOVE, this._onMove);
-               L.DomEvent.off(document, L.Draggable.END, this._onUp);
+               L.DomUtil.enableImageDrag();
+               L.DomUtil.enableTextSelection();

 
 

-               if (this._moved) {
+               if (this._moved && this._moving) {

                        // ensure drag is not fired after dragend
                        L.Util.cancelAnimFrame(this._animRequest);
 
                        // 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);
+                       this.fire('dragend', {
+                               distance: this._newPos.distanceTo(this._startPos)
+                       });

                }
                }

-       },
-
-       _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;

        }
 });
 
 
 /*
        }
 });
 
 
 /*

- * L.Handler classes are used internally to inject interaction features to classes like Map and Marker.
- */
+       L.Handler is a base class for handler classes that are used internally to inject
+       interaction features like dragging to classes like Map and Marker.
+*/

 
 L.Handler = L.Class.extend({
        initialize: function (map) {
 
 L.Handler = L.Class.extend({
        initialize: function (map) {


@@ -5725,7 +6792,7 @@ L.Handler = L.Class.extend({
 
 
 /*
 
 
 /*

- * L.Handler.MapDrag is used internally by L.Map to make the map draggable.
+ * L.Handler.MapDrag is used to make the map draggable (with panning inertia), enabled by default.

  */
 
 L.Map.mergeOptions({
  */
 
 L.Map.mergeOptions({


@@ -5733,17 +6800,20 @@ L.Map.mergeOptions({
 
        inertia: !L.Browser.android23,
        inertiaDeceleration: 3400, // px/s^2
 
        inertia: !L.Browser.android23,
        inertiaDeceleration: 3400, // px/s^2

-       inertiaMaxSpeed: 6000, // px/s
+       inertiaMaxSpeed: Infinity, // px/s

        inertiaThreshold: L.Browser.touch ? 32 : 18, // ms
        inertiaThreshold: L.Browser.touch ? 32 : 18, // ms

+       easeLinearity: 0.25,

 
        // TODO refactor, move to CRS
 
        // TODO refactor, move to CRS

-       worldCopyJump: true
+       worldCopyJump: false

 });
 
 L.Map.Drag = L.Handler.extend({
        addHooks: function () {
                if (!this._draggable) {
 });
 
 L.Map.Drag = L.Handler.extend({
        addHooks: function () {
                if (!this._draggable) {

-                       this._draggable = new L.Draggable(this._map._mapPane, this._map._container);
+                       var map = this._map;
+
+                       this._draggable = new L.Draggable(map._mapPane, map._container);

 
                        this._draggable.on({
                                'dragstart': this._onDragStart,
 
                        this._draggable.on({
                                'dragstart': this._onDragStart,


@@ -5751,11 +6821,11 @@ L.Map.Drag = L.Handler.extend({
                                'dragend': this._onDragEnd
                        }, this);
 
                                'dragend': this._onDragEnd
                        }, this);
 

-                       var options = this._map.options;
-
-                       if (options.worldCopyJump) {
+                       if (map.options.worldCopyJump) {

                                this._draggable.on('predrag', this._onPreDrag, this);
                                this._draggable.on('predrag', this._onPreDrag, this);

-                               this._map.on('viewreset', this._onViewReset, this);
+                               map.on('viewreset', this._onViewReset, this);
+
+                               map.whenReady(this._onViewReset, this);

                        }
                }
                this._draggable.enable();
                        }
                }
                this._draggable.enable();


@@ -5777,8 +6847,8 @@ L.Map.Drag = L.Handler.extend({
                }
 
                map
                }
 
                map

-                       .fire('movestart')
-                       .fire('dragstart');
+                   .fire('movestart')
+                   .fire('dragstart');

 
                if (map.options.inertia) {
                        this._positions = [];
 
                if (map.options.inertia) {
                        this._positions = [];


@@ -5801,40 +6871,40 @@ L.Map.Drag = L.Handler.extend({
                }
 
                this._map
                }
 
                this._map

-                       .fire('move')
-                       .fire('drag');
+                   .fire('move')
+                   .fire('drag');

        },
 
        _onViewReset: function () {
        },
 
        _onViewReset: function () {

+               // TODO fix hardcoded Earth values

                var pxCenter = this._map.getSize()._divideBy(2),
                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._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 () {
                // TODO refactor to be able to adjust map pane position after zoom
        },
 
        _onPreDrag: function () {
                // TODO refactor to be able to adjust map pane position after zoom

-               var map = this._map,
-                       worldWidth = this._worldWidth,
-                       halfWidth = Math.round(worldWidth / 2),
-                       dx = this._initialWorldOffset,
-                       x = this._draggable._newPos.x,
-                       newX1 = (x - halfWidth + dx) % worldWidth + halfWidth - dx,
-                       newX2 = (x + halfWidth + dx) % worldWidth - halfWidth - dx,
-                       newX = Math.abs(newX1 + dx) < Math.abs(newX2 + dx) ? newX1 : newX2;
+               var worldWidth = this._worldWidth,
+                   halfWidth = Math.round(worldWidth / 2),
+                   dx = this._initialWorldOffset,
+                   x = this._draggable._newPos.x,
+                   newX1 = (x - halfWidth + dx) % worldWidth + halfWidth - dx,
+                   newX2 = (x + halfWidth + dx) % worldWidth - halfWidth - dx,
+                   newX = Math.abs(newX1 + dx) < Math.abs(newX2 + dx) ? newX1 : newX2;

 
                this._draggable._newPos.x = newX;
        },
 
 
                this._draggable._newPos.x = newX;
        },
 

-       _onDragEnd: function () {
+       _onDragEnd: function (e) {

                var map = this._map,
                var map = this._map,

-                       options = map.options,
-                       delay = +new Date() - this._lastTime,
+                   options = map.options,
+                   delay = +new Date() - this._lastTime,

 
 

-                       noInertia = !options.inertia ||
-                                       delay > options.inertiaThreshold ||
-                                       this._positions[0] === undefined;
+                   noInertia = !options.inertia || delay > options.inertiaThreshold || !this._positions[0];
+
+               map.fire('dragend', e);

 
                if (noInertia) {
                        map.fire('moveend');
 
                if (noInertia) {
                        map.fire('moveend');


@@ -5842,32 +6912,33 @@ L.Map.Drag = L.Handler.extend({
                } else {
 
                        var direction = this._lastPos.subtract(this._positions[0]),
                } else {
 
                        var direction = this._lastPos.subtract(this._positions[0]),

-                               duration = (this._lastTime + delay - this._times[0]) / 1000,
-
-                               speedVector = direction.multiplyBy(0.58 / duration),
-                               speed = speedVector.distanceTo(new L.Point(0, 0)),
+                           duration = (this._lastTime + delay - this._times[0]) / 1000,
+                           ease = options.easeLinearity,

 
 

-                               limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
-                               limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
+                           speedVector = direction.multiplyBy(ease / duration),
+                           speed = speedVector.distanceTo([0, 0]),

 
 

-                               decelerationDuration = limitedSpeed / options.inertiaDeceleration,
-                               offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
+                           limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
+                           limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),

 
 

-                       L.Util.requestAnimFrame(L.Util.bind(function () {
-                               this._map.panBy(offset, decelerationDuration);
-                       }, this));
-               }
+                           decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
+                           offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();

 
 

-               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 {
+                               offset = map._limitOffset(offset, map.options.maxBounds);
+
+                               L.Util.requestAnimFrame(function () {
+                                       map.panBy(offset, {
+                                               duration: decelerationDuration,
+                                               easeLinearity: ease,
+                                               noMoveStart: true
+                                       });
+                               });
+                       }

                }
                }

-       },
-
-       _panInsideMaxBounds: function () {
-               this.panInsideBounds(this.options.maxBounds);

        }
 });
 
        }
 });
 


@@ -5875,7 +6946,7 @@ L.Map.addInitHook('addHandler', 'dragging', L.Map.Drag);
 
 
 /*
 
 
 /*

- * L.Handler.DoubleClickZoom is used internally by L.Map to add double-click zooming.
+ * L.Handler.DoubleClickZoom is used to handle double-click zoom on the map, enabled by default.

  */
 
 L.Map.mergeOptions({
  */
 
 L.Map.mergeOptions({


@@ -5884,36 +6955,46 @@ L.Map.mergeOptions({
 
 L.Map.DoubleClickZoom = L.Handler.extend({
        addHooks: function () {
 
 L.Map.DoubleClickZoom = L.Handler.extend({
        addHooks: function () {

-               this._map.on('dblclick', this._onDoubleClick);
+               this._map.on('dblclick', this._onDoubleClick, this);

        },
 
        removeHooks: function () {
        },
 
        removeHooks: function () {

-               this._map.off('dblclick', this._onDoubleClick);
+               this._map.off('dblclick', this._onDoubleClick, this);

        },
 
        _onDoubleClick: function (e) {
        },
 
        _onDoubleClick: function (e) {

-               this.setView(e.latlng, this._zoom + 1);
+               var map = this._map,
+                   zoom = map.getZoom() + (e.originalEvent.shiftKey ? -1 : 1);
+
+               if (map.options.doubleClickZoom === 'center') {
+                       map.setZoom(zoom);
+               } else {
+                       map.setZoomAround(e.containerPoint, zoom);
+               }

        }
 });
 
 L.Map.addInitHook('addHandler', 'doubleClickZoom', L.Map.DoubleClickZoom);
 
        }
 });
 
 L.Map.addInitHook('addHandler', 'doubleClickZoom', L.Map.DoubleClickZoom);
 

+

 /*
 /*

- * L.Handler.ScrollWheelZoom is used internally by L.Map to enable mouse scroll wheel zooming on the map.
+ * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.

  */
 
 L.Map.mergeOptions({
  */
 
 L.Map.mergeOptions({

-       scrollWheelZoom: !L.Browser.touch || L.Browser.msTouch
+       scrollWheelZoom: true

 });
 
 L.Map.ScrollWheelZoom = L.Handler.extend({
        addHooks: function () {
                L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);
 });
 
 L.Map.ScrollWheelZoom = L.Handler.extend({
        addHooks: function () {
                L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);

+               L.DomEvent.on(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);

                this._delta = 0;
        },
 
        removeHooks: function () {
                L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll);
                this._delta = 0;
        },
 
        removeHooks: function () {
                L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll);

+               L.DomEvent.off(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);

        },
 
        _onWheelScroll: function (e) {
        },
 
        _onWheelScroll: function (e) {


@@ -5929,7 +7010,7 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
                var left = Math.max(40 - (+new Date() - this._startTime), 0);
 
                clearTimeout(this._timer);
                var left = Math.max(40 - (+new Date() - this._startTime), 0);
 
                clearTimeout(this._timer);

-               this._timer = setTimeout(L.Util.bind(this._performZoom, this), left);
+               this._timer = setTimeout(L.bind(this._performZoom, this), left);

 
                L.DomEvent.preventDefault(e);
                L.DomEvent.stopPropagation(e);
 
                L.DomEvent.preventDefault(e);
                L.DomEvent.stopPropagation(e);


@@ -5937,57 +7018,53 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
 
        _performZoom: function () {
                var map = this._map,
 
        _performZoom: function () {
                var map = this._map,

-                       delta = Math.round(this._delta),
-                       zoom = map.getZoom();
+                   delta = this._delta,
+                   zoom = map.getZoom();

 
 

+               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;
                delta = Math.max(Math.min(delta, 4), -4);
                delta = map._limitZoom(zoom + delta) - zoom;
 
                this._delta = 0;

-

                this._startTime = null;
 
                if (!delta) { return; }
 
                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);
+               if (map.options.scrollWheelZoom === 'center') {
+                       map.setZoom(zoom + delta);
+               } else {
+                       map.setZoomAround(this._lastMousePos, zoom + delta);
+               }

        }
 });
 
 L.Map.addInitHook('addHandler', 'scrollWheelZoom', L.Map.ScrollWheelZoom);
 
 
        }
 });
 
 L.Map.addInitHook('addHandler', 'scrollWheelZoom', L.Map.ScrollWheelZoom);
 
 

-L.Util.extend(L.DomEvent, {
+/*
+ * Extends the event handling code with double tap support for mobile browsers.
+ */
+
+L.extend(L.DomEvent, {

 
 

-       _touchstart: L.Browser.msTouch ? 'MSPointerDown' : 'touchstart',
-       _touchend: L.Browser.msTouch ? 'MSPointerUp' : 'touchend',
+       _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
+       _touchend: L.Browser.msPointer ? 'MSPointerUp' : L.Browser.pointer ? 'pointerup' : 'touchend',

 
        // inspired by Zepto touch code by Thomas Fuchs
        addDoubleTapListener: function (obj, handler, id) {
                var last,
 
        // inspired by Zepto touch code by Thomas Fuchs
        addDoubleTapListener: function (obj, handler, id) {
                var last,

-                       doubleTap = false,
-                       delay = 250,
-                       touch,
-                       pre = '_leaflet_',
-                       touchstart = this._touchstart,
-                       touchend = this._touchend,
-                       trackedTouches = [];
+                   doubleTap = false,
+                   delay = 250,
+                   touch,
+                   pre = '_leaflet_',
+                   touchstart = this._touchstart,
+                   touchend = this._touchend,
+                   trackedTouches = [];

 
                function onTouchStart(e) {
                        var count;
 
                function onTouchStart(e) {
                        var count;

-                       if (L.Browser.msTouch) {
+
+                       if (L.Browser.pointer) {

                                trackedTouches.push(e.pointerId);
                                count = trackedTouches.length;
                        } else {
                                trackedTouches.push(e.pointerId);
                                count = trackedTouches.length;
                        } else {


@@ -6004,8 +7081,9 @@ L.Util.extend(L.DomEvent, {
                        doubleTap = (delta > 0 && delta <= delay);
                        last = now;
                }
                        doubleTap = (delta > 0 && delta <= delay);
                        last = now;
                }

+

                function onTouchEnd(e) {
                function onTouchEnd(e) {

-                       if (L.Browser.msTouch) {
+                       if (L.Browser.pointer) {

                                var idx = trackedTouches.indexOf(e.pointerId);
                                if (idx === -1) {
                                        return;
                                var idx = trackedTouches.indexOf(e.pointerId);
                                if (idx === -1) {
                                        return;


@@ -6014,18 +7092,18 @@ L.Util.extend(L.DomEvent, {
                        }
 
                        if (doubleTap) {
                        }
 
                        if (doubleTap) {

-                               if (L.Browser.msTouch) {
-                                       //Work around .type being readonly with MSPointer* events
+                               if (L.Browser.pointer) {
+                                       // work around .type being readonly with MSPointer* events

                                        var newTouch = { },
                                                prop;
                                        var newTouch = { },
                                                prop;

+
+                                       // jshint forin:false

                                        for (var i in touch) {
                                        for (var i in touch) {

-                                               if (true) { //Make JSHint happy, we want to copy all properties
-                                                       prop = touch[i];
-                                                       if (typeof prop === 'function') {
-                                                               newTouch[i] = prop.bind(touch);
-                                                       } else {
-                                                               newTouch[i] = prop;
-                                                       }
+                                               prop = touch[i];
+                                               if (typeof prop === 'function') {
+                                                       newTouch[i] = prop.bind(touch);
+                                               } else {
+                                                       newTouch[i] = prop;

                                                }
                                        }
                                        touch = newTouch;
                                                }
                                        }
                                        touch = newTouch;


@@ -6038,109 +7116,127 @@ L.Util.extend(L.DomEvent, {
                obj[pre + touchstart + id] = onTouchStart;
                obj[pre + touchend + id] = onTouchEnd;
 
                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
-               var endElement = L.Browser.msTouch ? document.documentElement : obj;
+               // on pointer 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.pointer ? document.documentElement : obj;

 
                obj.addEventListener(touchstart, onTouchStart, false);
                endElement.addEventListener(touchend, onTouchEnd, false);
 
                obj.addEventListener(touchstart, onTouchStart, false);
                endElement.addEventListener(touchend, onTouchEnd, false);

-               if (L.Browser.msTouch) {
-                       endElement.addEventListener('MSPointerCancel', onTouchEnd, false);
+
+               if (L.Browser.pointer) {
+                       endElement.addEventListener(L.DomEvent.POINTER_CANCEL, onTouchEnd, false);

                }
                }

+

                return this;
        },
 
        removeDoubleTapListener: function (obj, id) {
                var pre = '_leaflet_';
                return this;
        },
 
        removeDoubleTapListener: function (obj, id) {
                var pre = '_leaflet_';

+

                obj.removeEventListener(this._touchstart, obj[pre + this._touchstart + id], false);
                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);
-               if (L.Browser.msTouch) {
-                       document.documentElement.removeEventListener('MSPointerCancel', obj[pre + this._touchend + id], false);
+               (L.Browser.pointer ? document.documentElement : obj).removeEventListener(
+                       this._touchend, obj[pre + this._touchend + id], false);
+
+               if (L.Browser.pointer) {
+                       document.documentElement.removeEventListener(L.DomEvent.POINTER_CANCEL, obj[pre + this._touchend + id],
+                               false);

                }
                }

+

                return this;
        }
 });
 
 
                return this;
        }
 });
 
 

-L.Util.extend(L.DomEvent, {
+/*
+ * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
+ */
+
+L.extend(L.DomEvent, {
+
+       //static
+       POINTER_DOWN: L.Browser.msPointer ? 'MSPointerDown' : 'pointerdown',
+       POINTER_MOVE: L.Browser.msPointer ? 'MSPointerMove' : 'pointermove',
+       POINTER_UP: L.Browser.msPointer ? 'MSPointerUp' : 'pointerup',
+       POINTER_CANCEL: L.Browser.msPointer ? 'MSPointerCancel' : 'pointercancel',

 
 

-       _msTouches: [],
-       _msDocumentListener: false,
+       _pointers: [],
+       _pointerDocumentListener: false,

 
 

-       // Provides a touch events wrapper for msPointer events.
+       // Provides a touch events wrapper for (ms)pointer events.

        // Based on changes by veproza https://github.com/CloudMade/Leaflet/pull/1019
        // Based on changes by veproza https://github.com/CloudMade/Leaflet/pull/1019

+       //ref http://www.w3.org/TR/pointerevents/ https://www.w3.org/Bugs/Public/show_bug.cgi?id=22890

 
 

-       addMsTouchListener: function (obj, type, handler, id) {
+       addPointerListener: function (obj, type, handler, id) {

 
                switch (type) {
                case 'touchstart':
 
                switch (type) {
                case 'touchstart':

-                       return this.addMsTouchListenerStart(obj, type, handler, id);
+                       return this.addPointerListenerStart(obj, type, handler, id);

                case 'touchend':
                case 'touchend':

-                       return this.addMsTouchListenerEnd(obj, type, handler, id);
+                       return this.addPointerListenerEnd(obj, type, handler, id);

                case 'touchmove':
                case 'touchmove':

-                       return this.addMsTouchListenerMove(obj, type, handler, id);
+                       return this.addPointerListenerMove(obj, type, handler, id);

                default:
                        throw 'Unknown touch event type';
                }
        },
 
                default:
                        throw 'Unknown touch event type';
                }
        },
 

-       addMsTouchListenerStart: function (obj, type, handler, id) {
+       addPointerListenerStart: function (obj, type, handler, id) {

                var pre = '_leaflet_',
                var pre = '_leaflet_',

-                       touches = this._msTouches;
+                   pointers = this._pointers;

 
                var cb = function (e) {
 
 
                var cb = function (e) {
 

+                       L.DomEvent.preventDefault(e);
+

                        var alreadyInArray = false;
                        var alreadyInArray = false;

-                       for (var i = 0; i < touches.length; i++) {
-                               if (touches[i].pointerId === e.pointerId) {
+                       for (var i = 0; i < pointers.length; i++) {
+                               if (pointers[i].pointerId === e.pointerId) {

                                        alreadyInArray = true;
                                        break;
                                }
                        }
                        if (!alreadyInArray) {
                                        alreadyInArray = true;
                                        break;
                                }
                        }
                        if (!alreadyInArray) {

-                               touches.push(e);
+                               pointers.push(e);

                        }
 
                        }
 

-                       e.touches = touches.slice();
+                       e.touches = pointers.slice();

                        e.changedTouches = [e];
 
                        handler(e);
                };
 
                obj[pre + 'touchstart' + id] = cb;
                        e.changedTouches = [e];
 
                        handler(e);
                };
 
                obj[pre + 'touchstart' + id] = cb;

-               obj.addEventListener('MSPointerDown', cb, false);
+               obj.addEventListener(this.POINTER_DOWN, cb, false);

 
 

-               //Need to also listen for end events to keep the _msTouches list accurate
-               //this needs to be on the body and never go away
-               if (!this._msDocumentListener) {
+               // need to also listen for end events to keep the _pointers list accurate
+               // this needs to be on the body and never go away
+               if (!this._pointerDocumentListener) {

                        var internalCb = function (e) {
                        var internalCb = function (e) {

-                               for (var i = 0; i < touches.length; i++) {
-                                       if (touches[i].pointerId === e.pointerId) {
-                                               touches.splice(i, 1);
+                               for (var i = 0; i < pointers.length; i++) {
+                                       if (pointers[i].pointerId === e.pointerId) {
+                                               pointers.splice(i, 1);

                                                break;
                                        }
                                }
                        };
                        //We listen on the documentElement as any drags that end by moving the touch off the screen get fired there
                                                break;
                                        }
                                }
                        };
                        //We listen on the documentElement as any drags that end by moving the touch off the screen get fired there

-                       document.documentElement.addEventListener('MSPointerUp', internalCb, false);
-                       document.documentElement.addEventListener('MSPointerCancel', internalCb, false);
+                       document.documentElement.addEventListener(this.POINTER_UP, internalCb, false);
+                       document.documentElement.addEventListener(this.POINTER_CANCEL, internalCb, false);

 
 

-                       this._msDocumentListener = true;
+                       this._pointerDocumentListener = true;

                }
 
                return this;
        },
 
                }
 
                return this;
        },
 

-       addMsTouchListenerMove: function (obj, type, handler, id) {
-               var pre = '_leaflet_';
+       addPointerListenerMove: function (obj, type, handler, id) {
+               var pre = '_leaflet_',
+                   touches = this._pointers;

 
 

-               var touches = this._msTouches;
-               var cb = function (e) {
+               function cb(e) {

 
 

-                       //Don't fire touch moves when mouse isn't down
-                       if (e.pointerType === e.MSPOINTER_TYPE_MOUSE && e.buttons === 0) {
-                               return;
-                       }
+                       // don't fire touch moves when mouse isn't down
+                       if ((e.pointerType === e.MSPOINTER_TYPE_MOUSE || e.pointerType === 'mouse') && e.buttons === 0) { return; }

 
                        for (var i = 0; i < touches.length; i++) {
                                if (touches[i].pointerId === e.pointerId) {
 
                        for (var i = 0; i < touches.length; i++) {
                                if (touches[i].pointerId === e.pointerId) {


@@ -6153,17 +7249,17 @@ L.Util.extend(L.DomEvent, {
                        e.changedTouches = [e];
 
                        handler(e);
                        e.changedTouches = [e];
 
                        handler(e);

-               };
+               }

 
                obj[pre + 'touchmove' + id] = cb;
 
                obj[pre + 'touchmove' + id] = cb;

-               obj.addEventListener('MSPointerMove', cb, false);
+               obj.addEventListener(this.POINTER_MOVE, cb, false);

 
                return this;
        },
 
 
                return this;
        },
 

-       addMsTouchListenerEnd: function (obj, type, handler, id) {
+       addPointerListenerEnd: function (obj, type, handler, id) {

                var pre = '_leaflet_',
                var pre = '_leaflet_',

-                       touches = this._msTouches;
+                   touches = this._pointers;

 
                var cb = function (e) {
                        for (var i = 0; i < touches.length; i++) {
 
                var cb = function (e) {
                        for (var i = 0; i < touches.length; i++) {


@@ -6180,26 +7276,26 @@ L.Util.extend(L.DomEvent, {
                };
 
                obj[pre + 'touchend' + id] = cb;
                };
 
                obj[pre + 'touchend' + id] = cb;

-               obj.addEventListener('MSPointerUp', cb, false);
-               obj.addEventListener('MSPointerCancel', cb, false);
+               obj.addEventListener(this.POINTER_UP, cb, false);
+               obj.addEventListener(this.POINTER_CANCEL, cb, false);

 
                return this;
        },
 
 
                return this;
        },
 

-       removeMsTouchListener: function (obj, type, id) {
+       removePointerListener: function (obj, type, id) {

                var pre = '_leaflet_',
                    cb = obj[pre + type + id];
 
                switch (type) {
                case 'touchstart':
                var pre = '_leaflet_',
                    cb = obj[pre + type + id];
 
                switch (type) {
                case 'touchstart':

-                       obj.removeEventListener('MSPointerDown', cb, false);
+                       obj.removeEventListener(this.POINTER_DOWN, cb, false);

                        break;
                case 'touchmove':
                        break;
                case 'touchmove':

-                       obj.removeEventListener('MSPointerMove', cb, false);
+                       obj.removeEventListener(this.POINTER_MOVE, cb, false);

                        break;
                case 'touchend':
                        break;
                case 'touchend':

-                       obj.removeEventListener('MSPointerUp', cb, false);
-                       obj.removeEventListener('MSPointerCancel', cb, false);
+                       obj.removeEventListener(this.POINTER_UP, cb, false);
+                       obj.removeEventListener(this.POINTER_CANCEL, cb, false);

                        break;
                }
 
                        break;
                }
 


@@ -6209,11 +7305,12 @@ L.Util.extend(L.DomEvent, {
 
 
 /*
 
 
 /*

- * L.Handler.TouchZoom is used internally by L.Map to add touch-zooming on Webkit-powered mobile browsers.
+ * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.

  */
 
 L.Map.mergeOptions({
  */
 
 L.Map.mergeOptions({

-       touchZoom: L.Browser.touch && !L.Browser.android23
+       touchZoom: L.Browser.touch && !L.Browser.android23,
+       bounceAtZoomLimits: true

 });
 
 L.Map.TouchZoom = L.Handler.extend({
 });
 
 L.Map.TouchZoom = L.Handler.extend({


@@ -6231,8 +7328,8 @@ L.Map.TouchZoom = L.Handler.extend({
                if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
 
                var p1 = map.mouseEventToLayerPoint(e.touches[0]),
                if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
 
                var p1 = map.mouseEventToLayerPoint(e.touches[0]),

-                       p2 = map.mouseEventToLayerPoint(e.touches[1]),
-                       viewCenter = map._getCenterLayerPoint();
+                   p2 = map.mouseEventToLayerPoint(e.touches[1]),
+                   viewCenter = map._getCenterLayerPoint();

 
                this._startCenter = p1.add(p2)._divideBy(2);
                this._startDist = p1.distanceTo(p2);
 
                this._startCenter = p1.add(p2)._divideBy(2);
                this._startDist = p1.distanceTo(p2);


@@ -6247,86 +7344,84 @@ L.Map.TouchZoom = L.Handler.extend({
                }
 
                L.DomEvent
                }
 
                L.DomEvent

-                       .on(document, 'touchmove', this._onTouchMove, this)
-                       .on(document, 'touchend', this._onTouchEnd, this);
+                   .on(document, 'touchmove', this._onTouchMove, this)
+                   .on(document, 'touchend', this._onTouchEnd, this);

 
                L.DomEvent.preventDefault(e);
        },
 
        _onTouchMove: function (e) {
 
                L.DomEvent.preventDefault(e);
        },
 
        _onTouchMove: function (e) {

-               if (!e.touches || e.touches.length !== 2) { return; }
-

                var map = this._map;
 
                var map = this._map;
 

+               if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; }
+

                var p1 = map.mouseEventToLayerPoint(e.touches[0]),
                var p1 = map.mouseEventToLayerPoint(e.touches[0]),

-                       p2 = map.mouseEventToLayerPoint(e.touches[1]);
+                   p2 = map.mouseEventToLayerPoint(e.touches[1]);

 
                this._scale = p1.distanceTo(p2) / this._startDist;
                this._delta = p1._add(p2)._divideBy(2)._subtract(this._startCenter);
 
                if (this._scale === 1) { return; }
 
 
                this._scale = p1.distanceTo(p2) / this._startDist;
                this._delta = p1._add(p2)._divideBy(2)._subtract(this._startCenter);
 
                if (this._scale === 1) { return; }
 

+               if (!map.options.bounceAtZoomLimits) {
+                       if ((map.getZoom() === map.getMinZoom() && this._scale < 1) ||
+                           (map.getZoom() === map.getMaxZoom() && this._scale > 1)) { return; }
+               }
+

                if (!this._moved) {
                if (!this._moved) {

-                       L.DomUtil.addClass(map._mapPane, 'leaflet-zoom-anim leaflet-touching');
+                       L.DomUtil.addClass(map._mapPane, 'leaflet-touching');

 
                        map
 
                        map

-                               .fire('movestart')
-                               .fire('zoomstart')
-                               ._prepareTileBg();
+                           .fire('movestart')
+                           .fire('zoomstart');

 
                        this._moved = true;
                }
 
                L.Util.cancelAnimFrame(this._animRequest);
 
                        this._moved = true;
                }
 
                L.Util.cancelAnimFrame(this._animRequest);

-               this._animRequest = L.Util.requestAnimFrame(this._updateOnMove, this, true, this._map._container);
+               this._animRequest = L.Util.requestAnimFrame(
+                       this._updateOnMove, this, true, this._map._container);

 
                L.DomEvent.preventDefault(e);
        },
 
        _updateOnMove: function () {
                var map = this._map,
 
                L.DomEvent.preventDefault(e);
        },
 
        _updateOnMove: function () {
                var map = this._map,

-                       origin = this._getScaleOrigin(),
-                       center = map.layerPointToLatLng(origin);
+                   origin = this._getScaleOrigin(),
+                   center = map.layerPointToLatLng(origin),
+                   zoom = map.getScaleZoom(this._scale);

 
 

-               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
-
-               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 (e) {
-               if (!this._moved || !this._zooming) { return; }
+       _onTouchEnd: function () {
+               if (!this._moved || !this._zooming) {
+                       this._zooming = false;
+                       return;
+               }

 
                var map = this._map;
 
                this._zooming = false;
                L.DomUtil.removeClass(map._mapPane, 'leaflet-touching');
 
                var map = this._map;
 
                this._zooming = false;
                L.DomUtil.removeClass(map._mapPane, 'leaflet-touching');

+               L.Util.cancelAnimFrame(this._animRequest);

 
                L.DomEvent
 
                L.DomEvent

-                       .off(document, 'touchmove', this._onTouchMove)
-                       .off(document, 'touchend', this._onTouchEnd);
+                   .off(document, 'touchmove', this._onTouchMove)
+                   .off(document, 'touchend', this._onTouchEnd);

 
                var origin = this._getScaleOrigin(),
 
                var origin = this._getScaleOrigin(),

-                       center = map.layerPointToLatLng(origin),
+                   center = map.layerPointToLatLng(origin),

 
 

-                       oldZoom = map.getZoom(),
-                       floatZoomDelta = map.getScaleZoom(this._scale) - oldZoom,
-                       roundZoomDelta = (floatZoomDelta > 0 ? Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)),
-                       zoom = map._limitZoom(oldZoom + roundZoomDelta);
+                   oldZoom = map.getZoom(),
+                   floatZoomDelta = map.getScaleZoom(this._scale) - oldZoom,
+                   roundZoomDelta = (floatZoomDelta > 0 ?
+                           Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)),

 
 

-               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 () {
        },
 
        _getScaleOrigin: function () {


@@ -6339,7 +7434,117 @@ L.Map.addInitHook('addHandler', 'touchZoom', L.Map.TouchZoom);
 
 
 /*
 
 
 /*

- * L.Handler.ShiftDragZoom is used internally by L.Map to add shift-drag zoom (zoom to a selected bounding box).
+ * 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 && 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 && el.tagName && 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.pointer) {
+       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.

  */
 
 L.Map.mergeOptions({
  */
 
 L.Map.mergeOptions({


@@ -6351,6 +7556,7 @@ L.Map.BoxZoom = L.Handler.extend({
                this._map = map;
                this._container = map._container;
                this._pane = map._panes.overlayPane;
                this._map = map;
                this._container = map._container;
                this._pane = map._panes.overlayPane;

+               this._moved = false;

        },
 
        addHooks: function () {
        },
 
        addHooks: function () {


@@ -6359,75 +7565,107 @@ L.Map.BoxZoom = L.Handler.extend({
 
        removeHooks: function () {
                L.DomEvent.off(this._container, 'mousedown', this._onMouseDown);
 
        removeHooks: function () {
                L.DomEvent.off(this._container, 'mousedown', this._onMouseDown);

+               this._moved = false;
+       },
+
+       moved: function () {
+               return this._moved;

        },
 
        _onMouseDown: function (e) {
        },
 
        _onMouseDown: function (e) {

+               this._moved = false;
+

                if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
 
                L.DomUtil.disableTextSelection();
                if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
 
                L.DomUtil.disableTextSelection();

+               L.DomUtil.disableImageDrag();

 
                this._startLayerPoint = this._map.mouseEventToLayerPoint(e);
 
 
                this._startLayerPoint = this._map.mouseEventToLayerPoint(e);
 

-               this._box = L.DomUtil.create('div', 'leaflet-zoom-box', this._pane);
-               L.DomUtil.setPosition(this._box, this._startLayerPoint);
-
-               //TODO refactor: move cursor to styles
-               this._container.style.cursor = 'crosshair';
-

                L.DomEvent
                L.DomEvent

-                       .on(document, 'mousemove', this._onMouseMove, this)
-                       .on(document, 'mouseup', this._onMouseUp, this)
-                       .preventDefault(e);
-                       
-               this._map.fire("boxzoomstart");
+                   .on(document, 'mousemove', this._onMouseMove, this)
+                   .on(document, 'mouseup', this._onMouseUp, this)
+                   .on(document, 'keydown', this._onKeyDown, this);

        },
 
        _onMouseMove: function (e) {
        },
 
        _onMouseMove: function (e) {

+               if (!this._moved) {
+                       this._box = L.DomUtil.create('div', 'leaflet-zoom-box', this._pane);
+                       L.DomUtil.setPosition(this._box, this._startLayerPoint);
+
+                       //TODO refactor: move cursor to styles
+                       this._container.style.cursor = 'crosshair';
+                       this._map.fire('boxzoomstart');
+               }
+

                var startPoint = this._startLayerPoint,
                var startPoint = this._startLayerPoint,

-                       box = this._box,
+                   box = this._box,

 
 

-                       layerPoint = this._map.mouseEventToLayerPoint(e),
-                       offset = layerPoint.subtract(startPoint),
+                   layerPoint = this._map.mouseEventToLayerPoint(e),
+                   offset = layerPoint.subtract(startPoint),

 
 

-                       newPos = new L.Point(
-                               Math.min(layerPoint.x, startPoint.x),
-                               Math.min(layerPoint.y, startPoint.y));
+                   newPos = new L.Point(
+                       Math.min(layerPoint.x, startPoint.x),
+                       Math.min(layerPoint.y, startPoint.y));

 
                L.DomUtil.setPosition(box, newPos);
 
 
                L.DomUtil.setPosition(box, newPos);
 

+               this._moved = true;
+

                // TODO refactor: remove hardcoded 4 pixels
                box.style.width  = (Math.max(0, Math.abs(offset.x) - 4)) + 'px';
                box.style.height = (Math.max(0, Math.abs(offset.y) - 4)) + 'px';
        },
 
                // TODO refactor: remove hardcoded 4 pixels
                box.style.width  = (Math.max(0, Math.abs(offset.x) - 4)) + 'px';
                box.style.height = (Math.max(0, Math.abs(offset.y) - 4)) + 'px';
        },
 

-       _onMouseUp: function (e) {
-               this._pane.removeChild(this._box);
-               this._container.style.cursor = '';
+       _finish: function () {
+               if (this._moved) {
+                       this._pane.removeChild(this._box);
+                       this._container.style.cursor = '';
+               }

 
                L.DomUtil.enableTextSelection();
 
                L.DomUtil.enableTextSelection();

+               L.DomUtil.enableImageDrag();

 
                L.DomEvent
 
                L.DomEvent

-                       .off(document, 'mousemove', this._onMouseMove)
-                       .off(document, 'mouseup', this._onMouseUp);
+                   .off(document, 'mousemove', this._onMouseMove)
+                   .off(document, 'mouseup', this._onMouseUp)
+                   .off(document, 'keydown', this._onKeyDown);
+       },
+
+       _onMouseUp: function (e) {
+
+               this._finish();

 
                var map = this._map,
 
                var map = this._map,

-                       layerPoint = map.mouseEventToLayerPoint(e);
+                   layerPoint = map.mouseEventToLayerPoint(e);
+
+               if (this._startLayerPoint.equals(layerPoint)) { return; }

 
                var bounds = new L.LatLngBounds(
 
                var bounds = new L.LatLngBounds(

-                               map.layerPointToLatLng(this._startLayerPoint),
-                               map.layerPointToLatLng(layerPoint));
+                       map.layerPointToLatLng(this._startLayerPoint),
+                       map.layerPointToLatLng(layerPoint));

 
                map.fitBounds(bounds);
 
                map.fitBounds(bounds);

-               
-               map.fire("boxzoomend", {
+
+               map.fire('boxzoomend', {

                        boxZoomBounds: bounds
                });
                        boxZoomBounds: bounds
                });

+       },
+
+       _onKeyDown: function (e) {
+               if (e.keyCode === 27) {
+                       this._finish();
+               }

        }
 });
 
 L.Map.addInitHook('addHandler', 'boxZoom', L.Map.BoxZoom);
 
 
        }
 });
 
 L.Map.addInitHook('addHandler', 'boxZoom', L.Map.BoxZoom);
 
 

+/*
+ * L.Map.Keyboard is handling keyboard interaction with the map, enabled by default.
+ */
+

 L.Map.mergeOptions({
        keyboard: true,
        keyboardPanOffset: 80,
 L.Map.mergeOptions({
        keyboard: true,
        keyboardPanOffset: 80,


@@ -6436,14 +7674,13 @@ L.Map.mergeOptions({
 
 L.Map.Keyboard = L.Handler.extend({
 
 
 L.Map.Keyboard = L.Handler.extend({
 

-       // list of e.keyCode values for particular actions

        keyCodes: {
                left:    [37],
                right:   [39],
                down:    [40],
                up:      [38],
        keyCodes: {
                left:    [37],
                right:   [39],
                down:    [40],
                up:      [38],

-               zoomIn:  [187, 107, 61],
-               zoomOut: [189, 109]
+               zoomIn:  [187, 107, 61, 171],
+               zoomOut: [189, 109, 173]

        },
 
        initialize: function (map) {
        },
 
        initialize: function (map) {


@@ -6458,37 +7695,45 @@ L.Map.Keyboard = L.Handler.extend({
 
                // make the container focusable by tabbing
                if (container.tabIndex === -1) {
 
                // make the container focusable by tabbing
                if (container.tabIndex === -1) {

-                       container.tabIndex = "0";
+                       container.tabIndex = '0';

                }
 
                L.DomEvent
                }
 
                L.DomEvent

-                       .addListener(container, 'focus', this._onFocus, this)
-                       .addListener(container, 'blur', this._onBlur, this)
-                       .addListener(container, 'mousedown', this._onMouseDown, this);
+                   .on(container, 'focus', this._onFocus, this)
+                   .on(container, 'blur', this._onBlur, this)
+                   .on(container, 'mousedown', this._onMouseDown, this);

 
                this._map
 
                this._map

-                       .on('focus', this._addHooks, this)
-                       .on('blur', this._removeHooks, this);
+                   .on('focus', this._addHooks, this)
+                   .on('blur', this._removeHooks, this);

        },
 
        removeHooks: function () {
                this._removeHooks();
 
                var container = this._map._container;
        },
 
        removeHooks: function () {
                this._removeHooks();
 
                var container = this._map._container;

+

                L.DomEvent
                L.DomEvent

-                       .removeListener(container, 'focus', this._onFocus, this)
-                       .removeListener(container, 'blur', this._onBlur, this)
-                       .removeListener(container, 'mousedown', this._onMouseDown, this);
+                   .off(container, 'focus', this._onFocus, this)
+                   .off(container, 'blur', this._onBlur, this)
+                   .off(container, 'mousedown', this._onMouseDown, this);

 
                this._map
 
                this._map

-                       .off('focus', this._addHooks, this)
-                       .off('blur', this._removeHooks, this);
+                   .off('focus', this._addHooks, this)
+                   .off('blur', this._removeHooks, this);

        },
 
        _onMouseDown: function () {
        },
 
        _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.scrollLeft || docEl.scrollLeft;
+
+               this._map._container.focus();
+
+               window.scrollTo(left, top);

        },
 
        _onFocus: function () {
        },
 
        _onFocus: function () {


@@ -6522,7 +7767,7 @@ L.Map.Keyboard = L.Handler.extend({
 
        _setZoomOffset: function (zoom) {
                var keys = this._zoomKeys = {},
 
        _setZoomOffset: function (zoom) {
                var keys = this._zoomKeys = {},

-                       codes = this.keyCodes,
+                   codes = this.keyCodes,

                    i, len;
 
                for (i = 0, len = codes.zoomIn.length; i < len; i++) {
                    i, len;
 
                for (i = 0, len = codes.zoomIn.length; i < len; i++) {


@@ -6530,318 +7775,119 @@ L.Map.Keyboard = L.Handler.extend({
                }
                for (i = 0, len = codes.zoomOut.length; i < len; i++) {
                        keys[codes.zoomOut[i]] = -zoom;
                }
                for (i = 0, len = codes.zoomOut.length; i < len; i++) {
                        keys[codes.zoomOut[i]] = -zoom;

-               }
-       },
-
-       _addHooks: function () {
-               L.DomEvent.addListener(document, 'keydown', this._onKeyDown, this);
-       },
-
-       _removeHooks: function () {
-               L.DomEvent.removeListener(document, 'keydown', this._onKeyDown, this);
-       },
-
-       _onKeyDown: function (e) {
-               var key = e.keyCode;
-
-               if (this._panKeys.hasOwnProperty(key)) {
-                       this._map.panBy(this._panKeys[key]);
-
-               } else if (this._zoomKeys.hasOwnProperty(key)) {
-                       this._map.setZoom(this._map.getZoom() + this._zoomKeys[key]);
-
-               } else {
-                       return;
-               }
-
-               L.DomEvent.stop(e);
-       }
-});
-
-L.Map.addInitHook('addHandler', 'keyboard', L.Map.Keyboard);
-
-
-/*
- * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
- */
-
-L.Handler.MarkerDrag = L.Handler.extend({
-       initialize: function (marker) {
-               this._marker = marker;
-       },
-
-       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.enable();
-       },
-
-       removeHooks: function () {
-               this._draggable.disable();
-       },
-
-       moved: function () {
-               return this._draggable && this._draggable._moved;
-       },
-
-       _onDragStart: function (e) {
-               this._marker
-                       .closePopup()
-                       .fire('movestart')
-                       .fire('dragstart');
-       },
-
-       _onDrag: function (e) {
-               var marker = this._marker,
-                       shadow = marker._shadow,
-                       iconPos = L.DomUtil.getPosition(marker._icon),
-                       latlng = marker._map.layerPointToLatLng(iconPos);
-
-               // update shadow position
-               if (shadow) {
-                       L.DomUtil.setPosition(shadow, iconPos);
-               }
-
-               marker._latlng = latlng;
-
-               marker
-                       .fire('move', { latlng: latlng })
-                       .fire('drag');
-       },
-
-       _onDragEnd: function () {
-               this._marker
-                       .fire('moveend')
-                       .fire('dragend');
-       }
-});
-
-
-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.Util.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;
+       _addHooks: function () {
+               L.DomEvent.on(document, 'keydown', this._onKeyDown, this);

        },
 
        },
 

-       _fireEdit: function () {
-               this._poly.fire('edit');
+       _removeHooks: function () {
+               L.DomEvent.off(document, 'keydown', this._onKeyDown, this);

        },
 
        },
 

-       _onMarkerDrag: function (e) {
-               var marker = e.target;
+       _onKeyDown: function (e) {
+               var key = e.keyCode,
+                   map = this._map;

 
 

-               L.Util.extend(marker._origLatLng, marker._latlng);
+               if (key in this._panKeys) {

 
 

-               if (marker._middleLeft) {
-                       marker._middleLeft.setLatLng(this._getMiddleLatLng(marker._prev, marker));
-               }
-               if (marker._middleRight) {
-                       marker._middleRight.setLatLng(this._getMiddleLatLng(marker, marker._next));
-               }
+                       if (map._panAnim && map._panAnim._inProgress) { return; }

 
 

-               this._poly.redraw();
-       },
+                       map.panBy(this._panKeys[key]);

 
 

-       _onMarkerClick: function (e) {
-               // Default action on marker click is to remove that marker, but if we remove the marker when latlng count < 3, we don't have a valid polyline anymore
-               if (this._poly._latlngs.length < 3) {
-                       return;
-               }
+                       if (map.options.maxBounds) {
+                               map.panInsideBounds(map.options.maxBounds);
+                       }

 
 

-               var marker = e.target,
-                   i = marker._index;
+               } else if (key in this._zoomKeys) {
+                       map.setZoom(map.getZoom() + this._zoomKeys[key]);

 
 

-               // Check existence of previous and next markers since they wouldn't exist for edge points on the polyline
-               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;
+               } else {
+                       return;

                }
                }

-               this._updatePrevNext(marker._prev, marker._next);

 
 

-               // The marker itself is guaranteed to exist and present in the layer, since we managed to click on it
-               this._markerGroup.removeLayer(marker);
-               // Check for the existence of middle left or middle right
-               if (marker._middleLeft) {
-                       this._markerGroup.removeLayer(marker._middleLeft);
-               }
-               if (marker._middleRight) {
-                       this._markerGroup.removeLayer(marker._middleRight);
-               }
-               this._markers.splice(i, 1);
-               this._poly.spliceLatLngs(i, 1);
-               this._updateIndexes(i, -1);
-               this._poly.fire('edit');
-       },
+               L.DomEvent.stop(e);
+       }
+});

 
 

-       _updateIndexes: function (index, delta) {
-               this._markerGroup.eachLayer(function (marker) {
-                       if (marker._index > index) {
-                               marker._index += delta;
-                       }
-               });
-       },
+L.Map.addInitHook('addHandler', 'keyboard', L.Map.Keyboard);

 
 

-       _createMiddleMarker: function (marker1, marker2) {
-               var latlng = this._getMiddleLatLng(marker1, marker2),
-                       marker = this._createMarker(latlng),
-                       onClick,
-                       onDragStart,
-                       onDragEnd;

 
 

-               marker.setOpacity(0.6);
+/*
+ * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
+ */

 
 

-               marker1._middleRight = marker2._middleLeft = marker;
+L.Handler.MarkerDrag = L.Handler.extend({
+       initialize: function (marker) {
+               this._marker = marker;
+       },

 
 

-               onDragStart = function () {
-                       var i = marker2._index;
+       addHooks: function () {
+               var icon = this._marker._icon;
+               if (!this._draggable) {
+                       this._draggable = new L.Draggable(icon, icon);
+               }

 
 

-                       marker._index = i;
+               this._draggable
+                       .on('dragstart', this._onDragStart, this)
+                       .on('drag', this._onDrag, this)
+                       .on('dragend', this._onDragEnd, this);
+               this._draggable.enable();
+               L.DomUtil.addClass(this._marker._icon, 'leaflet-marker-draggable');
+       },

 
 

-                       marker
-                               .off('click', onClick)
-                               .on('click', this._onMarkerClick, this);
+       removeHooks: function () {
+               this._draggable
+                       .off('dragstart', this._onDragStart, this)
+                       .off('drag', this._onDrag, this)
+                       .off('dragend', this._onDragEnd, this);

 
 

-                       latlng.lat = marker.getLatLng().lat;
-                       latlng.lng = marker.getLatLng().lng;
-                       this._poly.spliceLatLngs(i, 0, latlng);
-                       this._markers.splice(i, 0, marker);
+               this._draggable.disable();
+               L.DomUtil.removeClass(this._marker._icon, 'leaflet-marker-draggable');
+       },

 
 

-                       marker.setOpacity(1);
+       moved: function () {
+               return this._draggable && this._draggable._moved;
+       },

 
 

-                       this._updateIndexes(i, 1);
-                       marker2._index++;
-                       this._updatePrevNext(marker1, marker);
-                       this._updatePrevNext(marker, marker2);
-               };
+       _onDragStart: function () {
+               this._marker
+                   .closePopup()
+                   .fire('movestart')
+                   .fire('dragstart');
+       },

 
 

-               onDragEnd = function () {
-                       marker.off('dragstart', onDragStart, this);
-                       marker.off('dragend', onDragEnd, this);
+       _onDrag: function () {
+               var marker = this._marker,
+                   shadow = marker._shadow,
+                   iconPos = L.DomUtil.getPosition(marker._icon),
+                   latlng = marker._map.layerPointToLatLng(iconPos);

 
 

-                       this._createMiddleMarker(marker1, marker);
-                       this._createMiddleMarker(marker, marker2);
-               };
+               // update shadow position
+               if (shadow) {
+                       L.DomUtil.setPosition(shadow, iconPos);
+               }

 
 

-               onClick = function () {
-                       onDragStart.call(this);
-                       onDragEnd.call(this);
-                       this._poly.fire('edit');
-               };
+               marker._latlng = latlng;

 
                marker
 
                marker

-                       .on('click', onClick, this)
-                       .on('dragstart', onDragStart, this)
-                       .on('dragend', onDragEnd, this);
-
-               this._markerGroup.addLayer(marker);
+                   .fire('move', {latlng: latlng})
+                   .fire('drag');

        },
 
        },
 

-       _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));
+       _onDragEnd: function (e) {
+               this._marker
+                   .fire('moveend')
+                   .fire('dragend', e);

        }
 });
 
 
        }
 });
 
 

+/*
+ * L.Control is a base class for implementing map controls. Handles positioning.
+ * All other controls extend from this class.
+ */

 
 L.Control = L.Class.extend({
        options: {
 
 L.Control = L.Class.extend({
        options: {


@@ -6849,7 +7895,7 @@ L.Control = L.Class.extend({
        },
 
        initialize: function (options) {
        },
 
        initialize: function (options) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

        },
 
        getPosition: function () {
        },
 
        getPosition: function () {


@@ -6872,12 +7918,16 @@ L.Control = L.Class.extend({
                return this;
        },
 
                return this;
        },
 

+       getContainer: function () {
+               return this._container;
+       },
+

        addTo: function (map) {
                this._map = map;
 
                var container = this._container = this.onAdd(map),
                    pos = this.getPosition(),
        addTo: function (map) {
                this._map = map;
 
                var container = this._container = this.onAdd(map),
                    pos = this.getPosition(),

-                       corner = map._controlCorners[pos];
+                   corner = map._controlCorners[pos];

 
                L.DomUtil.addClass(container, 'leaflet-control');
 
 
                L.DomUtil.addClass(container, 'leaflet-control');
 


@@ -6892,7 +7942,7 @@ L.Control = L.Class.extend({
 
        removeFrom: function (map) {
                var pos = this.getPosition(),
 
        removeFrom: function (map) {
                var pos = this.getPosition(),

-                       corner = map._controlCorners[pos];
+                   corner = map._controlCorners[pos];

 
                corner.removeChild(this._container);
                this._map = null;
 
                corner.removeChild(this._container);
                this._map = null;


@@ -6902,6 +7952,12 @@ L.Control = L.Class.extend({
                }
 
                return this;
                }
 
                return this;

+       },
+
+       _refocusOnMap: function () {
+               if (this._map) {
+                       this._map.getContainer().focus();
+               }

        }
 });
 
        }
 });
 


@@ -6910,6 +7966,8 @@ L.control = function (options) {
 };
 
 
 };
 
 

+// adds control-related methods to L.Map
+

 L.Map.include({
        addControl: function (control) {
                control.addTo(this);
 L.Map.include({
        addControl: function (control) {
                control.addTo(this);


@@ -6925,40 +7983,62 @@ L.Map.include({
                var corners = this._controlCorners = {},
                    l = 'leaflet-',
                    container = this._controlContainer =
                var corners = this._controlCorners = {},
                    l = 'leaflet-',
                    container = this._controlContainer =

-                               L.DomUtil.create('div', l + 'control-container', this._container);
+                           L.DomUtil.create('div', l + 'control-container', this._container);

 
                function createCorner(vSide, hSide) {
                        var className = l + vSide + ' ' + l + hSide;
 
 
                function createCorner(vSide, hSide) {
                        var className = l + vSide + ' ' + l + hSide;
 

-                       corners[vSide + hSide] =
-                                       L.DomUtil.create('div', className, container);
+                       corners[vSide + hSide] = L.DomUtil.create('div', className, container);

                }
 
                createCorner('top', 'left');
                createCorner('top', 'right');
                createCorner('bottom', 'left');
                createCorner('bottom', 'right');
                }
 
                createCorner('top', 'left');
                createCorner('top', 'right');
                createCorner('bottom', 'left');
                createCorner('bottom', 'right');

+       },
+
+       _clearControlPos: function () {
+               this._container.removeChild(this._controlContainer);

        }
 });
 
 
        }
 });
 
 

+/*
+ * L.Control.Zoom is used for the default zoom buttons on the map.
+ */
+

 L.Control.Zoom = L.Control.extend({
        options: {
 L.Control.Zoom = L.Control.extend({
        options: {

-               position: 'topleft'
+               position: 'topleft',
+               zoomInText: '+',
+               zoomInTitle: 'Zoom in',
+               zoomOutText: '-',
+               zoomOutTitle: 'Zoom out'

        },
 
        onAdd: function (map) {
        },
 
        onAdd: function (map) {

-               var className = 'leaflet-control-zoom',
-                   container = L.DomUtil.create('div', className);
+               var zoomName = 'leaflet-control-zoom',
+                   container = L.DomUtil.create('div', zoomName + ' leaflet-bar');

 
                this._map = map;
 
 
                this._map = map;
 

-               this._createButton('Zoom in', className + '-in', container, this._zoomIn, this);
-               this._createButton('Zoom out', className + '-out', container, this._zoomOut, this);
+               this._zoomInButton  = this._createButton(
+                       this.options.zoomInText, this.options.zoomInTitle,
+                       zoomName + '-in',  container, this._zoomIn,  this);
+               this._zoomOutButton = this._createButton(
+                       this.options.zoomOutText, this.options.zoomOutTitle,
+                       zoomName + '-out', container, this._zoomOut, this);
+
+               this._updateDisabled();
+               map.on('zoomend zoomlevelschange', this._updateDisabled, this);

 
                return container;
        },
 
 
                return container;
        },
 

+       onRemove: function (map) {
+               map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+       },
+

        _zoomIn: function (e) {
                this._map.zoomIn(e.shiftKey ? 3 : 1);
        },
        _zoomIn: function (e) {
                this._map.zoomIn(e.shiftKey ? 3 : 1);
        },


@@ -6967,19 +8047,38 @@ L.Control.Zoom = L.Control.extend({
                this._map.zoomOut(e.shiftKey ? 3 : 1);
        },
 
                this._map.zoomOut(e.shiftKey ? 3 : 1);
        },
 

-       _createButton: function (title, className, container, fn, context) {
+       _createButton: function (html, title, className, container, fn, context) {

                var link = L.DomUtil.create('a', className, container);
                var link = L.DomUtil.create('a', className, container);

+               link.innerHTML = html;

                link.href = '#';
                link.title = title;
 
                link.href = '#';
                link.title = title;
 

+               var stop = L.DomEvent.stopPropagation;
+

                L.DomEvent
                L.DomEvent

-                       .on(link, 'click', L.DomEvent.stopPropagation)
-                       .on(link, 'mousedown', L.DomEvent.stopPropagation)
-                       .on(link, 'dblclick', L.DomEvent.stopPropagation)
-                       .on(link, 'click', L.DomEvent.preventDefault)
-                       .on(link, 'click', fn, context);
+                   .on(link, 'click', stop)
+                   .on(link, 'mousedown', stop)
+                   .on(link, 'dblclick', stop)
+                   .on(link, 'click', L.DomEvent.preventDefault)
+                   .on(link, 'click', fn, context)
+                   .on(link, 'click', this._refocusOnMap, context);

 
                return link;
 
                return link;

+       },
+
+       _updateDisabled: function () {
+               var map = this._map,
+                       className = 'leaflet-disabled';
+
+               L.DomUtil.removeClass(this._zoomInButton, className);
+               L.DomUtil.removeClass(this._zoomOutButton, className);
+
+               if (map._zoom === map.getMinZoom()) {
+                       L.DomUtil.addClass(this._zoomOutButton, className);
+               }
+               if (map._zoom === map.getMaxZoom()) {
+                       L.DomUtil.addClass(this._zoomInButton, className);
+               }

        }
 });
 
        }
 });
 


@@ -7000,14 +8099,18 @@ L.control.zoom = function (options) {
 
 
 
 
 
 

+/*
+ * L.Control.Attribution is used for displaying attribution on the map (added by default).
+ */
+

 L.Control.Attribution = L.Control.extend({
        options: {
                position: 'bottomright',
 L.Control.Attribution = L.Control.extend({
        options: {
                position: 'bottomright',

-               prefix: 'Powered by <a href="http://leaflet.cloudmade.com">Leaflet</a>'
+               prefix: '<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'

        },
 
        initialize: function (options) {
        },
 
        initialize: function (options) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

 
                this._attributions = {};
        },
 
                this._attributions = {};
        },


@@ -7016,9 +8119,15 @@ L.Control.Attribution = L.Control.extend({
                this._container = L.DomUtil.create('div', 'leaflet-control-attribution');
                L.DomEvent.disableClickPropagation(this._container);
 
                this._container = L.DomUtil.create('div', 'leaflet-control-attribution');
                L.DomEvent.disableClickPropagation(this._container);
 

+               for (var i in map._layers) {
+                       if (map._layers[i].getAttribution) {
+                               this.addAttribution(map._layers[i].getAttribution());
+                       }
+               }
+               

                map
                map

-                       .on('layeradd', this._onLayerAdd, this)
-                       .on('layerremove', this._onLayerRemove, this);
+                   .on('layeradd', this._onLayerAdd, this)
+                   .on('layerremove', this._onLayerRemove, this);

 
                this._update();
 
 
                this._update();
 


@@ -7027,8 +8136,8 @@ L.Control.Attribution = L.Control.extend({
 
        onRemove: function (map) {
                map
 
        onRemove: function (map) {
                map

-                       .off('layeradd', this._onLayerAdd)
-                       .off('layerremove', this._onLayerRemove);
+                   .off('layeradd', this._onLayerAdd)
+                   .off('layerremove', this._onLayerRemove);

 
        },
 
 
        },
 


@@ -7054,8 +8163,10 @@ L.Control.Attribution = L.Control.extend({
        removeAttribution: function (text) {
                if (!text) { return; }
 
        removeAttribution: function (text) {
                if (!text) { return; }
 

-               this._attributions[text]--;
-               this._update();
+               if (this._attributions[text]) {
+                       this._attributions[text]--;
+                       this._update();
+               }

 
                return this;
        },
 
                return this;
        },


@@ -7066,7 +8177,7 @@ L.Control.Attribution = L.Control.extend({
                var attribs = [];
 
                for (var i in this._attributions) {
                var attribs = [];
 
                for (var i in this._attributions) {

-                       if (this._attributions.hasOwnProperty(i) && this._attributions[i]) {
+                       if (this._attributions[i]) {

                                attribs.push(i);
                        }
                }
                                attribs.push(i);
                        }
                }


@@ -7080,7 +8191,7 @@ L.Control.Attribution = L.Control.extend({
                        prefixAndAttribs.push(attribs.join(', '));
                }
 
                        prefixAndAttribs.push(attribs.join(', '));
                }
 

-               this._container.innerHTML = prefixAndAttribs.join(' &#8212; ');
+               this._container.innerHTML = prefixAndAttribs.join(' | ');

        },
 
        _onLayerAdd: function (e) {
        },
 
        _onLayerAdd: function (e) {


@@ -7111,6 +8222,10 @@ L.control.attribution = function (options) {
 };
 
 
 };
 
 

+/*
+ * L.Control.Scale is used for displaying metric/imperial scale on the map.
+ */
+

 L.Control.Scale = L.Control.extend({
        options: {
                position: 'bottomleft',
 L.Control.Scale = L.Control.extend({
        options: {
                position: 'bottomleft',


@@ -7184,8 +8299,8 @@ L.Control.Scale = L.Control.extend({
 
        _updateImperial: function (maxMeters) {
                var maxFeet = maxMeters * 3.2808399,
 
        _updateImperial: function (maxMeters) {
                var maxFeet = maxMeters * 3.2808399,

-                       scale = this._iScale,
-                       maxMiles, miles, feet;
+                   scale = this._iScale,
+                   maxMiles, miles, feet;

 
                if (maxFeet > 5280) {
                        maxMiles = maxFeet / 5280;
 
                if (maxFeet > 5280) {
                        maxMiles = maxFeet / 5280;


@@ -7221,6 +8336,10 @@ L.control.scale = function (options) {
 };
 
 
 };
 
 

+/*
+ * L.Control.Layers is a control to allow users to switch between different layers on the map.
+ */
+

 L.Control.Layers = L.Control.extend({
        options: {
                collapsed: true,
 L.Control.Layers = L.Control.extend({
        options: {
                collapsed: true,


@@ -7229,21 +8348,18 @@ L.Control.Layers = L.Control.extend({
        },
 
        initialize: function (baseLayers, overlays, options) {
        },
 
        initialize: function (baseLayers, overlays, options) {

-               L.Util.setOptions(this, options);
+               L.setOptions(this, options);

 
                this._layers = {};
                this._lastZIndex = 0;
 
                this._layers = {};
                this._lastZIndex = 0;

+               this._handlingClick = false;

 
                for (var i in baseLayers) {
 
                for (var i in baseLayers) {

-                       if (baseLayers.hasOwnProperty(i)) {
-                               this._addLayer(baseLayers[i], i);
-                       }
+                       this._addLayer(baseLayers[i], i);

                }
 
                for (i in overlays) {
                }
 
                for (i in overlays) {

-                       if (overlays.hasOwnProperty(i)) {
-                               this._addLayer(overlays[i], i, true);
-                       }
+                       this._addLayer(overlays[i], i, true);

                }
        },
 
                }
        },
 


@@ -7251,9 +8367,19 @@ L.Control.Layers = L.Control.extend({
                this._initLayout();
                this._update();
 
                this._initLayout();
                this._update();
 

+               map
+                   .on('layeradd', this._onLayerChange, this)
+                   .on('layerremove', this._onLayerChange, this);
+

                return this._container;
        },
 
                return this._container;
        },
 

+       onRemove: function (map) {
+               map
+                   .off('layeradd', this._onLayerChange)
+                   .off('layerremove', this._onLayerChange);
+       },
+

        addBaseLayer: function (layer, name) {
                this._addLayer(layer, name);
                this._update();
        addBaseLayer: function (layer, name) {
                this._addLayer(layer, name);
                this._update();


@@ -7267,7 +8393,7 @@ L.Control.Layers = L.Control.extend({
        },
 
        removeLayer: function (layer) {
        },
 
        removeLayer: function (layer) {

-               var id = L.Util.stamp(layer);
+               var id = L.stamp(layer);

                delete this._layers[id];
                this._update();
                return this;
                delete this._layers[id];
                this._update();
                return this;


@@ -7277,8 +8403,13 @@ L.Control.Layers = L.Control.extend({
                var className = 'leaflet-control-layers',
                    container = this._container = L.DomUtil.create('div', className);
 
                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) {
                if (!L.Browser.touch) {

-                       L.DomEvent.disableClickPropagation(container);
+                       L.DomEvent
+                               .disableClickPropagation(container)
+                               .disableScrollPropagation(container);

                } else {
                        L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
                }
                } else {
                        L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
                }


@@ -7286,25 +8417,29 @@ L.Control.Layers = L.Control.extend({
                var form = this._form = L.DomUtil.create('form', className + '-list');
 
                if (this.options.collapsed) {
                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
                        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', this._expand, this);
+                                   .on(link, 'click', L.DomEvent.stop)
+                                   .on(link, 'click', this._expand, this);

                        }
                        else {
                                L.DomEvent.on(link, 'focus', this._expand, this);
                        }
                        }
                        else {
                                L.DomEvent.on(link, 'focus', this._expand, this);
                        }

+                       //Work around for Firefox android issue https://github.com/Leaflet/Leaflet/issues/2033
+                       L.DomEvent.on(form, 'click', function () {
+                               setTimeout(L.bind(this._onInputClick, this), 0);
+                       }, this);

 
 

-                       this._map.on('movestart', this._collapse, this);
+                       this._map.on('click', this._collapse, this);

                        // TODO keyboard accessibility
                } else {
                        this._expand();
                        // TODO keyboard accessibility
                } else {
                        this._expand();


@@ -7318,7 +8453,7 @@ L.Control.Layers = L.Control.extend({
        },
 
        _addLayer: function (layer, name, overlay) {
        },
 
        _addLayer: function (layer, name, overlay) {

-               var id = L.Util.stamp(layer);
+               var id = L.stamp(layer);

 
                this._layers[id] = {
                        layer: layer,
 
                this._layers[id] = {
                        layer: layer,


@@ -7341,18 +8476,35 @@ L.Control.Layers = L.Control.extend({
                this._overlaysList.innerHTML = '';
 
                var baseLayersPresent = false,
                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';
+       },
+
+       _onLayerChange: function (e) {
+               var obj = this._layers[L.stamp(e.layer)];
+
+               if (!obj) { return; }
+
+               if (!this._handlingClick) {
+                       this._update();

                }
 
                }
 

-               this._separator.style.display = (overlaysPresent && baseLayersPresent ? '' : 'none');
+               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)
        },
 
        // IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see http://bit.ly/PqYLBe)


@@ -7384,7 +8536,7 @@ L.Control.Layers = L.Control.extend({
                        input = this._createRadioElement('leaflet-base-layers', checked);
                }
 
                        input = this._createRadioElement('leaflet-base-layers', checked);
                }
 

-               input.layerId = L.Util.stamp(obj.layer);
+               input.layerId = L.stamp(obj.layer);

 
                L.DomEvent.on(input, 'click', this._onInputClick, this);
 
 
                L.DomEvent.on(input, 'click', this._onInputClick, this);
 


@@ -7396,13 +8548,16 @@ L.Control.Layers = L.Control.extend({
 
                var container = obj.overlay ? this._overlaysList : this._baseLayersList;
                container.appendChild(label);
 
                var container = obj.overlay ? this._overlaysList : this._baseLayersList;
                container.appendChild(label);

+
+               return label;

        },
 
        _onInputClick: function () {
                var i, input, obj,
        },
 
        _onInputClick: function () {
                var i, input, obj,

-                       inputs = this._form.getElementsByTagName('input'),
-                       inputsLen = inputs.length,
-                       baseLayer;
+                   inputs = this._form.getElementsByTagName('input'),
+                   inputsLen = inputs.length;
+
+               this._handlingClick = true;

 
                for (i = 0; i < inputsLen; i++) {
                        input = inputs[i];
 
                for (i = 0; i < inputsLen; i++) {
                        input = inputs[i];


@@ -7410,17 +8565,15 @@ L.Control.Layers = L.Control.extend({
 
                        if (input.checked && !this._map.hasLayer(obj.layer)) {
                                this._map.addLayer(obj.layer);
 
                        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);
                        }
                }
 
                        } else if (!input.checked && this._map.hasLayer(obj.layer)) {
                                this._map.removeLayer(obj.layer);
                        }
                }
 

-               if (baseLayer) {
-                       this._map.fire('baselayerchange', {layer: baseLayer});
-               }
+               this._handlingClick = false;
+
+               this._refocusOnMap();

        },
 
        _expand: function () {
        },
 
        _expand: function () {


@@ -7444,15 +8597,17 @@ L.control.layers = function (baseLayers, overlays, options) {
 L.PosAnimation = L.Class.extend({
        includes: L.Mixin.Events,
 
 L.PosAnimation = L.Class.extend({
        includes: L.Mixin.Events,
 

-       run: function (el, newPos, duration, easing) { // (HTMLElement, Point[, Number, String])
+       run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])

                this.stop();
 
                this._el = el;
                this._inProgress = true;
                this.stop();
 
                this._el = el;
                this._inProgress = true;

+               this._newPos = newPos;

 
                this.fire('start');
 
 
                this.fire('start');
 

-               el.style[L.DomUtil.TRANSITION] = 'all ' + (duration || 0.25) + 's ' + (easing || 'ease-out');
+               el.style[L.DomUtil.TRANSITION] = 'all ' + (duration || 0.25) +
+                       's cubic-bezier(0,0,' + (easeLinearity || 0.5) + ',1)';

 
                L.DomEvent.on(el, L.DomUtil.TRANSITION_END, this._onTransitionEnd, this);
                L.DomUtil.setPosition(el, newPos);
 
                L.DomEvent.on(el, L.DomUtil.TRANSITION_END, this._onTransitionEnd, this);
                L.DomUtil.setPosition(el, newPos);


@@ -7460,8 +8615,8 @@ L.PosAnimation = L.Class.extend({
                // toggle reflow, Chrome flickers for some reason if you don't do this
                L.Util.falseFn(el.offsetWidth);
 
                // toggle reflow, Chrome flickers for some reason if you don't do this
                L.Util.falseFn(el.offsetWidth);
 

-               // there's no native way to track value updates of tranisitioned properties, so we imitate this
-               this._stepTimer = setInterval(L.Util.bind(this.fire, this, 'step'), 50);
+               // there's no native way to track value updates of transitioned properties, so we imitate this
+               this._stepTimer = setInterval(L.bind(this._onStep, this), 50);

        },
 
        stop: function () {
        },
 
        stop: function () {


@@ -7472,20 +8627,35 @@ L.PosAnimation = L.Class.extend({
 
                L.DomUtil.setPosition(this._el, this._getPos());
                this._onTransitionEnd();
 
                L.DomUtil.setPosition(this._el, this._getPos());
                this._onTransitionEnd();

+               L.Util.falseFn(this._el.offsetWidth); // force reflow in case we are about to start a new animation
+       },
+
+       _onStep: function () {
+               var stepPos = this._getPos();
+               if (!stepPos) {
+                       this._onTransitionEnd();
+                       return;
+               }
+               // jshint camelcase: false
+               // make L.DomUtil.getPosition return intermediate position value during animation
+               this._el._leaflet_pos = stepPos;
+
+               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)
 
        },
 
        // 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,
 
        _getPos: function () {
                var left, top, matches,

-                       el = this._el,
-                       style = window.getComputedStyle(el);
+                   el = this._el,
+                   style = window.getComputedStyle(el);

 
                if (L.Browser.any3d) {
                        matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);
 
                if (L.Browser.any3d) {
                        matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);

+                       if (!matches) { return; }

                        left = parseFloat(matches[1]);
                        top  = parseFloat(matches[2]);
                } else {
                        left = parseFloat(matches[1]);
                        top  = parseFloat(matches[2]);
                } else {


@@ -7504,6 +8674,10 @@ L.PosAnimation = L.Class.extend({
 
                this._el.style[L.DomUtil.TRANSITION] = '';
 
 
                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');
                clearInterval(this._stepTimer);
 
                this.fire('step').fire('end');


@@ -7512,41 +8686,52 @@ L.PosAnimation = L.Class.extend({
 });
 
 
 });
 
 

+/*
+ * Extends L.Map to handle panning animations.
+ */

 
 L.Map.include({
 
 
 L.Map.include({
 

-       setView: function (center, zoom, forceReset) {
-               zoom = this._limitZoom(zoom);
+       setView: function (center, zoom, options) {

 
 

-               var zoomChanged = (this._zoom !== zoom);
+               zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom);
+               center = this._limitCenter(L.latLng(center), zoom, this.options.maxBounds);
+               options = options || {};
+
+               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;
                        }
                }
 
                                clearTimeout(this._sizeTimer);
                                return this;
                        }
                }
 

-               // reset the map view
+               // animation didn't start, just reset the map view

                this._resetView(center, zoom);
 
                return this;
        },
 
                this._resetView(center, zoom);
 
                return this;
        },
 

-       panBy: function (offset, duration) {
-               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;
                }
 
                        return this;
                }
 


@@ -7559,12 +8744,21 @@ L.Map.include({
                        }, this);
                }
 
                        }, 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);
-               this._panAnim.run(this._mapPane, newPos, duration || 0.25);
+                       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;
        },
 
                return this;
        },


@@ -7578,23 +8772,16 @@ L.Map.include({
                this.fire('moveend');
        },
 
                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();
 
                // 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;

        }
 });
 
        }
 });
 


@@ -7606,13 +8793,13 @@ L.Map.include({
 
 L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
 
 
 L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
 

-       run: function (el, newPos, duration, easing) { // (HTMLElement, Point[, Number, String])
+       run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])

                this.stop();
 
                this._el = el;
                this._inProgress = true;
                this._duration = duration || 0.25;
                this.stop();
 
                this._el = el;
                this._inProgress = true;
                this._duration = duration || 0.25;

-               this._ease = this._easings[easing || 'ease-out'];
+               this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);

 
                this._startPos = L.DomUtil.getPosition(el);
                this._offset = newPos.subtract(this._startPos);
 
                this._startPos = L.DomUtil.getPosition(el);
                this._offset = newPos.subtract(this._startPos);


@@ -7638,10 +8825,10 @@ L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
 
        _step: function () {
                var elapsed = (+new Date()) - this._startTime,
 
        _step: function () {
                var elapsed = (+new Date()) - this._startTime,

-                       duration = this._duration * 1000;
+                   duration = this._duration * 1000;

 
                if (elapsed < duration) {
 
                if (elapsed < duration) {

-                       this._runFrame(this._ease(elapsed / duration));
+                       this._runFrame(this._easeOut(elapsed / duration));

                } else {
                        this._runFrame(1);
                        this._complete();
                } else {
                        this._runFrame(1);
                        this._complete();


@@ -7662,128 +8849,194 @@ L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
                this.fire('end');
        },
 
                this.fire('end');
        },
 

-       // easing functions, they map time progress to movement progress
-       _easings: {
-               'ease-out': function (t) { return t * (2 - t); },
-               'linear':   function (t) { return t; }
+       _easeOut: function (t) {
+               return 1 - Math.pow(1 - t, this._easeOutPower);

        }
        }

-

 });
 
 
 });
 
 

+/*
+ * Extends L.Map to handle zoom animations.
+ */
+

 L.Map.mergeOptions({
 L.Map.mergeOptions({

-       zoomAnimation: L.DomUtil.TRANSITION && !L.Browser.android23 && !L.Browser.mobileOpera
+       zoomAnimation: true,
+       zoomAnimationThreshold: 4

 });
 
 if (L.DomUtil.TRANSITION) {
 });
 
 if (L.DomUtil.TRANSITION) {

+

        L.Map.addInitHook(function () {
        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 ? {} : {
 
        });
 }
 
 L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 

-       _zoomToIfClose: function (center, zoom) {
+       _catchTransitionEnd: function (e) {
+               if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) {
+                       this._onZoomTransitionEnd();
+               }
+       },

 
 

-               if (this._animatingZoom) { return true; }
+       _nothingToAnimate: function () {
+               return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
+       },

 
 

-               if (!this.options.zoomAnimation) { return false; }
+       _tryAnimatedZoom: function (center, zoom, options) {

 
 

-               var scale = this.getZoomScale(zoom),
-                       offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale);
+               if (this._animatingZoom) { return true; }

 
 

-               // if offset does not exceed half of the view
-               if (!this._offsetIsWithinView(offset, 1)) { return false; }
+               options = options || {};

 
 

-               L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
+               // don't animate if disabled, not supported or zoom difference is too large
+               if (!this._zoomAnimated || options.animate === false || this._nothingToAnimate() ||
+                       Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; }

 
 

-               this
-                       .fire('movestart')
-                       .fire('zoomstart');
+               // 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);

 
 

-               this.fire('zoomanim', {
-                       center: center,
-                       zoom: zoom
-               });
+               // 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; }

 
 

-               var origin = this._getCenterLayerPoint().add(offset);
+               this
+                   .fire('movestart')
+                   .fire('zoomstart');

 
 

-               this._prepareTileBg();
-               this._runAnimation(center, zoom, scale, origin);
+               this._animateZoom(center, zoom, origin, scale, null, true);

 
                return true;
        },
 
 
                return true;
        },
 

-       _catchTransitionEnd: function (e) {
-               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._animateToCenter = center;
                this._animateToZoom = zoom;

-               this._animatingZoom = true;

 
 

+               // disable any dragging during animation

                if (L.Draggable) {
                        L.Draggable._disabled = true;
                }
 
                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) {
+               if (!this._animating) {
+                       this._animating = true;
+                       this._prepareBgBuffer();

                }
 
                }
 

-               if (!tileBg) {
-                       tileBg = this._tileBg = this._createPane('leaflet-tile-pane', this._mapPane);
-                       tileBg.style.zIndex = 1;
+               var bg = this._bgBuffer,
+                   transform = L.DomUtil.TRANSFORM,
+                   initialTransform = e.delta ? L.DomUtil.getTranslateString(e.delta) : bg.style[transform],
+                   scaleStr = L.DomUtil.getScaleString(e.scale, e.origin);
+
+               bg.style[transform] = e.backwards ?
+                               scaleStr + ' ' + initialTransform :
+                               initialTransform + ' ' + scaleStr;
+       },
+
+       _endZoomAnim: function () {
+               var front = this._tileContainer,
+                   bg = this._bgBuffer;
+
+               front.style.visibility = '';
+               front.parentNode.appendChild(front); // Bring to fore
+
+               // 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] = '';

                }
                }

+       },

 
 

-               // prepare the background pane to become the main tile pane
-               tileBg.style[L.DomUtil.TRANSFORM] = '';
-               tileBg.style.visibility = 'hidden';
+       _prepareBgBuffer: function () {

 
 

-               // tells tile layers to reinitialize their containers
-               tileBg.empty = true; //new FG
-               tilePane.empty = false; //new BG
+               var front = this._tileContainer,
+                   bg = this._bgBuffer;

 
 

-               //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;
+               // if foreground layer doesn't have many tiles but bg layer does,
+               // keep the existing bg layer and just zoom it some more

 
 

-               L.DomUtil.addClass(newTileBg, 'leaflet-zoom-animated');
+               var bgLoaded = this._getLoadedTilesPercentage(bg),
+                   frontLoaded = this._getLoadedTilesPercentage(front);

 
 

-               this._stopLoadingImages(newTileBg);
+               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);
+
+               //prevent bg buffer from clearing right after zoom
+               clearTimeout(this._clearBgBufferTimer);

        },
 
        _getLoadedTilesPercentage: function (container) {
                var tiles = container.getElementsByTagName('img'),
        },
 
        _getLoadedTilesPercentage: function (container) {
                var tiles = container.getElementsByTagName('img'),

-                       i, len, count = 0;
+                   i, len, count = 0;

 
                for (i = 0, len = tiles.length; i < len; i++) {
                        if (tiles[i].complete) {
 
                for (i = 0, len = tiles.length; i < len; i++) {
                        if (tiles[i].complete) {


@@ -7796,7 +9049,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
        // stops loading all tiles in the background layer
        _stopLoadingImages: function (container) {
                var tiles = Array.prototype.slice.call(container.getElementsByTagName('img')),
        // stops loading all tiles in the background layer
        _stopLoadingImages: function (container) {
                var tiles = Array.prototype.slice.call(container.getElementsByTagName('img')),

-                       i, len, tile;
+                   i, len, tile;

 
                for (i = 0, len = tiles.length; i < len; i++) {
                        tile = tiles[i];
 
                for (i = 0, len = tiles.length; i < len; i++) {
                        tile = tiles[i];


@@ -7809,38 +9062,12 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
                                tile.parentNode.removeChild(tile);
                        }
                }
                                tile.parentNode.removeChild(tile);
                        }
                }

-       },
-
-       _onZoomTransitionEnd: function () {
-               this._restoreTileFront();
-               L.Util.falseFn(this._tileBg.offsetWidth); // force reflow
-               this._resetView(this._animateToCenter, this._animateToZoom, true, true);
-
-               L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
-               this._animatingZoom = false;
-
-               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 = '';
-               }

        }
 });
 
 
 /*
        }
 });
 
 
 /*

- * Provides L.Map with convenient shortcuts for W3C geolocation.
+ * Provides L.Map with convenient shortcuts for using browser geolocation features.

  */
 
 L.Map.include({
  */
 
 L.Map.include({


@@ -7855,21 +9082,22 @@ L.Map.include({
 
        locate: function (/*Object*/ options) {
 
 
        locate: function (/*Object*/ options) {
 

-               options = this._locationOptions = L.Util.extend(this._defaultLocateOptions, options);
+               options = this._locateOptions = L.extend(this._defaultLocateOptions, options);

 
                if (!navigator.geolocation) {
                        this._handleGeolocationError({
                                code: 0,
 
                if (!navigator.geolocation) {
                        this._handleGeolocationError({
                                code: 0,

-                               message: "Geolocation not supported."
+                               message: 'Geolocation not supported.'

                        });
                        return this;
                }
 
                        });
                        return this;
                }
 

-               var onResponse = L.Util.bind(this._handleGeolocationResponse, this),
-                       onError = L.Util.bind(this._handleGeolocationError, this);
+               var onResponse = L.bind(this._handleGeolocationResponse, this),
+                       onError = L.bind(this._handleGeolocationError, this);

 
                if (options.watch) {
 
                if (options.watch) {

-                       this._locationWatchId = navigator.geolocation.watchPosition(onResponse, onError, options);
+                       this._locationWatchId =
+                               navigator.geolocation.watchPosition(onResponse, onError, options);

                } else {
                        navigator.geolocation.getCurrentPosition(onResponse, onError, options);
                }
                } else {
                        navigator.geolocation.getCurrentPosition(onResponse, onError, options);
                }


@@ -7880,53 +9108,62 @@ L.Map.include({
                if (navigator.geolocation) {
                        navigator.geolocation.clearWatch(this._locationWatchId);
                }
                if (navigator.geolocation) {
                        navigator.geolocation.clearWatch(this._locationWatchId);
                }

+               if (this._locateOptions) {
+                       this._locateOptions.setView = false;
+               }

                return this;
        },
 
        _handleGeolocationError: function (error) {
                var c = error.code,
                return this;
        },
 
        _handleGeolocationError: function (error) {
                var c = error.code,

-                       message = error.message ||
-                               (c === 1 ? "permission denied" :
-                               (c === 2 ? "position unavailable" : "timeout"));
+                   message = error.message ||
+                           (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,
                        this.fitWorld();
                }
 
                this.fire('locationerror', {
                        code: c,

-                       message: "Geolocation error: " + message + "."
+                       message: 'Geolocation error: ' + message + '.'

                });
        },
 
        _handleGeolocationResponse: function (pos) {
                });
        },
 
        _handleGeolocationResponse: function (pos) {

-               var latAccuracy = 180 * pos.coords.accuracy / 4e7,
-                       lngAccuracy = latAccuracy * 2,
+               var lat = pos.coords.latitude,
+                   lng = pos.coords.longitude,
+                   latlng = new L.LatLng(lat, lng),

 
 

-                       lat = pos.coords.latitude,
-                       lng = pos.coords.longitude,
-                       latlng = new L.LatLng(lat, lng),
+                   latAccuracy = 180 * pos.coords.accuracy / 40075017,
+                   lngAccuracy = latAccuracy / Math.cos(L.LatLng.DEG_TO_RAD * lat),

 
 

-                       sw = new L.LatLng(lat - latAccuracy, lng - lngAccuracy),
-                       ne = new L.LatLng(lat + latAccuracy, lng + lngAccuracy),
-                       bounds = new L.LatLngBounds(sw, ne),
+                   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);
                }
 
 
                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,
                        latlng: latlng,
                        bounds: bounds,

-                       accuracy: pos.coords.accuracy
-               });
-       }
-});
+                       timestamp: pos.timestamp
+               };

 
 

+               for (var i in pos.coords) {
+                       if (typeof pos.coords[i] === 'number') {
+                               data[i] = pos.coords[i];
+                       }
+               }

 
 

+               this.fire('locationfound', data);
+       }
+});

 
 
 
 

-}(this));
\ No newline at end of file
+}(window, document));
\ No newline at end of file