]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/leaflet/leaflet.js
Merge branch 'master' into patch/view_migration
[rails.git] / vendor / assets / leaflet / leaflet.js
index 32024f5d509d94232c0e40e7f4e7ef9473941de9..a845eb6aeeccd94d1cd79a2ac770d0c83c06f442 100644 (file)
@@ -1,38 +1,15 @@
-/*
- Leaflet 1.0.1, a JS library for interactive maps. http://leafletjs.com
- (c) 2010-2016 Vladimir Agafonkin, (c) 2010-2011 CloudMade
-*/
-(function (window, document, undefined) {
-var L = {
-       version: "1.0.1"
-};
-
-function expose() {
-       var oldL = window.L;
-
-       L.noConflict = function () {
-               window.L = oldL;
-               return this;
-       };
-
-       window.L = L;
-}
-
-// define Leaflet for Node module pattern loaders, including Browserify
-if (typeof module === 'object' && typeof module.exports === 'object') {
-       module.exports = L;
-
-// define Leaflet as an AMD module
-} else if (typeof define === 'function' && define.amd) {
-       define(L);
-}
-
-// define Leaflet as a global L variable, saving the original L to restore later if needed
-if (typeof window !== 'undefined') {
-       expose();
-}
+/* @preserve
+ * Leaflet 1.5.1+build.2e3e0ff, a JS library for interactive maps. http://leafletjs.com
+ * (c) 2010-2018 Vladimir Agafonkin, (c) 2010-2011 CloudMade
+ */
 
+(function (global, factory) {
+       typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+       typeof define === 'function' && define.amd ? define(['exports'], factory) :
+       (factory((global.L = {})));
+}(this, (function (exports) { 'use strict';
 
+var version = "1.5.1+build.2e3e0ffb";
 
 /*
  * @namespace Util
@@ -40,253 +17,267 @@ if (typeof window !== 'undefined') {
  * Various utility functions, used by Leaflet internally.
  */
 
-L.Util = {
+var freeze = Object.freeze;
+Object.freeze = function (obj) { return obj; };
 
-       // @function extend(dest: Object, src?: Object): Object
-       // Merges the properties of the `src` object (or multiple objects) into `dest` object and returns the latter. Has an `L.extend` shortcut.
-       extend: function (dest) {
-               var i, j, len, src;
+// @function extend(dest: Object, src?: Object): Object
+// Merges the properties of the `src` object (or multiple objects) into `dest` object and returns the latter. Has an `L.extend` shortcut.
+function extend(dest) {
+       var i, j, len, src;
 
-               for (j = 1, len = arguments.length; j < len; j++) {
-                       src = arguments[j];
-                       for (i in src) {
-                               dest[i] = src[i];
-                       }
+       for (j = 1, len = arguments.length; j < len; j++) {
+               src = arguments[j];
+               for (i in src) {
+                       dest[i] = src[i];
                }
-               return dest;
-       },
-
-       // @function create(proto: Object, properties?: Object): Object
-       // Compatibility polyfill for [Object.create](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/create)
-       create: Object.create || (function () {
-               function F() {}
-               return function (proto) {
-                       F.prototype = proto;
-                       return new F();
-               };
-       })(),
+       }
+       return dest;
+}
 
-       // @function bind(fn: Function, …): Function
-       // Returns a new function bound to the arguments passed, like [Function.prototype.bind](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Function/bind).
-       // Has a `L.bind()` shortcut.
-       bind: function (fn, obj) {
-               var slice = Array.prototype.slice;
+// @function create(proto: Object, properties?: Object): Object
+// Compatibility polyfill for [Object.create](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/create)
+var create = Object.create || (function () {
+       function F() {}
+       return function (proto) {
+               F.prototype = proto;
+               return new F();
+       };
+})();
 
-               if (fn.bind) {
-                       return fn.bind.apply(fn, slice.call(arguments, 1));
-               }
+// @function bind(fn: Function, …): Function
+// Returns a new function bound to the arguments passed, like [Function.prototype.bind](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Function/bind).
+// Has a `L.bind()` shortcut.
+function bind(fn, obj) {
+       var slice = Array.prototype.slice;
 
-               var args = slice.call(arguments, 2);
+       if (fn.bind) {
+               return fn.bind.apply(fn, slice.call(arguments, 1));
+       }
 
-               return function () {
-                       return fn.apply(obj, args.length ? args.concat(slice.call(arguments)) : arguments);
-               };
-       },
+       var args = slice.call(arguments, 2);
 
-       // @function stamp(obj: Object): Number
-       // Returns the unique ID of an object, assiging it one if it doesn't have it.
-       stamp: function (obj) {
-               /*eslint-disable */
-               obj._leaflet_id = obj._leaflet_id || ++L.Util.lastId;
-               return obj._leaflet_id;
-               /*eslint-enable */
-       },
-
-       // @property lastId: Number
-       // Last unique ID used by [`stamp()`](#util-stamp)
-       lastId: 0,
-
-       // @function throttle(fn: Function, time: Number, context: Object): Function
-       // Returns a function which executes function `fn` with the given scope `context`
-       // (so that the `this` keyword refers to `context` inside `fn`'s code). The function
-       // `fn` will be called no more than one time per given amount of `time`. The arguments
-       // received by the bound function will be any arguments passed when binding the
-       // function, followed by any arguments passed when invoking the bound function.
-       // Has an `L.bind` shortcut.
-       throttle: function (fn, time, context) {
-               var lock, args, wrapperFn, later;
-
-               later = function () {
-                       // reset lock and call if queued
-                       lock = false;
-                       if (args) {
-                               wrapperFn.apply(context, args);
-                               args = false;
-                       }
-               };
+       return function () {
+               return fn.apply(obj, args.length ? args.concat(slice.call(arguments)) : arguments);
+       };
+}
 
-               wrapperFn = function () {
-                       if (lock) {
-                               // called too soon, queue to call later
-                               args = arguments;
+// @property lastId: Number
+// Last unique ID used by [`stamp()`](#util-stamp)
+var lastId = 0;
+
+// @function stamp(obj: Object): Number
+// Returns the unique ID of an object, assigning it one if it doesn't have it.
+function stamp(obj) {
+       /*eslint-disable */
+       obj._leaflet_id = obj._leaflet_id || ++lastId;
+       return obj._leaflet_id;
+       /* eslint-enable */
+}
 
-                       } else {
-                               // call and lock until later
-                               fn.apply(context, arguments);
-                               setTimeout(later, time);
-                               lock = true;
-                       }
-               };
+// @function throttle(fn: Function, time: Number, context: Object): Function
+// Returns a function which executes function `fn` with the given scope `context`
+// (so that the `this` keyword refers to `context` inside `fn`'s code). The function
+// `fn` will be called no more than one time per given amount of `time`. The arguments
+// received by the bound function will be any arguments passed when binding the
+// function, followed by any arguments passed when invoking the bound function.
+// Has an `L.throttle` shortcut.
+function throttle(fn, time, context) {
+       var lock, args, wrapperFn, later;
+
+       later = function () {
+               // reset lock and call if queued
+               lock = false;
+               if (args) {
+                       wrapperFn.apply(context, args);
+                       args = false;
+               }
+       };
 
-               return wrapperFn;
-       },
+       wrapperFn = function () {
+               if (lock) {
+                       // called too soon, queue to call later
+                       args = arguments;
 
-       // @function wrapNum(num: Number, range: Number[], includeMax?: Boolean): Number
-       // Returns the number `num` modulo `range` in such a way so it lies within
-       // `range[0]` and `range[1]`. The returned value will be always smaller than
-       // `range[1]` unless `includeMax` is set to `true`.
-       wrapNum: function (x, range, includeMax) {
-               var max = range[1],
-                   min = range[0],
-                   d = max - min;
-               return x === max && includeMax ? x : ((x - min) % d + d) % d + min;
-       },
+               } else {
+                       // call and lock until later
+                       fn.apply(context, arguments);
+                       setTimeout(later, time);
+                       lock = true;
+               }
+       };
 
-       // @function falseFn(): Function
-       // Returns a function which always returns `false`.
-       falseFn: function () { return false; },
+       return wrapperFn;
+}
 
-       // @function formatNum(num: Number, digits?: Number): Number
-       // Returns the number `num` rounded to `digits` decimals, or to 5 decimals by default.
-       formatNum: function (num, digits) {
-               var pow = Math.pow(10, digits || 5);
-               return Math.round(num * pow) / pow;
-       },
+// @function wrapNum(num: Number, range: Number[], includeMax?: Boolean): Number
+// Returns the number `num` modulo `range` in such a way so it lies within
+// `range[0]` and `range[1]`. The returned value will be always smaller than
+// `range[1]` unless `includeMax` is set to `true`.
+function wrapNum(x, range, includeMax) {
+       var max = range[1],
+           min = range[0],
+           d = max - min;
+       return x === max && includeMax ? x : ((x - min) % d + d) % d + min;
+}
 
-       // @function trim(str: String): String
-       // Compatibility polyfill for [String.prototype.trim](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/Trim)
-       trim: function (str) {
-               return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
-       },
+// @function falseFn(): Function
+// Returns a function which always returns `false`.
+function falseFn() { return false; }
 
-       // @function splitWords(str: String): String[]
-       // Trims and splits the string on whitespace and returns the array of parts.
-       splitWords: function (str) {
-               return L.Util.trim(str).split(/\s+/);
-       },
+// @function formatNum(num: Number, digits?: Number): Number
+// Returns the number `num` rounded to `digits` decimals, or to 6 decimals by default.
+function formatNum(num, digits) {
+       digits = (digits === undefined ? 6 : digits);
+       return +(Math.round(num + ('e+' + digits)) + ('e-' + digits));
+}
 
-       // @function setOptions(obj: Object, options: Object): Object
-       // Merges the given properties to the `options` of the `obj` object, returning the resulting options. See `Class options`. Has an `L.setOptions` shortcut.
-       setOptions: function (obj, options) {
-               if (!obj.hasOwnProperty('options')) {
-                       obj.options = obj.options ? L.Util.create(obj.options) : {};
-               }
-               for (var i in options) {
-                       obj.options[i] = options[i];
-               }
-               return obj.options;
-       },
+// @function trim(str: String): String
+// Compatibility polyfill for [String.prototype.trim](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/Trim)
+function trim(str) {
+       return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
+}
 
-       // @function getParamString(obj: Object, existingUrl?: String, uppercase?: Boolean): String
-       // Converts an object into a parameter URL string, e.g. `{a: "foo", b: "bar"}`
-       // translates to `'?a=foo&b=bar'`. If `existingUrl` is set, the parameters will
-       // be appended at the end. If `uppercase` is `true`, the parameter names will
-       // be uppercased (e.g. `'?A=foo&B=bar'`)
-       getParamString: function (obj, existingUrl, uppercase) {
-               var params = [];
-               for (var i in obj) {
-                       params.push(encodeURIComponent(uppercase ? i.toUpperCase() : i) + '=' + encodeURIComponent(obj[i]));
-               }
-               return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');
-       },
+// @function splitWords(str: String): String[]
+// Trims and splits the string on whitespace and returns the array of parts.
+function splitWords(str) {
+       return trim(str).split(/\s+/);
+}
 
-       // @function template(str: String, data: Object): String
-       // Simple templating facility, accepts a template string of the form `'Hello {a}, {b}'`
-       // and a data object like `{a: 'foo', b: 'bar'}`, returns evaluated string
-       // `('Hello foo, bar')`. You can also specify functions instead of strings for
-       // data values — they will be evaluated passing `data` as an argument.
-       template: function (str, data) {
-               return str.replace(L.Util.templateRe, function (str, key) {
-                       var value = data[key];
+// @function setOptions(obj: Object, options: Object): Object
+// Merges the given properties to the `options` of the `obj` object, returning the resulting options. See `Class options`. Has an `L.setOptions` shortcut.
+function setOptions(obj, options) {
+       if (!obj.hasOwnProperty('options')) {
+               obj.options = obj.options ? create(obj.options) : {};
+       }
+       for (var i in options) {
+               obj.options[i] = options[i];
+       }
+       return obj.options;
+}
 
-                       if (value === undefined) {
-                               throw new Error('No value provided for variable ' + str);
+// @function getParamString(obj: Object, existingUrl?: String, uppercase?: Boolean): String
+// Converts an object into a parameter URL string, e.g. `{a: "foo", b: "bar"}`
+// translates to `'?a=foo&b=bar'`. If `existingUrl` is set, the parameters will
+// be appended at the end. If `uppercase` is `true`, the parameter names will
+// be uppercased (e.g. `'?A=foo&B=bar'`)
+function getParamString(obj, existingUrl, uppercase) {
+       var params = [];
+       for (var i in obj) {
+               params.push(encodeURIComponent(uppercase ? i.toUpperCase() : i) + '=' + encodeURIComponent(obj[i]));
+       }
+       return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');
+}
 
-                       } else if (typeof value === 'function') {
-                               value = value(data);
-                       }
-                       return value;
-               });
-       },
+var templateRe = /\{ *([\w_-]+) *\}/g;
 
-       templateRe: /\{ *([\w_\-]+) *\}/g,
+// @function template(str: String, data: Object): String
+// Simple templating facility, accepts a template string of the form `'Hello {a}, {b}'`
+// and a data object like `{a: 'foo', b: 'bar'}`, returns evaluated string
+// `('Hello foo, bar')`. You can also specify functions instead of strings for
+// data values — they will be evaluated passing `data` as an argument.
+function template(str, data) {
+       return str.replace(templateRe, function (str, key) {
+               var value = data[key];
 
-       // @function isArray(obj): Boolean
-       // Compatibility polyfill for [Array.isArray](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray)
-       isArray: Array.isArray || function (obj) {
-               return (Object.prototype.toString.call(obj) === '[object Array]');
-       },
+               if (value === undefined) {
+                       throw new Error('No value provided for variable ' + str);
 
-       // @function indexOf(array: Array, el: Object): Number
-       // Compatibility polyfill for [Array.prototype.indexOf](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
-       indexOf: function (array, el) {
-               for (var i = 0; i < array.length; i++) {
-                       if (array[i] === el) { return i; }
+               } else if (typeof value === 'function') {
+                       value = value(data);
                }
-               return -1;
-       },
+               return value;
+       });
+}
 
-       // @property emptyImageUrl: String
-       // Data URI string containing a base64-encoded empty GIF image.
-       // Used as a hack to free memory from unused images on WebKit-powered
-       // mobile devices (by setting image `src` to this string).
-       emptyImageUrl: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
+// @function isArray(obj): Boolean
+// Compatibility polyfill for [Array.isArray](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray)
+var isArray = Array.isArray || function (obj) {
+       return (Object.prototype.toString.call(obj) === '[object Array]');
 };
 
-(function () {
-       // inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/
-
-       function getPrefixed(name) {
-               return window['webkit' + name] || window['moz' + name] || window['ms' + name];
+// @function indexOf(array: Array, el: Object): Number
+// Compatibility polyfill for [Array.prototype.indexOf](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
+function indexOf(array, el) {
+       for (var i = 0; i < array.length; i++) {
+               if (array[i] === el) { return i; }
        }
+       return -1;
+}
 
-       var lastTime = 0;
-
-       // fallback for IE 7-8
-       function timeoutDefer(fn) {
-               var time = +new Date(),
-                   timeToCall = Math.max(0, 16 - (time - lastTime));
+// @property emptyImageUrl: String
+// Data URI string containing a base64-encoded empty GIF image.
+// Used as a hack to free memory from unused images on WebKit-powered
+// mobile devices (by setting image `src` to this string).
+var emptyImageUrl = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
 
-               lastTime = time + timeToCall;
-               return window.setTimeout(fn, timeToCall);
-       }
+// inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/
 
-       var requestFn = window.requestAnimationFrame || getPrefixed('RequestAnimationFrame') || timeoutDefer,
-           cancelFn = window.cancelAnimationFrame || getPrefixed('CancelAnimationFrame') ||
-                      getPrefixed('CancelRequestAnimationFrame') || function (id) { window.clearTimeout(id); };
+function getPrefixed(name) {
+       return window['webkit' + name] || window['moz' + name] || window['ms' + name];
+}
 
+var lastTime = 0;
 
-       // @function requestAnimFrame(fn: Function, context?: Object, immediate?: Boolean): Number
-       // Schedules `fn` to be executed when the browser repaints. `fn` is bound to
-       // `context` if given. When `immediate` is set, `fn` is called immediately if
-       // the browser doesn't have native support for
-       // [`window.requestAnimationFrame`](https://developer.mozilla.org/docs/Web/API/window/requestAnimationFrame),
-       // otherwise it's delayed. Returns a request ID that can be used to cancel the request.
-       L.Util.requestAnimFrame = function (fn, context, immediate) {
-               if (immediate && requestFn === timeoutDefer) {
-                       fn.call(context);
-               } else {
-                       return requestFn.call(window, L.bind(fn, context));
-               }
-       };
+// fallback for IE 7-8
+function timeoutDefer(fn) {
+       var time = +new Date(),
+           timeToCall = Math.max(0, 16 - (time - lastTime));
 
-       // @function cancelAnimFrame(id: Number): undefined
-       // Cancels a previous `requestAnimFrame`. See also [window.cancelAnimationFrame](https://developer.mozilla.org/docs/Web/API/window/cancelAnimationFrame).
-       L.Util.cancelAnimFrame = function (id) {
-               if (id) {
-                       cancelFn.call(window, id);
-               }
-       };
-})();
+       lastTime = time + timeToCall;
+       return window.setTimeout(fn, timeToCall);
+}
 
-// 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;
+var requestFn = window.requestAnimationFrame || getPrefixed('RequestAnimationFrame') || timeoutDefer;
+var cancelFn = window.cancelAnimationFrame || getPrefixed('CancelAnimationFrame') ||
+               getPrefixed('CancelRequestAnimationFrame') || function (id) { window.clearTimeout(id); };
+
+// @function requestAnimFrame(fn: Function, context?: Object, immediate?: Boolean): Number
+// Schedules `fn` to be executed when the browser repaints. `fn` is bound to
+// `context` if given. When `immediate` is set, `fn` is called immediately if
+// the browser doesn't have native support for
+// [`window.requestAnimationFrame`](https://developer.mozilla.org/docs/Web/API/window/requestAnimationFrame),
+// otherwise it's delayed. Returns a request ID that can be used to cancel the request.
+function requestAnimFrame(fn, context, immediate) {
+       if (immediate && requestFn === timeoutDefer) {
+               fn.call(context);
+       } else {
+               return requestFn.call(window, bind(fn, context));
+       }
+}
 
+// @function cancelAnimFrame(id: Number): undefined
+// Cancels a previous `requestAnimFrame`. See also [window.cancelAnimationFrame](https://developer.mozilla.org/docs/Web/API/window/cancelAnimationFrame).
+function cancelAnimFrame(id) {
+       if (id) {
+               cancelFn.call(window, id);
+       }
+}
 
 
+var Util = (Object.freeze || Object)({
+       freeze: freeze,
+       extend: extend,
+       create: create,
+       bind: bind,
+       lastId: lastId,
+       stamp: stamp,
+       throttle: throttle,
+       wrapNum: wrapNum,
+       falseFn: falseFn,
+       formatNum: formatNum,
+       trim: trim,
+       splitWords: splitWords,
+       setOptions: setOptions,
+       getParamString: getParamString,
+       template: template,
+       isArray: isArray,
+       indexOf: indexOf,
+       emptyImageUrl: emptyImageUrl,
+       requestFn: requestFn,
+       cancelFn: cancelFn,
+       requestAnimFrame: requestAnimFrame,
+       cancelAnimFrame: cancelAnimFrame
+});
 
 // @class Class
 // @aka L.Class
@@ -296,9 +287,9 @@ L.setOptions = L.Util.setOptions;
 
 // Thanks to John Resig and Dean Edwards for inspiration!
 
-L.Class = function () {};
+function Class() {}
 
-L.Class.extend = function (props) {
+Class.extend = function (props) {
 
        // @function extend(props: Object): Function
        // [Extends the current class](#class-inheritance) given the properties to be included.
@@ -316,37 +307,38 @@ L.Class.extend = function (props) {
 
        var parentProto = NewClass.__super__ = this.prototype;
 
-       var proto = L.Util.create(parentProto);
+       var proto = create(parentProto);
        proto.constructor = NewClass;
 
        NewClass.prototype = proto;
 
        // inherit parent's statics
        for (var i in this) {
-               if (this.hasOwnProperty(i) && i !== 'prototype') {
+               if (this.hasOwnProperty(i) && i !== 'prototype' && i !== '__super__') {
                        NewClass[i] = this[i];
                }
        }
 
        // mix static properties into the class
        if (props.statics) {
-               L.extend(NewClass, props.statics);
+               extend(NewClass, props.statics);
                delete props.statics;
        }
 
        // mix includes into the prototype
        if (props.includes) {
-               L.Util.extend.apply(null, [proto].concat(props.includes));
+               checkDeprecatedMixinEvents(props.includes);
+               extend.apply(null, [proto].concat(props.includes));
                delete props.includes;
        }
 
        // merge options
        if (proto.options) {
-               props.options = L.Util.extend(L.Util.create(proto.options), props.options);
+               props.options = extend(create(proto.options), props.options);
        }
 
        // mix given properties into the prototype
-       L.extend(proto, props);
+       extend(proto, props);
 
        proto._initHooks = [];
 
@@ -372,21 +364,21 @@ L.Class.extend = function (props) {
 
 // @function include(properties: Object): this
 // [Includes a mixin](#class-includes) into the current class.
-L.Class.include = function (props) {
-       L.extend(this.prototype, props);
+Class.include = function (props) {
+       extend(this.prototype, props);
        return this;
 };
 
 // @function mergeOptions(options: Object): this
 // [Merges `options`](#class-options) into the defaults of the class.
-L.Class.mergeOptions = function (options) {
-       L.extend(this.prototype.options, options);
+Class.mergeOptions = function (options) {
+       extend(this.prototype.options, options);
        return this;
 };
 
 // @function addInitHook(fn: Function): this
 // Adds a [constructor hook](#class-constructor-hooks) to the class.
-L.Class.addInitHook = function (fn) { // (Function) || (String, args...)
+Class.addInitHook = function (fn) { // (Function) || (String, args...)
        var args = Array.prototype.slice.call(arguments, 1);
 
        var init = typeof fn === 'function' ? fn : function () {
@@ -398,7 +390,19 @@ L.Class.addInitHook = function (fn) { // (Function) || (String, args...)
        return this;
 };
 
+function checkDeprecatedMixinEvents(includes) {
+       if (typeof L === 'undefined' || !L || !L.Mixin) { return; }
 
+       includes = isArray(includes) ? includes : [includes];
+
+       for (var i = 0; i < includes.length; i++) {
+               if (includes[i] === L.Mixin.Events) {
+                       console.warn('Deprecated include of L.Mixin.Events: ' +
+                               'this property will be removed in future releases, ' +
+                               'please inherit from L.Evented instead.', new Error().stack);
+               }
+       }
+}
 
 /*
  * @class Evented
@@ -425,9 +429,7 @@ L.Class.addInitHook = function (fn) { // (Function) || (String, args...)
  * ```
  */
 
-
-L.Evented = L.Class.extend({
-
+var Events = {
        /* @method on(type: String, fn: Function, context?: Object): this
         * Adds a listener function (`fn`) to a particular event type of the object. You can optionally specify the context of the listener (object the this keyword will point to). You can also pass several space-separated types (e.g. `'click dblclick'`).
         *
@@ -447,7 +449,7 @@ L.Evented = L.Class.extend({
 
                } else {
                        // types can be a string of space-separated words
-                       types = L.Util.splitWords(types);
+                       types = splitWords(types);
 
                        for (var i = 0, len = types.length; i < len; i++) {
                                this._on(types[i], fn, context);
@@ -466,7 +468,7 @@ L.Evented = L.Class.extend({
         *
         * @alternative
         * @method off: this
-        * Removes all listeners to all events on the object.
+        * Removes all listeners to all events on the object. This includes implicitly attached events.
         */
        off: function (types, fn, context) {
 
@@ -480,7 +482,7 @@ L.Evented = L.Class.extend({
                        }
 
                } else {
-                       types = L.Util.splitWords(types);
+                       types = splitWords(types);
 
                        for (var i = 0, len = types.length; i < len; i++) {
                                this._off(types[i], fn, context);
@@ -516,7 +518,6 @@ L.Evented = L.Class.extend({
                }
 
                listeners.push(newListener);
-               typeListeners.count++;
        },
 
        _off: function (type, fn, context) {
@@ -535,7 +536,7 @@ L.Evented = L.Class.extend({
                if (!fn) {
                        // Set all removed listeners to noop so they are not called if remove happens in fire
                        for (i = 0, len = listeners.length; i < len; i++) {
-                               listeners[i].fn = L.Util.falseFn;
+                               listeners[i].fn = falseFn;
                        }
                        // clear all listeners for a type if function isn't specified
                        delete this._events[type];
@@ -555,7 +556,7 @@ L.Evented = L.Class.extend({
                                if (l.fn === fn) {
 
                                        // set the removed listener to noop so that's not called if remove happens in fire
-                                       l.fn = L.Util.falseFn;
+                                       l.fn = falseFn;
 
                                        if (this._firingCount) {
                                                /* copy array in case events are being fired */
@@ -572,11 +573,15 @@ L.Evented = L.Class.extend({
        // @method fire(type: String, data?: Object, propagate?: Boolean): this
        // Fires an event of the specified type. You can optionally provide an data
        // object — the first argument of the listener function will contain its
-       // properties. The event might can optionally be propagated to event parents.
+       // properties. The event can optionally be propagated to event parents.
        fire: function (type, data, propagate) {
                if (!this.listens(type, propagate)) { return this; }
 
-               var event = L.Util.extend({}, data, {type: type, target: this});
+               var event = extend({}, data, {
+                       type: type,
+                       target: this,
+                       sourceTarget: data && data.sourceTarget || this
+               });
 
                if (this._events) {
                        var listeners = this._events[type];
@@ -626,7 +631,7 @@ L.Evented = L.Class.extend({
                        return this;
                }
 
-               var handler = L.bind(function () {
+               var handler = bind(function () {
                        this
                            .off(types, fn, context)
                            .off(types, handler, context);
@@ -642,7 +647,7 @@ L.Evented = L.Class.extend({
        // Adds an event parent - an `Evented` that will receive propagated events
        addEventParent: function (obj) {
                this._eventParents = this._eventParents || {};
-               this._eventParents[L.stamp(obj)] = obj;
+               this._eventParents[stamp(obj)] = obj;
                return this;
        },
 
@@ -650,199 +655,47 @@ L.Evented = L.Class.extend({
        // Removes an event parent, so it will stop receiving propagated events
        removeEventParent: function (obj) {
                if (this._eventParents) {
-                       delete this._eventParents[L.stamp(obj)];
+                       delete this._eventParents[stamp(obj)];
                }
                return this;
        },
 
        _propagateEvent: function (e) {
                for (var id in this._eventParents) {
-                       this._eventParents[id].fire(e.type, L.extend({layer: e.target}, e), true);
+                       this._eventParents[id].fire(e.type, extend({
+                               layer: e.target,
+                               propagatedFrom: e.target
+                       }, e), true);
                }
        }
-});
-
-var proto = L.Evented.prototype;
+};
 
 // aliases; we should ditch those eventually
 
 // @method addEventListener(…): this
 // Alias to [`on(…)`](#evented-on)
-proto.addEventListener = proto.on;
+Events.addEventListener = Events.on;
 
 // @method removeEventListener(…): this
 // Alias to [`off(…)`](#evented-off)
 
 // @method clearAllEventListeners(…): this
 // Alias to [`off()`](#evented-off)
-proto.removeEventListener = proto.clearAllEventListeners = proto.off;
+Events.removeEventListener = Events.clearAllEventListeners = Events.off;
 
 // @method addOneTimeEventListener(…): this
 // Alias to [`once(…)`](#evented-once)
-proto.addOneTimeEventListener = proto.once;
+Events.addOneTimeEventListener = Events.once;
 
 // @method fireEvent(…): this
 // Alias to [`fire(…)`](#evented-fire)
-proto.fireEvent = proto.fire;
+Events.fireEvent = Events.fire;
 
 // @method hasEventListeners(…): Boolean
 // Alias to [`listens(…)`](#evented-listens)
-proto.hasEventListeners = proto.listens;
-
-L.Mixin = {Events: proto};
-
-
-
-/*
- * @namespace Browser
- * @aka L.Browser
- *
- * A namespace with static properties for browser/feature detection used by Leaflet internally.
- *
- * @example
- *
- * ```js
- * if (L.Browser.ielt9) {
- *   alert('Upgrade your browser, dude!');
- * }
- * ```
- */
-
-(function () {
-
-       var ua = navigator.userAgent.toLowerCase(),
-           doc = document.documentElement,
-
-           ie = 'ActiveXObject' in window,
-
-           webkit    = ua.indexOf('webkit') !== -1,
-           phantomjs = ua.indexOf('phantom') !== -1,
-           android23 = ua.search('android [23]') !== -1,
-           chrome    = ua.indexOf('chrome') !== -1,
-           gecko     = ua.indexOf('gecko') !== -1  && !webkit && !window.opera && !ie,
-
-           win = navigator.platform.indexOf('Win') === 0,
-
-           mobile = typeof orientation !== 'undefined' || ua.indexOf('mobile') !== -1,
-           msPointer = !window.PointerEvent && window.MSPointerEvent,
-           pointer = window.PointerEvent || msPointer,
-
-           ie3d = ie && ('transition' in doc.style),
-           webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()) && !android23,
-           gecko3d = 'MozPerspective' in doc.style,
-           opera12 = 'OTransition' in doc.style;
-
-
-       var touch = !window.L_NO_TOUCH && (pointer || 'ontouchstart' in window ||
-                       (window.DocumentTouch && document instanceof window.DocumentTouch));
-
-       L.Browser = {
-
-               // @property ie: Boolean
-               // `true` for all Internet Explorer versions (not Edge).
-               ie: ie,
-
-               // @property ielt9: Boolean
-               // `true` for Internet Explorer versions less than 9.
-               ielt9: ie && !document.addEventListener,
-
-               // @property edge: Boolean
-               // `true` for the Edge web browser.
-               edge: 'msLaunchUri' in navigator && !('documentMode' in document),
-
-               // @property webkit: Boolean
-               // `true` for webkit-based browsers like Chrome and Safari (including mobile versions).
-               webkit: webkit,
-
-               // @property gecko: Boolean
-               // `true` for gecko-based browsers like Firefox.
-               gecko: gecko,
-
-               // @property android: Boolean
-               // `true` for any browser running on an Android platform.
-               android: ua.indexOf('android') !== -1,
-
-               // @property android23: Boolean
-               // `true` for browsers running on Android 2 or Android 3.
-               android23: android23,
-
-               // @property chrome: Boolean
-               // `true` for the Chrome browser.
-               chrome: chrome,
-
-               // @property safari: Boolean
-               // `true` for the Safari browser.
-               safari: !chrome && ua.indexOf('safari') !== -1,
-
-
-               // @property win: Boolean
-               // `true` when the browser is running in a Windows platform
-               win: win,
-
-
-               // @property ie3d: Boolean
-               // `true` for all Internet Explorer versions supporting CSS transforms.
-               ie3d: ie3d,
-
-               // @property webkit3d: Boolean
-               // `true` for webkit-based browsers supporting CSS transforms.
-               webkit3d: webkit3d,
-
-               // @property gecko3d: Boolean
-               // `true` for gecko-based browsers supporting CSS transforms.
-               gecko3d: gecko3d,
-
-               // @property opera12: Boolean
-               // `true` for the Opera browser supporting CSS transforms (version 12 or later).
-               opera12: opera12,
-
-               // @property any3d: Boolean
-               // `true` for all browsers supporting CSS transforms.
-               any3d: !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d) && !opera12 && !phantomjs,
-
-
-               // @property mobile: Boolean
-               // `true` for all browsers running in a mobile device.
-               mobile: mobile,
-
-               // @property mobileWebkit: Boolean
-               // `true` for all webkit-based browsers in a mobile device.
-               mobileWebkit: mobile && webkit,
-
-               // @property mobileWebkit3d: Boolean
-               // `true` for all webkit-based browsers in a mobile device supporting CSS transforms.
-               mobileWebkit3d: mobile && webkit3d,
-
-               // @property mobileOpera: Boolean
-               // `true` for the Opera browser in a mobile device.
-               mobileOpera: mobile && window.opera,
-
-               // @property mobileGecko: Boolean
-               // `true` for gecko-based browsers running in a mobile device.
-               mobileGecko: mobile && gecko,
-
-
-               // @property touch: Boolean
-               // `true` for all browsers supporting [touch events](https://developer.mozilla.org/docs/Web/API/Touch_events).
-               touch: !!touch,
-
-               // @property msPointer: Boolean
-               // `true` for browsers implementing the Microsoft touch events model (notably IE10).
-               msPointer: !!msPointer,
-
-               // @property pointer: Boolean
-               // `true` for all browsers supporting [pointer events](https://msdn.microsoft.com/en-us/library/dn433244%28v=vs.85%29.aspx).
-               pointer: !!pointer,
-
-
-               // @property retina: Boolean
-               // `true` for browsers on a high-resolution "retina" screen.
-               retina: (window.devicePixelRatio || (window.screen.deviceXDPI / window.screen.logicalXDPI)) > 1
-       };
-
-}());
-
+Events.hasEventListeners = Events.listens;
 
+var Evented = Class.extend(Events);
 
 /*
  * @class Point
@@ -862,26 +715,36 @@ L.Mixin = {Events: proto};
  * map.panBy([200, 300]);
  * map.panBy(L.point(200, 300));
  * ```
+ *
+ * Note that `Point` does not inherit from Leafet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
  */
 
-L.Point = function (x, y, round) {
+function Point(x, y, round) {
+       // @property x: Number; The `x` coordinate of the point
        this.x = (round ? Math.round(x) : x);
+       // @property y: Number; The `y` coordinate of the point
        this.y = (round ? Math.round(y) : y);
+}
+
+var trunc = Math.trunc || function (v) {
+       return v > 0 ? Math.floor(v) : Math.ceil(v);
 };
 
-L.Point.prototype = {
+Point.prototype = {
 
        // @method clone(): Point
        // Returns a copy of the current point.
        clone: function () {
-               return new L.Point(this.x, this.y);
+               return new Point(this.x, this.y);
        },
 
        // @method add(otherPoint: Point): Point
        // Returns the result of addition of the current and the given points.
        add: function (point) {
                // non-destructive, returns a new point
-               return this.clone()._add(L.point(point));
+               return this.clone()._add(toPoint(point));
        },
 
        _add: function (point) {
@@ -894,7 +757,7 @@ L.Point.prototype = {
        // @method subtract(otherPoint: Point): Point
        // Returns the result of subtraction of the given point from the current.
        subtract: function (point) {
-               return this.clone()._subtract(L.point(point));
+               return this.clone()._subtract(toPoint(point));
        },
 
        _subtract: function (point) {
@@ -933,14 +796,14 @@ L.Point.prototype = {
        // [scaling matrix](https://en.wikipedia.org/wiki/Scaling_%28geometry%29#Matrix_representation)
        // defined by `scale`.
        scaleBy: function (point) {
-               return new L.Point(this.x * point.x, this.y * point.y);
+               return new Point(this.x * point.x, this.y * point.y);
        },
 
        // @method unscaleBy(scale: Point): Point
        // Inverse of `scaleBy`. Divide each coordinate of the current point by
        // each coordinate of `scale`.
        unscaleBy: function (point) {
-               return new L.Point(this.x / point.x, this.y / point.y);
+               return new Point(this.x / point.x, this.y / point.y);
        },
 
        // @method round(): Point
@@ -979,10 +842,22 @@ L.Point.prototype = {
                return this;
        },
 
+       // @method trunc(): Point
+       // Returns a copy of the current point with truncated coordinates (rounded towards zero).
+       trunc: function () {
+               return this.clone()._trunc();
+       },
+
+       _trunc: function () {
+               this.x = trunc(this.x);
+               this.y = trunc(this.y);
+               return this;
+       },
+
        // @method distanceTo(otherPoint: Point): Number
        // Returns the cartesian distance between the current and the given points.
        distanceTo: function (point) {
-               point = L.point(point);
+               point = toPoint(point);
 
                var x = point.x - this.x,
                    y = point.y - this.y;
@@ -993,7 +868,7 @@ L.Point.prototype = {
        // @method equals(otherPoint: Point): Boolean
        // Returns `true` if the given point has the same coordinates.
        equals: function (point) {
-               point = L.point(point);
+               point = toPoint(point);
 
                return point.x === this.x &&
                       point.y === this.y;
@@ -1002,7 +877,7 @@ L.Point.prototype = {
        // @method contains(otherPoint: Point): Boolean
        // Returns `true` if both coordinates of the given point are less than the corresponding current point coordinates (in absolute values).
        contains: function (point) {
-               point = L.point(point);
+               point = toPoint(point);
 
                return Math.abs(point.x) <= Math.abs(this.x) &&
                       Math.abs(point.y) <= Math.abs(this.y);
@@ -1012,8 +887,8 @@ L.Point.prototype = {
        // Returns a string representation of the point for debugging purposes.
        toString: function () {
                return 'Point(' +
-                       L.Util.formatNum(this.x) + ', ' +
-                       L.Util.formatNum(this.y) + ')';
+                       formatNum(this.x) + ', ' +
+                       formatNum(this.y) + ')';
        }
 };
 
@@ -1027,23 +902,21 @@ L.Point.prototype = {
 // @alternative
 // @factory L.point(coords: Object)
 // Expects a plain object of the form `{x: Number, y: Number}` instead.
-L.point = function (x, y, round) {
-       if (x instanceof L.Point) {
+function toPoint(x, y, round) {
+       if (x instanceof Point) {
                return x;
        }
-       if (L.Util.isArray(x)) {
-               return new L.Point(x[0], x[1]);
+       if (isArray(x)) {
+               return new Point(x[0], x[1]);
        }
        if (x === undefined || x === null) {
                return x;
        }
        if (typeof x === 'object' && 'x' in x && 'y' in x) {
-               return new L.Point(x.x, x.y);
+               return new Point(x.x, x.y);
        }
-       return new L.Point(x, y, round);
-};
-
-
+       return new Point(x, y, round);
+}
 
 /*
  * @class Bounds
@@ -1064,9 +937,13 @@ L.point = function (x, y, round) {
  * ```js
  * otherBounds.intersects([[10, 10], [40, 60]]);
  * ```
+ *
+ * Note that `Bounds` does not inherit from Leafet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
  */
 
-L.Bounds = function (a, b) {
+function Bounds(a, b) {
        if (!a) { return; }
 
        var points = b ? [a, b] : a;
@@ -1074,13 +951,13 @@ L.Bounds = function (a, b) {
        for (var i = 0, len = points.length; i < len; i++) {
                this.extend(points[i]);
        }
-};
+}
 
-L.Bounds.prototype = {
+Bounds.prototype = {
        // @method extend(point: Point): this
        // Extends the bounds to contain the given point.
        extend: function (point) { // (Point)
-               point = L.point(point);
+               point = toPoint(point);
 
                // @property min: Point
                // The top left corner of the rectangle.
@@ -1101,7 +978,7 @@ L.Bounds.prototype = {
        // @method getCenter(round?: Boolean): Point
        // Returns the center point of the bounds.
        getCenter: function (round) {
-               return new L.Point(
+               return new Point(
                        (this.min.x + this.max.x) / 2,
                        (this.min.y + this.max.y) / 2, round);
        },
@@ -1109,13 +986,25 @@ L.Bounds.prototype = {
        // @method getBottomLeft(): Point
        // Returns the bottom-left point of the bounds.
        getBottomLeft: function () {
-               return new L.Point(this.min.x, this.max.y);
+               return new Point(this.min.x, this.max.y);
        },
 
        // @method getTopRight(): Point
        // Returns the top-right point of the bounds.
        getTopRight: function () { // -> Point
-               return new L.Point(this.max.x, this.min.y);
+               return new Point(this.max.x, this.min.y);
+       },
+
+       // @method getTopLeft(): Point
+       // Returns the top-left point of the bounds (i.e. [`this.min`](#bounds-min)).
+       getTopLeft: function () {
+               return this.min; // left, top
+       },
+
+       // @method getBottomRight(): Point
+       // Returns the bottom-right point of the bounds (i.e. [`this.max`](#bounds-max)).
+       getBottomRight: function () {
+               return this.max; // right, bottom
        },
 
        // @method getSize(): Point
@@ -1132,13 +1021,13 @@ L.Bounds.prototype = {
        contains: function (obj) {
                var min, max;
 
-               if (typeof obj[0] === 'number' || obj instanceof L.Point) {
-                       obj = L.point(obj);
+               if (typeof obj[0] === 'number' || obj instanceof Point) {
+                       obj = toPoint(obj);
                } else {
-                       obj = L.bounds(obj);
+                       obj = toBounds(obj);
                }
 
-               if (obj instanceof L.Bounds) {
+               if (obj instanceof Bounds) {
                        min = obj.min;
                        max = obj.max;
                } else {
@@ -1155,7 +1044,7 @@ L.Bounds.prototype = {
        // Returns `true` if the rectangle intersects the given bounds. Two bounds
        // intersect if they have at least one point in common.
        intersects: function (bounds) { // (Bounds) -> Boolean
-               bounds = L.bounds(bounds);
+               bounds = toBounds(bounds);
 
                var min = this.min,
                    max = this.max,
@@ -1171,7 +1060,7 @@ L.Bounds.prototype = {
        // Returns `true` if the rectangle overlaps the given bounds. Two bounds
        // overlap if their intersection is an area.
        overlaps: function (bounds) { // (Bounds) -> Boolean
-               bounds = L.bounds(bounds);
+               bounds = toBounds(bounds);
 
                var min = this.min,
                    max = this.max,
@@ -1189,399 +1078,267 @@ L.Bounds.prototype = {
 };
 
 
-// @factory L.bounds(topLeft: Point, bottomRight: Point)
-// Creates a Bounds object from two coordinates (usually top-left and bottom-right corners).
+// @factory L.bounds(corner1: Point, corner2: Point)
+// Creates a Bounds object from two corners coordinate pairs.
 // @alternative
 // @factory L.bounds(points: Point[])
-// Creates a Bounds object from the points it contains
-L.bounds = function (a, b) {
-       if (!a || a instanceof L.Bounds) {
+// Creates a Bounds object from the given array of points.
+function toBounds(a, b) {
+       if (!a || a instanceof Bounds) {
                return a;
        }
-       return new L.Bounds(a, b);
-};
-
-
+       return new Bounds(a, b);
+}
 
 /*
- * @class Transformation
- * @aka L.Transformation
+ * @class LatLngBounds
+ * @aka L.LatLngBounds
  *
- * Represents an affine transformation: a set of coefficients `a`, `b`, `c`, `d`
- * for transforming a point of a form `(x, y)` into `(a*x + b, c*y + d)` and doing
- * the reverse. Used by Leaflet in its projections code.
+ * Represents a rectangular geographical area on a map.
  *
  * @example
  *
  * ```js
- * var transformation = new L.Transformation(2, 5, -1, 10),
- *     p = L.point(1, 2),
- *     p2 = transformation.transform(p), //  L.point(7, 8)
- *     p3 = transformation.untransform(p2); //  L.point(1, 2)
+ * var corner1 = L.latLng(40.712, -74.227),
+ * corner2 = L.latLng(40.774, -74.125),
+ * bounds = L.latLngBounds(corner1, corner2);
+ * ```
+ *
+ * All Leaflet methods that accept LatLngBounds objects also accept them in a simple Array form (unless noted otherwise), so the bounds example above can be passed like this:
+ *
+ * ```js
+ * map.fitBounds([
+ *     [40.712, -74.227],
+ *     [40.774, -74.125]
+ * ]);
  * ```
+ *
+ * Caution: if the area crosses the antimeridian (often confused with the International Date Line), you must specify corners _outside_ the [-180, 180] degrees longitude range.
+ *
+ * Note that `LatLngBounds` does not inherit from Leafet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
  */
 
+function LatLngBounds(corner1, corner2) { // (LatLng, LatLng) or (LatLng[])
+       if (!corner1) { return; }
 
-// factory new L.Transformation(a: Number, b: Number, c: Number, d: Number)
-// Creates a `Transformation` object with the given coefficients.
-L.Transformation = function (a, b, c, d) {
-       this._a = a;
-       this._b = b;
-       this._c = c;
-       this._d = d;
-};
-
-L.Transformation.prototype = {
-       // @method transform(point: Point, scale?: Number): Point
-       // Returns a transformed point, optionally multiplied by the given scale.
-       // Only accepts real `L.Point` instances, not arrays.
-       transform: function (point, scale) { // (Point, Number) -> Point
-               return this._transform(point.clone(), scale);
-       },
-
-       // destructive transform (faster)
-       _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;
-       },
+       var latlngs = corner2 ? [corner1, corner2] : corner1;
 
-       // @method untransform(point: Point, scale?: Number): Point
-       // Returns the reverse transformation of the given point, optionally divided
-       // by the given scale. Only accepts real `L.Point` instances, not arrays.
-       untransform: function (point, scale) {
-               scale = scale || 1;
-               return new L.Point(
-                       (point.x / scale - this._b) / this._a,
-                       (point.y / scale - this._d) / this._c);
+       for (var i = 0, len = latlngs.length; i < len; i++) {
+               this.extend(latlngs[i]);
        }
-};
-
+}
 
+LatLngBounds.prototype = {
 
-/*
- * @namespace DomUtil
- *
- * Utility functions to work with the [DOM](https://developer.mozilla.org/docs/Web/API/Document_Object_Model)
- * tree, used by Leaflet internally.
- *
- * Most functions expecting or returning a `HTMLElement` also work for
- * SVG elements. The only difference is that classes refer to CSS classes
- * in HTML and SVG classes in SVG.
- */
+       // @method extend(latlng: LatLng): this
+       // Extend the bounds to contain the given point
 
-L.DomUtil = {
+       // @alternative
+       // @method extend(otherBounds: LatLngBounds): this
+       // Extend the bounds to contain the given bounds
+       extend: function (obj) {
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2, ne2;
 
-       // @function get(id: String|HTMLElement): HTMLElement
-       // Returns an element given its DOM id, or returns the element itself
-       // if it was passed directly.
-       get: function (id) {
-               return typeof id === 'string' ? document.getElementById(id) : id;
-       },
+               if (obj instanceof LatLng) {
+                       sw2 = obj;
+                       ne2 = obj;
 
-       // @function getStyle(el: HTMLElement, styleAttrib: String): String
-       // Returns the value for a certain style attribute on an element,
-       // including computed values or values set through CSS.
-       getStyle: function (el, style) {
+               } else if (obj instanceof LatLngBounds) {
+                       sw2 = obj._southWest;
+                       ne2 = obj._northEast;
 
-               var value = el.style[style] || (el.currentStyle && el.currentStyle[style]);
+                       if (!sw2 || !ne2) { return this; }
 
-               if ((!value || value === 'auto') && document.defaultView) {
-                       var css = document.defaultView.getComputedStyle(el, null);
-                       value = css ? css[style] : null;
+               } else {
+                       return obj ? this.extend(toLatLng(obj) || toLatLngBounds(obj)) : this;
                }
 
-               return value === 'auto' ? null : value;
-       },
-
-       // @function create(tagName: String, className?: String, container?: HTMLElement): HTMLElement
-       // Creates an HTML element with `tagName`, sets its class to `className`, and optionally appends it to `container` element.
-       create: function (tagName, className, container) {
-
-               var el = document.createElement(tagName);
-               el.className = className || '';
-
-               if (container) {
-                       container.appendChild(el);
+               if (!sw && !ne) {
+                       this._southWest = new LatLng(sw2.lat, sw2.lng);
+                       this._northEast = new LatLng(ne2.lat, ne2.lng);
+               } else {
+                       sw.lat = Math.min(sw2.lat, sw.lat);
+                       sw.lng = Math.min(sw2.lng, sw.lng);
+                       ne.lat = Math.max(ne2.lat, ne.lat);
+                       ne.lng = Math.max(ne2.lng, ne.lng);
                }
 
-               return el;
+               return this;
        },
 
-       // @function remove(el: HTMLElement)
-       // Removes `el` from its parent element
-       remove: function (el) {
-               var parent = el.parentNode;
-               if (parent) {
-                       parent.removeChild(el);
-               }
-       },
+       // @method pad(bufferRatio: Number): LatLngBounds
+       // Returns bounds created by extending or retracting the current bounds by a given ratio in each direction.
+       // For example, a ratio of 0.5 extends the bounds by 50% in each direction.
+       // Negative values will retract the bounds.
+       pad: function (bufferRatio) {
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
+                   widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
 
-       // @function empty(el: HTMLElement)
-       // Removes all of `el`'s children elements from `el`
-       empty: function (el) {
-               while (el.firstChild) {
-                       el.removeChild(el.firstChild);
-               }
+               return new LatLngBounds(
+                       new LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+                       new LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
        },
 
-       // @function toFront(el: HTMLElement)
-       // Makes `el` the last children of its parent, so it renders in front of the other children.
-       toFront: function (el) {
-               el.parentNode.appendChild(el);
+       // @method getCenter(): LatLng
+       // Returns the center point of the bounds.
+       getCenter: function () {
+               return new LatLng(
+                       (this._southWest.lat + this._northEast.lat) / 2,
+                       (this._southWest.lng + this._northEast.lng) / 2);
        },
 
-       // @function toBack(el: HTMLElement)
-       // Makes `el` the first children of its parent, so it renders back from the other children.
-       toBack: function (el) {
-               var parent = el.parentNode;
-               parent.insertBefore(el, parent.firstChild);
+       // @method getSouthWest(): LatLng
+       // Returns the south-west point of the bounds.
+       getSouthWest: function () {
+               return this._southWest;
        },
 
-       // @function hasClass(el: HTMLElement, name: String): Boolean
-       // Returns `true` if the element's class attribute contains `name`.
-       hasClass: function (el, name) {
-               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);
+       // @method getNorthEast(): LatLng
+       // Returns the north-east point of the bounds.
+       getNorthEast: function () {
+               return this._northEast;
        },
 
-       // @function addClass(el: HTMLElement, name: String)
-       // Adds `name` to the element's class attribute.
-       addClass: function (el, 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);
-               }
+       // @method getNorthWest(): LatLng
+       // Returns the north-west point of the bounds.
+       getNorthWest: function () {
+               return new LatLng(this.getNorth(), this.getWest());
        },
 
-       // @function removeClass(el: HTMLElement, name: String)
-       // Removes `name` from the element's class attribute.
-       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 + ' ', ' ')));
-               }
+       // @method getSouthEast(): LatLng
+       // Returns the south-east point of the bounds.
+       getSouthEast: function () {
+               return new LatLng(this.getSouth(), this.getEast());
        },
 
-       // @function setClass(el: HTMLElement, name: String)
-       // Sets the element's class.
-       setClass: function (el, name) {
-               if (el.className.baseVal === undefined) {
-                       el.className = name;
-               } else {
-                       // in case of SVG element
-                       el.className.baseVal = name;
-               }
+       // @method getWest(): Number
+       // Returns the west longitude of the bounds
+       getWest: function () {
+               return this._southWest.lng;
        },
 
-       // @function getClass(el: HTMLElement): String
-       // Returns the element's class.
-       getClass: function (el) {
-               return el.className.baseVal === undefined ? el.className : el.className.baseVal;
+       // @method getSouth(): Number
+       // Returns the south latitude of the bounds
+       getSouth: function () {
+               return this._southWest.lat;
        },
 
-       // @function setOpacity(el: HTMLElement, opacity: Number)
-       // Set the opacity of an element (including old IE support).
-       // `opacity` must be a number from `0` to `1`.
-       setOpacity: function (el, value) {
-
-               if ('opacity' in el.style) {
-                       el.style.opacity = value;
+       // @method getEast(): Number
+       // Returns the east longitude of the bounds
+       getEast: function () {
+               return this._northEast.lng;
+       },
 
-               } else if ('filter' in el.style) {
-                       L.DomUtil._setOpacityIE(el, value);
-               }
+       // @method getNorth(): Number
+       // Returns the north latitude of the bounds
+       getNorth: function () {
+               return this._northEast.lat;
        },
 
-       _setOpacityIE: function (el, value) {
-               var filter = false,
-                   filterName = 'DXImageTransform.Microsoft.Alpha';
+       // @method contains(otherBounds: LatLngBounds): Boolean
+       // Returns `true` if the rectangle contains the given one.
 
-               // filters collection throws an error if we try to retrieve a filter that doesn't exist
-               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; }
+       // @alternative
+       // @method contains (latlng: LatLng): Boolean
+       // Returns `true` if the rectangle contains the given point.
+       contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean
+               if (typeof obj[0] === 'number' || obj instanceof LatLng || 'lat' in obj) {
+                       obj = toLatLng(obj);
+               } else {
+                       obj = toLatLngBounds(obj);
                }
 
-               value = Math.round(value * 100);
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2, ne2;
 
-               if (filter) {
-                       filter.Enabled = (value !== 100);
-                       filter.Opacity = value;
+               if (obj instanceof LatLngBounds) {
+                       sw2 = obj.getSouthWest();
+                       ne2 = obj.getNorthEast();
                } else {
-                       el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
+                       sw2 = ne2 = obj;
                }
-       },
-
-       // @function testProp(props: String[]): String|false
-       // Goes through the array of style names and returns the first name
-       // that is a valid style name for an element. If no such name is found,
-       // it returns false. Useful for vendor-prefixed styles like `transform`.
-       testProp: function (props) {
 
-               var style = document.documentElement.style;
-
-               for (var i = 0; i < props.length; i++) {
-                       if (props[i] in style) {
-                               return props[i];
-                       }
-               }
-               return false;
+               return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
+                      (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
        },
 
-       // @function setTransform(el: HTMLElement, offset: Point, scale?: Number)
-       // Resets the 3D CSS transform of `el` so it is translated by `offset` pixels
-       // and optionally scaled by `scale`. Does not have an effect if the
-       // browser doesn't support 3D CSS transforms.
-       setTransform: function (el, offset, scale) {
-               var pos = offset || new L.Point(0, 0);
-
-               el.style[L.DomUtil.TRANSFORM] =
-                       (L.Browser.ie3d ?
-                               'translate(' + pos.x + 'px,' + pos.y + 'px)' :
-                               'translate3d(' + pos.x + 'px,' + pos.y + 'px,0)') +
-                       (scale ? ' scale(' + scale + ')' : '');
-       },
+       // @method intersects(otherBounds: LatLngBounds): Boolean
+       // Returns `true` if the rectangle intersects the given bounds. Two bounds intersect if they have at least one point in common.
+       intersects: function (bounds) {
+               bounds = toLatLngBounds(bounds);
 
-       // @function setPosition(el: HTMLElement, position: Point)
-       // Sets the position of `el` to coordinates specified by `position`,
-       // using CSS translate or top/left positioning depending on the browser
-       // (used by Leaflet internally to position its layers).
-       setPosition: function (el, point) { // (HTMLElement, Point[, Boolean])
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2 = bounds.getSouthWest(),
+                   ne2 = bounds.getNorthEast(),
 
-               /*eslint-disable */
-               el._leaflet_pos = point;
-               /*eslint-enable */
+                   latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+                   lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
 
-               if (L.Browser.any3d) {
-                       L.DomUtil.setTransform(el, point);
-               } else {
-                       el.style.left = point.x + 'px';
-                       el.style.top = point.y + 'px';
-               }
+               return latIntersects && lngIntersects;
        },
 
-       // @function getPosition(el: HTMLElement): Point
-       // Returns the coordinates of an element previously positioned with setPosition.
-       getPosition: function (el) {
-               // this method is only used for elements previously positioned using setPosition,
-               // so it's safe to cache the position for performance
-
-               return el._leaflet_pos || new L.Point(0, 0);
-       }
-};
-
-
-(function () {
-       // prefix style property names
+       // @method overlaps(otherBounds: Bounds): Boolean
+       // Returns `true` if the rectangle overlaps the given bounds. Two bounds overlap if their intersection is an area.
+       overlaps: function (bounds) {
+               bounds = toLatLngBounds(bounds);
 
-       // @property TRANSFORM: String
-       // Vendor-prefixed fransform style name (e.g. `'webkitTransform'` for WebKit).
-       L.DomUtil.TRANSFORM = L.DomUtil.testProp(
-                       ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2 = bounds.getSouthWest(),
+                   ne2 = bounds.getNorthEast(),
 
+                   latOverlaps = (ne2.lat > sw.lat) && (sw2.lat < ne.lat),
+                   lngOverlaps = (ne2.lng > sw.lng) && (sw2.lng < ne.lng);
 
-       // 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
+               return latOverlaps && lngOverlaps;
+       },
 
-       // @property TRANSITION: String
-       // Vendor-prefixed transform style name.
-       var transition = L.DomUtil.TRANSITION = L.DomUtil.testProp(
-                       ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);
+       // @method toBBoxString(): String
+       // Returns a string with bounding box coordinates in a 'southwest_lng,southwest_lat,northeast_lng,northeast_lat' format. Useful for sending requests to web services that return geo data.
+       toBBoxString: function () {
+               return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(',');
+       },
 
-       L.DomUtil.TRANSITION_END =
-                       transition === 'webkitTransition' || transition === 'OTransition' ? transition + 'End' : 'transitionend';
+       // @method equals(otherBounds: LatLngBounds, maxMargin?: Number): Boolean
+       // Returns `true` if the rectangle is equivalent (within a small margin of error) to the given bounds. The margin of error can be overridden by setting `maxMargin` to a small number.
+       equals: function (bounds, maxMargin) {
+               if (!bounds) { return false; }
 
-       // @function disableTextSelection()
-       // Prevents the user from generating `selectstart` DOM events, usually generated
-       // when the user drags the mouse through a page with text. Used internally
-       // by Leaflet to override the behaviour of any click-and-drag interaction on
-       // the map. Affects drag interactions on the whole document.
+               bounds = toLatLngBounds(bounds);
 
-       // @function enableTextSelection()
-       // Cancels the effects of a previous [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection).
-       if ('onselectstart' in document) {
-               L.DomUtil.disableTextSelection = function () {
-                       L.DomEvent.on(window, 'selectstart', L.DomEvent.preventDefault);
-               };
-               L.DomUtil.enableTextSelection = function () {
-                       L.DomEvent.off(window, 'selectstart', L.DomEvent.preventDefault);
-               };
+               return this._southWest.equals(bounds.getSouthWest(), maxMargin) &&
+                      this._northEast.equals(bounds.getNorthEast(), maxMargin);
+       },
 
-       } else {
-               var userSelectProperty = L.DomUtil.testProp(
-                       ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
-
-               L.DomUtil.disableTextSelection = function () {
-                       if (userSelectProperty) {
-                               var style = document.documentElement.style;
-                               this._userSelect = style[userSelectProperty];
-                               style[userSelectProperty] = 'none';
-                       }
-               };
-               L.DomUtil.enableTextSelection = function () {
-                       if (userSelectProperty) {
-                               document.documentElement.style[userSelectProperty] = this._userSelect;
-                               delete this._userSelect;
-                       }
-               };
+       // @method isValid(): Boolean
+       // Returns `true` if the bounds are properly initialized.
+       isValid: function () {
+               return !!(this._southWest && this._northEast);
        }
+};
 
-       // @function disableImageDrag()
-       // As [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection), but
-       // for `dragstart` DOM events, usually generated when the user drags an image.
-       L.DomUtil.disableImageDrag = function () {
-               L.DomEvent.on(window, 'dragstart', L.DomEvent.preventDefault);
-       };
-
-       // @function enableImageDrag()
-       // Cancels the effects of a previous [`L.DomUtil.disableImageDrag`](#domutil-disabletextselection).
-       L.DomUtil.enableImageDrag = function () {
-               L.DomEvent.off(window, 'dragstart', L.DomEvent.preventDefault);
-       };
-
-       // @function preventOutline(el: HTMLElement)
-       // Makes the [outline](https://developer.mozilla.org/docs/Web/CSS/outline)
-       // of the element `el` invisible. Used internally by Leaflet to prevent
-       // focusable elements from displaying an outline when the user performs a
-       // drag interaction on them.
-       L.DomUtil.preventOutline = function (element) {
-               while (element.tabIndex === -1) {
-                       element = element.parentNode;
-               }
-               if (!element || !element.style) { return; }
-               L.DomUtil.restoreOutline();
-               this._outlineElement = element;
-               this._outlineStyle = element.style.outline;
-               element.style.outline = 'none';
-               L.DomEvent.on(window, 'keydown', L.DomUtil.restoreOutline, this);
-       };
-
-       // @function restoreOutline()
-       // Cancels the effects of a previous [`L.DomUtil.preventOutline`]().
-       L.DomUtil.restoreOutline = function () {
-               if (!this._outlineElement) { return; }
-               this._outlineElement.style.outline = this._outlineStyle;
-               delete this._outlineElement;
-               delete this._outlineStyle;
-               L.DomEvent.off(window, 'keydown', L.DomUtil.restoreOutline, this);
-       };
-})();
+// TODO International date line?
 
+// @factory L.latLngBounds(corner1: LatLng, corner2: LatLng)
+// Creates a `LatLngBounds` object by defining two diagonally opposite corners of the rectangle.
 
+// @alternative
+// @factory L.latLngBounds(latlngs: LatLng[])
+// Creates a `LatLngBounds` object defined by the geographical points it contains. Very useful for zooming the map to fit a particular set of locations with [`fitBounds`](#map-fitbounds).
+function toLatLngBounds(a, b) {
+       if (a instanceof LatLngBounds) {
+               return a;
+       }
+       return new LatLngBounds(a, b);
+}
 
 /* @class LatLng
  * @aka L.LatLng
@@ -1602,9 +1359,13 @@ L.DomUtil = {
  * map.panTo({lat: 50, lng: 30});
  * map.panTo(L.latLng(50, 30));
  * ```
+ *
+ * Note that `LatLng` does not inherit from Leaflet's `Class` object,
+ * which means new classes can't inherit from it, and new methods
+ * can't be added to it with the `include` function.
  */
 
-L.LatLng = function (lat, lng, alt) {
+function LatLng(lat, lng, alt) {
        if (isNaN(lat) || isNaN(lng)) {
                throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');
        }
@@ -1622,15 +1383,15 @@ L.LatLng = function (lat, lng, alt) {
        if (alt !== undefined) {
                this.alt = +alt;
        }
-};
+}
 
-L.LatLng.prototype = {
+LatLng.prototype = {
        // @method equals(otherLatLng: LatLng, maxMargin?: Number): Boolean
-       // Returns `true` if the given `LatLng` point is at the same position (within a small margin of error). The margin of error can be overriden by setting `maxMargin` to a small number.
+       // Returns `true` if the given `LatLng` point is at the same position (within a small margin of error). The margin of error can be overridden by setting `maxMargin` to a small number.
        equals: function (obj, maxMargin) {
                if (!obj) { return false; }
 
-               obj = L.latLng(obj);
+               obj = toLatLng(obj);
 
                var margin = Math.max(
                        Math.abs(this.lat - obj.lat),
@@ -1643,35 +1404,35 @@ L.LatLng.prototype = {
        // Returns a string representation of the point (for debugging purposes).
        toString: function (precision) {
                return 'LatLng(' +
-                       L.Util.formatNum(this.lat, precision) + ', ' +
-                       L.Util.formatNum(this.lng, precision) + ')';
+                       formatNum(this.lat, precision) + ', ' +
+                       formatNum(this.lng, precision) + ')';
        },
 
        // @method distanceTo(otherLatLng: LatLng): Number
-       // Returns the distance (in meters) to the given `LatLng` calculated using the [Haversine formula](http://en.wikipedia.org/wiki/Haversine_formula).
+       // Returns the distance (in meters) to the given `LatLng` calculated using the [Spherical Law of Cosines](https://en.wikipedia.org/wiki/Spherical_law_of_cosines).
        distanceTo: function (other) {
-               return L.CRS.Earth.distance(this, L.latLng(other));
+               return Earth.distance(this, toLatLng(other));
        },
 
        // @method wrap(): LatLng
        // Returns a new `LatLng` object with the longitude wrapped so it's always between -180 and +180 degrees.
        wrap: function () {
-               return L.CRS.Earth.wrapLatLng(this);
+               return Earth.wrapLatLng(this);
        },
 
        // @method toBounds(sizeInMeters: Number): LatLngBounds
-       // Returns a new `LatLngBounds` object in which each boundary is `sizeInMeters` meters apart from the `LatLng`.
+       // Returns a new `LatLngBounds` object in which each boundary is `sizeInMeters/2` meters apart from the `LatLng`.
        toBounds: function (sizeInMeters) {
                var latAccuracy = 180 * sizeInMeters / 40075017,
                    lngAccuracy = latAccuracy / Math.cos((Math.PI / 180) * this.lat);
 
-               return L.latLngBounds(
+               return toLatLngBounds(
                        [this.lat - latAccuracy, this.lng - lngAccuracy],
                        [this.lat + latAccuracy, this.lng + lngAccuracy]);
        },
 
        clone: function () {
-               return new L.LatLng(this.lat, this.lng, this.alt);
+               return new LatLng(this.lat, this.lng, this.alt);
        }
 };
 
@@ -1688,16 +1449,16 @@ L.LatLng.prototype = {
 // @factory L.latLng(coords: Object): LatLng
 // Expects an plain object of the form `{lat: Number, lng: Number}` or `{lat: Number, lng: Number, alt: Number}` instead.
 
-L.latLng = function (a, b, c) {
-       if (a instanceof L.LatLng) {
+function toLatLng(a, b, c) {
+       if (a instanceof LatLng) {
                return a;
        }
-       if (L.Util.isArray(a) && typeof a[0] !== 'object') {
+       if (isArray(a) && typeof a[0] !== 'object') {
                if (a.length === 3) {
-                       return new L.LatLng(a[0], a[1], a[2]);
+                       return new LatLng(a[0], a[1], a[2]);
                }
                if (a.length === 2) {
-                       return new L.LatLng(a[0], a[1]);
+                       return new LatLng(a[0], a[1]);
                }
                return null;
        }
@@ -1705,288 +1466,178 @@ L.latLng = function (a, b, c) {
                return a;
        }
        if (typeof a === 'object' && 'lat' in a) {
-               return new L.LatLng(a.lat, 'lng' in a ? a.lng : a.lon, a.alt);
+               return new LatLng(a.lat, 'lng' in a ? a.lng : a.lon, a.alt);
        }
        if (b === undefined) {
                return null;
        }
-       return new L.LatLng(a, b, c);
-};
-
-
+       return new LatLng(a, b, c);
+}
 
 /*
- * @class LatLngBounds
- * @aka L.LatLngBounds
- *
- * Represents a rectangular geographical area on a map.
- *
- * @example
- *
- * ```js
- * var southWest = L.latLng(40.712, -74.227),
- * northEast = L.latLng(40.774, -74.125),
- * bounds = L.latLngBounds(southWest, northEast);
- * ```
+ * @namespace CRS
+ * @crs L.CRS.Base
+ * Object that defines coordinate reference systems for projecting
+ * geographical points into pixel (screen) coordinates and back (and to
+ * coordinates in other units for [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services). See
+ * [spatial reference system](http://en.wikipedia.org/wiki/Coordinate_reference_system).
  *
- * All Leaflet methods that accept LatLngBounds objects also accept them in a simple Array form (unless noted otherwise), so the bounds example above can be passed like this:
+ * Leaflet defines the most usual CRSs by default. If you want to use a
+ * CRS not defined by default, take a look at the
+ * [Proj4Leaflet](https://github.com/kartena/Proj4Leaflet) plugin.
  *
- * ```js
- * map.fitBounds([
- *     [40.712, -74.227],
- *     [40.774, -74.125]
- * ]);
- * ```
+ * Note that the CRS instances do not inherit from Leafet's `Class` object,
+ * and can't be instantiated. Also, new classes can't inherit from them,
+ * and methods can't be added to them with the `include` function.
  */
 
-L.LatLngBounds = function (southWest, northEast) { // (LatLng, LatLng) or (LatLng[])
-       if (!southWest) { return; }
+var CRS = {
+       // @method latLngToPoint(latlng: LatLng, zoom: Number): Point
+       // Projects geographical coordinates into pixel coordinates for a given zoom.
+       latLngToPoint: function (latlng, zoom) {
+               var projectedPoint = this.projection.project(latlng),
+                   scale = this.scale(zoom);
 
-       var latlngs = northEast ? [southWest, northEast] : southWest;
+               return this.transformation._transform(projectedPoint, scale);
+       },
 
-       for (var i = 0, len = latlngs.length; i < len; i++) {
-               this.extend(latlngs[i]);
-       }
-};
+       // @method pointToLatLng(point: Point, zoom: Number): LatLng
+       // The inverse of `latLngToPoint`. Projects pixel coordinates on a given
+       // zoom into geographical coordinates.
+       pointToLatLng: function (point, zoom) {
+               var scale = this.scale(zoom),
+                   untransformedPoint = this.transformation.untransform(point, scale);
 
-L.LatLngBounds.prototype = {
+               return this.projection.unproject(untransformedPoint);
+       },
 
-       // @method extend(latlng: LatLng): this
-       // Extend the bounds to contain the given point
+       // @method project(latlng: LatLng): Point
+       // Projects geographical coordinates into coordinates in units accepted for
+       // this CRS (e.g. meters for EPSG:3857, for passing it to WMS services).
+       project: function (latlng) {
+               return this.projection.project(latlng);
+       },
 
-       // @alternative
-       // @method extend(otherBounds: LatLngBounds): this
-       // Extend the bounds to contain the given bounds
-       extend: function (obj) {
-               var sw = this._southWest,
-                   ne = this._northEast,
-                   sw2, ne2;
+       // @method unproject(point: Point): LatLng
+       // Given a projected coordinate returns the corresponding LatLng.
+       // The inverse of `project`.
+       unproject: function (point) {
+               return this.projection.unproject(point);
+       },
 
-               if (obj instanceof L.LatLng) {
-                       sw2 = obj;
-                       ne2 = obj;
+       // @method scale(zoom: Number): Number
+       // Returns the scale used when transforming projected coordinates into
+       // pixel coordinates for a particular zoom. For example, it returns
+       // `256 * 2^zoom` for Mercator-based CRS.
+       scale: function (zoom) {
+               return 256 * Math.pow(2, zoom);
+       },
 
-               } else if (obj instanceof L.LatLngBounds) {
-                       sw2 = obj._southWest;
-                       ne2 = obj._northEast;
+       // @method zoom(scale: Number): Number
+       // Inverse of `scale()`, returns the zoom level corresponding to a scale
+       // factor of `scale`.
+       zoom: function (scale) {
+               return Math.log(scale / 256) / Math.LN2;
+       },
 
-                       if (!sw2 || !ne2) { return this; }
+       // @method getProjectedBounds(zoom: Number): Bounds
+       // Returns the projection's bounds scaled and transformed for the provided `zoom`.
+       getProjectedBounds: function (zoom) {
+               if (this.infinite) { return null; }
 
-               } else {
-                       return obj ? this.extend(L.latLng(obj) || L.latLngBounds(obj)) : this;
-               }
+               var b = this.projection.bounds,
+                   s = this.scale(zoom),
+                   min = this.transformation.transform(b.min, s),
+                   max = this.transformation.transform(b.max, s);
 
-               if (!sw && !ne) {
-                       this._southWest = new L.LatLng(sw2.lat, sw2.lng);
-                       this._northEast = new L.LatLng(ne2.lat, ne2.lng);
-               } else {
-                       sw.lat = Math.min(sw2.lat, sw.lat);
-                       sw.lng = Math.min(sw2.lng, sw.lng);
-                       ne.lat = Math.max(ne2.lat, ne.lat);
-                       ne.lng = Math.max(ne2.lng, ne.lng);
-               }
-
-               return this;
-       },
-
-       // @method pad(bufferRatio: Number): LatLngBounds
-       // Returns bigger bounds created by extending the current bounds by a given percentage in each direction.
-       pad: function (bufferRatio) {
-               var sw = this._southWest,
-                   ne = this._northEast,
-                   heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
-                   widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
-
-               return new L.LatLngBounds(
-                       new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
-                       new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
-       },
-
-       // @method getCenter(): LatLng
-       // Returns the center point of the bounds.
-       getCenter: function () {
-               return new L.LatLng(
-                       (this._southWest.lat + this._northEast.lat) / 2,
-                       (this._southWest.lng + this._northEast.lng) / 2);
-       },
-
-       // @method getSouthWest(): LatLng
-       // Returns the south-west point of the bounds.
-       getSouthWest: function () {
-               return this._southWest;
-       },
-
-       // @method getNorthEast(): LatLng
-       // Returns the north-east point of the bounds.
-       getNorthEast: function () {
-               return this._northEast;
+               return new Bounds(min, max);
        },
 
-       // @method getNorthWest(): LatLng
-       // Returns the north-west point of the bounds.
-       getNorthWest: function () {
-               return new L.LatLng(this.getNorth(), this.getWest());
-       },
+       // @method distance(latlng1: LatLng, latlng2: LatLng): Number
+       // Returns the distance between two geographical coordinates.
 
-       // @method getSouthEast(): LatLng
-       // Returns the south-east point of the bounds.
-       getSouthEast: function () {
-               return new L.LatLng(this.getSouth(), this.getEast());
-       },
+       // @property code: String
+       // Standard code name of the CRS passed into WMS services (e.g. `'EPSG:3857'`)
+       //
+       // @property wrapLng: Number[]
+       // An array of two numbers defining whether the longitude (horizontal) coordinate
+       // axis wraps around a given range and how. Defaults to `[-180, 180]` in most
+       // geographical CRSs. If `undefined`, the longitude axis does not wrap around.
+       //
+       // @property wrapLat: Number[]
+       // Like `wrapLng`, but for the latitude (vertical) axis.
 
-       // @method getWest(): Number
-       // Returns the west longitude of the bounds
-       getWest: function () {
-               return this._southWest.lng;
-       },
+       // wrapLng: [min, max],
+       // wrapLat: [min, max],
 
-       // @method getSouth(): Number
-       // Returns the south latitude of the bounds
-       getSouth: function () {
-               return this._southWest.lat;
-       },
+       // @property infinite: Boolean
+       // If true, the coordinate space will be unbounded (infinite in both axes)
+       infinite: false,
 
-       // @method getEast(): Number
-       // Returns the east longitude of the bounds
-       getEast: function () {
-               return this._northEast.lng;
-       },
+       // @method wrapLatLng(latlng: LatLng): LatLng
+       // Returns a `LatLng` where lat and lng has been wrapped according to the
+       // CRS's `wrapLat` and `wrapLng` properties, if they are outside the CRS's bounds.
+       wrapLatLng: function (latlng) {
+               var lng = this.wrapLng ? wrapNum(latlng.lng, this.wrapLng, true) : latlng.lng,
+                   lat = this.wrapLat ? wrapNum(latlng.lat, this.wrapLat, true) : latlng.lat,
+                   alt = latlng.alt;
 
-       // @method getNorth(): Number
-       // Returns the north latitude of the bounds
-       getNorth: function () {
-               return this._northEast.lat;
+               return new LatLng(lat, lng, alt);
        },
 
-       // @method contains(otherBounds: LatLngBounds): Boolean
-       // Returns `true` if the rectangle contains the given one.
-
-       // @alternative
-       // @method contains (latlng: LatLng): Boolean
-       // Returns `true` if the rectangle contains the given point.
-       contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean
-               if (typeof obj[0] === 'number' || obj instanceof L.LatLng) {
-                       obj = L.latLng(obj);
-               } else {
-                       obj = L.latLngBounds(obj);
-               }
-
-               var sw = this._southWest,
-                   ne = this._northEast,
-                   sw2, ne2;
+       // @method wrapLatLngBounds(bounds: LatLngBounds): LatLngBounds
+       // Returns a `LatLngBounds` with the same size as the given one, ensuring
+       // that its center is within the CRS's bounds.
+       // Only accepts actual `L.LatLngBounds` instances, not arrays.
+       wrapLatLngBounds: function (bounds) {
+               var center = bounds.getCenter(),
+                   newCenter = this.wrapLatLng(center),
+                   latShift = center.lat - newCenter.lat,
+                   lngShift = center.lng - newCenter.lng;
 
-               if (obj instanceof L.LatLngBounds) {
-                       sw2 = obj.getSouthWest();
-                       ne2 = obj.getNorthEast();
-               } else {
-                       sw2 = ne2 = obj;
+               if (latShift === 0 && lngShift === 0) {
+                       return bounds;
                }
 
-               return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
-                      (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
-       },
-
-       // @method intersects(otherBounds: LatLngBounds): Boolean
-       // Returns `true` if the rectangle intersects the given bounds. Two bounds intersect if they have at least one point in common.
-       intersects: function (bounds) {
-               bounds = L.latLngBounds(bounds);
-
-               var sw = this._southWest,
-                   ne = this._northEast,
-                   sw2 = bounds.getSouthWest(),
-                   ne2 = bounds.getNorthEast(),
-
-                   latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
-                   lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
-
-               return latIntersects && lngIntersects;
-       },
-
-       // @method overlaps(otherBounds: Bounds): Boolean
-       // Returns `true` if the rectangle overlaps the given bounds. Two bounds overlap if their intersection is an area.
-       overlaps: function (bounds) {
-               bounds = L.latLngBounds(bounds);
-
-               var sw = this._southWest,
-                   ne = this._northEast,
-                   sw2 = bounds.getSouthWest(),
-                   ne2 = bounds.getNorthEast(),
-
-                   latOverlaps = (ne2.lat > sw.lat) && (sw2.lat < ne.lat),
-                   lngOverlaps = (ne2.lng > sw.lng) && (sw2.lng < ne.lng);
-
-               return latOverlaps && lngOverlaps;
-       },
-
-       // @method toBBoxString(): String
-       // Returns a string with bounding box coordinates in a 'southwest_lng,southwest_lat,northeast_lng,northeast_lat' format. Useful for sending requests to web services that return geo data.
-       toBBoxString: function () {
-               return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(',');
-       },
-
-       // @method equals(otherBounds: LatLngBounds): Boolean
-       // Returns `true` if the rectangle is equivalent (within a small margin of error) to the given bounds.
-       equals: function (bounds) {
-               if (!bounds) { return false; }
-
-               bounds = L.latLngBounds(bounds);
-
-               return this._southWest.equals(bounds.getSouthWest()) &&
-                      this._northEast.equals(bounds.getNorthEast());
-       },
-
-       // @method isValid(): Boolean
-       // Returns `true` if the bounds are properly initialized.
-       isValid: function () {
-               return !!(this._southWest && this._northEast);
-       }
-};
-
-// TODO International date line?
-
-// @factory L.latLngBounds(southWest: LatLng, northEast: LatLng)
-// Creates a `LatLngBounds` object by defining south-west and north-east corners of the rectangle.
+               var sw = bounds.getSouthWest(),
+                   ne = bounds.getNorthEast(),
+                   newSw = new LatLng(sw.lat - latShift, sw.lng - lngShift),
+                   newNe = new LatLng(ne.lat - latShift, ne.lng - lngShift);
 
-// @alternative
-// @factory L.latLngBounds(latlngs: LatLng[])
-// Creates a `LatLngBounds` object defined by the geographical points it contains. Very useful for zooming the map to fit a particular set of locations with [`fitBounds`](#map-fitbounds).
-L.latLngBounds = function (a, b) {
-       if (a instanceof L.LatLngBounds) {
-               return a;
+               return new LatLngBounds(newSw, newNe);
        }
-       return new L.LatLngBounds(a, b);
 };
 
-
-
 /*
- * @namespace Projection
- * @section
- * Leaflet comes with a set of already defined Projections out of the box:
- *
- * @projection L.Projection.LonLat
+ * @namespace CRS
+ * @crs L.CRS.Earth
  *
- * Equirectangular, or Plate Carree projection — the most simple projection,
- * mostly used by GIS enthusiasts. Directly maps `x` as longitude, and `y` as
- * latitude. Also suitable for flat worlds, e.g. game maps. Used by the
- * `EPSG:3395` and `Simple` CRS.
+ * Serves as the base for CRS that are global such that they cover the earth.
+ * Can only be used as the base for other CRS and cannot be used directly,
+ * since it does not have a `code`, `projection` or `transformation`. `distance()` returns
+ * meters.
  */
 
-L.Projection = {};
-
-L.Projection.LonLat = {
-       project: function (latlng) {
-               return new L.Point(latlng.lng, latlng.lat);
-       },
-
-       unproject: function (point) {
-               return new L.LatLng(point.y, point.x);
-       },
-
-       bounds: L.bounds([-180, -90], [180, 90])
-};
+var Earth = extend({}, CRS, {
+       wrapLng: [-180, 180],
 
+       // Mean Earth Radius, as recommended for use by
+       // the International Union of Geodesy and Geophysics,
+       // see http://rosettacode.org/wiki/Haversine_formula
+       R: 6371000,
 
+       // distance between two geographical points using spherical law of cosines approximation
+       distance: function (latlng1, latlng2) {
+               var rad = Math.PI / 180,
+                   lat1 = latlng1.lat * rad,
+                   lat2 = latlng2.lat * rad,
+                   sinDLat = Math.sin((latlng2.lat - latlng1.lat) * rad / 2),
+                   sinDLon = Math.sin((latlng2.lng - latlng1.lng) * rad / 2),
+                   a = sinDLat * sinDLat + Math.cos(lat1) * Math.cos(lat2) * sinDLon * sinDLon,
+                   c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+               return this.R * c;
+       }
+});
 
 /*
  * @namespace Projection
@@ -1997,9 +1648,11 @@ L.Projection.LonLat = {
  * a sphere. Used by the `EPSG:3857` CRS.
  */
 
-L.Projection.SphericalMercator = {
+var earthRadius = 6378137;
 
-       R: 6378137,
+var SphericalMercator = {
+
+       R: earthRadius,
        MAX_LATITUDE: 85.0511287798,
 
        project: function (latlng) {
@@ -2008,202 +1661,101 @@ L.Projection.SphericalMercator = {
                    lat = Math.max(Math.min(max, latlng.lat), -max),
                    sin = Math.sin(lat * d);
 
-               return new L.Point(
-                               this.R * latlng.lng * d,
-                               this.R * Math.log((1 + sin) / (1 - sin)) / 2);
+               return new Point(
+                       this.R * latlng.lng * d,
+                       this.R * Math.log((1 + sin) / (1 - sin)) / 2);
        },
 
        unproject: function (point) {
                var d = 180 / Math.PI;
 
-               return new L.LatLng(
+               return new LatLng(
                        (2 * Math.atan(Math.exp(point.y / this.R)) - (Math.PI / 2)) * d,
                        point.x * d / this.R);
        },
 
        bounds: (function () {
-               var d = 6378137 * Math.PI;
-               return L.bounds([-d, -d], [d, d]);
+               var d = earthRadius * Math.PI;
+               return new Bounds([-d, -d], [d, d]);
        })()
 };
 
-
-
 /*
- * @class CRS
- * @aka L.CRS
- * Abstract class that defines coordinate reference systems for projecting
- * geographical points into pixel (screen) coordinates and back (and to
- * coordinates in other units for [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services). See
- * [spatial reference system](http://en.wikipedia.org/wiki/Coordinate_reference_system).
+ * @class Transformation
+ * @aka L.Transformation
  *
- * Leaflet defines the most usual CRSs by default. If you want to use a
- * CRS not defined by default, take a look at the
- * [Proj4Leaflet](https://github.com/kartena/Proj4Leaflet) plugin.
+ * Represents an affine transformation: a set of coefficients `a`, `b`, `c`, `d`
+ * for transforming a point of a form `(x, y)` into `(a*x + b, c*y + d)` and doing
+ * the reverse. Used by Leaflet in its projections code.
+ *
+ * @example
+ *
+ * ```js
+ * var transformation = L.transformation(2, 5, -1, 10),
+ *     p = L.point(1, 2),
+ *     p2 = transformation.transform(p), //  L.point(7, 8)
+ *     p3 = transformation.untransform(p2); //  L.point(1, 2)
+ * ```
  */
 
-L.CRS = {
-       // @method latLngToPoint(latlng: LatLng, zoom: Number): Point
-       // Projects geographical coordinates into pixel coordinates for a given zoom.
-       latLngToPoint: function (latlng, zoom) {
-               var projectedPoint = this.projection.project(latlng),
-                   scale = this.scale(zoom);
 
-               return this.transformation._transform(projectedPoint, scale);
-       },
+// factory new L.Transformation(a: Number, b: Number, c: Number, d: Number)
+// Creates a `Transformation` object with the given coefficients.
+function Transformation(a, b, c, d) {
+       if (isArray(a)) {
+               // use array properties
+               this._a = a[0];
+               this._b = a[1];
+               this._c = a[2];
+               this._d = a[3];
+               return;
+       }
+       this._a = a;
+       this._b = b;
+       this._c = c;
+       this._d = d;
+}
 
-       // @method pointToLatLng(point: Point, zoom: Number): LatLng
-       // The inverse of `latLngToPoint`. Projects pixel coordinates on a given
-       // zoom into geographical coordinates.
-       pointToLatLng: function (point, zoom) {
-               var scale = this.scale(zoom),
-                   untransformedPoint = this.transformation.untransform(point, scale);
+Transformation.prototype = {
+       // @method transform(point: Point, scale?: Number): Point
+       // Returns a transformed point, optionally multiplied by the given scale.
+       // Only accepts actual `L.Point` instances, not arrays.
+       transform: function (point, scale) { // (Point, Number) -> Point
+               return this._transform(point.clone(), scale);
+       },
 
-               return this.projection.unproject(untransformedPoint);
+       // destructive transform (faster)
+       _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;
        },
 
-       // @method project(latlng: LatLng): Point
-       // Projects geographical coordinates into coordinates in units accepted for
-       // this CRS (e.g. meters for EPSG:3857, for passing it to WMS services).
-       project: function (latlng) {
-               return this.projection.project(latlng);
-       },
-
-       // @method unproject(point: Point): LatLng
-       // Given a projected coordinate returns the corresponding LatLng.
-       // The inverse of `project`.
-       unproject: function (point) {
-               return this.projection.unproject(point);
-       },
-
-       // @method scale(zoom: Number): Number
-       // Returns the scale used when transforming projected coordinates into
-       // pixel coordinates for a particular zoom. For example, it returns
-       // `256 * 2^zoom` for Mercator-based CRS.
-       scale: function (zoom) {
-               return 256 * Math.pow(2, zoom);
-       },
-
-       // @method zoom(scale: Number): Number
-       // Inverse of `scale()`, returns the zoom level corresponding to a scale
-       // factor of `scale`.
-       zoom: function (scale) {
-               return Math.log(scale / 256) / Math.LN2;
-       },
-
-       // @method getProjectedBounds(zoom: Number): Bounds
-       // Returns the projection's bounds scaled and transformed for the provided `zoom`.
-       getProjectedBounds: function (zoom) {
-               if (this.infinite) { return null; }
-
-               var b = this.projection.bounds,
-                   s = this.scale(zoom),
-                   min = this.transformation.transform(b.min, s),
-                   max = this.transformation.transform(b.max, s);
-
-               return L.bounds(min, max);
-       },
-
-       // @method distance(latlng1: LatLng, latlng2: LatLng): Number
-       // Returns the distance between two geographical coordinates.
-
-       // @property code: String
-       // Standard code name of the CRS passed into WMS services (e.g. `'EPSG:3857'`)
-       //
-       // @property wrapLng: Number[]
-       // An array of two numbers defining whether the longitude (horizontal) coordinate
-       // axis wraps around a given range and how. Defaults to `[-180, 180]` in most
-       // geographical CRSs. If `undefined`, the longitude axis does not wrap around.
-       //
-       // @property wrapLat: Number[]
-       // Like `wrapLng`, but for the latitude (vertical) axis.
-
-       // wrapLng: [min, max],
-       // wrapLat: [min, max],
-
-       // @property infinite: Boolean
-       // If true, the coordinate space will be unbounded (infinite in both axes)
-       infinite: false,
-
-       // @method wrapLatLng(latlng: LatLng): LatLng
-       // Returns a `LatLng` where lat and lng has been wrapped according to the
-       // CRS's `wrapLat` and `wrapLng` properties, if they are outside the CRS's bounds.
-       wrapLatLng: function (latlng) {
-               var lng = this.wrapLng ? L.Util.wrapNum(latlng.lng, this.wrapLng, true) : latlng.lng,
-                   lat = this.wrapLat ? L.Util.wrapNum(latlng.lat, this.wrapLat, true) : latlng.lat,
-                   alt = latlng.alt;
-
-               return L.latLng(lat, lng, alt);
+       // @method untransform(point: Point, scale?: Number): Point
+       // Returns the reverse transformation of the given point, optionally divided
+       // by the given scale. Only accepts actual `L.Point` instances, not arrays.
+       untransform: function (point, scale) {
+               scale = scale || 1;
+               return new Point(
+                       (point.x / scale - this._b) / this._a,
+                       (point.y / scale - this._d) / this._c);
        }
 };
 
+// factory L.transformation(a: Number, b: Number, c: Number, d: Number)
 
+// @factory L.transformation(a: Number, b: Number, c: Number, d: Number)
+// Instantiates a Transformation object with the given coefficients.
 
-/*
- * @namespace CRS
- * @crs L.CRS.Simple
- *
- * A simple CRS that maps longitude and latitude into `x` and `y` directly.
- * May be used for maps of flat surfaces (e.g. game maps). Note that the `y`
- * axis should still be inverted (going from bottom to top). `distance()` returns
- * simple euclidean distance.
- */
-
-L.CRS.Simple = L.extend({}, L.CRS, {
-       projection: L.Projection.LonLat,
-       transformation: new L.Transformation(1, 0, -1, 0),
-
-       scale: function (zoom) {
-               return Math.pow(2, zoom);
-       },
-
-       zoom: function (scale) {
-               return Math.log(scale) / Math.LN2;
-       },
-
-       distance: function (latlng1, latlng2) {
-               var dx = latlng2.lng - latlng1.lng,
-                   dy = latlng2.lat - latlng1.lat;
-
-               return Math.sqrt(dx * dx + dy * dy);
-       },
-
-       infinite: true
-});
-
-
-
-/*
- * @namespace CRS
- * @crs L.CRS.Earth
- *
- * Serves as the base for CRS that are global such that they cover the earth.
- * Can only be used as the base for other CRS and cannot be used directly,
- * since it does not have a `code`, `projection` or `transformation`. `distance()` returns
- * meters.
- */
-
-L.CRS.Earth = L.extend({}, L.CRS, {
-       wrapLng: [-180, 180],
-
-       // Mean Earth Radius, as recommended for use by
-       // the International Union of Geodesy and Geophysics,
-       // see http://rosettacode.org/wiki/Haversine_formula
-       R: 6371000,
-
-       // distance between two geographical points using spherical law of cosines approximation
-       distance: function (latlng1, latlng2) {
-               var rad = Math.PI / 180,
-                   lat1 = latlng1.lat * rad,
-                   lat2 = latlng2.lat * rad,
-                   a = Math.sin(lat1) * Math.sin(lat2) +
-                       Math.cos(lat1) * Math.cos(lat2) * Math.cos((latlng2.lng - latlng1.lng) * rad);
-
-               return this.R * Math.acos(Math.min(a, 1));
-       }
-});
-
+// @alternative
+// @factory L.transformation(coefficients: Array): Transformation
+// Expects an coefficients array of the form
+// `[a: Number, b: Number, c: Number, d: Number]`.
 
+function toTransformation(a, b, c, d) {
+       return new Transformation(a, b, c, d);
+}
 
 /*
  * @namespace CRS
@@ -2214,5181 +1766,5985 @@ L.CRS.Earth = L.extend({}, L.CRS, {
  * Map's `crs` option.
  */
 
-L.CRS.EPSG3857 = L.extend({}, L.CRS.Earth, {
+var EPSG3857 = extend({}, Earth, {
        code: 'EPSG:3857',
-       projection: L.Projection.SphericalMercator,
+       projection: SphericalMercator,
 
        transformation: (function () {
-               var scale = 0.5 / (Math.PI * L.Projection.SphericalMercator.R);
-               return new L.Transformation(scale, 0.5, -scale, 0.5);
+               var scale = 0.5 / (Math.PI * SphericalMercator.R);
+               return toTransformation(scale, 0.5, -scale, 0.5);
        }())
 });
 
-L.CRS.EPSG900913 = L.extend({}, L.CRS.EPSG3857, {
+var EPSG900913 = extend({}, EPSG3857, {
        code: 'EPSG:900913'
 });
 
+// @namespace SVG; @section
+// There are several static functions which can be called without instantiating L.SVG:
 
+// @function create(name: String): SVGElement
+// Returns a instance of [SVGElement](https://developer.mozilla.org/docs/Web/API/SVGElement),
+// corresponding to the class name passed. For example, using 'line' will return
+// an instance of [SVGLineElement](https://developer.mozilla.org/docs/Web/API/SVGLineElement).
+function svgCreate(name) {
+       return document.createElementNS('http://www.w3.org/2000/svg', name);
+}
 
-/*
- * @namespace CRS
- * @crs L.CRS.EPSG4326
- *
- * A common CRS among GIS enthusiasts. Uses simple Equirectangular projection.
- */
+// @function pointsToPath(rings: Point[], closed: Boolean): String
+// Generates a SVG path string for multiple rings, with each ring turning
+// into "M..L..L.." instructions
+function pointsToPath(rings, closed) {
+       var str = '',
+       i, j, len, len2, points, p;
 
-L.CRS.EPSG4326 = L.extend({}, L.CRS.Earth, {
-       code: 'EPSG:4326',
-       projection: L.Projection.LonLat,
-       transformation: new L.Transformation(1 / 180, 1, -1 / 180, 0.5)
-});
+       for (i = 0, len = rings.length; i < len; i++) {
+               points = rings[i];
+
+               for (j = 0, len2 = points.length; j < len2; j++) {
+                       p = points[j];
+                       str += (j ? 'L' : 'M') + p.x + ' ' + p.y;
+               }
 
+               // closes the ring for polygons; "x" is VML syntax
+               str += closed ? (svg ? 'z' : 'x') : '';
+       }
 
+       // SVG complains about empty path strings
+       return str || 'M0 0';
+}
 
 /*
- * @class Map
- * @aka L.Map
- * @inherits Evented
+ * @namespace Browser
+ * @aka L.Browser
  *
- * The central class of the API — it is used to create a map on a page and manipulate it.
+ * A namespace with static properties for browser/feature detection used by Leaflet internally.
  *
  * @example
  *
  * ```js
- * // initialize the map on the "map" div with a given center and zoom
- * var map = L.map('map', {
- *     center: [51.505, -0.09],
- *     zoom: 13
- * });
+ * if (L.Browser.ielt9) {
+ *   alert('Upgrade your browser, dude!');
+ * }
  * ```
- *
  */
 
-L.Map = L.Evented.extend({
-
-       options: {
-               // @section Map State Options
-               // @option crs: CRS = L.CRS.EPSG3857
-               // The [Coordinate Reference System](#crs) to use. Don't change this if you're not
-               // sure what it means.
-               crs: L.CRS.EPSG3857,
+var style$1 = document.documentElement.style;
 
-               // @option center: LatLng = undefined
-               // Initial geographic center of the map
-               center: undefined,
+// @property ie: Boolean; `true` for all Internet Explorer versions (not Edge).
+var ie = 'ActiveXObject' in window;
 
-               // @option zoom: Number = undefined
-               // Initial map zoom level
-               zoom: undefined,
+// @property ielt9: Boolean; `true` for Internet Explorer versions less than 9.
+var ielt9 = ie && !document.addEventListener;
 
-               // @option minZoom: Number = undefined
-               // Minimum zoom level of the map. Overrides any `minZoom` option set on map layers.
-               minZoom: undefined,
+// @property edge: Boolean; `true` for the Edge web browser.
+var edge = 'msLaunchUri' in navigator && !('documentMode' in document);
 
-               // @option maxZoom: Number = undefined
-               // Maximum zoom level of the map. Overrides any `maxZoom` option set on map layers.
-               maxZoom: undefined,
+// @property webkit: Boolean;
+// `true` for webkit-based browsers like Chrome and Safari (including mobile versions).
+var webkit = userAgentContains('webkit');
 
-               // @option layers: Layer[] = []
-               // Array of layers that will be added to the map initially
-               layers: [],
+// @property android: Boolean
+// `true` for any browser running on an Android platform.
+var android = userAgentContains('android');
 
-               // @option maxBounds: LatLngBounds = null
-               // When this option is set, the map restricts the view to the given
-               // geographical bounds, bouncing the user back when he tries to pan
-               // outside the view. To set the restriction dynamically, use
-               // [`setMaxBounds`](#map-setmaxbounds) method.
-               maxBounds: undefined,
+// @property android23: Boolean; `true` for browsers running on Android 2 or Android 3.
+var android23 = userAgentContains('android 2') || userAgentContains('android 3');
 
-               // @option renderer: Renderer = *
-               // The default method for drawing vector layers on the map. `L.SVG`
-               // or `L.Canvas` by default depending on browser support.
-               renderer: undefined,
+/* See https://stackoverflow.com/a/17961266 for details on detecting stock Android */
+var webkitVer = parseInt(/WebKit\/([0-9]+)|$/.exec(navigator.userAgent)[1], 10); // also matches AppleWebKit
+// @property androidStock: Boolean; `true` for the Android stock browser (i.e. not Chrome)
+var androidStock = android && userAgentContains('Google') && webkitVer < 537 && !('AudioNode' in window);
 
+// @property opera: Boolean; `true` for the Opera browser
+var opera = !!window.opera;
 
-               // @section Animation Options
-               // @option fadeAnimation: Boolean = true
-               // Whether the tile fade animation is enabled. By default it's enabled
-               // in all browsers that support CSS3 Transitions except Android.
-               fadeAnimation: true,
+// @property chrome: Boolean; `true` for the Chrome browser.
+var chrome = userAgentContains('chrome');
 
-               // @option markerZoomAnimation: Boolean = true
-               // Whether markers animate their zoom with the zoom animation, if disabled
-               // they will disappear for the length of the animation. By default it's
-               // enabled in all browsers that support CSS3 Transitions except Android.
-               markerZoomAnimation: true,
+// @property gecko: Boolean; `true` for gecko-based browsers like Firefox.
+var gecko = userAgentContains('gecko') && !webkit && !opera && !ie;
 
-               // @option transform3DLimit: Number = 2^23
-               // Defines the maximum size of a CSS translation transform. The default
-               // value should not be changed unless a web browser positions layers in
-               // the wrong place after doing a large `panBy`.
-               transform3DLimit: 8388608, // Precision limit of a 32-bit float
+// @property safari: Boolean; `true` for the Safari browser.
+var safari = !chrome && userAgentContains('safari');
 
-               // @section Interaction Options
-               // @option zoomSnap: Number = 1
-               // Forces the map's zoom level to always be a multiple of this, particularly
-               // right after a [`fitBounds()`](#map-fitbounds) or a pinch-zoom.
-               // By default, the zoom level snaps to the nearest integer; lower values
-               // (e.g. `0.5` or `0.1`) allow for greater granularity. A value of `0`
-               // means the zoom level will not be snapped after `fitBounds` or a pinch-zoom.
-               zoomSnap: 1,
+var phantom = userAgentContains('phantom');
 
-               // @option zoomDelta: Number = 1
-               // Controls how much the map's zoom level will change after a
-               // [`zoomIn()`](#map-zoomin), [`zoomOut()`](#map-zoomout), pressing `+`
-               // or `-` on the keyboard, or using the [zoom controls](#control-zoom).
-               // Values smaller than `1` (e.g. `0.5`) allow for greater granularity.
-               zoomDelta: 1,
+// @property opera12: Boolean
+// `true` for the Opera browser supporting CSS transforms (version 12 or later).
+var opera12 = 'OTransition' in style$1;
 
-               // @option trackResize: Boolean = true
-               // Whether the map automatically handles browser window resize to update itself.
-               trackResize: true
-       },
+// @property win: Boolean; `true` when the browser is running in a Windows platform
+var win = navigator.platform.indexOf('Win') === 0;
 
-       initialize: function (id, options) { // (HTMLElement or String, Object)
-               options = L.setOptions(this, options);
+// @property ie3d: Boolean; `true` for all Internet Explorer versions supporting CSS transforms.
+var ie3d = ie && ('transition' in style$1);
 
-               this._initContainer(id);
-               this._initLayout();
+// @property webkit3d: Boolean; `true` for webkit-based browsers supporting CSS transforms.
+var webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()) && !android23;
 
-               // hack for https://github.com/Leaflet/Leaflet/issues/1980
-               this._onResize = L.bind(this._onResize, this);
+// @property gecko3d: Boolean; `true` for gecko-based browsers supporting CSS transforms.
+var gecko3d = 'MozPerspective' in style$1;
 
-               this._initEvents();
+// @property any3d: Boolean
+// `true` for all browsers supporting CSS transforms.
+var any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d) && !opera12 && !phantom;
 
-               if (options.maxBounds) {
-                       this.setMaxBounds(options.maxBounds);
-               }
+// @property mobile: Boolean; `true` for all browsers running in a mobile device.
+var mobile = typeof orientation !== 'undefined' || userAgentContains('mobile');
 
-               if (options.zoom !== undefined) {
-                       this._zoom = this._limitZoom(options.zoom);
-               }
+// @property mobileWebkit: Boolean; `true` for all webkit-based browsers in a mobile device.
+var mobileWebkit = mobile && webkit;
 
-               if (options.center && options.zoom !== undefined) {
-                       this.setView(L.latLng(options.center), options.zoom, {reset: true});
-               }
+// @property mobileWebkit3d: Boolean
+// `true` for all webkit-based browsers in a mobile device supporting CSS transforms.
+var mobileWebkit3d = mobile && webkit3d;
 
-               this._handlers = [];
-               this._layers = {};
-               this._zoomBoundLayers = {};
-               this._sizeChanged = true;
+// @property msPointer: Boolean
+// `true` for browsers implementing the Microsoft touch events model (notably IE10).
+var msPointer = !window.PointerEvent && window.MSPointerEvent;
 
-               this.callInitHooks();
+// @property pointer: Boolean
+// `true` for all browsers supporting [pointer events](https://msdn.microsoft.com/en-us/library/dn433244%28v=vs.85%29.aspx).
+var pointer = !!(window.PointerEvent || msPointer);
 
-               this._addLayers(this.options.layers);
-       },
+// @property touch: Boolean
+// `true` for all browsers supporting [touch events](https://developer.mozilla.org/docs/Web/API/Touch_events).
+// This does not necessarily mean that the browser is running in a computer with
+// a touchscreen, it only means that the browser is capable of understanding
+// touch events.
+var touch = !window.L_NO_TOUCH && (pointer || 'ontouchstart' in window ||
+               (window.DocumentTouch && document instanceof window.DocumentTouch));
 
+// @property mobileOpera: Boolean; `true` for the Opera browser in a mobile device.
+var mobileOpera = mobile && opera;
 
-       // @section Methods for modifying map state
+// @property mobileGecko: Boolean
+// `true` for gecko-based browsers running in a mobile device.
+var mobileGecko = mobile && gecko;
 
-       // @method setView(center: LatLng, zoom: Number, options?: Zoom/pan options): this
-       // Sets the view of the map (geographical center and zoom) with the given
-       // animation options.
-       setView: function (center, zoom) {
-               // replaced by animation-powered implementation in Map.PanAnimation.js
-               zoom = zoom === undefined ? this.getZoom() : zoom;
-               this._resetView(L.latLng(center), zoom);
-               return this;
-       },
+// @property retina: Boolean
+// `true` for browsers on a high-resolution "retina" screen or on any screen when browser's display zoom is more than 100%.
+var retina = (window.devicePixelRatio || (window.screen.deviceXDPI / window.screen.logicalXDPI)) > 1;
 
-       // @method setZoom(zoom: Number, options: Zoom/pan options): this
-       // Sets the zoom of the map.
-       setZoom: function (zoom, options) {
-               if (!this._loaded) {
-                       this._zoom = zoom;
-                       return this;
-               }
-               return this.setView(this.getCenter(), zoom, {zoom: options});
-       },
 
-       // @method zoomIn(delta?: Number, options?: Zoom options): this
-       // Increases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
-       zoomIn: function (delta, options) {
-               delta = delta || (L.Browser.any3d ? this.options.zoomDelta : 1);
-               return this.setZoom(this._zoom + delta, options);
-       },
+// @property canvas: Boolean
+// `true` when the browser supports [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).
+var canvas = (function () {
+       return !!document.createElement('canvas').getContext;
+}());
 
-       // @method zoomOut(delta?: Number, options?: Zoom options): this
-       // Decreases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
-       zoomOut: function (delta, options) {
-               delta = delta || (L.Browser.any3d ? this.options.zoomDelta : 1);
-               return this.setZoom(this._zoom - delta, options);
-       },
+// @property svg: Boolean
+// `true` when the browser supports [SVG](https://developer.mozilla.org/docs/Web/SVG).
+var svg = !!(document.createElementNS && svgCreate('svg').createSVGRect);
 
-       // @method setZoomAround(latlng: LatLng, zoom: Number, options: Zoom options): this
-       // Zooms the map while keeping a specified geographical point on the map
-       // stationary (e.g. used internally for scroll zoom and double-click zoom).
-       // @alternative
-       // @method setZoomAround(offset: Point, zoom: Number, options: Zoom options): this
-       // Zooms the map while keeping a specified pixel on the map (relative to the top-left corner) stationary.
-       setZoomAround: function (latlng, zoom, options) {
-               var scale = this.getZoomScale(zoom),
-                   viewHalf = this.getSize().divideBy(2),
-                   containerPoint = latlng instanceof L.Point ? latlng : this.latLngToContainerPoint(latlng),
+// @property vml: Boolean
+// `true` if the browser supports [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language).
+var vml = !svg && (function () {
+       try {
+               var div = document.createElement('div');
+               div.innerHTML = '<v:shape adj="1"/>';
 
-                   centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale),
-                   newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset));
+               var shape = div.firstChild;
+               shape.style.behavior = 'url(#default#VML)';
 
-               return this.setView(newCenter, zoom, {zoom: options});
-       },
+               return shape && (typeof shape.adj === 'object');
 
-       _getBoundsCenterZoom: function (bounds, options) {
+       } catch (e) {
+               return false;
+       }
+}());
 
-               options = options || {};
-               bounds = bounds.getBounds ? bounds.getBounds() : L.latLngBounds(bounds);
 
-               var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]),
-                   paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]),
+function userAgentContains(str) {
+       return navigator.userAgent.toLowerCase().indexOf(str) >= 0;
+}
 
-                   zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));
 
-               zoom = (typeof options.maxZoom === 'number') ? Math.min(options.maxZoom, zoom) : zoom;
+var Browser = (Object.freeze || Object)({
+       ie: ie,
+       ielt9: ielt9,
+       edge: edge,
+       webkit: webkit,
+       android: android,
+       android23: android23,
+       androidStock: androidStock,
+       opera: opera,
+       chrome: chrome,
+       gecko: gecko,
+       safari: safari,
+       phantom: phantom,
+       opera12: opera12,
+       win: win,
+       ie3d: ie3d,
+       webkit3d: webkit3d,
+       gecko3d: gecko3d,
+       any3d: any3d,
+       mobile: mobile,
+       mobileWebkit: mobileWebkit,
+       mobileWebkit3d: mobileWebkit3d,
+       msPointer: msPointer,
+       pointer: pointer,
+       touch: touch,
+       mobileOpera: mobileOpera,
+       mobileGecko: mobileGecko,
+       retina: retina,
+       canvas: canvas,
+       svg: svg,
+       vml: vml
+});
 
-               var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
+/*
+ * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
+ */
 
-                   swPoint = this.project(bounds.getSouthWest(), zoom),
-                   nePoint = this.project(bounds.getNorthEast(), zoom),
-                   center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);
 
-               return {
-                       center: center,
-                       zoom: zoom
-               };
-       },
+var POINTER_DOWN =   msPointer ? 'MSPointerDown'   : 'pointerdown';
+var POINTER_MOVE =   msPointer ? 'MSPointerMove'   : 'pointermove';
+var POINTER_UP =     msPointer ? 'MSPointerUp'     : 'pointerup';
+var POINTER_CANCEL = msPointer ? 'MSPointerCancel' : 'pointercancel';
+var TAG_WHITE_LIST = ['INPUT', 'SELECT', 'OPTION'];
 
-       // @method fitBounds(bounds: LatLngBounds, options: fitBounds options): this
-       // Sets a map view that contains the given geographical bounds with the
-       // maximum zoom level possible.
-       fitBounds: function (bounds, options) {
+var _pointers = {};
+var _pointerDocListener = false;
 
-               bounds = L.latLngBounds(bounds);
+// DomEvent.DoubleTap needs to know about this
+var _pointersCount = 0;
 
-               if (!bounds.isValid()) {
-                       throw new Error('Bounds are not valid.');
-               }
+// Provides a touch events wrapper for (ms)pointer events.
+// ref http://www.w3.org/TR/pointerevents/ https://www.w3.org/Bugs/Public/show_bug.cgi?id=22890
 
-               var target = this._getBoundsCenterZoom(bounds, options);
-               return this.setView(target.center, target.zoom, options);
-       },
+function addPointerListener(obj, type, handler, id) {
+       if (type === 'touchstart') {
+               _addPointerStart(obj, handler, id);
 
-       // @method fitWorld(options?: fitBounds options): this
-       // Sets a map view that mostly contains the whole world with the maximum
-       // zoom level possible.
-       fitWorld: function (options) {
-               return this.fitBounds([[-90, -180], [90, 180]], options);
-       },
+       } else if (type === 'touchmove') {
+               _addPointerMove(obj, handler, id);
 
-       // @method panTo(latlng: LatLng, options?: Pan options): this
-       // Pans the map to a given center.
-       panTo: function (center, options) { // (LatLng)
-               return this.setView(center, this._zoom, {pan: options});
-       },
+       } else if (type === 'touchend') {
+               _addPointerEnd(obj, handler, id);
+       }
 
-       // @method panBy(offset: Point): this
-       // Pans the map by a given number of pixels (animated).
-       panBy: function (offset) { // (Point)
-               // replaced with animated panBy in Map.PanAnimation.js
-               this.fire('movestart');
+       return this;
+}
 
-               this._rawPanBy(L.point(offset));
+function removePointerListener(obj, type, id) {
+       var handler = obj['_leaflet_' + type + id];
 
-               this.fire('move');
-               return this.fire('moveend');
-       },
+       if (type === 'touchstart') {
+               obj.removeEventListener(POINTER_DOWN, handler, false);
 
-       // @method setMaxBounds(bounds: Bounds): this
-       // Restricts the map view to the given bounds (see the [maxBounds](#map-maxbounds) option).
-       setMaxBounds: function (bounds) {
-               bounds = L.latLngBounds(bounds);
+       } else if (type === 'touchmove') {
+               obj.removeEventListener(POINTER_MOVE, handler, false);
 
-               if (!bounds.isValid()) {
-                       this.options.maxBounds = null;
-                       return this.off('moveend', this._panInsideMaxBounds);
-               } else if (this.options.maxBounds) {
-                       this.off('moveend', this._panInsideMaxBounds);
-               }
+       } else if (type === 'touchend') {
+               obj.removeEventListener(POINTER_UP, handler, false);
+               obj.removeEventListener(POINTER_CANCEL, handler, false);
+       }
 
-               this.options.maxBounds = bounds;
+       return this;
+}
 
-               if (this._loaded) {
-                       this._panInsideMaxBounds();
+function _addPointerStart(obj, handler, id) {
+       var onDown = bind(function (e) {
+               if (e.pointerType !== 'mouse' && e.MSPOINTER_TYPE_MOUSE && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
+                       // In IE11, some touch events needs to fire for form controls, or
+                       // the controls will stop working. We keep a whitelist of tag names that
+                       // need these events. For other target tags, we prevent default on the event.
+                       if (TAG_WHITE_LIST.indexOf(e.target.tagName) < 0) {
+                               preventDefault(e);
+                       } else {
+                               return;
+                       }
                }
 
-               return this.on('moveend', this._panInsideMaxBounds);
-       },
+               _handlePointer(e, handler);
+       });
 
-       // @method setMinZoom(zoom: Number): this
-       // Sets the lower limit for the available zoom levels (see the [minZoom](#map-minzoom) option).
-       setMinZoom: function (zoom) {
-               this.options.minZoom = zoom;
+       obj['_leaflet_touchstart' + id] = onDown;
+       obj.addEventListener(POINTER_DOWN, onDown, false);
 
-               if (this._loaded && this.getZoom() < this.options.minZoom) {
-                       return this.setZoom(zoom);
-               }
+       // need to keep track of what pointers and how many are active to provide e.touches emulation
+       if (!_pointerDocListener) {
+               // we listen documentElement as any drags that end by moving the touch off the screen get fired there
+               document.documentElement.addEventListener(POINTER_DOWN, _globalPointerDown, true);
+               document.documentElement.addEventListener(POINTER_MOVE, _globalPointerMove, true);
+               document.documentElement.addEventListener(POINTER_UP, _globalPointerUp, true);
+               document.documentElement.addEventListener(POINTER_CANCEL, _globalPointerUp, true);
 
-               return this;
-       },
+               _pointerDocListener = true;
+       }
+}
 
-       // @method setMaxZoom(zoom: Number): this
-       // Sets the upper limit for the available zoom levels (see the [maxZoom](#map-maxzoom) option).
-       setMaxZoom: function (zoom) {
-               this.options.maxZoom = zoom;
+function _globalPointerDown(e) {
+       _pointers[e.pointerId] = e;
+       _pointersCount++;
+}
 
-               if (this._loaded && (this.getZoom() > this.options.maxZoom)) {
-                       return this.setZoom(zoom);
-               }
+function _globalPointerMove(e) {
+       if (_pointers[e.pointerId]) {
+               _pointers[e.pointerId] = e;
+       }
+}
 
-               return this;
-       },
+function _globalPointerUp(e) {
+       delete _pointers[e.pointerId];
+       _pointersCount--;
+}
 
-       // @method panInsideBounds(bounds: LatLngBounds, options?: Pan options): this
-       // Pans the map to the closest view that would lie inside the given bounds (if it's not already), controlling the animation using the options specific, if any.
-       panInsideBounds: function (bounds, options) {
-               this._enforcingBounds = true;
-               var center = this.getCenter(),
-                   newCenter = this._limitCenter(center, this._zoom, L.latLngBounds(bounds));
+function _handlePointer(e, handler) {
+       e.touches = [];
+       for (var i in _pointers) {
+               e.touches.push(_pointers[i]);
+       }
+       e.changedTouches = [e];
 
-               if (!center.equals(newCenter)) {
-                       this.panTo(newCenter, options);
-               }
+       handler(e);
+}
 
-               this._enforcingBounds = false;
-               return this;
-       },
+function _addPointerMove(obj, handler, id) {
+       var onMove = function (e) {
+               // don't fire touch moves when mouse isn't down
+               if ((e.pointerType === e.MSPOINTER_TYPE_MOUSE || e.pointerType === 'mouse') && e.buttons === 0) { return; }
 
-       // @method invalidateSize(options: Zoom/Pan options): this
-       // Checks if the map container size changed and updates the map if so —
-       // call it after you've changed the map size dynamically, also animating
-       // pan by default. If `options.pan` is `false`, panning will not occur.
-       // If `options.debounceMoveend` is `true`, it will delay `moveend` event so
-       // that it doesn't happen often even if the method is called many
-       // times in a row.
+               _handlePointer(e, handler);
+       };
 
-       // @alternative
-       // @method invalidateSize(animate: Boolean): this
-       // Checks if the map container size changed and updates the map if so —
-       // call it after you've changed the map size dynamically, also animating
-       // pan by default.
-       invalidateSize: function (options) {
-               if (!this._loaded) { return this; }
+       obj['_leaflet_touchmove' + id] = onMove;
+       obj.addEventListener(POINTER_MOVE, onMove, false);
+}
 
-               options = L.extend({
-                       animate: false,
-                       pan: true
-               }, options === true ? {animate: true} : options);
+function _addPointerEnd(obj, handler, id) {
+       var onUp = function (e) {
+               _handlePointer(e, handler);
+       };
 
-               var oldSize = this.getSize();
-               this._sizeChanged = true;
-               this._lastCenter = null;
+       obj['_leaflet_touchend' + id] = onUp;
+       obj.addEventListener(POINTER_UP, onUp, false);
+       obj.addEventListener(POINTER_CANCEL, onUp, false);
+}
 
-               var newSize = this.getSize(),
-                   oldCenter = oldSize.divideBy(2).round(),
-                   newCenter = newSize.divideBy(2).round(),
-                   offset = oldCenter.subtract(newCenter);
+/*
+ * Extends the event handling code with double tap support for mobile browsers.
+ */
 
-               if (!offset.x && !offset.y) { return this; }
+var _touchstart = msPointer ? 'MSPointerDown' : pointer ? 'pointerdown' : 'touchstart';
+var _touchend = msPointer ? 'MSPointerUp' : pointer ? 'pointerup' : 'touchend';
+var _pre = '_leaflet_';
 
-               if (options.animate && options.pan) {
-                       this.panBy(offset);
+// inspired by Zepto touch code by Thomas Fuchs
+function addDoubleTapListener(obj, handler, id) {
+       var last, touch$$1,
+           doubleTap = false,
+           delay = 250;
+
+       function onTouchStart(e) {
+               var count;
 
+               if (pointer) {
+                       if ((!edge) || e.pointerType === 'mouse') { return; }
+                       count = _pointersCount;
                } else {
-                       if (options.pan) {
-                               this._rawPanBy(offset);
-                       }
+                       count = e.touches.length;
+               }
 
-                       this.fire('move');
+               if (count > 1) { return; }
 
-                       if (options.debounceMoveend) {
-                               clearTimeout(this._sizeTimer);
-                               this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200);
-                       } else {
-                               this.fire('moveend');
+               var now = Date.now(),
+                   delta = now - (last || now);
+
+               touch$$1 = e.touches ? e.touches[0] : e;
+               doubleTap = (delta > 0 && delta <= delay);
+               last = now;
+       }
+
+       function onTouchEnd(e) {
+               if (doubleTap && !touch$$1.cancelBubble) {
+                       if (pointer) {
+                               if ((!edge) || e.pointerType === 'mouse') { return; }
+                               // work around .type being readonly with MSPointer* events
+                               var newTouch = {},
+                                   prop, i;
+
+                               for (i in touch$$1) {
+                                       prop = touch$$1[i];
+                                       newTouch[i] = prop && prop.bind ? prop.bind(touch$$1) : prop;
+                               }
+                               touch$$1 = newTouch;
                        }
+                       touch$$1.type = 'dblclick';
+                       touch$$1.button = 0;
+                       handler(touch$$1);
+                       last = null;
                }
+       }
 
-               // @section Map state change events
-               // @event resize: ResizeEvent
-               // Fired when the map is resized.
-               return this.fire('resize', {
-                       oldSize: oldSize,
-                       newSize: newSize
-               });
-       },
+       obj[_pre + _touchstart + id] = onTouchStart;
+       obj[_pre + _touchend + id] = onTouchEnd;
+       obj[_pre + 'dblclick' + id] = handler;
 
-       // @section Methods for modifying map state
-       // @method stop(): this
-       // Stops the currently running `panTo` or `flyTo` animation, if any.
-       stop: function () {
-               this.setZoom(this._limitZoom(this._zoom));
-               if (!this.options.zoomSnap) {
-                       this.fire('viewreset');
-               }
-               return this._stop();
-       },
+       obj.addEventListener(_touchstart, onTouchStart, false);
+       obj.addEventListener(_touchend, onTouchEnd, false);
 
+       // On some platforms (notably, chrome<55 on win10 + touchscreen + mouse),
+       // the browser doesn't fire touchend/pointerup events but does fire
+       // native dblclicks. See #4127.
+       // Edge 14 also fires native dblclicks, but only for pointerType mouse, see #5180.
+       obj.addEventListener('dblclick', handler, false);
 
-       // TODO handler.addTo
-       // TODO Appropiate docs section?
-       // @section Other Methods
-       // @method addHandler(name: String, HandlerClass: Function): this
-       // Adds a new `Handler` to the map, given its name and constructor function.
-       addHandler: function (name, HandlerClass) {
-               if (!HandlerClass) { return this; }
+       return this;
+}
 
-               var handler = this[name] = new HandlerClass(this);
+function removeDoubleTapListener(obj, id) {
+       var touchstart = obj[_pre + _touchstart + id],
+           touchend = obj[_pre + _touchend + id],
+           dblclick = obj[_pre + 'dblclick' + id];
 
-               this._handlers.push(handler);
+       obj.removeEventListener(_touchstart, touchstart, false);
+       obj.removeEventListener(_touchend, touchend, false);
+       if (!edge) {
+               obj.removeEventListener('dblclick', dblclick, false);
+       }
 
-               if (this.options[name]) {
-                       handler.enable();
-               }
+       return this;
+}
 
-               return this;
-       },
+/*
+ * @namespace DomUtil
+ *
+ * Utility functions to work with the [DOM](https://developer.mozilla.org/docs/Web/API/Document_Object_Model)
+ * tree, used by Leaflet internally.
+ *
+ * Most functions expecting or returning a `HTMLElement` also work for
+ * SVG elements. The only difference is that classes refer to CSS classes
+ * in HTML and SVG classes in SVG.
+ */
 
-       // @method remove(): this
-       // Destroys the map and clears all related event listeners.
-       remove: function () {
 
-               this._initEvents(true);
+// @property TRANSFORM: String
+// Vendor-prefixed transform style name (e.g. `'webkitTransform'` for WebKit).
+var TRANSFORM = testProp(
+       ['transform', 'webkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
 
-               if (this._containerId !== this._container._leaflet_id) {
-                       throw new Error('Map container is being reused by another instance');
-               }
+// 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
 
-               try {
-                       // throws error in IE6-8
-                       delete this._container._leaflet_id;
-                       delete this._containerId;
-               } catch (e) {
-                       /*eslint-disable */
-                       this._container._leaflet_id = undefined;
-                       /*eslint-enable */
-                       this._containerId = undefined;
-               }
+// @property TRANSITION: String
+// Vendor-prefixed transition style name.
+var TRANSITION = testProp(
+       ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);
 
-               L.DomUtil.remove(this._mapPane);
+// @property TRANSITION_END: String
+// Vendor-prefixed transitionend event name.
+var TRANSITION_END =
+       TRANSITION === 'webkitTransition' || TRANSITION === 'OTransition' ? TRANSITION + 'End' : 'transitionend';
 
-               if (this._clearControlPos) {
-                       this._clearControlPos();
-               }
 
-               this._clearHandlers();
+// @function get(id: String|HTMLElement): HTMLElement
+// Returns an element given its DOM id, or returns the element itself
+// if it was passed directly.
+function get(id) {
+       return typeof id === 'string' ? document.getElementById(id) : id;
+}
 
-               if (this._loaded) {
-                       // @section Map state change events
-                       // @event unload: Event
-                       // Fired when the map is destroyed with [remove](#map-remove) method.
-                       this.fire('unload');
-               }
+// @function getStyle(el: HTMLElement, styleAttrib: String): String
+// Returns the value for a certain style attribute on an element,
+// including computed values or values set through CSS.
+function getStyle(el, style) {
+       var value = el.style[style] || (el.currentStyle && el.currentStyle[style]);
 
-               for (var i in this._layers) {
-                       this._layers[i].remove();
-               }
+       if ((!value || value === 'auto') && document.defaultView) {
+               var css = document.defaultView.getComputedStyle(el, null);
+               value = css ? css[style] : null;
+       }
+       return value === 'auto' ? null : value;
+}
 
-               return this;
-       },
+// @function create(tagName: String, className?: String, container?: HTMLElement): HTMLElement
+// Creates an HTML element with `tagName`, sets its class to `className`, and optionally appends it to `container` element.
+function create$1(tagName, className, container) {
+       var el = document.createElement(tagName);
+       el.className = className || '';
 
-       // @section Other Methods
-       // @method createPane(name: String, container?: HTMLElement): HTMLElement
-       // Creates a new [map pane](#map-pane) with the given name if it doesn't exist already,
-       // then returns it. The pane is created as a children of `container`, or
-       // as a children of the main map pane if not set.
-       createPane: function (name, container) {
-               var className = 'leaflet-pane' + (name ? ' leaflet-' + name.replace('Pane', '') + '-pane' : ''),
-                   pane = L.DomUtil.create('div', className, container || this._mapPane);
+       if (container) {
+               container.appendChild(el);
+       }
+       return el;
+}
 
-               if (name) {
-                       this._panes[name] = pane;
-               }
-               return pane;
-       },
+// @function remove(el: HTMLElement)
+// Removes `el` from its parent element
+function remove(el) {
+       var parent = el.parentNode;
+       if (parent) {
+               parent.removeChild(el);
+       }
+}
 
-       // @section Methods for Getting Map State
+// @function empty(el: HTMLElement)
+// Removes all of `el`'s children elements from `el`
+function empty(el) {
+       while (el.firstChild) {
+               el.removeChild(el.firstChild);
+       }
+}
 
-       // @method getCenter(): LatLng
-       // Returns the geographical center of the map view
-       getCenter: function () {
-               this._checkIfLoaded();
+// @function toFront(el: HTMLElement)
+// Makes `el` the last child of its parent, so it renders in front of the other children.
+function toFront(el) {
+       var parent = el.parentNode;
+       if (parent && parent.lastChild !== el) {
+               parent.appendChild(el);
+       }
+}
 
-               if (this._lastCenter && !this._moved()) {
-                       return this._lastCenter;
-               }
-               return this.layerPointToLatLng(this._getCenterLayerPoint());
-       },
+// @function toBack(el: HTMLElement)
+// Makes `el` the first child of its parent, so it renders behind the other children.
+function toBack(el) {
+       var parent = el.parentNode;
+       if (parent && parent.firstChild !== el) {
+               parent.insertBefore(el, parent.firstChild);
+       }
+}
 
-       // @method getZoom(): Number
-       // Returns the current zoom level of the map view
-       getZoom: function () {
-               return this._zoom;
-       },
+// @function hasClass(el: HTMLElement, name: String): Boolean
+// Returns `true` if the element's class attribute contains `name`.
+function hasClass(el, name) {
+       if (el.classList !== undefined) {
+               return el.classList.contains(name);
+       }
+       var className = getClass(el);
+       return className.length > 0 && new RegExp('(^|\\s)' + name + '(\\s|$)').test(className);
+}
 
-       // @method getBounds(): LatLngBounds
-       // Returns the geographical bounds visible in the current map view
-       getBounds: function () {
-               var bounds = this.getPixelBounds(),
-                   sw = this.unproject(bounds.getBottomLeft()),
-                   ne = this.unproject(bounds.getTopRight());
+// @function addClass(el: HTMLElement, name: String)
+// Adds `name` to the element's class attribute.
+function addClass(el, name) {
+       if (el.classList !== undefined) {
+               var classes = splitWords(name);
+               for (var i = 0, len = classes.length; i < len; i++) {
+                       el.classList.add(classes[i]);
+               }
+       } else if (!hasClass(el, name)) {
+               var className = getClass(el);
+               setClass(el, (className ? className + ' ' : '') + name);
+       }
+}
 
-               return new L.LatLngBounds(sw, ne);
-       },
+// @function removeClass(el: HTMLElement, name: String)
+// Removes `name` from the element's class attribute.
+function removeClass(el, name) {
+       if (el.classList !== undefined) {
+               el.classList.remove(name);
+       } else {
+               setClass(el, trim((' ' + getClass(el) + ' ').replace(' ' + name + ' ', ' ')));
+       }
+}
 
-       // @method getMinZoom(): Number
-       // Returns the minimum zoom level of the map (if set in the `minZoom` option of the map or of any layers), or `0` by default.
-       getMinZoom: function () {
-               return this.options.minZoom === undefined ? this._layersMinZoom || 0 : this.options.minZoom;
-       },
+// @function setClass(el: HTMLElement, name: String)
+// Sets the element's class.
+function setClass(el, name) {
+       if (el.className.baseVal === undefined) {
+               el.className = name;
+       } else {
+               // in case of SVG element
+               el.className.baseVal = name;
+       }
+}
 
-       // @method getMaxZoom(): Number
-       // Returns the maximum zoom level of the map (if set in the `maxZoom` option of the map or of any layers).
-       getMaxZoom: function () {
-               return this.options.maxZoom === undefined ?
-                       (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
-                       this.options.maxZoom;
-       },
+// @function getClass(el: HTMLElement): String
+// Returns the element's class.
+function getClass(el) {
+       // Check if the element is an SVGElementInstance and use the correspondingElement instead
+       // (Required for linked SVG elements in IE11.)
+       if (el.correspondingElement) {
+               el = el.correspondingElement;
+       }
+       return el.className.baseVal === undefined ? el.className : el.className.baseVal;
+}
 
-       // @method getBoundsZoom(bounds: LatLngBounds, inside?: Boolean): Number
-       // Returns the maximum zoom level on which the given bounds fit to the map
-       // view in its entirety. If `inside` (optional) is set to `true`, the method
-       // instead returns the minimum zoom level on which the map view fits into
-       // the given bounds in its entirety.
-       getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number
-               bounds = L.latLngBounds(bounds);
-               padding = L.point(padding || [0, 0]);
+// @function setOpacity(el: HTMLElement, opacity: Number)
+// Set the opacity of an element (including old IE support).
+// `opacity` must be a number from `0` to `1`.
+function setOpacity(el, value) {
+       if ('opacity' in el.style) {
+               el.style.opacity = value;
+       } else if ('filter' in el.style) {
+               _setOpacityIE(el, value);
+       }
+}
 
-               var zoom = this.getZoom() || 0,
-                   min = this.getMinZoom(),
-                   max = this.getMaxZoom(),
-                   nw = bounds.getNorthWest(),
-                   se = bounds.getSouthEast(),
-                   size = this.getSize().subtract(padding),
-                   boundsSize = this.project(se, zoom).subtract(this.project(nw, zoom)),
-                   snap = L.Browser.any3d ? this.options.zoomSnap : 1;
+function _setOpacityIE(el, value) {
+       var filter = false,
+           filterName = 'DXImageTransform.Microsoft.Alpha';
 
-               var scale = Math.min(size.x / boundsSize.x, size.y / boundsSize.y);
-               zoom = this.getScaleZoom(scale, zoom);
+       // filters collection throws an error if we try to retrieve a filter that doesn't exist
+       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; }
+       }
 
-               if (snap) {
-                       zoom = Math.round(zoom / (snap / 100)) * (snap / 100); // don't jump if within 1% of a snap level
-                       zoom = inside ? Math.ceil(zoom / snap) * snap : Math.floor(zoom / snap) * snap;
-               }
+       value = Math.round(value * 100);
 
-               return Math.max(min, Math.min(max, zoom));
-       },
+       if (filter) {
+               filter.Enabled = (value !== 100);
+               filter.Opacity = value;
+       } else {
+               el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
+       }
+}
 
-       // @method getSize(): Point
-       // Returns the current size of the map container (in pixels).
-       getSize: function () {
-               if (!this._size || this._sizeChanged) {
-                       this._size = new L.Point(
-                               this._container.clientWidth,
-                               this._container.clientHeight);
+// @function testProp(props: String[]): String|false
+// Goes through the array of style names and returns the first name
+// that is a valid style name for an element. If no such name is found,
+// it returns false. Useful for vendor-prefixed styles like `transform`.
+function testProp(props) {
+       var style = document.documentElement.style;
 
-                       this._sizeChanged = false;
+       for (var i = 0; i < props.length; i++) {
+               if (props[i] in style) {
+                       return props[i];
                }
-               return this._size.clone();
-       },
+       }
+       return false;
+}
 
-       // @method getPixelBounds(): Bounds
-       // Returns the bounds of the current map view in projected pixel
-       // coordinates (sometimes useful in layer and overlay implementations).
-       getPixelBounds: function (center, zoom) {
-               var topLeftPoint = this._getTopLeftPoint(center, zoom);
-               return new L.Bounds(topLeftPoint, topLeftPoint.add(this.getSize()));
-       },
+// @function setTransform(el: HTMLElement, offset: Point, scale?: Number)
+// Resets the 3D CSS transform of `el` so it is translated by `offset` pixels
+// and optionally scaled by `scale`. Does not have an effect if the
+// browser doesn't support 3D CSS transforms.
+function setTransform(el, offset, scale) {
+       var pos = offset || new Point(0, 0);
+
+       el.style[TRANSFORM] =
+               (ie3d ?
+                       'translate(' + pos.x + 'px,' + pos.y + 'px)' :
+                       'translate3d(' + pos.x + 'px,' + pos.y + 'px,0)') +
+               (scale ? ' scale(' + scale + ')' : '');
+}
 
-       // TODO: Check semantics - isn't the pixel origin the 0,0 coord relative to
-       // the map pane? "left point of the map layer" can be confusing, specially
-       // since there can be negative offsets.
-       // @method getPixelOrigin(): Point
-       // Returns the projected pixel coordinates of the top left point of
-       // the map layer (useful in custom layer and overlay implementations).
-       getPixelOrigin: function () {
-               this._checkIfLoaded();
-               return this._pixelOrigin;
-       },
+// @function setPosition(el: HTMLElement, position: Point)
+// Sets the position of `el` to coordinates specified by `position`,
+// using CSS translate or top/left positioning depending on the browser
+// (used by Leaflet internally to position its layers).
+function setPosition(el, point) {
 
-       // @method getPixelWorldBounds(zoom?: Number): Bounds
-       // Returns the world's bounds in pixel coordinates for zoom level `zoom`.
-       // If `zoom` is omitted, the map's current zoom level is used.
-       getPixelWorldBounds: function (zoom) {
-               return this.options.crs.getProjectedBounds(zoom === undefined ? this.getZoom() : zoom);
-       },
+       /*eslint-disable */
+       el._leaflet_pos = point;
+       /* eslint-enable */
 
-       // @section Other Methods
+       if (any3d) {
+               setTransform(el, point);
+       } else {
+               el.style.left = point.x + 'px';
+               el.style.top = point.y + 'px';
+       }
+}
 
-       // @method getPane(pane: String|HTMLElement): HTMLElement
-       // Returns a [map pane](#map-pane), given its name or its HTML element (its identity).
-       getPane: function (pane) {
-               return typeof pane === 'string' ? this._panes[pane] : pane;
-       },
+// @function getPosition(el: HTMLElement): Point
+// Returns the coordinates of an element previously positioned with setPosition.
+function getPosition(el) {
+       // this method is only used for elements previously positioned using setPosition,
+       // so it's safe to cache the position for performance
 
-       // @method getPanes(): Object
-       // Returns a plain object containing the names of all [panes](#map-pane) as keys and
-       // the panes as values.
-       getPanes: function () {
-               return this._panes;
-       },
+       return el._leaflet_pos || new Point(0, 0);
+}
 
-       // @method getContainer: HTMLElement
-       // Returns the HTML element that contains the map.
-       getContainer: function () {
-               return this._container;
-       },
+// @function disableTextSelection()
+// Prevents the user from generating `selectstart` DOM events, usually generated
+// when the user drags the mouse through a page with text. Used internally
+// by Leaflet to override the behaviour of any click-and-drag interaction on
+// the map. Affects drag interactions on the whole document.
+
+// @function enableTextSelection()
+// Cancels the effects of a previous [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection).
+var disableTextSelection;
+var enableTextSelection;
+var _userSelect;
+if ('onselectstart' in document) {
+       disableTextSelection = function () {
+               on(window, 'selectstart', preventDefault);
+       };
+       enableTextSelection = function () {
+               off(window, 'selectstart', preventDefault);
+       };
+} else {
+       var userSelectProperty = testProp(
+               ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
 
+       disableTextSelection = function () {
+               if (userSelectProperty) {
+                       var style = document.documentElement.style;
+                       _userSelect = style[userSelectProperty];
+                       style[userSelectProperty] = 'none';
+               }
+       };
+       enableTextSelection = function () {
+               if (userSelectProperty) {
+                       document.documentElement.style[userSelectProperty] = _userSelect;
+                       _userSelect = undefined;
+               }
+       };
+}
 
-       // @section Conversion Methods
+// @function disableImageDrag()
+// As [`L.DomUtil.disableTextSelection`](#domutil-disabletextselection), but
+// for `dragstart` DOM events, usually generated when the user drags an image.
+function disableImageDrag() {
+       on(window, 'dragstart', preventDefault);
+}
 
-       // @method getZoomScale(toZoom: Number, fromZoom: Number): Number
-       // Returns the scale factor to be applied to a map transition from zoom level
-       // `fromZoom` to `toZoom`. Used internally to help with zoom animations.
-       getZoomScale: function (toZoom, fromZoom) {
-               // TODO replace with universal implementation after refactoring projections
-               var crs = this.options.crs;
-               fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
-               return crs.scale(toZoom) / crs.scale(fromZoom);
-       },
+// @function enableImageDrag()
+// Cancels the effects of a previous [`L.DomUtil.disableImageDrag`](#domutil-disabletextselection).
+function enableImageDrag() {
+       off(window, 'dragstart', preventDefault);
+}
 
-       // @method getScaleZoom(scale: Number, fromZoom: Number): Number
-       // Returns the zoom level that the map would end up at, if it is at `fromZoom`
-       // level and everything is scaled by a factor of `scale`. Inverse of
-       // [`getZoomScale`](#map-getZoomScale).
-       getScaleZoom: function (scale, fromZoom) {
-               var crs = this.options.crs;
-               fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
-               var zoom = crs.zoom(scale * crs.scale(fromZoom));
-               return isNaN(zoom) ? Infinity : zoom;
-       },
+var _outlineElement;
+var _outlineStyle;
+// @function preventOutline(el: HTMLElement)
+// Makes the [outline](https://developer.mozilla.org/docs/Web/CSS/outline)
+// of the element `el` invisible. Used internally by Leaflet to prevent
+// focusable elements from displaying an outline when the user performs a
+// drag interaction on them.
+function preventOutline(element) {
+       while (element.tabIndex === -1) {
+               element = element.parentNode;
+       }
+       if (!element.style) { return; }
+       restoreOutline();
+       _outlineElement = element;
+       _outlineStyle = element.style.outline;
+       element.style.outline = 'none';
+       on(window, 'keydown', restoreOutline);
+}
 
-       // @method project(latlng: LatLng, zoom: Number): Point
-       // Projects a geographical coordinate `LatLng` according to the projection
-       // of the map's CRS, then scales it according to `zoom` and the CRS's
-       // `Transformation`. The result is pixel coordinate relative to
-       // the CRS origin.
-       project: function (latlng, zoom) {
-               zoom = zoom === undefined ? this._zoom : zoom;
-               return this.options.crs.latLngToPoint(L.latLng(latlng), zoom);
-       },
+// @function restoreOutline()
+// Cancels the effects of a previous [`L.DomUtil.preventOutline`]().
+function restoreOutline() {
+       if (!_outlineElement) { return; }
+       _outlineElement.style.outline = _outlineStyle;
+       _outlineElement = undefined;
+       _outlineStyle = undefined;
+       off(window, 'keydown', restoreOutline);
+}
 
-       // @method unproject(point: Point, zoom: Number): LatLng
-       // Inverse of [`project`](#map-project).
-       unproject: function (point, zoom) {
-               zoom = zoom === undefined ? this._zoom : zoom;
-               return this.options.crs.pointToLatLng(L.point(point), zoom);
-       },
+// @function getSizedParentNode(el: HTMLElement): HTMLElement
+// Finds the closest parent node which size (width and height) is not null.
+function getSizedParentNode(element) {
+       do {
+               element = element.parentNode;
+       } while ((!element.offsetWidth || !element.offsetHeight) && element !== document.body);
+       return element;
+}
 
-       // @method layerPointToLatLng(point: Point): LatLng
-       // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin),
-       // returns the corresponding geographical coordinate (for the current zoom level).
-       layerPointToLatLng: function (point) {
-               var projectedPoint = L.point(point).add(this.getPixelOrigin());
-               return this.unproject(projectedPoint);
-       },
+// @function getScale(el: HTMLElement): Object
+// Computes the CSS scale currently applied on the element.
+// Returns an object with `x` and `y` members as horizontal and vertical scales respectively,
+// and `boundingClientRect` as the result of [`getBoundingClientRect()`](https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect).
+function getScale(element) {
+       var rect = element.getBoundingClientRect(); // Read-only in old browsers.
+
+       return {
+               x: rect.width / element.offsetWidth || 1,
+               y: rect.height / element.offsetHeight || 1,
+               boundingClientRect: rect
+       };
+}
 
-       // @method latLngToLayerPoint(latlng: LatLng): Point
-       // Given a geographical coordinate, returns the corresponding pixel coordinate
-       // relative to the [origin pixel](#map-getpixelorigin).
-       latLngToLayerPoint: function (latlng) {
-               var projectedPoint = this.project(L.latLng(latlng))._round();
-               return projectedPoint._subtract(this.getPixelOrigin());
-       },
 
-       // @method wrapLatLng(latlng: LatLng): LatLng
-       // Returns a `LatLng` where `lat` and `lng` has been wrapped according to the
-       // map's CRS's `wrapLat` and `wrapLng` properties, if they are outside the
-       // CRS's bounds.
-       // By default this means longitude is wrapped around the dateline so its
-       // value is between -180 and +180 degrees.
-       wrapLatLng: function (latlng) {
-               return this.options.crs.wrapLatLng(L.latLng(latlng));
-       },
+var DomUtil = (Object.freeze || Object)({
+       TRANSFORM: TRANSFORM,
+       TRANSITION: TRANSITION,
+       TRANSITION_END: TRANSITION_END,
+       get: get,
+       getStyle: getStyle,
+       create: create$1,
+       remove: remove,
+       empty: empty,
+       toFront: toFront,
+       toBack: toBack,
+       hasClass: hasClass,
+       addClass: addClass,
+       removeClass: removeClass,
+       setClass: setClass,
+       getClass: getClass,
+       setOpacity: setOpacity,
+       testProp: testProp,
+       setTransform: setTransform,
+       setPosition: setPosition,
+       getPosition: getPosition,
+       disableTextSelection: disableTextSelection,
+       enableTextSelection: enableTextSelection,
+       disableImageDrag: disableImageDrag,
+       enableImageDrag: enableImageDrag,
+       preventOutline: preventOutline,
+       restoreOutline: restoreOutline,
+       getSizedParentNode: getSizedParentNode,
+       getScale: getScale
+});
 
-       // @method distance(latlng1: LatLng, latlng2: LatLng): Number
-       // Returns the distance between two geographical coordinates according to
-       // the map's CRS. By default this measures distance in meters.
-       distance: function (latlng1, latlng2) {
-               return this.options.crs.distance(L.latLng(latlng1), L.latLng(latlng2));
-       },
+/*
+ * @namespace DomEvent
+ * Utility functions to work with the [DOM events](https://developer.mozilla.org/docs/Web/API/Event), used by Leaflet internally.
+ */
 
-       // @method containerPointToLayerPoint(point: Point): Point
-       // Given a pixel coordinate relative to the map container, returns the corresponding
-       // pixel coordinate relative to the [origin pixel](#map-getpixelorigin).
-       containerPointToLayerPoint: function (point) { // (Point)
-               return L.point(point).subtract(this._getMapPanePos());
-       },
+// Inspired by John Resig, Dean Edwards and YUI addEvent implementations.
 
-       // @method layerPointToContainerPoint(point: Point): Point
-       // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin),
-       // returns the corresponding pixel coordinate relative to the map container.
-       layerPointToContainerPoint: function (point) { // (Point)
-               return L.point(point).add(this._getMapPanePos());
-       },
+// @function on(el: HTMLElement, types: String, fn: Function, context?: Object): this
+// Adds a listener function (`fn`) to a particular DOM event type of the
+// element `el`. You can optionally specify the context of the listener
+// (object the `this` keyword will point to). You can also pass several
+// space-separated types (e.g. `'click dblclick'`).
 
-       // @method containerPointToLatLng(point: Point): Point
-       // Given a pixel coordinate relative to the map container, returns
-       // the corresponding geographical coordinate (for the current zoom level).
-       containerPointToLatLng: function (point) {
-               var layerPoint = this.containerPointToLayerPoint(L.point(point));
-               return this.layerPointToLatLng(layerPoint);
-       },
+// @alternative
+// @function on(el: HTMLElement, eventMap: Object, context?: Object): this
+// Adds a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+function on(obj, types, fn, context) {
 
-       // @method latLngToContainerPoint(latlng: LatLng): Point
-       // Given a geographical coordinate, returns the corresponding pixel coordinate
-       // relative to the map container.
-       latLngToContainerPoint: function (latlng) {
-               return this.layerPointToContainerPoint(this.latLngToLayerPoint(L.latLng(latlng)));
-       },
+       if (typeof types === 'object') {
+               for (var type in types) {
+                       addOne(obj, type, types[type], fn);
+               }
+       } else {
+               types = splitWords(types);
 
-       // @method mouseEventToContainerPoint(ev: MouseEvent): Point
-       // Given a MouseEvent object, returns the pixel coordinate relative to the
-       // map container where the event took place.
-       mouseEventToContainerPoint: function (e) {
-               return L.DomEvent.getMousePosition(e, this._container);
-       },
+               for (var i = 0, len = types.length; i < len; i++) {
+                       addOne(obj, types[i], fn, context);
+               }
+       }
 
-       // @method mouseEventToLayerPoint(ev: MouseEvent): Point
-       // Given a MouseEvent object, returns the pixel coordinate relative to
-       // the [origin pixel](#map-getpixelorigin) where the event took place.
-       mouseEventToLayerPoint: function (e) {
-               return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));
-       },
+       return this;
+}
 
-       // @method mouseEventToLatLng(ev: MouseEvent): LatLng
-       // Given a MouseEvent object, returns geographical coordinate where the
-       // event took place.
-       mouseEventToLatLng: function (e) { // (MouseEvent)
-               return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
-       },
+var eventsKey = '_leaflet_events';
 
+// @function off(el: HTMLElement, types: String, fn: Function, context?: Object): this
+// Removes a previously added listener function.
+// Note that if you passed a custom context to on, you must pass the same
+// context to `off` in order to remove the listener.
 
-       // map initialization methods
+// @alternative
+// @function off(el: HTMLElement, eventMap: Object, context?: Object): this
+// Removes a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+function off(obj, types, fn, context) {
 
-       _initContainer: function (id) {
-               var container = this._container = L.DomUtil.get(id);
+       if (typeof types === 'object') {
+               for (var type in types) {
+                       removeOne(obj, type, types[type], fn);
+               }
+       } else if (types) {
+               types = splitWords(types);
 
-               if (!container) {
-                       throw new Error('Map container not found.');
-               } else if (container._leaflet_id) {
-                       throw new Error('Map container is already initialized.');
+               for (var i = 0, len = types.length; i < len; i++) {
+                       removeOne(obj, types[i], fn, context);
+               }
+       } else {
+               for (var j in obj[eventsKey]) {
+                       removeOne(obj, j, obj[eventsKey][j]);
                }
+               delete obj[eventsKey];
+       }
 
-               L.DomEvent.addListener(container, 'scroll', this._onScroll, this);
-               this._containerId = L.Util.stamp(container);
-       },
+       return this;
+}
 
-       _initLayout: function () {
-               var container = this._container;
+function addOne(obj, type, fn, context) {
+       var id = type + stamp(fn) + (context ? '_' + stamp(context) : '');
 
-               this._fadeAnimated = this.options.fadeAnimation && L.Browser.any3d;
+       if (obj[eventsKey] && obj[eventsKey][id]) { return this; }
 
-               L.DomUtil.addClass(container, 'leaflet-container' +
-                       (L.Browser.touch ? ' leaflet-touch' : '') +
-                       (L.Browser.retina ? ' leaflet-retina' : '') +
-                       (L.Browser.ielt9 ? ' leaflet-oldie' : '') +
-                       (L.Browser.safari ? ' leaflet-safari' : '') +
-                       (this._fadeAnimated ? ' leaflet-fade-anim' : ''));
+       var handler = function (e) {
+               return fn.call(context || obj, e || window.event);
+       };
 
-               var position = L.DomUtil.getStyle(container, 'position');
+       var originalHandler = handler;
 
-               if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') {
-                       container.style.position = 'relative';
-               }
+       if (pointer && type.indexOf('touch') === 0) {
+               // Needs DomEvent.Pointer.js
+               addPointerListener(obj, type, handler, id);
 
-               this._initPanes();
+       } else if (touch && (type === 'dblclick') && addDoubleTapListener &&
+                  !(pointer && chrome)) {
+               // Chrome >55 does not need the synthetic dblclicks from addDoubleTapListener
+               // See #5180
+               addDoubleTapListener(obj, handler, id);
 
-               if (this._initControlPos) {
-                       this._initControlPos();
-               }
-       },
+       } else if ('addEventListener' in obj) {
 
-       _initPanes: function () {
-               var panes = this._panes = {};
-               this._paneRenderers = {};
+               if (type === 'mousewheel') {
+                       obj.addEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
 
-               // @section
-               //
-               // Panes are DOM elements used to control the ordering of layers on the map. You
-               // can access panes with [`map.getPane`](#map-getpane) or
-               // [`map.getPanes`](#map-getpanes) methods. New panes can be created with the
-               // [`map.createPane`](#map-createpane) method.
-               //
-               // Every map has the following default panes that differ only in zIndex.
-               //
-               // @pane mapPane: HTMLElement = 'auto'
-               // Pane that contains all other map panes
+               } else if ((type === 'mouseenter') || (type === 'mouseleave')) {
+                       handler = function (e) {
+                               e = e || window.event;
+                               if (isExternalTarget(obj, e)) {
+                                       originalHandler(e);
+                               }
+                       };
+                       obj.addEventListener(type === 'mouseenter' ? 'mouseover' : 'mouseout', handler, false);
 
-               this._mapPane = this.createPane('mapPane', this._container);
-               L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
+               } else {
+                       if (type === 'click' && android) {
+                               handler = function (e) {
+                                       filterClick(e, originalHandler);
+                               };
+                       }
+                       obj.addEventListener(type, handler, false);
+               }
 
-               // @pane tilePane: HTMLElement = 200
-               // Pane for `GridLayer`s and `TileLayer`s
-               this.createPane('tilePane');
-               // @pane overlayPane: HTMLElement = 400
-               // Pane for vector overlays (`Path`s), like `Polyline`s and `Polygon`s
-               this.createPane('shadowPane');
-               // @pane shadowPane: HTMLElement = 500
-               // Pane for overlay shadows (e.g. `Marker` shadows)
-               this.createPane('overlayPane');
-               // @pane markerPane: HTMLElement = 600
-               // Pane for `Icon`s of `Marker`s
-               this.createPane('markerPane');
-               // @pane tooltipPane: HTMLElement = 650
-               // Pane for tooltip.
-               this.createPane('tooltipPane');
-               // @pane popupPane: HTMLElement = 700
-               // Pane for `Popup`s.
-               this.createPane('popupPane');
+       } else if ('attachEvent' in obj) {
+               obj.attachEvent('on' + type, handler);
+       }
 
-               if (!this.options.markerZoomAnimation) {
-                       L.DomUtil.addClass(panes.markerPane, 'leaflet-zoom-hide');
-                       L.DomUtil.addClass(panes.shadowPane, 'leaflet-zoom-hide');
-               }
-       },
+       obj[eventsKey] = obj[eventsKey] || {};
+       obj[eventsKey][id] = handler;
+}
 
+function removeOne(obj, type, fn, context) {
 
-       // private methods that modify map state
+       var id = type + stamp(fn) + (context ? '_' + stamp(context) : ''),
+           handler = obj[eventsKey] && obj[eventsKey][id];
 
-       // @section Map state change events
-       _resetView: function (center, zoom) {
-               L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
+       if (!handler) { return this; }
 
-               var loading = !this._loaded;
-               this._loaded = true;
-               zoom = this._limitZoom(zoom);
+       if (pointer && type.indexOf('touch') === 0) {
+               removePointerListener(obj, type, id);
 
-               this.fire('viewprereset');
+       } else if (touch && (type === 'dblclick') && removeDoubleTapListener &&
+                  !(pointer && chrome)) {
+               removeDoubleTapListener(obj, id);
 
-               var zoomChanged = this._zoom !== zoom;
-               this
-                       ._moveStart(zoomChanged)
-                       ._move(center, zoom)
-                       ._moveEnd(zoomChanged);
+       } else if ('removeEventListener' in obj) {
 
-               // @event viewreset: Event
-               // Fired when the map needs to redraw its content (this usually happens
-               // on map zoom or load). Very useful for creating custom overlays.
-               this.fire('viewreset');
+               if (type === 'mousewheel') {
+                       obj.removeEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
 
-               // @event load: Event
-               // Fired when the map is initialized (when its center and zoom are set
-               // for the first time).
-               if (loading) {
-                       this.fire('load');
+               } else {
+                       obj.removeEventListener(
+                               type === 'mouseenter' ? 'mouseover' :
+                               type === 'mouseleave' ? 'mouseout' : type, handler, false);
                }
-       },
 
-       _moveStart: function (zoomChanged) {
-               // @event zoomstart: Event
-               // Fired when the map zoom is about to change (e.g. before zoom animation).
-               // @event movestart: Event
-               // Fired when the view of the map starts changing (e.g. user starts dragging the map).
-               if (zoomChanged) {
-                       this.fire('zoomstart');
-               }
-               return this.fire('movestart');
-       },
+       } else if ('detachEvent' in obj) {
+               obj.detachEvent('on' + type, handler);
+       }
 
-       _move: function (center, zoom, data) {
-               if (zoom === undefined) {
-                       zoom = this._zoom;
-               }
-               var zoomChanged = this._zoom !== zoom;
+       obj[eventsKey][id] = null;
+}
 
-               this._zoom = zoom;
-               this._lastCenter = center;
-               this._pixelOrigin = this._getNewPixelOrigin(center);
+// @function stopPropagation(ev: DOMEvent): this
+// Stop the given event from propagation to parent elements. Used inside the listener functions:
+// ```js
+// L.DomEvent.on(div, 'click', function (ev) {
+//     L.DomEvent.stopPropagation(ev);
+// });
+// ```
+function stopPropagation(e) {
 
-               // @event zoom: Event
-               // Fired repeatedly during any change in zoom level, including zoom
-               // and fly animations.
-               if (zoomChanged || (data && data.pinch)) {      // Always fire 'zoom' if pinching because #3530
-                       this.fire('zoom', data);
-               }
+       if (e.stopPropagation) {
+               e.stopPropagation();
+       } else if (e.originalEvent) {  // In case of Leaflet event.
+               e.originalEvent._stopped = true;
+       } else {
+               e.cancelBubble = true;
+       }
+       skipped(e);
 
-               // @event move: Event
-               // Fired repeatedly during any movement of the map, including pan and
-               // fly animations.
-               return this.fire('move', data);
-       },
+       return this;
+}
 
-       _moveEnd: function (zoomChanged) {
-               // @event zoomend: Event
-               // Fired when the map has changed, after any animations.
-               if (zoomChanged) {
-                       this.fire('zoomend');
-               }
+// @function disableScrollPropagation(el: HTMLElement): this
+// Adds `stopPropagation` to the element's `'mousewheel'` events (plus browser variants).
+function disableScrollPropagation(el) {
+       addOne(el, 'mousewheel', stopPropagation);
+       return this;
+}
 
-               // @event moveend: Event
-               // Fired when the center of the map stops changing (e.g. user stopped
-               // dragging the map).
-               return this.fire('moveend');
-       },
+// @function disableClickPropagation(el: HTMLElement): this
+// Adds `stopPropagation` to the element's `'click'`, `'doubleclick'`,
+// `'mousedown'` and `'touchstart'` events (plus browser variants).
+function disableClickPropagation(el) {
+       on(el, 'mousedown touchstart dblclick', stopPropagation);
+       addOne(el, 'click', fakeStop);
+       return this;
+}
 
-       _stop: function () {
-               L.Util.cancelAnimFrame(this._flyToFrame);
-               if (this._panAnim) {
-                       this._panAnim.stop();
-               }
-               return this;
-       },
+// @function preventDefault(ev: DOMEvent): this
+// Prevents the default action of the DOM Event `ev` from happening (such as
+// following a link in the href of the a element, or doing a POST request
+// with page reload when a `<form>` is submitted).
+// Use it inside listener functions.
+function preventDefault(e) {
+       if (e.preventDefault) {
+               e.preventDefault();
+       } else {
+               e.returnValue = false;
+       }
+       return this;
+}
 
-       _rawPanBy: function (offset) {
-               L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
-       },
+// @function stop(ev: DOMEvent): this
+// Does `stopPropagation` and `preventDefault` at the same time.
+function stop(e) {
+       preventDefault(e);
+       stopPropagation(e);
+       return this;
+}
 
-       _getZoomSpan: function () {
-               return this.getMaxZoom() - this.getMinZoom();
-       },
+// @function getMousePosition(ev: DOMEvent, container?: HTMLElement): Point
+// Gets normalized mouse position from a DOM event relative to the
+// `container` (border excluded) or to the whole page if not specified.
+function getMousePosition(e, container) {
+       if (!container) {
+               return new Point(e.clientX, e.clientY);
+       }
 
-       _panInsideMaxBounds: function () {
-               if (!this._enforcingBounds) {
-                       this.panInsideBounds(this.options.maxBounds);
-               }
-       },
+       var scale = getScale(container),
+           offset = scale.boundingClientRect; // left and top  values are in page scale (like the event clientX/Y)
 
-       _checkIfLoaded: function () {
-               if (!this._loaded) {
-                       throw new Error('Set map center and zoom first.');
-               }
-       },
+       return new Point(
+               // offset.left/top values are in page scale (like clientX/Y),
+               // whereas clientLeft/Top (border width) values are the original values (before CSS scale applies).
+               (e.clientX - offset.left) / scale.x - container.clientLeft,
+               (e.clientY - offset.top) / scale.y - container.clientTop
+       );
+}
 
-       // DOM event handling
+// Chrome on Win scrolls double the pixels as in other platforms (see #4538),
+// and Firefox scrolls device pixels, not CSS pixels
+var wheelPxFactor =
+       (win && chrome) ? 2 * window.devicePixelRatio :
+       gecko ? window.devicePixelRatio : 1;
+
+// @function getWheelDelta(ev: DOMEvent): Number
+// Gets normalized wheel delta from a mousewheel DOM event, in vertical
+// pixels scrolled (negative if scrolling down).
+// Events from pointing devices without precise scrolling are mapped to
+// a best guess of 60 pixels.
+function getWheelDelta(e) {
+       return (edge) ? e.wheelDeltaY / 2 : // Don't trust window-geometry-based delta
+              (e.deltaY && e.deltaMode === 0) ? -e.deltaY / wheelPxFactor : // Pixels
+              (e.deltaY && e.deltaMode === 1) ? -e.deltaY * 20 : // Lines
+              (e.deltaY && e.deltaMode === 2) ? -e.deltaY * 60 : // Pages
+              (e.deltaX || e.deltaZ) ? 0 :     // Skip horizontal/depth wheel events
+              e.wheelDelta ? (e.wheelDeltaY || e.wheelDelta) / 2 : // Legacy IE pixels
+              (e.detail && Math.abs(e.detail) < 32765) ? -e.detail * 20 : // Legacy Moz lines
+              e.detail ? e.detail / -32765 * 60 : // Legacy Moz pages
+              0;
+}
 
-       // @section Interaction events
-       _initEvents: function (remove) {
-               if (!L.DomEvent) { return; }
+var skipEvents = {};
 
-               this._targets = {};
-               this._targets[L.stamp(this._container)] = this;
+function fakeStop(e) {
+       // fakes stopPropagation by setting a special event flag, checked/reset with skipped(e)
+       skipEvents[e.type] = true;
+}
 
-               var onOff = remove ? 'off' : 'on';
+function skipped(e) {
+       var events = skipEvents[e.type];
+       // reset when checking, as it's only used in map container and propagates outside of the map
+       skipEvents[e.type] = false;
+       return events;
+}
 
-               // @event click: MouseEvent
-               // Fired when the user clicks (or taps) the map.
-               // @event dblclick: MouseEvent
-               // Fired when the user double-clicks (or double-taps) the map.
-               // @event mousedown: MouseEvent
-               // Fired when the user pushes the mouse button on the map.
-               // @event mouseup: MouseEvent
-               // Fired when the user releases the mouse button on the map.
-               // @event mouseover: MouseEvent
-               // Fired when the mouse enters the map.
-               // @event mouseout: MouseEvent
-               // Fired when the mouse leaves the map.
-               // @event mousemove: MouseEvent
-               // Fired while the mouse moves over the map.
-               // @event contextmenu: MouseEvent
-               // Fired when the user pushes the right mouse button on the map, prevents
-               // default browser context menu from showing if there are listeners on
-               // this event. Also fired on mobile when the user holds a single touch
-               // for a second (also called long press).
-               // @event keypress: KeyboardEvent
-               // Fired when the user presses a key from the keyboard while the map is focused.
-               L.DomEvent[onOff](this._container, 'click dblclick mousedown mouseup ' +
-                       'mouseover mouseout mousemove contextmenu keypress', this._handleDOMEvent, this);
+// check if element really left/entered the event target (for mouseenter/mouseleave)
+function isExternalTarget(el, e) {
 
-               if (this.options.trackResize) {
-                       L.DomEvent[onOff](window, 'resize', this._onResize, this);
-               }
+       var related = e.relatedTarget;
 
-               if (L.Browser.any3d && this.options.transform3DLimit) {
-                       this[onOff]('moveend', this._onMoveEnd);
+       if (!related) { return true; }
+
+       try {
+               while (related && (related !== el)) {
+                       related = related.parentNode;
                }
-       },
+       } catch (err) {
+               return false;
+       }
+       return (related !== el);
+}
 
-       _onResize: function () {
-               L.Util.cancelAnimFrame(this._resizeRequest);
-               this._resizeRequest = L.Util.requestAnimFrame(
-                       function () { this.invalidateSize({debounceMoveend: true}); }, this);
-       },
+var lastClick;
 
-       _onScroll: function () {
-               this._container.scrollTop  = 0;
-               this._container.scrollLeft = 0;
-       },
+// this is a horrible workaround for a bug in Android where a single touch triggers two click events
+function filterClick(e, handler) {
+       var timeStamp = (e.timeStamp || (e.originalEvent && e.originalEvent.timeStamp)),
+           elapsed = lastClick && (timeStamp - lastClick);
 
-       _onMoveEnd: function () {
-               var pos = this._getMapPanePos();
-               if (Math.max(Math.abs(pos.x), Math.abs(pos.y)) >= this.options.transform3DLimit) {
-                       // https://bugzilla.mozilla.org/show_bug.cgi?id=1203873 but Webkit also have
-                       // a pixel offset on very high values, see: http://jsfiddle.net/dg6r5hhb/
-                       this._resetView(this.getCenter(), this.getZoom());
-               }
-       },
+       // are they closer together than 500ms 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
 
-       _findEventTargets: function (e, type) {
-               var targets = [],
-                   target,
-                   isHover = type === 'mouseout' || type === 'mouseover',
-                   src = e.target || e.srcElement,
-                   dragging = false;
+       if ((elapsed && elapsed > 100 && elapsed < 500) || (e.target._simulatedClick && !e._simulated)) {
+               stop(e);
+               return;
+       }
+       lastClick = timeStamp;
 
-               while (src) {
-                       target = this._targets[L.stamp(src)];
-                       if (target && (type === 'click' || type === 'preclick') && !e._simulated && this._draggableMoved(target)) {
-                               // Prevent firing click after you just dragged an object.
-                               dragging = true;
-                               break;
-                       }
-                       if (target && target.listens(type, true)) {
-                               if (isHover && !L.DomEvent._isExternalTarget(src, e)) { break; }
-                               targets.push(target);
-                               if (isHover) { break; }
-                       }
-                       if (src === this._container) { break; }
-                       src = src.parentNode;
-               }
-               if (!targets.length && !dragging && !isHover && L.DomEvent._isExternalTarget(src, e)) {
-                       targets = [this];
-               }
-               return targets;
-       },
-
-       _handleDOMEvent: function (e) {
-               if (!this._loaded || L.DomEvent._skipped(e)) { return; }
-
-               var type = e.type === 'keypress' && e.keyCode === 13 ? 'click' : e.type;
+       handler(e);
+}
 
-               if (type === 'mousedown') {
-                       // prevents outline when clicking on keyboard-focusable element
-                       L.DomUtil.preventOutline(e.target || e.srcElement);
-               }
 
-               this._fireDOMEvent(e, type);
-       },
 
-       _fireDOMEvent: function (e, type, targets) {
 
-               if (e.type === 'click') {
-                       // Fire a synthetic 'preclick' event which propagates up (mainly for closing popups).
-                       // @event preclick: MouseEvent
-                       // Fired before mouse click on the map (sometimes useful when you
-                       // want something to happen on click before any existing click
-                       // handlers start running).
-                       var synth = L.Util.extend({}, e);
-                       synth.type = 'preclick';
-                       this._fireDOMEvent(synth, synth.type, targets);
-               }
+var DomEvent = (Object.freeze || Object)({
+       on: on,
+       off: off,
+       stopPropagation: stopPropagation,
+       disableScrollPropagation: disableScrollPropagation,
+       disableClickPropagation: disableClickPropagation,
+       preventDefault: preventDefault,
+       stop: stop,
+       getMousePosition: getMousePosition,
+       getWheelDelta: getWheelDelta,
+       fakeStop: fakeStop,
+       skipped: skipped,
+       isExternalTarget: isExternalTarget,
+       addListener: on,
+       removeListener: off
+});
 
-               if (e._stopped) { return; }
+/*
+ * @class PosAnimation
+ * @aka L.PosAnimation
+ * @inherits Evented
+ * Used internally for panning animations, utilizing CSS3 Transitions for modern browsers and a timer fallback for IE6-9.
+ *
+ * @example
+ * ```js
+ * var fx = new L.PosAnimation();
+ * fx.run(el, [300, 500], 0.5);
+ * ```
+ *
+ * @constructor L.PosAnimation()
+ * Creates a `PosAnimation` object.
+ *
+ */
 
-               // Find the layer the event is propagating from and its parents.
-               targets = (targets || []).concat(this._findEventTargets(e, type));
+var PosAnimation = Evented.extend({
 
-               if (!targets.length) { return; }
+       // @method run(el: HTMLElement, newPos: Point, duration?: Number, easeLinearity?: Number)
+       // Run an animation of a given element to a new position, optionally setting
+       // duration in seconds (`0.25` by default) and easing linearity factor (3rd
+       // argument of the [cubic bezier curve](http://cubic-bezier.com/#0,0,.5,1),
+       // `0.5` by default).
+       run: function (el, newPos, duration, easeLinearity) {
+               this.stop();
 
-               var target = targets[0];
-               if (type === 'contextmenu' && target.listens(type, true)) {
-                       L.DomEvent.preventDefault(e);
-               }
+               this._el = el;
+               this._inProgress = true;
+               this._duration = duration || 0.25;
+               this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
 
-               var data = {
-                       originalEvent: e
-               };
+               this._startPos = getPosition(el);
+               this._offset = newPos.subtract(this._startPos);
+               this._startTime = +new Date();
 
-               if (e.type !== 'keypress') {
-                       var isMarker = target instanceof L.Marker;
-                       data.containerPoint = isMarker ?
-                                       this.latLngToContainerPoint(target.getLatLng()) : this.mouseEventToContainerPoint(e);
-                       data.layerPoint = this.containerPointToLayerPoint(data.containerPoint);
-                       data.latlng = isMarker ? target.getLatLng() : this.layerPointToLatLng(data.layerPoint);
-               }
+               // @event start: Event
+               // Fired when the animation starts
+               this.fire('start');
 
-               for (var i = 0; i < targets.length; i++) {
-                       targets[i].fire(type, data, true);
-                       if (data.originalEvent._stopped ||
-                               (targets[i].options.nonBubblingEvents && L.Util.indexOf(targets[i].options.nonBubblingEvents, type) !== -1)) { return; }
-               }
+               this._animate();
        },
 
-       _draggableMoved: function (obj) {
-               obj = obj.dragging && obj.dragging.enabled() ? obj : this;
-               return (obj.dragging && obj.dragging.moved()) || (this.boxZoom && this.boxZoom.moved());
+       // @method stop()
+       // Stops the animation (if currently running).
+       stop: function () {
+               if (!this._inProgress) { return; }
+
+               this._step(true);
+               this._complete();
        },
 
-       _clearHandlers: function () {
-               for (var i = 0, len = this._handlers.length; i < len; i++) {
-                       this._handlers[i].disable();
-               }
+       _animate: function () {
+               // animation loop
+               this._animId = requestAnimFrame(this._animate, this);
+               this._step();
        },
 
-       // @section Other Methods
+       _step: function (round) {
+               var elapsed = (+new Date()) - this._startTime,
+                   duration = this._duration * 1000;
 
-       // @method whenReady(fn: Function, context?: Object): this
-       // Runs the given function `fn` when the map gets initialized with
-       // a view (center and zoom) and at least one layer, or immediately
-       // if it's already initialized, optionally passing a function context.
-       whenReady: function (callback, context) {
-               if (this._loaded) {
-                       callback.call(context || this, {target: this});
+               if (elapsed < duration) {
+                       this._runFrame(this._easeOut(elapsed / duration), round);
                } else {
-                       this.on('load', callback, context);
+                       this._runFrame(1);
+                       this._complete();
                }
-               return this;
-       },
-
-
-       // private methods for getting map state
-
-       _getMapPanePos: function () {
-               return L.DomUtil.getPosition(this._mapPane) || new L.Point(0, 0);
-       },
-
-       _moved: function () {
-               var pos = this._getMapPanePos();
-               return pos && !pos.equals([0, 0]);
-       },
-
-       _getTopLeftPoint: function (center, zoom) {
-               var pixelOrigin = center && zoom !== undefined ?
-                       this._getNewPixelOrigin(center, zoom) :
-                       this.getPixelOrigin();
-               return pixelOrigin.subtract(this._getMapPanePos());
-       },
-
-       _getNewPixelOrigin: function (center, zoom) {
-               var viewHalf = this.getSize()._divideBy(2);
-               return this.project(center, zoom)._subtract(viewHalf)._add(this._getMapPanePos())._round();
-       },
-
-       _latLngToNewLayerPoint: function (latlng, zoom, center) {
-               var topLeft = this._getNewPixelOrigin(center, zoom);
-               return this.project(latlng, zoom)._subtract(topLeft);
-       },
-
-       // layer point of the current center
-       _getCenterLayerPoint: function () {
-               return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
-       },
-
-       // 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);
-
-               // If offset is less than a pixel, ignore.
-               // This prevents unstable projections from getting into
-               // an infinite loop of tiny offsets.
-               if (offset.round().equals([0, 0])) {
-                       return center;
+       _runFrame: function (progress, round) {
+               var pos = this._startPos.add(this._offset.multiplyBy(progress));
+               if (round) {
+                       pos._round();
                }
+               setPosition(this._el, pos);
 
-               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));
+               // @event step: Event
+               // Fired continuously during the animation.
+               this.fire('step');
        },
 
-       // returns offset needed for pxBounds to get inside maxBounds at a specified zoom
-       _getBoundsOffset: function (pxBounds, maxBounds, zoom) {
-               var projectedMaxBounds = L.bounds(
-                       this.project(maxBounds.getNorthEast(), zoom),
-                       this.project(maxBounds.getSouthWest(), zoom)
-                   ),
-                   minOffset = projectedMaxBounds.min.subtract(pxBounds.min),
-                   maxOffset = projectedMaxBounds.max.subtract(pxBounds.max),
-
-                   dx = this._rebound(minOffset.x, -maxOffset.x),
-                   dy = this._rebound(minOffset.y, -maxOffset.y);
-
-               return new L.Point(dx, dy);
-       },
+       _complete: function () {
+               cancelAnimFrame(this._animId);
 
-       _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));
+               this._inProgress = false;
+               // @event end: Event
+               // Fired when the animation ends.
+               this.fire('end');
        },
 
-       _limitZoom: function (zoom) {
-               var min = this.getMinZoom(),
-                   max = this.getMaxZoom(),
-                   snap = L.Browser.any3d ? this.options.zoomSnap : 1;
-               if (snap) {
-                       zoom = Math.round(zoom / snap) * snap;
-               }
-               return Math.max(min, Math.min(max, zoom));
+       _easeOut: function (t) {
+               return 1 - Math.pow(1 - t, this._easeOutPower);
        }
 });
 
-// @section
-
-// @factory L.map(id: String, options?: Map options)
-// Instantiates a map object given the DOM ID of a `<div>` element
-// and optionally an object literal with `Map options`.
-//
-// @alternative
-// @factory L.map(el: HTMLElement, options?: Map options)
-// Instantiates a map object given an instance of a `<div>` HTML element
-// and optionally an object literal with `Map options`.
-L.map = function (id, options) {
-       return new L.Map(id, options);
-};
-
-
-
-
 /*
- * @class Layer
+ * @class Map
+ * @aka L.Map
  * @inherits Evented
- * @aka L.Layer
- * @aka ILayer
  *
- * A set of methods from the Layer base class that all Leaflet layers use.
- * Inherits all methods, options and events from `L.Evented`.
+ * The central class of the API — it is used to create a map on a page and manipulate it.
  *
  * @example
  *
  * ```js
- * var layer = L.Marker(latlng).addTo(map);
- * layer.addTo(map);
- * layer.remove();
+ * // initialize the map on the "map" div with a given center and zoom
+ * var map = L.map('map', {
+ *     center: [51.505, -0.09],
+ *     zoom: 13
+ * });
  * ```
  *
- * @event add: Event
- * Fired after the layer is added to a map
- *
- * @event remove: Event
- * Fired after the layer is removed from a map
  */
 
+var Map = Evented.extend({
 
-L.Layer = L.Evented.extend({
-
-       // Classes extending `L.Layer` will inherit the following options:
        options: {
-               // @option pane: String = 'overlayPane'
-               // By default the layer will be added to the map's [overlay pane](#map-overlaypane). Overriding this option will cause the layer to be placed on another pane by default.
-               pane: 'overlayPane',
-               nonBubblingEvents: []  // Array of events that should not be bubbled to DOM parents (like the map)
-       },
-
-       /* @section
-        * Classes extending `L.Layer` will inherit the following methods:
-        *
-        * @method addTo(map: Map): this
-        * Adds the layer to the given map
-        */
-       addTo: function (map) {
-               map.addLayer(this);
-               return this;
-       },
+               // @section Map State Options
+               // @option crs: CRS = L.CRS.EPSG3857
+               // The [Coordinate Reference System](#crs) to use. Don't change this if you're not
+               // sure what it means.
+               crs: EPSG3857,
 
-       // @method remove: this
-       // Removes the layer from the map it is currently active on.
-       remove: function () {
-               return this.removeFrom(this._map || this._mapToAdd);
-       },
+               // @option center: LatLng = undefined
+               // Initial geographic center of the map
+               center: undefined,
 
-       // @method removeFrom(map: Map): this
-       // Removes the layer from the given map
-       removeFrom: function (obj) {
-               if (obj) {
-                       obj.removeLayer(this);
-               }
-               return this;
-       },
+               // @option zoom: Number = undefined
+               // Initial map zoom level
+               zoom: undefined,
 
-       // @method getPane(name? : String): HTMLElement
-       // Returns the `HTMLElement` representing the named pane on the map. If `name` is omitted, returns the pane for this layer.
-       getPane: function (name) {
-               return this._map.getPane(name ? (this.options[name] || name) : this.options.pane);
-       },
+               // @option minZoom: Number = *
+               // Minimum zoom level of the map.
+               // If not specified and at least one `GridLayer` or `TileLayer` is in the map,
+               // the lowest of their `minZoom` options will be used instead.
+               minZoom: undefined,
 
-       addInteractiveTarget: function (targetEl) {
-               this._map._targets[L.stamp(targetEl)] = this;
-               return this;
-       },
+               // @option maxZoom: Number = *
+               // Maximum zoom level of the map.
+               // If not specified and at least one `GridLayer` or `TileLayer` is in the map,
+               // the highest of their `maxZoom` options will be used instead.
+               maxZoom: undefined,
 
-       removeInteractiveTarget: function (targetEl) {
-               delete this._map._targets[L.stamp(targetEl)];
-               return this;
-       },
+               // @option layers: Layer[] = []
+               // Array of layers that will be added to the map initially
+               layers: [],
 
-       _layerAdd: function (e) {
-               var map = e.target;
+               // @option maxBounds: LatLngBounds = null
+               // When this option is set, the map restricts the view to the given
+               // geographical bounds, bouncing the user back if the user tries to pan
+               // outside the view. To set the restriction dynamically, use
+               // [`setMaxBounds`](#map-setmaxbounds) method.
+               maxBounds: undefined,
 
-               // check in case layer gets added and then removed before the map is ready
-               if (!map.hasLayer(this)) { return; }
+               // @option renderer: Renderer = *
+               // The default method for drawing vector layers on the map. `L.SVG`
+               // or `L.Canvas` by default depending on browser support.
+               renderer: undefined,
 
-               this._map = map;
-               this._zoomAnimated = map._zoomAnimated;
 
-               if (this.getEvents) {
-                       var events = this.getEvents();
-                       map.on(events, this);
-                       this.once('remove', function () {
-                               map.off(events, this);
-                       }, this);
-               }
+               // @section Animation Options
+               // @option zoomAnimation: Boolean = true
+               // Whether the map zoom animation is enabled. By default it's enabled
+               // in all browsers that support CSS3 Transitions except Android.
+               zoomAnimation: true,
 
-               this.onAdd(map);
+               // @option zoomAnimationThreshold: Number = 4
+               // Won't animate zoom if the zoom difference exceeds this value.
+               zoomAnimationThreshold: 4,
 
-               if (this.getAttribution && this._map.attributionControl) {
-                       this._map.attributionControl.addAttribution(this.getAttribution());
-               }
+               // @option fadeAnimation: Boolean = true
+               // Whether the tile fade animation is enabled. By default it's enabled
+               // in all browsers that support CSS3 Transitions except Android.
+               fadeAnimation: true,
 
-               this.fire('add');
-               map.fire('layeradd', {layer: this});
-       }
-});
+               // @option markerZoomAnimation: Boolean = true
+               // Whether markers animate their zoom with the zoom animation, if disabled
+               // they will disappear for the length of the animation. By default it's
+               // enabled in all browsers that support CSS3 Transitions except Android.
+               markerZoomAnimation: true,
 
-/* @section Extension methods
- * @uninheritable
- *
- * Every layer should extend from `L.Layer` and (re-)implement the following methods.
- *
- * @method onAdd(map: Map): this
- * Should contain code that creates DOM elements for the layer, adds them to `map panes` where they should belong and puts listeners on relevant map events. Called on [`map.addLayer(layer)`](#map-addlayer).
- *
- * @method onRemove(map: Map): this
- * Should contain all clean up code that removes the layer's elements from the DOM and removes listeners previously added in [`onAdd`](#layer-onadd). Called on [`map.removeLayer(layer)`](#map-removelayer).
- *
- * @method getEvents(): Object
- * This optional method should return an object like `{ viewreset: this._reset }` for [`addEventListener`](#evented-addeventlistener). The event handlers in this object will be automatically added and removed from the map with your layer.
- *
- * @method getAttribution(): String
- * This optional method should return a string containing HTML to be shown on the `Attribution control` whenever the layer is visible.
- *
- * @method beforeAdd(map: Map): this
- * Optional method. Called on [`map.addLayer(layer)`](#map-addlayer), before the layer is added to the map, before events are initialized, without waiting until the map is in a usable state. Use for early initialization only.
- */
+               // @option transform3DLimit: Number = 2^23
+               // Defines the maximum size of a CSS translation transform. The default
+               // value should not be changed unless a web browser positions layers in
+               // the wrong place after doing a large `panBy`.
+               transform3DLimit: 8388608, // Precision limit of a 32-bit float
 
+               // @section Interaction Options
+               // @option zoomSnap: Number = 1
+               // Forces the map's zoom level to always be a multiple of this, particularly
+               // right after a [`fitBounds()`](#map-fitbounds) or a pinch-zoom.
+               // By default, the zoom level snaps to the nearest integer; lower values
+               // (e.g. `0.5` or `0.1`) allow for greater granularity. A value of `0`
+               // means the zoom level will not be snapped after `fitBounds` or a pinch-zoom.
+               zoomSnap: 1,
 
-/* @namespace Map
- * @section Layer events
- *
- * @event layeradd: LayerEvent
- * Fired when a new layer is added to the map.
- *
- * @event layerremove: LayerEvent
- * Fired when some layer is removed from the map
- *
- * @section Methods for Layers and Controls
- */
-L.Map.include({
-       // @method addLayer(layer: Layer): this
-       // Adds the given layer to the map
-       addLayer: function (layer) {
-               var id = L.stamp(layer);
-               if (this._layers[id]) { return this; }
-               this._layers[id] = layer;
+               // @option zoomDelta: Number = 1
+               // Controls how much the map's zoom level will change after a
+               // [`zoomIn()`](#map-zoomin), [`zoomOut()`](#map-zoomout), pressing `+`
+               // or `-` on the keyboard, or using the [zoom controls](#control-zoom).
+               // Values smaller than `1` (e.g. `0.5`) allow for greater granularity.
+               zoomDelta: 1,
 
-               layer._mapToAdd = this;
+               // @option trackResize: Boolean = true
+               // Whether the map automatically handles browser window resize to update itself.
+               trackResize: true
+       },
 
-               if (layer.beforeAdd) {
-                       layer.beforeAdd(this);
-               }
+       initialize: function (id, options) { // (HTMLElement or String, Object)
+               options = setOptions(this, options);
 
-               this.whenReady(layer._layerAdd, layer);
+               // Make sure to assign internal flags at the beginning,
+               // to avoid inconsistent state in some edge cases.
+               this._handlers = [];
+               this._layers = {};
+               this._zoomBoundLayers = {};
+               this._sizeChanged = true;
 
-               return this;
-       },
+               this._initContainer(id);
+               this._initLayout();
 
-       // @method removeLayer(layer: Layer): this
-       // Removes the given layer from the map.
-       removeLayer: function (layer) {
-               var id = L.stamp(layer);
+               // hack for https://github.com/Leaflet/Leaflet/issues/1980
+               this._onResize = bind(this._onResize, this);
 
-               if (!this._layers[id]) { return this; }
+               this._initEvents();
 
-               if (this._loaded) {
-                       layer.onRemove(this);
+               if (options.maxBounds) {
+                       this.setMaxBounds(options.maxBounds);
                }
 
-               if (layer.getAttribution && this.attributionControl) {
-                       this.attributionControl.removeAttribution(layer.getAttribution());
+               if (options.zoom !== undefined) {
+                       this._zoom = this._limitZoom(options.zoom);
                }
 
-               delete this._layers[id];
-
-               if (this._loaded) {
-                       this.fire('layerremove', {layer: layer});
-                       layer.fire('remove');
+               if (options.center && options.zoom !== undefined) {
+                       this.setView(toLatLng(options.center), options.zoom, {reset: true});
                }
 
-               layer._map = layer._mapToAdd = null;
-
-               return this;
-       },
+               this.callInitHooks();
 
-       // @method hasLayer(layer: Layer): Boolean
-       // Returns `true` if the given layer is currently added to the map
-       hasLayer: function (layer) {
-               return !!layer && (L.stamp(layer) in this._layers);
-       },
+               // don't animate on browsers without hardware-accelerated transitions or old Android/Opera
+               this._zoomAnimated = TRANSITION && any3d && !mobileOpera &&
+                               this.options.zoomAnimation;
 
-       /* @method eachLayer(fn: Function, context?: Object): this
-        * Iterates over the layers of the map, optionally specifying context of the iterator function.
-        * ```
-        * map.eachLayer(function(layer){
-        *     layer.bindPopup('Hello');
-        * });
-        * ```
-        */
-       eachLayer: function (method, context) {
-               for (var i in this._layers) {
-                       method.call(context, this._layers[i]);
+               // 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) {
+                       this._createAnimProxy();
+                       on(this._proxy, TRANSITION_END, this._catchTransitionEnd, this);
                }
-               return this;
+
+               this._addLayers(this.options.layers);
        },
 
-       _addLayers: function (layers) {
-               layers = layers ? (L.Util.isArray(layers) ? layers : [layers]) : [];
 
-               for (var i = 0, len = layers.length; i < len; i++) {
-                       this.addLayer(layers[i]);
-               }
-       },
+       // @section Methods for modifying map state
 
-       _addZoomLimit: function (layer) {
-               if (isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom)) {
-                       this._zoomBoundLayers[L.stamp(layer)] = layer;
-                       this._updateZoomLevels();
-               }
-       },
+       // @method setView(center: LatLng, zoom: Number, options?: Zoom/pan options): this
+       // Sets the view of the map (geographical center and zoom) with the given
+       // animation options.
+       setView: function (center, zoom, options) {
 
-       _removeZoomLimit: function (layer) {
-               var id = L.stamp(layer);
+               zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom);
+               center = this._limitCenter(toLatLng(center), zoom, this.options.maxBounds);
+               options = options || {};
 
-               if (this._zoomBoundLayers[id]) {
-                       delete this._zoomBoundLayers[id];
-                       this._updateZoomLevels();
-               }
-       },
+               this._stop();
 
-       _updateZoomLevels: function () {
-               var minZoom = Infinity,
-                   maxZoom = -Infinity,
-                   oldZoomSpan = this._getZoomSpan();
+               if (this._loaded && !options.reset && options !== true) {
 
-               for (var i in this._zoomBoundLayers) {
-                       var options = this._zoomBoundLayers[i].options;
+                       if (options.animate !== undefined) {
+                               options.zoom = extend({animate: options.animate}, options.zoom);
+                               options.pan = extend({animate: options.animate, duration: options.duration}, options.pan);
+                       }
 
-                       minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom);
-                       maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom);
+                       // try animating pan or zoom
+                       var moved = (this._zoom !== zoom) ?
+                               this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) :
+                               this._tryAnimatedPan(center, options.pan);
+
+                       if (moved) {
+                               // prevent resize handler call, the view will refresh after animation anyway
+                               clearTimeout(this._sizeTimer);
+                               return this;
+                       }
                }
 
-               this._layersMaxZoom = maxZoom === -Infinity ? undefined : maxZoom;
-               this._layersMinZoom = minZoom === Infinity ? undefined : minZoom;
+               // animation didn't start, just reset the map view
+               this._resetView(center, zoom);
 
-               // @section Map state change events
-               // @event zoomlevelschange: Event
-               // Fired when the number of zoomlevels on the map is changed due
-               // to adding or removing a layer.
-               if (oldZoomSpan !== this._getZoomSpan()) {
-                       this.fire('zoomlevelschange');
+               return this;
+       },
+
+       // @method setZoom(zoom: Number, options?: Zoom/pan options): this
+       // Sets the zoom of the map.
+       setZoom: function (zoom, options) {
+               if (!this._loaded) {
+                       this._zoom = zoom;
+                       return this;
                }
-       }
-});
+               return this.setView(this.getCenter(), zoom, {zoom: options});
+       },
 
+       // @method zoomIn(delta?: Number, options?: Zoom options): this
+       // Increases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
+       zoomIn: function (delta, options) {
+               delta = delta || (any3d ? this.options.zoomDelta : 1);
+               return this.setZoom(this._zoom + delta, options);
+       },
 
+       // @method zoomOut(delta?: Number, options?: Zoom options): this
+       // Decreases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default).
+       zoomOut: function (delta, options) {
+               delta = delta || (any3d ? this.options.zoomDelta : 1);
+               return this.setZoom(this._zoom - delta, options);
+       },
 
-/*
- * @namespace Projection
- * @projection L.Projection.Mercator
- *
- * Elliptical Mercator projection — more complex than Spherical Mercator. Takes into account that Earth is a geoid, not a perfect sphere. Used by the EPSG:3395 CRS.
- */
+       // @method setZoomAround(latlng: LatLng, zoom: Number, options: Zoom options): this
+       // Zooms the map while keeping a specified geographical point on the map
+       // stationary (e.g. used internally for scroll zoom and double-click zoom).
+       // @alternative
+       // @method setZoomAround(offset: Point, zoom: Number, options: Zoom options): this
+       // Zooms the map while keeping a specified pixel on the map (relative to the top-left corner) stationary.
+       setZoomAround: function (latlng, zoom, options) {
+               var scale = this.getZoomScale(zoom),
+                   viewHalf = this.getSize().divideBy(2),
+                   containerPoint = latlng instanceof Point ? latlng : this.latLngToContainerPoint(latlng),
 
-L.Projection.Mercator = {
-       R: 6378137,
-       R_MINOR: 6356752.314245179,
+                   centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale),
+                   newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset));
 
-       bounds: L.bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]),
+               return this.setView(newCenter, zoom, {zoom: options});
+       },
 
-       project: function (latlng) {
-               var d = Math.PI / 180,
-                   r = this.R,
-                   y = latlng.lat * d,
-                   tmp = this.R_MINOR / r,
-                   e = Math.sqrt(1 - tmp * tmp),
-                   con = e * Math.sin(y);
+       _getBoundsCenterZoom: function (bounds, options) {
 
-               var ts = Math.tan(Math.PI / 4 - y / 2) / Math.pow((1 - con) / (1 + con), e / 2);
-               y = -r * Math.log(Math.max(ts, 1E-10));
+               options = options || {};
+               bounds = bounds.getBounds ? bounds.getBounds() : toLatLngBounds(bounds);
 
-               return new L.Point(latlng.lng * d * r, y);
-       },
+               var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]),
+                   paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]),
 
-       unproject: function (point) {
-               var d = 180 / Math.PI,
-                   r = this.R,
-                   tmp = this.R_MINOR / r,
-                   e = Math.sqrt(1 - tmp * tmp),
-                   ts = Math.exp(-point.y / r),
-                   phi = Math.PI / 2 - 2 * Math.atan(ts);
+                   zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));
 
-               for (var i = 0, dphi = 0.1, con; i < 15 && Math.abs(dphi) > 1e-7; i++) {
-                       con = e * Math.sin(phi);
-                       con = Math.pow((1 - con) / (1 + con), e / 2);
-                       dphi = Math.PI / 2 - 2 * Math.atan(ts * con) - phi;
-                       phi += dphi;
+               zoom = (typeof options.maxZoom === 'number') ? Math.min(options.maxZoom, zoom) : zoom;
+
+               if (zoom === Infinity) {
+                       return {
+                               center: bounds.getCenter(),
+                               zoom: zoom
+                       };
                }
 
-               return new L.LatLng(phi * d, point.x * d / r);
-       }
-};
+               var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
 
+                   swPoint = this.project(bounds.getSouthWest(), zoom),
+                   nePoint = this.project(bounds.getNorthEast(), zoom),
+                   center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);
 
+               return {
+                       center: center,
+                       zoom: zoom
+               };
+       },
 
-/*
- * @namespace CRS
- * @crs L.CRS.EPSG3395
- *
- * Rarely used by some commercial tile providers. Uses Elliptical Mercator projection.
- */
+       // @method fitBounds(bounds: LatLngBounds, options?: fitBounds options): this
+       // Sets a map view that contains the given geographical bounds with the
+       // maximum zoom level possible.
+       fitBounds: function (bounds, options) {
 
-L.CRS.EPSG3395 = L.extend({}, L.CRS.Earth, {
-       code: 'EPSG:3395',
-       projection: L.Projection.Mercator,
+               bounds = toLatLngBounds(bounds);
 
-       transformation: (function () {
-               var scale = 0.5 / (Math.PI * L.Projection.Mercator.R);
-               return new L.Transformation(scale, 0.5, -scale, 0.5);
-       }())
-});
+               if (!bounds.isValid()) {
+                       throw new Error('Bounds are not valid.');
+               }
 
+               var target = this._getBoundsCenterZoom(bounds, options);
+               return this.setView(target.center, target.zoom, options);
+       },
 
+       // @method fitWorld(options?: fitBounds options): this
+       // Sets a map view that mostly contains the whole world with the maximum
+       // zoom level possible.
+       fitWorld: function (options) {
+               return this.fitBounds([[-90, -180], [90, 180]], options);
+       },
 
-/*
- * @class GridLayer
- * @inherits Layer
- * @aka L.GridLayer
- *
- * Generic class for handling a tiled grid of HTML elements. This is the base class for all tile layers and replaces `TileLayer.Canvas`.
- * GridLayer can be extended to create a tiled grid of HTML elements like `<canvas>`, `<img>` or `<div>`. GridLayer will handle creating and animating these DOM elements for you.
- *
- *
- * @section Synchronous usage
- * @example
- *
- * To create a custom layer, extend GridLayer and implement the `createTile()` method, which will be passed a `Point` object with the `x`, `y`, and `z` (zoom level) coordinates to draw your tile.
- *
- * ```js
- * var CanvasLayer = L.GridLayer.extend({
- *     createTile: function(coords){
- *         // create a <canvas> element for drawing
- *         var tile = L.DomUtil.create('canvas', 'leaflet-tile');
- *
- *         // setup tile width and height according to the options
- *         var size = this.getTileSize();
- *         tile.width = size.x;
- *         tile.height = size.y;
- *
- *         // get a canvas context and draw something on it using coords.x, coords.y and coords.z
- *         var ctx = tile.getContext('2d');
- *
- *         // return the tile so it can be rendered on screen
- *         return tile;
- *     }
- * });
- * ```
- *
- * @section Asynchronous usage
- * @example
- *
- * Tile creation can also be asynchronous, this is useful when using a third-party drawing library. Once the tile is finished drawing it can be passed to the `done()` callback.
- *
- * ```js
- * var CanvasLayer = L.GridLayer.extend({
- *     createTile: function(coords, done){
- *         var error;
- *
- *         // create a <canvas> element for drawing
- *         var tile = L.DomUtil.create('canvas', 'leaflet-tile');
- *
- *         // setup tile width and height according to the options
- *         var size = this.getTileSize();
- *         tile.width = size.x;
- *         tile.height = size.y;
- *
- *         // draw something asynchronously and pass the tile to the done() callback
- *         setTimeout(function() {
- *             done(error, tile);
- *         }, 1000);
- *
- *         return tile;
- *     }
- * });
- * ```
- *
- * @section
- */
+       // @method panTo(latlng: LatLng, options?: Pan options): this
+       // Pans the map to a given center.
+       panTo: function (center, options) { // (LatLng)
+               return this.setView(center, this._zoom, {pan: options});
+       },
 
+       // @method panBy(offset: Point, options?: Pan options): this
+       // Pans the map by a given number of pixels (animated).
+       panBy: function (offset, options) {
+               offset = toPoint(offset).round();
+               options = options || {};
 
-L.GridLayer = L.Layer.extend({
+               if (!offset.x && !offset.y) {
+                       return this.fire('moveend');
+               }
+               // If we pan too far, Chrome gets issues with tiles
+               // and makes them disappear or appear in the wrong place (slightly offset) #2602
+               if (options.animate !== true && !this.getSize().contains(offset)) {
+                       this._resetView(this.unproject(this.project(this.getCenter()).add(offset)), this.getZoom());
+                       return this;
+               }
 
-       // @section
-       // @aka GridLayer options
-       options: {
-               // @option tileSize: Number|Point = 256
-               // Width and height of tiles in the grid. Use a number if width and height are equal, or `L.point(width, height)` otherwise.
-               tileSize: 256,
+               if (!this._panAnim) {
+                       this._panAnim = new PosAnimation();
 
-               // @option opacity: Number = 1.0
-               // Opacity of the tiles. Can be used in the `createTile()` function.
-               opacity: 1,
+                       this._panAnim.on({
+                               'step': this._onPanTransitionStep,
+                               'end': this._onPanTransitionEnd
+                       }, this);
+               }
 
-               // @option updateWhenIdle: Boolean = depends
-               // If `false`, new tiles are loaded during panning, otherwise only after it (for better performance). `true` by default on mobile browsers, otherwise `false`.
-               updateWhenIdle: L.Browser.mobile,
+               // don't fire movestart if animating inertia
+               if (!options.noMoveStart) {
+                       this.fire('movestart');
+               }
 
-               // @option updateWhenZooming: Boolean = true
-               // By default, a smooth zoom animation (during a [touch zoom](#map-touchzoom) or a [`flyTo()`](#map-flyto)) will update grid layers every integer zoom level. Setting this option to `false` will update the grid layer only when the smooth animation ends.
-               updateWhenZooming: true,
+               // animate pan unless animate: false specified
+               if (options.animate !== false) {
+                       addClass(this._mapPane, 'leaflet-pan-anim');
 
-               // @option updateInterval: Number = 200
-               // Tiles will not update more than once every `updateInterval` milliseconds when panning.
-               updateInterval: 200,
+                       var newPos = this._getMapPanePos().subtract(offset).round();
+                       this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity);
+               } else {
+                       this._rawPanBy(offset);
+                       this.fire('move').fire('moveend');
+               }
 
-               // @option attribution: String = null
-               // String to be shown in the attribution control, describes the layer data, e.g. "© Mapbox".
-               attribution: null,
+               return this;
+       },
 
-               // @option zIndex: Number = 1
-               // The explicit zIndex of the tile layer.
-               zIndex: 1,
+       // @method flyTo(latlng: LatLng, zoom?: Number, options?: Zoom/pan options): this
+       // Sets the view of the map (geographical center and zoom) performing a smooth
+       // pan-zoom animation.
+       flyTo: function (targetCenter, targetZoom, options) {
 
-               // @option bounds: LatLngBounds = undefined
-               // If set, tiles will only be loaded inside the set `LatLngBounds`.
-               bounds: null,
+               options = options || {};
+               if (options.animate === false || !any3d) {
+                       return this.setView(targetCenter, targetZoom, options);
+               }
 
-               // @option minZoom: Number = 0
-               // The minimum zoom level that tiles will be loaded at. By default the entire map.
-               minZoom: 0,
+               this._stop();
 
-               // @option maxZoom: Number = undefined
-               // The maximum zoom level that tiles will be loaded at.
-               maxZoom: undefined,
+               var from = this.project(this.getCenter()),
+                   to = this.project(targetCenter),
+                   size = this.getSize(),
+                   startZoom = this._zoom;
 
-               // @option noWrap: Boolean = false
-               // Whether the layer is wrapped around the antimeridian. If `true`, the
-               // GridLayer will only be displayed once at low zoom levels. Has no
-               // effect when the [map CRS](#map-crs) doesn't wrap around.
-               noWrap: false,
+               targetCenter = toLatLng(targetCenter);
+               targetZoom = targetZoom === undefined ? startZoom : targetZoom;
 
-               // @option pane: String = 'tilePane'
-               // `Map pane` where the grid layer will be added.
-               pane: 'tilePane',
+               var w0 = Math.max(size.x, size.y),
+                   w1 = w0 * this.getZoomScale(startZoom, targetZoom),
+                   u1 = (to.distanceTo(from)) || 1,
+                   rho = 1.42,
+                   rho2 = rho * rho;
+
+               function r(i) {
+                       var s1 = i ? -1 : 1,
+                           s2 = i ? w1 : w0,
+                           t1 = w1 * w1 - w0 * w0 + s1 * rho2 * rho2 * u1 * u1,
+                           b1 = 2 * s2 * rho2 * u1,
+                           b = t1 / b1,
+                           sq = Math.sqrt(b * b + 1) - b;
+
+                           // workaround for floating point precision bug when sq = 0, log = -Infinite,
+                           // thus triggering an infinite loop in flyTo
+                           var log = sq < 0.000000001 ? -18 : Math.log(sq);
+
+                       return log;
+               }
+
+               function sinh(n) { return (Math.exp(n) - Math.exp(-n)) / 2; }
+               function cosh(n) { return (Math.exp(n) + Math.exp(-n)) / 2; }
+               function tanh(n) { return sinh(n) / cosh(n); }
+
+               var r0 = r(0);
+
+               function w(s) { return w0 * (cosh(r0) / cosh(r0 + rho * s)); }
+               function u(s) { return w0 * (cosh(r0) * tanh(r0 + rho * s) - sinh(r0)) / rho2; }
+
+               function easeOut(t) { return 1 - Math.pow(1 - t, 1.5); }
+
+               var start = Date.now(),
+                   S = (r(1) - r0) / rho,
+                   duration = options.duration ? 1000 * options.duration : 1000 * S * 0.8;
+
+               function frame() {
+                       var t = (Date.now() - start) / duration,
+                           s = easeOut(t) * S;
+
+                       if (t <= 1) {
+                               this._flyToFrame = requestAnimFrame(frame, this);
+
+                               this._move(
+                                       this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom),
+                                       this.getScaleZoom(w0 / w(s), startZoom),
+                                       {flyTo: true});
+
+                       } else {
+                               this
+                                       ._move(targetCenter, targetZoom)
+                                       ._moveEnd(true);
+                       }
+               }
+
+               this._moveStart(true, options.noMoveStart);
+
+               frame.call(this);
+               return this;
+       },
+
+       // @method flyToBounds(bounds: LatLngBounds, options?: fitBounds options): this
+       // Sets the view of the map with a smooth animation like [`flyTo`](#map-flyto),
+       // but takes a bounds parameter like [`fitBounds`](#map-fitbounds).
+       flyToBounds: function (bounds, options) {
+               var target = this._getBoundsCenterZoom(bounds, options);
+               return this.flyTo(target.center, target.zoom, options);
+       },
+
+       // @method setMaxBounds(bounds: Bounds): this
+       // Restricts the map view to the given bounds (see the [maxBounds](#map-maxbounds) option).
+       setMaxBounds: function (bounds) {
+               bounds = toLatLngBounds(bounds);
+
+               if (!bounds.isValid()) {
+                       this.options.maxBounds = null;
+                       return this.off('moveend', this._panInsideMaxBounds);
+               } else if (this.options.maxBounds) {
+                       this.off('moveend', this._panInsideMaxBounds);
+               }
+
+               this.options.maxBounds = bounds;
+
+               if (this._loaded) {
+                       this._panInsideMaxBounds();
+               }
+
+               return this.on('moveend', this._panInsideMaxBounds);
+       },
+
+       // @method setMinZoom(zoom: Number): this
+       // Sets the lower limit for the available zoom levels (see the [minZoom](#map-minzoom) option).
+       setMinZoom: function (zoom) {
+               var oldZoom = this.options.minZoom;
+               this.options.minZoom = zoom;
+
+               if (this._loaded && oldZoom !== zoom) {
+                       this.fire('zoomlevelschange');
+
+                       if (this.getZoom() < this.options.minZoom) {
+                               return this.setZoom(zoom);
+                       }
+               }
+
+               return this;
+       },
+
+       // @method setMaxZoom(zoom: Number): this
+       // Sets the upper limit for the available zoom levels (see the [maxZoom](#map-maxzoom) option).
+       setMaxZoom: function (zoom) {
+               var oldZoom = this.options.maxZoom;
+               this.options.maxZoom = zoom;
+
+               if (this._loaded && oldZoom !== zoom) {
+                       this.fire('zoomlevelschange');
+
+                       if (this.getZoom() > this.options.maxZoom) {
+                               return this.setZoom(zoom);
+                       }
+               }
+
+               return this;
+       },
+
+       // @method panInsideBounds(bounds: LatLngBounds, options?: Pan options): this
+       // Pans the map to the closest view that would lie inside the given bounds (if it's not already), controlling the animation using the options specific, if any.
+       panInsideBounds: function (bounds, options) {
+               this._enforcingBounds = true;
+               var center = this.getCenter(),
+                   newCenter = this._limitCenter(center, this._zoom, toLatLngBounds(bounds));
+
+               if (!center.equals(newCenter)) {
+                       this.panTo(newCenter, options);
+               }
+
+               this._enforcingBounds = false;
+               return this;
+       },
+
+       // @method panInside(latlng: LatLng, options?: options): this
+       // Pans the map the minimum amount to make the `latlng` visible. Use
+       // `padding`, `paddingTopLeft` and `paddingTopRight` options to fit
+       // the display to more restricted bounds, like [`fitBounds`](#map-fitbounds).
+       // If `latlng` is already within the (optionally padded) display bounds,
+       // the map will not be panned.
+       panInside: function (latlng, options) {
+               options = options || {};
+
+               var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]),
+                   paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]),
+                   center = this.getCenter(),
+                   pixelCenter = this.project(center),
+                   pixelPoint = this.project(latlng),
+                   pixelBounds = this.getPixelBounds(),
+                   halfPixelBounds = pixelBounds.getSize().divideBy(2),
+                   paddedBounds = toBounds([pixelBounds.min.add(paddingTL), pixelBounds.max.subtract(paddingBR)]);
+
+               if (!paddedBounds.contains(pixelPoint)) {
+                       this._enforcingBounds = true;
+                       var diff = pixelCenter.subtract(pixelPoint),
+                           newCenter = toPoint(pixelPoint.x + diff.x, pixelPoint.y + diff.y);
+
+                       if (pixelPoint.x < paddedBounds.min.x || pixelPoint.x > paddedBounds.max.x) {
+                               newCenter.x = pixelCenter.x - diff.x;
+                               if (diff.x > 0) {
+                                       newCenter.x += halfPixelBounds.x - paddingTL.x;
+                               } else {
+                                       newCenter.x -= halfPixelBounds.x - paddingBR.x;
+                               }
+                       }
+                       if (pixelPoint.y < paddedBounds.min.y || pixelPoint.y > paddedBounds.max.y) {
+                               newCenter.y = pixelCenter.y - diff.y;
+                               if (diff.y > 0) {
+                                       newCenter.y += halfPixelBounds.y - paddingTL.y;
+                               } else {
+                                       newCenter.y -= halfPixelBounds.y - paddingBR.y;
+                               }
+                       }
+                       this.panTo(this.unproject(newCenter), options);
+                       this._enforcingBounds = false;
+               }
+               return this;
+       },
+
+       // @method invalidateSize(options: Zoom/pan options): this
+       // Checks if the map container size changed and updates the map if so —
+       // call it after you've changed the map size dynamically, also animating
+       // pan by default. If `options.pan` is `false`, panning will not occur.
+       // If `options.debounceMoveend` is `true`, it will delay `moveend` event so
+       // that it doesn't happen often even if the method is called many
+       // times in a row.
+
+       // @alternative
+       // @method invalidateSize(animate: Boolean): this
+       // Checks if the map container size changed and updates the map if so —
+       // call it after you've changed the map size dynamically, also animating
+       // pan by default.
+       invalidateSize: function (options) {
+               if (!this._loaded) { return this; }
+
+               options = extend({
+                       animate: false,
+                       pan: true
+               }, options === true ? {animate: true} : options);
+
+               var oldSize = this.getSize();
+               this._sizeChanged = true;
+               this._lastCenter = null;
+
+               var newSize = this.getSize(),
+                   oldCenter = oldSize.divideBy(2).round(),
+                   newCenter = newSize.divideBy(2).round(),
+                   offset = oldCenter.subtract(newCenter);
+
+               if (!offset.x && !offset.y) { return this; }
+
+               if (options.animate && options.pan) {
+                       this.panBy(offset);
+
+               } else {
+                       if (options.pan) {
+                               this._rawPanBy(offset);
+                       }
+
+                       this.fire('move');
+
+                       if (options.debounceMoveend) {
+                               clearTimeout(this._sizeTimer);
+                               this._sizeTimer = setTimeout(bind(this.fire, this, 'moveend'), 200);
+                       } else {
+                               this.fire('moveend');
+                       }
+               }
+
+               // @section Map state change events
+               // @event resize: ResizeEvent
+               // Fired when the map is resized.
+               return this.fire('resize', {
+                       oldSize: oldSize,
+                       newSize: newSize
+               });
+       },
+
+       // @section Methods for modifying map state
+       // @method stop(): this
+       // Stops the currently running `panTo` or `flyTo` animation, if any.
+       stop: function () {
+               this.setZoom(this._limitZoom(this._zoom));
+               if (!this.options.zoomSnap) {
+                       this.fire('viewreset');
+               }
+               return this._stop();
+       },
+
+       // @section Geolocation methods
+       // @method locate(options?: Locate options): this
+       // Tries to locate the user using the Geolocation API, firing a [`locationfound`](#map-locationfound)
+       // event with location data on success or a [`locationerror`](#map-locationerror) event on failure,
+       // and optionally sets the map view to the user's location with respect to
+       // detection accuracy (or to the world view if geolocation failed).
+       // Note that, if your page doesn't use HTTPS, this method will fail in
+       // modern browsers ([Chrome 50 and newer](https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-powerful-features-on-insecure-origins))
+       // See `Locate options` for more details.
+       locate: function (options) {
+
+               options = this._locateOptions = extend({
+                       timeout: 10000,
+                       watch: false
+                       // setView: false
+                       // maxZoom: <Number>
+                       // maximumAge: 0
+                       // enableHighAccuracy: false
+               }, options);
+
+               if (!('geolocation' in navigator)) {
+                       this._handleGeolocationError({
+                               code: 0,
+                               message: 'Geolocation not supported.'
+                       });
+                       return this;
+               }
+
+               var onResponse = bind(this._handleGeolocationResponse, this),
+                   onError = bind(this._handleGeolocationError, this);
+
+               if (options.watch) {
+                       this._locationWatchId =
+                               navigator.geolocation.watchPosition(onResponse, onError, options);
+               } else {
+                       navigator.geolocation.getCurrentPosition(onResponse, onError, options);
+               }
+               return this;
+       },
+
+       // @method stopLocate(): this
+       // Stops watching location previously initiated by `map.locate({watch: true})`
+       // and aborts resetting the map view if map.locate was called with
+       // `{setView: true}`.
+       stopLocate: function () {
+               if (navigator.geolocation && navigator.geolocation.clearWatch) {
+                       navigator.geolocation.clearWatch(this._locationWatchId);
+               }
+               if (this._locateOptions) {
+                       this._locateOptions.setView = false;
+               }
+               return this;
+       },
+
+       _handleGeolocationError: function (error) {
+               var c = error.code,
+                   message = error.message ||
+                           (c === 1 ? 'permission denied' :
+                           (c === 2 ? 'position unavailable' : 'timeout'));
+
+               if (this._locateOptions.setView && !this._loaded) {
+                       this.fitWorld();
+               }
+
+               // @section Location events
+               // @event locationerror: ErrorEvent
+               // Fired when geolocation (using the [`locate`](#map-locate) method) failed.
+               this.fire('locationerror', {
+                       code: c,
+                       message: 'Geolocation error: ' + message + '.'
+               });
+       },
+
+       _handleGeolocationResponse: function (pos) {
+               var lat = pos.coords.latitude,
+                   lng = pos.coords.longitude,
+                   latlng = new LatLng(lat, lng),
+                   bounds = latlng.toBounds(pos.coords.accuracy * 2),
+                   options = this._locateOptions;
+
+               if (options.setView) {
+                       var zoom = this.getBoundsZoom(bounds);
+                       this.setView(latlng, options.maxZoom ? Math.min(zoom, options.maxZoom) : zoom);
+               }
+
+               var data = {
+                       latlng: latlng,
+                       bounds: bounds,
+                       timestamp: pos.timestamp
+               };
+
+               for (var i in pos.coords) {
+                       if (typeof pos.coords[i] === 'number') {
+                               data[i] = pos.coords[i];
+                       }
+               }
+
+               // @event locationfound: LocationEvent
+               // Fired when geolocation (using the [`locate`](#map-locate) method)
+               // went successfully.
+               this.fire('locationfound', data);
+       },
+
+       // TODO Appropriate docs section?
+       // @section Other Methods
+       // @method addHandler(name: String, HandlerClass: Function): this
+       // Adds a new `Handler` to the map, given its name and constructor function.
+       addHandler: function (name, HandlerClass) {
+               if (!HandlerClass) { return this; }
+
+               var handler = this[name] = new HandlerClass(this);
+
+               this._handlers.push(handler);
+
+               if (this.options[name]) {
+                       handler.enable();
+               }
+
+               return this;
+       },
+
+       // @method remove(): this
+       // Destroys the map and clears all related event listeners.
+       remove: function () {
+
+               this._initEvents(true);
+
+               if (this._containerId !== this._container._leaflet_id) {
+                       throw new Error('Map container is being reused by another instance');
+               }
+
+               try {
+                       // throws error in IE6-8
+                       delete this._container._leaflet_id;
+                       delete this._containerId;
+               } catch (e) {
+                       /*eslint-disable */
+                       this._container._leaflet_id = undefined;
+                       /* eslint-enable */
+                       this._containerId = undefined;
+               }
+
+               if (this._locationWatchId !== undefined) {
+                       this.stopLocate();
+               }
+
+               this._stop();
+
+               remove(this._mapPane);
+
+               if (this._clearControlPos) {
+                       this._clearControlPos();
+               }
+               if (this._resizeRequest) {
+                       cancelAnimFrame(this._resizeRequest);
+                       this._resizeRequest = null;
+               }
+
+               this._clearHandlers();
+
+               if (this._loaded) {
+                       // @section Map state change events
+                       // @event unload: Event
+                       // Fired when the map is destroyed with [remove](#map-remove) method.
+                       this.fire('unload');
+               }
+
+               var i;
+               for (i in this._layers) {
+                       this._layers[i].remove();
+               }
+               for (i in this._panes) {
+                       remove(this._panes[i]);
+               }
+
+               this._layers = [];
+               this._panes = [];
+               delete this._mapPane;
+               delete this._renderer;
+
+               return this;
+       },
+
+       // @section Other Methods
+       // @method createPane(name: String, container?: HTMLElement): HTMLElement
+       // Creates a new [map pane](#map-pane) with the given name if it doesn't exist already,
+       // then returns it. The pane is created as a child of `container`, or
+       // as a child of the main map pane if not set.
+       createPane: function (name, container) {
+               var className = 'leaflet-pane' + (name ? ' leaflet-' + name.replace('Pane', '') + '-pane' : ''),
+                   pane = create$1('div', className, container || this._mapPane);
+
+               if (name) {
+                       this._panes[name] = pane;
+               }
+               return pane;
+       },
+
+       // @section Methods for Getting Map State
+
+       // @method getCenter(): LatLng
+       // Returns the geographical center of the map view
+       getCenter: function () {
+               this._checkIfLoaded();
+
+               if (this._lastCenter && !this._moved()) {
+                       return this._lastCenter;
+               }
+               return this.layerPointToLatLng(this._getCenterLayerPoint());
+       },
+
+       // @method getZoom(): Number
+       // Returns the current zoom level of the map view
+       getZoom: function () {
+               return this._zoom;
+       },
+
+       // @method getBounds(): LatLngBounds
+       // Returns the geographical bounds visible in the current map view
+       getBounds: function () {
+               var bounds = this.getPixelBounds(),
+                   sw = this.unproject(bounds.getBottomLeft()),
+                   ne = this.unproject(bounds.getTopRight());
+
+               return new LatLngBounds(sw, ne);
+       },
+
+       // @method getMinZoom(): Number
+       // Returns the minimum zoom level of the map (if set in the `minZoom` option of the map or of any layers), or `0` by default.
+       getMinZoom: function () {
+               return this.options.minZoom === undefined ? this._layersMinZoom || 0 : this.options.minZoom;
+       },
+
+       // @method getMaxZoom(): Number
+       // Returns the maximum zoom level of the map (if set in the `maxZoom` option of the map or of any layers).
+       getMaxZoom: function () {
+               return this.options.maxZoom === undefined ?
+                       (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
+                       this.options.maxZoom;
+       },
+
+       // @method getBoundsZoom(bounds: LatLngBounds, inside?: Boolean, padding?: Point): Number
+       // Returns the maximum zoom level on which the given bounds fit to the map
+       // view in its entirety. If `inside` (optional) is set to `true`, the method
+       // instead returns the minimum zoom level on which the map view fits into
+       // the given bounds in its entirety.
+       getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number
+               bounds = toLatLngBounds(bounds);
+               padding = toPoint(padding || [0, 0]);
+
+               var zoom = this.getZoom() || 0,
+                   min = this.getMinZoom(),
+                   max = this.getMaxZoom(),
+                   nw = bounds.getNorthWest(),
+                   se = bounds.getSouthEast(),
+                   size = this.getSize().subtract(padding),
+                   boundsSize = toBounds(this.project(se, zoom), this.project(nw, zoom)).getSize(),
+                   snap = any3d ? this.options.zoomSnap : 1,
+                   scalex = size.x / boundsSize.x,
+                   scaley = size.y / boundsSize.y,
+                   scale = inside ? Math.max(scalex, scaley) : Math.min(scalex, scaley);
+
+               zoom = this.getScaleZoom(scale, zoom);
+
+               if (snap) {
+                       zoom = Math.round(zoom / (snap / 100)) * (snap / 100); // don't jump if within 1% of a snap level
+                       zoom = inside ? Math.ceil(zoom / snap) * snap : Math.floor(zoom / snap) * snap;
+               }
+
+               return Math.max(min, Math.min(max, zoom));
+       },
+
+       // @method getSize(): Point
+       // Returns the current size of the map container (in pixels).
+       getSize: function () {
+               if (!this._size || this._sizeChanged) {
+                       this._size = new Point(
+                               this._container.clientWidth || 0,
+                               this._container.clientHeight || 0);
+
+                       this._sizeChanged = false;
+               }
+               return this._size.clone();
+       },
+
+       // @method getPixelBounds(): Bounds
+       // Returns the bounds of the current map view in projected pixel
+       // coordinates (sometimes useful in layer and overlay implementations).
+       getPixelBounds: function (center, zoom) {
+               var topLeftPoint = this._getTopLeftPoint(center, zoom);
+               return new Bounds(topLeftPoint, topLeftPoint.add(this.getSize()));
+       },
+
+       // TODO: Check semantics - isn't the pixel origin the 0,0 coord relative to
+       // the map pane? "left point of the map layer" can be confusing, specially
+       // since there can be negative offsets.
+       // @method getPixelOrigin(): Point
+       // Returns the projected pixel coordinates of the top left point of
+       // the map layer (useful in custom layer and overlay implementations).
+       getPixelOrigin: function () {
+               this._checkIfLoaded();
+               return this._pixelOrigin;
+       },
 
-               // @option className: String = ''
-               // A custom class name to assign to the tile layer. Empty by default.
-               className: '',
+       // @method getPixelWorldBounds(zoom?: Number): Bounds
+       // Returns the world's bounds in pixel coordinates for zoom level `zoom`.
+       // If `zoom` is omitted, the map's current zoom level is used.
+       getPixelWorldBounds: function (zoom) {
+               return this.options.crs.getProjectedBounds(zoom === undefined ? this.getZoom() : zoom);
+       },
 
-               // @option keepBuffer: Number = 2
-               // When panning the map, keep this many rows and columns of tiles before unloading them.
-               keepBuffer: 2
+       // @section Other Methods
+
+       // @method getPane(pane: String|HTMLElement): HTMLElement
+       // Returns a [map pane](#map-pane), given its name or its HTML element (its identity).
+       getPane: function (pane) {
+               return typeof pane === 'string' ? this._panes[pane] : pane;
        },
 
-       initialize: function (options) {
-               L.setOptions(this, options);
+       // @method getPanes(): Object
+       // Returns a plain object containing the names of all [panes](#map-pane) as keys and
+       // the panes as values.
+       getPanes: function () {
+               return this._panes;
        },
 
-       onAdd: function () {
-               this._initContainer();
+       // @method getContainer: HTMLElement
+       // Returns the HTML element that contains the map.
+       getContainer: function () {
+               return this._container;
+       },
 
-               this._levels = {};
-               this._tiles = {};
 
-               this._resetView();
-               this._update();
+       // @section Conversion Methods
+
+       // @method getZoomScale(toZoom: Number, fromZoom: Number): Number
+       // Returns the scale factor to be applied to a map transition from zoom level
+       // `fromZoom` to `toZoom`. Used internally to help with zoom animations.
+       getZoomScale: function (toZoom, fromZoom) {
+               // TODO replace with universal implementation after refactoring projections
+               var crs = this.options.crs;
+               fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
+               return crs.scale(toZoom) / crs.scale(fromZoom);
        },
 
-       beforeAdd: function (map) {
-               map._addZoomLimit(this);
+       // @method getScaleZoom(scale: Number, fromZoom: Number): Number
+       // Returns the zoom level that the map would end up at, if it is at `fromZoom`
+       // level and everything is scaled by a factor of `scale`. Inverse of
+       // [`getZoomScale`](#map-getZoomScale).
+       getScaleZoom: function (scale, fromZoom) {
+               var crs = this.options.crs;
+               fromZoom = fromZoom === undefined ? this._zoom : fromZoom;
+               var zoom = crs.zoom(scale * crs.scale(fromZoom));
+               return isNaN(zoom) ? Infinity : zoom;
        },
 
-       onRemove: function (map) {
-               this._removeAllTiles();
-               L.DomUtil.remove(this._container);
-               map._removeZoomLimit(this);
-               this._container = null;
-               this._tileZoom = null;
+       // @method project(latlng: LatLng, zoom: Number): Point
+       // Projects a geographical coordinate `LatLng` according to the projection
+       // of the map's CRS, then scales it according to `zoom` and the CRS's
+       // `Transformation`. The result is pixel coordinate relative to
+       // the CRS origin.
+       project: function (latlng, zoom) {
+               zoom = zoom === undefined ? this._zoom : zoom;
+               return this.options.crs.latLngToPoint(toLatLng(latlng), zoom);
+       },
+
+       // @method unproject(point: Point, zoom: Number): LatLng
+       // Inverse of [`project`](#map-project).
+       unproject: function (point, zoom) {
+               zoom = zoom === undefined ? this._zoom : zoom;
+               return this.options.crs.pointToLatLng(toPoint(point), zoom);
+       },
+
+       // @method layerPointToLatLng(point: Point): LatLng
+       // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin),
+       // returns the corresponding geographical coordinate (for the current zoom level).
+       layerPointToLatLng: function (point) {
+               var projectedPoint = toPoint(point).add(this.getPixelOrigin());
+               return this.unproject(projectedPoint);
+       },
+
+       // @method latLngToLayerPoint(latlng: LatLng): Point
+       // Given a geographical coordinate, returns the corresponding pixel coordinate
+       // relative to the [origin pixel](#map-getpixelorigin).
+       latLngToLayerPoint: function (latlng) {
+               var projectedPoint = this.project(toLatLng(latlng))._round();
+               return projectedPoint._subtract(this.getPixelOrigin());
+       },
+
+       // @method wrapLatLng(latlng: LatLng): LatLng
+       // Returns a `LatLng` where `lat` and `lng` has been wrapped according to the
+       // map's CRS's `wrapLat` and `wrapLng` properties, if they are outside the
+       // CRS's bounds.
+       // By default this means longitude is wrapped around the dateline so its
+       // value is between -180 and +180 degrees.
+       wrapLatLng: function (latlng) {
+               return this.options.crs.wrapLatLng(toLatLng(latlng));
+       },
+
+       // @method wrapLatLngBounds(bounds: LatLngBounds): LatLngBounds
+       // Returns a `LatLngBounds` with the same size as the given one, ensuring that
+       // its center is within the CRS's bounds.
+       // By default this means the center longitude is wrapped around the dateline so its
+       // value is between -180 and +180 degrees, and the majority of the bounds
+       // overlaps the CRS's bounds.
+       wrapLatLngBounds: function (latlng) {
+               return this.options.crs.wrapLatLngBounds(toLatLngBounds(latlng));
+       },
+
+       // @method distance(latlng1: LatLng, latlng2: LatLng): Number
+       // Returns the distance between two geographical coordinates according to
+       // the map's CRS. By default this measures distance in meters.
+       distance: function (latlng1, latlng2) {
+               return this.options.crs.distance(toLatLng(latlng1), toLatLng(latlng2));
+       },
+
+       // @method containerPointToLayerPoint(point: Point): Point
+       // Given a pixel coordinate relative to the map container, returns the corresponding
+       // pixel coordinate relative to the [origin pixel](#map-getpixelorigin).
+       containerPointToLayerPoint: function (point) { // (Point)
+               return toPoint(point).subtract(this._getMapPanePos());
+       },
+
+       // @method layerPointToContainerPoint(point: Point): Point
+       // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin),
+       // returns the corresponding pixel coordinate relative to the map container.
+       layerPointToContainerPoint: function (point) { // (Point)
+               return toPoint(point).add(this._getMapPanePos());
+       },
+
+       // @method containerPointToLatLng(point: Point): LatLng
+       // Given a pixel coordinate relative to the map container, returns
+       // the corresponding geographical coordinate (for the current zoom level).
+       containerPointToLatLng: function (point) {
+               var layerPoint = this.containerPointToLayerPoint(toPoint(point));
+               return this.layerPointToLatLng(layerPoint);
+       },
+
+       // @method latLngToContainerPoint(latlng: LatLng): Point
+       // Given a geographical coordinate, returns the corresponding pixel coordinate
+       // relative to the map container.
+       latLngToContainerPoint: function (latlng) {
+               return this.layerPointToContainerPoint(this.latLngToLayerPoint(toLatLng(latlng)));
+       },
+
+       // @method mouseEventToContainerPoint(ev: MouseEvent): Point
+       // Given a MouseEvent object, returns the pixel coordinate relative to the
+       // map container where the event took place.
+       mouseEventToContainerPoint: function (e) {
+               return getMousePosition(e, this._container);
+       },
+
+       // @method mouseEventToLayerPoint(ev: MouseEvent): Point
+       // Given a MouseEvent object, returns the pixel coordinate relative to
+       // the [origin pixel](#map-getpixelorigin) where the event took place.
+       mouseEventToLayerPoint: function (e) {
+               return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));
+       },
+
+       // @method mouseEventToLatLng(ev: MouseEvent): LatLng
+       // Given a MouseEvent object, returns geographical coordinate where the
+       // event took place.
+       mouseEventToLatLng: function (e) { // (MouseEvent)
+               return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
+       },
+
+
+       // map initialization methods
+
+       _initContainer: function (id) {
+               var container = this._container = get(id);
+
+               if (!container) {
+                       throw new Error('Map container not found.');
+               } else if (container._leaflet_id) {
+                       throw new Error('Map container is already initialized.');
+               }
+
+               on(container, 'scroll', this._onScroll, this);
+               this._containerId = stamp(container);
+       },
+
+       _initLayout: function () {
+               var container = this._container;
+
+               this._fadeAnimated = this.options.fadeAnimation && any3d;
+
+               addClass(container, 'leaflet-container' +
+                       (touch ? ' leaflet-touch' : '') +
+                       (retina ? ' leaflet-retina' : '') +
+                       (ielt9 ? ' leaflet-oldie' : '') +
+                       (safari ? ' leaflet-safari' : '') +
+                       (this._fadeAnimated ? ' leaflet-fade-anim' : ''));
+
+               var position = getStyle(container, 'position');
+
+               if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') {
+                       container.style.position = 'relative';
+               }
+
+               this._initPanes();
+
+               if (this._initControlPos) {
+                       this._initControlPos();
+               }
+       },
+
+       _initPanes: function () {
+               var panes = this._panes = {};
+               this._paneRenderers = {};
+
+               // @section
+               //
+               // Panes are DOM elements used to control the ordering of layers on the map. You
+               // can access panes with [`map.getPane`](#map-getpane) or
+               // [`map.getPanes`](#map-getpanes) methods. New panes can be created with the
+               // [`map.createPane`](#map-createpane) method.
+               //
+               // Every map has the following default panes that differ only in zIndex.
+               //
+               // @pane mapPane: HTMLElement = 'auto'
+               // Pane that contains all other map panes
+
+               this._mapPane = this.createPane('mapPane', this._container);
+               setPosition(this._mapPane, new Point(0, 0));
+
+               // @pane tilePane: HTMLElement = 200
+               // Pane for `GridLayer`s and `TileLayer`s
+               this.createPane('tilePane');
+               // @pane overlayPane: HTMLElement = 400
+               // Pane for vectors (`Path`s, like `Polyline`s and `Polygon`s), `ImageOverlay`s and `VideoOverlay`s
+               this.createPane('shadowPane');
+               // @pane shadowPane: HTMLElement = 500
+               // Pane for overlay shadows (e.g. `Marker` shadows)
+               this.createPane('overlayPane');
+               // @pane markerPane: HTMLElement = 600
+               // Pane for `Icon`s of `Marker`s
+               this.createPane('markerPane');
+               // @pane tooltipPane: HTMLElement = 650
+               // Pane for `Tooltip`s.
+               this.createPane('tooltipPane');
+               // @pane popupPane: HTMLElement = 700
+               // Pane for `Popup`s.
+               this.createPane('popupPane');
+
+               if (!this.options.markerZoomAnimation) {
+                       addClass(panes.markerPane, 'leaflet-zoom-hide');
+                       addClass(panes.shadowPane, 'leaflet-zoom-hide');
+               }
+       },
+
+
+       // private methods that modify map state
+
+       // @section Map state change events
+       _resetView: function (center, zoom) {
+               setPosition(this._mapPane, new Point(0, 0));
+
+               var loading = !this._loaded;
+               this._loaded = true;
+               zoom = this._limitZoom(zoom);
+
+               this.fire('viewprereset');
+
+               var zoomChanged = this._zoom !== zoom;
+               this
+                       ._moveStart(zoomChanged, false)
+                       ._move(center, zoom)
+                       ._moveEnd(zoomChanged);
+
+               // @event viewreset: Event
+               // Fired when the map needs to redraw its content (this usually happens
+               // on map zoom or load). Very useful for creating custom overlays.
+               this.fire('viewreset');
+
+               // @event load: Event
+               // Fired when the map is initialized (when its center and zoom are set
+               // for the first time).
+               if (loading) {
+                       this.fire('load');
+               }
        },
 
-       // @method bringToFront: this
-       // Brings the tile layer to the top of all tile layers.
-       bringToFront: function () {
-               if (this._map) {
-                       L.DomUtil.toFront(this._container);
-                       this._setAutoZIndex(Math.max);
+       _moveStart: function (zoomChanged, noMoveStart) {
+               // @event zoomstart: Event
+               // Fired when the map zoom is about to change (e.g. before zoom animation).
+               // @event movestart: Event
+               // Fired when the view of the map starts changing (e.g. user starts dragging the map).
+               if (zoomChanged) {
+                       this.fire('zoomstart');
+               }
+               if (!noMoveStart) {
+                       this.fire('movestart');
                }
                return this;
        },
 
-       // @method bringToBack: this
-       // Brings the tile layer to the bottom of all tile layers.
-       bringToBack: function () {
-               if (this._map) {
-                       L.DomUtil.toBack(this._container);
-                       this._setAutoZIndex(Math.min);
+       _move: function (center, zoom, data) {
+               if (zoom === undefined) {
+                       zoom = this._zoom;
                }
-               return this;
-       },
+               var zoomChanged = this._zoom !== zoom;
 
-       // @method getAttribution: String
-       // Used by the `attribution control`, returns the [attribution option](#gridlayer-attribution).
-       getAttribution: function () {
-               return this.options.attribution;
+               this._zoom = zoom;
+               this._lastCenter = center;
+               this._pixelOrigin = this._getNewPixelOrigin(center);
+
+               // @event zoom: Event
+               // Fired repeatedly during any change in zoom level, including zoom
+               // and fly animations.
+               if (zoomChanged || (data && data.pinch)) {      // Always fire 'zoom' if pinching because #3530
+                       this.fire('zoom', data);
+               }
+
+               // @event move: Event
+               // Fired repeatedly during any movement of the map, including pan and
+               // fly animations.
+               return this.fire('move', data);
        },
 
-       // @method getContainer: HTMLElement
-       // Returns the HTML element that contains the tiles for this layer.
-       getContainer: function () {
-               return this._container;
+       _moveEnd: function (zoomChanged) {
+               // @event zoomend: Event
+               // Fired when the map has changed, after any animations.
+               if (zoomChanged) {
+                       this.fire('zoomend');
+               }
+
+               // @event moveend: Event
+               // Fired when the center of the map stops changing (e.g. user stopped
+               // dragging the map).
+               return this.fire('moveend');
        },
 
-       // @method setOpacity(opacity: Number): this
-       // Changes the [opacity](#gridlayer-opacity) of the grid layer.
-       setOpacity: function (opacity) {
-               this.options.opacity = opacity;
-               this._updateOpacity();
+       _stop: function () {
+               cancelAnimFrame(this._flyToFrame);
+               if (this._panAnim) {
+                       this._panAnim.stop();
+               }
                return this;
        },
 
-       // @method setZIndex(zIndex: Number): this
-       // Changes the [zIndex](#gridlayer-zindex) of the grid layer.
-       setZIndex: function (zIndex) {
-               this.options.zIndex = zIndex;
-               this._updateZIndex();
+       _rawPanBy: function (offset) {
+               setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
+       },
 
-               return this;
+       _getZoomSpan: function () {
+               return this.getMaxZoom() - this.getMinZoom();
        },
 
-       // @method isLoading: Boolean
-       // Returns `true` if any tile in the grid layer has not finished loading.
-       isLoading: function () {
-               return this._loading;
+       _panInsideMaxBounds: function () {
+               if (!this._enforcingBounds) {
+                       this.panInsideBounds(this.options.maxBounds);
+               }
        },
 
-       // @method redraw: this
-       // Causes the layer to clear all the tiles and request them again.
-       redraw: function () {
-               if (this._map) {
-                       this._removeAllTiles();
-                       this._update();
+       _checkIfLoaded: function () {
+               if (!this._loaded) {
+                       throw new Error('Set map center and zoom first.');
                }
-               return this;
        },
 
-       getEvents: function () {
-               var events = {
-                       viewprereset: this._invalidateAll,
-                       viewreset: this._resetView,
-                       zoom: this._resetView,
-                       moveend: this._onMoveEnd
-               };
+       // DOM event handling
 
-               if (!this.options.updateWhenIdle) {
-                       // update tiles on move, but not more often than once per given interval
-                       if (!this._onMove) {
-                               this._onMove = L.Util.throttle(this._onMoveEnd, this.options.updateInterval, this);
-                       }
+       // @section Interaction events
+       _initEvents: function (remove$$1) {
+               this._targets = {};
+               this._targets[stamp(this._container)] = this;
 
-                       events.move = this._onMove;
-               }
+               var onOff = remove$$1 ? off : on;
 
-               if (this._zoomAnimated) {
-                       events.zoomanim = this._animateZoom;
+               // @event click: MouseEvent
+               // Fired when the user clicks (or taps) the map.
+               // @event dblclick: MouseEvent
+               // Fired when the user double-clicks (or double-taps) the map.
+               // @event mousedown: MouseEvent
+               // Fired when the user pushes the mouse button on the map.
+               // @event mouseup: MouseEvent
+               // Fired when the user releases the mouse button on the map.
+               // @event mouseover: MouseEvent
+               // Fired when the mouse enters the map.
+               // @event mouseout: MouseEvent
+               // Fired when the mouse leaves the map.
+               // @event mousemove: MouseEvent
+               // Fired while the mouse moves over the map.
+               // @event contextmenu: MouseEvent
+               // Fired when the user pushes the right mouse button on the map, prevents
+               // default browser context menu from showing if there are listeners on
+               // this event. Also fired on mobile when the user holds a single touch
+               // for a second (also called long press).
+               // @event keypress: KeyboardEvent
+               // Fired when the user presses a key from the keyboard that produces a character value while the map is focused.
+               // @event keydown: KeyboardEvent
+               // Fired when the user presses a key from the keyboard while the map is focused. Unlike the `keypress` event,
+               // the `keydown` event is fired for keys that produce a character value and for keys
+               // that do not produce a character value.
+               // @event keyup: KeyboardEvent
+               // Fired when the user releases a key from the keyboard while the map is focused.
+               onOff(this._container, 'click dblclick mousedown mouseup ' +
+                       'mouseover mouseout mousemove contextmenu keypress keydown keyup', this._handleDOMEvent, this);
+
+               if (this.options.trackResize) {
+                       onOff(window, 'resize', this._onResize, this);
                }
 
-               return events;
+               if (any3d && this.options.transform3DLimit) {
+                       (remove$$1 ? this.off : this.on).call(this, 'moveend', this._onMoveEnd);
+               }
        },
 
-       // @section Extension methods
-       // Layers extending `GridLayer` shall reimplement the following method.
-       // @method createTile(coords: Object, done?: Function): HTMLElement
-       // Called only internally, must be overriden by classes extending `GridLayer`.
-       // Returns the `HTMLElement` corresponding to the given `coords`. If the `done` callback
-       // is specified, it must be called when the tile has finished loading and drawing.
-       createTile: function () {
-               return document.createElement('div');
+       _onResize: function () {
+               cancelAnimFrame(this._resizeRequest);
+               this._resizeRequest = requestAnimFrame(
+                       function () { this.invalidateSize({debounceMoveend: true}); }, this);
        },
 
-       // @section
-       // @method getTileSize: Point
-       // Normalizes the [tileSize option](#gridlayer-tilesize) into a point. Used by the `createTile()` method.
-       getTileSize: function () {
-               var s = this.options.tileSize;
-               return s instanceof L.Point ? s : new L.Point(s, s);
+       _onScroll: function () {
+               this._container.scrollTop  = 0;
+               this._container.scrollLeft = 0;
        },
 
-       _updateZIndex: function () {
-               if (this._container && this.options.zIndex !== undefined && this.options.zIndex !== null) {
-                       this._container.style.zIndex = this.options.zIndex;
+       _onMoveEnd: function () {
+               var pos = this._getMapPanePos();
+               if (Math.max(Math.abs(pos.x), Math.abs(pos.y)) >= this.options.transform3DLimit) {
+                       // https://bugzilla.mozilla.org/show_bug.cgi?id=1203873 but Webkit also have
+                       // a pixel offset on very high values, see: http://jsfiddle.net/dg6r5hhb/
+                       this._resetView(this.getCenter(), this.getZoom());
                }
        },
 
-       _setAutoZIndex: function (compare) {
-               // go through all other layers of the same pane, set zIndex to max + 1 (front) or min - 1 (back)
+       _findEventTargets: function (e, type) {
+               var targets = [],
+                   target,
+                   isHover = type === 'mouseout' || type === 'mouseover',
+                   src = e.target || e.srcElement,
+                   dragging = false;
 
-               var layers = this.getPane().children,
-                   edgeZIndex = -compare(-Infinity, Infinity); // -Infinity for max, Infinity for min
+               while (src) {
+                       target = this._targets[stamp(src)];
+                       if (target && (type === 'click' || type === 'preclick') && !e._simulated && this._draggableMoved(target)) {
+                               // Prevent firing click after you just dragged an object.
+                               dragging = true;
+                               break;
+                       }
+                       if (target && target.listens(type, true)) {
+                               if (isHover && !isExternalTarget(src, e)) { break; }
+                               targets.push(target);
+                               if (isHover) { break; }
+                       }
+                       if (src === this._container) { break; }
+                       src = src.parentNode;
+               }
+               if (!targets.length && !dragging && !isHover && isExternalTarget(src, e)) {
+                       targets = [this];
+               }
+               return targets;
+       },
 
-               for (var i = 0, len = layers.length, zIndex; i < len; i++) {
+       _handleDOMEvent: function (e) {
+               if (!this._loaded || skipped(e)) { return; }
 
-                       zIndex = layers[i].style.zIndex;
+               var type = e.type;
 
-                       if (layers[i] !== this._container && zIndex) {
-                               edgeZIndex = compare(edgeZIndex, +zIndex);
-                       }
+               if (type === 'mousedown' || type === 'keypress' || type === 'keyup' || type === 'keydown') {
+                       // prevents outline when clicking on keyboard-focusable element
+                       preventOutline(e.target || e.srcElement);
                }
 
-               if (isFinite(edgeZIndex)) {
-                       this.options.zIndex = edgeZIndex + compare(-1, 1);
-                       this._updateZIndex();
-               }
+               this._fireDOMEvent(e, type);
        },
 
-       _updateOpacity: function () {
-               if (!this._map) { return; }
+       _mouseEvents: ['click', 'dblclick', 'mouseover', 'mouseout', 'contextmenu'],
 
-               // IE doesn't inherit filter opacity properly, so we're forced to set it on tiles
-               if (L.Browser.ielt9) { return; }
+       _fireDOMEvent: function (e, type, targets) {
 
-               L.DomUtil.setOpacity(this._container, this.options.opacity);
+               if (e.type === 'click') {
+                       // Fire a synthetic 'preclick' event which propagates up (mainly for closing popups).
+                       // @event preclick: MouseEvent
+                       // Fired before mouse click on the map (sometimes useful when you
+                       // want something to happen on click before any existing click
+                       // handlers start running).
+                       var synth = extend({}, e);
+                       synth.type = 'preclick';
+                       this._fireDOMEvent(synth, synth.type, targets);
+               }
 
-               var now = +new Date(),
-                   nextFrame = false,
-                   willPrune = false;
+               if (e._stopped) { return; }
 
-               for (var key in this._tiles) {
-                       var tile = this._tiles[key];
-                       if (!tile.current || !tile.loaded) { continue; }
+               // Find the layer the event is propagating from and its parents.
+               targets = (targets || []).concat(this._findEventTargets(e, type));
 
-                       var fade = Math.min(1, (now - tile.loaded) / 200);
+               if (!targets.length) { return; }
 
-                       L.DomUtil.setOpacity(tile.el, fade);
-                       if (fade < 1) {
-                               nextFrame = true;
-                       } else {
-                               if (tile.active) { willPrune = true; }
-                               tile.active = true;
-                       }
+               var target = targets[0];
+               if (type === 'contextmenu' && target.listens(type, true)) {
+                       preventDefault(e);
+               }
+
+               var data = {
+                       originalEvent: e
+               };
+
+               if (e.type !== 'keypress' && e.type !== 'keydown' && e.type !== 'keyup') {
+                       var isMarker = target.getLatLng && (!target._radius || target._radius <= 10);
+                       data.containerPoint = isMarker ?
+                               this.latLngToContainerPoint(target.getLatLng()) : this.mouseEventToContainerPoint(e);
+                       data.layerPoint = this.containerPointToLayerPoint(data.containerPoint);
+                       data.latlng = isMarker ? target.getLatLng() : this.layerPointToLatLng(data.layerPoint);
+               }
+
+               for (var i = 0; i < targets.length; i++) {
+                       targets[i].fire(type, data, true);
+                       if (data.originalEvent._stopped ||
+                               (targets[i].options.bubblingMouseEvents === false && indexOf(this._mouseEvents, type) !== -1)) { return; }
+               }
+       },
+
+       _draggableMoved: function (obj) {
+               obj = obj.dragging && obj.dragging.enabled() ? obj : this;
+               return (obj.dragging && obj.dragging.moved()) || (this.boxZoom && this.boxZoom.moved());
+       },
+
+       _clearHandlers: function () {
+               for (var i = 0, len = this._handlers.length; i < len; i++) {
+                       this._handlers[i].disable();
                }
+       },
 
-               if (willPrune && !this._noPrune) { this._pruneTiles(); }
+       // @section Other Methods
 
-               if (nextFrame) {
-                       L.Util.cancelAnimFrame(this._fadeFrame);
-                       this._fadeFrame = L.Util.requestAnimFrame(this._updateOpacity, this);
+       // @method whenReady(fn: Function, context?: Object): this
+       // Runs the given function `fn` when the map gets initialized with
+       // a view (center and zoom) and at least one layer, or immediately
+       // if it's already initialized, optionally passing a function context.
+       whenReady: function (callback, context) {
+               if (this._loaded) {
+                       callback.call(context || this, {target: this});
+               } else {
+                       this.on('load', callback, context);
                }
+               return this;
        },
 
-       _initContainer: function () {
-               if (this._container) { return; }
 
-               this._container = L.DomUtil.create('div', 'leaflet-layer ' + (this.options.className || ''));
-               this._updateZIndex();
+       // private methods for getting map state
 
-               if (this.options.opacity < 1) {
-                       this._updateOpacity();
-               }
+       _getMapPanePos: function () {
+               return getPosition(this._mapPane) || new Point(0, 0);
+       },
 
-               this.getPane().appendChild(this._container);
+       _moved: function () {
+               var pos = this._getMapPanePos();
+               return pos && !pos.equals([0, 0]);
        },
 
-       _updateLevels: function () {
+       _getTopLeftPoint: function (center, zoom) {
+               var pixelOrigin = center && zoom !== undefined ?
+                       this._getNewPixelOrigin(center, zoom) :
+                       this.getPixelOrigin();
+               return pixelOrigin.subtract(this._getMapPanePos());
+       },
 
-               var zoom = this._tileZoom,
-                   maxZoom = this.options.maxZoom;
+       _getNewPixelOrigin: function (center, zoom) {
+               var viewHalf = this.getSize()._divideBy(2);
+               return this.project(center, zoom)._subtract(viewHalf)._add(this._getMapPanePos())._round();
+       },
 
-               if (zoom === undefined) { return undefined; }
+       _latLngToNewLayerPoint: function (latlng, zoom, center) {
+               var topLeft = this._getNewPixelOrigin(center, zoom);
+               return this.project(latlng, zoom)._subtract(topLeft);
+       },
 
-               for (var z in this._levels) {
-                       if (this._levels[z].el.children.length || z === zoom) {
-                               this._levels[z].el.style.zIndex = maxZoom - Math.abs(zoom - z);
-                       } else {
-                               L.DomUtil.remove(this._levels[z].el);
-                               this._removeTilesAtZoom(z);
-                               delete this._levels[z];
-                       }
-               }
+       _latLngBoundsToNewLayerBounds: function (latLngBounds, zoom, center) {
+               var topLeft = this._getNewPixelOrigin(center, zoom);
+               return toBounds([
+                       this.project(latLngBounds.getSouthWest(), zoom)._subtract(topLeft),
+                       this.project(latLngBounds.getNorthWest(), zoom)._subtract(topLeft),
+                       this.project(latLngBounds.getSouthEast(), zoom)._subtract(topLeft),
+                       this.project(latLngBounds.getNorthEast(), zoom)._subtract(topLeft)
+               ]);
+       },
 
-               var level = this._levels[zoom],
-                   map = this._map;
+       // layer point of the current center
+       _getCenterLayerPoint: function () {
+               return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
+       },
 
-               if (!level) {
-                       level = this._levels[zoom] = {};
+       // offset of the specified place to the current center in pixels
+       _getCenterOffset: function (latlng) {
+               return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint());
+       },
 
-                       level.el = L.DomUtil.create('div', 'leaflet-tile-container leaflet-zoom-animated', this._container);
-                       level.el.style.zIndex = maxZoom;
+       // adjust center for view to get inside bounds
+       _limitCenter: function (center, zoom, bounds) {
 
-                       level.origin = map.project(map.unproject(map.getPixelOrigin()), zoom).round();
-                       level.zoom = zoom;
+               if (!bounds) { return center; }
 
-                       this._setZoomTransform(level, map.getCenter(), map.getZoom());
+               var centerPoint = this.project(center, zoom),
+                   viewHalf = this.getSize().divideBy(2),
+                   viewBounds = new Bounds(centerPoint.subtract(viewHalf), centerPoint.add(viewHalf)),
+                   offset = this._getBoundsOffset(viewBounds, bounds, zoom);
 
-                       // force the browser to consider the newly added element for transition
-                       L.Util.falseFn(level.el.offsetWidth);
+               // If offset is less than a pixel, ignore.
+               // This prevents unstable projections from getting into
+               // an infinite loop of tiny offsets.
+               if (offset.round().equals([0, 0])) {
+                       return center;
                }
 
-               this._level = level;
-
-               return level;
+               return this.unproject(centerPoint.add(offset), zoom);
        },
 
-       _pruneTiles: function () {
-               if (!this._map) {
-                       return;
-               }
+       // adjust offset for view to get inside bounds
+       _limitOffset: function (offset, bounds) {
+               if (!bounds) { return offset; }
 
-               var key, tile;
+               var viewBounds = this.getPixelBounds(),
+                   newBounds = new Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset));
 
-               var zoom = this._map.getZoom();
-               if (zoom > this.options.maxZoom ||
-                       zoom < this.options.minZoom) {
-                       this._removeAllTiles();
-                       return;
-               }
+               return offset.add(this._getBoundsOffset(newBounds, bounds));
+       },
 
-               for (key in this._tiles) {
-                       tile = this._tiles[key];
-                       tile.retain = tile.current;
-               }
+       // returns offset needed for pxBounds to get inside maxBounds at a specified zoom
+       _getBoundsOffset: function (pxBounds, maxBounds, zoom) {
+               var projectedMaxBounds = toBounds(
+                       this.project(maxBounds.getNorthEast(), zoom),
+                       this.project(maxBounds.getSouthWest(), zoom)
+                   ),
+                   minOffset = projectedMaxBounds.min.subtract(pxBounds.min),
+                   maxOffset = projectedMaxBounds.max.subtract(pxBounds.max),
 
-               for (key in this._tiles) {
-                       tile = this._tiles[key];
-                       if (tile.current && !tile.active) {
-                               var coords = tile.coords;
-                               if (!this._retainParent(coords.x, coords.y, coords.z, coords.z - 5)) {
-                                       this._retainChildren(coords.x, coords.y, coords.z, coords.z + 2);
-                               }
-                       }
-               }
+                   dx = this._rebound(minOffset.x, -maxOffset.x),
+                   dy = this._rebound(minOffset.y, -maxOffset.y);
 
-               for (key in this._tiles) {
-                       if (!this._tiles[key].retain) {
-                               this._removeTile(key);
-                       }
-               }
+               return new Point(dx, dy);
        },
 
-       _removeTilesAtZoom: function (zoom) {
-               for (var key in this._tiles) {
-                       if (this._tiles[key].coords.z !== zoom) {
-                               continue;
-                       }
-                       this._removeTile(key);
-               }
+       _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));
        },
 
-       _removeAllTiles: function () {
-               for (var key in this._tiles) {
-                       this._removeTile(key);
+       _limitZoom: function (zoom) {
+               var min = this.getMinZoom(),
+                   max = this.getMaxZoom(),
+                   snap = any3d ? this.options.zoomSnap : 1;
+               if (snap) {
+                       zoom = Math.round(zoom / snap) * snap;
                }
+               return Math.max(min, Math.min(max, zoom));
        },
 
-       _invalidateAll: function () {
-               for (var z in this._levels) {
-                       L.DomUtil.remove(this._levels[z].el);
-                       delete this._levels[z];
-               }
-               this._removeAllTiles();
+       _onPanTransitionStep: function () {
+               this.fire('move');
+       },
 
-               this._tileZoom = null;
+       _onPanTransitionEnd: function () {
+               removeClass(this._mapPane, 'leaflet-pan-anim');
+               this.fire('moveend');
        },
 
-       _retainParent: function (x, y, z, minZoom) {
-               var x2 = Math.floor(x / 2),
-                   y2 = Math.floor(y / 2),
-                   z2 = z - 1,
-                   coords2 = new L.Point(+x2, +y2);
-               coords2.z = +z2;
+       _tryAnimatedPan: function (center, options) {
+               // difference between the new and current centers in pixels
+               var offset = this._getCenterOffset(center)._trunc();
 
-               var key = this._tileCoordsToKey(coords2),
-                   tile = this._tiles[key];
+               // don't animate too far unless animate: true specified in options
+               if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; }
 
-               if (tile && tile.active) {
-                       tile.retain = true;
-                       return true;
+               this.panBy(offset, options);
 
-               } else if (tile && tile.loaded) {
-                       tile.retain = true;
-               }
+               return true;
+       },
 
-               if (z2 > minZoom) {
-                       return this._retainParent(x2, y2, z2, minZoom);
-               }
+       _createAnimProxy: function () {
 
-               return false;
-       },
+               var proxy = this._proxy = create$1('div', 'leaflet-proxy leaflet-zoom-animated');
+               this._panes.mapPane.appendChild(proxy);
 
-       _retainChildren: function (x, y, z, maxZoom) {
+               this.on('zoomanim', function (e) {
+                       var prop = TRANSFORM,
+                           transform = this._proxy.style[prop];
 
-               for (var i = 2 * x; i < 2 * x + 2; i++) {
-                       for (var j = 2 * y; j < 2 * y + 2; j++) {
+                       setTransform(this._proxy, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1));
 
-                               var coords = new L.Point(i, j);
-                               coords.z = z + 1;
+                       // workaround for case when transform is the same and so transitionend event is not fired
+                       if (transform === this._proxy.style[prop] && this._animatingZoom) {
+                               this._onZoomTransitionEnd();
+                       }
+               }, this);
 
-                               var key = this._tileCoordsToKey(coords),
-                                   tile = this._tiles[key];
+               this.on('load moveend', function () {
+                       var c = this.getCenter(),
+                           z = this.getZoom();
+                       setTransform(this._proxy, this.project(c, z), this.getZoomScale(z, 1));
+               }, this);
 
-                               if (tile && tile.active) {
-                                       tile.retain = true;
-                                       continue;
+               this._on('unload', this._destroyAnimProxy, this);
+       },
 
-                               } else if (tile && tile.loaded) {
-                                       tile.retain = true;
-                               }
+       _destroyAnimProxy: function () {
+               remove(this._proxy);
+               delete this._proxy;
+       },
 
-                               if (z + 1 < maxZoom) {
-                                       this._retainChildren(i, j, z + 1, maxZoom);
-                               }
-                       }
+       _catchTransitionEnd: function (e) {
+               if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) {
+                       this._onZoomTransitionEnd();
                }
        },
 
-       _resetView: function (e) {
-               var animating = e && (e.pinch || e.flyTo);
-               this._setView(this._map.getCenter(), this._map.getZoom(), animating, animating);
+       _nothingToAnimate: function () {
+               return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
        },
 
-       _animateZoom: function (e) {
-               this._setView(e.center, e.zoom, true, e.noUpdate);
-       },
+       _tryAnimatedZoom: function (center, zoom, options) {
 
-       _setView: function (center, zoom, noPrune, noUpdate) {
-               var tileZoom = Math.round(zoom);
-               if ((this.options.maxZoom !== undefined && tileZoom > this.options.maxZoom) ||
-                   (this.options.minZoom !== undefined && tileZoom < this.options.minZoom)) {
-                       tileZoom = undefined;
-               }
+               if (this._animatingZoom) { return true; }
 
-               var tileZoomChanged = this.options.updateWhenZooming && (tileZoom !== this._tileZoom);
+               options = options || {};
 
-               if (!noUpdate || tileZoomChanged) {
+               // 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._tileZoom = tileZoom;
+               // 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);
 
-                       if (this._abortLoading) {
-                               this._abortLoading();
-                       }
+               // 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; }
+
+               requestAnimFrame(function () {
+                       this
+                           ._moveStart(true, false)
+                           ._animateZoom(center, zoom, true);
+               }, this);
+
+               return true;
+       },
 
-                       this._updateLevels();
-                       this._resetGrid();
+       _animateZoom: function (center, zoom, startAnim, noUpdate) {
+               if (!this._mapPane) { return; }
 
-                       if (tileZoom !== undefined) {
-                               this._update(center);
-                       }
+               if (startAnim) {
+                       this._animatingZoom = true;
 
-                       if (!noPrune) {
-                               this._pruneTiles();
-                       }
+                       // remember what center/zoom to set after animation
+                       this._animateToCenter = center;
+                       this._animateToZoom = zoom;
 
-                       // Flag to prevent _updateOpacity from pruning tiles during
-                       // a zoom anim or a pinch gesture
-                       this._noPrune = !!noPrune;
+                       addClass(this._mapPane, 'leaflet-zoom-anim');
                }
 
-               this._setZoomTransforms(center, zoom);
-       },
+               // @event zoomanim: ZoomAnimEvent
+               // Fired at least once per zoom animation. For continuous zoom, like pinch zooming, fired once per frame during zoom.
+               this.fire('zoomanim', {
+                       center: center,
+                       zoom: zoom,
+                       noUpdate: noUpdate
+               });
 
-       _setZoomTransforms: function (center, zoom) {
-               for (var i in this._levels) {
-                       this._setZoomTransform(this._levels[i], center, zoom);
-               }
+               // Work around webkit not firing 'transitionend', see https://github.com/Leaflet/Leaflet/issues/3689, 2693
+               setTimeout(bind(this._onZoomTransitionEnd, this), 250);
        },
 
-       _setZoomTransform: function (level, center, zoom) {
-               var scale = this._map.getZoomScale(zoom, level.zoom),
-                   translate = level.origin.multiplyBy(scale)
-                       .subtract(this._map._getNewPixelOrigin(center, zoom)).round();
+       _onZoomTransitionEnd: function () {
+               if (!this._animatingZoom) { return; }
 
-               if (L.Browser.any3d) {
-                       L.DomUtil.setTransform(level.el, translate, scale);
-               } else {
-                       L.DomUtil.setPosition(level.el, translate);
+               if (this._mapPane) {
+                       removeClass(this._mapPane, 'leaflet-zoom-anim');
                }
-       },
 
-       _resetGrid: function () {
-               var map = this._map,
-                   crs = map.options.crs,
-                   tileSize = this._tileSize = this.getTileSize(),
-                   tileZoom = this._tileZoom;
+               this._animatingZoom = false;
 
-               var bounds = this._map.getPixelWorldBounds(this._tileZoom);
-               if (bounds) {
-                       this._globalTileRange = this._pxBoundsToTileRange(bounds);
-               }
+               this._move(this._animateToCenter, this._animateToZoom);
 
-               this._wrapX = crs.wrapLng && !this.options.noWrap && [
-                       Math.floor(map.project([0, crs.wrapLng[0]], tileZoom).x / tileSize.x),
-                       Math.ceil(map.project([0, crs.wrapLng[1]], tileZoom).x / tileSize.y)
-               ];
-               this._wrapY = crs.wrapLat && !this.options.noWrap && [
-                       Math.floor(map.project([crs.wrapLat[0], 0], tileZoom).y / tileSize.x),
-                       Math.ceil(map.project([crs.wrapLat[1], 0], tileZoom).y / tileSize.y)
-               ];
-       },
+               // This anim frame should prevent an obscure iOS webkit tile loading race condition.
+               requestAnimFrame(function () {
+                       this._moveEnd(true);
+               }, this);
+       }
+});
 
-       _onMoveEnd: function () {
-               if (!this._map || this._map._animatingZoom) { return; }
+// @section
 
-               this._update();
-       },
+// @factory L.map(id: String, options?: Map options)
+// Instantiates a map object given the DOM ID of a `<div>` element
+// and optionally an object literal with `Map options`.
+//
+// @alternative
+// @factory L.map(el: HTMLElement, options?: Map options)
+// Instantiates a map object given an instance of a `<div>` HTML element
+// and optionally an object literal with `Map options`.
+function createMap(id, options) {
+       return new Map(id, options);
+}
 
-       _getTiledPixelBounds: function (center) {
-               var map = this._map,
-                   mapZoom = map._animatingZoom ? Math.max(map._animateToZoom, map.getZoom()) : map.getZoom(),
-                   scale = map.getZoomScale(mapZoom, this._tileZoom),
-                   pixelCenter = map.project(center, this._tileZoom).floor(),
-                   halfSize = map.getSize().divideBy(scale * 2);
+/*
+ * @class Control
+ * @aka L.Control
+ * @inherits Class
+ *
+ * L.Control is a base class for implementing map controls. Handles positioning.
+ * All other controls extend from this class.
+ */
 
-               return new L.Bounds(pixelCenter.subtract(halfSize), pixelCenter.add(halfSize));
+var Control = Class.extend({
+       // @section
+       // @aka Control options
+       options: {
+               // @option position: String = 'topright'
+               // The position of the control (one of the map corners). Possible values are `'topleft'`,
+               // `'topright'`, `'bottomleft'` or `'bottomright'`
+               position: 'topright'
        },
 
-       // Private method to load tiles in the grid's active zoom level according to map bounds
-       _update: function (center) {
-               var map = this._map;
-               if (!map) { return; }
-               var zoom = map.getZoom();
+       initialize: function (options) {
+               setOptions(this, options);
+       },
 
-               if (center === undefined) { center = map.getCenter(); }
-               if (this._tileZoom === undefined) { return; }   // if out of minzoom/maxzoom
+       /* @section
+        * Classes extending L.Control will inherit the following methods:
+        *
+        * @method getPosition: string
+        * Returns the position of the control.
+        */
+       getPosition: function () {
+               return this.options.position;
+       },
 
-               var pixelBounds = this._getTiledPixelBounds(center),
-                   tileRange = this._pxBoundsToTileRange(pixelBounds),
-                   tileCenter = tileRange.getCenter(),
-                   queue = [],
-                   margin = this.options.keepBuffer,
-                   noPruneRange = new L.Bounds(tileRange.getBottomLeft().subtract([margin, -margin]),
-                                             tileRange.getTopRight().add([margin, -margin]));
+       // @method setPosition(position: string): this
+       // Sets the position of the control.
+       setPosition: function (position) {
+               var map = this._map;
 
-               for (var key in this._tiles) {
-                       var c = this._tiles[key].coords;
-                       if (c.z !== this._tileZoom || !noPruneRange.contains(L.point(c.x, c.y))) {
-                               this._tiles[key].current = false;
-                       }
+               if (map) {
+                       map.removeControl(this);
                }
 
-               // _update just loads more tiles. If the tile zoom level differs too much
-               // from the map's, let _setView reset levels and prune old tiles.
-               if (Math.abs(zoom - this._tileZoom) > 1) { this._setView(center, zoom); return; }
-
-               // create a queue of coordinates to load tiles from
-               for (var j = tileRange.min.y; j <= tileRange.max.y; j++) {
-                       for (var i = tileRange.min.x; i <= tileRange.max.x; i++) {
-                               var coords = new L.Point(i, j);
-                               coords.z = this._tileZoom;
-
-                               if (!this._isValidTile(coords)) { continue; }
+               this.options.position = position;
 
-                               var tile = this._tiles[this._tileCoordsToKey(coords)];
-                               if (tile) {
-                                       tile.current = true;
-                               } else {
-                                       queue.push(coords);
-                               }
-                       }
+               if (map) {
+                       map.addControl(this);
                }
 
-               // sort tile queue to load tiles in order of their distance to center
-               queue.sort(function (a, b) {
-                       return a.distanceTo(tileCenter) - b.distanceTo(tileCenter);
-               });
-
-               if (queue.length !== 0) {
-                       // if it's the first batch of tiles to load
-                       if (!this._loading) {
-                               this._loading = true;
-                               // @event loading: Event
-                               // Fired when the grid layer starts loading tiles.
-                               this.fire('loading');
-                       }
+               return this;
+       },
 
-                       // create DOM fragment to append tiles in one batch
-                       var fragment = document.createDocumentFragment();
+       // @method getContainer: HTMLElement
+       // Returns the HTMLElement that contains the control.
+       getContainer: function () {
+               return this._container;
+       },
 
-                       for (i = 0; i < queue.length; i++) {
-                               this._addTile(queue[i], fragment);
-                       }
+       // @method addTo(map: Map): this
+       // Adds the control to the given map.
+       addTo: function (map) {
+               this.remove();
+               this._map = map;
 
-                       this._level.el.appendChild(fragment);
-               }
-       },
+               var container = this._container = this.onAdd(map),
+                   pos = this.getPosition(),
+                   corner = map._controlCorners[pos];
 
-       _isValidTile: function (coords) {
-               var crs = this._map.options.crs;
+               addClass(container, 'leaflet-control');
 
-               if (!crs.infinite) {
-                       // don't load tile if it's out of bounds and not wrapped
-                       var bounds = this._globalTileRange;
-                       if ((!crs.wrapLng && (coords.x < bounds.min.x || coords.x > bounds.max.x)) ||
-                           (!crs.wrapLat && (coords.y < bounds.min.y || coords.y > bounds.max.y))) { return false; }
+               if (pos.indexOf('bottom') !== -1) {
+                       corner.insertBefore(container, corner.firstChild);
+               } else {
+                       corner.appendChild(container);
                }
 
-               if (!this.options.bounds) { return true; }
+               this._map.on('unload', this.remove, this);
 
-               // don't load tile if it doesn't intersect the bounds in options
-               var tileBounds = this._tileCoordsToBounds(coords);
-               return L.latLngBounds(this.options.bounds).overlaps(tileBounds);
+               return this;
        },
 
-       _keyToBounds: function (key) {
-               return this._tileCoordsToBounds(this._keyToTileCoords(key));
-       },
+       // @method remove: this
+       // Removes the control from the map it is currently active on.
+       remove: function () {
+               if (!this._map) {
+                       return this;
+               }
 
-       // converts tile coordinates to its geographical bounds
-       _tileCoordsToBounds: function (coords) {
+               remove(this._container);
 
-               var map = this._map,
-                   tileSize = this.getTileSize(),
+               if (this.onRemove) {
+                       this.onRemove(this._map);
+               }
 
-                   nwPoint = coords.scaleBy(tileSize),
-                   sePoint = nwPoint.add(tileSize),
+               this._map.off('unload', this.remove, this);
+               this._map = null;
 
-                   nw = map.unproject(nwPoint, coords.z),
-                   se = map.unproject(sePoint, coords.z);
+               return this;
+       },
 
-               if (!this.options.noWrap) {
-                       nw = map.wrapLatLng(nw);
-                       se = map.wrapLatLng(se);
+       _refocusOnMap: function (e) {
+               // if map exists and event is not a keyboard event
+               if (this._map && e && e.screenX > 0 && e.screenY > 0) {
+                       this._map.getContainer().focus();
                }
+       }
+});
 
-               return new L.LatLngBounds(nw, se);
-       },
+var control = function (options) {
+       return new Control(options);
+};
 
-       // converts tile coordinates to key for the tile cache
-       _tileCoordsToKey: function (coords) {
-               return coords.x + ':' + coords.y + ':' + coords.z;
+/* @section Extension methods
+ * @uninheritable
+ *
+ * Every control should extend from `L.Control` and (re-)implement the following methods.
+ *
+ * @method onAdd(map: Map): HTMLElement
+ * Should return the container DOM element for the control and add listeners on relevant map events. Called on [`control.addTo(map)`](#control-addTo).
+ *
+ * @method onRemove(map: Map)
+ * Optional method. Should contain all clean up code that removes the listeners previously added in [`onAdd`](#control-onadd). Called on [`control.remove()`](#control-remove).
+ */
+
+/* @namespace Map
+ * @section Methods for Layers and Controls
+ */
+Map.include({
+       // @method addControl(control: Control): this
+       // Adds the given control to the map
+       addControl: function (control) {
+               control.addTo(this);
+               return this;
        },
 
-       // converts tile cache key to coordinates
-       _keyToTileCoords: function (key) {
-               var k = key.split(':'),
-                   coords = new L.Point(+k[0], +k[1]);
-               coords.z = +k[2];
-               return coords;
+       // @method removeControl(control: Control): this
+       // Removes the given control from the map
+       removeControl: function (control) {
+               control.remove();
+               return this;
        },
 
-       _removeTile: function (key) {
-               var tile = this._tiles[key];
-               if (!tile) { return; }
+       _initControlPos: function () {
+               var corners = this._controlCorners = {},
+                   l = 'leaflet-',
+                   container = this._controlContainer =
+                           create$1('div', l + 'control-container', this._container);
 
-               L.DomUtil.remove(tile.el);
+               function createCorner(vSide, hSide) {
+                       var className = l + vSide + ' ' + l + hSide;
 
-               delete this._tiles[key];
+                       corners[vSide + hSide] = create$1('div', className, container);
+               }
 
-               // @event tileunload: TileEvent
-               // Fired when a tile is removed (e.g. when a tile goes off the screen).
-               this.fire('tileunload', {
-                       tile: tile.el,
-                       coords: this._keyToTileCoords(key)
-               });
+               createCorner('top', 'left');
+               createCorner('top', 'right');
+               createCorner('bottom', 'left');
+               createCorner('bottom', 'right');
        },
 
-       _initTile: function (tile) {
-               L.DomUtil.addClass(tile, 'leaflet-tile');
-
-               var tileSize = this.getTileSize();
-               tile.style.width = tileSize.x + 'px';
-               tile.style.height = tileSize.y + 'px';
-
-               tile.onselectstart = L.Util.falseFn;
-               tile.onmousemove = L.Util.falseFn;
-
-               // update opacity on tiles in IE7-8 because of filter inheritance problems
-               if (L.Browser.ielt9 && this.options.opacity < 1) {
-                       L.DomUtil.setOpacity(tile, this.options.opacity);
+       _clearControlPos: function () {
+               for (var i in this._controlCorners) {
+                       remove(this._controlCorners[i]);
                }
+               remove(this._controlContainer);
+               delete this._controlCorners;
+               delete this._controlContainer;
+       }
+});
 
-               // without this hack, tiles disappear after zoom on Chrome for Android
-               // https://github.com/Leaflet/Leaflet/issues/2078
-               if (L.Browser.android && !L.Browser.android23) {
-                       tile.style.WebkitBackfaceVisibility = 'hidden';
-               }
-       },
+/*
+ * @class Control.Layers
+ * @aka L.Control.Layers
+ * @inherits Control
+ *
+ * The layers control gives users the ability to switch between different base layers and switch overlays on/off (check out the [detailed example](http://leafletjs.com/examples/layers-control/)). Extends `Control`.
+ *
+ * @example
+ *
+ * ```js
+ * var baseLayers = {
+ *     "Mapbox": mapbox,
+ *     "OpenStreetMap": osm
+ * };
+ *
+ * var overlays = {
+ *     "Marker": marker,
+ *     "Roads": roadsLayer
+ * };
+ *
+ * L.control.layers(baseLayers, overlays).addTo(map);
+ * ```
+ *
+ * The `baseLayers` and `overlays` parameters are object literals with layer names as keys and `Layer` objects as values:
+ *
+ * ```js
+ * {
+ *     "<someName1>": layer1,
+ *     "<someName2>": layer2
+ * }
+ * ```
+ *
+ * The layer names can contain HTML, which allows you to add additional styling to the items:
+ *
+ * ```js
+ * {"<img src='my-layer-icon' /> <span class='my-layer-item'>My Layer</span>": myLayer}
+ * ```
+ */
 
-       _addTile: function (coords, container) {
-               var tilePos = this._getTilePos(coords),
-                   key = this._tileCoordsToKey(coords);
+var Layers = Control.extend({
+       // @section
+       // @aka Control.Layers options
+       options: {
+               // @option collapsed: Boolean = true
+               // If `true`, the control will be collapsed into an icon and expanded on mouse hover or touch.
+               collapsed: true,
+               position: 'topright',
 
-               var tile = this.createTile(this._wrapCoords(coords), L.bind(this._tileReady, this, coords));
+               // @option autoZIndex: Boolean = true
+               // If `true`, the control will assign zIndexes in increasing order to all of its layers so that the order is preserved when switching them on/off.
+               autoZIndex: true,
 
-               this._initTile(tile);
+               // @option hideSingleBase: Boolean = false
+               // If `true`, the base layers in the control will be hidden when there is only one.
+               hideSingleBase: false,
 
-               // if createTile is defined with a second argument ("done" callback),
-               // we know that tile is async and will be ready later; otherwise
-               if (this.createTile.length < 2) {
-                       // mark tile as ready, but delay one frame for opacity animation to happen
-                       L.Util.requestAnimFrame(L.bind(this._tileReady, this, coords, null, tile));
-               }
+               // @option sortLayers: Boolean = false
+               // Whether to sort the layers. When `false`, layers will keep the order
+               // in which they were added to the control.
+               sortLayers: false,
 
-               L.DomUtil.setPosition(tile, tilePos);
+               // @option sortFunction: Function = *
+               // A [compare function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/sort)
+               // that will be used for sorting the layers, when `sortLayers` is `true`.
+               // The function receives both the `L.Layer` instances and their names, as in
+               // `sortFunction(layerA, layerB, nameA, nameB)`.
+               // By default, it sorts layers alphabetically by their name.
+               sortFunction: function (layerA, layerB, nameA, nameB) {
+                       return nameA < nameB ? -1 : (nameB < nameA ? 1 : 0);
+               }
+       },
 
-               // save tile in cache
-               this._tiles[key] = {
-                       el: tile,
-                       coords: coords,
-                       current: true
-               };
+       initialize: function (baseLayers, overlays, options) {
+               setOptions(this, options);
 
-               container.appendChild(tile);
-               // @event tileloadstart: TileEvent
-               // Fired when a tile is requested and starts loading.
-               this.fire('tileloadstart', {
-                       tile: tile,
-                       coords: coords
-               });
-       },
+               this._layerControlInputs = [];
+               this._layers = [];
+               this._lastZIndex = 0;
+               this._handlingClick = false;
 
-       _tileReady: function (coords, err, tile) {
-               if (!this._map) { return; }
+               for (var i in baseLayers) {
+                       this._addLayer(baseLayers[i], i);
+               }
 
-               if (err) {
-                       // @event tileerror: TileErrorEvent
-                       // Fired when there is an error loading a tile.
-                       this.fire('tileerror', {
-                               error: err,
-                               tile: tile,
-                               coords: coords
-                       });
+               for (i in overlays) {
+                       this._addLayer(overlays[i], i, true);
                }
+       },
 
-               var key = this._tileCoordsToKey(coords);
+       onAdd: function (map) {
+               this._initLayout();
+               this._update();
 
-               tile = this._tiles[key];
-               if (!tile) { return; }
+               this._map = map;
+               map.on('zoomend', this._checkDisabledLayers, this);
 
-               tile.loaded = +new Date();
-               if (this._map._fadeAnimated) {
-                       L.DomUtil.setOpacity(tile.el, 0);
-                       L.Util.cancelAnimFrame(this._fadeFrame);
-                       this._fadeFrame = L.Util.requestAnimFrame(this._updateOpacity, this);
-               } else {
-                       tile.active = true;
-                       this._pruneTiles();
+               for (var i = 0; i < this._layers.length; i++) {
+                       this._layers[i].layer.on('add remove', this._onLayerChange, this);
                }
 
-               if (!err) {
-                       L.DomUtil.addClass(tile.el, 'leaflet-tile-loaded');
+               return this._container;
+       },
 
-                       // @event tileload: TileEvent
-                       // Fired when a tile loads.
-                       this.fire('tileload', {
-                               tile: tile.el,
-                               coords: coords
-                       });
-               }
+       addTo: function (map) {
+               Control.prototype.addTo.call(this, map);
+               // Trigger expand after Layers Control has been inserted into DOM so that is now has an actual height.
+               return this._expandIfNotCollapsed();
+       },
 
-               if (this._noTilesToLoad()) {
-                       this._loading = false;
-                       // @event load: Event
-                       // Fired when the grid layer loaded all visible tiles.
-                       this.fire('load');
+       onRemove: function () {
+               this._map.off('zoomend', this._checkDisabledLayers, this);
 
-                       if (L.Browser.ielt9 || !this._map._fadeAnimated) {
-                               L.Util.requestAnimFrame(this._pruneTiles, this);
-                       } else {
-                               // Wait a bit more than 0.2 secs (the duration of the tile fade-in)
-                               // to trigger a pruning.
-                               setTimeout(L.bind(this._pruneTiles, this), 250);
-                       }
+               for (var i = 0; i < this._layers.length; i++) {
+                       this._layers[i].layer.off('add remove', this._onLayerChange, this);
                }
        },
 
-       _getTilePos: function (coords) {
-               return coords.scaleBy(this.getTileSize()).subtract(this._level.origin);
+       // @method addBaseLayer(layer: Layer, name: String): this
+       // Adds a base layer (radio button entry) with the given name to the control.
+       addBaseLayer: function (layer, name) {
+               this._addLayer(layer, name);
+               return (this._map) ? this._update() : this;
        },
 
-       _wrapCoords: function (coords) {
-               var newCoords = new L.Point(
-                       this._wrapX ? L.Util.wrapNum(coords.x, this._wrapX) : coords.x,
-                       this._wrapY ? L.Util.wrapNum(coords.y, this._wrapY) : coords.y);
-               newCoords.z = coords.z;
-               return newCoords;
+       // @method addOverlay(layer: Layer, name: String): this
+       // Adds an overlay (checkbox entry) with the given name to the control.
+       addOverlay: function (layer, name) {
+               this._addLayer(layer, name, true);
+               return (this._map) ? this._update() : this;
        },
 
-       _pxBoundsToTileRange: function (bounds) {
-               var tileSize = this.getTileSize();
-               return new L.Bounds(
-                       bounds.min.unscaleBy(tileSize).floor(),
-                       bounds.max.unscaleBy(tileSize).ceil().subtract([1, 1]));
-       },
+       // @method removeLayer(layer: Layer): this
+       // Remove the given layer from the control.
+       removeLayer: function (layer) {
+               layer.off('add remove', this._onLayerChange, this);
 
-       _noTilesToLoad: function () {
-               for (var key in this._tiles) {
-                       if (!this._tiles[key].loaded) { return false; }
+               var obj = this._getLayer(stamp(layer));
+               if (obj) {
+                       this._layers.splice(this._layers.indexOf(obj), 1);
                }
-               return true;
-       }
-});
-
-// @factory L.gridLayer(options?: GridLayer options)
-// Creates a new instance of GridLayer with the supplied options.
-L.gridLayer = function (options) {
-       return new L.GridLayer(options);
-};
-
-
+               return (this._map) ? this._update() : this;
+       },
 
-/*
- * @class TileLayer
- * @inherits GridLayer
- * @aka L.TileLayer
- * Used to load and display tile layers on the map. Extends `GridLayer`.
- *
- * @example
- *
- * ```js
- * L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png?{foo}', {foo: 'bar'}).addTo(map);
- * ```
- *
- * @section URL template
- * @example
- *
- * A string of the following form:
- *
- * ```
- * 'http://{s}.somedomain.com/blabla/{z}/{x}/{y}{r}.png'
- * ```
- *
- * `{s}` means one of the available subdomains (used sequentially to help with browser parallel requests per domain limitation; subdomain values are specified in options; `a`, `b` or `c` by default, can be omitted), `{z}` — zoom level, `{x}` and `{y}` — tile coordinates. `{r}` can be used to add @2x to the URL to load retina tiles.
- *
- * You can use custom keys in the template, which will be [evaluated](#util-template) from TileLayer options, like this:
- *
- * ```
- * L.tileLayer('http://{s}.somedomain.com/{foo}/{z}/{x}/{y}.png', {foo: 'bar'});
- * ```
- */
+       // @method expand(): this
+       // Expand the control container if collapsed.
+       expand: function () {
+               addClass(this._container, 'leaflet-control-layers-expanded');
+               this._section.style.height = null;
+               var acceptableHeight = this._map.getSize().y - (this._container.offsetTop + 50);
+               if (acceptableHeight < this._section.clientHeight) {
+                       addClass(this._section, 'leaflet-control-layers-scrollbar');
+                       this._section.style.height = acceptableHeight + 'px';
+               } else {
+                       removeClass(this._section, 'leaflet-control-layers-scrollbar');
+               }
+               this._checkDisabledLayers();
+               return this;
+       },
 
+       // @method collapse(): this
+       // Collapse the control container if expanded.
+       collapse: function () {
+               removeClass(this._container, 'leaflet-control-layers-expanded');
+               return this;
+       },
 
-L.TileLayer = L.GridLayer.extend({
+       _initLayout: function () {
+               var className = 'leaflet-control-layers',
+                   container = this._container = create$1('div', className),
+                   collapsed = this.options.collapsed;
 
-       // @section
-       // @aka TileLayer options
-       options: {
-               // @option minZoom: Number = 0
-               // Minimum zoom number.
-               minZoom: 0,
+               // makes this work on IE touch devices by stopping it from firing a mouseout event when the touch is released
+               container.setAttribute('aria-haspopup', true);
 
-               // @option maxZoom: Number = 18
-               // Maximum zoom number.
-               maxZoom: 18,
+               disableClickPropagation(container);
+               disableScrollPropagation(container);
 
-               // @option maxNativeZoom: Number = null
-               // Maximum zoom number the tile source has available. If it is specified,
-               // the tiles on all zoom levels higher than `maxNativeZoom` will be loaded
-               // from `maxNativeZoom` level and auto-scaled.
-               maxNativeZoom: null,
+               var section = this._section = create$1('section', className + '-list');
 
-               // @option subdomains: String|String[] = 'abc'
-               // Subdomains of the tile service. Can be passed in the form of one string (where each letter is a subdomain name) or an array of strings.
-               subdomains: 'abc',
+               if (collapsed) {
+                       this._map.on('click', this.collapse, this);
 
-               // @option errorTileUrl: String = ''
-               // URL to the tile image to show in place of the tile that failed to load.
-               errorTileUrl: '',
+                       if (!android) {
+                               on(container, {
+                                       mouseenter: this.expand,
+                                       mouseleave: this.collapse
+                               }, this);
+                       }
+               }
 
-               // @option zoomOffset: Number = 0
-               // The zoom number used in tile URLs will be offset with this value.
-               zoomOffset: 0,
+               var link = this._layersLink = create$1('a', className + '-toggle', container);
+               link.href = '#';
+               link.title = 'Layers';
 
-               // @option tms: Boolean = false
-               // If `true`, inverses Y axis numbering for tiles (turn this on for [TMS](https://en.wikipedia.org/wiki/Tile_Map_Service) services).
-               tms: false,
+               if (touch) {
+                       on(link, 'click', stop);
+                       on(link, 'click', this.expand, this);
+               } else {
+                       on(link, 'focus', this.expand, this);
+               }
 
-               // @option zoomReverse: Boolean = false
-               // If set to true, the zoom number used in tile URLs will be reversed (`maxZoom - zoom` instead of `zoom`)
-               zoomReverse: false,
+               if (!collapsed) {
+                       this.expand();
+               }
 
-               // @option detectRetina: Boolean = false
-               // If `true` and user is on a retina display, it will request four tiles of half the specified size and a bigger zoom level in place of one to utilize the high resolution.
-               detectRetina: false,
+               this._baseLayersList = create$1('div', className + '-base', section);
+               this._separator = create$1('div', className + '-separator', section);
+               this._overlaysList = create$1('div', className + '-overlays', section);
 
-               // @option crossOrigin: Boolean = false
-               // If true, all tiles will have their crossOrigin attribute set to ''. This is needed if you want to access tile pixel data.
-               crossOrigin: false
+               container.appendChild(section);
        },
 
-       initialize: function (url, options) {
-
-               this._url = url;
-
-               options = L.setOptions(this, options);
-
-               // detecting retina displays, adjusting tileSize and zoom levels
-               if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {
-
-                       options.tileSize = Math.floor(options.tileSize / 2);
+       _getLayer: function (id) {
+               for (var i = 0; i < this._layers.length; i++) {
 
-                       if (!options.zoomReverse) {
-                               options.zoomOffset++;
-                               options.maxZoom--;
-                       } else {
-                               options.zoomOffset--;
-                               options.minZoom++;
+                       if (this._layers[i] && stamp(this._layers[i].layer) === id) {
+                               return this._layers[i];
                        }
+               }
+       },
 
-                       options.minZoom = Math.max(0, options.minZoom);
+       _addLayer: function (layer, name, overlay) {
+               if (this._map) {
+                       layer.on('add remove', this._onLayerChange, this);
                }
 
-               if (typeof options.subdomains === 'string') {
-                       options.subdomains = options.subdomains.split('');
+               this._layers.push({
+                       layer: layer,
+                       name: name,
+                       overlay: overlay
+               });
+
+               if (this.options.sortLayers) {
+                       this._layers.sort(bind(function (a, b) {
+                               return this.options.sortFunction(a.layer, b.layer, a.name, b.name);
+                       }, this));
                }
 
-               // for https://github.com/Leaflet/Leaflet/issues/137
-               if (!L.Browser.android) {
-                       this.on('tileunload', this._onTileRemove);
+               if (this.options.autoZIndex && layer.setZIndex) {
+                       this._lastZIndex++;
+                       layer.setZIndex(this._lastZIndex);
                }
+
+               this._expandIfNotCollapsed();
        },
 
-       // @method setUrl(url: String, noRedraw?: Boolean): this
-       // Updates the layer's URL template and redraws it (unless `noRedraw` is set to `true`).
-       setUrl: function (url, noRedraw) {
-               this._url = url;
+       _update: function () {
+               if (!this._container) { return this; }
 
-               if (!noRedraw) {
-                       this.redraw();
+               empty(this._baseLayersList);
+               empty(this._overlaysList);
+
+               this._layerControlInputs = [];
+               var baseLayersPresent, overlaysPresent, i, obj, baseLayersCount = 0;
+
+               for (i = 0; i < this._layers.length; i++) {
+                       obj = this._layers[i];
+                       this._addItem(obj);
+                       overlaysPresent = overlaysPresent || obj.overlay;
+                       baseLayersPresent = baseLayersPresent || !obj.overlay;
+                       baseLayersCount += !obj.overlay ? 1 : 0;
                }
-               return this;
-       },
 
-       // @method createTile(coords: Object, done?: Function): HTMLElement
-       // Called only internally, overrides GridLayer's [`createTile()`](#gridlayer-createtile)
-       // to return an `<img>` HTML element with the appropiate image URL given `coords`. The `done`
-       // callback is called when the tile has been loaded.
-       createTile: function (coords, done) {
-               var tile = document.createElement('img');
+               // Hide base layers section if there's only one layer.
+               if (this.options.hideSingleBase) {
+                       baseLayersPresent = baseLayersPresent && baseLayersCount > 1;
+                       this._baseLayersList.style.display = baseLayersPresent ? '' : 'none';
+               }
+
+               this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none';
 
-               L.DomEvent.on(tile, 'load', L.bind(this._tileOnLoad, this, done, tile));
-               L.DomEvent.on(tile, 'error', L.bind(this._tileOnError, this, done, tile));
+               return this;
+       },
 
-               if (this.options.crossOrigin) {
-                       tile.crossOrigin = '';
+       _onLayerChange: function (e) {
+               if (!this._handlingClick) {
+                       this._update();
                }
 
-               /*
-                Alt tag is set to empty string to keep screen readers from reading URL and for compliance reasons
-                http://www.w3.org/TR/WCAG20-TECHS/H67
-               */
-               tile.alt = '';
+               var obj = this._getLayer(stamp(e.target));
 
-               tile.src = this.getTileUrl(coords);
+               // @namespace Map
+               // @section Layer events
+               // @event baselayerchange: LayersControlEvent
+               // Fired when the base layer is changed through the [layer control](#control-layers).
+               // @event overlayadd: LayersControlEvent
+               // Fired when an overlay is selected through the [layer control](#control-layers).
+               // @event overlayremove: LayersControlEvent
+               // Fired when an overlay is deselected through the [layer control](#control-layers).
+               // @namespace Control.Layers
+               var type = obj.overlay ?
+                       (e.type === 'add' ? 'overlayadd' : 'overlayremove') :
+                       (e.type === 'add' ? 'baselayerchange' : null);
 
-               return tile;
+               if (type) {
+                       this._map.fire(type, obj);
+               }
        },
 
-       // @section Extension methods
-       // @uninheritable
-       // Layers extending `TileLayer` might reimplement the following method.
-       // @method getTileUrl(coords: Object): String
-       // Called only internally, returns the URL for a tile given its coordinates.
-       // Classes extending `TileLayer` can override this function to provide custom tile URL naming schemes.
-       getTileUrl: function (coords) {
-               var data = {
-                       r: L.Browser.retina ? '@2x' : '',
-                       s: this._getSubdomain(coords),
-                       x: coords.x,
-                       y: coords.y,
-                       z: this._getZoomForUrl()
-               };
-               if (this._map && !this._map.options.crs.infinite) {
-                       var invertedY = this._globalTileRange.max.y - coords.y;
-                       if (this.options.tms) {
-                               data['y'] = invertedY;
-                       }
-                       data['-y'] = invertedY;
-               }
+       // IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see http://bit.ly/PqYLBe)
+       _createRadioElement: function (name, checked) {
+
+               var radioHtml = '<input type="radio" class="leaflet-control-layers-selector" name="' +
+                               name + '"' + (checked ? ' checked="checked"' : '') + '/>';
+
+               var radioFragment = document.createElement('div');
+               radioFragment.innerHTML = radioHtml;
 
-               return L.Util.template(this._url, L.extend(data, this.options));
+               return radioFragment.firstChild;
        },
 
-       _tileOnLoad: function (done, tile) {
-               // For https://github.com/Leaflet/Leaflet/issues/3332
-               if (L.Browser.ielt9) {
-                       setTimeout(L.bind(done, this, null, tile), 0);
+       _addItem: function (obj) {
+               var label = document.createElement('label'),
+                   checked = this._map.hasLayer(obj.layer),
+                   input;
+
+               if (obj.overlay) {
+                       input = document.createElement('input');
+                       input.type = 'checkbox';
+                       input.className = 'leaflet-control-layers-selector';
+                       input.defaultChecked = checked;
                } else {
-                       done(null, tile);
+                       input = this._createRadioElement('leaflet-base-layers_' + stamp(this), checked);
                }
-       },
 
-       _tileOnError: function (done, tile, e) {
-               var errorUrl = this.options.errorTileUrl;
-               if (errorUrl) {
-                       tile.src = errorUrl;
-               }
-               done(e, tile);
-       },
+               this._layerControlInputs.push(input);
+               input.layerId = stamp(obj.layer);
 
-       getTileSize: function () {
-               var map = this._map,
-                   tileSize = L.GridLayer.prototype.getTileSize.call(this),
-                   zoom = this._tileZoom + this.options.zoomOffset,
-                   zoomN = this.options.maxNativeZoom;
+               on(input, 'click', this._onInputClick, this);
 
-               // increase tile size when overscaling
-               return zoomN !== null && zoom > zoomN ?
-                               tileSize.divideBy(map.getZoomScale(zoomN, zoom)).round() :
-                               tileSize;
-       },
+               var name = document.createElement('span');
+               name.innerHTML = ' ' + obj.name;
 
-       _onTileRemove: function (e) {
-               e.tile.onload = null;
+               // Helps from preventing layer control flicker when checkboxes are disabled
+               // https://github.com/Leaflet/Leaflet/issues/2771
+               var holder = document.createElement('div');
+
+               label.appendChild(holder);
+               holder.appendChild(input);
+               holder.appendChild(name);
+
+               var container = obj.overlay ? this._overlaysList : this._baseLayersList;
+               container.appendChild(label);
+
+               this._checkDisabledLayers();
+               return label;
        },
 
-       _getZoomForUrl: function () {
+       _onInputClick: function () {
+               var inputs = this._layerControlInputs,
+                   input, layer;
+               var addedLayers = [],
+                   removedLayers = [];
 
-               var options = this.options,
-                   zoom = this._tileZoom;
+               this._handlingClick = true;
+
+               for (var i = inputs.length - 1; i >= 0; i--) {
+                       input = inputs[i];
+                       layer = this._getLayer(input.layerId).layer;
+
+                       if (input.checked) {
+                               addedLayers.push(layer);
+                       } else if (!input.checked) {
+                               removedLayers.push(layer);
+                       }
+               }
 
-               if (options.zoomReverse) {
-                       zoom = options.maxZoom - zoom;
+               // Bugfix issue 2318: Should remove all old layers before readding new ones
+               for (i = 0; i < removedLayers.length; i++) {
+                       if (this._map.hasLayer(removedLayers[i])) {
+                               this._map.removeLayer(removedLayers[i]);
+                       }
+               }
+               for (i = 0; i < addedLayers.length; i++) {
+                       if (!this._map.hasLayer(addedLayers[i])) {
+                               this._map.addLayer(addedLayers[i]);
+                       }
                }
 
-               zoom += options.zoomOffset;
+               this._handlingClick = false;
 
-               return options.maxNativeZoom !== null ? Math.min(zoom, options.maxNativeZoom) : zoom;
+               this._refocusOnMap();
        },
 
-       _getSubdomain: function (tilePoint) {
-               var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length;
-               return this.options.subdomains[index];
-       },
+       _checkDisabledLayers: function () {
+               var inputs = this._layerControlInputs,
+                   input,
+                   layer,
+                   zoom = this._map.getZoom();
 
-       // stops loading all tiles in the background layer
-       _abortLoading: function () {
-               var i, tile;
-               for (i in this._tiles) {
-                       if (this._tiles[i].coords.z !== this._tileZoom) {
-                               tile = this._tiles[i].el;
+               for (var i = inputs.length - 1; i >= 0; i--) {
+                       input = inputs[i];
+                       layer = this._getLayer(input.layerId).layer;
+                       input.disabled = (layer.options.minZoom !== undefined && zoom < layer.options.minZoom) ||
+                                        (layer.options.maxZoom !== undefined && zoom > layer.options.maxZoom);
 
-                               tile.onload = L.Util.falseFn;
-                               tile.onerror = L.Util.falseFn;
+               }
+       },
 
-                               if (!tile.complete) {
-                                       tile.src = L.Util.emptyImageUrl;
-                                       L.DomUtil.remove(tile);
-                               }
-                       }
+       _expandIfNotCollapsed: function () {
+               if (this._map && !this.options.collapsed) {
+                       this.expand();
                }
-       }
-});
+               return this;
+       },
 
+       _expand: function () {
+               // Backward compatibility, remove me in 1.1.
+               return this.expand();
+       },
 
-// @factory L.tilelayer(urlTemplate: String, options?: TileLayer options)
-// Instantiates a tile layer object given a `URL template` and optionally an options object.
+       _collapse: function () {
+               // Backward compatibility, remove me in 1.1.
+               return this.collapse();
+       }
 
-L.tileLayer = function (url, options) {
-       return new L.TileLayer(url, options);
-};
+});
 
 
+// @factory L.control.layers(baselayers?: Object, overlays?: Object, options?: Control.Layers options)
+// Creates an attribution control with the given layers. Base layers will be switched with radio buttons, while overlays will be switched with checkboxes. Note that all base layers should be passed in the base layers object, but only one should be added to the map during map instantiation.
+var layers = function (baseLayers, overlays, options) {
+       return new Layers(baseLayers, overlays, options);
+};
 
 /*
- * @class TileLayer.WMS
- * @inherits TileLayer
- * @aka L.TileLayer.WMS
- * Used to display [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services as tile layers on the map. Extends `TileLayer`.
- *
- * @example
+ * @class Control.Zoom
+ * @aka L.Control.Zoom
+ * @inherits Control
  *
- * ```js
- * var nexrad = L.tileLayer.wms("http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi", {
- *     layers: 'nexrad-n0r-900913',
- *     format: 'image/png',
- *     transparent: true,
- *     attribution: "Weather data © 2012 IEM Nexrad"
- * });
- * ```
+ * A basic zoom control with two buttons (zoom in and zoom out). It is put on the map by default unless you set its [`zoomControl` option](#map-zoomcontrol) to `false`. Extends `Control`.
  */
 
-L.TileLayer.WMS = L.TileLayer.extend({
-
+var Zoom = Control.extend({
        // @section
-       // @aka TileLayer.WMS options
-       // If any custom options not documented here are used, they will be sent to the
-       // WMS server as extra parameters in each request URL. This can be useful for
-       // [non-standard vendor WMS parameters](http://docs.geoserver.org/stable/en/user/services/wms/vendor.html).
-       defaultWmsParams: {
-               service: 'WMS',
-               request: 'GetMap',
-
-               // @option layers: String = ''
-               // **(required)** Comma-separated list of WMS layers to show.
-               layers: '',
-
-               // @option styles: String = ''
-               // Comma-separated list of WMS styles.
-               styles: '',
-
-               // @option format: String = 'image/jpeg'
-               // WMS image format (use `'image/png'` for layers with transparency).
-               format: 'image/jpeg',
-
-               // @option transparent: Boolean = false
-               // If `true`, the WMS service will return images with transparency.
-               transparent: false,
-
-               // @option version: String = '1.1.1'
-               // Version of the WMS service to use
-               version: '1.1.1'
-       },
-
+       // @aka Control.Zoom options
        options: {
-               // @option crs: CRS = null
-               // Coordinate Reference System to use for the WMS requests, defaults to
-               // map CRS. Don't change this if you're not sure what it means.
-               crs: null,
+               position: 'topleft',
 
-               // @option uppercase: Boolean = false
-               // If `true`, WMS request parameter keys will be uppercase.
-               uppercase: false
-       },
+               // @option zoomInText: String = '+'
+               // The text set on the 'zoom in' button.
+               zoomInText: '+',
 
-       initialize: function (url, options) {
+               // @option zoomInTitle: String = 'Zoom in'
+               // The title set on the 'zoom in' button.
+               zoomInTitle: 'Zoom in',
 
-               this._url = url;
+               // @option zoomOutText: String = '&#x2212;'
+               // The text set on the 'zoom out' button.
+               zoomOutText: '&#x2212;',
 
-               var wmsParams = L.extend({}, this.defaultWmsParams);
+               // @option zoomOutTitle: String = 'Zoom out'
+               // The title set on the 'zoom out' button.
+               zoomOutTitle: 'Zoom out'
+       },
 
-               // all keys that are not TileLayer options go to WMS params
-               for (var i in options) {
-                       if (!(i in this.options)) {
-                               wmsParams[i] = options[i];
-                       }
-               }
+       onAdd: function (map) {
+               var zoomName = 'leaflet-control-zoom',
+                   container = create$1('div', zoomName + ' leaflet-bar'),
+                   options = this.options;
 
-               options = L.setOptions(this, options);
+               this._zoomInButton  = this._createButton(options.zoomInText, options.zoomInTitle,
+                       zoomName + '-in',  container, this._zoomIn);
+               this._zoomOutButton = this._createButton(options.zoomOutText, options.zoomOutTitle,
+                       zoomName + '-out', container, this._zoomOut);
 
-               wmsParams.width = wmsParams.height = options.tileSize * (options.detectRetina && L.Browser.retina ? 2 : 1);
+               this._updateDisabled();
+               map.on('zoomend zoomlevelschange', this._updateDisabled, this);
 
-               this.wmsParams = wmsParams;
+               return container;
        },
 
-       onAdd: function (map) {
+       onRemove: function (map) {
+               map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+       },
 
-               this._crs = this.options.crs || map.options.crs;
-               this._wmsVersion = parseFloat(this.wmsParams.version);
+       disable: function () {
+               this._disabled = true;
+               this._updateDisabled();
+               return this;
+       },
 
-               var projectionKey = this._wmsVersion >= 1.3 ? 'crs' : 'srs';
-               this.wmsParams[projectionKey] = this._crs.code;
+       enable: function () {
+               this._disabled = false;
+               this._updateDisabled();
+               return this;
+       },
 
-               L.TileLayer.prototype.onAdd.call(this, map);
+       _zoomIn: function (e) {
+               if (!this._disabled && this._map._zoom < this._map.getMaxZoom()) {
+                       this._map.zoomIn(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
+               }
        },
 
-       getTileUrl: function (coords) {
+       _zoomOut: function (e) {
+               if (!this._disabled && this._map._zoom > this._map.getMinZoom()) {
+                       this._map.zoomOut(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
+               }
+       },
 
-               var tileBounds = this._tileCoordsToBounds(coords),
-                   nw = this._crs.project(tileBounds.getNorthWest()),
-                   se = this._crs.project(tileBounds.getSouthEast()),
+       _createButton: function (html, title, className, container, fn) {
+               var link = create$1('a', className, container);
+               link.innerHTML = html;
+               link.href = '#';
+               link.title = title;
 
-                   bbox = (this._wmsVersion >= 1.3 && this._crs === L.CRS.EPSG4326 ?
-                           [se.y, nw.x, nw.y, se.x] :
-                           [nw.x, se.y, se.x, nw.y]).join(','),
+               /*
+                * Will force screen readers like VoiceOver to read this as "Zoom in - button"
+                */
+               link.setAttribute('role', 'button');
+               link.setAttribute('aria-label', title);
 
-                   url = L.TileLayer.prototype.getTileUrl.call(this, coords);
+               disableClickPropagation(link);
+               on(link, 'click', stop);
+               on(link, 'click', fn, this);
+               on(link, 'click', this._refocusOnMap, this);
 
-               return url +
-                       L.Util.getParamString(this.wmsParams, url, this.options.uppercase) +
-                       (this.options.uppercase ? '&BBOX=' : '&bbox=') + bbox;
+               return link;
        },
 
-       // @method setParams(params: Object, noRedraw?: Boolean): this
-       // Merges an object with the new parameters and re-requests tiles on the current screen (unless `noRedraw` was set to true).
-       setParams: function (params, noRedraw) {
+       _updateDisabled: function () {
+               var map = this._map,
+                   className = 'leaflet-disabled';
 
-               L.extend(this.wmsParams, params);
+               removeClass(this._zoomInButton, className);
+               removeClass(this._zoomOutButton, className);
 
-               if (!noRedraw) {
-                       this.redraw();
+               if (this._disabled || map._zoom === map.getMinZoom()) {
+                       addClass(this._zoomOutButton, className);
+               }
+               if (this._disabled || map._zoom === map.getMaxZoom()) {
+                       addClass(this._zoomInButton, className);
                }
-
-               return this;
        }
 });
 
+// @namespace Map
+// @section Control options
+// @option zoomControl: Boolean = true
+// Whether a [zoom control](#control-zoom) is added to the map by default.
+Map.mergeOptions({
+       zoomControl: true
+});
 
-// @factory L.tileLayer.wms(baseUrl: String, options: TileLayer.WMS options)
-// Instantiates a WMS tile layer object given a base URL of the WMS service and a WMS parameters/options object.
-L.tileLayer.wms = function (url, options) {
-       return new L.TileLayer.WMS(url, options);
-};
-
+Map.addInitHook(function () {
+       if (this.options.zoomControl) {
+               // @section Controls
+               // @property zoomControl: Control.Zoom
+               // The default zoom control (only available if the
+               // [`zoomControl` option](#map-zoomcontrol) was `true` when creating the map).
+               this.zoomControl = new Zoom();
+               this.addControl(this.zoomControl);
+       }
+});
 
+// @namespace Control.Zoom
+// @factory L.control.zoom(options: Control.Zoom options)
+// Creates a zoom control
+var zoom = function (options) {
+       return new Zoom(options);
+};
 
 /*
- * @class ImageOverlay
- * @aka L.ImageOverlay
- * @inherits Interactive layer
+ * @class Control.Scale
+ * @aka L.Control.Scale
+ * @inherits Control
  *
- * Used to load and display a single image over specific bounds of the map. Extends `Layer`.
+ * A simple scale control that shows the scale of the current center of screen in metric (m/km) and imperial (mi/ft) systems. Extends `Control`.
  *
  * @example
  *
  * ```js
- * var imageUrl = 'http://www.lib.utexas.edu/maps/historical/newark_nj_1922.jpg',
- *     imageBounds = [[40.712216, -74.22655], [40.773941, -74.12544]];
- * L.imageOverlay(imageUrl, imageBounds).addTo(map);
+ * L.control.scale().addTo(map);
  * ```
  */
 
-L.ImageOverlay = L.Layer.extend({
-
+var Scale = Control.extend({
        // @section
-       // @aka ImageOverlay options
+       // @aka Control.Scale options
        options: {
-               // @option opacity: Number = 1.0
-               // The opacity of the image overlay.
-               opacity: 1,
-
-               // @option alt: String = ''
-               // Text for the `alt` attribute of the image (useful for accessibility).
-               alt: '',
-
-               // @option interactive: Boolean = false
-               // If `true`, the image overlay will emit [mouse events](#interactive-layer) when clicked or hovered.
-               interactive: false,
-
-               // @option attribution: String = null
-               // An optional string containing HTML to be shown on the `Attribution control`
-               attribution: null,
-
-               // @option crossOrigin: Boolean = false
-               // If true, the image will have its crossOrigin attribute set to ''. This is needed if you want to access image pixel data.
-               crossOrigin: false
-       },
-
-       initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)
-               this._url = url;
-               this._bounds = L.latLngBounds(bounds);
-
-               L.setOptions(this, options);
-       },
-
-       onAdd: function () {
-               if (!this._image) {
-                       this._initImage();
-
-                       if (this.options.opacity < 1) {
-                               this._updateOpacity();
-                       }
-               }
-
-               if (this.options.interactive) {
-                       L.DomUtil.addClass(this._image, 'leaflet-interactive');
-                       this.addInteractiveTarget(this._image);
-               }
+               position: 'bottomleft',
 
-               this.getPane().appendChild(this._image);
-               this._reset();
-       },
+               // @option maxWidth: Number = 100
+               // Maximum width of the control in pixels. The width is set dynamically to show round values (e.g. 100, 200, 500).
+               maxWidth: 100,
 
-       onRemove: function () {
-               L.DomUtil.remove(this._image);
-               if (this.options.interactive) {
-                       this.removeInteractiveTarget(this._image);
-               }
-       },
+               // @option metric: Boolean = True
+               // Whether to show the metric scale line (m/km).
+               metric: true,
 
-       // @method setOpacity(opacity: Number): this
-       // Sets the opacity of the overlay.
-       setOpacity: function (opacity) {
-               this.options.opacity = opacity;
+               // @option imperial: Boolean = True
+               // Whether to show the imperial scale line (mi/ft).
+               imperial: true
 
-               if (this._image) {
-                       this._updateOpacity();
-               }
-               return this;
+               // @option updateWhenIdle: Boolean = false
+               // If `true`, the control is updated on [`moveend`](#map-moveend), otherwise it's always up-to-date (updated on [`move`](#map-move)).
        },
 
-       setStyle: function (styleOpts) {
-               if (styleOpts.opacity) {
-                       this.setOpacity(styleOpts.opacity);
-               }
-               return this;
-       },
+       onAdd: function (map) {
+               var className = 'leaflet-control-scale',
+                   container = create$1('div', className),
+                   options = this.options;
 
-       // @method bringToFront(): this
-       // Brings the layer to the top of all overlays.
-       bringToFront: function () {
-               if (this._map) {
-                       L.DomUtil.toFront(this._image);
-               }
-               return this;
-       },
+               this._addScales(options, className + '-line', container);
 
-       // @method bringToBack(): this
-       // Brings the layer to the bottom of all overlays.
-       bringToBack: function () {
-               if (this._map) {
-                       L.DomUtil.toBack(this._image);
-               }
-               return this;
+               map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+               map.whenReady(this._update, this);
+
+               return container;
        },
 
-       // @method setUrl(url: String): this
-       // Changes the URL of the image.
-       setUrl: function (url) {
-               this._url = url;
+       onRemove: function (map) {
+               map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+       },
 
-               if (this._image) {
-                       this._image.src = url;
+       _addScales: function (options, className, container) {
+               if (options.metric) {
+                       this._mScale = create$1('div', className, container);
+               }
+               if (options.imperial) {
+                       this._iScale = create$1('div', className, container);
                }
-               return this;
        },
 
-       setBounds: function (bounds) {
-               this._bounds = bounds;
+       _update: function () {
+               var map = this._map,
+                   y = map.getSize().y / 2;
 
-               if (this._map) {
-                       this._reset();
-               }
-               return this;
-       },
+               var maxMeters = map.distance(
+                       map.containerPointToLatLng([0, y]),
+                       map.containerPointToLatLng([this.options.maxWidth, y]));
 
-       getAttribution: function () {
-               return this.options.attribution;
+               this._updateScales(maxMeters);
        },
 
-       getEvents: function () {
-               var events = {
-                       zoom: this._reset,
-                       viewreset: this._reset
-               };
-
-               if (this._zoomAnimated) {
-                       events.zoomanim = this._animateZoom;
+       _updateScales: function (maxMeters) {
+               if (this.options.metric && maxMeters) {
+                       this._updateMetric(maxMeters);
+               }
+               if (this.options.imperial && maxMeters) {
+                       this._updateImperial(maxMeters);
                }
-
-               return events;
        },
 
-       getBounds: function () {
-               return this._bounds;
-       },
+       _updateMetric: function (maxMeters) {
+               var meters = this._getRoundNum(maxMeters),
+                   label = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km';
 
-       getElement: function () {
-               return this._image;
+               this._updateScale(this._mScale, label, meters / maxMeters);
        },
 
-       _initImage: function () {
-               var img = this._image = L.DomUtil.create('img',
-                               'leaflet-image-layer ' + (this._zoomAnimated ? 'leaflet-zoom-animated' : ''));
-
-               img.onselectstart = L.Util.falseFn;
-               img.onmousemove = L.Util.falseFn;
+       _updateImperial: function (maxMeters) {
+               var maxFeet = maxMeters * 3.2808399,
+                   maxMiles, miles, feet;
 
-               img.onload = L.bind(this.fire, this, 'load');
+               if (maxFeet > 5280) {
+                       maxMiles = maxFeet / 5280;
+                       miles = this._getRoundNum(maxMiles);
+                       this._updateScale(this._iScale, miles + ' mi', miles / maxMiles);
 
-               if (this.options.crossOrigin) {
-                       img.crossOrigin = '';
+               } else {
+                       feet = this._getRoundNum(maxFeet);
+                       this._updateScale(this._iScale, feet + ' ft', feet / maxFeet);
                }
-
-               img.src = this._url;
-               img.alt = this.options.alt;
        },
 
-       _animateZoom: function (e) {
-               var scale = this._map.getZoomScale(e.zoom),
-                   offset = this._map._latLngToNewLayerPoint(this._bounds.getNorthWest(), e.zoom, e.center);
-
-               L.DomUtil.setTransform(this._image, offset, scale);
+       _updateScale: function (scale, text, ratio) {
+               scale.style.width = Math.round(this.options.maxWidth * ratio) + 'px';
+               scale.innerHTML = text;
        },
 
-       _reset: function () {
-               var image = this._image,
-                   bounds = new L.Bounds(
-                       this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
-                       this._map.latLngToLayerPoint(this._bounds.getSouthEast())),
-                   size = bounds.getSize();
-
-               L.DomUtil.setPosition(image, bounds.min);
+       _getRoundNum: function (num) {
+               var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1),
+                   d = num / pow10;
 
-               image.style.width  = size.x + 'px';
-               image.style.height = size.y + 'px';
-       },
+               d = d >= 10 ? 10 :
+                   d >= 5 ? 5 :
+                   d >= 3 ? 3 :
+                   d >= 2 ? 2 : 1;
 
-       _updateOpacity: function () {
-               L.DomUtil.setOpacity(this._image, this.options.opacity);
+               return pow10 * d;
        }
 });
 
-// @factory L.imageOverlay(imageUrl: String, bounds: LatLngBounds, options?: ImageOverlay options)
-// Instantiates an image overlay object given the URL of the image and the
-// geographical bounds it is tied to.
-L.imageOverlay = function (url, bounds, options) {
-       return new L.ImageOverlay(url, bounds, options);
-};
-
 
+// @factory L.control.scale(options?: Control.Scale options)
+// Creates an scale control with the given options.
+var scale = function (options) {
+       return new Scale(options);
+};
 
 /*
- * @class Icon
- * @aka L.Icon
- * @inherits Layer
- *
- * Represents an icon to provide when creating a marker.
- *
- * @example
- *
- * ```js
- * var myIcon = L.icon({
- *     iconUrl: 'my-icon.png',
- *     iconRetinaUrl: 'my-icon@2x.png',
- *     iconSize: [38, 95],
- *     iconAnchor: [22, 94],
- *     popupAnchor: [-3, -76],
- *     shadowUrl: 'my-icon-shadow.png',
- *     shadowRetinaUrl: 'my-icon-shadow@2x.png',
- *     shadowSize: [68, 95],
- *     shadowAnchor: [22, 94]
- * });
- *
- * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);
- * ```
- *
- * `L.Icon.Default` extends `L.Icon` and is the blue icon Leaflet uses for markers by default.
+ * @class Control.Attribution
+ * @aka L.Control.Attribution
+ * @inherits Control
  *
+ * The attribution control allows you to display attribution data in a small text box on a map. It is put on the map by default unless you set its [`attributionControl` option](#map-attributioncontrol) to `false`, and it fetches attribution texts from layers with the [`getAttribution` method](#layer-getattribution) automatically. Extends Control.
  */
 
-L.Icon = L.Class.extend({
+var Attribution = Control.extend({
+       // @section
+       // @aka Control.Attribution options
+       options: {
+               position: 'bottomright',
 
-       /* @section
-        * @aka Icon options
-        *
-        * @option iconUrl: String = null
-        * **(required)** The URL to the icon image (absolute or relative to your script path).
-        *
-        * @option iconRetinaUrl: String = null
-        * The URL to a retina sized version of the icon image (absolute or relative to your
-        * script path). Used for Retina screen devices.
-        *
-        * @option iconSize: Point = null
-        * Size of the icon image in pixels.
-        *
-        * @option iconAnchor: Point = null
-        * The coordinates of the "tip" of the icon (relative to its top left corner). The icon
-        * will be aligned so that this point is at the marker's geographical location. Centered
-        * by default if size is specified, also can be set in CSS with negative margins.
-        *
-        * @option popupAnchor: Point = null
-        * The coordinates of the point from which popups will "open", relative to the icon anchor.
-        *
-        * @option shadowUrl: String = null
-        * The URL to the icon shadow image. If not specified, no shadow image will be created.
-        *
-        * @option shadowRetinaUrl: String = null
-        *
-        * @option shadowSize: Point = null
-        * Size of the shadow image in pixels.
-        *
-        * @option shadowAnchor: Point = null
-        * The coordinates of the "tip" of the shadow (relative to its top left corner) (the same
-        * as iconAnchor if not specified).
-        *
-        * @option className: String = ''
-        * A custom class name to assign to both icon and shadow images. Empty by default.
-        */
+               // @option prefix: String = 'Leaflet'
+               // The HTML text shown before the attributions. Pass `false` to disable.
+               prefix: '<a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'
+       },
 
        initialize: function (options) {
-               L.setOptions(this, options);
+               setOptions(this, options);
+
+               this._attributions = {};
        },
 
-       // @method createIcon(oldIcon?: HTMLElement): HTMLElement
-       // Called internally when the icon has to be shown, returns a `<img>` HTML element
-       // styled according to the options.
-       createIcon: function (oldIcon) {
-               return this._createIcon('icon', oldIcon);
+       onAdd: function (map) {
+               map.attributionControl = this;
+               this._container = create$1('div', 'leaflet-control-attribution');
+               disableClickPropagation(this._container);
+
+               // TODO ugly, refactor
+               for (var i in map._layers) {
+                       if (map._layers[i].getAttribution) {
+                               this.addAttribution(map._layers[i].getAttribution());
+                       }
+               }
+
+               this._update();
+
+               return this._container;
        },
 
-       // @method createShadow(oldIcon?: HTMLElement): HTMLElement
-       // As `createIcon`, but for the shadow beneath it.
-       createShadow: function (oldIcon) {
-               return this._createIcon('shadow', oldIcon);
+       // @method setPrefix(prefix: String): this
+       // Sets the text before the attributions.
+       setPrefix: function (prefix) {
+               this.options.prefix = prefix;
+               this._update();
+               return this;
        },
 
-       _createIcon: function (name, oldIcon) {
-               var src = this._getIconUrl(name);
+       // @method addAttribution(text: String): this
+       // Adds an attribution text (e.g. `'Vector data &copy; Mapbox'`).
+       addAttribution: function (text) {
+               if (!text) { return this; }
 
-               if (!src) {
-                       if (name === 'icon') {
-                               throw new Error('iconUrl not set in Icon options (see the docs).');
-                       }
-                       return null;
+               if (!this._attributions[text]) {
+                       this._attributions[text] = 0;
                }
+               this._attributions[text]++;
 
-               var img = this._createImg(src, oldIcon && oldIcon.tagName === 'IMG' ? oldIcon : null);
-               this._setIconStyles(img, name);
+               this._update();
+
+               return this;
+       },
+
+       // @method removeAttribution(text: String): this
+       // Removes an attribution text.
+       removeAttribution: function (text) {
+               if (!text) { return this; }
+
+               if (this._attributions[text]) {
+                       this._attributions[text]--;
+                       this._update();
+               }
 
-               return img;
+               return this;
        },
 
-       _setIconStyles: function (img, name) {
-               var options = this.options;
-               var sizeOption = options[name + 'Size'];
+       _update: function () {
+               if (!this._map) { return; }
 
-               if (typeof sizeOption === 'number') {
-                       sizeOption = [sizeOption, sizeOption];
-               }
+               var attribs = [];
 
-               var size = L.point(sizeOption),
-                   anchor = L.point(name === 'shadow' && options.shadowAnchor || options.iconAnchor ||
-                           size && size.divideBy(2, true));
+               for (var i in this._attributions) {
+                       if (this._attributions[i]) {
+                               attribs.push(i);
+                       }
+               }
 
-               img.className = 'leaflet-marker-' + name + ' ' + (options.className || '');
+               var prefixAndAttribs = [];
 
-               if (anchor) {
-                       img.style.marginLeft = (-anchor.x) + 'px';
-                       img.style.marginTop  = (-anchor.y) + 'px';
+               if (this.options.prefix) {
+                       prefixAndAttribs.push(this.options.prefix);
                }
-
-               if (size) {
-                       img.style.width  = size.x + 'px';
-                       img.style.height = size.y + 'px';
+               if (attribs.length) {
+                       prefixAndAttribs.push(attribs.join(', '));
                }
-       },
-
-       _createImg: function (src, el) {
-               el = el || document.createElement('img');
-               el.src = src;
-               return el;
-       },
 
-       _getIconUrl: function (name) {
-               return L.Browser.retina && this.options[name + 'RetinaUrl'] || this.options[name + 'Url'];
+               this._container.innerHTML = prefixAndAttribs.join(' | ');
        }
 });
 
+// @namespace Map
+// @section Control options
+// @option attributionControl: Boolean = true
+// Whether a [attribution control](#control-attribution) is added to the map by default.
+Map.mergeOptions({
+       attributionControl: true
+});
 
-// @factory L.icon(options: Icon options)
-// Creates an icon instance with the given options.
-L.icon = function (options) {
-       return new L.Icon(options);
+Map.addInitHook(function () {
+       if (this.options.attributionControl) {
+               new Attribution().addTo(this);
+       }
+});
+
+// @namespace Control.Attribution
+// @factory L.control.attribution(options: Control.Attribution options)
+// Creates an attribution control.
+var attribution = function (options) {
+       return new Attribution(options);
 };
 
+Control.Layers = Layers;
+Control.Zoom = Zoom;
+Control.Scale = Scale;
+Control.Attribution = Attribution;
 
+control.layers = layers;
+control.zoom = zoom;
+control.scale = scale;
+control.attribution = attribution;
 
 /*
- * @miniclass Icon.Default (Icon)
- * @aka L.Icon.Default
- * @section
- *
- * A trivial subclass of `Icon`, represents the icon to use in `Marker`s when
- * no icon is specified. Points to the blue marker image distributed with Leaflet
- * releases.
- *
- * In order to change the default icon, just change the properties of `L.Icon.Default.prototype.options`
- * (which is a set of `Icon options`).
- */
+       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.Icon.Default = L.Icon.extend({
+// @class Handler
+// @aka L.Handler
+// Abstract class for map interaction handlers
 
-       options: {
-               iconUrl:       'marker-icon.png',
-               iconRetinaUrl: 'marker-icon-2x.png',
-               shadowUrl:     'marker-shadow.png',
-               iconSize:    [25, 41],
-               iconAnchor:  [12, 41],
-               popupAnchor: [1, -34],
-               tooltipAnchor: [16, -28],
-               shadowSize:  [41, 41]
+var Handler = Class.extend({
+       initialize: function (map) {
+               this._map = map;
        },
 
-       _getIconUrl: function (name) {
-               if (!L.Icon.Default.imagePath) {        // Deprecated, backwards-compatibility only
-                       L.Icon.Default.imagePath = this._detectIconPath();
-               }
+       // @method enable(): this
+       // Enables the handler
+       enable: function () {
+               if (this._enabled) { return this; }
 
-               // @option imagePath: String
-               // `L.Icon.Default` will try to auto-detect the absolute location of the
-               // blue icon images. If you are placing these images in a non-standard
-               // way, set this option to point to the right absolute path.
-               return (this.options.imagePath || L.Icon.Default.imagePath) + L.Icon.prototype._getIconUrl.call(this, name);
+               this._enabled = true;
+               this.addHooks();
+               return this;
        },
 
-       _detectIconPath: function () {
-               var el = L.DomUtil.create('div',  'leaflet-default-icon-path', document.body);
-               var path = L.DomUtil.getStyle(el, 'background-image') ||
-                          L.DomUtil.getStyle(el, 'backgroundImage');   // IE8
+       // @method disable(): this
+       // Disables the handler
+       disable: function () {
+               if (!this._enabled) { return this; }
 
-               document.body.removeChild(el);
+               this._enabled = false;
+               this.removeHooks();
+               return this;
+       },
 
-               return path.indexOf('url') === 0 ?
-                       path.replace(/^url\([\"\']?/, '').replace(/marker-icon\.png[\"\']?\)$/, '') : '';
+       // @method enabled(): Boolean
+       // Returns `true` if the handler is enabled
+       enabled: function () {
+               return !!this._enabled;
        }
+
+       // @section Extension methods
+       // Classes inheriting from `Handler` must implement the two following methods:
+       // @method addHooks()
+       // Called when the handler is enabled, should add event hooks.
+       // @method removeHooks()
+       // Called when the handler is disabled, should remove the event hooks added previously.
 });
 
+// @section There is static function which can be called without instantiating L.Handler:
+// @function addTo(map: Map, name: String): this
+// Adds a new Handler to the given map with the given name.
+Handler.addTo = function (map, name) {
+       map.addHandler(name, this);
+       return this;
+};
 
+var Mixin = {Events: Events};
 
 /*
- * @class Marker
- * @inherits Interactive layer
- * @aka L.Marker
- * L.Marker is used to display clickable/draggable icons on the map. Extends `Layer`.
+ * @class Draggable
+ * @aka L.Draggable
+ * @inherits Evented
  *
- * @example
+ * A class for making DOM elements draggable (including touch support).
+ * Used internally for map and marker dragging. Only works for elements
+ * that were positioned with [`L.DomUtil.setPosition`](#domutil-setposition).
  *
+ * @example
  * ```js
- * L.marker([50.5, 30.5]).addTo(map);
+ * var draggable = new L.Draggable(elementToDrag);
+ * draggable.enable();
  * ```
  */
 
-L.Marker = L.Layer.extend({
+var START = touch ? 'touchstart mousedown' : 'mousedown';
+var END = {
+       mousedown: 'mouseup',
+       touchstart: 'touchend',
+       pointerdown: 'touchend',
+       MSPointerDown: 'touchend'
+};
+var MOVE = {
+       mousedown: 'mousemove',
+       touchstart: 'touchmove',
+       pointerdown: 'touchmove',
+       MSPointerDown: 'touchmove'
+};
 
-       // @section
-       // @aka Marker options
-       options: {
-               // @option icon: Icon = *
-               // Icon class to use for rendering the marker. See [Icon documentation](#L.Icon) for details on how to customize the marker icon. If not specified, a new `L.Icon.Default` is used.
-               icon: new L.Icon.Default(),
 
-               // Option inherited from "Interactive layer" abstract class
-               interactive: true,
+var Draggable = Evented.extend({
 
-               // @option draggable: Boolean = false
-               // Whether the marker is draggable with mouse/touch or not.
-               draggable: false,
+       options: {
+               // @section
+               // @aka Draggable options
+               // @option clickTolerance: Number = 3
+               // The max number of pixels a user can shift the mouse pointer during a click
+               // for it to be considered a valid click (as opposed to a mouse drag).
+               clickTolerance: 3
+       },
 
-               // @option keyboard: Boolean = true
-               // Whether the marker can be tabbed to with a keyboard and clicked by pressing enter.
-               keyboard: true,
+       // @constructor L.Draggable(el: HTMLElement, dragHandle?: HTMLElement, preventOutline?: Boolean, options?: Draggable options)
+       // Creates a `Draggable` object for moving `el` when you start dragging the `dragHandle` element (equals `el` itself by default).
+       initialize: function (element, dragStartTarget, preventOutline$$1, options) {
+               setOptions(this, options);
 
-               // @option title: String = ''
-               // Text for the browser tooltip that appear on marker hover (no tooltip by default).
-               title: '',
+               this._element = element;
+               this._dragStartTarget = dragStartTarget || element;
+               this._preventOutline = preventOutline$$1;
+       },
 
-               // @option alt: String = ''
-               // Text for the `alt` attribute of the icon image (useful for accessibility).
-               alt: '',
+       // @method enable()
+       // Enables the dragging ability
+       enable: function () {
+               if (this._enabled) { return; }
 
-               // @option zIndexOffset: Number = 0
-               // By default, marker images zIndex is set automatically based on its latitude. Use this option if you want to put the marker on top of all others (or below), specifying a high value like `1000` (or high negative value, respectively).
-               zIndexOffset: 0,
+               on(this._dragStartTarget, START, this._onDown, this);
 
-               // @option opacity: Number = 1.0
-               // The opacity of the marker.
-               opacity: 1,
+               this._enabled = true;
+       },
 
-               // @option riseOnHover: Boolean = false
-               // If `true`, the marker will get on top of others when you hover the mouse over it.
-               riseOnHover: false,
+       // @method disable()
+       // Disables the dragging ability
+       disable: function () {
+               if (!this._enabled) { return; }
 
-               // @option riseOffset: Number = 250
-               // The z-index offset used for the `riseOnHover` feature.
-               riseOffset: 250,
+               // If we're currently dragging this draggable,
+               // disabling it counts as first ending the drag.
+               if (Draggable._dragging === this) {
+                       this.finishDrag();
+               }
 
-               // @option pane: String = 'markerPane'
-               // `Map pane` where the markers icon will be added.
-               pane: 'markerPane',
+               off(this._dragStartTarget, START, this._onDown, this);
 
-               // FIXME: shadowPane is no longer a valid option
-               nonBubblingEvents: ['click', 'dblclick', 'mouseover', 'mouseout', 'contextmenu']
+               this._enabled = false;
+               this._moved = false;
        },
 
-       /* @section
-        *
-        * In addition to [shared layer methods](#Layer) like `addTo()` and `remove()` and [popup methods](#Popup) like bindPopup() you can also use the following methods:
-        */
+       _onDown: function (e) {
+               // Ignore simulated events, since we handle both touch and
+               // mouse explicitly; otherwise we risk getting duplicates of
+               // touch events, see #4315.
+               // Also ignore the event if disabled; this happens in IE11
+               // under some circumstances, see #3666.
+               if (e._simulated || !this._enabled) { return; }
 
-       initialize: function (latlng, options) {
-               L.setOptions(this, options);
-               this._latlng = L.latLng(latlng);
-       },
+               this._moved = false;
 
-       onAdd: function (map) {
-               this._zoomAnimated = this._zoomAnimated && map.options.markerZoomAnimation;
+               if (hasClass(this._element, 'leaflet-zoom-anim')) { return; }
 
-               if (this._zoomAnimated) {
-                       map.on('zoomanim', this._animateZoom, this);
+               if (Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
+               Draggable._dragging = this;  // Prevent dragging multiple objects at once.
+
+               if (this._preventOutline) {
+                       preventOutline(this._element);
                }
 
-               this._initIcon();
-               this.update();
+               disableImageDrag();
+               disableTextSelection();
+
+               if (this._moving) { return; }
+
+               // @event down: Event
+               // Fired when a drag is about to start.
+               this.fire('down');
+
+               var first = e.touches ? e.touches[0] : e,
+                   sizedParent = getSizedParentNode(this._element);
+
+               this._startPoint = new Point(first.clientX, first.clientY);
+
+               // Cache the scale, so that we can continuously compensate for it during drag (_onMove).
+               this._parentScale = getScale(sizedParent);
+
+               on(document, MOVE[e.type], this._onMove, this);
+               on(document, END[e.type], this._onUp, this);
        },
 
-       onRemove: function (map) {
-               if (this.dragging && this.dragging.enabled()) {
-                       this.options.draggable = true;
-                       this.dragging.removeHooks();
+       _onMove: function (e) {
+               // Ignore simulated events, since we handle both touch and
+               // mouse explicitly; otherwise we risk getting duplicates of
+               // touch events, see #4315.
+               // Also ignore the event if disabled; this happens in IE11
+               // under some circumstances, see #3666.
+               if (e._simulated || !this._enabled) { return; }
+
+               if (e.touches && e.touches.length > 1) {
+                       this._moved = true;
+                       return;
                }
 
-               if (this._zoomAnimated) {
-                       map.off('zoomanim', this._animateZoom, this);
+               var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
+                   offset = new Point(first.clientX, first.clientY)._subtract(this._startPoint);
+
+               if (!offset.x && !offset.y) { return; }
+               if (Math.abs(offset.x) + Math.abs(offset.y) < this.options.clickTolerance) { return; }
+
+               // We assume that the parent container's position, border and scale do not change for the duration of the drag.
+               // Therefore there is no need to account for the position and border (they are eliminated by the subtraction)
+               // and we can use the cached value for the scale.
+               offset.x /= this._parentScale.x;
+               offset.y /= this._parentScale.y;
+
+               preventDefault(e);
+
+               if (!this._moved) {
+                       // @event dragstart: Event
+                       // Fired when a drag starts
+                       this.fire('dragstart');
+
+                       this._moved = true;
+                       this._startPos = getPosition(this._element).subtract(offset);
+
+                       addClass(document.body, 'leaflet-dragging');
+
+                       this._lastTarget = e.target || e.srcElement;
+                       // IE and Edge do not give the <use> element, so fetch it
+                       // if necessary
+                       if ((window.SVGElementInstance) && (this._lastTarget instanceof SVGElementInstance)) {
+                               this._lastTarget = this._lastTarget.correspondingUseElement;
+                       }
+                       addClass(this._lastTarget, 'leaflet-drag-target');
                }
 
-               this._removeIcon();
-               this._removeShadow();
-       },
+               this._newPos = this._startPos.add(offset);
+               this._moving = true;
 
-       getEvents: function () {
-               return {
-                       zoom: this.update,
-                       viewreset: this.update
-               };
+               cancelAnimFrame(this._animRequest);
+               this._lastEvent = e;
+               this._animRequest = requestAnimFrame(this._updatePosition, this, true);
        },
 
-       // @method getLatLng: LatLng
-       // Returns the current geographical position of the marker.
-       getLatLng: function () {
-               return this._latlng;
-       },
+       _updatePosition: function () {
+               var e = {originalEvent: this._lastEvent};
 
-       // @method setLatLng(latlng: LatLng): this
-       // Changes the marker position to the given point.
-       setLatLng: function (latlng) {
-               var oldLatLng = this._latlng;
-               this._latlng = L.latLng(latlng);
-               this.update();
+               // @event predrag: Event
+               // Fired continuously during dragging *before* each corresponding
+               // update of the element's position.
+               this.fire('predrag', e);
+               setPosition(this._element, this._newPos);
 
-               // @event move: Event
-               // Fired when the marker is moved via [`setLatLng`](#marker-setlatlng) or by [dragging](#marker-dragging). Old and new coordinates are included in event arguments as `oldLatLng`, `latlng`.
-               return this.fire('move', {oldLatLng: oldLatLng, latlng: this._latlng});
+               // @event drag: Event
+               // Fired continuously during dragging.
+               this.fire('drag', e);
        },
 
-       // @method setZIndexOffset(offset: Number): this
-       // Changes the [zIndex offset](#marker-zindexoffset) of the marker.
-       setZIndexOffset: function (offset) {
-               this.options.zIndexOffset = offset;
-               return this.update();
+       _onUp: function (e) {
+               // Ignore simulated events, since we handle both touch and
+               // mouse explicitly; otherwise we risk getting duplicates of
+               // touch events, see #4315.
+               // Also ignore the event if disabled; this happens in IE11
+               // under some circumstances, see #3666.
+               if (e._simulated || !this._enabled) { return; }
+               this.finishDrag();
        },
 
-       // @method setIcon(icon: Icon): this
-       // Changes the marker icon.
-       setIcon: function (icon) {
-
-               this.options.icon = icon;
+       finishDrag: function () {
+               removeClass(document.body, 'leaflet-dragging');
 
-               if (this._map) {
-                       this._initIcon();
-                       this.update();
+               if (this._lastTarget) {
+                       removeClass(this._lastTarget, 'leaflet-drag-target');
+                       this._lastTarget = null;
                }
 
-               if (this._popup) {
-                       this.bindPopup(this._popup, this._popup.options);
+               for (var i in MOVE) {
+                       off(document, MOVE[i], this._onMove, this);
+                       off(document, END[i], this._onUp, this);
                }
 
-               return this;
-       },
-
-       getElement: function () {
-               return this._icon;
-       },
+               enableImageDrag();
+               enableTextSelection();
 
-       update: function () {
+               if (this._moved && this._moving) {
+                       // ensure drag is not fired after dragend
+                       cancelAnimFrame(this._animRequest);
 
-               if (this._icon) {
-                       var pos = this._map.latLngToLayerPoint(this._latlng).round();
-                       this._setPos(pos);
+                       // @event dragend: DragEndEvent
+                       // Fired when the drag ends.
+                       this.fire('dragend', {
+                               distance: this._newPos.distanceTo(this._startPos)
+                       });
                }
 
-               return this;
-       },
+               this._moving = false;
+               Draggable._dragging = false;
+       }
 
-       _initIcon: function () {
-               var options = this.options,
-                   classToAdd = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
+});
 
-               var icon = options.icon.createIcon(this._icon),
-                   addIcon = false;
+/*
+ * @namespace LineUtil
+ *
+ * Various utility functions for polyline points processing, used by Leaflet internally to make polylines lightning-fast.
+ */
 
-               // 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;
+// Simplify polyline with vertex reduction and Douglas-Peucker simplification.
+// Improves rendering performance dramatically by lessening the number of points to draw.
+
+// @function simplify(points: Point[], tolerance: Number): Point[]
+// Dramatically reduces the number of points in a polyline while retaining
+// its shape and returns a new array of simplified points, using the
+// [Douglas-Peucker algorithm](http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm).
+// Used for a huge performance boost when processing/displaying Leaflet polylines for
+// each zoom level and also reducing visual noise. tolerance affects the amount of
+// simplification (lesser value means higher quality but slower and with more points).
+// Also released as a separated micro-library [Simplify.js](http://mourner.github.com/simplify-js/).
+function simplify(points, tolerance) {
+       if (!tolerance || !points.length) {
+               return points.slice();
+       }
 
-                       if (options.title) {
-                               icon.title = options.title;
-                       }
-                       if (options.alt) {
-                               icon.alt = options.alt;
-                       }
-               }
+       var sqTolerance = tolerance * tolerance;
 
-               L.DomUtil.addClass(icon, classToAdd);
+           // stage 1: vertex reduction
+           points = _reducePoints(points, sqTolerance);
 
-               if (options.keyboard) {
-                       icon.tabIndex = '0';
-               }
+           // stage 2: Douglas-Peucker simplification
+           points = _simplifyDP(points, sqTolerance);
 
-               this._icon = icon;
+       return points;
+}
 
-               if (options.riseOnHover) {
-                       this.on({
-                               mouseover: this._bringToFront,
-                               mouseout: this._resetZIndex
-                       });
-               }
+// @function pointToSegmentDistance(p: Point, p1: Point, p2: Point): Number
+// Returns the distance between point `p` and segment `p1` to `p2`.
+function pointToSegmentDistance(p, p1, p2) {
+       return Math.sqrt(_sqClosestPointOnSegment(p, p1, p2, true));
+}
 
-               var newShadow = options.icon.createShadow(this._shadow),
-                   addShadow = false;
+// @function closestPointOnSegment(p: Point, p1: Point, p2: Point): Number
+// Returns the closest point from a point `p` on a segment `p1` to `p2`.
+function closestPointOnSegment(p, p1, p2) {
+       return _sqClosestPointOnSegment(p, p1, p2);
+}
 
-               if (newShadow !== this._shadow) {
-                       this._removeShadow();
-                       addShadow = true;
-               }
+// Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm
+function _simplifyDP(points, sqTolerance) {
 
-               if (newShadow) {
-                       L.DomUtil.addClass(newShadow, classToAdd);
-               }
-               this._shadow = newShadow;
+       var len = points.length,
+           ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
+           markers = new ArrayConstructor(len);
 
+           markers[0] = markers[len - 1] = 1;
 
-               if (options.opacity < 1) {
-                       this._updateOpacity();
-               }
+       _simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
 
+       var i,
+           newPoints = [];
 
-               if (addIcon) {
-                       this.getPane().appendChild(this._icon);
-               }
-               this._initInteraction();
-               if (newShadow && addShadow) {
-                       this.getPane('shadowPane').appendChild(this._shadow);
+       for (i = 0; i < len; i++) {
+               if (markers[i]) {
+                       newPoints.push(points[i]);
                }
-       },
+       }
 
-       _removeIcon: function () {
-               if (this.options.riseOnHover) {
-                       this.off({
-                               mouseover: this._bringToFront,
-                               mouseout: this._resetZIndex
-                       });
-               }
+       return newPoints;
+}
 
-               L.DomUtil.remove(this._icon);
-               this.removeInteractiveTarget(this._icon);
+function _simplifyDPStep(points, markers, sqTolerance, first, last) {
 
-               this._icon = null;
-       },
+       var maxSqDist = 0,
+       index, i, sqDist;
 
-       _removeShadow: function () {
-               if (this._shadow) {
-                       L.DomUtil.remove(this._shadow);
+       for (i = first + 1; i <= last - 1; i++) {
+               sqDist = _sqClosestPointOnSegment(points[i], points[first], points[last], true);
+
+               if (sqDist > maxSqDist) {
+                       index = i;
+                       maxSqDist = sqDist;
                }
-               this._shadow = null;
-       },
+       }
 
-       _setPos: function (pos) {
-               L.DomUtil.setPosition(this._icon, pos);
+       if (maxSqDist > sqTolerance) {
+               markers[index] = 1;
 
-               if (this._shadow) {
-                       L.DomUtil.setPosition(this._shadow, pos);
+               _simplifyDPStep(points, markers, sqTolerance, first, index);
+               _simplifyDPStep(points, markers, sqTolerance, index, last);
+       }
+}
+
+// reduce points that are too close to each other to a single point
+function _reducePoints(points, sqTolerance) {
+       var reducedPoints = [points[0]];
+
+       for (var i = 1, prev = 0, len = points.length; i < len; i++) {
+               if (_sqDist(points[i], points[prev]) > sqTolerance) {
+                       reducedPoints.push(points[i]);
+                       prev = i;
                }
+       }
+       if (prev < len - 1) {
+               reducedPoints.push(points[len - 1]);
+       }
+       return reducedPoints;
+}
 
-               this._zIndex = pos.y + this.options.zIndexOffset;
+var _lastCode;
 
-               this._resetZIndex();
-       },
+// @function clipSegment(a: Point, b: Point, bounds: Bounds, useLastCode?: Boolean, round?: Boolean): Point[]|Boolean
+// Clips the segment a to b by rectangular bounds with the
+// [Cohen-Sutherland algorithm](https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm)
+// (modifying the segment points directly!). Used by Leaflet to only show polyline
+// points that are on the screen or near, increasing performance.
+function clipSegment(a, b, bounds, useLastCode, round) {
+       var codeA = useLastCode ? _lastCode : _getBitCode(a, bounds),
+           codeB = _getBitCode(b, bounds),
 
-       _updateZIndex: function (offset) {
-               this._icon.style.zIndex = this._zIndex + offset;
-       },
+           codeOut, p, newCode;
 
-       _animateZoom: function (opt) {
-               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round();
+           // save 2nd code to avoid calculating it on the next segment
+           _lastCode = codeB;
 
-               this._setPos(pos);
-       },
+       while (true) {
+               // if a,b is inside the clip window (trivial accept)
+               if (!(codeA | codeB)) {
+                       return [a, b];
+               }
 
-       _initInteraction: function () {
+               // if a,b is outside the clip window (trivial reject)
+               if (codeA & codeB) {
+                       return false;
+               }
 
-               if (!this.options.interactive) { return; }
+               // other cases
+               codeOut = codeA || codeB;
+               p = _getEdgeIntersection(a, b, codeOut, bounds, round);
+               newCode = _getBitCode(p, bounds);
 
-               L.DomUtil.addClass(this._icon, 'leaflet-interactive');
+               if (codeOut === codeA) {
+                       a = p;
+                       codeA = newCode;
+               } else {
+                       b = p;
+                       codeB = newCode;
+               }
+       }
+}
 
-               this.addInteractiveTarget(this._icon);
+function _getEdgeIntersection(a, b, code, bounds, round) {
+       var dx = b.x - a.x,
+           dy = b.y - a.y,
+           min = bounds.min,
+           max = bounds.max,
+           x, y;
 
-               if (L.Handler.MarkerDrag) {
-                       var draggable = this.options.draggable;
-                       if (this.dragging) {
-                               draggable = this.dragging.enabled();
-                               this.dragging.disable();
-                       }
+       if (code & 8) { // top
+               x = a.x + dx * (max.y - a.y) / dy;
+               y = max.y;
 
-                       this.dragging = new L.Handler.MarkerDrag(this);
+       } else if (code & 4) { // bottom
+               x = a.x + dx * (min.y - a.y) / dy;
+               y = min.y;
 
-                       if (draggable) {
-                               this.dragging.enable();
-                       }
-               }
-       },
+       } else if (code & 2) { // right
+               x = max.x;
+               y = a.y + dy * (max.x - a.x) / dx;
 
-       // @method setOpacity(opacity: Number): this
-       // Changes the opacity of the marker.
-       setOpacity: function (opacity) {
-               this.options.opacity = opacity;
-               if (this._map) {
-                       this._updateOpacity();
-               }
+       } else if (code & 1) { // left
+               x = min.x;
+               y = a.y + dy * (min.x - a.x) / dx;
+       }
 
-               return this;
-       },
+       return new Point(x, y, round);
+}
 
-       _updateOpacity: function () {
-               var opacity = this.options.opacity;
+function _getBitCode(p, bounds) {
+       var code = 0;
+
+       if (p.x < bounds.min.x) { // left
+               code |= 1;
+       } else if (p.x > bounds.max.x) { // right
+               code |= 2;
+       }
 
-               L.DomUtil.setOpacity(this._icon, opacity);
+       if (p.y < bounds.min.y) { // bottom
+               code |= 4;
+       } else if (p.y > bounds.max.y) { // top
+               code |= 8;
+       }
 
-               if (this._shadow) {
-                       L.DomUtil.setOpacity(this._shadow, opacity);
-               }
-       },
+       return code;
+}
 
-       _bringToFront: function () {
-               this._updateZIndex(this.options.riseOffset);
-       },
+// square distance (to avoid unnecessary Math.sqrt calls)
+function _sqDist(p1, p2) {
+       var dx = p2.x - p1.x,
+           dy = p2.y - p1.y;
+       return dx * dx + dy * dy;
+}
 
-       _resetZIndex: function () {
-               this._updateZIndex(0);
+// return closest point on segment or distance to that point
+function _sqClosestPointOnSegment(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;
+
+       if (dot > 0) {
+               t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
+
+               if (t > 1) {
+                       x = p2.x;
+                       y = p2.y;
+               } else if (t > 0) {
+                       x += dx * t;
+                       y += dy * t;
+               }
        }
-});
 
+       dx = p.x - x;
+       dy = p.y - y;
 
-// factory L.marker(latlng: LatLng, options? : Marker options)
+       return sqDist ? dx * dx + dy * dy : new Point(x, y);
+}
 
-// @factory L.marker(latlng: LatLng, options? : Marker options)
-// Instantiates a Marker object given a geographical point and optionally an options object.
-L.marker = function (latlng, options) {
-       return new L.Marker(latlng, options);
-};
 
+// @function isFlat(latlngs: LatLng[]): Boolean
+// Returns true if `latlngs` is a flat array, false is nested.
+function isFlat(latlngs) {
+       return !isArray(latlngs[0]) || (typeof latlngs[0][0] !== 'object' && typeof latlngs[0][0] !== 'undefined');
+}
 
+function _flat(latlngs) {
+       console.warn('Deprecated use of _flat, please use L.LineUtil.isFlat instead.');
+       return isFlat(latlngs);
+}
 
-/*
- * @class DivIcon
- * @aka L.DivIcon
- * @inherits Icon
- *
- * Represents a lightweight icon for markers that uses a simple `<div>`
- * element instead of an image. Inherits from `Icon` but ignores the `iconUrl` and shadow options.
- *
- * @example
- * ```js
- * var myIcon = L.divIcon({className: 'my-div-icon'});
- * // you can set .my-div-icon styles in CSS
- *
- * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);
- * ```
- *
- * By default, it has a 'leaflet-div-icon' CSS class and is styled as a little white square with a shadow.
- */
 
-L.DivIcon = L.Icon.extend({
-       options: {
-               // @section
-               // @aka DivIcon options
-               iconSize: [12, 12], // also can be set through CSS
+var LineUtil = (Object.freeze || Object)({
+       simplify: simplify,
+       pointToSegmentDistance: pointToSegmentDistance,
+       closestPointOnSegment: closestPointOnSegment,
+       clipSegment: clipSegment,
+       _getEdgeIntersection: _getEdgeIntersection,
+       _getBitCode: _getBitCode,
+       _sqClosestPointOnSegment: _sqClosestPointOnSegment,
+       isFlat: isFlat,
+       _flat: _flat
+});
 
-               // iconAnchor: (Point),
-               // popupAnchor: (Point),
+/*
+ * @namespace PolyUtil
+ * Various utility functions for polygon geometries.
+ */
 
-               // @option html: String = ''
-               // Custom HTML code to put inside the div element, empty by default.
-               html: false,
+/* @function clipPolygon(points: Point[], bounds: Bounds, round?: Boolean): Point[]
+ * Clips the polygon geometry defined by the given `points` by the given bounds (using the [Sutherland-Hodgman algorithm](https://en.wikipedia.org/wiki/Sutherland%E2%80%93Hodgman_algorithm)).
+ * Used by Leaflet to only show polygon points that are on the screen or near, increasing
+ * performance. Note that polygon points needs different algorithm for clipping
+ * than polyline, so there's a separate method for it.
+ */
+function clipPolygon(points, bounds, round) {
+       var clippedPoints,
+           edges = [1, 4, 2, 8],
+           i, j, k,
+           a, b,
+           len, edge, p;
 
-               // @option bgPos: Point = [0, 0]
-               // Optional relative position of the background, in pixels
-               bgPos: null,
+       for (i = 0, len = points.length; i < len; i++) {
+               points[i]._code = _getBitCode(points[i], bounds);
+       }
 
-               className: 'leaflet-div-icon'
-       },
+       // for each edge (left, bottom, right, top)
+       for (k = 0; k < 4; k++) {
+               edge = edges[k];
+               clippedPoints = [];
 
-       createIcon: function (oldIcon) {
-               var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
-                   options = this.options;
+               for (i = 0, len = points.length, j = len - 1; i < len; j = i++) {
+                       a = points[i];
+                       b = points[j];
 
-               div.innerHTML = options.html !== false ? options.html : '';
+                       // if a is inside the clip window
+                       if (!(a._code & edge)) {
+                               // if b is outside the clip window (a->b goes out of screen)
+                               if (b._code & edge) {
+                                       p = _getEdgeIntersection(b, a, edge, bounds, round);
+                                       p._code = _getBitCode(p, bounds);
+                                       clippedPoints.push(p);
+                               }
+                               clippedPoints.push(a);
 
-               if (options.bgPos) {
-                       var bgPos = L.point(options.bgPos);
-                       div.style.backgroundPosition = (-bgPos.x) + 'px ' + (-bgPos.y) + 'px';
+                       // else if b is inside the clip window (a->b enters the screen)
+                       } else if (!(b._code & edge)) {
+                               p = _getEdgeIntersection(b, a, edge, bounds, round);
+                               p._code = _getBitCode(p, bounds);
+                               clippedPoints.push(p);
+                       }
                }
-               this._setIconStyles(div, 'icon');
-
-               return div;
-       },
-
-       createShadow: function () {
-               return null;
+               points = clippedPoints;
        }
-});
 
-// @factory L.divIcon(options: DivIcon options)
-// Creates a `DivIcon` instance with the given options.
-L.divIcon = function (options) {
-       return new L.DivIcon(options);
-};
+       return points;
+}
 
 
+var PolyUtil = (Object.freeze || Object)({
+       clipPolygon: clipPolygon
+});
 
 /*
- * @class DivOverlay
- * @inherits Layer
- * @aka L.DivOverlay
- * Base model for L.Popup and L.Tooltip. Inherit from it for custom popup like plugins.
+ * @namespace Projection
+ * @section
+ * Leaflet comes with a set of already defined Projections out of the box:
+ *
+ * @projection L.Projection.LonLat
+ *
+ * Equirectangular, or Plate Carree projection — the most simple projection,
+ * mostly used by GIS enthusiasts. Directly maps `x` as longitude, and `y` as
+ * latitude. Also suitable for flat worlds, e.g. game maps. Used by the
+ * `EPSG:4326` and `Simple` CRS.
  */
 
-// @namespace DivOverlay
-L.DivOverlay = L.Layer.extend({
-
-       // @section
-       // @aka DivOverlay options
-       options: {
-               // @option offset: Point = Point(0, 7)
-               // The offset of the popup position. Useful to control the anchor
-               // of the popup when opening it on some overlays.
-               offset: [0, 7],
-
-               // @option className: String = ''
-               // A custom CSS class name to assign to the popup.
-               className: '',
-
-               // @option pane: String = 'popupPane'
-               // `Map pane` where the popup will be added.
-               pane: 'popupPane'
+var LonLat = {
+       project: function (latlng) {
+               return new Point(latlng.lng, latlng.lat);
        },
 
-       initialize: function (options, source) {
-               L.setOptions(this, options);
-
-               this._source = source;
+       unproject: function (point) {
+               return new LatLng(point.y, point.x);
        },
 
-       onAdd: function (map) {
-               this._zoomAnimated = map._zoomAnimated;
+       bounds: new Bounds([-180, -90], [180, 90])
+};
 
-               if (!this._container) {
-                       this._initLayout();
-               }
+/*
+ * @namespace Projection
+ * @projection L.Projection.Mercator
+ *
+ * Elliptical Mercator projection — more complex than Spherical Mercator. Assumes that Earth is an ellipsoid. Used by the EPSG:3395 CRS.
+ */
 
-               if (map._fadeAnimated) {
-                       L.DomUtil.setOpacity(this._container, 0);
-               }
+var Mercator = {
+       R: 6378137,
+       R_MINOR: 6356752.314245179,
 
-               clearTimeout(this._removeTimeout);
-               this.getPane().appendChild(this._container);
-               this.update();
+       bounds: new Bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]),
 
-               if (map._fadeAnimated) {
-                       L.DomUtil.setOpacity(this._container, 1);
-               }
+       project: function (latlng) {
+               var d = Math.PI / 180,
+                   r = this.R,
+                   y = latlng.lat * d,
+                   tmp = this.R_MINOR / r,
+                   e = Math.sqrt(1 - tmp * tmp),
+                   con = e * Math.sin(y);
 
-               this.bringToFront();
-       },
+               var ts = Math.tan(Math.PI / 4 - y / 2) / Math.pow((1 - con) / (1 + con), e / 2);
+               y = -r * Math.log(Math.max(ts, 1E-10));
 
-       onRemove: function (map) {
-               if (map._fadeAnimated) {
-                       L.DomUtil.setOpacity(this._container, 0);
-                       this._removeTimeout = setTimeout(L.bind(L.DomUtil.remove, L.DomUtil, this._container), 200);
-               } else {
-                       L.DomUtil.remove(this._container);
-               }
+               return new Point(latlng.lng * d * r, y);
        },
 
-       // @namespace Popup
-       // @method getLatLng: LatLng
-       // Returns the geographical point of popup.
-       getLatLng: function () {
-               return this._latlng;
-       },
+       unproject: function (point) {
+               var d = 180 / Math.PI,
+                   r = this.R,
+                   tmp = this.R_MINOR / r,
+                   e = Math.sqrt(1 - tmp * tmp),
+                   ts = Math.exp(-point.y / r),
+                   phi = Math.PI / 2 - 2 * Math.atan(ts);
 
-       // @method setLatLng(latlng: LatLng): this
-       // Sets the geographical point where the popup will open.
-       setLatLng: function (latlng) {
-               this._latlng = L.latLng(latlng);
-               if (this._map) {
-                       this._updatePosition();
-                       this._adjustPan();
+               for (var i = 0, dphi = 0.1, con; i < 15 && Math.abs(dphi) > 1e-7; i++) {
+                       con = e * Math.sin(phi);
+                       con = Math.pow((1 - con) / (1 + con), e / 2);
+                       dphi = Math.PI / 2 - 2 * Math.atan(ts * con) - phi;
+                       phi += dphi;
                }
-               return this;
-       },
 
-       // @method getContent: String|HTMLElement
-       // Returns the content of the popup.
-       getContent: function () {
-               return this._content;
-       },
+               return new LatLng(phi * d, point.x * d / r);
+       }
+};
 
-       // @method setContent(htmlContent: String|HTMLElement|Function): this
-       // Sets the HTML content of the popup. If a function is passed the source layer will be passed to the function. The function should return a `String` or `HTMLElement` to be used in the popup.
-       setContent: function (content) {
-               this._content = content;
-               this.update();
-               return this;
-       },
+/*
+ * @class Projection
 
-       // @method getElement: String|HTMLElement
-       // Alias for [getContent()](#popup-getcontent)
-       getElement: function () {
-               return this._container;
-       },
+ * An object with methods for projecting geographical coordinates of the world onto
+ * a flat surface (and back). See [Map projection](http://en.wikipedia.org/wiki/Map_projection).
 
-       // @method update: null
-       // Updates the popup content, layout and position. Useful for updating the popup after something inside changed, e.g. image loaded.
-       update: function () {
-               if (!this._map) { return; }
+ * @property bounds: Bounds
+ * The bounds (specified in CRS units) where the projection is valid
 
-               this._container.style.visibility = 'hidden';
+ * @method project(latlng: LatLng): Point
+ * Projects geographical coordinates into a 2D point.
+ * Only accepts actual `L.LatLng` instances, not arrays.
 
-               this._updateContent();
-               this._updateLayout();
-               this._updatePosition();
+ * @method unproject(point: Point): LatLng
+ * The inverse of `project`. Projects a 2D point into a geographical location.
+ * Only accepts actual `L.Point` instances, not arrays.
 
-               this._container.style.visibility = '';
+ * Note that the projection instances do not inherit from Leafet's `Class` object,
+ * and can't be instantiated. Also, new classes can't inherit from them,
+ * and methods can't be added to them with the `include` function.
 
-               this._adjustPan();
-       },
+ */
 
-       getEvents: function () {
-               var events = {
-                       zoom: this._updatePosition,
-                       viewreset: this._updatePosition
-               };
 
-               if (this._zoomAnimated) {
-                       events.zoomanim = this._animateZoom;
-               }
-               return events;
-       },
 
-       // @method isOpen: Boolean
-       // Returns `true` when the popup is visible on the map.
-       isOpen: function () {
-               return !!this._map && this._map.hasLayer(this);
-       },
 
-       // @method bringToFront: this
-       // Brings this popup in front of other popups (in the same map pane).
-       bringToFront: function () {
-               if (this._map) {
-                       L.DomUtil.toFront(this._container);
-               }
-               return this;
-       },
+var index = (Object.freeze || Object)({
+       LonLat: LonLat,
+       Mercator: Mercator,
+       SphericalMercator: SphericalMercator
+});
 
-       // @method bringToBack: this
-       // Brings this popup to the back of other popups (in the same map pane).
-       bringToBack: function () {
-               if (this._map) {
-                       L.DomUtil.toBack(this._container);
-               }
-               return this;
-       },
+/*
+ * @namespace CRS
+ * @crs L.CRS.EPSG3395
+ *
+ * Rarely used by some commercial tile providers. Uses Elliptical Mercator projection.
+ */
+var EPSG3395 = extend({}, Earth, {
+       code: 'EPSG:3395',
+       projection: Mercator,
 
-       _updateContent: function () {
-               if (!this._content) { return; }
+       transformation: (function () {
+               var scale = 0.5 / (Math.PI * Mercator.R);
+               return toTransformation(scale, 0.5, -scale, 0.5);
+       }())
+});
 
-               var node = this._contentNode;
-               var content = (typeof this._content === 'function') ? this._content(this._source || this) : this._content;
+/*
+ * @namespace CRS
+ * @crs L.CRS.EPSG4326
+ *
+ * A common CRS among GIS enthusiasts. Uses simple Equirectangular projection.
+ *
+ * Leaflet 1.0.x complies with the [TMS coordinate scheme for EPSG:4326](https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification#global-geodetic),
+ * which is a breaking change from 0.7.x behaviour.  If you are using a `TileLayer`
+ * with this CRS, ensure that there are two 256x256 pixel tiles covering the
+ * whole earth at zoom level zero, and that the tile coordinate origin is (-180,+90),
+ * or (-180,-90) for `TileLayer`s with [the `tms` option](#tilelayer-tms) set.
+ */
 
-               if (typeof content === 'string') {
-                       node.innerHTML = content;
-               } else {
-                       while (node.hasChildNodes()) {
-                               node.removeChild(node.firstChild);
-                       }
-                       node.appendChild(content);
-               }
-               this.fire('contentupdate');
-       },
+var EPSG4326 = extend({}, Earth, {
+       code: 'EPSG:4326',
+       projection: LonLat,
+       transformation: toTransformation(1 / 180, 1, -1 / 180, 0.5)
+});
+
+/*
+ * @namespace CRS
+ * @crs L.CRS.Simple
+ *
+ * A simple CRS that maps longitude and latitude into `x` and `y` directly.
+ * May be used for maps of flat surfaces (e.g. game maps). Note that the `y`
+ * axis should still be inverted (going from bottom to top). `distance()` returns
+ * simple euclidean distance.
+ */
 
-       _updatePosition: function () {
-               if (!this._map) { return; }
+var Simple = extend({}, CRS, {
+       projection: LonLat,
+       transformation: toTransformation(1, 0, -1, 0),
 
-               var pos = this._map.latLngToLayerPoint(this._latlng),
-                   offset = L.point(this.options.offset),
-                   anchor = this._getAnchor();
+       scale: function (zoom) {
+               return Math.pow(2, zoom);
+       },
 
-               if (this._zoomAnimated) {
-                       L.DomUtil.setPosition(this._container, pos.add(anchor));
-               } else {
-                       offset = offset.add(pos).add(anchor);
-               }
+       zoom: function (scale) {
+               return Math.log(scale) / Math.LN2;
+       },
 
-               var bottom = this._containerBottom = -offset.y,
-                   left = this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x;
+       distance: function (latlng1, latlng2) {
+               var dx = latlng2.lng - latlng1.lng,
+                   dy = latlng2.lat - latlng1.lat;
 
-               // bottom position the popup in case the height of the popup changes (images loading etc)
-               this._container.style.bottom = bottom + 'px';
-               this._container.style.left = left + 'px';
+               return Math.sqrt(dx * dx + dy * dy);
        },
 
-       _getAnchor: function () {
-               return [0, 0];
-       }
-
+       infinite: true
 });
 
-
+CRS.Earth = Earth;
+CRS.EPSG3395 = EPSG3395;
+CRS.EPSG3857 = EPSG3857;
+CRS.EPSG900913 = EPSG900913;
+CRS.EPSG4326 = EPSG4326;
+CRS.Simple = Simple;
 
 /*
- * @class Popup
- * @inherits DivOverlay
- * @aka L.Popup
- * Used to open popups in certain places of the map. Use [Map.openPopup](#map-openpopup) to
- * open popups while making sure that only one popup is open at one time
- * (recommended for usability), or use [Map.addLayer](#map-addlayer) to open as many as you want.
+ * @class Layer
+ * @inherits Evented
+ * @aka L.Layer
+ * @aka ILayer
  *
- * @example
+ * A set of methods from the Layer base class that all Leaflet layers use.
+ * Inherits all methods, options and events from `L.Evented`.
  *
- * If you want to just bind a popup to marker click and then open it, it's really easy:
+ * @example
  *
  * ```js
- * marker.bindPopup(popupContent).openPopup();
+ * var layer = L.marker(latlng).addTo(map);
+ * layer.addTo(map);
+ * layer.remove();
  * ```
- * Path overlays like polylines also have a `bindPopup` method.
- * Here's a more complicated way to open a popup on a map:
  *
- * ```js
- * var popup = L.popup()
- *     .setLatLng(latlng)
- *     .setContent('<p>Hello world!<br />This is a nice popup.</p>')
- *     .openOn(map);
- * ```
+ * @event add: Event
+ * Fired after the layer is added to a map
+ *
+ * @event remove: Event
+ * Fired after the layer is removed from a map
  */
 
 
-// @namespace Popup
-L.Popup = L.DivOverlay.extend({
+var Layer = Evented.extend({
 
-       // @section
-       // @aka Popup options
+       // Classes extending `L.Layer` will inherit the following options:
        options: {
-               // @option maxWidth: Number = 300
-               // Max width of the popup, in pixels.
-               maxWidth: 300,
-
-               // @option minWidth: Number = 50
-               // Min width of the popup, in pixels.
-               minWidth: 50,
-
-               // @option maxHeight: Number = null
-               // If set, creates a scrollable container of the given height
-               // inside a popup if its content exceeds it.
-               maxHeight: null,
-
-               // @option autoPan: Boolean = true
-               // Set it to `false` if you don't want the map to do panning animation
-               // to fit the opened popup.
-               autoPan: true,
-
-               // @option autoPanPaddingTopLeft: Point = null
-               // The margin between the popup and the top left corner of the map
-               // view after autopanning was performed.
-               autoPanPaddingTopLeft: null,
+               // @option pane: String = 'overlayPane'
+               // By default the layer will be added to the map's [overlay pane](#map-overlaypane). Overriding this option will cause the layer to be placed on another pane by default.
+               pane: 'overlayPane',
 
-               // @option autoPanPaddingBottomRight: Point = null
-               // The margin between the popup and the bottom right corner of the map
-               // view after autopanning was performed.
-               autoPanPaddingBottomRight: null,
+               // @option attribution: String = null
+               // String to be shown in the attribution control, e.g. "© OpenStreetMap contributors". It describes the layer data and is often a legal obligation towards copyright holders and tile providers.
+               attribution: null,
 
-               // @option autoPanPadding: Point = Point(5, 5)
-               // Equivalent of setting both top left and bottom right autopan padding to the same value.
-               autoPanPadding: [5, 5],
+               bubblingMouseEvents: true
+       },
 
-               // @option keepInView: Boolean = false
-               // Set it to `true` if you want to prevent users from panning the popup
-               // off of the screen while it is open.
-               keepInView: false,
+       /* @section
+        * Classes extending `L.Layer` will inherit the following methods:
+        *
+        * @method addTo(map: Map|LayerGroup): this
+        * Adds the layer to the given map or layer group.
+        */
+       addTo: function (map) {
+               map.addLayer(this);
+               return this;
+       },
 
-               // @option closeButton: Boolean = true
-               // Controls the presence of a close button in the popup.
-               closeButton: true,
+       // @method remove: this
+       // Removes the layer from the map it is currently active on.
+       remove: function () {
+               return this.removeFrom(this._map || this._mapToAdd);
+       },
 
-               // @option autoClose: Boolean = true
-               // Set it to `false` if you want to override the default behavior of
-               // the popup closing when user clicks the map (set globally by
-               // the Map's [closePopupOnClick](#map-closepopuponclick) option).
-               autoClose: true,
+       // @method removeFrom(map: Map): this
+       // Removes the layer from the given map
+       removeFrom: function (obj) {
+               if (obj) {
+                       obj.removeLayer(this);
+               }
+               return this;
+       },
 
-               // @option className: String = ''
-               // A custom CSS class name to assign to the popup.
-               className: ''
+       // @method getPane(name? : String): HTMLElement
+       // Returns the `HTMLElement` representing the named pane on the map. If `name` is omitted, returns the pane for this layer.
+       getPane: function (name) {
+               return this._map.getPane(name ? (this.options[name] || name) : this.options.pane);
        },
 
-       // @namespace Popup
-       // @method openOn(map: Map): this
-       // Adds the popup to the map and closes the previous one. The same as `map.openPopup(popup)`.
-       openOn: function (map) {
-               map.openPopup(this);
+       addInteractiveTarget: function (targetEl) {
+               this._map._targets[stamp(targetEl)] = this;
                return this;
        },
 
-       onAdd: function (map) {
-               L.DivOverlay.prototype.onAdd.call(this, map);
-
-               // @namespace Map
-               // @section Popup events
-               // @event popupopen: PopupEvent
-               // Fired when a popup is opened in the map
-               map.fire('popupopen', {popup: this});
+       removeInteractiveTarget: function (targetEl) {
+               delete this._map._targets[stamp(targetEl)];
+               return this;
+       },
 
-               if (this._source) {
-                       // @namespace Layer
-                       // @section Popup events
-                       // @event popupopen: PopupEvent
-                       // Fired when a popup bound to this layer is opened
-                       this._source.fire('popupopen', {popup: this}, true);
-                       // For non-path layers, we toggle the popup when clicking
-                       // again the layer, so prevent the map to reopen it.
-                       if (!(this._source instanceof L.Path)) {
-                               this._source.on('preclick', L.DomEvent.stopPropagation);
-                       }
-               }
+       // @method getAttribution: String
+       // Used by the `attribution control`, returns the [attribution option](#gridlayer-attribution).
+       getAttribution: function () {
+               return this.options.attribution;
        },
 
-       onRemove: function (map) {
-               L.DivOverlay.prototype.onRemove.call(this, map);
+       _layerAdd: function (e) {
+               var map = e.target;
 
-               // @namespace Map
-               // @section Popup events
-               // @event popupclose: PopupEvent
-               // Fired when a popup in the map is closed
-               map.fire('popupclose', {popup: this});
+               // check in case layer gets added and then removed before the map is ready
+               if (!map.hasLayer(this)) { return; }
 
-               if (this._source) {
-                       // @namespace Layer
-                       // @section Popup events
-                       // @event popupclose: PopupEvent
-                       // Fired when a popup bound to this layer is closed
-                       this._source.fire('popupclose', {popup: this}, true);
-                       if (!(this._source instanceof L.Path)) {
-                               this._source.off('preclick', L.DomEvent.stopPropagation);
-                       }
+               this._map = map;
+               this._zoomAnimated = map._zoomAnimated;
+
+               if (this.getEvents) {
+                       var events = this.getEvents();
+                       map.on(events, this);
+                       this.once('remove', function () {
+                               map.off(events, this);
+                       }, this);
                }
-       },
 
-       getEvents: function () {
-               var events = L.DivOverlay.prototype.getEvents.call(this);
+               this.onAdd(map);
 
-               if ('closeOnClick' in this.options ? this.options.closeOnClick : this._map.options.closePopupOnClick) {
-                       events.preclick = this._close;
+               if (this.getAttribution && map.attributionControl) {
+                       map.attributionControl.addAttribution(this.getAttribution());
                }
 
-               if (this.options.keepInView) {
-                       events.moveend = this._adjustPan;
-               }
+               this.fire('add');
+               map.fire('layeradd', {layer: this});
+       }
+});
 
-               return events;
-       },
+/* @section Extension methods
+ * @uninheritable
+ *
+ * Every layer should extend from `L.Layer` and (re-)implement the following methods.
+ *
+ * @method onAdd(map: Map): this
+ * Should contain code that creates DOM elements for the layer, adds them to `map panes` where they should belong and puts listeners on relevant map events. Called on [`map.addLayer(layer)`](#map-addlayer).
+ *
+ * @method onRemove(map: Map): this
+ * Should contain all clean up code that removes the layer's elements from the DOM and removes listeners previously added in [`onAdd`](#layer-onadd). Called on [`map.removeLayer(layer)`](#map-removelayer).
+ *
+ * @method getEvents(): Object
+ * This optional method should return an object like `{ viewreset: this._reset }` for [`addEventListener`](#evented-addeventlistener). The event handlers in this object will be automatically added and removed from the map with your layer.
+ *
+ * @method getAttribution(): String
+ * This optional method should return a string containing HTML to be shown on the `Attribution control` whenever the layer is visible.
+ *
+ * @method beforeAdd(map: Map): this
+ * Optional method. Called on [`map.addLayer(layer)`](#map-addlayer), before the layer is added to the map, before events are initialized, without waiting until the map is in a usable state. Use for early initialization only.
+ */
 
-       _close: function () {
-               if (this._map) {
-                       this._map.closePopup(this);
-               }
-       },
 
-       _initLayout: function () {
-               var prefix = 'leaflet-popup',
-                   container = this._container = L.DomUtil.create('div',
-                       prefix + ' ' + (this.options.className || '') +
-                       ' leaflet-zoom-animated');
+/* @namespace Map
+ * @section Layer events
+ *
+ * @event layeradd: LayerEvent
+ * Fired when a new layer is added to the map.
+ *
+ * @event layerremove: LayerEvent
+ * Fired when some layer is removed from the map
+ *
+ * @section Methods for Layers and Controls
+ */
+Map.include({
+       // @method addLayer(layer: Layer): this
+       // Adds the given layer to the map
+       addLayer: function (layer) {
+               if (!layer._layerAdd) {
+                       throw new Error('The provided object is not a Layer.');
+               }
 
-               if (this.options.closeButton) {
-                       var closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
-                       closeButton.href = '#close';
-                       closeButton.innerHTML = '&#215;';
+               var id = stamp(layer);
+               if (this._layers[id]) { return this; }
+               this._layers[id] = layer;
 
-                       L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
-               }
+               layer._mapToAdd = this;
 
-               var wrapper = this._wrapper = L.DomUtil.create('div', prefix + '-content-wrapper', container);
-               this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
+               if (layer.beforeAdd) {
+                       layer.beforeAdd(this);
+               }
 
-               L.DomEvent
-                       .disableClickPropagation(wrapper)
-                       .disableScrollPropagation(this._contentNode)
-                       .on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
+               this.whenReady(layer._layerAdd, layer);
 
-               this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
-               this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
+               return this;
        },
 
-       _updateLayout: function () {
-               var container = this._contentNode,
-                   style = container.style;
-
-               style.width = '';
-               style.whiteSpace = 'nowrap';
+       // @method removeLayer(layer: Layer): this
+       // Removes the given layer from the map.
+       removeLayer: function (layer) {
+               var id = stamp(layer);
 
-               var width = container.offsetWidth;
-               width = Math.min(width, this.options.maxWidth);
-               width = Math.max(width, this.options.minWidth);
+               if (!this._layers[id]) { return this; }
 
-               style.width = (width + 1) + 'px';
-               style.whiteSpace = '';
+               if (this._loaded) {
+                       layer.onRemove(this);
+               }
 
-               style.height = '';
+               if (layer.getAttribution && this.attributionControl) {
+                       this.attributionControl.removeAttribution(layer.getAttribution());
+               }
 
-               var height = container.offsetHeight,
-                   maxHeight = this.options.maxHeight,
-                   scrolledClass = 'leaflet-popup-scrolled';
+               delete this._layers[id];
 
-               if (maxHeight && height > maxHeight) {
-                       style.height = maxHeight + 'px';
-                       L.DomUtil.addClass(container, scrolledClass);
-               } else {
-                       L.DomUtil.removeClass(container, scrolledClass);
+               if (this._loaded) {
+                       this.fire('layerremove', {layer: layer});
+                       layer.fire('remove');
                }
 
-               this._containerWidth = this._container.offsetWidth;
-       },
+               layer._map = layer._mapToAdd = null;
 
-       _animateZoom: function (e) {
-               var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center),
-                   anchor = this._getAnchor();
-               L.DomUtil.setPosition(this._container, pos.add(anchor));
+               return this;
        },
 
-       _adjustPan: function () {
-               if (!this.options.autoPan || (this._map._panAnim && this._map._panAnim._inProgress)) { return; }
-
-               var map = this._map,
-                   marginBottom = parseInt(L.DomUtil.getStyle(this._container, 'marginBottom'), 10) || 0,
-                   containerHeight = this._container.offsetHeight + marginBottom,
-                   containerWidth = this._containerWidth,
-                   layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);
-
-               layerPos._add(L.DomUtil.getPosition(this._container));
-
-               var containerPos = map.layerPointToContainerPoint(layerPos),
-                   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;
+       // @method hasLayer(layer: Layer): Boolean
+       // Returns `true` if the given layer is currently added to the map
+       hasLayer: function (layer) {
+               return !!layer && (stamp(layer) in this._layers);
+       },
 
-               if (containerPos.x + containerWidth + paddingBR.x > size.x) { // right
-                       dx = containerPos.x + containerWidth - size.x + paddingBR.x;
-               }
-               if (containerPos.x - dx - paddingTL.x < 0) { // left
-                       dx = containerPos.x - paddingTL.x;
-               }
-               if (containerPos.y + containerHeight + paddingBR.y > size.y) { // bottom
-                       dy = containerPos.y + containerHeight - size.y + paddingBR.y;
-               }
-               if (containerPos.y - dy - paddingTL.y < 0) { // top
-                       dy = containerPos.y - paddingTL.y;
+       /* @method eachLayer(fn: Function, context?: Object): this
+        * Iterates over the layers of the map, optionally specifying context of the iterator function.
+        * ```
+        * map.eachLayer(function(layer){
+        *     layer.bindPopup('Hello');
+        * });
+        * ```
+        */
+       eachLayer: function (method, context) {
+               for (var i in this._layers) {
+                       method.call(context, this._layers[i]);
                }
+               return this;
+       },
 
-               // @namespace Map
-               // @section Popup events
-               // @event autopanstart: Event
-               // Fired when the map starts autopanning when opening a popup.
-               if (dx || dy) {
-                       map
-                           .fire('autopanstart')
-                           .panBy([dx, dy]);
+       _addLayers: function (layers) {
+               layers = layers ? (isArray(layers) ? layers : [layers]) : [];
+
+               for (var i = 0, len = layers.length; i < len; i++) {
+                       this.addLayer(layers[i]);
                }
        },
 
-       _onCloseButtonClick: function (e) {
-               this._close();
-               L.DomEvent.stop(e);
+       _addZoomLimit: function (layer) {
+               if (isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom)) {
+                       this._zoomBoundLayers[stamp(layer)] = layer;
+                       this._updateZoomLevels();
+               }
        },
 
-       _getAnchor: function () {
-               // Where should we anchor the popup on the source layer?
-               return L.point(this._source && this._source._getPopupAnchor ? this._source._getPopupAnchor() : [0, 0]);
-       }
-
-});
-
-// @namespace Popup
-// @factory L.popup(options?: Popup options, source?: Layer)
-// Instantiates a `Popup` object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the popup with a reference to the Layer to which it refers.
-L.popup = function (options, source) {
-       return new L.Popup(options, source);
-};
-
+       _removeZoomLimit: function (layer) {
+               var id = stamp(layer);
 
-/* @namespace Map
- * @section Interaction Options
- * @option closePopupOnClick: Boolean = true
- * Set it to `false` if you don't want popups to close when user clicks the map.
- */
-L.Map.mergeOptions({
-       closePopupOnClick: true
-});
+               if (this._zoomBoundLayers[id]) {
+                       delete this._zoomBoundLayers[id];
+                       this._updateZoomLevels();
+               }
+       },
 
+       _updateZoomLevels: function () {
+               var minZoom = Infinity,
+                   maxZoom = -Infinity,
+                   oldZoomSpan = this._getZoomSpan();
 
-// @namespace Map
-// @section Methods for Layers and Controls
-L.Map.include({
-       // @method openPopup(popup: Popup): this
-       // Opens the specified popup while closing the previously opened (to make sure only one is opened at one time for usability).
-       // @alternative
-       // @method openPopup(content: String|HTMLElement, latlng: LatLng, options?: Popup options): this
-       // Creates a popup with the specified content and options and opens it in the given point on a map.
-       openPopup: function (popup, latlng, options) {
-               if (!(popup instanceof L.Popup)) {
-                       popup = new L.Popup(options).setContent(popup);
-               }
+               for (var i in this._zoomBoundLayers) {
+                       var options = this._zoomBoundLayers[i].options;
 
-               if (latlng) {
-                       popup.setLatLng(latlng);
+                       minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom);
+                       maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom);
                }
 
-               if (this.hasLayer(popup)) {
-                       return this;
-               }
+               this._layersMaxZoom = maxZoom === -Infinity ? undefined : maxZoom;
+               this._layersMinZoom = minZoom === Infinity ? undefined : minZoom;
 
-               if (this._popup && this._popup.options.autoClose) {
-                       this.closePopup();
+               // @section Map state change events
+               // @event zoomlevelschange: Event
+               // Fired when the number of zoomlevels on the map is changed due
+               // to adding or removing a layer.
+               if (oldZoomSpan !== this._getZoomSpan()) {
+                       this.fire('zoomlevelschange');
                }
 
-               this._popup = popup;
-               return this.addLayer(popup);
-       },
-
-       // @method closePopup(popup?: Popup): this
-       // Closes the popup previously opened with [openPopup](#map-openpopup) (or the given one).
-       closePopup: function (popup) {
-               if (!popup || popup === this._popup) {
-                       popup = this._popup;
-                       this._popup = null;
+               if (this.options.maxZoom === undefined && this._layersMaxZoom && this.getZoom() > this._layersMaxZoom) {
+                       this.setZoom(this._layersMaxZoom);
                }
-               if (popup) {
-                       this.removeLayer(popup);
+               if (this.options.minZoom === undefined && this._layersMinZoom && this.getZoom() < this._layersMinZoom) {
+                       this.setZoom(this._layersMinZoom);
                }
-               return this;
        }
 });
 
-
-
 /*
- * @namespace Layer
- * @section Popup methods example
+ * @class LayerGroup
+ * @aka L.LayerGroup
+ * @inherits Layer
  *
- * All layers share a set of methods convenient for binding popups to it.
+ * Used to group several layers and handle them as one. If you add it to the map,
+ * any layers added or removed from the group will be added/removed on the map as
+ * well. Extends `Layer`.
+ *
+ * @example
  *
  * ```js
- * var layer = L.Polygon(latlngs).bindPopup('Hi There!').addTo(map);
- * layer.openPopup();
- * layer.closePopup();
+ * L.layerGroup([marker1, marker2])
+ *     .addLayer(polyline)
+ *     .addTo(map);
  * ```
- *
- * Popups will also be automatically opened when the layer is clicked on and closed when the layer is removed from the map or another popup is opened.
  */
 
-// @section Popup methods
-L.Layer.include({
-
-       // @method bindPopup(content: String|HTMLElement|Function|Popup, options?: Popup options): this
-       // Binds a popup to the layer with the passed `content` and sets up the
-       // neccessary event listeners. If a `Function` is passed it will receive
-       // the layer as the first argument and should return a `String` or `HTMLElement`.
-       bindPopup: function (content, options) {
-
-               if (content instanceof L.Popup) {
-                       L.setOptions(content, options);
-                       this._popup = content;
-                       content._source = this;
-               } else {
-                       if (!this._popup || options) {
-                               this._popup = new L.Popup(options, this);
-                       }
-                       this._popup.setContent(content);
-               }
-
-               if (!this._popupHandlersAdded) {
-                       this.on({
-                               click: this._openPopup,
-                               remove: this.closePopup,
-                               move: this._movePopup
-                       });
-                       this._popupHandlersAdded = true;
-               }
+var LayerGroup = Layer.extend({
 
-               return this;
-       },
+       initialize: function (layers, options) {
+               setOptions(this, options);
 
-       // @method unbindPopup(): this
-       // Removes the popup previously bound with `bindPopup`.
-       unbindPopup: function () {
-               if (this._popup) {
-                       this.off({
-                               click: this._openPopup,
-                               remove: this.closePopup,
-                               move: this._movePopup
-                       });
-                       this._popupHandlersAdded = false;
-                       this._popup = null;
-               }
-               return this;
-       },
+               this._layers = {};
 
-       // @method openPopup(latlng?: LatLng): this
-       // Opens the bound popup at the specificed `latlng` or at the default popup anchor if no `latlng` is passed.
-       openPopup: function (layer, latlng) {
-               if (!(layer instanceof L.Layer)) {
-                       latlng = layer;
-                       layer = this;
-               }
+               var i, len;
 
-               if (layer instanceof L.FeatureGroup) {
-                       for (var id in this._layers) {
-                               layer = this._layers[id];
-                               break;
+               if (layers) {
+                       for (i = 0, len = layers.length; i < len; i++) {
+                               this.addLayer(layers[i]);
                        }
                }
+       },
 
-               if (!latlng) {
-                       latlng = layer.getCenter ? layer.getCenter() : layer.getLatLng();
-               }
-
-               if (this._popup && this._map) {
-                       // set popup source to this layer
-                       this._popup._source = layer;
+       // @method addLayer(layer: Layer): this
+       // Adds the given layer to the group.
+       addLayer: function (layer) {
+               var id = this.getLayerId(layer);
 
-                       // update the popup (content, layout, ect...)
-                       this._popup.update();
+               this._layers[id] = layer;
 
-                       // open the popup on the map
-                       this._map.openPopup(this._popup, latlng);
+               if (this._map) {
+                       this._map.addLayer(layer);
                }
 
                return this;
        },
 
-       // @method closePopup(): this
-       // Closes the popup bound to this layer if it is open.
-       closePopup: function () {
-               if (this._popup) {
-                       this._popup._close();
-               }
-               return this;
-       },
+       // @method removeLayer(layer: Layer): this
+       // Removes the given layer from the group.
+       // @alternative
+       // @method removeLayer(id: Number): this
+       // Removes the layer with the given internal ID from the group.
+       removeLayer: function (layer) {
+               var id = layer in this._layers ? layer : this.getLayerId(layer);
 
-       // @method togglePopup(): this
-       // Opens or closes the popup bound to this layer depending on its current state.
-       togglePopup: function (target) {
-               if (this._popup) {
-                       if (this._popup._map) {
-                               this.closePopup();
-                       } else {
-                               this.openPopup(target);
-                       }
+               if (this._map && this._layers[id]) {
+                       this._map.removeLayer(this._layers[id]);
                }
+
+               delete this._layers[id];
+
                return this;
        },
 
-       // @method isPopupOpen(): boolean
-       // Returns `true` if the popup bound to this layer is currently open.
-       isPopupOpen: function () {
-               return this._popup.isOpen();
+       // @method hasLayer(layer: Layer): Boolean
+       // Returns `true` if the given layer is currently added to the group.
+       // @alternative
+       // @method hasLayer(id: Number): Boolean
+       // Returns `true` if the given internal ID is currently added to the group.
+       hasLayer: function (layer) {
+               return !!layer && (layer in this._layers || this.getLayerId(layer) in this._layers);
        },
 
-       // @method setPopupContent(content: String|HTMLElement|Popup): this
-       // Sets the content of the popup bound to this layer.
-       setPopupContent: function (content) {
-               if (this._popup) {
-                       this._popup.setContent(content);
-               }
-               return this;
+       // @method clearLayers(): this
+       // Removes all the layers from the group.
+       clearLayers: function () {
+               return this.eachLayer(this.removeLayer, this);
        },
 
-       // @method getPopup(): Popup
-       // Returns the popup bound to this layer.
-       getPopup: function () {
-               return this._popup;
-       },
+       // @method invoke(methodName: String, …): this
+       // Calls `methodName` on every layer contained in this group, passing any
+       // additional parameters. Has no effect if the layers contained do not
+       // implement `methodName`.
+       invoke: function (methodName) {
+               var args = Array.prototype.slice.call(arguments, 1),
+                   i, layer;
 
-       _openPopup: function (e) {
-               var layer = e.layer || e.target;
+               for (i in this._layers) {
+                       layer = this._layers[i];
 
-               if (!this._popup) {
-                       return;
+                       if (layer[methodName]) {
+                               layer[methodName].apply(layer, args);
+                       }
                }
 
-               if (!this._map) {
-                       return;
-               }
+               return this;
+       },
 
-               // prevent map click
-               L.DomEvent.stop(e);
+       onAdd: function (map) {
+               this.eachLayer(map.addLayer, map);
+       },
 
-               // if this inherits from Path its a vector and we can just
-               // open the popup at the new location
-               if (layer instanceof L.Path) {
-                       this.openPopup(e.layer || e.target, e.latlng);
-                       return;
-               }
+       onRemove: function (map) {
+               this.eachLayer(map.removeLayer, map);
+       },
 
-               // otherwise treat it like a marker and figure out
-               // if we should toggle it open/closed
-               if (this._map.hasLayer(this._popup) && this._popup._source === layer) {
-                       this.closePopup();
-               } else {
-                       this.openPopup(layer, e.latlng);
+       // @method eachLayer(fn: Function, context?: Object): this
+       // Iterates over the layers of the group, optionally specifying context of the iterator function.
+       // ```js
+       // group.eachLayer(function (layer) {
+       //      layer.bindPopup('Hello');
+       // });
+       // ```
+       eachLayer: function (method, context) {
+               for (var i in this._layers) {
+                       method.call(context, this._layers[i]);
                }
+               return this;
        },
 
-       _movePopup: function (e) {
-               this._popup.setLatLng(e.latlng);
-       }
-});
-
+       // @method getLayer(id: Number): Layer
+       // Returns the layer with the given internal ID.
+       getLayer: function (id) {
+               return this._layers[id];
+       },
 
+       // @method getLayers(): Layer[]
+       // Returns an array of all the layers added to the group.
+       getLayers: function () {
+               var layers = [];
+               this.eachLayer(layers.push, layers);
+               return layers;
+       },
 
-/*
- * Popup extension to L.Marker, adding popup-related methods.
- */
+       // @method setZIndex(zIndex: Number): this
+       // Calls `setZIndex` on every layer contained in this group, passing the z-index.
+       setZIndex: function (zIndex) {
+               return this.invoke('setZIndex', zIndex);
+       },
 
-L.Marker.include({
-       _getPopupAnchor: function () {
-               return this.options.icon.options.popupAnchor || [0, 0];
+       // @method getLayerId(layer: Layer): Number
+       // Returns the internal ID for a layer
+       getLayerId: function (layer) {
+               return stamp(layer);
        }
 });
 
 
+// @factory L.layerGroup(layers?: Layer[], options?: Object)
+// Create a layer group, optionally given an initial set of layers and an `options` object.
+var layerGroup = function (layers, options) {
+       return new LayerGroup(layers, options);
+};
 
 /*
- * @class Tooltip
- * @inherits DivOverlay
- * @aka L.Tooltip
- * Used to display small texts on top of map layers.
+ * @class FeatureGroup
+ * @aka L.FeatureGroup
+ * @inherits LayerGroup
+ *
+ * Extended `LayerGroup` that makes it easier to do the same thing to all its member layers:
+ *  * [`bindPopup`](#layer-bindpopup) binds a popup to all of the layers at once (likewise with [`bindTooltip`](#layer-bindtooltip))
+ *  * Events are propagated to the `FeatureGroup`, so if the group has an event
+ * handler, it will handle events from any of the layers. This includes mouse events
+ * and custom events.
+ *  * Has `layeradd` and `layerremove` events
  *
  * @example
  *
  * ```js
- * marker.bindTooltip("my tooltip text").openTooltip();
+ * L.featureGroup([marker1, marker2, polyline])
+ *     .bindPopup('Hello world!')
+ *     .on('click', function() { alert('Clicked on a member of the group!'); })
+ *     .addTo(map);
  * ```
- * Note about tooltip offset. Leaflet takes two options in consideration
- * for computing tooltip offseting:
- * - the `offset` Tooltip option: it defaults to [0, 0], and it's specific to one tooltip.
- *   Add a positive x offset to move the tooltip to the right, and a positive y offset to
- *   move it to the bottom. Negatives will move to the left and top.
- * - the `tooltipAnchor` Icon option: this will only be considered for Marker. You
- *   should adapt this value if you use a custom icon.
  */
 
+var FeatureGroup = LayerGroup.extend({
 
-// @namespace Tooltip
-L.Tooltip = L.DivOverlay.extend({
+       addLayer: function (layer) {
+               if (this.hasLayer(layer)) {
+                       return this;
+               }
 
-       // @section
-       // @aka Tooltip options
-       options: {
-               // @option pane: String = 'tooltipPane'
-               // `Map pane` where the tooltip will be added.
-               pane: 'tooltipPane',
+               layer.addEventParent(this);
 
-               // @option offset: Point = Point(0, 0)
-               // Optional offset of the tooltip position.
-               offset: [0, 0],
+               LayerGroup.prototype.addLayer.call(this, layer);
 
-               // @option direction: String = 'auto'
-               // Direction where to open the tooltip. Possible values are: `right`, `left`,
-               // `top`, `bottom`, `center`, `auto`.
-               // `auto` will dynamicaly switch between `right` and `left` according to the tooltip
-               // position on the map.
-               direction: 'auto',
+               // @event layeradd: LayerEvent
+               // Fired when a layer is added to this `FeatureGroup`
+               return this.fire('layeradd', {layer: layer});
+       },
 
-               // @option permanent: Boolean = false
-               // Whether to open the tooltip permanently or only on mouseover.
-               permanent: false,
+       removeLayer: function (layer) {
+               if (!this.hasLayer(layer)) {
+                       return this;
+               }
+               if (layer in this._layers) {
+                       layer = this._layers[layer];
+               }
 
-               // @option sticky: Boolean = false
-               // If true, the tooltip will follow the mouse instead of being fixed at the feature center.
-               sticky: false,
+               layer.removeEventParent(this);
 
-               // @option interactive: Boolean = false
-               // If true, the tooltip will listen to the feature events.
-               interactive: false,
+               LayerGroup.prototype.removeLayer.call(this, layer);
 
-               // @option opacity: Number = 0.9
-               // Tooltip container opacity.
-               opacity: 0.9
+               // @event layerremove: LayerEvent
+               // Fired when a layer is removed from this `FeatureGroup`
+               return this.fire('layerremove', {layer: layer});
+       },
+
+       // @method setStyle(style: Path options): this
+       // Sets the given path options to each layer of the group that has a `setStyle` method.
+       setStyle: function (style) {
+               return this.invoke('setStyle', style);
+       },
+
+       // @method bringToFront(): this
+       // Brings the layer group to the top of all other layers
+       bringToFront: function () {
+               return this.invoke('bringToFront');
+       },
+
+       // @method bringToBack(): this
+       // Brings the layer group to the back of all other layers
+       bringToBack: function () {
+               return this.invoke('bringToBack');
        },
 
-       onAdd: function (map) {
-               L.DivOverlay.prototype.onAdd.call(this, map);
-               this.setOpacity(this.options.opacity);
+       // @method getBounds(): LatLngBounds
+       // Returns the LatLngBounds of the Feature Group (created from bounds and coordinates of its children).
+       getBounds: function () {
+               var bounds = new LatLngBounds();
+
+               for (var id in this._layers) {
+                       var layer = this._layers[id];
+                       bounds.extend(layer.getBounds ? layer.getBounds() : layer.getLatLng());
+               }
+               return bounds;
+       }
+});
+
+// @factory L.featureGroup(layers: Layer[])
+// Create a feature group, optionally given an initial set of layers.
+var featureGroup = function (layers) {
+       return new FeatureGroup(layers);
+};
+
+/*
+ * @class Icon
+ * @aka L.Icon
+ *
+ * Represents an icon to provide when creating a marker.
+ *
+ * @example
+ *
+ * ```js
+ * var myIcon = L.icon({
+ *     iconUrl: 'my-icon.png',
+ *     iconRetinaUrl: 'my-icon@2x.png',
+ *     iconSize: [38, 95],
+ *     iconAnchor: [22, 94],
+ *     popupAnchor: [-3, -76],
+ *     shadowUrl: 'my-icon-shadow.png',
+ *     shadowRetinaUrl: 'my-icon-shadow@2x.png',
+ *     shadowSize: [68, 95],
+ *     shadowAnchor: [22, 94]
+ * });
+ *
+ * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);
+ * ```
+ *
+ * `L.Icon.Default` extends `L.Icon` and is the blue icon Leaflet uses for markers by default.
+ *
+ */
+
+var Icon = Class.extend({
 
-               // @namespace Map
-               // @section Tooltip events
-               // @event tooltipopen: TooltipEvent
-               // Fired when a tooltip is opened in the map.
-               map.fire('tooltipopen', {tooltip: this});
+       /* @section
+        * @aka Icon options
+        *
+        * @option iconUrl: String = null
+        * **(required)** The URL to the icon image (absolute or relative to your script path).
+        *
+        * @option iconRetinaUrl: String = null
+        * The URL to a retina sized version of the icon image (absolute or relative to your
+        * script path). Used for Retina screen devices.
+        *
+        * @option iconSize: Point = null
+        * Size of the icon image in pixels.
+        *
+        * @option iconAnchor: Point = null
+        * The coordinates of the "tip" of the icon (relative to its top left corner). The icon
+        * will be aligned so that this point is at the marker's geographical location. Centered
+        * by default if size is specified, also can be set in CSS with negative margins.
+        *
+        * @option popupAnchor: Point = [0, 0]
+        * The coordinates of the point from which popups will "open", relative to the icon anchor.
+        *
+        * @option tooltipAnchor: Point = [0, 0]
+        * The coordinates of the point from which tooltips will "open", relative to the icon anchor.
+        *
+        * @option shadowUrl: String = null
+        * The URL to the icon shadow image. If not specified, no shadow image will be created.
+        *
+        * @option shadowRetinaUrl: String = null
+        *
+        * @option shadowSize: Point = null
+        * Size of the shadow image in pixels.
+        *
+        * @option shadowAnchor: Point = null
+        * The coordinates of the "tip" of the shadow (relative to its top left corner) (the same
+        * as iconAnchor if not specified).
+        *
+        * @option className: String = ''
+        * A custom class name to assign to both icon and shadow images. Empty by default.
+        */
 
-               if (this._source) {
-                       // @namespace Layer
-                       // @section Tooltip events
-                       // @event tooltipopen: TooltipEvent
-                       // Fired when a tooltip bound to this layer is opened.
-                       this._source.fire('tooltipopen', {tooltip: this}, true);
-               }
+       options: {
+               popupAnchor: [0, 0],
+               tooltipAnchor: [0, 0]
        },
 
-       onRemove: function (map) {
-               L.DivOverlay.prototype.onRemove.call(this, map);
-
-               // @namespace Map
-               // @section Tooltip events
-               // @event tooltipclose: TooltipEvent
-               // Fired when a tooltip in the map is closed.
-               map.fire('tooltipclose', {tooltip: this});
-
-               if (this._source) {
-                       // @namespace Layer
-                       // @section Tooltip events
-                       // @event tooltipclose: TooltipEvent
-                       // Fired when a tooltip bound to this layer is closed.
-                       this._source.fire('tooltipclose', {tooltip: this}, true);
-               }
+       initialize: function (options) {
+               setOptions(this, options);
        },
 
-       getEvents: function () {
-               var events = L.DivOverlay.prototype.getEvents.call(this);
-
-               if (L.Browser.touch && !this.options.permanent) {
-                       events.preclick = this._close;
-               }
-
-               return events;
+       // @method createIcon(oldIcon?: HTMLElement): HTMLElement
+       // Called internally when the icon has to be shown, returns a `<img>` HTML element
+       // styled according to the options.
+       createIcon: function (oldIcon) {
+               return this._createIcon('icon', oldIcon);
        },
 
-       _close: function () {
-               if (this._map) {
-                       this._map.closeTooltip(this);
-               }
+       // @method createShadow(oldIcon?: HTMLElement): HTMLElement
+       // As `createIcon`, but for the shadow beneath it.
+       createShadow: function (oldIcon) {
+               return this._createIcon('shadow', oldIcon);
        },
 
-       _initLayout: function () {
-               var prefix = 'leaflet-tooltip',
-                   className = prefix + ' ' + (this.options.className || '') + ' leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
+       _createIcon: function (name, oldIcon) {
+               var src = this._getIconUrl(name);
 
-               this._contentNode = this._container = L.DomUtil.create('div', className);
-       },
+               if (!src) {
+                       if (name === 'icon') {
+                               throw new Error('iconUrl not set in Icon options (see the docs).');
+                       }
+                       return null;
+               }
 
-       _updateLayout: function () {},
+               var img = this._createImg(src, oldIcon && oldIcon.tagName === 'IMG' ? oldIcon : null);
+               this._setIconStyles(img, name);
 
-       _adjustPan: function () {},
+               return img;
+       },
 
-       _setPosition: function (pos) {
-               var map = this._map,
-                   container = this._container,
-                   centerPoint = map.latLngToContainerPoint(map.getCenter()),
-                   tooltipPoint = map.layerPointToContainerPoint(pos),
-                   direction = this.options.direction,
-                   tooltipWidth = container.offsetWidth,
-                   tooltipHeight = container.offsetHeight,
-                   offset = L.point(this.options.offset),
-                   anchor = this._getAnchor();
+       _setIconStyles: function (img, name) {
+               var options = this.options;
+               var sizeOption = options[name + 'Size'];
 
-               if (direction === 'top') {
-                       pos = pos.add(L.point(-tooltipWidth / 2 + offset.x, -tooltipHeight + offset.y + anchor.y));
-               } else if (direction === 'bottom') {
-                       pos = pos.subtract(L.point(tooltipWidth / 2 - offset.x, -offset.y));
-               } else if (direction === 'center') {
-                       pos = pos.subtract(L.point(tooltipWidth / 2 + offset.x, tooltipHeight / 2 - anchor.y + offset.y));
-               } else if (direction === 'right' || direction === 'auto' && tooltipPoint.x < centerPoint.x) {
-                       direction = 'right';
-                       pos = pos.add([offset.x + anchor.x, anchor.y - tooltipHeight / 2 + offset.y]);
-               } else {
-                       direction = 'left';
-                       pos = pos.subtract(L.point(tooltipWidth + anchor.x - offset.x, tooltipHeight / 2 - anchor.y - offset.y));
+               if (typeof sizeOption === 'number') {
+                       sizeOption = [sizeOption, sizeOption];
                }
 
-               L.DomUtil.removeClass(container, 'leaflet-tooltip-right');
-               L.DomUtil.removeClass(container, 'leaflet-tooltip-left');
-               L.DomUtil.removeClass(container, 'leaflet-tooltip-top');
-               L.DomUtil.removeClass(container, 'leaflet-tooltip-bottom');
-               L.DomUtil.addClass(container, 'leaflet-tooltip-' + direction);
-               L.DomUtil.setPosition(container, pos);
-       },
+               var size = toPoint(sizeOption),
+                   anchor = toPoint(name === 'shadow' && options.shadowAnchor || options.iconAnchor ||
+                           size && size.divideBy(2, true));
 
-       _updatePosition: function () {
-               var pos = this._map.latLngToLayerPoint(this._latlng);
-               this._setPosition(pos);
-       },
+               img.className = 'leaflet-marker-' + name + ' ' + (options.className || '');
 
-       setOpacity: function (opacity) {
-               this.options.opacity = opacity;
+               if (anchor) {
+                       img.style.marginLeft = (-anchor.x) + 'px';
+                       img.style.marginTop  = (-anchor.y) + 'px';
+               }
 
-               if (this._container) {
-                       L.DomUtil.setOpacity(this._container, opacity);
+               if (size) {
+                       img.style.width  = size.x + 'px';
+                       img.style.height = size.y + 'px';
                }
        },
 
-       _animateZoom: function (e) {
-               var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center);
-               this._setPosition(pos);
+       _createImg: function (src, el) {
+               el = el || document.createElement('img');
+               el.src = src;
+               return el;
        },
 
-       _getAnchor: function () {
-               // Where should we anchor the tooltip on the source layer?
-               return L.point(this._source && this._source._getTooltipAnchor && !this.options.sticky ? this._source._getTooltipAnchor() : [0, 0]);
+       _getIconUrl: function (name) {
+               return retina && this.options[name + 'RetinaUrl'] || this.options[name + 'Url'];
        }
-
 });
 
-// @namespace Tooltip
-// @factory L.tooltip(options?: Tooltip options, source?: Layer)
-// Instantiates a Tooltip object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the tooltip with a reference to the Layer to which it refers.
-L.tooltip = function (options, source) {
-       return new L.Tooltip(options, source);
-};
 
-// @namespace Map
-// @section Methods for Layers and Controls
-L.Map.include({
+// @factory L.icon(options: Icon options)
+// Creates an icon instance with the given options.
+function icon(options) {
+       return new Icon(options);
+}
 
-       // @method openTooltip(tooltip: Tooltip): this
-       // Opens the specified tooltip.
-       // @alternative
-       // @method openTooltip(content: String|HTMLElement, latlng: LatLng, options?: Tooltip options): this
-       // Creates a tooltip with the specified content and options and open it.
-       openTooltip: function (tooltip, latlng, options) {
-               if (!(tooltip instanceof L.Tooltip)) {
-                       tooltip = new L.Tooltip(options).setContent(tooltip);
-               }
+/*
+ * @miniclass Icon.Default (Icon)
+ * @aka L.Icon.Default
+ * @section
+ *
+ * A trivial subclass of `Icon`, represents the icon to use in `Marker`s when
+ * no icon is specified. Points to the blue marker image distributed with Leaflet
+ * releases.
+ *
+ * In order to customize the default icon, just change the properties of `L.Icon.Default.prototype.options`
+ * (which is a set of `Icon options`).
+ *
+ * If you want to _completely_ replace the default icon, override the
+ * `L.Marker.prototype.options.icon` with your own icon instead.
+ */
 
-               if (latlng) {
-                       tooltip.setLatLng(latlng);
-               }
+var IconDefault = Icon.extend({
 
-               if (this.hasLayer(tooltip)) {
-                       return this;
+       options: {
+               iconUrl:       'marker-icon.png',
+               iconRetinaUrl: 'marker-icon-2x.png',
+               shadowUrl:     'marker-shadow.png',
+               iconSize:    [25, 41],
+               iconAnchor:  [12, 41],
+               popupAnchor: [1, -34],
+               tooltipAnchor: [16, -28],
+               shadowSize:  [41, 41]
+       },
+
+       _getIconUrl: function (name) {
+               if (!IconDefault.imagePath) {   // Deprecated, backwards-compatibility only
+                       IconDefault.imagePath = this._detectIconPath();
                }
 
-               return this.addLayer(tooltip);
+               // @option imagePath: String
+               // `Icon.Default` will try to auto-detect the location of the
+               // blue icon images. If you are placing these images in a non-standard
+               // way, set this option to point to the right path.
+               return (this.options.imagePath || IconDefault.imagePath) + Icon.prototype._getIconUrl.call(this, name);
        },
 
-       // @method closeTooltip(tooltip?: Tooltip): this
-       // Closes the tooltip given as parameter.
-       closeTooltip: function (tooltip) {
-               if (tooltip) {
-                       this.removeLayer(tooltip);
+       _detectIconPath: function () {
+               var el = create$1('div',  'leaflet-default-icon-path', document.body);
+               var path = getStyle(el, 'background-image') ||
+                          getStyle(el, 'backgroundImage');     // IE8
+
+               document.body.removeChild(el);
+
+               if (path === null || path.indexOf('url') !== 0) {
+                       path = '';
+               } else {
+                       path = path.replace(/^url\(["']?/, '').replace(/marker-icon\.png["']?\)$/, '');
                }
-               return this;
-       }
 
+               return path;
+       }
 });
 
+/*
+ * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
+ */
 
 
-/*
- * @namespace Layer
- * @section Tooltip methods example
+/* @namespace Marker
+ * @section Interaction handlers
  *
- * All layers share a set of methods convenient for binding tooltips to it.
+ * Interaction handlers are properties of a marker instance that allow you to control interaction behavior in runtime, enabling or disabling certain features such as dragging (see `Handler` methods). Example:
  *
  * ```js
- * var layer = L.Polygon(latlngs).bindTooltip('Hi There!').addTo(map);
- * layer.openTooltip();
- * layer.closeTooltip();
+ * marker.dragging.disable();
  * ```
+ *
+ * @property dragging: Handler
+ * Marker dragging handler (by both mouse and touch). Only valid when the marker is on the map (Otherwise set [`marker.options.draggable`](#marker-draggable)).
  */
 
-// @section Tooltip methods
-L.Layer.include({
-
-       // @method bindTooltip(content: String|HTMLElement|Function|Tooltip, options?: Tooltip options): this
-       // Binds a tooltip to the layer with the passed `content` and sets up the
-       // neccessary event listeners. If a `Function` is passed it will receive
-       // the layer as the first argument and should return a `String` or `HTMLElement`.
-       bindTooltip: function (content, options) {
-
-               if (content instanceof L.Tooltip) {
-                       L.setOptions(content, options);
-                       this._tooltip = content;
-                       content._source = this;
-               } else {
-                       if (!this._tooltip || options) {
-                               this._tooltip = L.tooltip(options, this);
-                       }
-                       this._tooltip.setContent(content);
-
-               }
+var MarkerDrag = Handler.extend({
+       initialize: function (marker) {
+               this._marker = marker;
+       },
 
-               this._initTooltipInteractions();
+       addHooks: function () {
+               var icon = this._marker._icon;
 
-               if (this._tooltip.options.permanent && this._map && this._map.hasLayer(this)) {
-                       this.openTooltip();
+               if (!this._draggable) {
+                       this._draggable = new Draggable(icon, icon, true);
                }
 
-               return this;
+               this._draggable.on({
+                       dragstart: this._onDragStart,
+                       predrag: this._onPreDrag,
+                       drag: this._onDrag,
+                       dragend: this._onDragEnd
+               }, this).enable();
+
+               addClass(icon, 'leaflet-marker-draggable');
        },
 
-       // @method unbindTooltip(): this
-       // Removes the tooltip previously bound with `bindTooltip`.
-       unbindTooltip: function () {
-               if (this._tooltip) {
-                       this._initTooltipInteractions(true);
-                       this.closeTooltip();
-                       this._tooltip = null;
+       removeHooks: function () {
+               this._draggable.off({
+                       dragstart: this._onDragStart,
+                       predrag: this._onPreDrag,
+                       drag: this._onDrag,
+                       dragend: this._onDragEnd
+               }, this).disable();
+
+               if (this._marker._icon) {
+                       removeClass(this._marker._icon, 'leaflet-marker-draggable');
                }
-               return this;
        },
 
-       _initTooltipInteractions: function (remove) {
-               if (!remove && this._tooltipHandlersAdded) { return; }
-               var onOff = remove ? 'off' : 'on',
-                   events = {
-                       remove: this.closeTooltip,
-                       move: this._moveTooltip
-                   };
-               if (!this._tooltip.options.permanent) {
-                       events.mouseover = this._openTooltip;
-                       events.mouseout = this.closeTooltip;
-                       if (this._tooltip.options.sticky) {
-                               events.mousemove = this._moveTooltip;
-                       }
-                       if (L.Browser.touch) {
-                               events.click = this._openTooltip;
-                       }
-               } else {
-                       events.add = this._openTooltip;
-               }
-               this[onOff](events);
-               this._tooltipHandlersAdded = !remove;
+       moved: function () {
+               return this._draggable && this._draggable._moved;
        },
 
-       // @method openTooltip(latlng?: LatLng): this
-       // Opens the bound tooltip at the specificed `latlng` or at the default tooltip anchor if no `latlng` is passed.
-       openTooltip: function (layer, latlng) {
-               if (!(layer instanceof L.Layer)) {
-                       latlng = layer;
-                       layer = this;
-               }
+       _adjustPan: function (e) {
+               var marker = this._marker,
+                   map = marker._map,
+                   speed = this._marker.options.autoPanSpeed,
+                   padding = this._marker.options.autoPanPadding,
+                   iconPos = getPosition(marker._icon),
+                   bounds = map.getPixelBounds(),
+                   origin = map.getPixelOrigin();
 
-               if (layer instanceof L.FeatureGroup) {
-                       for (var id in this._layers) {
-                               layer = this._layers[id];
-                               break;
-                       }
-               }
+               var panBounds = toBounds(
+                       bounds.min._subtract(origin).add(padding),
+                       bounds.max._subtract(origin).subtract(padding)
+               );
 
-               if (!latlng) {
-                       latlng = layer.getCenter ? layer.getCenter() : layer.getLatLng();
-               }
+               if (!panBounds.contains(iconPos)) {
+                       // Compute incremental movement
+                       var movement = toPoint(
+                               (Math.max(panBounds.max.x, iconPos.x) - panBounds.max.x) / (bounds.max.x - panBounds.max.x) -
+                               (Math.min(panBounds.min.x, iconPos.x) - panBounds.min.x) / (bounds.min.x - panBounds.min.x),
 
-               if (this._tooltip && this._map) {
+                               (Math.max(panBounds.max.y, iconPos.y) - panBounds.max.y) / (bounds.max.y - panBounds.max.y) -
+                               (Math.min(panBounds.min.y, iconPos.y) - panBounds.min.y) / (bounds.min.y - panBounds.min.y)
+                       ).multiplyBy(speed);
 
-                       // set tooltip source to this layer
-                       this._tooltip._source = layer;
+                       map.panBy(movement, {animate: false});
 
-                       // update the tooltip (content, layout, ect...)
-                       this._tooltip.update();
+                       this._draggable._newPos._add(movement);
+                       this._draggable._startPos._add(movement);
 
-                       // open the tooltip on the map
-                       this._map.openTooltip(this._tooltip, latlng);
+                       setPosition(marker._icon, this._draggable._newPos);
+                       this._onDrag(e);
 
-                       // Tooltip container may not be defined if not permanent and never
-                       // opened.
-                       if (this._tooltip.options.interactive && this._tooltip._container) {
-                               L.DomUtil.addClass(this._tooltip._container, 'leaflet-clickable');
-                               this.addInteractiveTarget(this._tooltip._container);
-                       }
+                       this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e));
                }
-
-               return this;
        },
 
-       // @method closeTooltip(): this
-       // Closes the tooltip bound to this layer if it is open.
-       closeTooltip: function () {
-               if (this._tooltip) {
-                       this._tooltip._close();
-                       if (this._tooltip.options.interactive && this._tooltip._container) {
-                               L.DomUtil.removeClass(this._tooltip._container, 'leaflet-clickable');
-                               this.removeInteractiveTarget(this._tooltip._container);
-                       }
-               }
-               return this;
-       },
+       _onDragStart: function () {
+               // @section Dragging events
+               // @event dragstart: Event
+               // Fired when the user starts dragging the marker.
 
-       // @method toggleTooltip(): this
-       // Opens or closes the tooltip bound to this layer depending on its current state.
-       toggleTooltip: function (target) {
-               if (this._tooltip) {
-                       if (this._tooltip._map) {
-                               this.closeTooltip();
-                       } else {
-                               this.openTooltip(target);
-                       }
-               }
-               return this;
-       },
+               // @event movestart: Event
+               // Fired when the marker starts moving (because of dragging).
 
-       // @method isTooltipOpen(): boolean
-       // Returns `true` if the tooltip bound to this layer is currently open.
-       isTooltipOpen: function () {
-               return this._tooltip.isOpen();
+               this._oldLatLng = this._marker.getLatLng();
+               this._marker
+                   .closePopup()
+                   .fire('movestart')
+                   .fire('dragstart');
        },
 
-       // @method setTooltipContent(content: String|HTMLElement|Tooltip): this
-       // Sets the content of the tooltip bound to this layer.
-       setTooltipContent: function (content) {
-               if (this._tooltip) {
-                       this._tooltip.setContent(content);
+       _onPreDrag: function (e) {
+               if (this._marker.options.autoPan) {
+                       cancelAnimFrame(this._panRequest);
+                       this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e));
                }
-               return this;
-       },
-
-       // @method getTooltip(): Tooltip
-       // Returns the tooltip bound to this layer.
-       getTooltip: function () {
-               return this._tooltip;
        },
 
-       _openTooltip: function (e) {
-               var layer = e.layer || e.target;
+       _onDrag: function (e) {
+               var marker = this._marker,
+                   shadow = marker._shadow,
+                   iconPos = getPosition(marker._icon),
+                   latlng = marker._map.layerPointToLatLng(iconPos);
 
-               if (!this._tooltip || !this._map) {
-                       return;
+               // update shadow position
+               if (shadow) {
+                       setPosition(shadow, iconPos);
                }
-               this.openTooltip(layer, this._tooltip.options.sticky ? e.latlng : undefined);
-       },
 
-       _moveTooltip: function (e) {
-               var latlng = e.latlng, containerPoint, layerPoint;
-               if (this._tooltip.options.sticky && e.originalEvent) {
-                       containerPoint = this._map.mouseEventToContainerPoint(e.originalEvent);
-                       layerPoint = this._map.containerPointToLayerPoint(containerPoint);
-                       latlng = this._map.layerPointToLatLng(layerPoint);
-               }
-               this._tooltip.setLatLng(latlng);
-       }
-});
+               marker._latlng = latlng;
+               e.latlng = latlng;
+               e.oldLatLng = this._oldLatLng;
 
+               // @event drag: Event
+               // Fired repeatedly while the user drags the marker.
+               marker
+                   .fire('move', e)
+                   .fire('drag', e);
+       },
 
+       _onDragEnd: function (e) {
+               // @event dragend: DragEndEvent
+               // Fired when the user stops dragging the marker.
 
-/*
- * Tooltip extension to L.Marker, adding tooltip-related methods.
- */
+                cancelAnimFrame(this._panRequest);
 
-L.Marker.include({
-       _getTooltipAnchor: function () {
-               return this.options.icon.options.tooltipAnchor || [0, 0];
+               // @event moveend: Event
+               // Fired when the marker stops moving (because of dragging).
+               delete this._oldLatLng;
+               this._marker
+                   .fire('moveend')
+                   .fire('dragend', e);
        }
 });
 
-
-
 /*
- * @class LayerGroup
- * @aka L.LayerGroup
- * @inherits Layer
- *
- * Used to group several layers and handle them as one. If you add it to the map,
- * any layers added or removed from the group will be added/removed on the map as
- * well. Extends `Layer`.
+ * @class Marker
+ * @inherits Interactive layer
+ * @aka L.Marker
+ * L.Marker is used to display clickable/draggable icons on the map. Extends `Layer`.
  *
  * @example
  *
  * ```js
- * L.layerGroup([marker1, marker2])
- *     .addLayer(polyline)
- *     .addTo(map);
+ * L.marker([50.5, 30.5]).addTo(map);
  * ```
  */
 
-L.LayerGroup = L.Layer.extend({
+var Marker = Layer.extend({
 
-       initialize: function (layers) {
-               this._layers = {};
+       // @section
+       // @aka Marker options
+       options: {
+               // @option icon: Icon = *
+               // Icon instance to use for rendering the marker.
+               // See [Icon documentation](#L.Icon) for details on how to customize the marker icon.
+               // If not specified, a common instance of `L.Icon.Default` is used.
+               icon: new IconDefault(),
 
-               var i, len;
+               // Option inherited from "Interactive layer" abstract class
+               interactive: true,
 
-               if (layers) {
-                       for (i = 0, len = layers.length; i < len; i++) {
-                               this.addLayer(layers[i]);
-                       }
-               }
+               // @option keyboard: Boolean = true
+               // Whether the marker can be tabbed to with a keyboard and clicked by pressing enter.
+               keyboard: true,
+
+               // @option title: String = ''
+               // Text for the browser tooltip that appear on marker hover (no tooltip by default).
+               title: '',
+
+               // @option alt: String = ''
+               // Text for the `alt` attribute of the icon image (useful for accessibility).
+               alt: '',
+
+               // @option zIndexOffset: Number = 0
+               // By default, marker images zIndex is set automatically based on its latitude. Use this option if you want to put the marker on top of all others (or below), specifying a high value like `1000` (or high negative value, respectively).
+               zIndexOffset: 0,
+
+               // @option opacity: Number = 1.0
+               // The opacity of the marker.
+               opacity: 1,
+
+               // @option riseOnHover: Boolean = false
+               // If `true`, the marker will get on top of others when you hover the mouse over it.
+               riseOnHover: false,
+
+               // @option riseOffset: Number = 250
+               // The z-index offset used for the `riseOnHover` feature.
+               riseOffset: 250,
+
+               // @option pane: String = 'markerPane'
+               // `Map pane` where the markers icon will be added.
+               pane: 'markerPane',
+
+               // @option pane: String = 'shadowPane'
+               // `Map pane` where the markers shadow will be added.
+               shadowPane: 'shadowPane',
+
+               // @option bubblingMouseEvents: Boolean = false
+               // When `true`, a mouse event on this marker will trigger the same event on the map
+               // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used).
+               bubblingMouseEvents: false,
+
+               // @section Draggable marker options
+               // @option draggable: Boolean = false
+               // Whether the marker is draggable with mouse/touch or not.
+               draggable: false,
+
+               // @option autoPan: Boolean = false
+               // Whether to pan the map when dragging this marker near its edge or not.
+               autoPan: false,
+
+               // @option autoPanPadding: Point = Point(50, 50)
+               // Distance (in pixels to the left/right and to the top/bottom) of the
+               // map edge to start panning the map.
+               autoPanPadding: [50, 50],
+
+               // @option autoPanSpeed: Number = 10
+               // Number of pixels the map should pan by.
+               autoPanSpeed: 10
        },
 
-       // @method addLayer(layer: Layer): this
-       // Adds the given layer to the group.
-       addLayer: function (layer) {
-               var id = this.getLayerId(layer);
+       /* @section
+        *
+        * In addition to [shared layer methods](#Layer) like `addTo()` and `remove()` and [popup methods](#Popup) like bindPopup() you can also use the following methods:
+        */
 
-               this._layers[id] = layer;
+       initialize: function (latlng, options) {
+               setOptions(this, options);
+               this._latlng = toLatLng(latlng);
+       },
 
-               if (this._map) {
-                       this._map.addLayer(layer);
+       onAdd: function (map) {
+               this._zoomAnimated = this._zoomAnimated && map.options.markerZoomAnimation;
+
+               if (this._zoomAnimated) {
+                       map.on('zoomanim', this._animateZoom, this);
                }
 
-               return this;
+               this._initIcon();
+               this.update();
        },
 
-       // @method removeLayer(layer: Layer): this
-       // Removes the given layer from the group.
-       // @alternative
-       // @method removeLayer(id: Number): this
-       // Removes the layer with the given internal ID from the group.
-       removeLayer: function (layer) {
-               var id = layer in this._layers ? layer : this.getLayerId(layer);
-
-               if (this._map && this._layers[id]) {
-                       this._map.removeLayer(this._layers[id]);
+       onRemove: function (map) {
+               if (this.dragging && this.dragging.enabled()) {
+                       this.options.draggable = true;
+                       this.dragging.removeHooks();
                }
+               delete this.dragging;
 
-               delete this._layers[id];
+               if (this._zoomAnimated) {
+                       map.off('zoomanim', this._animateZoom, this);
+               }
 
-               return this;
+               this._removeIcon();
+               this._removeShadow();
        },
 
-       // @method hasLayer(layer: Layer): Boolean
-       // Returns `true` if the given layer is currently added to the group.
-       hasLayer: function (layer) {
-               return !!layer && (layer in this._layers || this.getLayerId(layer) in this._layers);
+       getEvents: function () {
+               return {
+                       zoom: this.update,
+                       viewreset: this.update
+               };
        },
 
-       // @method clearLayers(): this
-       // Removes all the layers from the group.
-       clearLayers: function () {
-               for (var i in this._layers) {
-                       this.removeLayer(this._layers[i]);
-               }
-               return this;
+       // @method getLatLng: LatLng
+       // Returns the current geographical position of the marker.
+       getLatLng: function () {
+               return this._latlng;
        },
 
-       // @method invoke(methodName: String, …): this
-       // Calls `methodName` on every layer contained in this group, passing any
-       // additional parameters. Has no effect if the layers contained do not
-       // implement `methodName`.
-       invoke: function (methodName) {
-               var args = Array.prototype.slice.call(arguments, 1),
-                   i, layer;
-
-               for (i in this._layers) {
-                       layer = this._layers[i];
+       // @method setLatLng(latlng: LatLng): this
+       // Changes the marker position to the given point.
+       setLatLng: function (latlng) {
+               var oldLatLng = this._latlng;
+               this._latlng = toLatLng(latlng);
+               this.update();
 
-                       if (layer[methodName]) {
-                               layer[methodName].apply(layer, args);
-                       }
-               }
+               // @event move: Event
+               // Fired when the marker is moved via [`setLatLng`](#marker-setlatlng) or by [dragging](#marker-dragging). Old and new coordinates are included in event arguments as `oldLatLng`, `latlng`.
+               return this.fire('move', {oldLatLng: oldLatLng, latlng: this._latlng});
+       },
 
-               return this;
+       // @method setZIndexOffset(offset: Number): this
+       // Changes the [zIndex offset](#marker-zindexoffset) of the marker.
+       setZIndexOffset: function (offset) {
+               this.options.zIndexOffset = offset;
+               return this.update();
        },
 
-       onAdd: function (map) {
-               for (var i in this._layers) {
-                       map.addLayer(this._layers[i]);
-               }
+       // @method getIcon: Icon
+       // Returns the current icon used by the marker
+       getIcon: function () {
+               return this.options.icon;
        },
 
-       onRemove: function (map) {
-               for (var i in this._layers) {
-                       map.removeLayer(this._layers[i]);
+       // @method setIcon(icon: Icon): this
+       // Changes the marker icon.
+       setIcon: function (icon) {
+
+               this.options.icon = icon;
+
+               if (this._map) {
+                       this._initIcon();
+                       this.update();
                }
-       },
 
-       // @method eachLayer(fn: Function, context?: Object): this
-       // Iterates over the layers of the group, optionally specifying context of the iterator function.
-       // ```js
-       // group.eachLayer(function (layer) {
-       //      layer.bindPopup('Hello');
-       // });
-       // ```
-       eachLayer: function (method, context) {
-               for (var i in this._layers) {
-                       method.call(context, this._layers[i]);
+               if (this._popup) {
+                       this.bindPopup(this._popup, this._popup.options);
                }
+
                return this;
        },
 
-       // @method getLayer(id: Number): Layer
-       // Returns the layer with the given internal ID.
-       getLayer: function (id) {
-               return this._layers[id];
+       getElement: function () {
+               return this._icon;
        },
 
-       // @method getLayers(): Layer[]
-       // Returns an array of all the layers added to the group.
-       getLayers: function () {
-               var layers = [];
+       update: function () {
 
-               for (var i in this._layers) {
-                       layers.push(this._layers[i]);
+               if (this._icon && this._map) {
+                       var pos = this._map.latLngToLayerPoint(this._latlng).round();
+                       this._setPos(pos);
                }
-               return layers;
-       },
 
-       // @method setZIndex(zIndex: Number): this
-       // Calls `setZIndex` on every layer contained in this group, passing the z-index.
-       setZIndex: function (zIndex) {
-               return this.invoke('setZIndex', zIndex);
+               return this;
        },
 
-       // @method getLayerId(layer: Layer): Number
-       // Returns the internal ID for a layer
-       getLayerId: function (layer) {
-               return L.stamp(layer);
-       }
-});
-
+       _initIcon: function () {
+               var options = this.options,
+                   classToAdd = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
 
-// @factory L.layerGroup(layers: Layer[])
-// Create a layer group, optionally given an initial set of layers.
-L.layerGroup = function (layers) {
-       return new L.LayerGroup(layers);
-};
+               var icon = options.icon.createIcon(this._icon),
+                   addIcon = false;
 
+               // 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) {
+                               icon.title = options.title;
+                       }
 
-/*
- * @class FeatureGroup
- * @aka L.FeatureGroup
- * @inherits LayerGroup
- *
- * Extended `LayerGroup` that makes it easier to do the same thing to all its member layers:
- *  * [`bindPopup`](#layer-bindpopup) binds a popup to all of the layers at once (likewise with [`bindTooltip`](#layer-bindtooltip))
- *  * Events are propagated to the `FeatureGroup`, so if the group has an event
- * handler, it will handle events from any of the layers. This includes mouse events
- * and custom events.
- *  * Has `layeradd` and `layerremove` events
- *
- * @example
- *
- * ```js
- * L.featureGroup([marker1, marker2, polyline])
- *     .bindPopup('Hello world!')
- *     .on('click', function() { alert('Clicked on a member of the group!'); })
- *     .addTo(map);
- * ```
- */
+                       if (icon.tagName === 'IMG') {
+                               icon.alt = options.alt || '';
+                       }
+               }
 
-L.FeatureGroup = L.LayerGroup.extend({
+               addClass(icon, classToAdd);
 
-       addLayer: function (layer) {
-               if (this.hasLayer(layer)) {
-                       return this;
+               if (options.keyboard) {
+                       icon.tabIndex = '0';
                }
 
-               layer.addEventParent(this);
+               this._icon = icon;
 
-               L.LayerGroup.prototype.addLayer.call(this, layer);
+               if (options.riseOnHover) {
+                       this.on({
+                               mouseover: this._bringToFront,
+                               mouseout: this._resetZIndex
+                       });
+               }
 
-               // @event layeradd: LayerEvent
-               // Fired when a layer is added to this `FeatureGroup`
-               return this.fire('layeradd', {layer: layer});
-       },
+               var newShadow = options.icon.createShadow(this._shadow),
+                   addShadow = false;
 
-       removeLayer: function (layer) {
-               if (!this.hasLayer(layer)) {
-                       return this;
-               }
-               if (layer in this._layers) {
-                       layer = this._layers[layer];
+               if (newShadow !== this._shadow) {
+                       this._removeShadow();
+                       addShadow = true;
                }
 
-               layer.removeEventParent(this);
-
-               L.LayerGroup.prototype.removeLayer.call(this, layer);
+               if (newShadow) {
+                       addClass(newShadow, classToAdd);
+                       newShadow.alt = '';
+               }
+               this._shadow = newShadow;
 
-               // @event layerremove: LayerEvent
-               // Fired when a layer is removed from this `FeatureGroup`
-               return this.fire('layerremove', {layer: layer});
-       },
 
-       // @method setStyle(style: Path options): this
-       // Sets the given path options to each layer of the group that has a `setStyle` method.
-       setStyle: function (style) {
-               return this.invoke('setStyle', style);
-       },
+               if (options.opacity < 1) {
+                       this._updateOpacity();
+               }
 
-       // @method bringToFront(): this
-       // Brings the layer group to the top of all other layers
-       bringToFront: function () {
-               return this.invoke('bringToFront');
-       },
 
-       // @method bringToBack(): this
-       // Brings the layer group to the top of all other layers
-       bringToBack: function () {
-               return this.invoke('bringToBack');
+               if (addIcon) {
+                       this.getPane().appendChild(this._icon);
+               }
+               this._initInteraction();
+               if (newShadow && addShadow) {
+                       this.getPane(options.shadowPane).appendChild(this._shadow);
+               }
        },
 
-       // @method getBounds(): LatLngBounds
-       // Returns the LatLngBounds of the Feature Group (created from bounds and coordinates of its children).
-       getBounds: function () {
-               var bounds = new L.LatLngBounds();
-
-               for (var id in this._layers) {
-                       var layer = this._layers[id];
-                       bounds.extend(layer.getBounds ? layer.getBounds() : layer.getLatLng());
+       _removeIcon: function () {
+               if (this.options.riseOnHover) {
+                       this.off({
+                               mouseover: this._bringToFront,
+                               mouseout: this._resetZIndex
+                       });
                }
-               return bounds;
-       }
-});
-
-// @factory L.featureGroup(layers: Layer[])
-// Create a feature group, optionally given an initial set of layers.
-L.featureGroup = function (layers) {
-       return new L.FeatureGroup(layers);
-};
-
-
-
-/*
- * @class Renderer
- * @inherits Layer
- * @aka L.Renderer
- *
- * Base class for vector renderer implementations (`SVG`, `Canvas`). Handles the
- * DOM container of the renderer, its bounds, and its zoom animation.
- *
- * A `Renderer` works as an implicit layer group for all `Path`s - the renderer
- * itself can be added or removed to the map. All paths use a renderer, which can
- * be implicit (the map will decide the type of renderer and use it automatically)
- * or explicit (using the [`renderer`](#path-renderer) option of the path).
- *
- * Do not use this class directly, use `SVG` and `Canvas` instead.
- *
- * @event update: Event
- * Fired when the renderer updates its bounds, center and zoom, for example when
- * its map has moved
- */
 
-L.Renderer = L.Layer.extend({
+               remove(this._icon);
+               this.removeInteractiveTarget(this._icon);
 
-       // @section
-       // @aka Renderer options
-       options: {
-               // @option padding: Number = 0.1
-               // How much to extend the clip area around the map view (relative to its size)
-               // e.g. 0.1 would be 10% of map view in each direction
-               padding: 0.1
+               this._icon = null;
        },
 
-       initialize: function (options) {
-               L.setOptions(this, options);
-               L.stamp(this);
+       _removeShadow: function () {
+               if (this._shadow) {
+                       remove(this._shadow);
+               }
+               this._shadow = null;
        },
 
-       onAdd: function () {
-               if (!this._container) {
-                       this._initContainer(); // defined by renderer implementations
+       _setPos: function (pos) {
+               setPosition(this._icon, pos);
 
-                       if (this._zoomAnimated) {
-                               L.DomUtil.addClass(this._container, 'leaflet-zoom-animated');
-                       }
+               if (this._shadow) {
+                       setPosition(this._shadow, pos);
                }
 
-               this.getPane().appendChild(this._container);
-               this._update();
-       },
+               this._zIndex = pos.y + this.options.zIndexOffset;
 
-       onRemove: function () {
-               L.DomUtil.remove(this._container);
+               this._resetZIndex();
        },
 
-       getEvents: function () {
-               var events = {
-                       viewreset: this._reset,
-                       zoom: this._onZoom,
-                       moveend: this._update
-               };
-               if (this._zoomAnimated) {
-                       events.zoomanim = this._onAnimZoom;
-               }
-               return events;
+       _updateZIndex: function (offset) {
+               this._icon.style.zIndex = this._zIndex + offset;
        },
 
-       _onAnimZoom: function (ev) {
-               this._updateTransform(ev.center, ev.zoom);
-       },
+       _animateZoom: function (opt) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round();
 
-       _onZoom: function () {
-               this._updateTransform(this._map.getCenter(), this._map.getZoom());
+               this._setPos(pos);
        },
 
-       _updateTransform: function (center, zoom) {
-               var scale = this._map.getZoomScale(zoom, this._zoom),
-                   position = L.DomUtil.getPosition(this._container),
-                   viewHalf = this._map.getSize().multiplyBy(0.5 + this.options.padding),
-                   currentCenterPoint = this._map.project(this._center, zoom),
-                   destCenterPoint = this._map.project(center, zoom),
-                   centerOffset = destCenterPoint.subtract(currentCenterPoint),
+       _initInteraction: function () {
 
-                   topLeftOffset = viewHalf.multiplyBy(-scale).add(position).add(viewHalf).subtract(centerOffset);
+               if (!this.options.interactive) { return; }
 
-               if (L.Browser.any3d) {
-                       L.DomUtil.setTransform(this._container, topLeftOffset, scale);
-               } else {
-                       L.DomUtil.setPosition(this._container, topLeftOffset);
-               }
-       },
+               addClass(this._icon, 'leaflet-interactive');
 
-       _reset: function () {
-               this._update();
-               this._updateTransform(this._center, this._zoom);
-       },
+               this.addInteractiveTarget(this._icon);
 
-       _update: function () {
-               // Update pixel bounds of renderer container (for positioning/sizing/clipping later)
-               // Subclasses are responsible of firing the 'update' event.
-               var p = this.options.padding,
-                   size = this._map.getSize(),
-                   min = this._map.containerPointToLayerPoint(size.multiplyBy(-p)).round();
+               if (MarkerDrag) {
+                       var draggable = this.options.draggable;
+                       if (this.dragging) {
+                               draggable = this.dragging.enabled();
+                               this.dragging.disable();
+                       }
 
-               this._bounds = new L.Bounds(min, min.add(size.multiplyBy(1 + p * 2)).round());
+                       this.dragging = new MarkerDrag(this);
 
-               this._center = this._map.getCenter();
-               this._zoom = this._map.getZoom();
-       }
-});
+                       if (draggable) {
+                               this.dragging.enable();
+                       }
+               }
+       },
 
+       // @method setOpacity(opacity: Number): this
+       // Changes the opacity of the marker.
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
+               if (this._map) {
+                       this._updateOpacity();
+               }
 
-L.Map.include({
-       // @namespace Map; @method getRenderer(layer: Path): Renderer
-       // Returns the instance of `Renderer` that should be used to render the given
-       // `Path`. It will ensure that the `renderer` options of the map and paths
-       // are respected, and that the renderers do exist on the map.
-       getRenderer: function (layer) {
-               // @namespace Path; @option renderer: Renderer
-               // Use this specific instance of `Renderer` for this path. Takes
-               // precedence over the map's [default renderer](#map-renderer).
-               var renderer = layer.options.renderer || this._getPaneRenderer(layer.options.pane) || this.options.renderer || this._renderer;
+               return this;
+       },
 
-               if (!renderer) {
-                       // @namespace Map; @option preferCanvas: Boolean = false
-                       // Whether `Path`s should be rendered on a `Canvas` renderer.
-                       // By default, all `Path`s are rendered in a `SVG` renderer.
-                       renderer = this._renderer = (this.options.preferCanvas && L.canvas()) || L.svg();
+       _updateOpacity: function () {
+               var opacity = this.options.opacity;
+
+               if (this._icon) {
+                       setOpacity(this._icon, opacity);
                }
 
-               if (!this.hasLayer(renderer)) {
-                       this.addLayer(renderer);
+               if (this._shadow) {
+                       setOpacity(this._shadow, opacity);
                }
-               return renderer;
        },
 
-       _getPaneRenderer: function (name) {
-               if (name === 'overlayPane' || name === undefined) {
-                       return false;
-               }
+       _bringToFront: function () {
+               this._updateZIndex(this.options.riseOffset);
+       },
 
-               var renderer = this._paneRenderers[name];
-               if (renderer === undefined) {
-                       renderer = (L.SVG && L.svg({pane: name})) || (L.Canvas && L.canvas({pane: name}));
-                       this._paneRenderers[name] = renderer;
-               }
-               return renderer;
+       _resetZIndex: function () {
+               this._updateZIndex(0);
+       },
+
+       _getPopupAnchor: function () {
+               return this.options.icon.options.popupAnchor;
+       },
+
+       _getTooltipAnchor: function () {
+               return this.options.icon.options.tooltipAnchor;
        }
 });
 
 
+// factory L.marker(latlng: LatLng, options? : Marker options)
+
+// @factory L.marker(latlng: LatLng, options? : Marker options)
+// Instantiates a Marker object given a geographical point and optionally an options object.
+function marker(latlng, options) {
+       return new Marker(latlng, options);
+}
 
 /*
  * @class Path
@@ -7399,7 +7755,7 @@ L.Map.include({
  * overlays (Polygon, Polyline, Circle). Do not use it directly. Extends `Layer`.
  */
 
-L.Path = L.Layer.extend({
+var Path = Layer.extend({
 
        // @section
        // @aka Path options
@@ -7455,7 +7811,12 @@ L.Path = L.Layer.extend({
                // className: '',
 
                // Option inherited from "Interactive layer" abstract class
-               interactive: true
+               interactive: true,
+
+               // @option bubblingMouseEvents: Boolean = true
+               // When `true`, a mouse event on this path will trigger the same event on the map
+               // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used).
+               bubblingMouseEvents: true
        },
 
        beforeAdd: function (map) {
@@ -7468,19 +7829,10 @@ L.Path = L.Layer.extend({
                this._renderer._initPath(this);
                this._reset();
                this._renderer._addPath(this);
-               this._renderer.on('update', this._update, this);
        },
 
        onRemove: function () {
                this._renderer._removePath(this);
-               this._renderer.off('update', this._update, this);
-       },
-
-       getEvents: function () {
-               return {
-                       zoomend: this._project,
-                       viewreset: this._reset
-               };
        },
 
        // @method redraw(): this
@@ -7495,9 +7847,12 @@ L.Path = L.Layer.extend({
        // @method setStyle(style: Path options): this
        // Changes the appearance of a Path based on the options in the `Path options` object.
        setStyle: function (style) {
-               L.setOptions(this, style);
+               setOptions(this, style);
                if (this._renderer) {
                        this._renderer._updateStyle(this);
+                       if (this.options.stroke && style.hasOwnProperty('weight')) {
+                               this._updateBounds();
+                       }
                }
                return this;
        },
@@ -7525,249 +7880,222 @@ L.Path = L.Layer.extend({
        },
 
        _reset: function () {
-               // defined in children classes
+               // defined in child classes
                this._project();
                this._update();
        },
 
        _clickTolerance: function () {
                // used when doing hit detection for Canvas layers
-               return (this.options.stroke ? this.options.weight / 2 : 0) + (L.Browser.touch ? 10 : 0);
+               return (this.options.stroke ? this.options.weight / 2 : 0) + this._renderer.options.tolerance;
        }
 });
 
-
-
 /*
- * @namespace LineUtil
+ * @class CircleMarker
+ * @aka L.CircleMarker
+ * @inherits Path
  *
- * Various utility functions for polyine points processing, used by Leaflet internally to make polylines lightning-fast.
+ * A circle of a fixed size with radius specified in pixels. Extends `Path`.
  */
 
-L.LineUtil = {
-
-       // Simplify polyline with vertex reduction and Douglas-Peucker simplification.
-       // Improves rendering performance dramatically by lessening the number of points to draw.
-
-       // @function simplify(points: Point[], tolerance: Number): Point[]
-       // Dramatically reduces the number of points in a polyline while retaining
-       // its shape and returns a new array of simplified points, using the
-       // [Douglas-Peucker algorithm](http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm).
-       // Used for a huge performance boost when processing/displaying Leaflet polylines for
-       // each zoom level and also reducing visual noise. tolerance affects the amount of
-       // simplification (lesser value means higher quality but slower and with more points).
-       // Also released as a separated micro-library [Simplify.js](http://mourner.github.com/simplify-js/).
-       simplify: function (points, tolerance) {
-               if (!tolerance || !points.length) {
-                       return points.slice();
-               }
-
-               var sqTolerance = tolerance * tolerance;
+var CircleMarker = Path.extend({
 
-               // stage 1: vertex reduction
-               points = this._reducePoints(points, sqTolerance);
-
-               // stage 2: Douglas-Peucker simplification
-               points = this._simplifyDP(points, sqTolerance);
+       // @section
+       // @aka CircleMarker options
+       options: {
+               fill: true,
 
-               return points;
+               // @option radius: Number = 10
+               // Radius of the circle marker, in pixels
+               radius: 10
        },
 
-       // @function pointToSegmentDistance(p: Point, p1: Point, p2: Point): Number
-       // Returns the distance between point `p` and segment `p1` to `p2`.
-       pointToSegmentDistance:  function (p, p1, p2) {
-               return Math.sqrt(this._sqClosestPointOnSegment(p, p1, p2, true));
+       initialize: function (latlng, options) {
+               setOptions(this, options);
+               this._latlng = toLatLng(latlng);
+               this._radius = this.options.radius;
        },
 
-       // @function closestPointOnSegment(p: Point, p1: Point, p2: Point): Number
-       // Returns the closest point from a point `p` on a segment `p1` to `p2`.
-       closestPointOnSegment: function (p, p1, p2) {
-               return this._sqClosestPointOnSegment(p, p1, p2);
+       // @method setLatLng(latLng: LatLng): this
+       // Sets the position of a circle marker to a new location.
+       setLatLng: function (latlng) {
+               this._latlng = toLatLng(latlng);
+               this.redraw();
+               return this.fire('move', {latlng: this._latlng});
        },
 
-       // Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm
-       _simplifyDP: function (points, sqTolerance) {
-
-               var len = points.length,
-                   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,
-                   newPoints = [];
-
-               for (i = 0; i < len; i++) {
-                       if (markers[i]) {
-                               newPoints.push(points[i]);
-                       }
-               }
-
-               return newPoints;
+       // @method getLatLng(): LatLng
+       // Returns the current geographical position of the circle marker
+       getLatLng: function () {
+               return this._latlng;
        },
 
-       _simplifyDPStep: function (points, markers, sqTolerance, first, last) {
-
-               var maxSqDist = 0,
-                   index, i, sqDist;
-
-               for (i = first + 1; i <= last - 1; i++) {
-                       sqDist = this._sqClosestPointOnSegment(points[i], points[first], points[last], true);
+       // @method setRadius(radius: Number): this
+       // Sets the radius of a circle marker. Units are in pixels.
+       setRadius: function (radius) {
+               this.options.radius = this._radius = radius;
+               return this.redraw();
+       },
 
-                       if (sqDist > maxSqDist) {
-                               index = i;
-                               maxSqDist = sqDist;
-                       }
-               }
+       // @method getRadius(): Number
+       // Returns the current radius of the circle
+       getRadius: function () {
+               return this._radius;
+       },
 
-               if (maxSqDist > sqTolerance) {
-                       markers[index] = 1;
+       setStyle : function (options) {
+               var radius = options && options.radius || this._radius;
+               Path.prototype.setStyle.call(this, options);
+               this.setRadius(radius);
+               return this;
+       },
 
-                       this._simplifyDPStep(points, markers, sqTolerance, first, index);
-                       this._simplifyDPStep(points, markers, sqTolerance, index, last);
-               }
+       _project: function () {
+               this._point = this._map.latLngToLayerPoint(this._latlng);
+               this._updateBounds();
        },
 
-       // reduce points that are too close to each other to a single point
-       _reducePoints: function (points, sqTolerance) {
-               var reducedPoints = [points[0]];
+       _updateBounds: function () {
+               var r = this._radius,
+                   r2 = this._radiusY || r,
+                   w = this._clickTolerance(),
+                   p = [r + w, r2 + w];
+               this._pxBounds = new Bounds(this._point.subtract(p), this._point.add(p));
+       },
 
-               for (var i = 1, prev = 0, len = points.length; i < len; i++) {
-                       if (this._sqDist(points[i], points[prev]) > sqTolerance) {
-                               reducedPoints.push(points[i]);
-                               prev = i;
-                       }
-               }
-               if (prev < len - 1) {
-                       reducedPoints.push(points[len - 1]);
+       _update: function () {
+               if (this._map) {
+                       this._updatePath();
                }
-               return reducedPoints;
        },
 
+       _updatePath: function () {
+               this._renderer._updateCircle(this);
+       },
 
-       // @function clipSegment(a: Point, b: Point, bounds: Bounds, useLastCode?: Boolean, round?: Boolean): Point[]|Boolean
-       // Clips the segment a to b by rectangular bounds with the
-       // [Cohen-Sutherland algorithm](https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm)
-       // (modifying the segment points directly!). Used by Leaflet to only show polyline
-       // points that are on the screen or near, increasing performance.
-       clipSegment: function (a, b, bounds, useLastCode, round) {
-               var codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),
-                   codeB = this._getBitCode(b, bounds),
+       _empty: function () {
+               return this._radius && !this._renderer._bounds.intersects(this._pxBounds);
+       },
 
-                   codeOut, p, newCode;
+       // Needed by the `Canvas` renderer for interactivity
+       _containsPoint: function (p) {
+               return p.distanceTo(this._point) <= this._radius + this._clickTolerance();
+       }
+});
 
-               // save 2nd code to avoid calculating it on the next segment
-               this._lastCode = codeB;
 
-               while (true) {
-                       // if a,b is inside the clip window (trivial accept)
-                       if (!(codeA | codeB)) {
-                               return [a, b];
-                       }
+// @factory L.circleMarker(latlng: LatLng, options?: CircleMarker options)
+// Instantiates a circle marker object given a geographical point, and an optional options object.
+function circleMarker(latlng, options) {
+       return new CircleMarker(latlng, options);
+}
 
-                       // if a,b is outside the clip window (trivial reject)
-                       if (codeA & codeB) {
-                               return false;
-                       }
+/*
+ * @class Circle
+ * @aka L.Circle
+ * @inherits CircleMarker
+ *
+ * A class for drawing circle overlays on a map. Extends `CircleMarker`.
+ *
+ * It's an approximation and starts to diverge from a real circle closer to poles (due to projection distortion).
+ *
+ * @example
+ *
+ * ```js
+ * L.circle([50.5, 30.5], {radius: 200}).addTo(map);
+ * ```
+ */
 
-                       // other cases
-                       codeOut = codeA || codeB;
-                       p = this._getEdgeIntersection(a, b, codeOut, bounds, round);
-                       newCode = this._getBitCode(p, bounds);
+var Circle = CircleMarker.extend({
 
-                       if (codeOut === codeA) {
-                               a = p;
-                               codeA = newCode;
-                       } else {
-                               b = p;
-                               codeB = newCode;
-                       }
+       initialize: function (latlng, options, legacyOptions) {
+               if (typeof options === 'number') {
+                       // Backwards compatibility with 0.7.x factory (latlng, radius, options?)
+                       options = extend({}, legacyOptions, {radius: options});
                }
-       },
+               setOptions(this, options);
+               this._latlng = toLatLng(latlng);
 
-       _getEdgeIntersection: function (a, b, code, bounds, round) {
-               var dx = b.x - a.x,
-                   dy = b.y - a.y,
-                   min = bounds.min,
-                   max = bounds.max,
-                   x, y;
+               if (isNaN(this.options.radius)) { throw new Error('Circle radius cannot be NaN'); }
 
-               if (code & 8) { // top
-                       x = a.x + dx * (max.y - a.y) / dy;
-                       y = max.y;
+               // @section
+               // @aka Circle options
+               // @option radius: Number; Radius of the circle, in meters.
+               this._mRadius = this.options.radius;
+       },
 
-               } else if (code & 4) { // bottom
-                       x = a.x + dx * (min.y - a.y) / dy;
-                       y = min.y;
+       // @method setRadius(radius: Number): this
+       // Sets the radius of a circle. Units are in meters.
+       setRadius: function (radius) {
+               this._mRadius = radius;
+               return this.redraw();
+       },
 
-               } else if (code & 2) { // right
-                       x = max.x;
-                       y = a.y + dy * (max.x - a.x) / dx;
+       // @method getRadius(): Number
+       // Returns the current radius of a circle. Units are in meters.
+       getRadius: function () {
+               return this._mRadius;
+       },
 
-               } else if (code & 1) { // left
-                       x = min.x;
-                       y = a.y + dy * (min.x - a.x) / dx;
-               }
+       // @method getBounds(): LatLngBounds
+       // Returns the `LatLngBounds` of the path.
+       getBounds: function () {
+               var half = [this._radius, this._radiusY || this._radius];
 
-               return new L.Point(x, y, round);
+               return new LatLngBounds(
+                       this._map.layerPointToLatLng(this._point.subtract(half)),
+                       this._map.layerPointToLatLng(this._point.add(half)));
        },
 
-       _getBitCode: function (p, bounds) {
-               var code = 0;
+       setStyle: Path.prototype.setStyle,
 
-               if (p.x < bounds.min.x) { // left
-                       code |= 1;
-               } else if (p.x > bounds.max.x) { // right
-                       code |= 2;
-               }
+       _project: function () {
 
-               if (p.y < bounds.min.y) { // bottom
-                       code |= 4;
-               } else if (p.y > bounds.max.y) { // top
-                       code |= 8;
-               }
+               var lng = this._latlng.lng,
+                   lat = this._latlng.lat,
+                   map = this._map,
+                   crs = map.options.crs;
 
-               return code;
-       },
+               if (crs.distance === Earth.distance) {
+                       var d = Math.PI / 180,
+                           latR = (this._mRadius / Earth.R) / d,
+                           top = map.project([lat + latR, lng]),
+                           bottom = map.project([lat - latR, lng]),
+                           p = top.add(bottom).divideBy(2),
+                           lat2 = map.unproject(p).lat,
+                           lngR = Math.acos((Math.cos(latR * d) - Math.sin(lat * d) * Math.sin(lat2 * d)) /
+                                   (Math.cos(lat * d) * Math.cos(lat2 * d))) / d;
 
-       // square distance (to avoid unnecessary Math.sqrt calls)
-       _sqDist: function (p1, p2) {
-               var dx = p2.x - p1.x,
-                   dy = p2.y - p1.y;
-               return dx * dx + dy * dy;
-       },
+                       if (isNaN(lngR) || lngR === 0) {
+                               lngR = latR / Math.cos(Math.PI / 180 * lat); // Fallback for edge case, #2425
+                       }
 
-       // 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;
+                       this._point = p.subtract(map.getPixelOrigin());
+                       this._radius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR]).x;
+                       this._radiusY = p.y - top.y;
 
-               if (dot > 0) {
-                       t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
+               } else {
+                       var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0]));
 
-                       if (t > 1) {
-                               x = p2.x;
-                               y = p2.y;
-                       } else if (t > 0) {
-                               x += dx * t;
-                               y += dy * t;
-                       }
+                       this._point = map.latLngToLayerPoint(this._latlng);
+                       this._radius = this._point.x - map.latLngToLayerPoint(latlng2).x;
                }
 
-               dx = p.x - x;
-               dy = p.y - y;
-
-               return sqDist ? dx * dx + dy * dy : new L.Point(x, y);
+               this._updateBounds();
        }
-};
-
+});
 
+// @factory L.circle(latlng: LatLng, options?: Circle options)
+// Instantiates a circle object given a geographical point, and an options object
+// which contains the circle radius.
+// @alternative
+// @factory L.circle(latlng: LatLng, radius: Number, options?: Circle options)
+// Obsolete way of instantiating a circle, for compatibility with 0.7.x code.
+// Do not use in new applications or plugins.
+function circle(latlng, options, legacyOptions) {
+       return new Circle(latlng, options, legacyOptions);
+}
 
 /*
  * @class Polyline
@@ -7781,9 +8109,9 @@ L.LineUtil = {
  * ```js
  * // create a red polyline from an array of LatLng points
  * var latlngs = [
- *     [-122.68, 45.51],
- *     [-122.43, 37.77],
- *     [-118.2, 34.04]
+ *     [45.51, -122.68],
+ *     [37.77, -122.43],
+ *     [34.04, -118.2]
  * ];
  *
  * var polyline = L.polyline(latlngs, {color: 'red'}).addTo(map);
@@ -7797,17 +8125,18 @@ L.LineUtil = {
  * ```js
  * // create a red polyline from an array of arrays of LatLng points
  * var latlngs = [
- *     [[-122.68, 45.51],
- *      [-122.43, 37.77],
- *      [-118.2, 34.04]],
- *     [[-73.91, 40.78],
- *      [-87.62, 41.83],
- *      [-96.72, 32.76]]
+ *     [[45.51, -122.68],
+ *      [37.77, -122.43],
+ *      [34.04, -118.2]],
+ *     [[40.78, -73.91],
+ *      [41.83, -87.62],
+ *      [32.76, -96.72]]
  * ];
  * ```
  */
 
-L.Polyline = L.Path.extend({
+
+var Polyline = Path.extend({
 
        // @section
        // @aka Polyline options
@@ -7823,7 +8152,7 @@ L.Polyline = L.Path.extend({
        },
 
        initialize: function (latlngs, options) {
-               L.setOptions(this, options);
+               setOptions(this, options);
                this._setLatLngs(latlngs);
        },
 
@@ -7846,10 +8175,12 @@ L.Polyline = L.Path.extend({
                return !this._latlngs.length;
        },
 
+       // @method closestLayerPoint(p: Point): Point
+       // Returns the point closest to `p` on the Polyline.
        closestLayerPoint: function (p) {
                var minDistance = Infinity,
                    minPoint = null,
-                   closest = L.LineUtil._sqClosestPointOnSegment,
+                   closest = _sqClosestPointOnSegment,
                    p1, p2;
 
                for (var j = 0, jLen = this._parts.length; j < jLen; j++) {
@@ -7926,29 +8257,29 @@ L.Polyline = L.Path.extend({
        // a specific ring as a LatLng array (that you can earlier access with [`getLatLngs`](#polyline-getlatlngs)).
        addLatLng: function (latlng, latlngs) {
                latlngs = latlngs || this._defaultShape();
-               latlng = L.latLng(latlng);
+               latlng = toLatLng(latlng);
                latlngs.push(latlng);
                this._bounds.extend(latlng);
                return this.redraw();
        },
 
        _setLatLngs: function (latlngs) {
-               this._bounds = new L.LatLngBounds();
+               this._bounds = new LatLngBounds();
                this._latlngs = this._convertLatLngs(latlngs);
        },
 
        _defaultShape: function () {
-               return L.Polyline._flat(this._latlngs) ? this._latlngs : this._latlngs[0];
+               return isFlat(this._latlngs) ? this._latlngs : this._latlngs[0];
        },
 
        // recursively convert latlngs input into actual LatLng instances; calculate bounds along the way
        _convertLatLngs: function (latlngs) {
                var result = [],
-                   flat = L.Polyline._flat(latlngs);
+                   flat = isFlat(latlngs);
 
                for (var i = 0, len = latlngs.length; i < len; i++) {
                        if (flat) {
-                               result[i] = L.latLng(latlngs[i]);
+                               result[i] = toLatLng(latlngs[i]);
                                this._bounds.extend(result[i]);
                        } else {
                                result[i] = this._convertLatLngs(latlngs[i]);
@@ -7959,23 +8290,28 @@ L.Polyline = L.Path.extend({
        },
 
        _project: function () {
-               var pxBounds = new L.Bounds();
+               var pxBounds = new Bounds();
                this._rings = [];
                this._projectLatlngs(this._latlngs, this._rings, pxBounds);
 
-               var w = this._clickTolerance(),
-                   p = new L.Point(w, w);
-
                if (this._bounds.isValid() && pxBounds.isValid()) {
-                       pxBounds.min._subtract(p);
-                       pxBounds.max._add(p);
-                       this._pxBounds = pxBounds;
+                       this._rawPxBounds = pxBounds;
+                       this._updateBounds();
                }
        },
 
+       _updateBounds: function () {
+               var w = this._clickTolerance(),
+                   p = new Point(w, w);
+               this._pxBounds = new Bounds([
+                       this._rawPxBounds.min.subtract(p),
+                       this._rawPxBounds.max.add(p)
+               ]);
+       },
+
        // recursively turns latlngs into a set of rings with projected coordinates
        _projectLatlngs: function (latlngs, result, projectedBounds) {
-               var flat = latlngs[0] instanceof L.LatLng,
+               var flat = latlngs[0] instanceof LatLng,
                    len = latlngs.length,
                    i, ring;
 
@@ -8014,7 +8350,7 @@ L.Polyline = L.Path.extend({
                        points = this._rings[i];
 
                        for (j = 0, len2 = points.length; j < len2 - 1; j++) {
-                               segment = L.LineUtil.clipSegment(points[j], points[j + 1], bounds, j, true);
+                               segment = clipSegment(points[j], points[j + 1], bounds, j, true);
 
                                if (!segment) { continue; }
 
@@ -8036,7 +8372,7 @@ L.Polyline = L.Path.extend({
                    tolerance = this.options.smoothFactor;
 
                for (var i = 0, len = parts.length; i < len; i++) {
-                       parts[i] = L.LineUtil.simplify(parts[i], tolerance);
+                       parts[i] = simplify(parts[i], tolerance);
                }
        },
 
@@ -8050,83 +8386,42 @@ L.Polyline = L.Path.extend({
 
        _updatePath: function () {
                this._renderer._updatePoly(this);
-       }
-});
-
-// @factory L.polyline(latlngs: LatLng[], options?: Polyline options)
-// Instantiates a polyline object given an array of geographical points and
-// optionally an options object. You can create a `Polyline` object with
-// multiple separate lines (`MultiPolyline`) by passing an array of arrays
-// of geographic points.
-L.polyline = function (latlngs, options) {
-       return new L.Polyline(latlngs, options);
-};
-
-L.Polyline._flat = function (latlngs) {
-       // true if it's a flat array of latlngs; false if nested
-       return !L.Util.isArray(latlngs[0]) || (typeof latlngs[0][0] !== 'object' && typeof latlngs[0][0] !== 'undefined');
-};
-
-
-
-/*
- * @namespace PolyUtil
- * Various utility functions for polygon geometries.
- */
-
-L.PolyUtil = {};
+       },
 
-/* @function clipPolygon(points: Point[], bounds: Bounds, round?: Boolean): Point[]
- * Clips the polygon geometry defined by the given `points` by the given bounds (using the [Sutherland-Hodgeman algorithm](https://en.wikipedia.org/wiki/Sutherland%E2%80%93Hodgman_algorithm)).
- * Used by Leaflet to only show polygon points that are on the screen or near, increasing
- * performance. Note that polygon points needs different algorithm for clipping
- * than polyline, so there's a seperate method for it.
- */
-L.PolyUtil.clipPolygon = function (points, bounds, round) {
-       var clippedPoints,
-           edges = [1, 4, 2, 8],
-           i, j, k,
-           a, b,
-           len, edge, p,
-           lu = L.LineUtil;
+       // Needed by the `Canvas` renderer for interactivity
+       _containsPoint: function (p, closed) {
+               var i, j, k, len, len2, part,
+                   w = this._clickTolerance();
 
-       for (i = 0, len = points.length; i < len; i++) {
-               points[i]._code = lu._getBitCode(points[i], bounds);
-       }
+               if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; }
 
-       // for each edge (left, bottom, right, top)
-       for (k = 0; k < 4; k++) {
-               edge = edges[k];
-               clippedPoints = [];
+               // hit detection for polylines
+               for (i = 0, len = this._parts.length; i < len; i++) {
+                       part = this._parts[i];
 
-               for (i = 0, len = points.length, j = len - 1; i < len; j = i++) {
-                       a = points[i];
-                       b = points[j];
+                       for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
+                               if (!closed && (j === 0)) { continue; }
 
-                       // if a is inside the clip window
-                       if (!(a._code & edge)) {
-                               // if b is outside the clip window (a->b goes out of screen)
-                               if (b._code & edge) {
-                                       p = lu._getEdgeIntersection(b, a, edge, bounds, round);
-                                       p._code = lu._getBitCode(p, bounds);
-                                       clippedPoints.push(p);
+                               if (pointToSegmentDistance(p, part[k], part[j]) <= w) {
+                                       return true;
                                }
-                               clippedPoints.push(a);
-
-                       // else if b is inside the clip window (a->b enters the screen)
-                       } else if (!(b._code & edge)) {
-                               p = lu._getEdgeIntersection(b, a, edge, bounds, round);
-                               p._code = lu._getBitCode(p, bounds);
-                               clippedPoints.push(p);
                        }
                }
-               points = clippedPoints;
+               return false;
        }
+});
 
-       return points;
-};
-
+// @factory L.polyline(latlngs: LatLng[], options?: Polyline options)
+// Instantiates a polyline object given an array of geographical points and
+// optionally an options object. You can create a `Polyline` object with
+// multiple separate lines (`MultiPolyline`) by passing an array of arrays
+// of geographic points.
+function polyline(latlngs, options) {
+       return new Polyline(latlngs, options);
+}
 
+// Retrocompat. Allow plugins to support Leaflet versions before and after 1.1.
+Polyline._flat = _flat;
 
 /*
  * @class Polygon
@@ -8142,7 +8437,7 @@ L.PolyUtil.clipPolygon = function (points, bounds, round) {
  *
  * ```js
  * // create a red polygon from an array of LatLng points
- * var latlngs = [[-111.03, 41],[-111.04, 45],[-104.05, 45],[-104.05, 41]];
+ * var latlngs = [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]];
  *
  * var polygon = L.polygon(latlngs, {color: 'red'}).addTo(map);
  *
@@ -8154,8 +8449,8 @@ L.PolyUtil.clipPolygon = function (points, bounds, round) {
  *
  * ```js
  * var latlngs = [
- *   [[-111.03, 41],[-111.04, 45],[-104.05, 45],[-104.05, 41]], // outer ring
- *   [[-108.58,37.29],[-108.58,40.71],[-102.50,40.71],[-102.50,37.29]] // hole
+ *   [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring
+ *   [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole
  * ];
  * ```
  *
@@ -8164,17 +8459,17 @@ L.PolyUtil.clipPolygon = function (points, bounds, round) {
  * ```js
  * var latlngs = [
  *   [ // first polygon
- *     [[-111.03, 41],[-111.04, 45],[-104.05, 45],[-104.05, 41]], // outer ring
- *     [[-108.58,37.29],[-108.58,40.71],[-102.50,40.71],[-102.50,37.29]] // hole
+ *     [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring
+ *     [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole
  *   ],
  *   [ // second polygon
- *     [[-109.05, 37],[-109.03, 41],[-102.05, 41],[-102.04, 37],[-109.05, 38]]
+ *     [[41, -111.03],[45, -111.04],[45, -104.05],[41, -104.05]]
  *   ]
  * ];
  * ```
  */
 
-L.Polygon = L.Polyline.extend({
+var Polygon = Polyline.extend({
 
        options: {
                fill: true
@@ -8220,25 +8515,25 @@ L.Polygon = L.Polyline.extend({
        },
 
        _convertLatLngs: function (latlngs) {
-               var result = L.Polyline.prototype._convertLatLngs.call(this, latlngs),
+               var result = Polyline.prototype._convertLatLngs.call(this, latlngs),
                    len = result.length;
 
                // remove last point if it equals first one
-               if (len >= 2 && result[0] instanceof L.LatLng && result[0].equals(result[len - 1])) {
+               if (len >= 2 && result[0] instanceof LatLng && result[0].equals(result[len - 1])) {
                        result.pop();
                }
                return result;
        },
 
        _setLatLngs: function (latlngs) {
-               L.Polyline.prototype._setLatLngs.call(this, latlngs);
-               if (L.Polyline._flat(this._latlngs)) {
+               Polyline.prototype._setLatLngs.call(this, latlngs);
+               if (isFlat(this._latlngs)) {
                        this._latlngs = [this._latlngs];
                }
        },
 
        _defaultShape: function () {
-               return L.Polyline._flat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0];
+               return isFlat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0];
        },
 
        _clipPoints: function () {
@@ -8246,10 +8541,10 @@ L.Polygon = L.Polyline.extend({
 
                var bounds = this._renderer._bounds,
                    w = this.options.weight,
-                   p = new L.Point(w, w);
+                   p = new Point(w, w);
 
                // increase clip padding by stroke width to avoid stroke on clip edges
-               bounds = new L.Bounds(bounds.min.subtract(p), bounds.max.add(p));
+               bounds = new Bounds(bounds.min.subtract(p), bounds.max.add(p));
 
                this._parts = [];
                if (!this._pxBounds || !this._pxBounds.intersects(bounds)) {
@@ -8262,7 +8557,7 @@ L.Polygon = L.Polyline.extend({
                }
 
                for (var i = 0, len = this._rings.length, clipped; i < len; i++) {
-                       clipped = L.PolyUtil.clipPolygon(this._rings[i], bounds, true);
+                       clipped = clipPolygon(this._rings[i], bounds, true);
                        if (clipped.length) {
                                this._parts.push(clipped);
                        }
@@ -8271,4774 +8566,5455 @@ L.Polygon = L.Polyline.extend({
 
        _updatePath: function () {
                this._renderer._updatePoly(this, true);
-       }
-});
+       },
 
+       // Needed by the `Canvas` renderer for interactivity
+       _containsPoint: function (p) {
+               var inside = false,
+                   part, p1, p2, i, j, k, len, len2;
 
-// @factory L.polygon(latlngs: LatLng[], options?: Polyline options)
-L.polygon = function (latlngs, options) {
-       return new L.Polygon(latlngs, options);
-};
+               if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; }
 
+               // ray casting algorithm for detecting if point is in polygon
+               for (i = 0, len = this._parts.length; i < len; i++) {
+                       part = this._parts[i];
 
+                       for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
+                               p1 = part[j];
+                               p2 = part[k];
 
-/*
- * L.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds object.
- */
+                               if (((p1.y > p.y) !== (p2.y > p.y)) && (p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x)) {
+                                       inside = !inside;
+                               }
+                       }
+               }
+
+               // also check if it's on polygon stroke
+               return inside || Polyline.prototype._containsPoint.call(this, p, true);
+       }
+
+});
+
+
+// @factory L.polygon(latlngs: LatLng[], options?: Polyline options)
+function polygon(latlngs, options) {
+       return new Polygon(latlngs, options);
+}
 
 /*
- * @class Rectangle
- * @aka L.Retangle
- * @inherits Polygon
+ * @class GeoJSON
+ * @aka L.GeoJSON
+ * @inherits FeatureGroup
  *
- * A class for drawing rectangle overlays on a map. Extends `Polygon`.
+ * Represents a GeoJSON object or an array of GeoJSON objects. Allows you to parse
+ * GeoJSON data and display it on the map. Extends `FeatureGroup`.
  *
  * @example
  *
  * ```js
- * // define rectangle geographical bounds
- * var bounds = [[54.559322, -5.767822], [56.1210604, -3.021240]];
- *
- * // create an orange rectangle
- * L.rectangle(bounds, {color: "#ff7800", weight: 1}).addTo(map);
- *
- * // zoom the map to the rectangle bounds
- * map.fitBounds(bounds);
+ * L.geoJSON(data, {
+ *     style: function (feature) {
+ *             return {color: feature.properties.color};
+ *     }
+ * }).bindPopup(function (layer) {
+ *     return layer.feature.properties.description;
+ * }).addTo(map);
  * ```
- *
  */
 
+var GeoJSON = FeatureGroup.extend({
+
+       /* @section
+        * @aka GeoJSON options
+        *
+        * @option pointToLayer: Function = *
+        * A `Function` defining how GeoJSON points spawn Leaflet layers. It is internally
+        * called when data is added, passing the GeoJSON point feature and its `LatLng`.
+        * The default is to spawn a default `Marker`:
+        * ```js
+        * function(geoJsonPoint, latlng) {
+        *      return L.marker(latlng);
+        * }
+        * ```
+        *
+        * @option style: Function = *
+        * A `Function` defining the `Path options` for styling GeoJSON lines and polygons,
+        * called internally when data is added.
+        * The default value is to not override any defaults:
+        * ```js
+        * function (geoJsonFeature) {
+        *      return {}
+        * }
+        * ```
+        *
+        * @option onEachFeature: Function = *
+        * A `Function` that will be called once for each created `Feature`, after it has
+        * been created and styled. Useful for attaching events and popups to features.
+        * The default is to do nothing with the newly created layers:
+        * ```js
+        * function (feature, layer) {}
+        * ```
+        *
+        * @option filter: Function = *
+        * A `Function` that will be used to decide whether to include a feature or not.
+        * The default is to include all features:
+        * ```js
+        * function (geoJsonFeature) {
+        *      return true;
+        * }
+        * ```
+        * Note: dynamically changing the `filter` option will have effect only on newly
+        * added data. It will _not_ re-evaluate already included features.
+        *
+        * @option coordsToLatLng: Function = *
+        * A `Function` that will be used for converting GeoJSON coordinates to `LatLng`s.
+        * The default is the `coordsToLatLng` static method.
+        */
+
+       initialize: function (geojson, options) {
+               setOptions(this, options);
+
+               this._layers = {};
+
+               if (geojson) {
+                       this.addData(geojson);
+               }
+       },
+
+       // @method addData( <GeoJSON> data ): this
+       // Adds a GeoJSON object to the layer.
+       addData: function (geojson) {
+               var features = isArray(geojson) ? geojson : geojson.features,
+                   i, len, feature;
+
+               if (features) {
+                       for (i = 0, len = features.length; i < len; 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(feature);
+                               }
+                       }
+                       return this;
+               }
+
+               var options = this.options;
+
+               if (options.filter && !options.filter(geojson)) { return this; }
+
+               var layer = geometryToLayer(geojson, options);
+               if (!layer) {
+                       return this;
+               }
+               layer.feature = asFeature(geojson);
+
+               layer.defaultOptions = layer.options;
+               this.resetStyle(layer);
+
+               if (options.onEachFeature) {
+                       options.onEachFeature(geojson, layer);
+               }
+
+               return this.addLayer(layer);
+       },
 
-L.Rectangle = L.Polygon.extend({
-       initialize: function (latLngBounds, options) {
-               L.Polygon.prototype.initialize.call(this, this._boundsToLatLngs(latLngBounds), options);
+       // @method resetStyle( <Path> layer ): this
+       // Resets the given vector layer's style to the original GeoJSON style, useful for resetting style after hover events.
+       resetStyle: function (layer) {
+               // reset any custom styles
+               layer.options = extend({}, layer.defaultOptions);
+               this._setLayerStyle(layer, this.options.style);
+               return this;
        },
 
-       // @method setBounds(latLngBounds: LatLngBounds): this
-       // Redraws the rectangle with the passed bounds.
-       setBounds: function (latLngBounds) {
-               return this.setLatLngs(this._boundsToLatLngs(latLngBounds));
+       // @method setStyle( <Function> style ): this
+       // Changes styles of GeoJSON vector layers with the given style function.
+       setStyle: function (style) {
+               return this.eachLayer(function (layer) {
+                       this._setLayerStyle(layer, style);
+               }, this);
        },
 
-       _boundsToLatLngs: function (latLngBounds) {
-               latLngBounds = L.latLngBounds(latLngBounds);
-               return [
-                       latLngBounds.getSouthWest(),
-                       latLngBounds.getNorthWest(),
-                       latLngBounds.getNorthEast(),
-                       latLngBounds.getSouthEast()
-               ];
+       _setLayerStyle: function (layer, style) {
+               if (layer.setStyle) {
+                       if (typeof style === 'function') {
+                               style = style(layer.feature);
+                       }
+                       layer.setStyle(style);
+               }
        }
 });
 
+// @section
+// There are several static functions which can be called without instantiating L.GeoJSON:
 
-// @factory L.rectangle(latLngBounds: LatLngBounds, options?: Polyline options)
-L.rectangle = function (latLngBounds, options) {
-       return new L.Rectangle(latLngBounds, options);
-};
-
+// @function geometryToLayer(featureData: Object, options?: GeoJSON options): Layer
+// Creates a `Layer` from a given GeoJSON feature. Can use a custom
+// [`pointToLayer`](#geojson-pointtolayer) and/or [`coordsToLatLng`](#geojson-coordstolatlng)
+// functions if provided as options.
+function geometryToLayer(geojson, options) {
 
+       var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
+           coords = geometry ? geometry.coordinates : null,
+           layers = [],
+           pointToLayer = options && options.pointToLayer,
+           _coordsToLatLng = options && options.coordsToLatLng || coordsToLatLng,
+           latlng, latlngs, i, len;
 
-/*
- * @class CircleMarker
- * @aka L.CircleMarker
- * @inherits Path
- *
- * A circle of a fixed size with radius specified in pixels. Extends `Path`.
- */
+       if (!coords && !geometry) {
+               return null;
+       }
 
-L.CircleMarker = L.Path.extend({
+       switch (geometry.type) {
+       case 'Point':
+               latlng = _coordsToLatLng(coords);
+               return pointToLayer ? pointToLayer(geojson, latlng) : new Marker(latlng);
+
+       case 'MultiPoint':
+               for (i = 0, len = coords.length; i < len; i++) {
+                       latlng = _coordsToLatLng(coords[i]);
+                       layers.push(pointToLayer ? pointToLayer(geojson, latlng) : new Marker(latlng));
+               }
+               return new FeatureGroup(layers);
+
+       case 'LineString':
+       case 'MultiLineString':
+               latlngs = coordsToLatLngs(coords, geometry.type === 'LineString' ? 0 : 1, _coordsToLatLng);
+               return new Polyline(latlngs, options);
+
+       case 'Polygon':
+       case 'MultiPolygon':
+               latlngs = coordsToLatLngs(coords, geometry.type === 'Polygon' ? 1 : 2, _coordsToLatLng);
+               return new Polygon(latlngs, options);
+
+       case 'GeometryCollection':
+               for (i = 0, len = geometry.geometries.length; i < len; i++) {
+                       var layer = geometryToLayer({
+                               geometry: geometry.geometries[i],
+                               type: 'Feature',
+                               properties: geojson.properties
+                       }, options);
+
+                       if (layer) {
+                               layers.push(layer);
+                       }
+               }
+               return new FeatureGroup(layers);
 
-       // @section
-       // @aka CircleMarker options
-       options: {
-               fill: true,
+       default:
+               throw new Error('Invalid GeoJSON object.');
+       }
+}
 
-               // @option radius: Number = 10
-               // Radius of the circle marker, in pixels
-               radius: 10
-       },
+// @function coordsToLatLng(coords: Array): LatLng
+// Creates a `LatLng` object from an array of 2 numbers (longitude, latitude)
+// or 3 numbers (longitude, latitude, altitude) used in GeoJSON for points.
+function coordsToLatLng(coords) {
+       return new LatLng(coords[1], coords[0], coords[2]);
+}
 
-       initialize: function (latlng, options) {
-               L.setOptions(this, options);
-               this._latlng = L.latLng(latlng);
-               this._radius = this.options.radius;
-       },
+// @function coordsToLatLngs(coords: Array, levelsDeep?: Number, coordsToLatLng?: Function): Array
+// Creates a multidimensional array of `LatLng`s from a GeoJSON coordinates array.
+// `levelsDeep` specifies the nesting level (0 is for an array of points, 1 for an array of arrays of points, etc., 0 by default).
+// Can use a custom [`coordsToLatLng`](#geojson-coordstolatlng) function.
+function coordsToLatLngs(coords, levelsDeep, _coordsToLatLng) {
+       var latlngs = [];
 
-       // @method setLatLng(latLng: LatLng): this
-       // Sets the position of a circle marker to a new location.
-       setLatLng: function (latlng) {
-               this._latlng = L.latLng(latlng);
-               this.redraw();
-               return this.fire('move', {latlng: this._latlng});
-       },
+       for (var i = 0, len = coords.length, latlng; i < len; i++) {
+               latlng = levelsDeep ?
+                       coordsToLatLngs(coords[i], levelsDeep - 1, _coordsToLatLng) :
+                       (_coordsToLatLng || coordsToLatLng)(coords[i]);
 
-       // @method getLatLng(): LatLng
-       // Returns the current geographical position of the circle marker
-       getLatLng: function () {
-               return this._latlng;
-       },
+               latlngs.push(latlng);
+       }
 
-       // @method setRadius(radius: Number): this
-       // Sets the radius of a circle marker. Units are in pixels.
-       setRadius: function (radius) {
-               this.options.radius = this._radius = radius;
-               return this.redraw();
-       },
+       return latlngs;
+}
 
-       // @method getRadius(): Number
-       // Returns the current radius of the circle
-       getRadius: function () {
-               return this._radius;
-       },
+// @function latLngToCoords(latlng: LatLng, precision?: Number): Array
+// Reverse of [`coordsToLatLng`](#geojson-coordstolatlng)
+function latLngToCoords(latlng, precision) {
+       precision = typeof precision === 'number' ? precision : 6;
+       return latlng.alt !== undefined ?
+               [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision), formatNum(latlng.alt, precision)] :
+               [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision)];
+}
 
-       setStyle : function (options) {
-               var radius = options && options.radius || this._radius;
-               L.Path.prototype.setStyle.call(this, options);
-               this.setRadius(radius);
-               return this;
-       },
+// @function latLngsToCoords(latlngs: Array, levelsDeep?: Number, closed?: Boolean): Array
+// Reverse of [`coordsToLatLngs`](#geojson-coordstolatlngs)
+// `closed` determines whether the first point should be appended to the end of the array to close the feature, only used when `levelsDeep` is 0. False by default.
+function latLngsToCoords(latlngs, levelsDeep, closed, precision) {
+       var coords = [];
 
-       _project: function () {
-               this._point = this._map.latLngToLayerPoint(this._latlng);
-               this._updateBounds();
-       },
+       for (var i = 0, len = latlngs.length; i < len; i++) {
+               coords.push(levelsDeep ?
+                       latLngsToCoords(latlngs[i], levelsDeep - 1, closed, precision) :
+                       latLngToCoords(latlngs[i], precision));
+       }
 
-       _updateBounds: function () {
-               var r = this._radius,
-                   r2 = this._radiusY || r,
-                   w = this._clickTolerance(),
-                   p = [r + w, r2 + w];
-               this._pxBounds = new L.Bounds(this._point.subtract(p), this._point.add(p));
-       },
+       if (!levelsDeep && closed) {
+               coords.push(coords[0]);
+       }
 
-       _update: function () {
-               if (this._map) {
-                       this._updatePath();
-               }
-       },
+       return coords;
+}
 
-       _updatePath: function () {
-               this._renderer._updateCircle(this);
-       },
+function getFeature(layer, newGeometry) {
+       return layer.feature ?
+               extend({}, layer.feature, {geometry: newGeometry}) :
+               asFeature(newGeometry);
+}
 
-       _empty: function () {
-               return this._radius && !this._renderer._bounds.intersects(this._pxBounds);
+// @function asFeature(geojson: Object): Object
+// Normalize GeoJSON geometries/features into GeoJSON features.
+function asFeature(geojson) {
+       if (geojson.type === 'Feature' || geojson.type === 'FeatureCollection') {
+               return geojson;
        }
-});
 
+       return {
+               type: 'Feature',
+               properties: {},
+               geometry: geojson
+       };
+}
 
-// @factory L.circleMarker(latlng: LatLng, options?: CircleMarker options)
-// Instantiates a circle marker object given a geographical point, and an optional options object.
-L.circleMarker = function (latlng, options) {
-       return new L.CircleMarker(latlng, options);
+var PointToGeoJSON = {
+       toGeoJSON: function (precision) {
+               return getFeature(this, {
+                       type: 'Point',
+                       coordinates: latLngToCoords(this.getLatLng(), precision)
+               });
+       }
 };
 
+// @namespace Marker
+// @method toGeoJSON(precision?: Number): Object
+// `precision` is the number of decimal places for coordinates.
+// The default value is 6 places.
+// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the marker (as a GeoJSON `Point` Feature).
+Marker.include(PointToGeoJSON);
 
+// @namespace CircleMarker
+// @method toGeoJSON(precision?: Number): Object
+// `precision` is the number of decimal places for coordinates.
+// The default value is 6 places.
+// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the circle marker (as a GeoJSON `Point` Feature).
+Circle.include(PointToGeoJSON);
+CircleMarker.include(PointToGeoJSON);
 
-/*
- * @class Circle
- * @aka L.Circle
- * @inherits CircleMarker
- *
- * A class for drawing circle overlays on a map. Extends `CircleMarker`.
- *
- * It's an approximation and starts to diverge from a real circle closer to poles (due to projection distortion).
- *
- * @example
- *
- * ```js
- * L.circle([50.5, 30.5], {radius: 200}).addTo(map);
- * ```
- */
 
-L.Circle = L.CircleMarker.extend({
+// @namespace Polyline
+// @method toGeoJSON(precision?: Number): Object
+// `precision` is the number of decimal places for coordinates.
+// The default value is 6 places.
+// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the polyline (as a GeoJSON `LineString` or `MultiLineString` Feature).
+Polyline.include({
+       toGeoJSON: function (precision) {
+               var multi = !isFlat(this._latlngs);
 
-       initialize: function (latlng, options, legacyOptions) {
-               if (typeof options === 'number') {
-                       // Backwards compatibility with 0.7.x factory (latlng, radius, options?)
-                       options = L.extend({}, legacyOptions, {radius: options});
-               }
-               L.setOptions(this, options);
-               this._latlng = L.latLng(latlng);
+               var coords = latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision);
 
-               if (isNaN(this.options.radius)) { throw new Error('Circle radius cannot be NaN'); }
+               return getFeature(this, {
+                       type: (multi ? 'Multi' : '') + 'LineString',
+                       coordinates: coords
+               });
+       }
+});
 
-               // @section
-               // @aka Circle options
-               // @option radius: Number; Radius of the circle, in meters.
-               this._mRadius = this.options.radius;
-       },
+// @namespace Polygon
+// @method toGeoJSON(precision?: Number): Object
+// `precision` is the number of decimal places for coordinates.
+// The default value is 6 places.
+// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the polygon (as a GeoJSON `Polygon` or `MultiPolygon` Feature).
+Polygon.include({
+       toGeoJSON: function (precision) {
+               var holes = !isFlat(this._latlngs),
+                   multi = holes && !isFlat(this._latlngs[0]);
 
-       // @method setRadius(radius: Number): this
-       // Sets the radius of a circle. Units are in meters.
-       setRadius: function (radius) {
-               this._mRadius = radius;
-               return this.redraw();
-       },
+               var coords = latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision);
 
-       // @method getRadius(): Number
-       // Returns the current radius of a circle. Units are in meters.
-       getRadius: function () {
-               return this._mRadius;
-       },
+               if (!holes) {
+                       coords = [coords];
+               }
 
-       // @method getBounds(): LatLngBounds
-       // Returns the `LatLngBounds` of the path.
-       getBounds: function () {
-               var half = [this._radius, this._radiusY || this._radius];
+               return getFeature(this, {
+                       type: (multi ? 'Multi' : '') + 'Polygon',
+                       coordinates: coords
+               });
+       }
+});
 
-               return new L.LatLngBounds(
-                       this._map.layerPointToLatLng(this._point.subtract(half)),
-                       this._map.layerPointToLatLng(this._point.add(half)));
-       },
 
-       setStyle: L.Path.prototype.setStyle,
+// @namespace LayerGroup
+LayerGroup.include({
+       toMultiPoint: function (precision) {
+               var coords = [];
 
-       _project: function () {
+               this.eachLayer(function (layer) {
+                       coords.push(layer.toGeoJSON(precision).geometry.coordinates);
+               });
 
-               var lng = this._latlng.lng,
-                   lat = this._latlng.lat,
-                   map = this._map,
-                   crs = map.options.crs;
+               return getFeature(this, {
+                       type: 'MultiPoint',
+                       coordinates: coords
+               });
+       },
 
-               if (crs.distance === L.CRS.Earth.distance) {
-                       var d = Math.PI / 180,
-                           latR = (this._mRadius / L.CRS.Earth.R) / d,
-                           top = map.project([lat + latR, lng]),
-                           bottom = map.project([lat - latR, lng]),
-                           p = top.add(bottom).divideBy(2),
-                           lat2 = map.unproject(p).lat,
-                           lngR = Math.acos((Math.cos(latR * d) - Math.sin(lat * d) * Math.sin(lat2 * d)) /
-                                   (Math.cos(lat * d) * Math.cos(lat2 * d))) / d;
+       // @method toGeoJSON(precision?: Number): Object
+       // `precision` is the number of decimal places for coordinates.
+       // The default value is 6 places.
+       // Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the layer group (as a GeoJSON `FeatureCollection`, `GeometryCollection`, or `MultiPoint`).
+       toGeoJSON: function (precision) {
 
-                       if (isNaN(lngR) || lngR === 0) {
-                               lngR = latR / Math.cos(Math.PI / 180 * lat); // Fallback for edge case, #2425
-                       }
+               var type = this.feature && this.feature.geometry && this.feature.geometry.type;
 
-                       this._point = p.subtract(map.getPixelOrigin());
-                       this._radius = isNaN(lngR) ? 0 : Math.max(Math.round(p.x - map.project([lat2, lng - lngR]).x), 1);
-                       this._radiusY = Math.max(Math.round(p.y - top.y), 1);
+               if (type === 'MultiPoint') {
+                       return this.toMultiPoint(precision);
+               }
 
-               } else {
-                       var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0]));
+               var isGeometryCollection = type === 'GeometryCollection',
+                   jsons = [];
 
-                       this._point = map.latLngToLayerPoint(this._latlng);
-                       this._radius = this._point.x - map.latLngToLayerPoint(latlng2).x;
+               this.eachLayer(function (layer) {
+                       if (layer.toGeoJSON) {
+                               var json = layer.toGeoJSON(precision);
+                               if (isGeometryCollection) {
+                                       jsons.push(json.geometry);
+                               } else {
+                                       var feature = asFeature(json);
+                                       // Squash nested feature collections
+                                       if (feature.type === 'FeatureCollection') {
+                                               jsons.push.apply(jsons, feature.features);
+                                       } else {
+                                               jsons.push(feature);
+                                       }
+                               }
+                       }
+               });
+
+               if (isGeometryCollection) {
+                       return getFeature(this, {
+                               geometries: jsons,
+                               type: 'GeometryCollection'
+                       });
                }
 
-               this._updateBounds();
+               return {
+                       type: 'FeatureCollection',
+                       features: jsons
+               };
        }
 });
 
-// @factory L.circle(latlng: LatLng, options?: Circle options)
-// Instantiates a circle object given a geographical point, and an options object
-// which contains the circle radius.
-// @alternative
-// @factory L.circle(latlng: LatLng, radius: Number, options?: Circle options)
-// Obsolete way of instantiating a circle, for compatibility with 0.7.x code.
-// Do not use in new applications or plugins.
-L.circle = function (latlng, options, legacyOptions) {
-       return new L.Circle(latlng, options, legacyOptions);
-};
-
-
-
-/*
- * @class SVG
- * @inherits Renderer
- * @aka L.SVG
- *
- * Allows vector layers to be displayed with [SVG](https://developer.mozilla.org/docs/Web/SVG).
- * Inherits `Renderer`.
- *
- * Due to [technical limitations](http://caniuse.com/#search=svg), SVG is not
- * available in all web browsers, notably Android 2.x and 3.x.
+// @namespace GeoJSON
+// @factory L.geoJSON(geojson?: Object, options?: GeoJSON options)
+// Creates a GeoJSON layer. Optionally accepts an object in
+// [GeoJSON format](https://tools.ietf.org/html/rfc7946) to display on the map
+// (you can alternatively add it later with `addData` method) and an `options` object.
+function geoJSON(geojson, options) {
+       return new GeoJSON(geojson, options);
+}
+
+// Backward compatibility.
+var geoJson = geoJSON;
+
+/*
+ * @class ImageOverlay
+ * @aka L.ImageOverlay
+ * @inherits Interactive layer
  *
- * Although SVG is not available on IE7 and IE8, these browsers support
- * [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language)
- * (a now deprecated technology), and the SVG renderer will fall back to VML in
- * this case.
+ * Used to load and display a single image over specific bounds of the map. Extends `Layer`.
  *
  * @example
  *
- * Use SVG by default for all paths in the map:
- *
  * ```js
- * var map = L.map('map', {
- *     renderer: L.svg()
- * });
- * ```
- *
- * Use a SVG renderer with extra padding for specific vector geometries:
- *
- * ```js
- * var map = L.map('map');
- * var myRenderer = L.svg({ padding: 0.5 });
- * var line = L.polyline( coordinates, { renderer: myRenderer } );
- * var circle = L.circle( center, { renderer: myRenderer } );
+ * var imageUrl = 'http://www.lib.utexas.edu/maps/historical/newark_nj_1922.jpg',
+ *     imageBounds = [[40.712216, -74.22655], [40.773941, -74.12544]];
+ * L.imageOverlay(imageUrl, imageBounds).addTo(map);
  * ```
  */
 
-L.SVG = L.Renderer.extend({
-
-       getEvents: function () {
-               var events = L.Renderer.prototype.getEvents.call(this);
-               events.zoomstart = this._onZoomStart;
-               return events;
-       },
+var ImageOverlay = Layer.extend({
 
-       _initContainer: function () {
-               this._container = L.SVG.create('svg');
-
-               // makes it possible to click through svg root; we'll reset it back in individual paths
-               this._container.setAttribute('pointer-events', 'none');
+       // @section
+       // @aka ImageOverlay options
+       options: {
+               // @option opacity: Number = 1.0
+               // The opacity of the image overlay.
+               opacity: 1,
 
-               this._rootGroup = L.SVG.create('g');
-               this._container.appendChild(this._rootGroup);
-       },
+               // @option alt: String = ''
+               // Text for the `alt` attribute of the image (useful for accessibility).
+               alt: '',
 
-       _onZoomStart: function () {
-               // Drag-then-pinch interactions might mess up the center and zoom.
-               // In this case, the easiest way to prevent this is re-do the renderer
-               //   bounds and padding when the zooming starts.
-               this._update();
-       },
+               // @option interactive: Boolean = false
+               // If `true`, the image overlay will emit [mouse events](#interactive-layer) when clicked or hovered.
+               interactive: false,
 
-       _update: function () {
-               if (this._map._animatingZoom && this._bounds) { return; }
+               // @option crossOrigin: Boolean|String = false
+               // Whether the crossOrigin attribute will be added to the image.
+               // If a String is provided, the image will have its crossOrigin attribute set to the String provided. This is needed if you want to access image pixel data.
+               // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values.
+               crossOrigin: false,
 
-               L.Renderer.prototype._update.call(this);
+               // @option errorOverlayUrl: String = ''
+               // URL to the overlay image to show in place of the overlay that failed to load.
+               errorOverlayUrl: '',
 
-               var b = this._bounds,
-                   size = b.getSize(),
-                   container = this._container;
+               // @option zIndex: Number = 1
+               // The explicit [zIndex](https://developer.mozilla.org/docs/Web/CSS/CSS_Positioning/Understanding_z_index) of the overlay layer.
+               zIndex: 1,
 
-               // set size of svg-container if changed
-               if (!this._svgSize || !this._svgSize.equals(size)) {
-                       this._svgSize = size;
-                       container.setAttribute('width', size.x);
-                       container.setAttribute('height', size.y);
-               }
+               // @option className: String = ''
+               // A custom class name to assign to the image. Empty by default.
+               className: ''
+       },
 
-               // movement: update container viewBox so that we don't have to change coordinates of individual layers
-               L.DomUtil.setPosition(container, b.min);
-               container.setAttribute('viewBox', [b.min.x, b.min.y, size.x, size.y].join(' '));
+       initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)
+               this._url = url;
+               this._bounds = toLatLngBounds(bounds);
 
-               this.fire('update');
+               setOptions(this, options);
        },
 
-       // methods below are called by vector layers implementations
-
-       _initPath: function (layer) {
-               var path = layer._path = L.SVG.create('path');
+       onAdd: function () {
+               if (!this._image) {
+                       this._initImage();
 
-               // @namespace Path
-               // @option className: String = null
-               // Custom class name set on an element. Only for SVG renderer.
-               if (layer.options.className) {
-                       L.DomUtil.addClass(path, layer.options.className);
+                       if (this.options.opacity < 1) {
+                               this._updateOpacity();
+                       }
                }
 
-               if (layer.options.interactive) {
-                       L.DomUtil.addClass(path, 'leaflet-interactive');
+               if (this.options.interactive) {
+                       addClass(this._image, 'leaflet-interactive');
+                       this.addInteractiveTarget(this._image);
                }
 
-               this._updateStyle(layer);
+               this.getPane().appendChild(this._image);
+               this._reset();
        },
 
-       _addPath: function (layer) {
-               this._rootGroup.appendChild(layer._path);
-               layer.addInteractiveTarget(layer._path);
+       onRemove: function () {
+               remove(this._image);
+               if (this.options.interactive) {
+                       this.removeInteractiveTarget(this._image);
+               }
        },
 
-       _removePath: function (layer) {
-               L.DomUtil.remove(layer._path);
-               layer.removeInteractiveTarget(layer._path);
-       },
+       // @method setOpacity(opacity: Number): this
+       // Sets the opacity of the overlay.
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
 
-       _updatePath: function (layer) {
-               layer._project();
-               layer._update();
+               if (this._image) {
+                       this._updateOpacity();
+               }
+               return this;
        },
 
-       _updateStyle: function (layer) {
-               var path = layer._path,
-                   options = layer.options;
-
-               if (!path) { return; }
-
-               if (options.stroke) {
-                       path.setAttribute('stroke', options.color);
-                       path.setAttribute('stroke-opacity', options.opacity);
-                       path.setAttribute('stroke-width', options.weight);
-                       path.setAttribute('stroke-linecap', options.lineCap);
-                       path.setAttribute('stroke-linejoin', options.lineJoin);
-
-                       if (options.dashArray) {
-                               path.setAttribute('stroke-dasharray', options.dashArray);
-                       } else {
-                               path.removeAttribute('stroke-dasharray');
-                       }
-
-                       if (options.dashOffset) {
-                               path.setAttribute('stroke-dashoffset', options.dashOffset);
-                       } else {
-                               path.removeAttribute('stroke-dashoffset');
-                       }
-               } else {
-                       path.setAttribute('stroke', 'none');
+       setStyle: function (styleOpts) {
+               if (styleOpts.opacity) {
+                       this.setOpacity(styleOpts.opacity);
                }
+               return this;
+       },
 
-               if (options.fill) {
-                       path.setAttribute('fill', options.fillColor || options.color);
-                       path.setAttribute('fill-opacity', options.fillOpacity);
-                       path.setAttribute('fill-rule', options.fillRule || 'evenodd');
-               } else {
-                       path.setAttribute('fill', 'none');
+       // @method bringToFront(): this
+       // Brings the layer to the top of all overlays.
+       bringToFront: function () {
+               if (this._map) {
+                       toFront(this._image);
                }
+               return this;
        },
 
-       _updatePoly: function (layer, closed) {
-               this._setPath(layer, L.SVG.pointsToPath(layer._parts, closed));
+       // @method bringToBack(): this
+       // Brings the layer to the bottom of all overlays.
+       bringToBack: function () {
+               if (this._map) {
+                       toBack(this._image);
+               }
+               return this;
        },
 
-       _updateCircle: function (layer) {
-               var p = layer._point,
-                   r = layer._radius,
-                   r2 = layer._radiusY || r,
-                   arc = 'a' + r + ',' + r2 + ' 0 1,0 ';
-
-               // drawing a circle with two half-arcs
-               var d = layer._empty() ? 'M0 0' :
-                               'M' + (p.x - r) + ',' + p.y +
-                               arc + (r * 2) + ',0 ' +
-                               arc + (-r * 2) + ',0 ';
+       // @method setUrl(url: String): this
+       // Changes the URL of the image.
+       setUrl: function (url) {
+               this._url = url;
 
-               this._setPath(layer, d);
+               if (this._image) {
+                       this._image.src = url;
+               }
+               return this;
        },
 
-       _setPath: function (layer, path) {
-               layer._path.setAttribute('d', path);
-       },
+       // @method setBounds(bounds: LatLngBounds): this
+       // Update the bounds that this ImageOverlay covers
+       setBounds: function (bounds) {
+               this._bounds = toLatLngBounds(bounds);
 
-       // SVG does not have the concept of zIndex so we resort to changing the DOM order of elements
-       _bringToFront: function (layer) {
-               L.DomUtil.toFront(layer._path);
+               if (this._map) {
+                       this._reset();
+               }
+               return this;
        },
 
-       _bringToBack: function (layer) {
-               L.DomUtil.toBack(layer._path);
-       }
-});
-
-
-// @namespace SVG; @section
-// There are several static functions which can be called without instantiating L.SVG:
-L.extend(L.SVG, {
-       // @function create(name: String): SVGElement
-       // Returns a instance of [SVGElement](https://developer.mozilla.org/docs/Web/API/SVGElement),
-       // corresponding to the class name passed. For example, using 'line' will return
-       // an instance of [SVGLineElement](https://developer.mozilla.org/docs/Web/API/SVGLineElement).
-       create: function (name) {
-               return document.createElementNS('http://www.w3.org/2000/svg', name);
-       },
-
-       // @function pointsToPath(rings: Point[], closed: Boolean): String
-       // Generates a SVG path string for multiple rings, with each ring turning
-       // into "M..L..L.." instructions
-       pointsToPath: function (rings, closed) {
-               var str = '',
-                   i, j, len, len2, points, p;
-
-               for (i = 0, len = rings.length; i < len; i++) {
-                       points = rings[i];
-
-                       for (j = 0, len2 = points.length; j < len2; j++) {
-                               p = points[j];
-                               str += (j ? 'L' : 'M') + p.x + ' ' + p.y;
-                       }
+       getEvents: function () {
+               var events = {
+                       zoom: this._reset,
+                       viewreset: this._reset
+               };
 
-                       // closes the ring for polygons; "x" is VML syntax
-                       str += closed ? (L.Browser.svg ? 'z' : 'x') : '';
+               if (this._zoomAnimated) {
+                       events.zoomanim = this._animateZoom;
                }
 
-               // SVG complains about empty path strings
-               return str || 'M0 0';
-       }
-});
-
-// @namespace Browser; @property svg: Boolean
-// `true` when the browser supports [SVG](https://developer.mozilla.org/docs/Web/SVG).
-L.Browser.svg = !!(document.createElementNS && L.SVG.create('svg').createSVGRect);
-
-
-// @namespace SVG
-// @factory L.svg(options?: Renderer options)
-// Creates a SVG renderer with the given options.
-L.svg = function (options) {
-       return L.Browser.svg || L.Browser.vml ? new L.SVG(options) : null;
-};
-
-
+               return events;
+       },
 
-/*
- * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!
- */
+       // @method setZIndex(value: Number): this
+       // Changes the [zIndex](#imageoverlay-zindex) of the image overlay.
+       setZIndex: function (value) {
+               this.options.zIndex = value;
+               this._updateZIndex();
+               return this;
+       },
 
-/*
- * @class SVG
- *
- * Although SVG is not available on IE7 and IE8, these browsers support [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language), and the SVG renderer will fall back to VML in this case.
- *
- * VML was deprecated in 2012, which means VML functionality exists only for backwards compatibility
- * with old versions of Internet Explorer.
- */
+       // @method getBounds(): LatLngBounds
+       // Get the bounds that this ImageOverlay covers
+       getBounds: function () {
+               return this._bounds;
+       },
 
-// @namespace Browser; @property vml: Boolean
-// `true` if the browser supports [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language).
-L.Browser.vml = !L.Browser.svg && (function () {
-       try {
-               var div = document.createElement('div');
-               div.innerHTML = '<v:shape adj="1"/>';
+       // @method getElement(): HTMLElement
+       // Returns the instance of [`HTMLImageElement`](https://developer.mozilla.org/docs/Web/API/HTMLImageElement)
+       // used by this overlay.
+       getElement: function () {
+               return this._image;
+       },
 
-               var shape = div.firstChild;
-               shape.style.behavior = 'url(#default#VML)';
+       _initImage: function () {
+               var wasElementSupplied = this._url.tagName === 'IMG';
+               var img = this._image = wasElementSupplied ? this._url : create$1('img');
 
-               return shape && (typeof shape.adj === 'object');
+               addClass(img, 'leaflet-image-layer');
+               if (this._zoomAnimated) { addClass(img, 'leaflet-zoom-animated'); }
+               if (this.options.className) { addClass(img, this.options.className); }
 
-       } catch (e) {
-               return false;
-       }
-}());
+               img.onselectstart = falseFn;
+               img.onmousemove = falseFn;
 
-// redefine some SVG methods to handle VML syntax which is similar but with some differences
-L.SVG.include(!L.Browser.vml ? {} : {
+               // @event load: Event
+               // Fired when the ImageOverlay layer has loaded its image
+               img.onload = bind(this.fire, this, 'load');
+               img.onerror = bind(this._overlayOnError, this, 'error');
 
-       _initContainer: function () {
-               this._container = L.DomUtil.create('div', 'leaflet-vml-container');
-       },
+               if (this.options.crossOrigin || this.options.crossOrigin === '') {
+                       img.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;
+               }
 
-       _update: function () {
-               if (this._map._animatingZoom) { return; }
-               L.Renderer.prototype._update.call(this);
-               this.fire('update');
+               if (this.options.zIndex) {
+                       this._updateZIndex();
+               }
+
+               if (wasElementSupplied) {
+                       this._url = img.src;
+                       return;
+               }
+
+               img.src = this._url;
+               img.alt = this.options.alt;
        },
 
-       _initPath: function (layer) {
-               var container = layer._container = L.SVG.create('shape');
+       _animateZoom: function (e) {
+               var scale = this._map.getZoomScale(e.zoom),
+                   offset = this._map._latLngBoundsToNewLayerBounds(this._bounds, e.zoom, e.center).min;
 
-               L.DomUtil.addClass(container, 'leaflet-vml-shape ' + (this.options.className || ''));
+               setTransform(this._image, offset, scale);
+       },
 
-               container.coordsize = '1 1';
+       _reset: function () {
+               var image = this._image,
+                   bounds = new Bounds(
+                       this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
+                       this._map.latLngToLayerPoint(this._bounds.getSouthEast())),
+                   size = bounds.getSize();
 
-               layer._path = L.SVG.create('path');
-               container.appendChild(layer._path);
+               setPosition(image, bounds.min);
 
-               this._updateStyle(layer);
+               image.style.width  = size.x + 'px';
+               image.style.height = size.y + 'px';
        },
 
-       _addPath: function (layer) {
-               var container = layer._container;
-               this._container.appendChild(container);
+       _updateOpacity: function () {
+               setOpacity(this._image, this.options.opacity);
+       },
 
-               if (layer.options.interactive) {
-                       layer.addInteractiveTarget(container);
+       _updateZIndex: function () {
+               if (this._image && this.options.zIndex !== undefined && this.options.zIndex !== null) {
+                       this._image.style.zIndex = this.options.zIndex;
                }
        },
 
-       _removePath: function (layer) {
-               var container = layer._container;
-               L.DomUtil.remove(container);
-               layer.removeInteractiveTarget(container);
-       },
+       _overlayOnError: function () {
+               // @event error: Event
+               // Fired when the ImageOverlay layer fails to load its image
+               this.fire('error');
 
-       _updateStyle: function (layer) {
-               var stroke = layer._stroke,
-                   fill = layer._fill,
-                   options = layer.options,
-                   container = layer._container;
+               var errorUrl = this.options.errorOverlayUrl;
+               if (errorUrl && this._url !== errorUrl) {
+                       this._url = errorUrl;
+                       this._image.src = errorUrl;
+               }
+       }
+});
 
-               container.stroked = !!options.stroke;
-               container.filled = !!options.fill;
+// @factory L.imageOverlay(imageUrl: String, bounds: LatLngBounds, options?: ImageOverlay options)
+// Instantiates an image overlay object given the URL of the image and the
+// geographical bounds it is tied to.
+var imageOverlay = function (url, bounds, options) {
+       return new ImageOverlay(url, bounds, options);
+};
 
-               if (options.stroke) {
-                       if (!stroke) {
-                               stroke = layer._stroke = L.SVG.create('stroke');
-                       }
-                       container.appendChild(stroke);
-                       stroke.weight = options.weight + 'px';
-                       stroke.color = options.color;
-                       stroke.opacity = options.opacity;
+/*
+ * @class VideoOverlay
+ * @aka L.VideoOverlay
+ * @inherits ImageOverlay
+ *
+ * Used to load and display a video player over specific bounds of the map. Extends `ImageOverlay`.
+ *
+ * A video overlay uses the [`<video>`](https://developer.mozilla.org/docs/Web/HTML/Element/video)
+ * HTML5 element.
+ *
+ * @example
+ *
+ * ```js
+ * var videoUrl = 'https://www.mapbox.com/bites/00188/patricia_nasa.webm',
+ *     videoBounds = [[ 32, -130], [ 13, -100]];
+ * L.videoOverlay(videoUrl, videoBounds ).addTo(map);
+ * ```
+ */
 
-                       if (options.dashArray) {
-                               stroke.dashStyle = L.Util.isArray(options.dashArray) ?
-                                   options.dashArray.join(' ') :
-                                   options.dashArray.replace(/( *, *)/g, ' ');
-                       } else {
-                               stroke.dashStyle = '';
-                       }
-                       stroke.endcap = options.lineCap.replace('butt', 'flat');
-                       stroke.joinstyle = options.lineJoin;
+var VideoOverlay = ImageOverlay.extend({
 
-               } else if (stroke) {
-                       container.removeChild(stroke);
-                       layer._stroke = null;
-               }
+       // @section
+       // @aka VideoOverlay options
+       options: {
+               // @option autoplay: Boolean = true
+               // Whether the video starts playing automatically when loaded.
+               autoplay: true,
 
-               if (options.fill) {
-                       if (!fill) {
-                               fill = layer._fill = L.SVG.create('fill');
-                       }
-                       container.appendChild(fill);
-                       fill.color = options.fillColor || options.color;
-                       fill.opacity = options.fillOpacity;
+               // @option loop: Boolean = true
+               // Whether the video will loop back to the beginning when played.
+               loop: true,
 
-               } else if (fill) {
-                       container.removeChild(fill);
-                       layer._fill = null;
-               }
+               // @option keepAspectRatio: Boolean = true
+               // Whether the video will save aspect ratio after the projection.
+               // Relevant for supported browsers. Browser compatibility- https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit
+               keepAspectRatio: true
        },
 
-       _updateCircle: function (layer) {
-               var p = layer._point.round(),
-                   r = Math.round(layer._radius),
-                   r2 = Math.round(layer._radiusY || r);
+       _initImage: function () {
+               var wasElementSupplied = this._url.tagName === 'VIDEO';
+               var vid = this._image = wasElementSupplied ? this._url : create$1('video');
 
-               this._setPath(layer, layer._empty() ? 'M0 0' :
-                               'AL ' + p.x + ',' + p.y + ' ' + r + ',' + r2 + ' 0,' + (65535 * 360));
-       },
+               addClass(vid, 'leaflet-image-layer');
+               if (this._zoomAnimated) { addClass(vid, 'leaflet-zoom-animated'); }
 
-       _setPath: function (layer, path) {
-               layer._path.v = path;
-       },
+               vid.onselectstart = falseFn;
+               vid.onmousemove = falseFn;
 
-       _bringToFront: function (layer) {
-               L.DomUtil.toFront(layer._container);
-       },
+               // @event load: Event
+               // Fired when the video has finished loading the first frame
+               vid.onloadeddata = bind(this.fire, this, 'load');
 
-       _bringToBack: function (layer) {
-               L.DomUtil.toBack(layer._container);
+               if (wasElementSupplied) {
+                       var sourceElements = vid.getElementsByTagName('source');
+                       var sources = [];
+                       for (var j = 0; j < sourceElements.length; j++) {
+                               sources.push(sourceElements[j].src);
+                       }
+
+                       this._url = (sourceElements.length > 0) ? sources : [vid.src];
+                       return;
+               }
+
+               if (!isArray(this._url)) { this._url = [this._url]; }
+
+               if (!this.options.keepAspectRatio && vid.style.hasOwnProperty('objectFit')) { vid.style['objectFit'] = 'fill'; }
+               vid.autoplay = !!this.options.autoplay;
+               vid.loop = !!this.options.loop;
+               for (var i = 0; i < this._url.length; i++) {
+                       var source = create$1('source');
+                       source.src = this._url[i];
+                       vid.appendChild(source);
+               }
        }
+
+       // @method getElement(): HTMLVideoElement
+       // Returns the instance of [`HTMLVideoElement`](https://developer.mozilla.org/docs/Web/API/HTMLVideoElement)
+       // used by this overlay.
 });
 
-if (L.Browser.vml) {
-       L.SVG.create = (function () {
-               try {
-                       document.namespaces.add('lvml', 'urn:schemas-microsoft-com:vml');
-                       return function (name) {
-                               return document.createElement('<lvml:' + name + ' class="lvml">');
-                       };
-               } catch (e) {
-                       return function (name) {
-                               return document.createElement('<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
-                       };
-               }
-       })();
-}
 
+// @factory L.videoOverlay(video: String|Array|HTMLVideoElement, bounds: LatLngBounds, options?: VideoOverlay options)
+// Instantiates an image overlay object given the URL of the video (or array of URLs, or even a video element) and the
+// geographical bounds it is tied to.
 
+function videoOverlay(video, bounds, options) {
+       return new VideoOverlay(video, bounds, options);
+}
 
 /*
- * @class Canvas
- * @inherits Renderer
- * @aka L.Canvas
+ * @class SVGOverlay
+ * @aka L.SVGOverlay
+ * @inherits ImageOverlay
  *
- * Allows vector layers to be displayed with [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).
- * Inherits `Renderer`.
+ * Used to load, display and provide DOM access to an SVG file over specific bounds of the map. Extends `ImageOverlay`.
  *
- * Due to [technical limitations](http://caniuse.com/#search=canvas), Canvas is not
- * available in all web browsers, notably IE8, and overlapping geometries might
- * not display properly in some edge cases.
+ * An SVG overlay uses the [`<svg>`](https://developer.mozilla.org/docs/Web/SVG/Element/svg) element.
  *
  * @example
  *
- * Use Canvas by default for all paths in the map:
- *
- * ```js
- * var map = L.map('map', {
- *     renderer: L.canvas()
- * });
- * ```
- *
- * Use a Canvas renderer with extra padding for specific vector geometries:
- *
  * ```js
- * var map = L.map('map');
- * var myRenderer = L.canvas({ padding: 0.5 });
- * var line = L.polyline( coordinates, { renderer: myRenderer } );
- * var circle = L.circle( center, { renderer: myRenderer } );
+ * var element = '<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><image xlink:href="https://mdn.mozillademos.org/files/6457/mdn_logo_only_color.png" height="200" width="200"/></svg>',
+ *              elementBounds = [ [ 32, -130 ], [ 13, -100 ] ];
+ * L.svgOverlay(element, elementBounds).addTo(map);
  * ```
  */
 
-L.Canvas = L.Renderer.extend({
+var SVGOverlay = ImageOverlay.extend({
+       _initImage: function () {
+               var el = this._image = this._url;
 
-       onAdd: function () {
-               L.Renderer.prototype.onAdd.call(this);
+               addClass(el, 'leaflet-image-layer');
+               if (this._zoomAnimated) { addClass(el, 'leaflet-zoom-animated'); }
 
-               this._layers = this._layers || {};
+               el.onselectstart = falseFn;
+               el.onmousemove = falseFn;
+       }
 
-               // Redraw vectors since canvas is cleared upon removal,
-               // in case of removing the renderer itself from the map.
-               this._draw();
+       // @method getElement(): SVGElement
+       // Returns the instance of [`SVGElement`](https://developer.mozilla.org/docs/Web/API/SVGElement)
+       // used by this overlay.
+});
+
+
+// @factory L.svgOverlay(svg: String|SVGElement, bounds: LatLngBounds, options?: SVGOverlay options)
+// Instantiates an image overlay object given an SVG element and the geographical bounds it is tied to.
+// A viewBox attribute is required on the SVG element to zoom in and out properly.
+
+function svgOverlay(el, bounds, options) {
+       return new SVGOverlay(el, bounds, options);
+}
+
+/*
+ * @class DivOverlay
+ * @inherits Layer
+ * @aka L.DivOverlay
+ * Base model for L.Popup and L.Tooltip. Inherit from it for custom popup like plugins.
+ */
+
+// @namespace DivOverlay
+var DivOverlay = Layer.extend({
+
+       // @section
+       // @aka DivOverlay options
+       options: {
+               // @option offset: Point = Point(0, 7)
+               // The offset of the popup position. Useful to control the anchor
+               // of the popup when opening it on some overlays.
+               offset: [0, 7],
+
+               // @option className: String = ''
+               // A custom CSS class name to assign to the popup.
+               className: '',
+
+               // @option pane: String = 'popupPane'
+               // `Map pane` where the popup will be added.
+               pane: 'popupPane'
        },
 
-       _initContainer: function () {
-               var container = this._container = document.createElement('canvas');
+       initialize: function (options, source) {
+               setOptions(this, options);
 
-               L.DomEvent
-                       .on(container, 'mousemove', L.Util.throttle(this._onMouseMove, 32, this), this)
-                       .on(container, 'click dblclick mousedown mouseup contextmenu', this._onClick, this)
-                       .on(container, 'mouseout', this._handleMouseOut, this);
+               this._source = source;
+       },
 
-               this._ctx = container.getContext('2d');
+       onAdd: function (map) {
+               this._zoomAnimated = map._zoomAnimated;
+
+               if (!this._container) {
+                       this._initLayout();
+               }
+
+               if (map._fadeAnimated) {
+                       setOpacity(this._container, 0);
+               }
+
+               clearTimeout(this._removeTimeout);
+               this.getPane().appendChild(this._container);
+               this.update();
+
+               if (map._fadeAnimated) {
+                       setOpacity(this._container, 1);
+               }
+
+               this.bringToFront();
        },
 
-       _update: function () {
-               if (this._map._animatingZoom && this._bounds) { return; }
+       onRemove: function (map) {
+               if (map._fadeAnimated) {
+                       setOpacity(this._container, 0);
+                       this._removeTimeout = setTimeout(bind(remove, undefined, this._container), 200);
+               } else {
+                       remove(this._container);
+               }
+       },
+
+       // @namespace Popup
+       // @method getLatLng: LatLng
+       // Returns the geographical point of popup.
+       getLatLng: function () {
+               return this._latlng;
+       },
 
-               this._drawnLayers = {};
+       // @method setLatLng(latlng: LatLng): this
+       // Sets the geographical point where the popup will open.
+       setLatLng: function (latlng) {
+               this._latlng = toLatLng(latlng);
+               if (this._map) {
+                       this._updatePosition();
+                       this._adjustPan();
+               }
+               return this;
+       },
 
-               L.Renderer.prototype._update.call(this);
+       // @method getContent: String|HTMLElement
+       // Returns the content of the popup.
+       getContent: function () {
+               return this._content;
+       },
 
-               var b = this._bounds,
-                   container = this._container,
-                   size = b.getSize(),
-                   m = L.Browser.retina ? 2 : 1;
+       // @method setContent(htmlContent: String|HTMLElement|Function): this
+       // Sets the HTML content of the popup. If a function is passed the source layer will be passed to the function. The function should return a `String` or `HTMLElement` to be used in the popup.
+       setContent: function (content) {
+               this._content = content;
+               this.update();
+               return this;
+       },
 
-               L.DomUtil.setPosition(container, b.min);
+       // @method getElement: String|HTMLElement
+       // Alias for [getContent()](#popup-getcontent)
+       getElement: function () {
+               return this._container;
+       },
 
-               // set canvas size (also clearing it); use double size on retina
-               container.width = m * size.x;
-               container.height = m * size.y;
-               container.style.width = size.x + 'px';
-               container.style.height = size.y + 'px';
+       // @method update: null
+       // Updates the popup content, layout and position. Useful for updating the popup after something inside changed, e.g. image loaded.
+       update: function () {
+               if (!this._map) { return; }
 
-               if (L.Browser.retina) {
-                       this._ctx.scale(2, 2);
-               }
+               this._container.style.visibility = 'hidden';
 
-               // translate so we use the same path coordinates after canvas element moves
-               this._ctx.translate(-b.min.x, -b.min.y);
+               this._updateContent();
+               this._updateLayout();
+               this._updatePosition();
 
-               // Tell paths to redraw themselves
-               this.fire('update');
-       },
+               this._container.style.visibility = '';
 
-       _initPath: function (layer) {
-               this._updateDashArray(layer);
-               this._layers[L.stamp(layer)] = layer;
+               this._adjustPan();
        },
 
-       _addPath: L.Util.falseFn,
+       getEvents: function () {
+               var events = {
+                       zoom: this._updatePosition,
+                       viewreset: this._updatePosition
+               };
 
-       _removePath: function (layer) {
-               layer._removed = true;
-               this._requestRedraw(layer);
+               if (this._zoomAnimated) {
+                       events.zoomanim = this._animateZoom;
+               }
+               return events;
        },
 
-       _updatePath: function (layer) {
-               this._redrawBounds = layer._pxBounds;
-               this._draw(true);
-               layer._project();
-               layer._update();
-               this._draw();
-               this._redrawBounds = null;
+       // @method isOpen: Boolean
+       // Returns `true` when the popup is visible on the map.
+       isOpen: function () {
+               return !!this._map && this._map.hasLayer(this);
        },
 
-       _updateStyle: function (layer) {
-               this._updateDashArray(layer);
-               this._requestRedraw(layer);
+       // @method bringToFront: this
+       // Brings this popup in front of other popups (in the same map pane).
+       bringToFront: function () {
+               if (this._map) {
+                       toFront(this._container);
+               }
+               return this;
        },
 
-       _updateDashArray: function (layer) {
-               if (layer.options.dashArray) {
-                       var parts = layer.options.dashArray.split(','),
-                           dashArray = [],
-                           i;
-                       for (i = 0; i < parts.length; i++) {
-                               dashArray.push(Number(parts[i]));
-                       }
-                       layer.options._dashArray = dashArray;
+       // @method bringToBack: this
+       // Brings this popup to the back of other popups (in the same map pane).
+       bringToBack: function () {
+               if (this._map) {
+                       toBack(this._container);
                }
+               return this;
        },
 
-       _requestRedraw: function (layer) {
-               if (!this._map) { return; }
+       _prepareOpen: function (parent, layer, latlng) {
+               if (!(layer instanceof Layer)) {
+                       latlng = layer;
+                       layer = parent;
+               }
 
-               var padding = (layer.options.weight || 0) + 1;
-               this._redrawBounds = this._redrawBounds || new L.Bounds();
-               this._redrawBounds.extend(layer._pxBounds.min.subtract([padding, padding]));
-               this._redrawBounds.extend(layer._pxBounds.max.add([padding, padding]));
+               if (layer instanceof FeatureGroup) {
+                       for (var id in parent._layers) {
+                               layer = parent._layers[id];
+                               break;
+                       }
+               }
 
-               this._redrawRequest = this._redrawRequest || L.Util.requestAnimFrame(this._redraw, this);
-       },
+               if (!latlng) {
+                       if (layer.getCenter) {
+                               latlng = layer.getCenter();
+                       } else if (layer.getLatLng) {
+                               latlng = layer.getLatLng();
+                       } else {
+                               throw new Error('Unable to get source layer LatLng.');
+                       }
+               }
 
-       _redraw: function () {
-               this._redrawRequest = null;
+               // set overlay source to this layer
+               this._source = layer;
 
-               this._draw(true); // clear layers in redraw bounds
-               this._draw(); // draw layers
+               // update the overlay (content, layout, ect...)
+               this.update();
 
-               this._redrawBounds = null;
+               return latlng;
        },
 
-       _draw: function (clear) {
-               this._clear = clear;
-               var layer, bounds = this._redrawBounds;
-               this._ctx.save();
-               if (bounds) {
-                       this._ctx.beginPath();
-                       this._ctx.rect(bounds.min.x, bounds.min.y, bounds.max.x - bounds.min.x, bounds.max.y - bounds.min.y);
-                       this._ctx.clip();
-               }
+       _updateContent: function () {
+               if (!this._content) { return; }
 
-               for (var id in this._layers) {
-                       layer = this._layers[id];
-                       if (!bounds || (layer._pxBounds && layer._pxBounds.intersects(bounds))) {
-                               layer._updatePath();
-                       }
-                       if (clear && layer._removed) {
-                               delete layer._removed;
-                               delete this._layers[id];
+               var node = this._contentNode;
+               var content = (typeof this._content === 'function') ? this._content(this._source || this) : this._content;
+
+               if (typeof content === 'string') {
+                       node.innerHTML = content;
+               } else {
+                       while (node.hasChildNodes()) {
+                               node.removeChild(node.firstChild);
                        }
+                       node.appendChild(content);
                }
-               this._ctx.restore();  // Restore state before clipping.
+               this.fire('contentupdate');
        },
 
-       _updatePoly: function (layer, closed) {
+       _updatePosition: function () {
+               if (!this._map) { return; }
 
-               var i, j, len2, p,
-                   parts = layer._parts,
-                   len = parts.length,
-                   ctx = this._ctx;
+               var pos = this._map.latLngToLayerPoint(this._latlng),
+                   offset = toPoint(this.options.offset),
+                   anchor = this._getAnchor();
 
-               if (!len) { return; }
+               if (this._zoomAnimated) {
+                       setPosition(this._container, pos.add(anchor));
+               } else {
+                       offset = offset.add(pos).add(anchor);
+               }
 
-               this._drawnLayers[layer._leaflet_id] = layer;
+               var bottom = this._containerBottom = -offset.y,
+                   left = this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x;
 
-               ctx.beginPath();
+               // bottom position the popup in case the height of the popup changes (images loading etc)
+               this._container.style.bottom = bottom + 'px';
+               this._container.style.left = left + 'px';
+       },
 
-               if (ctx.setLineDash) {
-                       ctx.setLineDash(layer.options && layer.options._dashArray || []);
-               }
+       _getAnchor: function () {
+               return [0, 0];
+       }
 
-               for (i = 0; i < len; i++) {
-                       for (j = 0, len2 = parts[i].length; j < len2; j++) {
-                               p = parts[i][j];
-                               ctx[j ? 'lineTo' : 'moveTo'](p.x, p.y);
-                       }
-                       if (closed) {
-                               ctx.closePath();
-                       }
-               }
+});
 
-               this._fillStroke(ctx, layer);
+/*
+ * @class Popup
+ * @inherits DivOverlay
+ * @aka L.Popup
+ * Used to open popups in certain places of the map. Use [Map.openPopup](#map-openpopup) to
+ * open popups while making sure that only one popup is open at one time
+ * (recommended for usability), or use [Map.addLayer](#map-addlayer) to open as many as you want.
+ *
+ * @example
+ *
+ * If you want to just bind a popup to marker click and then open it, it's really easy:
+ *
+ * ```js
+ * marker.bindPopup(popupContent).openPopup();
+ * ```
+ * Path overlays like polylines also have a `bindPopup` method.
+ * Here's a more complicated way to open a popup on a map:
+ *
+ * ```js
+ * var popup = L.popup()
+ *     .setLatLng(latlng)
+ *     .setContent('<p>Hello world!<br />This is a nice popup.</p>')
+ *     .openOn(map);
+ * ```
+ */
 
-               // TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature
-       },
 
-       _updateCircle: function (layer) {
+// @namespace Popup
+var Popup = DivOverlay.extend({
 
-               if (layer._empty()) { return; }
+       // @section
+       // @aka Popup options
+       options: {
+               // @option maxWidth: Number = 300
+               // Max width of the popup, in pixels.
+               maxWidth: 300,
 
-               var p = layer._point,
-                   ctx = this._ctx,
-                   r = layer._radius,
-                   s = (layer._radiusY || r) / r;
+               // @option minWidth: Number = 50
+               // Min width of the popup, in pixels.
+               minWidth: 50,
 
-               this._drawnLayers[layer._leaflet_id] = layer;
+               // @option maxHeight: Number = null
+               // If set, creates a scrollable container of the given height
+               // inside a popup if its content exceeds it.
+               maxHeight: null,
 
-               if (s !== 1) {
-                       ctx.save();
-                       ctx.scale(1, s);
-               }
+               // @option autoPan: Boolean = true
+               // Set it to `false` if you don't want the map to do panning animation
+               // to fit the opened popup.
+               autoPan: true,
 
-               ctx.beginPath();
-               ctx.arc(p.x, p.y / s, r, 0, Math.PI * 2, false);
+               // @option autoPanPaddingTopLeft: Point = null
+               // The margin between the popup and the top left corner of the map
+               // view after autopanning was performed.
+               autoPanPaddingTopLeft: null,
 
-               if (s !== 1) {
-                       ctx.restore();
-               }
+               // @option autoPanPaddingBottomRight: Point = null
+               // The margin between the popup and the bottom right corner of the map
+               // view after autopanning was performed.
+               autoPanPaddingBottomRight: null,
 
-               this._fillStroke(ctx, layer);
-       },
+               // @option autoPanPadding: Point = Point(5, 5)
+               // Equivalent of setting both top left and bottom right autopan padding to the same value.
+               autoPanPadding: [5, 5],
 
-       _fillStroke: function (ctx, layer) {
-               var clear = this._clear,
-                   options = layer.options;
+               // @option keepInView: Boolean = false
+               // Set it to `true` if you want to prevent users from panning the popup
+               // off of the screen while it is open.
+               keepInView: false,
 
-               ctx.globalCompositeOperation = clear ? 'destination-out' : 'source-over';
+               // @option closeButton: Boolean = true
+               // Controls the presence of a close button in the popup.
+               closeButton: true,
 
-               if (options.fill) {
-                       ctx.globalAlpha = clear ? 1 : options.fillOpacity;
-                       ctx.fillStyle = options.fillColor || options.color;
-                       ctx.fill(options.fillRule || 'evenodd');
-               }
+               // @option autoClose: Boolean = true
+               // Set it to `false` if you want to override the default behavior of
+               // the popup closing when another popup is opened.
+               autoClose: true,
 
-               if (options.stroke && options.weight !== 0) {
-                       ctx.globalAlpha = clear ? 1 : options.opacity;
+               // @option closeOnEscapeKey: Boolean = true
+               // Set it to `false` if you want to override the default behavior of
+               // the ESC key for closing of the popup.
+               closeOnEscapeKey: true,
 
-                       // if clearing shape, do it with the previously drawn line width
-                       layer._prevWeight = ctx.lineWidth = clear ? layer._prevWeight + 1 : options.weight;
+               // @option closeOnClick: Boolean = *
+               // Set it if you want to override the default behavior of the popup closing when user clicks
+               // on the map. Defaults to the map's [`closePopupOnClick`](#map-closepopuponclick) option.
 
-                       ctx.strokeStyle = options.color;
-                       ctx.lineCap = options.lineCap;
-                       ctx.lineJoin = options.lineJoin;
-                       ctx.stroke();
-               }
+               // @option className: String = ''
+               // A custom CSS class name to assign to the popup.
+               className: ''
        },
 
-       // Canvas obviously doesn't have mouse events for individual drawn objects,
-       // so we emulate that by calculating what's under the mouse on mousemove/click manually
+       // @namespace Popup
+       // @method openOn(map: Map): this
+       // Adds the popup to the map and closes the previous one. The same as `map.openPopup(popup)`.
+       openOn: function (map) {
+               map.openPopup(this);
+               return this;
+       },
 
-       _onClick: function (e) {
-               var point = this._map.mouseEventToLayerPoint(e), layers = [], layer;
+       onAdd: function (map) {
+               DivOverlay.prototype.onAdd.call(this, map);
 
-               for (var id in this._layers) {
-                       layer = this._layers[id];
-                       if (layer.options.interactive && layer._containsPoint(point) && !this._map._draggableMoved(layer)) {
-                               L.DomEvent._fakeStop(e);
-                               layers.push(layer);
+               // @namespace Map
+               // @section Popup events
+               // @event popupopen: PopupEvent
+               // Fired when a popup is opened in the map
+               map.fire('popupopen', {popup: this});
+
+               if (this._source) {
+                       // @namespace Layer
+                       // @section Popup events
+                       // @event popupopen: PopupEvent
+                       // Fired when a popup bound to this layer is opened
+                       this._source.fire('popupopen', {popup: this}, true);
+                       // For non-path layers, we toggle the popup when clicking
+                       // again the layer, so prevent the map to reopen it.
+                       if (!(this._source instanceof Path)) {
+                               this._source.on('preclick', stopPropagation);
                        }
                }
-               if (layers.length)  {
-                       this._fireEvent(layers, e);
-               }
        },
 
-       _onMouseMove: function (e) {
-               if (!this._map || this._map.dragging.moving() || this._map._animatingZoom) { return; }
-
-               var point = this._map.mouseEventToLayerPoint(e);
-               this._handleMouseOut(e, point);
-               this._handleMouseHover(e, point);
-       },
+       onRemove: function (map) {
+               DivOverlay.prototype.onRemove.call(this, map);
 
+               // @namespace Map
+               // @section Popup events
+               // @event popupclose: PopupEvent
+               // Fired when a popup in the map is closed
+               map.fire('popupclose', {popup: this});
 
-       _handleMouseOut: function (e, point) {
-               var layer = this._hoveredLayer;
-               if (layer && (e.type === 'mouseout' || !layer._containsPoint(point))) {
-                       // if we're leaving the layer, fire mouseout
-                       L.DomUtil.removeClass(this._container, 'leaflet-interactive');
-                       this._fireEvent([layer], e, 'mouseout');
-                       this._hoveredLayer = null;
+               if (this._source) {
+                       // @namespace Layer
+                       // @section Popup events
+                       // @event popupclose: PopupEvent
+                       // Fired when a popup bound to this layer is closed
+                       this._source.fire('popupclose', {popup: this}, true);
+                       if (!(this._source instanceof Path)) {
+                               this._source.off('preclick', stopPropagation);
+                       }
                }
        },
 
-       _handleMouseHover: function (e, point) {
-               var id, layer;
+       getEvents: function () {
+               var events = DivOverlay.prototype.getEvents.call(this);
 
-               for (id in this._drawnLayers) {
-                       layer = this._drawnLayers[id];
-                       if (layer.options.interactive && layer._containsPoint(point)) {
-                               L.DomUtil.addClass(this._container, 'leaflet-interactive'); // change cursor
-                               this._fireEvent([layer], e, 'mouseover');
-                               this._hoveredLayer = layer;
-                       }
+               if (this.options.closeOnClick !== undefined ? this.options.closeOnClick : this._map.options.closePopupOnClick) {
+                       events.preclick = this._close;
                }
 
-               if (this._hoveredLayer) {
-                       this._fireEvent([this._hoveredLayer], e);
+               if (this.options.keepInView) {
+                       events.moveend = this._adjustPan;
                }
-       },
 
-       _fireEvent: function (layers, e, type) {
-               this._map._fireDOMEvent(e, type || e.type, layers);
+               return events;
        },
 
-       // TODO _bringToFront & _bringToBack, pretty tricky
-
-       _bringToFront: L.Util.falseFn,
-       _bringToBack: L.Util.falseFn
-});
-
-// @namespace Browser; @property canvas: Boolean
-// `true` when the browser supports [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).
-L.Browser.canvas = (function () {
-       return !!document.createElement('canvas').getContext;
-}());
+       _close: function () {
+               if (this._map) {
+                       this._map.closePopup(this);
+               }
+       },
 
-// @namespace Canvas
-// @factory L.canvas(options?: Renderer options)
-// Creates a Canvas renderer with the given options.
-L.canvas = function (options) {
-       return L.Browser.canvas ? new L.Canvas(options) : null;
-};
+       _initLayout: function () {
+               var prefix = 'leaflet-popup',
+                   container = this._container = create$1('div',
+                       prefix + ' ' + (this.options.className || '') +
+                       ' leaflet-zoom-animated');
 
-L.Polyline.prototype._containsPoint = function (p, closed) {
-       var i, j, k, len, len2, part,
-           w = this._clickTolerance();
+               var wrapper = this._wrapper = create$1('div', prefix + '-content-wrapper', container);
+               this._contentNode = create$1('div', prefix + '-content', wrapper);
 
-       if (!this._pxBounds.contains(p)) { return false; }
+               disableClickPropagation(wrapper);
+               disableScrollPropagation(this._contentNode);
+               on(wrapper, 'contextmenu', stopPropagation);
 
-       // hit detection for polylines
-       for (i = 0, len = this._parts.length; i < len; i++) {
-               part = this._parts[i];
+               this._tipContainer = create$1('div', prefix + '-tip-container', container);
+               this._tip = create$1('div', prefix + '-tip', this._tipContainer);
 
-               for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
-                       if (!closed && (j === 0)) { continue; }
+               if (this.options.closeButton) {
+                       var closeButton = this._closeButton = create$1('a', prefix + '-close-button', container);
+                       closeButton.href = '#close';
+                       closeButton.innerHTML = '&#215;';
 
-                       if (L.LineUtil.pointToSegmentDistance(p, part[k], part[j]) <= w) {
-                               return true;
-                       }
+                       on(closeButton, 'click', this._onCloseButtonClick, this);
                }
-       }
-       return false;
-};
+       },
 
-L.Polygon.prototype._containsPoint = function (p) {
-       var inside = false,
-           part, p1, p2, i, j, k, len, len2;
+       _updateLayout: function () {
+               var container = this._contentNode,
+                   style = container.style;
 
-       if (!this._pxBounds.contains(p)) { return false; }
+               style.width = '';
+               style.whiteSpace = 'nowrap';
 
-       // ray casting algorithm for detecting if point is in polygon
-       for (i = 0, len = this._parts.length; i < len; i++) {
-               part = this._parts[i];
+               var width = container.offsetWidth;
+               width = Math.min(width, this.options.maxWidth);
+               width = Math.max(width, this.options.minWidth);
 
-               for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
-                       p1 = part[j];
-                       p2 = part[k];
+               style.width = (width + 1) + 'px';
+               style.whiteSpace = '';
 
-                       if (((p1.y > p.y) !== (p2.y > p.y)) && (p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x)) {
-                               inside = !inside;
-                       }
-               }
-       }
+               style.height = '';
 
-       // also check if it's on polygon stroke
-       return inside || L.Polyline.prototype._containsPoint.call(this, p, true);
-};
+               var height = container.offsetHeight,
+                   maxHeight = this.options.maxHeight,
+                   scrolledClass = 'leaflet-popup-scrolled';
 
-L.CircleMarker.prototype._containsPoint = function (p) {
-       return p.distanceTo(this._point) <= this._radius + this._clickTolerance();
-};
+               if (maxHeight && height > maxHeight) {
+                       style.height = maxHeight + 'px';
+                       addClass(container, scrolledClass);
+               } else {
+                       removeClass(container, scrolledClass);
+               }
 
+               this._containerWidth = this._container.offsetWidth;
+       },
 
+       _animateZoom: function (e) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center),
+                   anchor = this._getAnchor();
+               setPosition(this._container, pos.add(anchor));
+       },
 
-/*
- * @class GeoJSON
- * @aka L.GeoJSON
- * @inherits FeatureGroup
- *
- * Represents a GeoJSON object or an array of GeoJSON objects. Allows you to parse
- * GeoJSON data and display it on the map. Extends `FeatureGroup`.
- *
- * @example
- *
- * ```js
- * L.geoJSON(data, {
- *     style: function (feature) {
- *             return {color: feature.properties.color};
- *     }
- * }).bindPopup(function (layer) {
- *     return layer.feature.properties.description;
- * }).addTo(map);
- * ```
- */
+       _adjustPan: function () {
+               if (!this.options.autoPan) { return; }
+               if (this._map._panAnim) { this._map._panAnim.stop(); }
 
-L.GeoJSON = L.FeatureGroup.extend({
+               var map = this._map,
+                   marginBottom = parseInt(getStyle(this._container, 'marginBottom'), 10) || 0,
+                   containerHeight = this._container.offsetHeight + marginBottom,
+                   containerWidth = this._containerWidth,
+                   layerPos = new Point(this._containerLeft, -containerHeight - this._containerBottom);
 
-       /* @section
-        * @aka GeoJSON options
-        *
-        * @option pointToLayer: Function = *
-        * A `Function` defining how GeoJSON points spawn Leaflet layers. It is internally
-        * called when data is added, passing the GeoJSON point feature and its `LatLng`.
-        * The default is to spawn a default `Marker`:
-        * ```js
-        * function(geoJsonPoint, latlng) {
-        *      return L.marker(latlng);
-        * }
-        * ```
-        *
-        * @option style: Function = *
-        * A `Function` defining the `Path options` for styling GeoJSON lines and polygons,
-        * called internally when data is added.
-        * The default value is to not override any defaults:
-        * ```js
-        * function (geoJsonFeature) {
-        *      return {}
-        * }
-        * ```
-        *
-        * @option onEachFeature: Function = *
-        * A `Function` that will be called once for each created `Feature`, after it has
-        * been created and styled. Useful for attaching events and popups to features.
-        * The default is to do nothing with the newly created layers:
-        * ```js
-        * function (feature, layer) {}
-        * ```
-        *
-        * @option filter: Function = *
-        * A `Function` that will be used to decide whether to include a feature or not.
-        * The default is to include all features:
-        * ```js
-        * function (geoJsonFeature) {
-        *      return true;
-        * }
-        * ```
-        * Note: dynamically changing the `filter` option will have effect only on newly
-        * added data. It will _not_ re-evaluate already included features.
-        *
-        * @option coordsToLatLng: Function = *
-        * A `Function` that will be used for converting GeoJSON coordinates to `LatLng`s.
-        * The default is the `coordsToLatLng` static method.
-        */
+               layerPos._add(getPosition(this._container));
 
-       initialize: function (geojson, options) {
-               L.setOptions(this, options);
+               var containerPos = map.layerPointToContainerPoint(layerPos),
+                   padding = toPoint(this.options.autoPanPadding),
+                   paddingTL = toPoint(this.options.autoPanPaddingTopLeft || padding),
+                   paddingBR = toPoint(this.options.autoPanPaddingBottomRight || padding),
+                   size = map.getSize(),
+                   dx = 0,
+                   dy = 0;
 
-               this._layers = {};
+               if (containerPos.x + containerWidth + paddingBR.x > size.x) { // right
+                       dx = containerPos.x + containerWidth - size.x + paddingBR.x;
+               }
+               if (containerPos.x - dx - paddingTL.x < 0) { // left
+                       dx = containerPos.x - paddingTL.x;
+               }
+               if (containerPos.y + containerHeight + paddingBR.y > size.y) { // bottom
+                       dy = containerPos.y + containerHeight - size.y + paddingBR.y;
+               }
+               if (containerPos.y - dy - paddingTL.y < 0) { // top
+                       dy = containerPos.y - paddingTL.y;
+               }
 
-               if (geojson) {
-                       this.addData(geojson);
+               // @namespace Map
+               // @section Popup events
+               // @event autopanstart: Event
+               // Fired when the map starts autopanning when opening a popup.
+               if (dx || dy) {
+                       map
+                           .fire('autopanstart')
+                           .panBy([dx, dy]);
                }
        },
 
-       // @method addData( <GeoJSON> data ): Layer
-       // Adds a GeoJSON object to the layer.
-       addData: function (geojson) {
-               var features = L.Util.isArray(geojson) ? geojson : geojson.features,
-                   i, len, feature;
+       _onCloseButtonClick: function (e) {
+               this._close();
+               stop(e);
+       },
 
-               if (features) {
-                       for (i = 0, len = features.length; i < len; 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(feature);
-                               }
-                       }
-                       return this;
-               }
+       _getAnchor: function () {
+               // Where should we anchor the popup on the source layer?
+               return toPoint(this._source && this._source._getPopupAnchor ? this._source._getPopupAnchor() : [0, 0]);
+       }
 
-               var options = this.options;
+});
 
-               if (options.filter && !options.filter(geojson)) { return this; }
+// @namespace Popup
+// @factory L.popup(options?: Popup options, source?: Layer)
+// Instantiates a `Popup` object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the popup with a reference to the Layer to which it refers.
+var popup = function (options, source) {
+       return new Popup(options, source);
+};
 
-               var layer = L.GeoJSON.geometryToLayer(geojson, options);
-               if (!layer) {
-                       return this;
-               }
-               layer.feature = L.GeoJSON.asFeature(geojson);
 
-               layer.defaultOptions = layer.options;
-               this.resetStyle(layer);
+/* @namespace Map
+ * @section Interaction Options
+ * @option closePopupOnClick: Boolean = true
+ * Set it to `false` if you don't want popups to close when user clicks the map.
+ */
+Map.mergeOptions({
+       closePopupOnClick: true
+});
 
-               if (options.onEachFeature) {
-                       options.onEachFeature(geojson, layer);
-               }
 
-               return this.addLayer(layer);
-       },
+// @namespace Map
+// @section Methods for Layers and Controls
+Map.include({
+       // @method openPopup(popup: Popup): this
+       // Opens the specified popup while closing the previously opened (to make sure only one is opened at one time for usability).
+       // @alternative
+       // @method openPopup(content: String|HTMLElement, latlng: LatLng, options?: Popup options): this
+       // Creates a popup with the specified content and options and opens it in the given point on a map.
+       openPopup: function (popup, latlng, options) {
+               if (!(popup instanceof Popup)) {
+                       popup = new Popup(options).setContent(popup);
+               }
 
-       // @method resetStyle( <Path> layer ): Layer
-       // Resets the given vector layer's style to the original GeoJSON style, useful for resetting style after hover events.
-       resetStyle: function (layer) {
-               // reset any custom styles
-               layer.options = L.Util.extend({}, layer.defaultOptions);
-               this._setLayerStyle(layer, this.options.style);
-               return this;
-       },
+               if (latlng) {
+                       popup.setLatLng(latlng);
+               }
 
-       // @method setStyle( <Function> style ): Layer
-       // Changes styles of GeoJSON vector layers with the given style function.
-       setStyle: function (style) {
-               return this.eachLayer(function (layer) {
-                       this._setLayerStyle(layer, style);
-               }, this);
+               if (this.hasLayer(popup)) {
+                       return this;
+               }
+
+               if (this._popup && this._popup.options.autoClose) {
+                       this.closePopup();
+               }
+
+               this._popup = popup;
+               return this.addLayer(popup);
        },
 
-       _setLayerStyle: function (layer, style) {
-               if (typeof style === 'function') {
-                       style = style(layer.feature);
+       // @method closePopup(popup?: Popup): this
+       // Closes the popup previously opened with [openPopup](#map-openpopup) (or the given one).
+       closePopup: function (popup) {
+               if (!popup || popup === this._popup) {
+                       popup = this._popup;
+                       this._popup = null;
                }
-               if (layer.setStyle) {
-                       layer.setStyle(style);
+               if (popup) {
+                       this.removeLayer(popup);
                }
+               return this;
        }
 });
 
-// @section
-// There are several static functions which can be called without instantiating L.GeoJSON:
-L.extend(L.GeoJSON, {
-       // @function geometryToLayer(featureData: Object, options?: GeoJSON options): Layer
-       // Creates a `Layer` from a given GeoJSON feature. Can use a custom
-       // [`pointToLayer`](#geojson-pointtolayer) and/or [`coordsToLatLng`](#geojson-coordstolatlng)
-       // functions if provided as options.
-       geometryToLayer: function (geojson, options) {
-
-               var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
-                   coords = geometry ? geometry.coordinates : null,
-                   layers = [],
-                   pointToLayer = options && options.pointToLayer,
-                   coordsToLatLng = options && options.coordsToLatLng || this.coordsToLatLng,
-                   latlng, latlngs, i, len;
-
-               if (!coords && !geometry) {
-                       return null;
-               }
+/*
+ * @namespace Layer
+ * @section Popup methods example
+ *
+ * All layers share a set of methods convenient for binding popups to it.
+ *
+ * ```js
+ * var layer = L.Polygon(latlngs).bindPopup('Hi There!').addTo(map);
+ * layer.openPopup();
+ * layer.closePopup();
+ * ```
+ *
+ * Popups will also be automatically opened when the layer is clicked on and closed when the layer is removed from the map or another popup is opened.
+ */
 
-               switch (geometry.type) {
-               case 'Point':
-                       latlng = coordsToLatLng(coords);
-                       return pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng);
+// @section Popup methods
+Layer.include({
 
-               case 'MultiPoint':
-                       for (i = 0, len = coords.length; i < len; i++) {
-                               latlng = coordsToLatLng(coords[i]);
-                               layers.push(pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng));
-                       }
-                       return new L.FeatureGroup(layers);
-
-               case 'LineString':
-               case 'MultiLineString':
-                       latlngs = this.coordsToLatLngs(coords, geometry.type === 'LineString' ? 0 : 1, coordsToLatLng);
-                       return new L.Polyline(latlngs, options);
-
-               case 'Polygon':
-               case 'MultiPolygon':
-                       latlngs = this.coordsToLatLngs(coords, geometry.type === 'Polygon' ? 1 : 2, coordsToLatLng);
-                       return new L.Polygon(latlngs, options);
-
-               case 'GeometryCollection':
-                       for (i = 0, len = geometry.geometries.length; i < len; i++) {
-                               var layer = this.geometryToLayer({
-                                       geometry: geometry.geometries[i],
-                                       type: 'Feature',
-                                       properties: geojson.properties
-                               }, options);
-
-                               if (layer) {
-                                       layers.push(layer);
-                               }
+       // @method bindPopup(content: String|HTMLElement|Function|Popup, options?: Popup options): this
+       // Binds a popup to the layer with the passed `content` and sets up the
+       // necessary event listeners. If a `Function` is passed it will receive
+       // the layer as the first argument and should return a `String` or `HTMLElement`.
+       bindPopup: function (content, options) {
+
+               if (content instanceof Popup) {
+                       setOptions(content, options);
+                       this._popup = content;
+                       content._source = this;
+               } else {
+                       if (!this._popup || options) {
+                               this._popup = new Popup(options, this);
                        }
-                       return new L.FeatureGroup(layers);
+                       this._popup.setContent(content);
+               }
 
-               default:
-                       throw new Error('Invalid GeoJSON object.');
+               if (!this._popupHandlersAdded) {
+                       this.on({
+                               click: this._openPopup,
+                               keypress: this._onKeyPress,
+                               remove: this.closePopup,
+                               move: this._movePopup
+                       });
+                       this._popupHandlersAdded = true;
                }
-       },
 
-       // @function coordsToLatLng(coords: Array): LatLng
-       // Creates a `LatLng` object from an array of 2 numbers (longitude, latitude)
-       // or 3 numbers (longitude, latitude, altitude) used in GeoJSON for points.
-       coordsToLatLng: function (coords) {
-               return new L.LatLng(coords[1], coords[0], coords[2]);
+               return this;
        },
 
-       // @function coordsToLatLngs(coords: Array, levelsDeep?: Number, coordsToLatLng?: Function): Array
-       // Creates a multidimensional array of `LatLng`s from a GeoJSON coordinates array.
-       // `levelsDeep` specifies the nesting level (0 is for an array of points, 1 for an array of arrays of points, etc., 0 by default).
-       // Can use a custom [`coordsToLatLng`](#geojson-coordstolatlng) function.
-       coordsToLatLngs: function (coords, levelsDeep, coordsToLatLng) {
-               var latlngs = [];
+       // @method unbindPopup(): this
+       // Removes the popup previously bound with `bindPopup`.
+       unbindPopup: function () {
+               if (this._popup) {
+                       this.off({
+                               click: this._openPopup,
+                               keypress: this._onKeyPress,
+                               remove: this.closePopup,
+                               move: this._movePopup
+                       });
+                       this._popupHandlersAdded = false;
+                       this._popup = null;
+               }
+               return this;
+       },
 
-               for (var i = 0, len = coords.length, latlng; i < len; i++) {
-                       latlng = levelsDeep ?
-                               this.coordsToLatLngs(coords[i], levelsDeep - 1, coordsToLatLng) :
-                               (coordsToLatLng || this.coordsToLatLng)(coords[i]);
+       // @method openPopup(latlng?: LatLng): this
+       // Opens the bound popup at the specified `latlng` or at the default popup anchor if no `latlng` is passed.
+       openPopup: function (layer, latlng) {
+               if (this._popup && this._map) {
+                       latlng = this._popup._prepareOpen(this, layer, latlng);
 
-                       latlngs.push(latlng);
+                       // open the popup on the map
+                       this._map.openPopup(this._popup, latlng);
                }
 
-               return latlngs;
-       },
-
-       // @function latLngToCoords(latlng: LatLng): Array
-       // Reverse of [`coordsToLatLng`](#geojson-coordstolatlng)
-       latLngToCoords: function (latlng) {
-               return latlng.alt !== undefined ?
-                               [latlng.lng, latlng.lat, latlng.alt] :
-                               [latlng.lng, latlng.lat];
+               return this;
        },
 
-       // @function latLngsToCoords(latlngs: Array, levelsDeep?: Number, closed?: Boolean): Array
-       // Reverse of [`coordsToLatLngs`](#geojson-coordstolatlngs)
-       // `closed` determines whether the first point should be appended to the end of the array to close the feature, only used when `levelsDeep` is 0. False by default.
-       latLngsToCoords: function (latlngs, levelsDeep, closed) {
-               var coords = [];
-
-               for (var i = 0, len = latlngs.length; i < len; i++) {
-                       coords.push(levelsDeep ?
-                               L.GeoJSON.latLngsToCoords(latlngs[i], levelsDeep - 1, closed) :
-                               L.GeoJSON.latLngToCoords(latlngs[i]));
+       // @method closePopup(): this
+       // Closes the popup bound to this layer if it is open.
+       closePopup: function () {
+               if (this._popup) {
+                       this._popup._close();
                }
+               return this;
+       },
 
-               if (!levelsDeep && closed) {
-                       coords.push(coords[0]);
+       // @method togglePopup(): this
+       // Opens or closes the popup bound to this layer depending on its current state.
+       togglePopup: function (target) {
+               if (this._popup) {
+                       if (this._popup._map) {
+                               this.closePopup();
+                       } else {
+                               this.openPopup(target);
+                       }
                }
-
-               return coords;
+               return this;
        },
 
-       getFeature: function (layer, newGeometry) {
-               return layer.feature ?
-                               L.extend({}, layer.feature, {geometry: newGeometry}) :
-                               L.GeoJSON.asFeature(newGeometry);
+       // @method isPopupOpen(): boolean
+       // Returns `true` if the popup bound to this layer is currently open.
+       isPopupOpen: function () {
+               return (this._popup ? this._popup.isOpen() : false);
        },
 
-       // @function asFeature(geojson: Object): Object
-       // Normalize GeoJSON geometries/features into GeoJSON features.
-       asFeature: function (geojson) {
-               if (geojson.type === 'Feature') {
-                       return geojson;
+       // @method setPopupContent(content: String|HTMLElement|Popup): this
+       // Sets the content of the popup bound to this layer.
+       setPopupContent: function (content) {
+               if (this._popup) {
+                       this._popup.setContent(content);
                }
+               return this;
+       },
 
-               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);
+       // @method getPopup(): Popup
+       // Returns the popup bound to this layer.
+       getPopup: function () {
+               return this._popup;
+       },
 
-// @namespace CircleMarker
-// @method toGeoJSON(): Object
-// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the circle marker (as a GeoJSON `Point` Feature).
-L.Circle.include(PointToGeoJSON);
-L.CircleMarker.include(PointToGeoJSON);
+       _openPopup: function (e) {
+               var layer = e.layer || e.target;
 
+               if (!this._popup) {
+                       return;
+               }
 
-// @namespace Polyline
-// @method toGeoJSON(): Object
-// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the polyline (as a GeoJSON `LineString` or `MultiLineString` Feature).
-L.Polyline.prototype.toGeoJSON = function () {
-       var multi = !L.Polyline._flat(this._latlngs);
+               if (!this._map) {
+                       return;
+               }
 
-       var coords = L.GeoJSON.latLngsToCoords(this._latlngs, multi ? 1 : 0);
+               // prevent map click
+               stop(e);
 
-       return L.GeoJSON.getFeature(this, {
-               type: (multi ? 'Multi' : '') + 'LineString',
-               coordinates: coords
-       });
-};
+               // if this inherits from Path its a vector and we can just
+               // open the popup at the new location
+               if (layer instanceof Path) {
+                       this.openPopup(e.layer || e.target, e.latlng);
+                       return;
+               }
 
-// @namespace Polygon
-// @method toGeoJSON(): Object
-// Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the polygon (as a GeoJSON `Polygon` or `MultiPolygon` Feature).
-L.Polygon.prototype.toGeoJSON = function () {
-       var holes = !L.Polyline._flat(this._latlngs),
-           multi = holes && !L.Polyline._flat(this._latlngs[0]);
+               // otherwise treat it like a marker and figure out
+               // if we should toggle it open/closed
+               if (this._map.hasLayer(this._popup) && this._popup._source === layer) {
+                       this.closePopup();
+               } else {
+                       this.openPopup(layer, e.latlng);
+               }
+       },
 
-       var coords = L.GeoJSON.latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true);
+       _movePopup: function (e) {
+               this._popup.setLatLng(e.latlng);
+       },
 
-       if (!holes) {
-               coords = [coords];
+       _onKeyPress: function (e) {
+               if (e.originalEvent.keyCode === 13) {
+                       this._openPopup(e);
+               }
        }
+});
 
-       return L.GeoJSON.getFeature(this, {
-               type: (multi ? 'Multi' : '') + 'Polygon',
-               coordinates: coords
-       });
-};
-
-
-// @namespace LayerGroup
-L.LayerGroup.include({
-       toMultiPoint: function () {
-               var coords = [];
-
-               this.eachLayer(function (layer) {
-                       coords.push(layer.toGeoJSON().geometry.coordinates);
-               });
-
-               return L.GeoJSON.getFeature(this, {
-                       type: 'MultiPoint',
-                       coordinates: coords
-               });
-       },
-
-       // @method toGeoJSON(): Object
-       // Returns a [`GeoJSON`](http://en.wikipedia.org/wiki/GeoJSON) representation of the layer group (as a GeoJSON `GeometryCollection`).
-       toGeoJSON: function () {
+/*
+ * @class Tooltip
+ * @inherits DivOverlay
+ * @aka L.Tooltip
+ * Used to display small texts on top of map layers.
+ *
+ * @example
+ *
+ * ```js
+ * marker.bindTooltip("my tooltip text").openTooltip();
+ * ```
+ * Note about tooltip offset. Leaflet takes two options in consideration
+ * for computing tooltip offsetting:
+ * - the `offset` Tooltip option: it defaults to [0, 0], and it's specific to one tooltip.
+ *   Add a positive x offset to move the tooltip to the right, and a positive y offset to
+ *   move it to the bottom. Negatives will move to the left and top.
+ * - the `tooltipAnchor` Icon option: this will only be considered for Marker. You
+ *   should adapt this value if you use a custom icon.
+ */
 
-               var type = this.feature && this.feature.geometry && this.feature.geometry.type;
 
-               if (type === 'MultiPoint') {
-                       return this.toMultiPoint();
-               }
+// @namespace Tooltip
+var Tooltip = DivOverlay.extend({
 
-               var isGeometryCollection = type === 'GeometryCollection',
-                   jsons = [];
+       // @section
+       // @aka Tooltip options
+       options: {
+               // @option pane: String = 'tooltipPane'
+               // `Map pane` where the tooltip will be added.
+               pane: 'tooltipPane',
 
-               this.eachLayer(function (layer) {
-                       if (layer.toGeoJSON) {
-                               var json = layer.toGeoJSON();
-                               jsons.push(isGeometryCollection ? json.geometry : L.GeoJSON.asFeature(json));
-                       }
-               });
+               // @option offset: Point = Point(0, 0)
+               // Optional offset of the tooltip position.
+               offset: [0, 0],
 
-               if (isGeometryCollection) {
-                       return L.GeoJSON.getFeature(this, {
-                               geometries: jsons,
-                               type: 'GeometryCollection'
-                       });
-               }
+               // @option direction: String = 'auto'
+               // Direction where to open the tooltip. Possible values are: `right`, `left`,
+               // `top`, `bottom`, `center`, `auto`.
+               // `auto` will dynamically switch between `right` and `left` according to the tooltip
+               // position on the map.
+               direction: 'auto',
 
-               return {
-                       type: 'FeatureCollection',
-                       features: jsons
-               };
-       }
-});
+               // @option permanent: Boolean = false
+               // Whether to open the tooltip permanently or only on mouseover.
+               permanent: false,
 
-// @namespace GeoJSON
-// @factory L.geoJSON(geojson?: Object, options?: GeoJSON options)
-// Creates a GeoJSON layer. Optionally accepts an object in
-// [GeoJSON format](http://geojson.org/geojson-spec.html) to display on the map
-// (you can alternatively add it later with `addData` method) and an `options` object.
-L.geoJSON = function (geojson, options) {
-       return new L.GeoJSON(geojson, options);
-};
-// Backward compatibility.
-L.geoJson = L.geoJSON;
+               // @option sticky: Boolean = false
+               // If true, the tooltip will follow the mouse instead of being fixed at the feature center.
+               sticky: false,
 
+               // @option interactive: Boolean = false
+               // If true, the tooltip will listen to the feature events.
+               interactive: false,
 
+               // @option opacity: Number = 0.9
+               // Tooltip container opacity.
+               opacity: 0.9
+       },
 
-/*
- * @namespace DomEvent
- * Utility functions to work with the [DOM events](https://developer.mozilla.org/docs/Web/API/Event), used by Leaflet internally.
- */
+       onAdd: function (map) {
+               DivOverlay.prototype.onAdd.call(this, map);
+               this.setOpacity(this.options.opacity);
 
-// Inspired by John Resig, Dean Edwards and YUI addEvent implementations.
+               // @namespace Map
+               // @section Tooltip events
+               // @event tooltipopen: TooltipEvent
+               // Fired when a tooltip is opened in the map.
+               map.fire('tooltipopen', {tooltip: this});
 
+               if (this._source) {
+                       // @namespace Layer
+                       // @section Tooltip events
+                       // @event tooltipopen: TooltipEvent
+                       // Fired when a tooltip bound to this layer is opened.
+                       this._source.fire('tooltipopen', {tooltip: this}, true);
+               }
+       },
 
+       onRemove: function (map) {
+               DivOverlay.prototype.onRemove.call(this, map);
 
-var eventsKey = '_leaflet_events';
+               // @namespace Map
+               // @section Tooltip events
+               // @event tooltipclose: TooltipEvent
+               // Fired when a tooltip in the map is closed.
+               map.fire('tooltipclose', {tooltip: this});
 
-L.DomEvent = {
+               if (this._source) {
+                       // @namespace Layer
+                       // @section Tooltip events
+                       // @event tooltipclose: TooltipEvent
+                       // Fired when a tooltip bound to this layer is closed.
+                       this._source.fire('tooltipclose', {tooltip: this}, true);
+               }
+       },
 
-       // @function on(el: HTMLElement, types: String, fn: Function, context?: Object): this
-       // Adds a listener function (`fn`) to a particular DOM event type of the
-       // element `el`. You can optionally specify the context of the listener
-       // (object the `this` keyword will point to). You can also pass several
-       // space-separated types (e.g. `'click dblclick'`).
+       getEvents: function () {
+               var events = DivOverlay.prototype.getEvents.call(this);
 
-       // @alternative
-       // @function on(el: HTMLElement, eventMap: Object, context?: Object): this
-       // Adds a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
-       on: function (obj, types, fn, context) {
+               if (touch && !this.options.permanent) {
+                       events.preclick = this._close;
+               }
 
-               if (typeof types === 'object') {
-                       for (var type in types) {
-                               this._on(obj, type, types[type], fn);
-                       }
-               } else {
-                       types = L.Util.splitWords(types);
+               return events;
+       },
 
-                       for (var i = 0, len = types.length; i < len; i++) {
-                               this._on(obj, types[i], fn, context);
-                       }
+       _close: function () {
+               if (this._map) {
+                       this._map.closeTooltip(this);
                }
+       },
 
-               return this;
+       _initLayout: function () {
+               var prefix = 'leaflet-tooltip',
+                   className = prefix + ' ' + (this.options.className || '') + ' leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
+
+               this._contentNode = this._container = create$1('div', className);
        },
 
-       // @function off(el: HTMLElement, types: String, fn: Function, context?: Object): this
-       // Removes a previously added listener function. If no function is specified,
-       // it will remove all the listeners of that particular DOM event from the element.
-       // Note that if you passed a custom context to on, you must pass the same
-       // context to `off` in order to remove the listener.
+       _updateLayout: function () {},
 
-       // @alternative
-       // @function off(el: HTMLElement, eventMap: Object, context?: Object): this
-       // Removes a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
-       off: function (obj, types, fn, context) {
+       _adjustPan: function () {},
 
-               if (typeof types === 'object') {
-                       for (var type in types) {
-                               this._off(obj, type, types[type], fn);
-                       }
-               } else {
-                       types = L.Util.splitWords(types);
+       _setPosition: function (pos) {
+               var map = this._map,
+                   container = this._container,
+                   centerPoint = map.latLngToContainerPoint(map.getCenter()),
+                   tooltipPoint = map.layerPointToContainerPoint(pos),
+                   direction = this.options.direction,
+                   tooltipWidth = container.offsetWidth,
+                   tooltipHeight = container.offsetHeight,
+                   offset = toPoint(this.options.offset),
+                   anchor = this._getAnchor();
 
-                       for (var i = 0, len = types.length; i < len; i++) {
-                               this._off(obj, types[i], fn, context);
-                       }
+               if (direction === 'top') {
+                       pos = pos.add(toPoint(-tooltipWidth / 2 + offset.x, -tooltipHeight + offset.y + anchor.y, true));
+               } else if (direction === 'bottom') {
+                       pos = pos.subtract(toPoint(tooltipWidth / 2 - offset.x, -offset.y, true));
+               } else if (direction === 'center') {
+                       pos = pos.subtract(toPoint(tooltipWidth / 2 + offset.x, tooltipHeight / 2 - anchor.y + offset.y, true));
+               } else if (direction === 'right' || direction === 'auto' && tooltipPoint.x < centerPoint.x) {
+                       direction = 'right';
+                       pos = pos.add(toPoint(offset.x + anchor.x, anchor.y - tooltipHeight / 2 + offset.y, true));
+               } else {
+                       direction = 'left';
+                       pos = pos.subtract(toPoint(tooltipWidth + anchor.x - offset.x, tooltipHeight / 2 - anchor.y - offset.y, true));
                }
 
-               return this;
+               removeClass(container, 'leaflet-tooltip-right');
+               removeClass(container, 'leaflet-tooltip-left');
+               removeClass(container, 'leaflet-tooltip-top');
+               removeClass(container, 'leaflet-tooltip-bottom');
+               addClass(container, 'leaflet-tooltip-' + direction);
+               setPosition(container, pos);
        },
 
-       _on: function (obj, type, fn, context) {
-               var id = type + L.stamp(fn) + (context ? '_' + L.stamp(context) : '');
-
-               if (obj[eventsKey] && obj[eventsKey][id]) { return this; }
+       _updatePosition: function () {
+               var pos = this._map.latLngToLayerPoint(this._latlng);
+               this._setPosition(pos);
+       },
 
-               var handler = function (e) {
-                       return fn.call(context || obj, e || window.event);
-               };
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
 
-               var originalHandler = handler;
+               if (this._container) {
+                       setOpacity(this._container, opacity);
+               }
+       },
 
-               if (L.Browser.pointer && type.indexOf('touch') === 0) {
-                       this.addPointerListener(obj, type, handler, id);
+       _animateZoom: function (e) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center);
+               this._setPosition(pos);
+       },
 
-               } else if (L.Browser.touch && (type === 'dblclick') && this.addDoubleTapListener) {
-                       this.addDoubleTapListener(obj, handler, id);
+       _getAnchor: function () {
+               // Where should we anchor the tooltip on the source layer?
+               return toPoint(this._source && this._source._getTooltipAnchor && !this.options.sticky ? this._source._getTooltipAnchor() : [0, 0]);
+       }
 
-               } else if ('addEventListener' in obj) {
+});
 
-                       if (type === 'mousewheel') {
-                               obj.addEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
+// @namespace Tooltip
+// @factory L.tooltip(options?: Tooltip options, source?: Layer)
+// Instantiates a Tooltip object given an optional `options` object that describes its appearance and location and an optional `source` object that is used to tag the tooltip with a reference to the Layer to which it refers.
+var tooltip = function (options, source) {
+       return new Tooltip(options, source);
+};
 
-                       } else if ((type === 'mouseenter') || (type === 'mouseleave')) {
-                               handler = function (e) {
-                                       e = e || window.event;
-                                       if (L.DomEvent._isExternalTarget(obj, e)) {
-                                               originalHandler(e);
-                                       }
-                               };
-                               obj.addEventListener(type === 'mouseenter' ? 'mouseover' : 'mouseout', handler, false);
+// @namespace Map
+// @section Methods for Layers and Controls
+Map.include({
 
-                       } else {
-                               if (type === 'click' && L.Browser.android) {
-                                       handler = function (e) {
-                                               return L.DomEvent._filterClick(e, originalHandler);
-                                       };
-                               }
-                               obj.addEventListener(type, handler, false);
-                       }
+       // @method openTooltip(tooltip: Tooltip): this
+       // Opens the specified tooltip.
+       // @alternative
+       // @method openTooltip(content: String|HTMLElement, latlng: LatLng, options?: Tooltip options): this
+       // Creates a tooltip with the specified content and options and open it.
+       openTooltip: function (tooltip, latlng, options) {
+               if (!(tooltip instanceof Tooltip)) {
+                       tooltip = new Tooltip(options).setContent(tooltip);
+               }
 
-               } else if ('attachEvent' in obj) {
-                       obj.attachEvent('on' + type, handler);
+               if (latlng) {
+                       tooltip.setLatLng(latlng);
                }
 
-               obj[eventsKey] = obj[eventsKey] || {};
-               obj[eventsKey][id] = handler;
+               if (this.hasLayer(tooltip)) {
+                       return this;
+               }
 
-               return this;
+               return this.addLayer(tooltip);
        },
 
-       _off: function (obj, type, fn, context) {
-
-               var id = type + L.stamp(fn) + (context ? '_' + L.stamp(context) : ''),
-                   handler = obj[eventsKey] && obj[eventsKey][id];
-
-               if (!handler) { return this; }
+       // @method closeTooltip(tooltip?: Tooltip): this
+       // Closes the tooltip given as parameter.
+       closeTooltip: function (tooltip) {
+               if (tooltip) {
+                       this.removeLayer(tooltip);
+               }
+               return this;
+       }
 
-               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);
+/*
+ * @namespace Layer
+ * @section Tooltip methods example
+ *
+ * All layers share a set of methods convenient for binding tooltips to it.
+ *
+ * ```js
+ * var layer = L.Polygon(latlngs).bindTooltip('Hi There!').addTo(map);
+ * layer.openTooltip();
+ * layer.closeTooltip();
+ * ```
+ */
 
-               } else if ('removeEventListener' in obj) {
+// @section Tooltip methods
+Layer.include({
 
-                       if (type === 'mousewheel') {
-                               obj.removeEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
+       // @method bindTooltip(content: String|HTMLElement|Function|Tooltip, options?: Tooltip options): this
+       // Binds a tooltip to the layer with the passed `content` and sets up the
+       // necessary event listeners. If a `Function` is passed it will receive
+       // the layer as the first argument and should return a `String` or `HTMLElement`.
+       bindTooltip: function (content, options) {
 
-                       } else {
-                               obj.removeEventListener(
-                                       type === 'mouseenter' ? 'mouseover' :
-                                       type === 'mouseleave' ? 'mouseout' : type, handler, false);
+               if (content instanceof Tooltip) {
+                       setOptions(content, options);
+                       this._tooltip = content;
+                       content._source = this;
+               } else {
+                       if (!this._tooltip || options) {
+                               this._tooltip = new Tooltip(options, this);
                        }
+                       this._tooltip.setContent(content);
 
-               } else if ('detachEvent' in obj) {
-                       obj.detachEvent('on' + type, handler);
                }
 
-               obj[eventsKey][id] = null;
-
-               return this;
-       },
-
-       // @function stopPropagation(ev: DOMEvent): this
-       // Stop the given event from propagation to parent elements. Used inside the listener functions:
-       // ```js
-       // L.DomEvent.on(div, 'click', function (ev) {
-       //      L.DomEvent.stopPropagation(ev);
-       // });
-       // ```
-       stopPropagation: function (e) {
+               this._initTooltipInteractions();
 
-               if (e.stopPropagation) {
-                       e.stopPropagation();
-               } else if (e.originalEvent) {  // In case of Leaflet event.
-                       e.originalEvent._stopped = true;
-               } else {
-                       e.cancelBubble = true;
+               if (this._tooltip.options.permanent && this._map && this._map.hasLayer(this)) {
+                       this.openTooltip();
                }
-               L.DomEvent._skipped(e);
 
                return this;
        },
 
-       // @function disableScrollPropagation(el: HTMLElement): this
-       // Adds `stopPropagation` to the element's `'mousewheel'` events (plus browser variants).
-       disableScrollPropagation: function (el) {
-               return L.DomEvent.on(el, 'mousewheel', L.DomEvent.stopPropagation);
-       },
-
-       // @function disableClickPropagation(el: HTMLElement): this
-       // Adds `stopPropagation` to the element's `'click'`, `'doubleclick'`,
-       // `'mousedown'` and `'touchstart'` events (plus browser variants).
-       disableClickPropagation: function (el) {
-               var stop = L.DomEvent.stopPropagation;
-
-               L.DomEvent.on(el, L.Draggable.START.join(' '), stop);
-
-               return L.DomEvent.on(el, {
-                       click: L.DomEvent._fakeStop,
-                       dblclick: stop
-               });
+       // @method unbindTooltip(): this
+       // Removes the tooltip previously bound with `bindTooltip`.
+       unbindTooltip: function () {
+               if (this._tooltip) {
+                       this._initTooltipInteractions(true);
+                       this.closeTooltip();
+                       this._tooltip = null;
+               }
+               return this;
        },
 
-       // @function preventDefault(ev: DOMEvent): this
-       // Prevents the default action of the DOM Event `ev` from happening (such as
-       // following a link in the href of the a element, or doing a POST request
-       // with page reload when a `<form>` is submitted).
-       // Use it inside listener functions.
-       preventDefault: function (e) {
-
-               if (e.preventDefault) {
-                       e.preventDefault();
+       _initTooltipInteractions: function (remove$$1) {
+               if (!remove$$1 && this._tooltipHandlersAdded) { return; }
+               var onOff = remove$$1 ? 'off' : 'on',
+                   events = {
+                       remove: this.closeTooltip,
+                       move: this._moveTooltip
+                   };
+               if (!this._tooltip.options.permanent) {
+                       events.mouseover = this._openTooltip;
+                       events.mouseout = this.closeTooltip;
+                       if (this._tooltip.options.sticky) {
+                               events.mousemove = this._moveTooltip;
+                       }
+                       if (touch) {
+                               events.click = this._openTooltip;
+                       }
                } else {
-                       e.returnValue = false;
+                       events.add = this._openTooltip;
                }
-               return this;
+               this[onOff](events);
+               this._tooltipHandlersAdded = !remove$$1;
        },
 
-       // @function stop(ev): this
-       // Does `stopPropagation` and `preventDefault` at the same time.
-       stop: function (e) {
-               return L.DomEvent
-                       .preventDefault(e)
-                       .stopPropagation(e);
-       },
+       // @method openTooltip(latlng?: LatLng): this
+       // Opens the bound tooltip at the specified `latlng` or at the default tooltip anchor if no `latlng` is passed.
+       openTooltip: function (layer, latlng) {
+               if (this._tooltip && this._map) {
+                       latlng = this._tooltip._prepareOpen(this, layer, latlng);
 
-       // @function getMousePosition(ev: DOMEvent, container?: HTMLElement): Point
-       // Gets normalized mouse position from a DOM event relative to the
-       // `container` or to the whole page if not specified.
-       getMousePosition: function (e, container) {
-               if (!container) {
-                       return new L.Point(e.clientX, e.clientY);
-               }
+                       // open the tooltip on the map
+                       this._map.openTooltip(this._tooltip, latlng);
 
-               var rect = container.getBoundingClientRect();
+                       // Tooltip container may not be defined if not permanent and never
+                       // opened.
+                       if (this._tooltip.options.interactive && this._tooltip._container) {
+                               addClass(this._tooltip._container, 'leaflet-clickable');
+                               this.addInteractiveTarget(this._tooltip._container);
+                       }
+               }
 
-               return new L.Point(
-                       e.clientX - rect.left - container.clientLeft,
-                       e.clientY - rect.top - container.clientTop);
+               return this;
        },
 
-       // Chrome on Win scrolls double the pixels as in other platforms (see #4538),
-       // and Firefox scrolls device pixels, not CSS pixels
-       _wheelPxFactor: (L.Browser.win && L.Browser.chrome) ? 2 :
-                       L.Browser.gecko ? window.devicePixelRatio :
-                       1,
-
-       // @function getWheelDelta(ev: DOMEvent): Number
-       // Gets normalized wheel delta from a mousewheel DOM event, in vertical
-       // pixels scrolled (negative if scrolling down).
-       // Events from pointing devices without precise scrolling are mapped to
-       // a best guess of 60 pixels.
-       getWheelDelta: function (e) {
-               return (L.Browser.edge) ? e.wheelDeltaY / 2 : // Don't trust window-geometry-based delta
-                      (e.deltaY && e.deltaMode === 0) ? -e.deltaY / L.DomEvent._wheelPxFactor : // Pixels
-                      (e.deltaY && e.deltaMode === 1) ? -e.deltaY * 20 : // Lines
-                      (e.deltaY && e.deltaMode === 2) ? -e.deltaY * 60 : // Pages
-                      (e.deltaX || e.deltaZ) ? 0 :     // Skip horizontal/depth wheel events
-                      e.wheelDelta ? (e.wheelDeltaY || e.wheelDelta) / 2 : // Legacy IE pixels
-                      (e.detail && Math.abs(e.detail) < 32765) ? -e.detail * 20 : // Legacy Moz lines
-                      e.detail ? e.detail / -32765 * 60 : // Legacy Moz pages
-                      0;
+       // @method closeTooltip(): this
+       // Closes the tooltip bound to this layer if it is open.
+       closeTooltip: function () {
+               if (this._tooltip) {
+                       this._tooltip._close();
+                       if (this._tooltip.options.interactive && this._tooltip._container) {
+                               removeClass(this._tooltip._container, 'leaflet-clickable');
+                               this.removeInteractiveTarget(this._tooltip._container);
+                       }
+               }
+               return this;
        },
 
-       _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;
+       // @method toggleTooltip(): this
+       // Opens or closes the tooltip bound to this layer depending on its current state.
+       toggleTooltip: function (target) {
+               if (this._tooltip) {
+                       if (this._tooltip._map) {
+                               this.closeTooltip();
+                       } else {
+                               this.openTooltip(target);
+                       }
+               }
+               return this;
        },
 
-       _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;
+       // @method isTooltipOpen(): boolean
+       // Returns `true` if the tooltip bound to this layer is currently open.
+       isTooltipOpen: function () {
+               return this._tooltip.isOpen();
        },
 
-       // check if element really left/entered the event target (for mouseenter/mouseleave)
-       _isExternalTarget: function (el, e) {
-
-               var related = e.relatedTarget;
-
-               if (!related) { return true; }
-
-               try {
-                       while (related && (related !== el)) {
-                               related = related.parentNode;
-                       }
-               } catch (err) {
-                       return false;
+       // @method setTooltipContent(content: String|HTMLElement|Tooltip): this
+       // Sets the content of the tooltip bound to this layer.
+       setTooltipContent: function (content) {
+               if (this._tooltip) {
+                       this._tooltip.setContent(content);
                }
-               return (related !== el);
+               return this;
        },
 
-       // 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 && e.originalEvent.timeStamp)),
-                   elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick);
+       // @method getTooltip(): Tooltip
+       // Returns the tooltip bound to this layer.
+       getTooltip: function () {
+               return this._tooltip;
+       },
 
-               // are they closer together than 500ms 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
+       _openTooltip: function (e) {
+               var layer = e.layer || e.target;
 
-               if ((elapsed && elapsed > 100 && elapsed < 500) || (e.target._simulatedClick && !e._simulated)) {
-                       L.DomEvent.stop(e);
+               if (!this._tooltip || !this._map) {
                        return;
                }
-               L.DomEvent._lastClick = timeStamp;
+               this.openTooltip(layer, this._tooltip.options.sticky ? e.latlng : undefined);
+       },
 
-               handler(e);
+       _moveTooltip: function (e) {
+               var latlng = e.latlng, containerPoint, layerPoint;
+               if (this._tooltip.options.sticky && e.originalEvent) {
+                       containerPoint = this._map.mouseEventToContainerPoint(e.originalEvent);
+                       layerPoint = this._map.containerPointToLayerPoint(containerPoint);
+                       latlng = this._map.layerPointToLatLng(layerPoint);
+               }
+               this._tooltip.setLatLng(latlng);
        }
-};
-
-// @function addListener(…): this
-// Alias to [`L.DomEvent.on`](#domevent-on)
-L.DomEvent.addListener = L.DomEvent.on;
-
-// @function removeListener(…): this
-// Alias to [`L.DomEvent.off`](#domevent-off)
-L.DomEvent.removeListener = L.DomEvent.off;
-
-
+});
 
 /*
- * @class Draggable
- * @aka L.Draggable
- * @inherits Evented
+ * @class DivIcon
+ * @aka L.DivIcon
+ * @inherits Icon
  *
- * A class for making DOM elements draggable (including touch support).
- * Used internally for map and marker dragging. Only works for elements
- * that were positioned with [`L.DomUtil.setPosition`](#domutil-setposition).
+ * Represents a lightweight icon for markers that uses a simple `<div>`
+ * element instead of an image. Inherits from `Icon` but ignores the `iconUrl` and shadow options.
  *
  * @example
  * ```js
- * var draggable = new L.Draggable(elementToDrag);
- * draggable.enable();
+ * var myIcon = L.divIcon({className: 'my-div-icon'});
+ * // you can set .my-div-icon styles in CSS
+ *
+ * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);
  * ```
+ *
+ * By default, it has a 'leaflet-div-icon' CSS class and is styled as a little white square with a shadow.
  */
 
-L.Draggable = L.Evented.extend({
-
+var DivIcon = Icon.extend({
        options: {
-               // @option clickTolerance: Number = 3
-               // The max number of pixels a user can shift the mouse pointer during a click
-               // for it to be considered a valid click (as opposed to a mouse drag).
-               clickTolerance: 3
-       },
-
-       statics: {
-               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'
-               }
-       },
-
-       // @constructor L.Draggable(el: HTMLElement, dragHandle?: HTMLElement, preventOutline: Boolean)
-       // Creates a `Draggable` object for moving `el` when you start dragging the `dragHandle` element (equals `el` itself by default).
-       initialize: function (element, dragStartTarget, preventOutline) {
-               this._element = element;
-               this._dragStartTarget = dragStartTarget || element;
-               this._preventOutline = preventOutline;
-       },
-
-       // @method enable()
-       // Enables the dragging ability
-       enable: function () {
-               if (this._enabled) { return; }
-
-               L.DomEvent.on(this._dragStartTarget, L.Draggable.START.join(' '), this._onDown, this);
+               // @section
+               // @aka DivIcon options
+               iconSize: [12, 12], // also can be set through CSS
 
-               this._enabled = true;
-       },
+               // iconAnchor: (Point),
+               // popupAnchor: (Point),
 
-       // @method disable()
-       // Disables the dragging ability
-       disable: function () {
-               if (!this._enabled) { return; }
+               // @option html: String|HTMLElement = ''
+               // Custom HTML code to put inside the div element, empty by default. Alternatively,
+               // an instance of `HTMLElement`.
+               html: false,
 
-               L.DomEvent.off(this._dragStartTarget, L.Draggable.START.join(' '), this._onDown, this);
+               // @option bgPos: Point = [0, 0]
+               // Optional relative position of the background, in pixels
+               bgPos: null,
 
-               this._enabled = false;
-               this._moved = false;
+               className: 'leaflet-div-icon'
        },
 
-       _onDown: function (e) {
-               // Ignore simulated events, since we handle both touch and
-               // mouse explicitly; otherwise we risk getting duplicates of
-               // touch events, see #4315.
-               // Also ignore the event if disabled; this happens in IE11
-               // under some circumstances, see #3666.
-               if (e._simulated || !this._enabled) { return; }
-
-               this._moved = false;
-
-               if (L.DomUtil.hasClass(this._element, 'leaflet-zoom-anim')) { return; }
-
-               if (L.Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches) || !this._enabled) { return; }
-               L.Draggable._dragging = true;  // Prevent dragging multiple objects at once.
+       createIcon: function (oldIcon) {
+               var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
+                   options = this.options;
 
-               if (this._preventOutline) {
-                       L.DomUtil.preventOutline(this._element);
+               if (options.html instanceof Element) {
+                       empty(div);
+                       div.appendChild(options.html);
+               } else {
+                       div.innerHTML = options.html !== false ? options.html : '';
                }
 
-               L.DomUtil.disableImageDrag();
-               L.DomUtil.disableTextSelection();
-
-               if (this._moving) { return; }
-
-               // @event down: Event
-               // Fired when a drag is about to start.
-               this.fire('down');
-
-               var first = e.touches ? e.touches[0] : e;
-
-               this._startPoint = new L.Point(first.clientX, first.clientY);
-
-               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) {
-               // Ignore simulated events, since we handle both touch and
-               // mouse explicitly; otherwise we risk getting duplicates of
-               // touch events, see #4315.
-               // Also ignore the event if disabled; this happens in IE11
-               // under some circumstances, see #3666.
-               if (e._simulated || !this._enabled) { return; }
-
-               if (e.touches && e.touches.length > 1) {
-                       this._moved = true;
-                       return;
+               if (options.bgPos) {
+                       var bgPos = toPoint(options.bgPos);
+                       div.style.backgroundPosition = (-bgPos.x) + 'px ' + (-bgPos.y) + 'px';
                }
+               this._setIconStyles(div, 'icon');
 
-               var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
-                   newPoint = new L.Point(first.clientX, first.clientY),
-                   offset = newPoint.subtract(this._startPoint);
-
-               if (!offset.x && !offset.y) { return; }
-               if (Math.abs(offset.x) + Math.abs(offset.y) < this.options.clickTolerance) { return; }
-
-               L.DomEvent.preventDefault(e);
-
-               if (!this._moved) {
-                       // @event dragstart: Event
-                       // Fired when a drag starts
-                       this.fire('dragstart');
-
-                       this._moved = true;
-                       this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);
-
-                       L.DomUtil.addClass(document.body, 'leaflet-dragging');
+               return div;
+       },
 
-                       this._lastTarget = e.target || e.srcElement;
-                       // IE and Edge do not give the <use> element, so fetch it
-                       // if necessary
-                       if ((window.SVGElementInstance) && (this._lastTarget instanceof SVGElementInstance)) {
-                               this._lastTarget = this._lastTarget.correspondingUseElement;
-                       }
-                       L.DomUtil.addClass(this._lastTarget, 'leaflet-drag-target');
-               }
+       createShadow: function () {
+               return null;
+       }
+});
 
-               this._newPos = this._startPos.add(offset);
-               this._moving = true;
+// @factory L.divIcon(options: DivIcon options)
+// Creates a `DivIcon` instance with the given options.
+function divIcon(options) {
+       return new DivIcon(options);
+}
 
-               L.Util.cancelAnimFrame(this._animRequest);
-               this._lastEvent = e;
-               this._animRequest = L.Util.requestAnimFrame(this._updatePosition, this, true);
-       },
+Icon.Default = IconDefault;
 
-       _updatePosition: function () {
-               var e = {originalEvent: this._lastEvent};
+/*
+ * @class GridLayer
+ * @inherits Layer
+ * @aka L.GridLayer
+ *
+ * Generic class for handling a tiled grid of HTML elements. This is the base class for all tile layers and replaces `TileLayer.Canvas`.
+ * GridLayer can be extended to create a tiled grid of HTML elements like `<canvas>`, `<img>` or `<div>`. GridLayer will handle creating and animating these DOM elements for you.
+ *
+ *
+ * @section Synchronous usage
+ * @example
+ *
+ * To create a custom layer, extend GridLayer and implement the `createTile()` method, which will be passed a `Point` object with the `x`, `y`, and `z` (zoom level) coordinates to draw your tile.
+ *
+ * ```js
+ * var CanvasLayer = L.GridLayer.extend({
+ *     createTile: function(coords){
+ *         // create a <canvas> element for drawing
+ *         var tile = L.DomUtil.create('canvas', 'leaflet-tile');
+ *
+ *         // setup tile width and height according to the options
+ *         var size = this.getTileSize();
+ *         tile.width = size.x;
+ *         tile.height = size.y;
+ *
+ *         // get a canvas context and draw something on it using coords.x, coords.y and coords.z
+ *         var ctx = tile.getContext('2d');
+ *
+ *         // return the tile so it can be rendered on screen
+ *         return tile;
+ *     }
+ * });
+ * ```
+ *
+ * @section Asynchronous usage
+ * @example
+ *
+ * Tile creation can also be asynchronous, this is useful when using a third-party drawing library. Once the tile is finished drawing it can be passed to the `done()` callback.
+ *
+ * ```js
+ * var CanvasLayer = L.GridLayer.extend({
+ *     createTile: function(coords, done){
+ *         var error;
+ *
+ *         // create a <canvas> element for drawing
+ *         var tile = L.DomUtil.create('canvas', 'leaflet-tile');
+ *
+ *         // setup tile width and height according to the options
+ *         var size = this.getTileSize();
+ *         tile.width = size.x;
+ *         tile.height = size.y;
+ *
+ *         // draw something asynchronously and pass the tile to the done() callback
+ *         setTimeout(function() {
+ *             done(error, tile);
+ *         }, 1000);
+ *
+ *         return tile;
+ *     }
+ * });
+ * ```
+ *
+ * @section
+ */
 
-               // @event predrag: Event
-               // Fired continuously during dragging *before* each corresponding
-               // update of the element's position.
-               this.fire('predrag', e);
-               L.DomUtil.setPosition(this._element, this._newPos);
 
-               // @event drag: Event
-               // Fired continuously during dragging.
-               this.fire('drag', e);
-       },
+var GridLayer = Layer.extend({
 
-       _onUp: function (e) {
-               // Ignore simulated events, since we handle both touch and
-               // mouse explicitly; otherwise we risk getting duplicates of
-               // touch events, see #4315.
-               // Also ignore the event if disabled; this happens in IE11
-               // under some circumstances, see #3666.
-               if (e._simulated || !this._enabled) { return; }
+       // @section
+       // @aka GridLayer options
+       options: {
+               // @option tileSize: Number|Point = 256
+               // Width and height of tiles in the grid. Use a number if width and height are equal, or `L.point(width, height)` otherwise.
+               tileSize: 256,
 
-               L.DomUtil.removeClass(document.body, 'leaflet-dragging');
+               // @option opacity: Number = 1.0
+               // Opacity of the tiles. Can be used in the `createTile()` function.
+               opacity: 1,
 
-               if (this._lastTarget) {
-                       L.DomUtil.removeClass(this._lastTarget, 'leaflet-drag-target');
-                       this._lastTarget = null;
-               }
+               // @option updateWhenIdle: Boolean = (depends)
+               // Load new tiles only when panning ends.
+               // `true` by default on mobile browsers, in order to avoid too many requests and keep smooth navigation.
+               // `false` otherwise in order to display new tiles _during_ panning, since it is easy to pan outside the
+               // [`keepBuffer`](#gridlayer-keepbuffer) option in desktop browsers.
+               updateWhenIdle: mobile,
 
-               for (var i in L.Draggable.MOVE) {
-                       L.DomEvent
-                               .off(document, L.Draggable.MOVE[i], this._onMove, this)
-                               .off(document, L.Draggable.END[i], this._onUp, this);
-               }
+               // @option updateWhenZooming: Boolean = true
+               // By default, a smooth zoom animation (during a [touch zoom](#map-touchzoom) or a [`flyTo()`](#map-flyto)) will update grid layers every integer zoom level. Setting this option to `false` will update the grid layer only when the smooth animation ends.
+               updateWhenZooming: true,
 
-               L.DomUtil.enableImageDrag();
-               L.DomUtil.enableTextSelection();
+               // @option updateInterval: Number = 200
+               // Tiles will not update more than once every `updateInterval` milliseconds when panning.
+               updateInterval: 200,
 
-               if (this._moved && this._moving) {
-                       // ensure drag is not fired after dragend
-                       L.Util.cancelAnimFrame(this._animRequest);
+               // @option zIndex: Number = 1
+               // The explicit zIndex of the tile layer.
+               zIndex: 1,
 
-                       // @event dragend: DragEndEvent
-                       // Fired when the drag ends.
-                       this.fire('dragend', {
-                               distance: this._newPos.distanceTo(this._startPos)
-                       });
-               }
+               // @option bounds: LatLngBounds = undefined
+               // If set, tiles will only be loaded inside the set `LatLngBounds`.
+               bounds: null,
 
-               this._moving = false;
-               L.Draggable._dragging = false;
-       }
-});
+               // @option minZoom: Number = 0
+               // The minimum zoom level down to which this layer will be displayed (inclusive).
+               minZoom: 0,
 
+               // @option maxZoom: Number = undefined
+               // The maximum zoom level up to which this layer will be displayed (inclusive).
+               maxZoom: undefined,
 
+               // @option maxNativeZoom: Number = undefined
+               // Maximum zoom number the tile source has available. If it is specified,
+               // the tiles on all zoom levels higher than `maxNativeZoom` will be loaded
+               // from `maxNativeZoom` level and auto-scaled.
+               maxNativeZoom: undefined,
 
-/*
-       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.
-*/
+               // @option minNativeZoom: Number = undefined
+               // Minimum zoom number the tile source has available. If it is specified,
+               // the tiles on all zoom levels lower than `minNativeZoom` will be loaded
+               // from `minNativeZoom` level and auto-scaled.
+               minNativeZoom: undefined,
 
-// @class Handler
-// @aka L.Handler
-// Abstract class for map interaction handlers
+               // @option noWrap: Boolean = false
+               // Whether the layer is wrapped around the antimeridian. If `true`, the
+               // GridLayer will only be displayed once at low zoom levels. Has no
+               // effect when the [map CRS](#map-crs) doesn't wrap around. Can be used
+               // in combination with [`bounds`](#gridlayer-bounds) to prevent requesting
+               // tiles outside the CRS limits.
+               noWrap: false,
 
-L.Handler = L.Class.extend({
-       initialize: function (map) {
-               this._map = map;
-       },
+               // @option pane: String = 'tilePane'
+               // `Map pane` where the grid layer will be added.
+               pane: 'tilePane',
 
-       // @method enable(): this
-       // Enables the handler
-       enable: function () {
-               if (this._enabled) { return this; }
+               // @option className: String = ''
+               // A custom class name to assign to the tile layer. Empty by default.
+               className: '',
 
-               this._enabled = true;
-               this.addHooks();
-               return this;
+               // @option keepBuffer: Number = 2
+               // When panning the map, keep this many rows and columns of tiles before unloading them.
+               keepBuffer: 2
        },
 
-       // @method disable(): this
-       // Disables the handler
-       disable: function () {
-               if (!this._enabled) { return this; }
-
-               this._enabled = false;
-               this.removeHooks();
-               return this;
+       initialize: function (options) {
+               setOptions(this, options);
        },
 
-       // @method enabled(): Boolean
-       // Returns `true` if the handler is enabled
-       enabled: function () {
-               return !!this._enabled;
-       }
+       onAdd: function () {
+               this._initContainer();
 
-       // @section Extension methods
-       // Classes inheriting from `Handler` must implement the two following methods:
-       // @method addHooks()
-       // Called when the handler is enabled, should add event hooks.
-       // @method removeHooks()
-       // Called when the handler is disabled, should remove the event hooks added previously.
-});
+               this._levels = {};
+               this._tiles = {};
 
+               this._resetView();
+               this._update();
+       },
 
+       beforeAdd: function (map) {
+               map._addZoomLimit(this);
+       },
 
-/*
- * L.Handler.MapDrag is used to make the map draggable (with panning inertia), enabled by default.
- */
+       onRemove: function (map) {
+               this._removeAllTiles();
+               remove(this._container);
+               map._removeZoomLimit(this);
+               this._container = null;
+               this._tileZoom = undefined;
+       },
 
-// @namespace Map
-// @section Interaction Options
-L.Map.mergeOptions({
-       // @option dragging: Boolean = true
-       // Whether the map be draggable with mouse/touch or not.
-       dragging: true,
+       // @method bringToFront: this
+       // Brings the tile layer to the top of all tile layers.
+       bringToFront: function () {
+               if (this._map) {
+                       toFront(this._container);
+                       this._setAutoZIndex(Math.max);
+               }
+               return this;
+       },
 
-       // @section Panning Inertia Options
-       // @option inertia: Boolean = *
-       // If enabled, panning of the map will have an inertia effect where
-       // the map builds momentum while dragging and continues moving in
-       // the same direction for some time. Feels especially nice on touch
-       // devices. Enabled by default unless running on old Android devices.
-       inertia: !L.Browser.android23,
+       // @method bringToBack: this
+       // Brings the tile layer to the bottom of all tile layers.
+       bringToBack: function () {
+               if (this._map) {
+                       toBack(this._container);
+                       this._setAutoZIndex(Math.min);
+               }
+               return this;
+       },
 
-       // @option inertiaDeceleration: Number = 3000
-       // The rate with which the inertial movement slows down, in pixels/second².
-       inertiaDeceleration: 3400, // px/s^2
+       // @method getContainer: HTMLElement
+       // Returns the HTML element that contains the tiles for this layer.
+       getContainer: function () {
+               return this._container;
+       },
 
-       // @option inertiaMaxSpeed: Number = Infinity
-       // Max speed of the inertial movement, in pixels/second.
-       inertiaMaxSpeed: Infinity, // px/s
+       // @method setOpacity(opacity: Number): this
+       // Changes the [opacity](#gridlayer-opacity) of the grid layer.
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
+               this._updateOpacity();
+               return this;
+       },
 
-       // @option easeLinearity: Number = 0.2
-       easeLinearity: 0.2,
+       // @method setZIndex(zIndex: Number): this
+       // Changes the [zIndex](#gridlayer-zindex) of the grid layer.
+       setZIndex: function (zIndex) {
+               this.options.zIndex = zIndex;
+               this._updateZIndex();
 
-       // TODO refactor, move to CRS
-       // @option worldCopyJump: Boolean = false
-       // With this option enabled, the map tracks when you pan to another "copy"
-       // of the world and seamlessly jumps to the original one so that all overlays
-       // like markers and vector layers are still visible.
-       worldCopyJump: false,
+               return this;
+       },
 
-       // @option maxBoundsViscosity: Number = 0.0
-       // If `maxBounds` is set, this option will control how solid the bounds
-       // are when dragging the map around. The default value of `0.0` allows the
-       // user to drag outside the bounds at normal speed, higher values will
-       // slow down map dragging outside bounds, and `1.0` makes the bounds fully
-       // solid, preventing the user from dragging outside the bounds.
-       maxBoundsViscosity: 0.0
-});
+       // @method isLoading: Boolean
+       // Returns `true` if any tile in the grid layer has not finished loading.
+       isLoading: function () {
+               return this._loading;
+       },
 
-L.Map.Drag = L.Handler.extend({
-       addHooks: function () {
-               if (!this._draggable) {
-                       var map = this._map;
+       // @method redraw: this
+       // Causes the layer to clear all the tiles and request them again.
+       redraw: function () {
+               if (this._map) {
+                       this._removeAllTiles();
+                       this._update();
+               }
+               return this;
+       },
 
-                       this._draggable = new L.Draggable(map._mapPane, map._container);
+       getEvents: function () {
+               var events = {
+                       viewprereset: this._invalidateAll,
+                       viewreset: this._resetView,
+                       zoom: this._resetView,
+                       moveend: this._onMoveEnd
+               };
 
-                       this._draggable.on({
-                               down: this._onDown,
-                               dragstart: this._onDragStart,
-                               drag: this._onDrag,
-                               dragend: this._onDragEnd
-                       }, this);
+               if (!this.options.updateWhenIdle) {
+                       // update tiles on move, but not more often than once per given interval
+                       if (!this._onMove) {
+                               this._onMove = throttle(this._onMoveEnd, this.options.updateInterval, this);
+                       }
 
-                       this._draggable.on('predrag', this._onPreDragLimit, this);
-                       if (map.options.worldCopyJump) {
-                               this._draggable.on('predrag', this._onPreDragWrap, this);
-                               map.on('zoomend', this._onZoomEnd, this);
+                       events.move = this._onMove;
+               }
 
-                               map.whenReady(this._onZoomEnd, this);
-                       }
+               if (this._zoomAnimated) {
+                       events.zoomanim = this._animateZoom;
                }
-               L.DomUtil.addClass(this._map._container, 'leaflet-grab leaflet-touch-drag');
-               this._draggable.enable();
-               this._positions = [];
-               this._times = [];
-       },
 
-       removeHooks: function () {
-               L.DomUtil.removeClass(this._map._container, 'leaflet-grab');
-               L.DomUtil.removeClass(this._map._container, 'leaflet-touch-drag');
-               this._draggable.disable();
+               return events;
        },
 
-       moved: function () {
-               return this._draggable && this._draggable._moved;
+       // @section Extension methods
+       // Layers extending `GridLayer` shall reimplement the following method.
+       // @method createTile(coords: Object, done?: Function): HTMLElement
+       // Called only internally, must be overridden by classes extending `GridLayer`.
+       // Returns the `HTMLElement` corresponding to the given `coords`. If the `done` callback
+       // is specified, it must be called when the tile has finished loading and drawing.
+       createTile: function () {
+               return document.createElement('div');
        },
 
-       moving: function () {
-               return this._draggable && this._draggable._moving;
+       // @section
+       // @method getTileSize: Point
+       // Normalizes the [tileSize option](#gridlayer-tilesize) into a point. Used by the `createTile()` method.
+       getTileSize: function () {
+               var s = this.options.tileSize;
+               return s instanceof Point ? s : new Point(s, s);
        },
 
-       _onDown: function () {
-               this._map._stop();
+       _updateZIndex: function () {
+               if (this._container && this.options.zIndex !== undefined && this.options.zIndex !== null) {
+                       this._container.style.zIndex = this.options.zIndex;
+               }
        },
 
-       _onDragStart: function () {
-               var map = this._map;
+       _setAutoZIndex: function (compare) {
+               // go through all other layers of the same pane, set zIndex to max + 1 (front) or min - 1 (back)
 
-               if (this._map.options.maxBounds && this._map.options.maxBoundsViscosity) {
-                       var bounds = L.latLngBounds(this._map.options.maxBounds);
+               var layers = this.getPane().children,
+                   edgeZIndex = -compare(-Infinity, Infinity); // -Infinity for max, Infinity for min
 
-                       this._offsetLimit = L.bounds(
-                               this._map.latLngToContainerPoint(bounds.getNorthWest()).multiplyBy(-1),
-                               this._map.latLngToContainerPoint(bounds.getSouthEast()).multiplyBy(-1)
-                                       .add(this._map.getSize()));
+               for (var i = 0, len = layers.length, zIndex; i < len; i++) {
 
-                       this._viscosity = Math.min(1.0, Math.max(0.0, this._map.options.maxBoundsViscosity));
-               } else {
-                       this._offsetLimit = null;
-               }
+                       zIndex = layers[i].style.zIndex;
 
-               map
-                   .fire('movestart')
-                   .fire('dragstart');
+                       if (layers[i] !== this._container && zIndex) {
+                               edgeZIndex = compare(edgeZIndex, +zIndex);
+                       }
+               }
 
-               if (map.options.inertia) {
-                       this._positions = [];
-                       this._times = [];
+               if (isFinite(edgeZIndex)) {
+                       this.options.zIndex = edgeZIndex + compare(-1, 1);
+                       this._updateZIndex();
                }
        },
 
-       _onDrag: function (e) {
-               if (this._map.options.inertia) {
-                       var time = this._lastTime = +new Date(),
-                           pos = this._lastPos = this._draggable._absPos || this._draggable._newPos;
+       _updateOpacity: function () {
+               if (!this._map) { return; }
 
-                       this._positions.push(pos);
-                       this._times.push(time);
+               // IE doesn't inherit filter opacity properly, so we're forced to set it on tiles
+               if (ielt9) { return; }
 
-                       if (time - this._times[0] > 50) {
-                               this._positions.shift();
-                               this._times.shift();
+               setOpacity(this._container, this.options.opacity);
+
+               var now = +new Date(),
+                   nextFrame = false,
+                   willPrune = false;
+
+               for (var key in this._tiles) {
+                       var tile = this._tiles[key];
+                       if (!tile.current || !tile.loaded) { continue; }
+
+                       var fade = Math.min(1, (now - tile.loaded) / 200);
+
+                       setOpacity(tile.el, fade);
+                       if (fade < 1) {
+                               nextFrame = true;
+                       } else {
+                               if (tile.active) {
+                                       willPrune = true;
+                               } else {
+                                       this._onOpaqueTile(tile);
+                               }
+                               tile.active = true;
                        }
                }
 
-               this._map
-                   .fire('move', e)
-                   .fire('drag', e);
-       },
-
-       _onZoomEnd: function () {
-               var pxCenter = this._map.getSize().divideBy(2),
-                   pxWorldCenter = this._map.latLngToLayerPoint([0, 0]);
+               if (willPrune && !this._noPrune) { this._pruneTiles(); }
 
-               this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
-               this._worldWidth = this._map.getPixelWorldBounds().getSize().x;
+               if (nextFrame) {
+                       cancelAnimFrame(this._fadeFrame);
+                       this._fadeFrame = requestAnimFrame(this._updateOpacity, this);
+               }
        },
 
-       _viscousLimit: function (value, threshold) {
-               return value - (value - threshold) * this._viscosity;
-       },
+       _onOpaqueTile: falseFn,
 
-       _onPreDragLimit: function () {
-               if (!this._viscosity || !this._offsetLimit) { return; }
+       _initContainer: function () {
+               if (this._container) { return; }
 
-               var offset = this._draggable._newPos.subtract(this._draggable._startPos);
+               this._container = create$1('div', 'leaflet-layer ' + (this.options.className || ''));
+               this._updateZIndex();
 
-               var limit = this._offsetLimit;
-               if (offset.x < limit.min.x) { offset.x = this._viscousLimit(offset.x, limit.min.x); }
-               if (offset.y < limit.min.y) { offset.y = this._viscousLimit(offset.y, limit.min.y); }
-               if (offset.x > limit.max.x) { offset.x = this._viscousLimit(offset.x, limit.max.x); }
-               if (offset.y > limit.max.y) { offset.y = this._viscousLimit(offset.y, limit.max.y); }
+               if (this.options.opacity < 1) {
+                       this._updateOpacity();
+               }
 
-               this._draggable._newPos = this._draggable._startPos.add(offset);
+               this.getPane().appendChild(this._container);
        },
 
-       _onPreDragWrap: function () {
-               // TODO refactor to be able to adjust map pane position after zoom
-               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;
+       _updateLevels: function () {
 
-               this._draggable._absPos = this._draggable._newPos.clone();
-               this._draggable._newPos.x = newX;
-       },
+               var zoom = this._tileZoom,
+                   maxZoom = this.options.maxZoom;
 
-       _onDragEnd: function (e) {
-               var map = this._map,
-                   options = map.options,
+               if (zoom === undefined) { return undefined; }
 
-                   noInertia = !options.inertia || this._times.length < 2;
+               for (var z in this._levels) {
+                       if (this._levels[z].el.children.length || z === zoom) {
+                               this._levels[z].el.style.zIndex = maxZoom - Math.abs(zoom - z);
+                               this._onUpdateLevel(z);
+                       } else {
+                               remove(this._levels[z].el);
+                               this._removeTilesAtZoom(z);
+                               this._onRemoveLevel(z);
+                               delete this._levels[z];
+                       }
+               }
 
-               map.fire('dragend', e);
+               var level = this._levels[zoom],
+                   map = this._map;
 
-               if (noInertia) {
-                       map.fire('moveend');
+               if (!level) {
+                       level = this._levels[zoom] = {};
 
-               } else {
+                       level.el = create$1('div', 'leaflet-tile-container leaflet-zoom-animated', this._container);
+                       level.el.style.zIndex = maxZoom;
 
-                       var direction = this._lastPos.subtract(this._positions[0]),
-                           duration = (this._lastTime - this._times[0]) / 1000,
-                           ease = options.easeLinearity,
+                       level.origin = map.project(map.unproject(map.getPixelOrigin()), zoom).round();
+                       level.zoom = zoom;
 
-                           speedVector = direction.multiplyBy(ease / duration),
-                           speed = speedVector.distanceTo([0, 0]),
+                       this._setZoomTransform(level, map.getCenter(), map.getZoom());
 
-                           limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
-                           limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
+                       // force the browser to consider the newly added element for transition
+                       falseFn(level.el.offsetWidth);
 
-                           decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
-                           offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
+                       this._onCreateLevel(level);
+               }
 
-                       if (!offset.x && !offset.y) {
-                               map.fire('moveend');
+               this._level = level;
 
-                       } else {
-                               offset = map._limitOffset(offset, map.options.maxBounds);
+               return level;
+       },
 
-                               L.Util.requestAnimFrame(function () {
-                                       map.panBy(offset, {
-                                               duration: decelerationDuration,
-                                               easeLinearity: ease,
-                                               noMoveStart: true,
-                                               animate: true
-                                       });
-                               });
-                       }
-               }
-       }
-});
+       _onUpdateLevel: falseFn,
 
-// @section Handlers
-// @property dragging: Handler
-// Map dragging handler (by both mouse and touch).
-L.Map.addInitHook('addHandler', 'dragging', L.Map.Drag);
+       _onRemoveLevel: falseFn,
 
+       _onCreateLevel: falseFn,
 
+       _pruneTiles: function () {
+               if (!this._map) {
+                       return;
+               }
 
-/*
- * L.Handler.DoubleClickZoom is used to handle double-click zoom on the map, enabled by default.
- */
+               var key, tile;
 
-// @namespace Map
-// @section Interaction Options
+               var zoom = this._map.getZoom();
+               if (zoom > this.options.maxZoom ||
+                       zoom < this.options.minZoom) {
+                       this._removeAllTiles();
+                       return;
+               }
 
-L.Map.mergeOptions({
-       // @option doubleClickZoom: Boolean|String = true
-       // Whether the map can be zoomed in by double clicking on it and
-       // zoomed out by double clicking while holding shift. If passed
-       // `'center'`, double-click zoom will zoom to the center of the
-       //  view regardless of where the mouse was.
-       doubleClickZoom: true
-});
+               for (key in this._tiles) {
+                       tile = this._tiles[key];
+                       tile.retain = tile.current;
+               }
 
-L.Map.DoubleClickZoom = L.Handler.extend({
-       addHooks: function () {
-               this._map.on('dblclick', this._onDoubleClick, this);
-       },
+               for (key in this._tiles) {
+                       tile = this._tiles[key];
+                       if (tile.current && !tile.active) {
+                               var coords = tile.coords;
+                               if (!this._retainParent(coords.x, coords.y, coords.z, coords.z - 5)) {
+                                       this._retainChildren(coords.x, coords.y, coords.z, coords.z + 2);
+                               }
+                       }
+               }
 
-       removeHooks: function () {
-               this._map.off('dblclick', this._onDoubleClick, this);
+               for (key in this._tiles) {
+                       if (!this._tiles[key].retain) {
+                               this._removeTile(key);
+                       }
+               }
        },
 
-       _onDoubleClick: function (e) {
-               var map = this._map,
-                   oldZoom = map.getZoom(),
-                   delta = map.options.zoomDelta,
-                   zoom = e.originalEvent.shiftKey ? oldZoom - delta : oldZoom + delta;
-
-               if (map.options.doubleClickZoom === 'center') {
-                       map.setZoom(zoom);
-               } else {
-                       map.setZoomAround(e.containerPoint, zoom);
+       _removeTilesAtZoom: function (zoom) {
+               for (var key in this._tiles) {
+                       if (this._tiles[key].coords.z !== zoom) {
+                               continue;
+                       }
+                       this._removeTile(key);
                }
-       }
-});
+       },
 
-// @section Handlers
-//
-// Map properties include interaction handlers that allow you to control
-// interaction behavior in runtime, enabling or disabling certain features such
-// as dragging or touch zoom (see `Handler` methods). For example:
-//
-// ```js
-// map.doubleClickZoom.disable();
-// ```
-//
-// @property doubleClickZoom: Handler
-// Double click zoom handler.
-L.Map.addInitHook('addHandler', 'doubleClickZoom', L.Map.DoubleClickZoom);
+       _removeAllTiles: function () {
+               for (var key in this._tiles) {
+                       this._removeTile(key);
+               }
+       },
 
+       _invalidateAll: function () {
+               for (var z in this._levels) {
+                       remove(this._levels[z].el);
+                       this._onRemoveLevel(z);
+                       delete this._levels[z];
+               }
+               this._removeAllTiles();
 
+               this._tileZoom = undefined;
+       },
 
-/*
- * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.
- */
+       _retainParent: function (x, y, z, minZoom) {
+               var x2 = Math.floor(x / 2),
+                   y2 = Math.floor(y / 2),
+                   z2 = z - 1,
+                   coords2 = new Point(+x2, +y2);
+               coords2.z = +z2;
 
-// @namespace Map
-// @section Interaction Options
-L.Map.mergeOptions({
-       // @section Mousewheel options
-       // @option scrollWheelZoom: Boolean|String = true
-       // Whether the map can be zoomed by using the mouse wheel. If passed `'center'`,
-       // it will zoom to the center of the view regardless of where the mouse was.
-       scrollWheelZoom: true,
+               var key = this._tileCoordsToKey(coords2),
+                   tile = this._tiles[key];
 
-       // @option wheelDebounceTime: Number = 40
-       // Limits the rate at which a wheel can fire (in milliseconds). By default
-       // user can't zoom via wheel more often than once per 40 ms.
-       wheelDebounceTime: 40,
+               if (tile && tile.active) {
+                       tile.retain = true;
+                       return true;
 
-       // @option wheelPxPerZoomLevel: Number = 60
-       // How many scroll pixels (as reported by [L.DomEvent.getWheelDelta](#domevent-getwheeldelta))
-       // mean a change of one full zoom level. Smaller values will make wheel-zooming
-       // faster (and vice versa).
-       wheelPxPerZoomLevel: 60
-});
+               } else if (tile && tile.loaded) {
+                       tile.retain = true;
+               }
 
-L.Map.ScrollWheelZoom = L.Handler.extend({
-       addHooks: function () {
-               L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);
+               if (z2 > minZoom) {
+                       return this._retainParent(x2, y2, z2, minZoom);
+               }
 
-               this._delta = 0;
+               return false;
        },
 
-       removeHooks: function () {
-               L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll, this);
-       },
+       _retainChildren: function (x, y, z, maxZoom) {
 
-       _onWheelScroll: function (e) {
-               var delta = L.DomEvent.getWheelDelta(e);
+               for (var i = 2 * x; i < 2 * x + 2; i++) {
+                       for (var j = 2 * y; j < 2 * y + 2; j++) {
 
-               var debounce = this._map.options.wheelDebounceTime;
+                               var coords = new Point(i, j);
+                               coords.z = z + 1;
 
-               this._delta += delta;
-               this._lastMousePos = this._map.mouseEventToContainerPoint(e);
+                               var key = this._tileCoordsToKey(coords),
+                                   tile = this._tiles[key];
 
-               if (!this._startTime) {
-                       this._startTime = +new Date();
-               }
+                               if (tile && tile.active) {
+                                       tile.retain = true;
+                                       continue;
 
-               var left = Math.max(debounce - (+new Date() - this._startTime), 0);
+                               } else if (tile && tile.loaded) {
+                                       tile.retain = true;
+                               }
 
-               clearTimeout(this._timer);
-               this._timer = setTimeout(L.bind(this._performZoom, this), left);
+                               if (z + 1 < maxZoom) {
+                                       this._retainChildren(i, j, z + 1, maxZoom);
+                               }
+                       }
+               }
+       },
 
-               L.DomEvent.stop(e);
+       _resetView: function (e) {
+               var animating = e && (e.pinch || e.flyTo);
+               this._setView(this._map.getCenter(), this._map.getZoom(), animating, animating);
        },
 
-       _performZoom: function () {
-               var map = this._map,
-                   zoom = map.getZoom(),
-                   snap = this._map.options.zoomSnap || 0;
+       _animateZoom: function (e) {
+               this._setView(e.center, e.zoom, true, e.noUpdate);
+       },
 
-               map._stop(); // stop panning and fly animations if any
+       _clampZoom: function (zoom) {
+               var options = this.options;
 
-               // map the delta with a sigmoid function to -4..4 range leaning on -1..1
-               var d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4),
-                   d3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2,
-                   d4 = snap ? Math.ceil(d3 / snap) * snap : d3,
-                   delta = map._limitZoom(zoom + (this._delta > 0 ? d4 : -d4)) - zoom;
+               if (undefined !== options.minNativeZoom && zoom < options.minNativeZoom) {
+                       return options.minNativeZoom;
+               }
 
-               this._delta = 0;
-               this._startTime = null;
+               if (undefined !== options.maxNativeZoom && options.maxNativeZoom < zoom) {
+                       return options.maxNativeZoom;
+               }
 
-               if (!delta) { return; }
+               return zoom;
+       },
 
-               if (map.options.scrollWheelZoom === 'center') {
-                       map.setZoom(zoom + delta);
-               } else {
-                       map.setZoomAround(this._lastMousePos, zoom + delta);
+       _setView: function (center, zoom, noPrune, noUpdate) {
+               var tileZoom = this._clampZoom(Math.round(zoom));
+               if ((this.options.maxZoom !== undefined && tileZoom > this.options.maxZoom) ||
+                   (this.options.minZoom !== undefined && tileZoom < this.options.minZoom)) {
+                       tileZoom = undefined;
                }
-       }
-});
 
-// @section Handlers
-// @property scrollWheelZoom: Handler
-// Scroll wheel zoom handler.
-L.Map.addInitHook('addHandler', 'scrollWheelZoom', L.Map.ScrollWheelZoom);
+               var tileZoomChanged = this.options.updateWhenZooming && (tileZoom !== this._tileZoom);
 
+               if (!noUpdate || tileZoomChanged) {
 
+                       this._tileZoom = tileZoom;
 
-/*
- * Extends the event handling code with double tap support for mobile browsers.
- */
+                       if (this._abortLoading) {
+                               this._abortLoading();
+                       }
 
-L.extend(L.DomEvent, {
+                       this._updateLevels();
+                       this._resetGrid();
 
-       _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
-       _touchend: L.Browser.msPointer ? 'MSPointerUp' : L.Browser.pointer ? 'pointerup' : 'touchend',
+                       if (tileZoom !== undefined) {
+                               this._update(center);
+                       }
 
-       // inspired by Zepto touch code by Thomas Fuchs
-       addDoubleTapListener: function (obj, handler, id) {
-               var last, touch,
-                   doubleTap = false,
-                   delay = 250;
+                       if (!noPrune) {
+                               this._pruneTiles();
+                       }
 
-               function onTouchStart(e) {
-                       var count;
+                       // Flag to prevent _updateOpacity from pruning tiles during
+                       // a zoom anim or a pinch gesture
+                       this._noPrune = !!noPrune;
+               }
 
-                       if (L.Browser.pointer) {
-                               count = L.DomEvent._pointersCount;
-                       } else {
-                               count = e.touches.length;
-                       }
+               this._setZoomTransforms(center, zoom);
+       },
 
-                       if (count > 1) { return; }
+       _setZoomTransforms: function (center, zoom) {
+               for (var i in this._levels) {
+                       this._setZoomTransform(this._levels[i], center, zoom);
+               }
+       },
 
-                       var now = Date.now(),
-                           delta = now - (last || now);
+       _setZoomTransform: function (level, center, zoom) {
+               var scale = this._map.getZoomScale(zoom, level.zoom),
+                   translate = level.origin.multiplyBy(scale)
+                       .subtract(this._map._getNewPixelOrigin(center, zoom)).round();
 
-                       touch = e.touches ? e.touches[0] : e;
-                       doubleTap = (delta > 0 && delta <= delay);
-                       last = now;
+               if (any3d) {
+                       setTransform(level.el, translate, scale);
+               } else {
+                       setPosition(level.el, translate);
                }
+       },
 
-               function onTouchEnd() {
-                       if (doubleTap && !touch.cancelBubble) {
-                               if (L.Browser.pointer) {
-                                       // work around .type being readonly with MSPointer* events
-                                       var newTouch = {},
-                                           prop, i;
+       _resetGrid: function () {
+               var map = this._map,
+                   crs = map.options.crs,
+                   tileSize = this._tileSize = this.getTileSize(),
+                   tileZoom = this._tileZoom;
 
-                                       for (i in touch) {
-                                               prop = touch[i];
-                                               newTouch[i] = prop && prop.bind ? prop.bind(touch) : prop;
-                                       }
-                                       touch = newTouch;
-                               }
-                               touch.type = 'dblclick';
-                               handler(touch);
-                               last = null;
-                       }
+               var bounds = this._map.getPixelWorldBounds(this._tileZoom);
+               if (bounds) {
+                       this._globalTileRange = this._pxBoundsToTileRange(bounds);
                }
 
-               var pre = '_leaflet_',
-                   touchstart = this._touchstart,
-                   touchend = this._touchend;
+               this._wrapX = crs.wrapLng && !this.options.noWrap && [
+                       Math.floor(map.project([0, crs.wrapLng[0]], tileZoom).x / tileSize.x),
+                       Math.ceil(map.project([0, crs.wrapLng[1]], tileZoom).x / tileSize.y)
+               ];
+               this._wrapY = crs.wrapLat && !this.options.noWrap && [
+                       Math.floor(map.project([crs.wrapLat[0], 0], tileZoom).y / tileSize.x),
+                       Math.ceil(map.project([crs.wrapLat[1], 0], tileZoom).y / tileSize.y)
+               ];
+       },
 
-               obj[pre + touchstart + id] = onTouchStart;
-               obj[pre + touchend + id] = onTouchEnd;
-               obj[pre + 'dblclick' + id] = handler;
+       _onMoveEnd: function () {
+               if (!this._map || this._map._animatingZoom) { return; }
 
-               obj.addEventListener(touchstart, onTouchStart, false);
-               obj.addEventListener(touchend, onTouchEnd, false);
+               this._update();
+       },
 
-               // On some platforms (notably, chrome on win10 + touchscreen + mouse),
-               // the browser doesn't fire touchend/pointerup events but does fire
-               // native dblclicks. See #4127.
-               if (!L.Browser.edge) {
-                       obj.addEventListener('dblclick', handler, false);
-               }
+       _getTiledPixelBounds: function (center) {
+               var map = this._map,
+                   mapZoom = map._animatingZoom ? Math.max(map._animateToZoom, map.getZoom()) : map.getZoom(),
+                   scale = map.getZoomScale(mapZoom, this._tileZoom),
+                   pixelCenter = map.project(center, this._tileZoom).floor(),
+                   halfSize = map.getSize().divideBy(scale * 2);
 
-               return this;
+               return new Bounds(pixelCenter.subtract(halfSize), pixelCenter.add(halfSize));
        },
 
-       removeDoubleTapListener: function (obj, id) {
-               var pre = '_leaflet_',
-                   touchstart = obj[pre + this._touchstart + id],
-                   touchend = obj[pre + this._touchend + id],
-                   dblclick = obj[pre + 'dblclick' + id];
+       // Private method to load tiles in the grid's active zoom level according to map bounds
+       _update: function (center) {
+               var map = this._map;
+               if (!map) { return; }
+               var zoom = this._clampZoom(map.getZoom());
+
+               if (center === undefined) { center = map.getCenter(); }
+               if (this._tileZoom === undefined) { return; }   // if out of minzoom/maxzoom
 
-               obj.removeEventListener(this._touchstart, touchstart, false);
-               obj.removeEventListener(this._touchend, touchend, false);
-               if (!L.Browser.edge) {
-                       obj.removeEventListener('dblclick', dblclick, false);
-               }
+               var pixelBounds = this._getTiledPixelBounds(center),
+                   tileRange = this._pxBoundsToTileRange(pixelBounds),
+                   tileCenter = tileRange.getCenter(),
+                   queue = [],
+                   margin = this.options.keepBuffer,
+                   noPruneRange = new Bounds(tileRange.getBottomLeft().subtract([margin, -margin]),
+                                             tileRange.getTopRight().add([margin, -margin]));
 
-               return this;
-       }
-});
+               // Sanity check: panic if the tile range contains Infinity somewhere.
+               if (!(isFinite(tileRange.min.x) &&
+                     isFinite(tileRange.min.y) &&
+                     isFinite(tileRange.max.x) &&
+                     isFinite(tileRange.max.y))) { throw new Error('Attempted to load an infinite number of tiles'); }
+
+               for (var key in this._tiles) {
+                       var c = this._tiles[key].coords;
+                       if (c.z !== this._tileZoom || !noPruneRange.contains(new Point(c.x, c.y))) {
+                               this._tiles[key].current = false;
+                       }
+               }
 
+               // _update just loads more tiles. If the tile zoom level differs too much
+               // from the map's, let _setView reset levels and prune old tiles.
+               if (Math.abs(zoom - this._tileZoom) > 1) { this._setView(center, zoom); return; }
 
+               // create a queue of coordinates to load tiles from
+               for (var j = tileRange.min.y; j <= tileRange.max.y; j++) {
+                       for (var i = tileRange.min.x; i <= tileRange.max.x; i++) {
+                               var coords = new Point(i, j);
+                               coords.z = this._tileZoom;
 
-/*
- * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
- */
+                               if (!this._isValidTile(coords)) { continue; }
 
-L.extend(L.DomEvent, {
+                               var tile = this._tiles[this._tileCoordsToKey(coords)];
+                               if (tile) {
+                                       tile.current = true;
+                               } else {
+                                       queue.push(coords);
+                               }
+                       }
+               }
 
-       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',
-       TAG_WHITE_LIST: ['INPUT', 'SELECT', 'OPTION'],
+               // sort tile queue to load tiles in order of their distance to center
+               queue.sort(function (a, b) {
+                       return a.distanceTo(tileCenter) - b.distanceTo(tileCenter);
+               });
 
-       _pointers: {},
-       _pointersCount: 0,
+               if (queue.length !== 0) {
+                       // if it's the first batch of tiles to load
+                       if (!this._loading) {
+                               this._loading = true;
+                               // @event loading: Event
+                               // Fired when the grid layer starts loading tiles.
+                               this.fire('loading');
+                       }
 
-       // Provides a touch events wrapper for (ms)pointer events.
-       // ref http://www.w3.org/TR/pointerevents/ https://www.w3.org/Bugs/Public/show_bug.cgi?id=22890
+                       // create DOM fragment to append tiles in one batch
+                       var fragment = document.createDocumentFragment();
 
-       addPointerListener: function (obj, type, handler, id) {
+                       for (i = 0; i < queue.length; i++) {
+                               this._addTile(queue[i], fragment);
+                       }
 
-               if (type === 'touchstart') {
-                       this._addPointerStart(obj, handler, id);
+                       this._level.el.appendChild(fragment);
+               }
+       },
 
-               } else if (type === 'touchmove') {
-                       this._addPointerMove(obj, handler, id);
+       _isValidTile: function (coords) {
+               var crs = this._map.options.crs;
 
-               } else if (type === 'touchend') {
-                       this._addPointerEnd(obj, handler, id);
+               if (!crs.infinite) {
+                       // don't load tile if it's out of bounds and not wrapped
+                       var bounds = this._globalTileRange;
+                       if ((!crs.wrapLng && (coords.x < bounds.min.x || coords.x > bounds.max.x)) ||
+                           (!crs.wrapLat && (coords.y < bounds.min.y || coords.y > bounds.max.y))) { return false; }
                }
 
-               return this;
+               if (!this.options.bounds) { return true; }
+
+               // don't load tile if it doesn't intersect the bounds in options
+               var tileBounds = this._tileCoordsToBounds(coords);
+               return toLatLngBounds(this.options.bounds).overlaps(tileBounds);
        },
 
-       removePointerListener: function (obj, type, id) {
-               var handler = obj['_leaflet_' + type + id];
+       _keyToBounds: function (key) {
+               return this._tileCoordsToBounds(this._keyToTileCoords(key));
+       },
 
-               if (type === 'touchstart') {
-                       obj.removeEventListener(this.POINTER_DOWN, handler, false);
+       _tileCoordsToNwSe: function (coords) {
+               var map = this._map,
+                   tileSize = this.getTileSize(),
+                   nwPoint = coords.scaleBy(tileSize),
+                   sePoint = nwPoint.add(tileSize),
+                   nw = map.unproject(nwPoint, coords.z),
+                   se = map.unproject(sePoint, coords.z);
+               return [nw, se];
+       },
 
-               } else if (type === 'touchmove') {
-                       obj.removeEventListener(this.POINTER_MOVE, handler, false);
+       // converts tile coordinates to its geographical bounds
+       _tileCoordsToBounds: function (coords) {
+               var bp = this._tileCoordsToNwSe(coords),
+                   bounds = new LatLngBounds(bp[0], bp[1]);
 
-               } else if (type === 'touchend') {
-                       obj.removeEventListener(this.POINTER_UP, handler, false);
-                       obj.removeEventListener(this.POINTER_CANCEL, handler, false);
+               if (!this.options.noWrap) {
+                       bounds = this._map.wrapLatLngBounds(bounds);
                }
+               return bounds;
+       },
+       // converts tile coordinates to key for the tile cache
+       _tileCoordsToKey: function (coords) {
+               return coords.x + ':' + coords.y + ':' + coords.z;
+       },
 
-               return this;
+       // converts tile cache key to coordinates
+       _keyToTileCoords: function (key) {
+               var k = key.split(':'),
+                   coords = new Point(+k[0], +k[1]);
+               coords.z = +k[2];
+               return coords;
        },
 
-       _addPointerStart: function (obj, handler, id) {
-               var onDown = L.bind(function (e) {
-                       if (e.pointerType !== 'mouse' && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
-                               // In IE11, some touch events needs to fire for form controls, or
-                               // the controls will stop working. We keep a whitelist of tag names that
-                               // need these events. For other target tags, we prevent default on the event.
-                               if (this.TAG_WHITE_LIST.indexOf(e.target.tagName) < 0) {
-                                       L.DomEvent.preventDefault(e);
-                               } else {
-                                       return;
-                               }
-                       }
+       _removeTile: function (key) {
+               var tile = this._tiles[key];
+               if (!tile) { return; }
+
+               remove(tile.el);
+
+               delete this._tiles[key];
+
+               // @event tileunload: TileEvent
+               // Fired when a tile is removed (e.g. when a tile goes off the screen).
+               this.fire('tileunload', {
+                       tile: tile.el,
+                       coords: this._keyToTileCoords(key)
+               });
+       },
 
-                       this._handlePointer(e, handler);
-               }, this);
+       _initTile: function (tile) {
+               addClass(tile, 'leaflet-tile');
 
-               obj['_leaflet_touchstart' + id] = onDown;
-               obj.addEventListener(this.POINTER_DOWN, onDown, false);
+               var tileSize = this.getTileSize();
+               tile.style.width = tileSize.x + 'px';
+               tile.style.height = tileSize.y + 'px';
 
-               // need to keep track of what pointers and how many are active to provide e.touches emulation
-               if (!this._pointerDocListener) {
-                       var pointerUp = L.bind(this._globalPointerUp, this);
+               tile.onselectstart = falseFn;
+               tile.onmousemove = falseFn;
 
-                       // we listen documentElement as any drags that end by moving the touch off the screen get fired there
-                       document.documentElement.addEventListener(this.POINTER_DOWN, L.bind(this._globalPointerDown, this), true);
-                       document.documentElement.addEventListener(this.POINTER_MOVE, L.bind(this._globalPointerMove, this), true);
-                       document.documentElement.addEventListener(this.POINTER_UP, pointerUp, true);
-                       document.documentElement.addEventListener(this.POINTER_CANCEL, pointerUp, true);
+               // update opacity on tiles in IE7-8 because of filter inheritance problems
+               if (ielt9 && this.options.opacity < 1) {
+                       setOpacity(tile, this.options.opacity);
+               }
 
-                       this._pointerDocListener = true;
+               // without this hack, tiles disappear after zoom on Chrome for Android
+               // https://github.com/Leaflet/Leaflet/issues/2078
+               if (android && !android23) {
+                       tile.style.WebkitBackfaceVisibility = 'hidden';
                }
        },
 
-       _globalPointerDown: function (e) {
-               this._pointers[e.pointerId] = e;
-               this._pointersCount++;
-       },
+       _addTile: function (coords, container) {
+               var tilePos = this._getTilePos(coords),
+                   key = this._tileCoordsToKey(coords);
 
-       _globalPointerMove: function (e) {
-               if (this._pointers[e.pointerId]) {
-                       this._pointers[e.pointerId] = e;
-               }
-       },
+               var tile = this.createTile(this._wrapCoords(coords), bind(this._tileReady, this, coords));
 
-       _globalPointerUp: function (e) {
-               delete this._pointers[e.pointerId];
-               this._pointersCount--;
-       },
+               this._initTile(tile);
 
-       _handlePointer: function (e, handler) {
-               e.touches = [];
-               for (var i in this._pointers) {
-                       e.touches.push(this._pointers[i]);
+               // if createTile is defined with a second argument ("done" callback),
+               // we know that tile is async and will be ready later; otherwise
+               if (this.createTile.length < 2) {
+                       // mark tile as ready, but delay one frame for opacity animation to happen
+                       requestAnimFrame(bind(this._tileReady, this, coords, null, tile));
                }
-               e.changedTouches = [e];
 
-               handler(e);
-       },
-
-       _addPointerMove: function (obj, handler, id) {
-               var onMove = L.bind(function (e) {
-                       // don't fire touch moves when mouse isn't down
-                       if ((e.pointerType === e.MSPOINTER_TYPE_MOUSE || e.pointerType === 'mouse') && e.buttons === 0) { return; }
+               setPosition(tile, tilePos);
 
-                       this._handlePointer(e, handler);
-               }, this);
+               // save tile in cache
+               this._tiles[key] = {
+                       el: tile,
+                       coords: coords,
+                       current: true
+               };
 
-               obj['_leaflet_touchmove' + id] = onMove;
-               obj.addEventListener(this.POINTER_MOVE, onMove, false);
+               container.appendChild(tile);
+               // @event tileloadstart: TileEvent
+               // Fired when a tile is requested and starts loading.
+               this.fire('tileloadstart', {
+                       tile: tile,
+                       coords: coords
+               });
        },
 
-       _addPointerEnd: function (obj, handler, id) {
-               var onUp = L.bind(function (e) {
-                       this._handlePointer(e, handler);
-               }, this);
+       _tileReady: function (coords, err, tile) {
+               if (err) {
+                       // @event tileerror: TileErrorEvent
+                       // Fired when there is an error loading a tile.
+                       this.fire('tileerror', {
+                               error: err,
+                               tile: tile,
+                               coords: coords
+                       });
+               }
 
-               obj['_leaflet_touchend' + id] = onUp;
-               obj.addEventListener(this.POINTER_UP, onUp, false);
-               obj.addEventListener(this.POINTER_CANCEL, onUp, false);
-       }
-});
+               var key = this._tileCoordsToKey(coords);
 
+               tile = this._tiles[key];
+               if (!tile) { return; }
 
+               tile.loaded = +new Date();
+               if (this._map._fadeAnimated) {
+                       setOpacity(tile.el, 0);
+                       cancelAnimFrame(this._fadeFrame);
+                       this._fadeFrame = requestAnimFrame(this._updateOpacity, this);
+               } else {
+                       tile.active = true;
+                       this._pruneTiles();
+               }
 
-/*
- * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.
- */
+               if (!err) {
+                       addClass(tile.el, 'leaflet-tile-loaded');
 
-// @namespace Map
-// @section Interaction Options
-L.Map.mergeOptions({
-       // @section Touch interaction options
-       // @option touchZoom: Boolean|String = *
-       // Whether the map can be zoomed by touch-dragging with two fingers. If
-       // passed `'center'`, it will zoom to the center of the view regardless of
-       // where the touch events (fingers) were. Enabled for touch-capable web
-       // browsers except for old Androids.
-       touchZoom: L.Browser.touch && !L.Browser.android23,
+                       // @event tileload: TileEvent
+                       // Fired when a tile loads.
+                       this.fire('tileload', {
+                               tile: tile.el,
+                               coords: coords
+                       });
+               }
 
-       // @option bounceAtZoomLimits: Boolean = true
-       // Set it to false if you don't want the map to zoom beyond min/max zoom
-       // and then bounce back when pinch-zooming.
-       bounceAtZoomLimits: true
-});
+               if (this._noTilesToLoad()) {
+                       this._loading = false;
+                       // @event load: Event
+                       // Fired when the grid layer loaded all visible tiles.
+                       this.fire('load');
 
-L.Map.TouchZoom = L.Handler.extend({
-       addHooks: function () {
-               L.DomUtil.addClass(this._map._container, 'leaflet-touch-zoom');
-               L.DomEvent.on(this._map._container, 'touchstart', this._onTouchStart, this);
+                       if (ielt9 || !this._map._fadeAnimated) {
+                               requestAnimFrame(this._pruneTiles, this);
+                       } else {
+                               // Wait a bit more than 0.2 secs (the duration of the tile fade-in)
+                               // to trigger a pruning.
+                               setTimeout(bind(this._pruneTiles, this), 250);
+                       }
+               }
        },
 
-       removeHooks: function () {
-               L.DomUtil.removeClass(this._map._container, 'leaflet-touch-zoom');
-               L.DomEvent.off(this._map._container, 'touchstart', this._onTouchStart, this);
+       _getTilePos: function (coords) {
+               return coords.scaleBy(this.getTileSize()).subtract(this._level.origin);
        },
 
-       _onTouchStart: function (e) {
-               var map = this._map;
-               if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
+       _wrapCoords: function (coords) {
+               var newCoords = new Point(
+                       this._wrapX ? wrapNum(coords.x, this._wrapX) : coords.x,
+                       this._wrapY ? wrapNum(coords.y, this._wrapY) : coords.y);
+               newCoords.z = coords.z;
+               return newCoords;
+       },
 
-               var p1 = map.mouseEventToContainerPoint(e.touches[0]),
-                   p2 = map.mouseEventToContainerPoint(e.touches[1]);
+       _pxBoundsToTileRange: function (bounds) {
+               var tileSize = this.getTileSize();
+               return new Bounds(
+                       bounds.min.unscaleBy(tileSize).floor(),
+                       bounds.max.unscaleBy(tileSize).ceil().subtract([1, 1]));
+       },
 
-               this._centerPoint = map.getSize()._divideBy(2);
-               this._startLatLng = map.containerPointToLatLng(this._centerPoint);
-               if (map.options.touchZoom !== 'center') {
-                       this._pinchStartLatLng = map.containerPointToLatLng(p1.add(p2)._divideBy(2));
+       _noTilesToLoad: function () {
+               for (var key in this._tiles) {
+                       if (!this._tiles[key].loaded) { return false; }
                }
+               return true;
+       }
+});
 
-               this._startDist = p1.distanceTo(p2);
-               this._startZoom = map.getZoom();
-
-               this._moved = false;
-               this._zooming = true;
-
-               map._stop();
+// @factory L.gridLayer(options?: GridLayer options)
+// Creates a new instance of GridLayer with the supplied options.
+function gridLayer(options) {
+       return new GridLayer(options);
+}
 
-               L.DomEvent
-                   .on(document, 'touchmove', this._onTouchMove, this)
-                   .on(document, 'touchend', this._onTouchEnd, this);
+/*
+ * @class TileLayer
+ * @inherits GridLayer
+ * @aka L.TileLayer
+ * Used to load and display tile layers on the map. Note that most tile servers require attribution, which you can set under `Layer`. Extends `GridLayer`.
+ *
+ * @example
+ *
+ * ```js
+ * L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png?{foo}', {foo: 'bar', attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>'}).addTo(map);
+ * ```
+ *
+ * @section URL template
+ * @example
+ *
+ * A string of the following form:
+ *
+ * ```
+ * 'http://{s}.somedomain.com/blabla/{z}/{x}/{y}{r}.png'
+ * ```
+ *
+ * `{s}` means one of the available subdomains (used sequentially to help with browser parallel requests per domain limitation; subdomain values are specified in options; `a`, `b` or `c` by default, can be omitted), `{z}` — zoom level, `{x}` and `{y}` — tile coordinates. `{r}` can be used to add "&commat;2x" to the URL to load retina tiles.
+ *
+ * You can use custom keys in the template, which will be [evaluated](#util-template) from TileLayer options, like this:
+ *
+ * ```
+ * L.tileLayer('http://{s}.somedomain.com/{foo}/{z}/{x}/{y}.png', {foo: 'bar'});
+ * ```
+ */
 
-               L.DomEvent.preventDefault(e);
-       },
 
-       _onTouchMove: function (e) {
-               if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; }
+var TileLayer = GridLayer.extend({
 
-               var map = this._map,
-                   p1 = map.mouseEventToContainerPoint(e.touches[0]),
-                   p2 = map.mouseEventToContainerPoint(e.touches[1]),
-                   scale = p1.distanceTo(p2) / this._startDist;
+       // @section
+       // @aka TileLayer options
+       options: {
+               // @option minZoom: Number = 0
+               // The minimum zoom level down to which this layer will be displayed (inclusive).
+               minZoom: 0,
 
+               // @option maxZoom: Number = 18
+               // The maximum zoom level up to which this layer will be displayed (inclusive).
+               maxZoom: 18,
 
-               this._zoom = map.getScaleZoom(scale, this._startZoom);
+               // @option subdomains: String|String[] = 'abc'
+               // Subdomains of the tile service. Can be passed in the form of one string (where each letter is a subdomain name) or an array of strings.
+               subdomains: 'abc',
 
-               if (!map.options.bounceAtZoomLimits && (
-                       (this._zoom < map.getMinZoom() && scale < 1) ||
-                       (this._zoom > map.getMaxZoom() && scale > 1))) {
-                       this._zoom = map._limitZoom(this._zoom);
-               }
+               // @option errorTileUrl: String = ''
+               // URL to the tile image to show in place of the tile that failed to load.
+               errorTileUrl: '',
 
-               if (map.options.touchZoom === 'center') {
-                       this._center = this._startLatLng;
-                       if (scale === 1) { return; }
-               } else {
-                       // Get delta from pinch to center, so centerLatLng is delta applied to initial pinchLatLng
-                       var delta = p1._add(p2)._divideBy(2)._subtract(this._centerPoint);
-                       if (scale === 1 && delta.x === 0 && delta.y === 0) { return; }
-                       this._center = map.unproject(map.project(this._pinchStartLatLng, this._zoom).subtract(delta), this._zoom);
-               }
+               // @option zoomOffset: Number = 0
+               // The zoom number used in tile URLs will be offset with this value.
+               zoomOffset: 0,
 
-               if (!this._moved) {
-                       map._moveStart(true);
-                       this._moved = true;
-               }
+               // @option tms: Boolean = false
+               // If `true`, inverses Y axis numbering for tiles (turn this on for [TMS](https://en.wikipedia.org/wiki/Tile_Map_Service) services).
+               tms: false,
 
-               L.Util.cancelAnimFrame(this._animRequest);
+               // @option zoomReverse: Boolean = false
+               // If set to true, the zoom number used in tile URLs will be reversed (`maxZoom - zoom` instead of `zoom`)
+               zoomReverse: false,
 
-               var moveFn = L.bind(map._move, map, this._center, this._zoom, {pinch: true, round: false});
-               this._animRequest = L.Util.requestAnimFrame(moveFn, this, true);
+               // @option detectRetina: Boolean = false
+               // If `true` and user is on a retina display, it will request four tiles of half the specified size and a bigger zoom level in place of one to utilize the high resolution.
+               detectRetina: false,
 
-               L.DomEvent.preventDefault(e);
+               // @option crossOrigin: Boolean|String = false
+               // Whether the crossOrigin attribute will be added to the tiles.
+               // If a String is provided, all tiles will have their crossOrigin attribute set to the String provided. This is needed if you want to access tile pixel data.
+               // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values.
+               crossOrigin: false
        },
 
-       _onTouchEnd: function () {
-               if (!this._moved || !this._zooming) {
-                       this._zooming = false;
-                       return;
-               }
-
-               this._zooming = false;
-               L.Util.cancelAnimFrame(this._animRequest);
-
-               L.DomEvent
-                   .off(document, 'touchmove', this._onTouchMove)
-                   .off(document, 'touchend', this._onTouchEnd);
-
-               // Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.
-               if (this._map.options.zoomAnimation) {
-                       this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);
-               } else {
-                       this._map._resetView(this._center, this._map._limitZoom(this._zoom));
-               }
-       }
-});
-
-// @section Handlers
-// @property touchZoom: Handler
-// Touch zoom handler.
-L.Map.addInitHook('addHandler', 'touchZoom', L.Map.TouchZoom);
+       initialize: function (url, options) {
 
+               this._url = url;
 
+               options = setOptions(this, options);
 
-/*
- * L.Map.Tap is used to enable mobile hacks like quick taps and long hold.
- */
+               // detecting retina displays, adjusting tileSize and zoom levels
+               if (options.detectRetina && retina && options.maxZoom > 0) {
 
-// @namespace Map
-// @section Interaction Options
-L.Map.mergeOptions({
-       // @section Touch interaction options
-       // @option tap: Boolean = true
-       // Enables mobile hacks for supporting instant taps (fixing 200ms click
-       // delay on iOS/Android) and touch holds (fired as `contextmenu` events).
-       tap: true,
+                       options.tileSize = Math.floor(options.tileSize / 2);
 
-       // @option tapTolerance: Number = 15
-       // The max number of pixels a user can shift his finger during touch
-       // for it to be considered a valid tap.
-       tapTolerance: 15
-});
+                       if (!options.zoomReverse) {
+                               options.zoomOffset++;
+                               options.maxZoom--;
+                       } else {
+                               options.zoomOffset--;
+                               options.minZoom++;
+                       }
 
-L.Map.Tap = L.Handler.extend({
-       addHooks: function () {
-               L.DomEvent.on(this._map._container, 'touchstart', this._onDown, this);
-       },
+                       options.minZoom = Math.max(0, options.minZoom);
+               }
 
-       removeHooks: function () {
-               L.DomEvent.off(this._map._container, 'touchstart', this._onDown, this);
-       },
+               if (typeof options.subdomains === 'string') {
+                       options.subdomains = options.subdomains.split('');
+               }
 
-       _onDown: function (e) {
-               if (!e.touches) { return; }
+               // for https://github.com/Leaflet/Leaflet/issues/137
+               if (!android) {
+                       this.on('tileunload', this._onTileRemove);
+               }
+       },
 
-               L.DomEvent.preventDefault(e);
+       // @method setUrl(url: String, noRedraw?: Boolean): this
+       // Updates the layer's URL template and redraws it (unless `noRedraw` is set to `true`).
+       // If the URL does not change, the layer will not be redrawn unless
+       // the noRedraw parameter is set to false.
+       setUrl: function (url, noRedraw) {
+               if (this._url === url && noRedraw === undefined) {
+                       noRedraw = true;
+               }
 
-               this._fireClick = true;
+               this._url = url;
 
-               // don't simulate click or track longpress if more than 1 touch
-               if (e.touches.length > 1) {
-                       this._fireClick = false;
-                       clearTimeout(this._holdTimeout);
-                       return;
+               if (!noRedraw) {
+                       this.redraw();
                }
+               return this;
+       },
 
-               var first = e.touches[0],
-                   el = first.target;
+       // @method createTile(coords: Object, done?: Function): HTMLElement
+       // Called only internally, overrides GridLayer's [`createTile()`](#gridlayer-createtile)
+       // to return an `<img>` HTML element with the appropriate image URL given `coords`. The `done`
+       // callback is called when the tile has been loaded.
+       createTile: function (coords, done) {
+               var tile = document.createElement('img');
 
-               this._startPos = this._newPos = new L.Point(first.clientX, first.clientY);
+               on(tile, 'load', bind(this._tileOnLoad, this, done, tile));
+               on(tile, 'error', bind(this._tileOnError, this, done, tile));
 
-               // if touching a link, highlight it
-               if (el.tagName && el.tagName.toLowerCase() === 'a') {
-                       L.DomUtil.addClass(el, 'leaflet-active');
+               if (this.options.crossOrigin || this.options.crossOrigin === '') {
+                       tile.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;
                }
 
-               // 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);
+               /*
+                Alt tag is set to empty string to keep screen readers from reading URL and for compliance reasons
+                http://www.w3.org/TR/WCAG20-TECHS/H67
+               */
+               tile.alt = '';
 
-               this._simulateEvent('mousedown', first);
+               /*
+                Set role="presentation" to force screen readers to ignore this
+                https://www.w3.org/TR/wai-aria/roles#textalternativecomputation
+               */
+               tile.setAttribute('role', 'presentation');
 
-               L.DomEvent.on(document, {
-                       touchmove: this._onMove,
-                       touchend: this._onUp
-               }, this);
+               tile.src = this.getTileUrl(coords);
+
+               return tile;
        },
 
-       _onUp: function (e) {
-               clearTimeout(this._holdTimeout);
+       // @section Extension methods
+       // @uninheritable
+       // Layers extending `TileLayer` might reimplement the following method.
+       // @method getTileUrl(coords: Object): String
+       // Called only internally, returns the URL for a tile given its coordinates.
+       // Classes extending `TileLayer` can override this function to provide custom tile URL naming schemes.
+       getTileUrl: function (coords) {
+               var data = {
+                       r: retina ? '@2x' : '',
+                       s: this._getSubdomain(coords),
+                       x: coords.x,
+                       y: coords.y,
+                       z: this._getZoomForUrl()
+               };
+               if (this._map && !this._map.options.crs.infinite) {
+                       var invertedY = this._globalTileRange.max.y - coords.y;
+                       if (this.options.tms) {
+                               data['y'] = invertedY;
+                       }
+                       data['-y'] = invertedY;
+               }
 
-               L.DomEvent.off(document, {
-                       touchmove: this._onMove,
-                       touchend: this._onUp
-               }, this);
+               return template(this._url, extend(data, this.options));
+       },
 
-               if (this._fireClick && e && e.changedTouches) {
+       _tileOnLoad: function (done, tile) {
+               // For https://github.com/Leaflet/Leaflet/issues/3332
+               if (ielt9) {
+                       setTimeout(bind(done, this, null, tile), 0);
+               } else {
+                       done(null, tile);
+               }
+       },
 
-                       var first = e.changedTouches[0],
-                           el = first.target;
+       _tileOnError: function (done, tile, e) {
+               var errorUrl = this.options.errorTileUrl;
+               if (errorUrl && tile.getAttribute('src') !== errorUrl) {
+                       tile.src = errorUrl;
+               }
+               done(e, tile);
+       },
 
-                       if (el && el.tagName && el.tagName.toLowerCase() === 'a') {
-                               L.DomUtil.removeClass(el, 'leaflet-active');
-                       }
+       _onTileRemove: function (e) {
+               e.tile.onload = null;
+       },
 
-                       this._simulateEvent('mouseup', first);
+       _getZoomForUrl: function () {
+               var zoom = this._tileZoom,
+               maxZoom = this.options.maxZoom,
+               zoomReverse = this.options.zoomReverse,
+               zoomOffset = this.options.zoomOffset;
 
-                       // simulate click if the touch didn't move too much
-                       if (this._isTapValid()) {
-                               this._simulateEvent('click', first);
-                       }
+               if (zoomReverse) {
+                       zoom = maxZoom - zoom;
                }
+
+               return zoom + zoomOffset;
        },
 
-       _isTapValid: function () {
-               return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance;
+       _getSubdomain: function (tilePoint) {
+               var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length;
+               return this.options.subdomains[index];
        },
 
-       _onMove: function (e) {
-               var first = e.touches[0];
-               this._newPos = new L.Point(first.clientX, first.clientY);
-               this._simulateEvent('mousemove', first);
+       // stops loading all tiles in the background layer
+       _abortLoading: function () {
+               var i, tile;
+               for (i in this._tiles) {
+                       if (this._tiles[i].coords.z !== this._tileZoom) {
+                               tile = this._tiles[i].el;
+
+                               tile.onload = falseFn;
+                               tile.onerror = falseFn;
+
+                               if (!tile.complete) {
+                                       tile.src = emptyImageUrl;
+                                       remove(tile);
+                                       delete this._tiles[i];
+                               }
+                       }
+               }
        },
 
-       _simulateEvent: function (type, e) {
-               var simulatedEvent = document.createEvent('MouseEvents');
+       _removeTile: function (key) {
+               var tile = this._tiles[key];
+               if (!tile) { return; }
 
-               simulatedEvent._simulated = true;
-               e.target._simulatedClick = true;
+               // Cancels any pending http requests associated with the tile
+               // unless we're on Android's stock browser,
+               // see https://github.com/Leaflet/Leaflet/issues/137
+               if (!androidStock) {
+                       tile.el.setAttribute('src', emptyImageUrl);
+               }
 
-               simulatedEvent.initMouseEvent(
-                       type, true, true, window, 1,
-                       e.screenX, e.screenY,
-                       e.clientX, e.clientY,
-                       false, false, false, false, 0, null);
+               return GridLayer.prototype._removeTile.call(this, key);
+       },
 
-               e.target.dispatchEvent(simulatedEvent);
+       _tileReady: function (coords, err, tile) {
+               if (!this._map || (tile && tile.getAttribute('src') === emptyImageUrl)) {
+                       return;
+               }
+
+               return GridLayer.prototype._tileReady.call(this, coords, err, tile);
        }
 });
 
-// @section Handlers
-// @property tap: Handler
-// Mobile touch hacks (quick tap and touch hold) handler.
-if (L.Browser.touch && !L.Browser.pointer) {
-       L.Map.addInitHook('addHandler', 'tap', L.Map.Tap);
-}
 
+// @factory L.tilelayer(urlTemplate: String, options?: TileLayer options)
+// Instantiates a tile layer object given a `URL template` and optionally an options object.
 
+function tileLayer(url, options) {
+       return new TileLayer(url, options);
+}
 
 /*
- * L.Handler.BoxZoom is used to add shift-drag zoom interaction to the map
- * (zoom to a selected bounding box), enabled by default.
+ * @class TileLayer.WMS
+ * @inherits TileLayer
+ * @aka L.TileLayer.WMS
+ * Used to display [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services as tile layers on the map. Extends `TileLayer`.
+ *
+ * @example
+ *
+ * ```js
+ * var nexrad = L.tileLayer.wms("http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi", {
+ *     layers: 'nexrad-n0r-900913',
+ *     format: 'image/png',
+ *     transparent: true,
+ *     attribution: "Weather data © 2012 IEM Nexrad"
+ * });
+ * ```
  */
 
-// @namespace Map
-// @section Interaction Options
-L.Map.mergeOptions({
-       // @option boxZoom: Boolean = true
-       // Whether the map can be zoomed to a rectangular area specified by
-       // dragging the mouse while pressing the shift key.
-       boxZoom: true
-});
-
-L.Map.BoxZoom = L.Handler.extend({
-       initialize: function (map) {
-               this._map = map;
-               this._container = map._container;
-               this._pane = map._panes.overlayPane;
-       },
-
-       addHooks: function () {
-               L.DomEvent.on(this._container, 'mousedown', this._onMouseDown, this);
-       },
+var TileLayerWMS = TileLayer.extend({
 
-       removeHooks: function () {
-               L.DomEvent.off(this._container, 'mousedown', this._onMouseDown, this);
-       },
+       // @section
+       // @aka TileLayer.WMS options
+       // If any custom options not documented here are used, they will be sent to the
+       // WMS server as extra parameters in each request URL. This can be useful for
+       // [non-standard vendor WMS parameters](http://docs.geoserver.org/stable/en/user/services/wms/vendor.html).
+       defaultWmsParams: {
+               service: 'WMS',
+               request: 'GetMap',
 
-       moved: function () {
-               return this._moved;
-       },
+               // @option layers: String = ''
+               // **(required)** Comma-separated list of WMS layers to show.
+               layers: '',
 
-       _resetState: function () {
-               this._moved = false;
-       },
+               // @option styles: String = ''
+               // Comma-separated list of WMS styles.
+               styles: '',
 
-       _onMouseDown: function (e) {
-               if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
+               // @option format: String = 'image/jpeg'
+               // WMS image format (use `'image/png'` for layers with transparency).
+               format: 'image/jpeg',
 
-               this._resetState();
+               // @option transparent: Boolean = false
+               // If `true`, the WMS service will return images with transparency.
+               transparent: false,
 
-               L.DomUtil.disableTextSelection();
-               L.DomUtil.disableImageDrag();
+               // @option version: String = '1.1.1'
+               // Version of the WMS service to use
+               version: '1.1.1'
+       },
 
-               this._startPoint = this._map.mouseEventToContainerPoint(e);
+       options: {
+               // @option crs: CRS = null
+               // Coordinate Reference System to use for the WMS requests, defaults to
+               // map CRS. Don't change this if you're not sure what it means.
+               crs: null,
 
-               L.DomEvent.on(document, {
-                       contextmenu: L.DomEvent.stop,
-                       mousemove: this._onMouseMove,
-                       mouseup: this._onMouseUp,
-                       keydown: this._onKeyDown
-               }, this);
+               // @option uppercase: Boolean = false
+               // If `true`, WMS request parameter keys will be uppercase.
+               uppercase: false
        },
 
-       _onMouseMove: function (e) {
-               if (!this._moved) {
-                       this._moved = true;
+       initialize: function (url, options) {
 
-                       this._box = L.DomUtil.create('div', 'leaflet-zoom-box', this._container);
-                       L.DomUtil.addClass(this._container, 'leaflet-crosshair');
+               this._url = url;
 
-                       this._map.fire('boxzoomstart');
-               }
+               var wmsParams = extend({}, this.defaultWmsParams);
 
-               this._point = this._map.mouseEventToContainerPoint(e);
+               // all keys that are not TileLayer options go to WMS params
+               for (var i in options) {
+                       if (!(i in this.options)) {
+                               wmsParams[i] = options[i];
+                       }
+               }
 
-               var bounds = new L.Bounds(this._point, this._startPoint),
-                   size = bounds.getSize();
+               options = setOptions(this, options);
 
-               L.DomUtil.setPosition(this._box, bounds.min);
+               var realRetina = options.detectRetina && retina ? 2 : 1;
+               var tileSize = this.getTileSize();
+               wmsParams.width = tileSize.x * realRetina;
+               wmsParams.height = tileSize.y * realRetina;
 
-               this._box.style.width  = size.x + 'px';
-               this._box.style.height = size.y + 'px';
+               this.wmsParams = wmsParams;
        },
 
-       _finish: function () {
-               if (this._moved) {
-                       L.DomUtil.remove(this._box);
-                       L.DomUtil.removeClass(this._container, 'leaflet-crosshair');
-               }
+       onAdd: function (map) {
 
-               L.DomUtil.enableTextSelection();
-               L.DomUtil.enableImageDrag();
+               this._crs = this.options.crs || map.options.crs;
+               this._wmsVersion = parseFloat(this.wmsParams.version);
 
-               L.DomEvent.off(document, {
-                       contextmenu: L.DomEvent.stop,
-                       mousemove: this._onMouseMove,
-                       mouseup: this._onMouseUp,
-                       keydown: this._onKeyDown
-               }, this);
-       },
+               var projectionKey = this._wmsVersion >= 1.3 ? 'crs' : 'srs';
+               this.wmsParams[projectionKey] = this._crs.code;
 
-       _onMouseUp: function (e) {
-               if ((e.which !== 1) && (e.button !== 1)) { return; }
+               TileLayer.prototype.onAdd.call(this, map);
+       },
 
-               this._finish();
+       getTileUrl: function (coords) {
 
-               if (!this._moved) { return; }
-               // Postpone to next JS tick so internal click event handling
-               // still see it as "moved".
-               setTimeout(L.bind(this._resetState, this), 0);
+               var tileBounds = this._tileCoordsToNwSe(coords),
+                   crs = this._crs,
+                   bounds = toBounds(crs.project(tileBounds[0]), crs.project(tileBounds[1])),
+                   min = bounds.min,
+                   max = bounds.max,
+                   bbox = (this._wmsVersion >= 1.3 && this._crs === EPSG4326 ?
+                   [min.y, min.x, max.y, max.x] :
+                   [min.x, min.y, max.x, max.y]).join(','),
+                   url = TileLayer.prototype.getTileUrl.call(this, coords);
+               return url +
+                       getParamString(this.wmsParams, url, this.options.uppercase) +
+                       (this.options.uppercase ? '&BBOX=' : '&bbox=') + bbox;
+       },
 
-               var bounds = new L.LatLngBounds(
-                       this._map.containerPointToLatLng(this._startPoint),
-                       this._map.containerPointToLatLng(this._point));
+       // @method setParams(params: Object, noRedraw?: Boolean): this
+       // Merges an object with the new parameters and re-requests tiles on the current screen (unless `noRedraw` was set to true).
+       setParams: function (params, noRedraw) {
 
-               this._map
-                       .fitBounds(bounds)
-                       .fire('boxzoomend', {boxZoomBounds: bounds});
-       },
+               extend(this.wmsParams, params);
 
-       _onKeyDown: function (e) {
-               if (e.keyCode === 27) {
-                       this._finish();
+               if (!noRedraw) {
+                       this.redraw();
                }
+
+               return this;
        }
 });
 
-// @section Handlers
-// @property boxZoom: Handler
-// Box (shift-drag with mouse) zoom handler.
-L.Map.addInitHook('addHandler', 'boxZoom', L.Map.BoxZoom);
 
+// @factory L.tileLayer.wms(baseUrl: String, options: TileLayer.WMS options)
+// Instantiates a WMS tile layer object given a base URL of the WMS service and a WMS parameters/options object.
+function tileLayerWMS(url, options) {
+       return new TileLayerWMS(url, options);
+}
 
+TileLayer.WMS = TileLayerWMS;
+tileLayer.wms = tileLayerWMS;
 
 /*
- * L.Map.Keyboard is handling keyboard interaction with the map, enabled by default.
+ * @class Renderer
+ * @inherits Layer
+ * @aka L.Renderer
+ *
+ * Base class for vector renderer implementations (`SVG`, `Canvas`). Handles the
+ * DOM container of the renderer, its bounds, and its zoom animation.
+ *
+ * A `Renderer` works as an implicit layer group for all `Path`s - the renderer
+ * itself can be added or removed to the map. All paths use a renderer, which can
+ * be implicit (the map will decide the type of renderer and use it automatically)
+ * or explicit (using the [`renderer`](#path-renderer) option of the path).
+ *
+ * Do not use this class directly, use `SVG` and `Canvas` instead.
+ *
+ * @event update: Event
+ * Fired when the renderer updates its bounds, center and zoom, for example when
+ * its map has moved
  */
 
-// @namespace Map
-// @section Keyboard Navigation Options
-L.Map.mergeOptions({
-       // @option keyboard: Boolean = true
-       // Makes the map focusable and allows users to navigate the map with keyboard
-       // arrows and `+`/`-` keys.
-       keyboard: true,
-
-       // @option keyboardPanDelta: Number = 80
-       // Amount of pixels to pan when pressing an arrow key.
-       keyboardPanDelta: 80
-});
+var Renderer = Layer.extend({
 
-L.Map.Keyboard = L.Handler.extend({
+       // @section
+       // @aka Renderer options
+       options: {
+               // @option padding: Number = 0.1
+               // How much to extend the clip area around the map view (relative to its size)
+               // e.g. 0.1 would be 10% of map view in each direction
+               padding: 0.1,
 
-       keyCodes: {
-               left:    [37],
-               right:   [39],
-               down:    [40],
-               up:      [38],
-               zoomIn:  [187, 107, 61, 171],
-               zoomOut: [189, 109, 54, 173]
+               // @option tolerance: Number = 0
+               // How much to extend click tolerance round a path/object on the map
+               tolerance : 0
        },
 
-       initialize: function (map) {
-               this._map = map;
-
-               this._setPanDelta(map.options.keyboardPanDelta);
-               this._setZoomDelta(map.options.zoomDelta);
+       initialize: function (options) {
+               setOptions(this, options);
+               stamp(this);
+               this._layers = this._layers || {};
        },
 
-       addHooks: function () {
-               var container = this._map._container;
+       onAdd: function () {
+               if (!this._container) {
+                       this._initContainer(); // defined by renderer implementations
 
-               // make the container focusable by tabbing
-               if (container.tabIndex <= 0) {
-                       container.tabIndex = '0';
+                       if (this._zoomAnimated) {
+                               addClass(this._container, 'leaflet-zoom-animated');
+                       }
                }
 
-               L.DomEvent.on(container, {
-                       focus: this._onFocus,
-                       blur: this._onBlur,
-                       mousedown: this._onMouseDown
-               }, this);
-
-               this._map.on({
-                       focus: this._addHooks,
-                       blur: this._removeHooks
-               }, this);
+               this.getPane().appendChild(this._container);
+               this._update();
+               this.on('update', this._updatePaths, this);
        },
 
-       removeHooks: function () {
-               this._removeHooks();
-
-               L.DomEvent.off(this._map._container, {
-                       focus: this._onFocus,
-                       blur: this._onBlur,
-                       mousedown: this._onMouseDown
-               }, this);
-
-               this._map.off({
-                       focus: this._addHooks,
-                       blur: this._removeHooks
-               }, this);
+       onRemove: function () {
+               this.off('update', this._updatePaths, this);
+               this._destroyContainer();
        },
 
-       _onMouseDown: function () {
-               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);
+       getEvents: function () {
+               var events = {
+                       viewreset: this._reset,
+                       zoom: this._onZoom,
+                       moveend: this._update,
+                       zoomend: this._onZoomEnd
+               };
+               if (this._zoomAnimated) {
+                       events.zoomanim = this._onAnimZoom;
+               }
+               return events;
        },
 
-       _onFocus: function () {
-               this._focused = true;
-               this._map.fire('focus');
+       _onAnimZoom: function (ev) {
+               this._updateTransform(ev.center, ev.zoom);
        },
 
-       _onBlur: function () {
-               this._focused = false;
-               this._map.fire('blur');
+       _onZoom: function () {
+               this._updateTransform(this._map.getCenter(), this._map.getZoom());
        },
 
-       _setPanDelta: function (panDelta) {
-               var keys = this._panKeys = {},
-                   codes = this.keyCodes,
-                   i, len;
+       _updateTransform: function (center, zoom) {
+               var scale = this._map.getZoomScale(zoom, this._zoom),
+                   position = getPosition(this._container),
+                   viewHalf = this._map.getSize().multiplyBy(0.5 + this.options.padding),
+                   currentCenterPoint = this._map.project(this._center, zoom),
+                   destCenterPoint = this._map.project(center, zoom),
+                   centerOffset = destCenterPoint.subtract(currentCenterPoint),
 
-               for (i = 0, len = codes.left.length; i < len; i++) {
-                       keys[codes.left[i]] = [-1 * panDelta, 0];
-               }
-               for (i = 0, len = codes.right.length; i < len; i++) {
-                       keys[codes.right[i]] = [panDelta, 0];
-               }
-               for (i = 0, len = codes.down.length; i < len; i++) {
-                       keys[codes.down[i]] = [0, panDelta];
-               }
-               for (i = 0, len = codes.up.length; i < len; i++) {
-                       keys[codes.up[i]] = [0, -1 * panDelta];
+                   topLeftOffset = viewHalf.multiplyBy(-scale).add(position).add(viewHalf).subtract(centerOffset);
+
+               if (any3d) {
+                       setTransform(this._container, topLeftOffset, scale);
+               } else {
+                       setPosition(this._container, topLeftOffset);
                }
        },
 
-       _setZoomDelta: function (zoomDelta) {
-               var keys = this._zoomKeys = {},
-                   codes = this.keyCodes,
-                   i, len;
+       _reset: function () {
+               this._update();
+               this._updateTransform(this._center, this._zoom);
 
-               for (i = 0, len = codes.zoomIn.length; i < len; i++) {
-                       keys[codes.zoomIn[i]] = zoomDelta;
-               }
-               for (i = 0, len = codes.zoomOut.length; i < len; i++) {
-                       keys[codes.zoomOut[i]] = -zoomDelta;
+               for (var id in this._layers) {
+                       this._layers[id]._reset();
                }
        },
 
-       _addHooks: function () {
-               L.DomEvent.on(document, 'keydown', this._onKeyDown, this);
+       _onZoomEnd: function () {
+               for (var id in this._layers) {
+                       this._layers[id]._project();
+               }
        },
 
-       _removeHooks: function () {
-               L.DomEvent.off(document, 'keydown', this._onKeyDown, this);
+       _updatePaths: function () {
+               for (var id in this._layers) {
+                       this._layers[id]._update();
+               }
        },
 
-       _onKeyDown: function (e) {
-               if (e.altKey || e.ctrlKey || e.metaKey) { return; }
-
-               var key = e.keyCode,
-                   map = this._map,
-                   offset;
-
-               if (key in this._panKeys) {
-
-                       if (map._panAnim && map._panAnim._inProgress) { return; }
-
-                       offset = this._panKeys[key];
-                       if (e.shiftKey) {
-                               offset = L.point(offset).multiplyBy(3);
-                       }
-
-                       map.panBy(offset);
-
-                       if (map.options.maxBounds) {
-                               map.panInsideBounds(map.options.maxBounds);
-                       }
-
-               } else if (key in this._zoomKeys) {
-                       map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
-
-               } else if (key === 27) {
-                       map.closePopup();
+       _update: function () {
+               // Update pixel bounds of renderer container (for positioning/sizing/clipping later)
+               // Subclasses are responsible of firing the 'update' event.
+               var p = this.options.padding,
+                   size = this._map.getSize(),
+                   min = this._map.containerPointToLayerPoint(size.multiplyBy(-p)).round();
 
-               } else {
-                       return;
-               }
+               this._bounds = new Bounds(min, min.add(size.multiplyBy(1 + p * 2)).round());
 
-               L.DomEvent.stop(e);
+               this._center = this._map.getCenter();
+               this._zoom = this._map.getZoom();
        }
 });
 
-// @section Handlers
-// @section Handlers
-// @property keyboard: Handler
-// Keyboard navigation handler.
-L.Map.addInitHook('addHandler', 'keyboard', L.Map.Keyboard);
-
-
-
 /*
- * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
- */
-
-
-/* @namespace Marker
- * @section Interaction handlers
+ * @class Canvas
+ * @inherits Renderer
+ * @aka L.Canvas
  *
- * Interaction handlers are properties of a marker instance that allow you to control interaction behavior in runtime, enabling or disabling certain features such as dragging (see `Handler` methods). Example:
+ * Allows vector layers to be displayed with [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).
+ * Inherits `Renderer`.
+ *
+ * Due to [technical limitations](http://caniuse.com/#search=canvas), Canvas is not
+ * available in all web browsers, notably IE8, and overlapping geometries might
+ * not display properly in some edge cases.
+ *
+ * @example
+ *
+ * Use Canvas by default for all paths in the map:
  *
  * ```js
- * marker.dragging.disable();
+ * var map = L.map('map', {
+ *     renderer: L.canvas()
+ * });
  * ```
  *
- * @property dragging: Handler
- * Marker dragging handler (by both mouse and touch).
+ * Use a Canvas renderer with extra padding for specific vector geometries:
+ *
+ * ```js
+ * var map = L.map('map');
+ * var myRenderer = L.canvas({ padding: 0.5 });
+ * var line = L.polyline( coordinates, { renderer: myRenderer } );
+ * var circle = L.circle( center, { renderer: myRenderer } );
+ * ```
  */
 
-L.Handler.MarkerDrag = L.Handler.extend({
-       initialize: function (marker) {
-               this._marker = marker;
+var Canvas = Renderer.extend({
+       getEvents: function () {
+               var events = Renderer.prototype.getEvents.call(this);
+               events.viewprereset = this._onViewPreReset;
+               return events;
        },
 
-       addHooks: function () {
-               var icon = this._marker._icon;
-
-               if (!this._draggable) {
-                       this._draggable = new L.Draggable(icon, icon, true);
-               }
+       _onViewPreReset: function () {
+               // Set a flag so that a viewprereset+moveend+viewreset only updates&redraws once
+               this._postponeUpdatePaths = true;
+       },
 
-               this._draggable.on({
-                       dragstart: this._onDragStart,
-                       drag: this._onDrag,
-                       dragend: this._onDragEnd
-               }, this).enable();
+       onAdd: function () {
+               Renderer.prototype.onAdd.call(this);
 
-               L.DomUtil.addClass(icon, 'leaflet-marker-draggable');
+               // Redraw vectors since canvas is cleared upon removal,
+               // in case of removing the renderer itself from the map.
+               this._draw();
        },
 
-       removeHooks: function () {
-               this._draggable.off({
-                       dragstart: this._onDragStart,
-                       drag: this._onDrag,
-                       dragend: this._onDragEnd
-               }, this).disable();
+       _initContainer: function () {
+               var container = this._container = document.createElement('canvas');
 
-               if (this._marker._icon) {
-                       L.DomUtil.removeClass(this._marker._icon, 'leaflet-marker-draggable');
-               }
-       },
+               on(container, 'mousemove', throttle(this._onMouseMove, 32, this), this);
+               on(container, 'click dblclick mousedown mouseup contextmenu', this._onClick, this);
+               on(container, 'mouseout', this._handleMouseOut, this);
 
-       moved: function () {
-               return this._draggable && this._draggable._moved;
+               this._ctx = container.getContext('2d');
        },
 
-       _onDragStart: function () {
-               // @section Dragging events
-               // @event dragstart: Event
-               // Fired when the user starts dragging the marker.
+       _destroyContainer: function () {
+               cancelAnimFrame(this._redrawRequest);
+               delete this._ctx;
+               remove(this._container);
+               off(this._container);
+               delete this._container;
+       },
 
-               // @event movestart: Event
-               // Fired when the marker starts moving (because of dragging).
+       _updatePaths: function () {
+               if (this._postponeUpdatePaths) { return; }
 
-               this._oldLatLng = this._marker.getLatLng();
-               this._marker
-                   .closePopup()
-                   .fire('movestart')
-                   .fire('dragstart');
+               var layer;
+               this._redrawBounds = null;
+               for (var id in this._layers) {
+                       layer = this._layers[id];
+                       layer._update();
+               }
+               this._redraw();
        },
 
-       _onDrag: function (e) {
-               var marker = this._marker,
-                   shadow = marker._shadow,
-                   iconPos = L.DomUtil.getPosition(marker._icon),
-                   latlng = marker._map.layerPointToLatLng(iconPos);
+       _update: function () {
+               if (this._map._animatingZoom && this._bounds) { return; }
 
-               // update shadow position
-               if (shadow) {
-                       L.DomUtil.setPosition(shadow, iconPos);
-               }
+               Renderer.prototype._update.call(this);
 
-               marker._latlng = latlng;
-               e.latlng = latlng;
-               e.oldLatLng = this._oldLatLng;
+               var b = this._bounds,
+                   container = this._container,
+                   size = b.getSize(),
+                   m = retina ? 2 : 1;
 
-               // @event drag: Event
-               // Fired repeatedly while the user drags the marker.
-               marker
-                   .fire('move', e)
-                   .fire('drag', e);
-       },
+               setPosition(container, b.min);
 
-       _onDragEnd: function (e) {
-               // @event dragend: DragEndEvent
-               // Fired when the user stops dragging the marker.
+               // set canvas size (also clearing it); use double size on retina
+               container.width = m * size.x;
+               container.height = m * size.y;
+               container.style.width = size.x + 'px';
+               container.style.height = size.y + 'px';
 
-               // @event moveend: Event
-               // Fired when the marker stops moving (because of dragging).
-               delete this._oldLatLng;
-               this._marker
-                   .fire('moveend')
-                   .fire('dragend', e);
-       }
-});
+               if (retina) {
+                       this._ctx.scale(2, 2);
+               }
 
+               // translate so we use the same path coordinates after canvas element moves
+               this._ctx.translate(-b.min.x, -b.min.y);
 
+               // Tell paths to redraw themselves
+               this.fire('update');
+       },
 
-/*
- * @class Control
- * @aka L.Control
- *
- * L.Control is a base class for implementing map controls. Handles positioning.
- * All other controls extend from this class.
- */
+       _reset: function () {
+               Renderer.prototype._reset.call(this);
 
-L.Control = L.Class.extend({
-       // @section
-       // @aka Control options
-       options: {
-               // @option position: String = 'topright'
-               // The position of the control (one of the map corners). Possible values are `'topleft'`,
-               // `'topright'`, `'bottomleft'` or `'bottomright'`
-               position: 'topright'
+               if (this._postponeUpdatePaths) {
+                       this._postponeUpdatePaths = false;
+                       this._updatePaths();
+               }
        },
 
-       initialize: function (options) {
-               L.setOptions(this, options);
+       _initPath: function (layer) {
+               this._updateDashArray(layer);
+               this._layers[stamp(layer)] = layer;
+
+               var order = layer._order = {
+                       layer: layer,
+                       prev: this._drawLast,
+                       next: null
+               };
+               if (this._drawLast) { this._drawLast.next = order; }
+               this._drawLast = order;
+               this._drawFirst = this._drawFirst || this._drawLast;
        },
 
-       /* @section
-        * Classes extending L.Control will inherit the following methods:
-        *
-        * @method getPosition: string
-        * Returns the position of the control.
-        */
-       getPosition: function () {
-               return this.options.position;
+       _addPath: function (layer) {
+               this._requestRedraw(layer);
        },
 
-       // @method setPosition(position: string): this
-       // Sets the position of the control.
-       setPosition: function (position) {
-               var map = this._map;
+       _removePath: function (layer) {
+               var order = layer._order;
+               var next = order.next;
+               var prev = order.prev;
 
-               if (map) {
-                       map.removeControl(this);
+               if (next) {
+                       next.prev = prev;
+               } else {
+                       this._drawLast = prev;
+               }
+               if (prev) {
+                       prev.next = next;
+               } else {
+                       this._drawFirst = next;
                }
 
-               this.options.position = position;
+               delete layer._order;
 
-               if (map) {
-                       map.addControl(this);
-               }
+               delete this._layers[stamp(layer)];
 
-               return this;
+               this._requestRedraw(layer);
        },
 
-       // @method getContainer: HTMLElement
-       // Returns the HTMLElement that contains the control.
-       getContainer: function () {
-               return this._container;
+       _updatePath: function (layer) {
+               // Redraw the union of the layer's old pixel
+               // bounds and the new pixel bounds.
+               this._extendRedrawBounds(layer);
+               layer._project();
+               layer._update();
+               // The redraw will extend the redraw bounds
+               // with the new pixel bounds.
+               this._requestRedraw(layer);
        },
 
-       // @method addTo(map: Map): this
-       // Adds the control to the given map.
-       addTo: function (map) {
-               this.remove();
-               this._map = map;
-
-               var container = this._container = this.onAdd(map),
-                   pos = this.getPosition(),
-                   corner = map._controlCorners[pos];
-
-               L.DomUtil.addClass(container, 'leaflet-control');
+       _updateStyle: function (layer) {
+               this._updateDashArray(layer);
+               this._requestRedraw(layer);
+       },
 
-               if (pos.indexOf('bottom') !== -1) {
-                       corner.insertBefore(container, corner.firstChild);
+       _updateDashArray: function (layer) {
+               if (typeof layer.options.dashArray === 'string') {
+                       var parts = layer.options.dashArray.split(/[, ]+/),
+                           dashArray = [],
+                           dashValue,
+                           i;
+                       for (i = 0; i < parts.length; i++) {
+                               dashValue = Number(parts[i]);
+                               // Ignore dash array containing invalid lengths
+                               if (isNaN(dashValue)) { return; }
+                               dashArray.push(dashValue);
+                       }
+                       layer.options._dashArray = dashArray;
                } else {
-                       corner.appendChild(container);
+                       layer.options._dashArray = layer.options.dashArray;
                }
+       },
 
-               return this;
+       _requestRedraw: function (layer) {
+               if (!this._map) { return; }
+
+               this._extendRedrawBounds(layer);
+               this._redrawRequest = this._redrawRequest || requestAnimFrame(this._redraw, this);
        },
 
-       // @method remove: this
-       // Removes the control from the map it is currently active on.
-       remove: function () {
-               if (!this._map) {
-                       return this;
+       _extendRedrawBounds: function (layer) {
+               if (layer._pxBounds) {
+                       var padding = (layer.options.weight || 0) + 1;
+                       this._redrawBounds = this._redrawBounds || new Bounds();
+                       this._redrawBounds.extend(layer._pxBounds.min.subtract([padding, padding]));
+                       this._redrawBounds.extend(layer._pxBounds.max.add([padding, padding]));
                }
+       },
 
-               L.DomUtil.remove(this._container);
+       _redraw: function () {
+               this._redrawRequest = null;
 
-               if (this.onRemove) {
-                       this.onRemove(this._map);
+               if (this._redrawBounds) {
+                       this._redrawBounds.min._floor();
+                       this._redrawBounds.max._ceil();
                }
 
-               this._map = null;
+               this._clear(); // clear layers in redraw bounds
+               this._draw(); // draw layers
 
-               return this;
+               this._redrawBounds = null;
        },
 
-       _refocusOnMap: function (e) {
-               // if map exists and event is not a keyboard event
-               if (this._map && e && e.screenX > 0 && e.screenY > 0) {
-                       this._map.getContainer().focus();
+       _clear: function () {
+               var bounds = this._redrawBounds;
+               if (bounds) {
+                       var size = bounds.getSize();
+                       this._ctx.clearRect(bounds.min.x, bounds.min.y, size.x, size.y);
+               } else {
+                       this._ctx.clearRect(0, 0, this._container.width, this._container.height);
                }
-       }
-});
+       },
 
-L.control = function (options) {
-       return new L.Control(options);
-};
+       _draw: function () {
+               var layer, bounds = this._redrawBounds;
+               this._ctx.save();
+               if (bounds) {
+                       var size = bounds.getSize();
+                       this._ctx.beginPath();
+                       this._ctx.rect(bounds.min.x, bounds.min.y, size.x, size.y);
+                       this._ctx.clip();
+               }
 
-/* @section Extension methods
- * @uninheritable
- *
- * Every control should extend from `L.Control` and (re-)implement the following methods.
- *
- * @method onAdd(map: Map): HTMLElement
- * Should return the container DOM element for the control and add listeners on relevant map events. Called on [`control.addTo(map)`](#control-addTo).
- *
- * @method onRemove(map: Map)
- * Optional method. Should contain all clean up code that removes the listeners previously added in [`onAdd`](#control-onadd). Called on [`control.remove()`](#control-remove).
- */
+               this._drawing = true;
 
-/* @namespace Map
- * @section Methods for Layers and Controls
- */
-L.Map.include({
-       // @method addControl(control: Control): this
-       // Adds the given control to the map
-       addControl: function (control) {
-               control.addTo(this);
-               return this;
-       },
+               for (var order = this._drawFirst; order; order = order.next) {
+                       layer = order.layer;
+                       if (!bounds || (layer._pxBounds && layer._pxBounds.intersects(bounds))) {
+                               layer._updatePath();
+                       }
+               }
 
-       // @method removeControl(control: Control): this
-       // Removes the given control from the map
-       removeControl: function (control) {
-               control.remove();
-               return this;
+               this._drawing = false;
+
+               this._ctx.restore();  // Restore state before clipping.
        },
 
-       _initControlPos: function () {
-               var corners = this._controlCorners = {},
-                   l = 'leaflet-',
-                   container = this._controlContainer =
-                           L.DomUtil.create('div', l + 'control-container', this._container);
+       _updatePoly: function (layer, closed) {
+               if (!this._drawing) { return; }
 
-               function createCorner(vSide, hSide) {
-                       var className = l + vSide + ' ' + l + hSide;
+               var i, j, len2, p,
+                   parts = layer._parts,
+                   len = parts.length,
+                   ctx = this._ctx;
+
+               if (!len) { return; }
 
-                       corners[vSide + hSide] = L.DomUtil.create('div', className, container);
+               ctx.beginPath();
+
+               for (i = 0; i < len; i++) {
+                       for (j = 0, len2 = parts[i].length; j < len2; j++) {
+                               p = parts[i][j];
+                               ctx[j ? 'lineTo' : 'moveTo'](p.x, p.y);
+                       }
+                       if (closed) {
+                               ctx.closePath();
+                       }
                }
 
-               createCorner('top', 'left');
-               createCorner('top', 'right');
-               createCorner('bottom', 'left');
-               createCorner('bottom', 'right');
+               this._fillStroke(ctx, layer);
+
+               // TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature
        },
 
-       _clearControlPos: function () {
-               L.DomUtil.remove(this._controlContainer);
-       }
-});
+       _updateCircle: function (layer) {
 
+               if (!this._drawing || layer._empty()) { return; }
 
+               var p = layer._point,
+                   ctx = this._ctx,
+                   r = Math.max(Math.round(layer._radius), 1),
+                   s = (Math.max(Math.round(layer._radiusY), 1) || r) / r;
 
-/*
- * @class Control.Zoom
- * @aka L.Control.Zoom
- * @inherits Control
- *
- * A basic zoom control with two buttons (zoom in and zoom out). It is put on the map by default unless you set its [`zoomControl` option](#map-zoomcontrol) to `false`. Extends `Control`.
- */
+               if (s !== 1) {
+                       ctx.save();
+                       ctx.scale(1, s);
+               }
 
-L.Control.Zoom = L.Control.extend({
-       // @section
-       // @aka Control.Zoom options
-       options: {
-               position: 'topleft',
+               ctx.beginPath();
+               ctx.arc(p.x, p.y / s, r, 0, Math.PI * 2, false);
 
-               // @option zoomInText: String = '+'
-               // The text set on the 'zoom in' button.
-               zoomInText: '+',
+               if (s !== 1) {
+                       ctx.restore();
+               }
 
-               // @option zoomInTitle: String = 'Zoom in'
-               // The title set on the 'zoom in' button.
-               zoomInTitle: 'Zoom in',
+               this._fillStroke(ctx, layer);
+       },
 
-               // @option zoomOutText: String = '-'
-               // The text set on the 'zoom out' button.
-               zoomOutText: '-',
+       _fillStroke: function (ctx, layer) {
+               var options = layer.options;
 
-               // @option zoomOutTitle: String = 'Zoom out'
-               // The title set on the 'zoom out' button.
-               zoomOutTitle: 'Zoom out'
-       },
+               if (options.fill) {
+                       ctx.globalAlpha = options.fillOpacity;
+                       ctx.fillStyle = options.fillColor || options.color;
+                       ctx.fill(options.fillRule || 'evenodd');
+               }
 
-       onAdd: function (map) {
-               var zoomName = 'leaflet-control-zoom',
-                   container = L.DomUtil.create('div', zoomName + ' leaflet-bar'),
-                   options = this.options;
+               if (options.stroke && options.weight !== 0) {
+                       if (ctx.setLineDash) {
+                               ctx.setLineDash(layer.options && layer.options._dashArray || []);
+                       }
+                       ctx.globalAlpha = options.opacity;
+                       ctx.lineWidth = options.weight;
+                       ctx.strokeStyle = options.color;
+                       ctx.lineCap = options.lineCap;
+                       ctx.lineJoin = options.lineJoin;
+                       ctx.stroke();
+               }
+       },
 
-               this._zoomInButton  = this._createButton(options.zoomInText, options.zoomInTitle,
-                       zoomName + '-in',  container, this._zoomIn);
-               this._zoomOutButton = this._createButton(options.zoomOutText, options.zoomOutTitle,
-                       zoomName + '-out', container, this._zoomOut);
+       // Canvas obviously doesn't have mouse events for individual drawn objects,
+       // so we emulate that by calculating what's under the mouse on mousemove/click manually
 
-               this._updateDisabled();
-               map.on('zoomend zoomlevelschange', this._updateDisabled, this);
+       _onClick: function (e) {
+               var point = this._map.mouseEventToLayerPoint(e), layer, clickedLayer;
 
-               return container;
+               for (var order = this._drawFirst; order; order = order.next) {
+                       layer = order.layer;
+                       if (layer.options.interactive && layer._containsPoint(point) && !this._map._draggableMoved(layer)) {
+                               clickedLayer = layer;
+                       }
+               }
+               if (clickedLayer)  {
+                       fakeStop(e);
+                       this._fireEvent([clickedLayer], e);
+               }
        },
 
-       onRemove: function (map) {
-               map.off('zoomend zoomlevelschange', this._updateDisabled, this);
-       },
+       _onMouseMove: function (e) {
+               if (!this._map || this._map.dragging.moving() || this._map._animatingZoom) { return; }
 
-       disable: function () {
-               this._disabled = true;
-               this._updateDisabled();
-               return this;
+               var point = this._map.mouseEventToLayerPoint(e);
+               this._handleMouseHover(e, point);
        },
 
-       enable: function () {
-               this._disabled = false;
-               this._updateDisabled();
-               return this;
-       },
 
-       _zoomIn: function (e) {
-               if (!this._disabled && this._map._zoom < this._map.getMaxZoom()) {
-                       this._map.zoomIn(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
+       _handleMouseOut: function (e) {
+               var layer = this._hoveredLayer;
+               if (layer) {
+                       // if we're leaving the layer, fire mouseout
+                       removeClass(this._container, 'leaflet-interactive');
+                       this._fireEvent([layer], e, 'mouseout');
+                       this._hoveredLayer = null;
                }
        },
 
-       _zoomOut: function (e) {
-               if (!this._disabled && this._map._zoom > this._map.getMinZoom()) {
-                       this._map.zoomOut(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
+       _handleMouseHover: function (e, point) {
+               var layer, candidateHoveredLayer;
+
+               for (var order = this._drawFirst; order; order = order.next) {
+                       layer = order.layer;
+                       if (layer.options.interactive && layer._containsPoint(point)) {
+                               candidateHoveredLayer = layer;
+                       }
+               }
+
+               if (candidateHoveredLayer !== this._hoveredLayer) {
+                       this._handleMouseOut(e);
+
+                       if (candidateHoveredLayer) {
+                               addClass(this._container, 'leaflet-interactive'); // change cursor
+                               this._fireEvent([candidateHoveredLayer], e, 'mouseover');
+                               this._hoveredLayer = candidateHoveredLayer;
+                       }
+               }
+
+               if (this._hoveredLayer) {
+                       this._fireEvent([this._hoveredLayer], e);
                }
        },
 
-       _createButton: function (html, title, className, container, fn) {
-               var link = L.DomUtil.create('a', className, container);
-               link.innerHTML = html;
-               link.href = '#';
-               link.title = title;
+       _fireEvent: function (layers, e, type) {
+               this._map._fireDOMEvent(e, type || e.type, layers);
+       },
+
+       _bringToFront: function (layer) {
+               var order = layer._order;
 
-               L.DomEvent
-                   .on(link, 'mousedown dblclick', L.DomEvent.stopPropagation)
-                   .on(link, 'click', L.DomEvent.stop)
-                   .on(link, 'click', fn, this)
-                   .on(link, 'click', this._refocusOnMap, this);
+               if (!order) { return; }
 
-               return link;
+               var next = order.next;
+               var prev = order.prev;
+
+               if (next) {
+                       next.prev = prev;
+               } else {
+                       // Already last
+                       return;
+               }
+               if (prev) {
+                       prev.next = next;
+               } else if (next) {
+                       // Update first entry unless this is the
+                       // single entry
+                       this._drawFirst = next;
+               }
+
+               order.prev = this._drawLast;
+               this._drawLast.next = order;
+
+               order.next = null;
+               this._drawLast = order;
+
+               this._requestRedraw(layer);
        },
 
-       _updateDisabled: function () {
-               var map = this._map,
-                   className = 'leaflet-disabled';
+       _bringToBack: function (layer) {
+               var order = layer._order;
 
-               L.DomUtil.removeClass(this._zoomInButton, className);
-               L.DomUtil.removeClass(this._zoomOutButton, className);
+               if (!order) { return; }
 
-               if (this._disabled || map._zoom === map.getMinZoom()) {
-                       L.DomUtil.addClass(this._zoomOutButton, className);
+               var next = order.next;
+               var prev = order.prev;
+
+               if (prev) {
+                       prev.next = next;
+               } else {
+                       // Already first
+                       return;
                }
-               if (this._disabled || map._zoom === map.getMaxZoom()) {
-                       L.DomUtil.addClass(this._zoomInButton, className);
+               if (next) {
+                       next.prev = prev;
+               } else if (prev) {
+                       // Update last entry unless this is the
+                       // single entry
+                       this._drawLast = prev;
                }
-       }
-});
 
-// @namespace Map
-// @section Control options
-// @option zoomControl: Boolean = true
-// Whether a [zoom control](#control-zoom) is added to the map by default.
-L.Map.mergeOptions({
-       zoomControl: true
-});
+               order.prev = null;
 
-L.Map.addInitHook(function () {
-       if (this.options.zoomControl) {
-               this.zoomControl = new L.Control.Zoom();
-               this.addControl(this.zoomControl);
+               order.next = this._drawFirst;
+               this._drawFirst.prev = order;
+               this._drawFirst = order;
+
+               this._requestRedraw(layer);
        }
 });
 
-// @namespace Control.Zoom
-// @factory L.control.zoom(options: Control.Zoom options)
-// Creates a zoom control
-L.control.zoom = function (options) {
-       return new L.Control.Zoom(options);
-};
-
-
+// @factory L.canvas(options?: Renderer options)
+// Creates a Canvas renderer with the given options.
+function canvas$1(options) {
+       return canvas ? new Canvas(options) : null;
+}
 
 /*
- * @class Control.Attribution
- * @aka L.Control.Attribution
- * @inherits Control
- *
- * The attribution control allows you to display attribution data in a small text box on a map. It is put on the map by default unless you set its [`attributionControl` option](#map-attributioncontrol) to `false`, and it fetches attribution texts from layers with the [`getAttribution` method](#layer-getattribution) automatically. Extends Control.
+ * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!
  */
 
-L.Control.Attribution = L.Control.extend({
-       // @section
-       // @aka Control.Attribution options
-       options: {
-               position: 'bottomright',
-
-               // @option prefix: String = 'Leaflet'
-               // The HTML text shown before the attributions. Pass `false` to disable.
-               prefix: '<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'
-       },
-
-       initialize: function (options) {
-               L.setOptions(this, options);
 
-               this._attributions = {};
-       },
+var vmlCreate = (function () {
+       try {
+               document.namespaces.add('lvml', 'urn:schemas-microsoft-com:vml');
+               return function (name) {
+                       return document.createElement('<lvml:' + name + ' class="lvml">');
+               };
+       } catch (e) {
+               return function (name) {
+                       return document.createElement('<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
+               };
+       }
+})();
 
-       onAdd: function (map) {
-               map.attributionControl = this;
-               this._container = L.DomUtil.create('div', 'leaflet-control-attribution');
-               if (L.DomEvent) {
-                       L.DomEvent.disableClickPropagation(this._container);
-               }
 
-               // TODO ugly, refactor
-               for (var i in map._layers) {
-                       if (map._layers[i].getAttribution) {
-                               this.addAttribution(map._layers[i].getAttribution());
-                       }
-               }
+/*
+ * @class SVG
+ *
+ *
+ * VML was deprecated in 2012, which means VML functionality exists only for backwards compatibility
+ * with old versions of Internet Explorer.
+ */
 
-               this._update();
+// mixin to redefine some SVG methods to handle VML syntax which is similar but with some differences
+var vmlMixin = {
 
-               return this._container;
+       _initContainer: function () {
+               this._container = create$1('div', 'leaflet-vml-container');
        },
 
-       // @method setPrefix(prefix: String): this
-       // Sets the text before the attributions.
-       setPrefix: function (prefix) {
-               this.options.prefix = prefix;
-               this._update();
-               return this;
+       _update: function () {
+               if (this._map._animatingZoom) { return; }
+               Renderer.prototype._update.call(this);
+               this.fire('update');
        },
 
-       // @method addAttribution(text: String): this
-       // Adds an attribution text (e.g. `'Vector data &copy; Mapbox'`).
-       addAttribution: function (text) {
-               if (!text) { return this; }
+       _initPath: function (layer) {
+               var container = layer._container = vmlCreate('shape');
 
-               if (!this._attributions[text]) {
-                       this._attributions[text] = 0;
-               }
-               this._attributions[text]++;
+               addClass(container, 'leaflet-vml-shape ' + (this.options.className || ''));
+
+               container.coordsize = '1 1';
 
-               this._update();
+               layer._path = vmlCreate('path');
+               container.appendChild(layer._path);
 
-               return this;
+               this._updateStyle(layer);
+               this._layers[stamp(layer)] = layer;
        },
 
-       // @method removeAttribution(text: String): this
-       // Removes an attribution text.
-       removeAttribution: function (text) {
-               if (!text) { return this; }
+       _addPath: function (layer) {
+               var container = layer._container;
+               this._container.appendChild(container);
 
-               if (this._attributions[text]) {
-                       this._attributions[text]--;
-                       this._update();
+               if (layer.options.interactive) {
+                       layer.addInteractiveTarget(container);
                }
+       },
 
-               return this;
+       _removePath: function (layer) {
+               var container = layer._container;
+               remove(container);
+               layer.removeInteractiveTarget(container);
+               delete this._layers[stamp(layer)];
        },
 
-       _update: function () {
-               if (!this._map) { return; }
+       _updateStyle: function (layer) {
+               var stroke = layer._stroke,
+                   fill = layer._fill,
+                   options = layer.options,
+                   container = layer._container;
 
-               var attribs = [];
+               container.stroked = !!options.stroke;
+               container.filled = !!options.fill;
 
-               for (var i in this._attributions) {
-                       if (this._attributions[i]) {
-                               attribs.push(i);
+               if (options.stroke) {
+                       if (!stroke) {
+                               stroke = layer._stroke = vmlCreate('stroke');
                        }
-               }
+                       container.appendChild(stroke);
+                       stroke.weight = options.weight + 'px';
+                       stroke.color = options.color;
+                       stroke.opacity = options.opacity;
 
-               var prefixAndAttribs = [];
+                       if (options.dashArray) {
+                               stroke.dashStyle = isArray(options.dashArray) ?
+                                   options.dashArray.join(' ') :
+                                   options.dashArray.replace(/( *, *)/g, ' ');
+                       } else {
+                               stroke.dashStyle = '';
+                       }
+                       stroke.endcap = options.lineCap.replace('butt', 'flat');
+                       stroke.joinstyle = options.lineJoin;
 
-               if (this.options.prefix) {
-                       prefixAndAttribs.push(this.options.prefix);
+               } else if (stroke) {
+                       container.removeChild(stroke);
+                       layer._stroke = null;
                }
-               if (attribs.length) {
-                       prefixAndAttribs.push(attribs.join(', '));
+
+               if (options.fill) {
+                       if (!fill) {
+                               fill = layer._fill = vmlCreate('fill');
+                       }
+                       container.appendChild(fill);
+                       fill.color = options.fillColor || options.color;
+                       fill.opacity = options.fillOpacity;
+
+               } else if (fill) {
+                       container.removeChild(fill);
+                       layer._fill = null;
                }
+       },
 
-               this._container.innerHTML = prefixAndAttribs.join(' | ');
-       }
-});
+       _updateCircle: function (layer) {
+               var p = layer._point.round(),
+                   r = Math.round(layer._radius),
+                   r2 = Math.round(layer._radiusY || r);
 
-// @namespace Map
-// @section Control options
-// @option attributionControl: Boolean = true
-// Whether a [attribution control](#control-attribution) is added to the map by default.
-L.Map.mergeOptions({
-       attributionControl: true
-});
+               this._setPath(layer, layer._empty() ? 'M0 0' :
+                       'AL ' + p.x + ',' + p.y + ' ' + r + ',' + r2 + ' 0,' + (65535 * 360));
+       },
 
-L.Map.addInitHook(function () {
-       if (this.options.attributionControl) {
-               new L.Control.Attribution().addTo(this);
-       }
-});
+       _setPath: function (layer, path) {
+               layer._path.v = path;
+       },
 
-// @namespace Control.Attribution
-// @factory L.control.attribution(options: Control.Attribution options)
-// Creates an attribution control.
-L.control.attribution = function (options) {
-       return new L.Control.Attribution(options);
-};
+       _bringToFront: function (layer) {
+               toFront(layer._container);
+       },
 
+       _bringToBack: function (layer) {
+               toBack(layer._container);
+       }
+};
 
+var create$2 = vml ? vmlCreate : svgCreate;
 
 /*
- * @class Control.Scale
- * @aka L.Control.Scale
- * @inherits Control
+ * @class SVG
+ * @inherits Renderer
+ * @aka L.SVG
  *
- * A simple scale control that shows the scale of the current center of screen in metric (m/km) and imperial (mi/ft) systems. Extends `Control`.
+ * Allows vector layers to be displayed with [SVG](https://developer.mozilla.org/docs/Web/SVG).
+ * Inherits `Renderer`.
+ *
+ * Due to [technical limitations](http://caniuse.com/#search=svg), SVG is not
+ * available in all web browsers, notably Android 2.x and 3.x.
+ *
+ * Although SVG is not available on IE7 and IE8, these browsers support
+ * [VML](https://en.wikipedia.org/wiki/Vector_Markup_Language)
+ * (a now deprecated technology), and the SVG renderer will fall back to VML in
+ * this case.
  *
  * @example
  *
+ * Use SVG by default for all paths in the map:
+ *
  * ```js
- * L.control.scale().addTo(map);
+ * var map = L.map('map', {
+ *     renderer: L.svg()
+ * });
+ * ```
+ *
+ * Use a SVG renderer with extra padding for specific vector geometries:
+ *
+ * ```js
+ * var map = L.map('map');
+ * var myRenderer = L.svg({ padding: 0.5 });
+ * var line = L.polyline( coordinates, { renderer: myRenderer } );
+ * var circle = L.circle( center, { renderer: myRenderer } );
  * ```
  */
 
-L.Control.Scale = L.Control.extend({
-       // @section
-       // @aka Control.Scale options
-       options: {
-               position: 'bottomleft',
+var SVG = Renderer.extend({
 
-               // @option maxWidth: Number = 100
-               // Maximum width of the control in pixels. The width is set dynamically to show round values (e.g. 100, 200, 500).
-               maxWidth: 100,
+       getEvents: function () {
+               var events = Renderer.prototype.getEvents.call(this);
+               events.zoomstart = this._onZoomStart;
+               return events;
+       },
 
-               // @option metric: Boolean = True
-               // Whether to show the metric scale line (m/km).
-               metric: true,
+       _initContainer: function () {
+               this._container = create$2('svg');
 
-               // @option imperial: Boolean = True
-               // Whether to show the imperial scale line (mi/ft).
-               imperial: true
+               // makes it possible to click through svg root; we'll reset it back in individual paths
+               this._container.setAttribute('pointer-events', 'none');
 
-               // @option updateWhenIdle: Boolean = false
-               // If `true`, the control is updated on [`moveend`](#map-moveend), otherwise it's always up-to-date (updated on [`move`](#map-move)).
+               this._rootGroup = create$2('g');
+               this._container.appendChild(this._rootGroup);
        },
 
-       onAdd: function (map) {
-               var className = 'leaflet-control-scale',
-                   container = L.DomUtil.create('div', className),
-                   options = this.options;
+       _destroyContainer: function () {
+               remove(this._container);
+               off(this._container);
+               delete this._container;
+               delete this._rootGroup;
+               delete this._svgSize;
+       },
 
-               this._addScales(options, className + '-line', container);
+       _onZoomStart: function () {
+               // Drag-then-pinch interactions might mess up the center and zoom.
+               // In this case, the easiest way to prevent this is re-do the renderer
+               //   bounds and padding when the zooming starts.
+               this._update();
+       },
 
-               map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
-               map.whenReady(this._update, this);
+       _update: function () {
+               if (this._map._animatingZoom && this._bounds) { return; }
 
-               return container;
+               Renderer.prototype._update.call(this);
+
+               var b = this._bounds,
+                   size = b.getSize(),
+                   container = this._container;
+
+               // set size of svg-container if changed
+               if (!this._svgSize || !this._svgSize.equals(size)) {
+                       this._svgSize = size;
+                       container.setAttribute('width', size.x);
+                       container.setAttribute('height', size.y);
+               }
+
+               // movement: update container viewBox so that we don't have to change coordinates of individual layers
+               setPosition(container, b.min);
+               container.setAttribute('viewBox', [b.min.x, b.min.y, size.x, size.y].join(' '));
+
+               this.fire('update');
        },
 
-       onRemove: function (map) {
-               map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+       // methods below are called by vector layers implementations
+
+       _initPath: function (layer) {
+               var path = layer._path = create$2('path');
+
+               // @namespace Path
+               // @option className: String = null
+               // Custom class name set on an element. Only for SVG renderer.
+               if (layer.options.className) {
+                       addClass(path, layer.options.className);
+               }
+
+               if (layer.options.interactive) {
+                       addClass(path, 'leaflet-interactive');
+               }
+
+               this._updateStyle(layer);
+               this._layers[stamp(layer)] = layer;
        },
 
-       _addScales: function (options, className, container) {
-               if (options.metric) {
-                       this._mScale = L.DomUtil.create('div', className, container);
+       _addPath: function (layer) {
+               if (!this._rootGroup) { this._initContainer(); }
+               this._rootGroup.appendChild(layer._path);
+               layer.addInteractiveTarget(layer._path);
+       },
+
+       _removePath: function (layer) {
+               remove(layer._path);
+               layer.removeInteractiveTarget(layer._path);
+               delete this._layers[stamp(layer)];
+       },
+
+       _updatePath: function (layer) {
+               layer._project();
+               layer._update();
+       },
+
+       _updateStyle: function (layer) {
+               var path = layer._path,
+                   options = layer.options;
+
+               if (!path) { return; }
+
+               if (options.stroke) {
+                       path.setAttribute('stroke', options.color);
+                       path.setAttribute('stroke-opacity', options.opacity);
+                       path.setAttribute('stroke-width', options.weight);
+                       path.setAttribute('stroke-linecap', options.lineCap);
+                       path.setAttribute('stroke-linejoin', options.lineJoin);
+
+                       if (options.dashArray) {
+                               path.setAttribute('stroke-dasharray', options.dashArray);
+                       } else {
+                               path.removeAttribute('stroke-dasharray');
+                       }
+
+                       if (options.dashOffset) {
+                               path.setAttribute('stroke-dashoffset', options.dashOffset);
+                       } else {
+                               path.removeAttribute('stroke-dashoffset');
+                       }
+               } else {
+                       path.setAttribute('stroke', 'none');
                }
-               if (options.imperial) {
-                       this._iScale = L.DomUtil.create('div', className, container);
+
+               if (options.fill) {
+                       path.setAttribute('fill', options.fillColor || options.color);
+                       path.setAttribute('fill-opacity', options.fillOpacity);
+                       path.setAttribute('fill-rule', options.fillRule || 'evenodd');
+               } else {
+                       path.setAttribute('fill', 'none');
                }
        },
 
-       _update: function () {
-               var map = this._map,
-                   y = map.getSize().y / 2;
+       _updatePoly: function (layer, closed) {
+               this._setPath(layer, pointsToPath(layer._parts, closed));
+       },
+
+       _updateCircle: function (layer) {
+               var p = layer._point,
+                   r = Math.max(Math.round(layer._radius), 1),
+                   r2 = Math.max(Math.round(layer._radiusY), 1) || r,
+                   arc = 'a' + r + ',' + r2 + ' 0 1,0 ';
+
+               // drawing a circle with two half-arcs
+               var d = layer._empty() ? 'M0 0' :
+                       'M' + (p.x - r) + ',' + p.y +
+                       arc + (r * 2) + ',0 ' +
+                       arc + (-r * 2) + ',0 ';
 
-               var maxMeters = map.distance(
-                               map.containerPointToLatLng([0, y]),
-                               map.containerPointToLatLng([this.options.maxWidth, y]));
+               this._setPath(layer, d);
+       },
 
-               this._updateScales(maxMeters);
+       _setPath: function (layer, path) {
+               layer._path.setAttribute('d', path);
        },
 
-       _updateScales: function (maxMeters) {
-               if (this.options.metric && maxMeters) {
-                       this._updateMetric(maxMeters);
-               }
-               if (this.options.imperial && maxMeters) {
-                       this._updateImperial(maxMeters);
-               }
+       // SVG does not have the concept of zIndex so we resort to changing the DOM order of elements
+       _bringToFront: function (layer) {
+               toFront(layer._path);
        },
 
-       _updateMetric: function (maxMeters) {
-               var meters = this._getRoundNum(maxMeters),
-                   label = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km';
+       _bringToBack: function (layer) {
+               toBack(layer._path);
+       }
+});
 
-               this._updateScale(this._mScale, label, meters / maxMeters);
-       },
+if (vml) {
+       SVG.include(vmlMixin);
+}
 
-       _updateImperial: function (maxMeters) {
-               var maxFeet = maxMeters * 3.2808399,
-                   maxMiles, miles, feet;
+// @namespace SVG
+// @factory L.svg(options?: Renderer options)
+// Creates a SVG renderer with the given options.
+function svg$1(options) {
+       return svg || vml ? new SVG(options) : null;
+}
 
-               if (maxFeet > 5280) {
-                       maxMiles = maxFeet / 5280;
-                       miles = this._getRoundNum(maxMiles);
-                       this._updateScale(this._iScale, miles + ' mi', miles / maxMiles);
+Map.include({
+       // @namespace Map; @method getRenderer(layer: Path): Renderer
+       // Returns the instance of `Renderer` that should be used to render the given
+       // `Path`. It will ensure that the `renderer` options of the map and paths
+       // are respected, and that the renderers do exist on the map.
+       getRenderer: function (layer) {
+               // @namespace Path; @option renderer: Renderer
+               // Use this specific instance of `Renderer` for this path. Takes
+               // precedence over the map's [default renderer](#map-renderer).
+               var renderer = layer.options.renderer || this._getPaneRenderer(layer.options.pane) || this.options.renderer || this._renderer;
 
-               } else {
-                       feet = this._getRoundNum(maxFeet);
-                       this._updateScale(this._iScale, feet + ' ft', feet / maxFeet);
+               if (!renderer) {
+                       renderer = this._renderer = this._createRenderer();
                }
-       },
 
-       _updateScale: function (scale, text, ratio) {
-               scale.style.width = Math.round(this.options.maxWidth * ratio) + 'px';
-               scale.innerHTML = text;
+               if (!this.hasLayer(renderer)) {
+                       this.addLayer(renderer);
+               }
+               return renderer;
        },
 
-       _getRoundNum: function (num) {
-               var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1),
-                   d = num / pow10;
+       _getPaneRenderer: function (name) {
+               if (name === 'overlayPane' || name === undefined) {
+                       return false;
+               }
 
-               d = d >= 10 ? 10 :
-                   d >= 5 ? 5 :
-                   d >= 3 ? 3 :
-                   d >= 2 ? 2 : 1;
+               var renderer = this._paneRenderers[name];
+               if (renderer === undefined) {
+                       renderer = this._createRenderer({pane: name});
+                       this._paneRenderers[name] = renderer;
+               }
+               return renderer;
+       },
 
-               return pow10 * d;
+       _createRenderer: function (options) {
+               // @namespace Map; @option preferCanvas: Boolean = false
+               // Whether `Path`s should be rendered on a `Canvas` renderer.
+               // By default, all `Path`s are rendered in a `SVG` renderer.
+               return (this.options.preferCanvas && canvas$1(options)) || svg$1(options);
        }
 });
 
-
-// @factory L.control.scale(options?: Control.Scale options)
-// Creates an scale control with the given options.
-L.control.scale = function (options) {
-       return new L.Control.Scale(options);
-};
-
-
+/*
+ * L.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds object.
+ */
 
 /*
- * @class Control.Layers
- * @aka L.Control.Layers
- * @inherits Control
+ * @class Rectangle
+ * @aka L.Rectangle
+ * @inherits Polygon
  *
- * The layers control gives users the ability to switch between different base layers and switch overlays on/off (check out the [detailed example](http://leafletjs.com/examples/layers-control.html)). Extends `Control`.
+ * A class for drawing rectangle overlays on a map. Extends `Polygon`.
  *
  * @example
  *
  * ```js
- * var baseLayers = {
- *     "Mapbox": mapbox,
- *     "OpenStreetMap": osm
- * };
- *
- * var overlays = {
- *     "Marker": marker,
- *     "Roads": roadsLayer
- * };
- *
- * L.control.layers(baseLayers, overlays).addTo(map);
- * ```
+ * // define rectangle geographical bounds
+ * var bounds = [[54.559322, -5.767822], [56.1210604, -3.021240]];
  *
- * The `baseLayers` and `overlays` parameters are object literals with layer names as keys and `Layer` objects as values:
+ * // create an orange rectangle
+ * L.rectangle(bounds, {color: "#ff7800", weight: 1}).addTo(map);
  *
- * ```js
- * {
- *     "<someName1>": layer1,
- *     "<someName2>": layer2
- * }
+ * // zoom the map to the rectangle bounds
+ * map.fitBounds(bounds);
  * ```
  *
- * The layer names can contain HTML, which allows you to add additional styling to the items:
- *
- * ```js
- * {"<img src='my-layer-icon' /> <span class='my-layer-item'>My Layer</span>": myLayer}
- * ```
  */
 
 
-L.Control.Layers = L.Control.extend({
-       // @section
-       // @aka Control.Layers options
-       options: {
-               // @option collapsed: Boolean = true
-               // If `true`, the control will be collapsed into an icon and expanded on mouse hover or touch.
-               collapsed: true,
-               position: 'topright',
-
-               // @option autoZIndex: Boolean = true
-               // If `true`, the control will assign zIndexes in increasing order to all of its layers so that the order is preserved when switching them on/off.
-               autoZIndex: true,
-
-               // @option hideSingleBase: Boolean = false
-               // If `true`, the base layers in the control will be hidden when there is only one.
-               hideSingleBase: false
+var Rectangle = Polygon.extend({
+       initialize: function (latLngBounds, options) {
+               Polygon.prototype.initialize.call(this, this._boundsToLatLngs(latLngBounds), options);
        },
 
-       initialize: function (baseLayers, overlays, options) {
-               L.setOptions(this, options);
+       // @method setBounds(latLngBounds: LatLngBounds): this
+       // Redraws the rectangle with the passed bounds.
+       setBounds: function (latLngBounds) {
+               return this.setLatLngs(this._boundsToLatLngs(latLngBounds));
+       },
 
-               this._layers = [];
-               this._lastZIndex = 0;
-               this._handlingClick = false;
+       _boundsToLatLngs: function (latLngBounds) {
+               latLngBounds = toLatLngBounds(latLngBounds);
+               return [
+                       latLngBounds.getSouthWest(),
+                       latLngBounds.getNorthWest(),
+                       latLngBounds.getNorthEast(),
+                       latLngBounds.getSouthEast()
+               ];
+       }
+});
 
-               for (var i in baseLayers) {
-                       this._addLayer(baseLayers[i], i);
-               }
 
-               for (i in overlays) {
-                       this._addLayer(overlays[i], i, true);
-               }
-       },
+// @factory L.rectangle(latLngBounds: LatLngBounds, options?: Polyline options)
+function rectangle(latLngBounds, options) {
+       return new Rectangle(latLngBounds, options);
+}
 
-       onAdd: function (map) {
-               this._initLayout();
-               this._update();
+SVG.create = create$2;
+SVG.pointsToPath = pointsToPath;
 
-               this._map = map;
-               map.on('zoomend', this._checkDisabledLayers, this);
+GeoJSON.geometryToLayer = geometryToLayer;
+GeoJSON.coordsToLatLng = coordsToLatLng;
+GeoJSON.coordsToLatLngs = coordsToLatLngs;
+GeoJSON.latLngToCoords = latLngToCoords;
+GeoJSON.latLngsToCoords = latLngsToCoords;
+GeoJSON.getFeature = getFeature;
+GeoJSON.asFeature = asFeature;
 
-               return this._container;
-       },
+/*
+ * L.Handler.BoxZoom is used to add shift-drag zoom interaction to the map
+ * (zoom to a selected bounding box), enabled by default.
+ */
 
-       onRemove: function () {
-               this._map.off('zoomend', this._checkDisabledLayers, this);
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+       // @option boxZoom: Boolean = true
+       // Whether the map can be zoomed to a rectangular area specified by
+       // dragging the mouse while pressing the shift key.
+       boxZoom: true
+});
 
-               for (var i = 0; i < this._layers.length; i++) {
-                       this._layers[i].layer.off('add remove', this._onLayerChange, this);
-               }
+var BoxZoom = Handler.extend({
+       initialize: function (map) {
+               this._map = map;
+               this._container = map._container;
+               this._pane = map._panes.overlayPane;
+               this._resetStateTimeout = 0;
+               map.on('unload', this._destroy, this);
        },
 
-       // @method addBaseLayer(layer: Layer, name: String): this
-       // Adds a base layer (radio button entry) with the given name to the control.
-       addBaseLayer: function (layer, name) {
-               this._addLayer(layer, name);
-               return (this._map) ? this._update() : this;
+       addHooks: function () {
+               on(this._container, 'mousedown', this._onMouseDown, this);
        },
 
-       // @method addOverlay(layer: Layer, name: String): this
-       // Adds an overlay (checkbox entry) with the given name to the control.
-       addOverlay: function (layer, name) {
-               this._addLayer(layer, name, true);
-               return (this._map) ? this._update() : this;
+       removeHooks: function () {
+               off(this._container, 'mousedown', this._onMouseDown, this);
        },
 
-       // @method removeLayer(layer: Layer): this
-       // Remove the given layer from the control.
-       removeLayer: function (layer) {
-               layer.off('add remove', this._onLayerChange, this);
-
-               var obj = this._getLayer(L.stamp(layer));
-               if (obj) {
-                       this._layers.splice(this._layers.indexOf(obj), 1);
-               }
-               return (this._map) ? this._update() : this;
+       moved: function () {
+               return this._moved;
        },
 
-       // @method expand(): this
-       // Expand the control container if collapsed.
-       expand: function () {
-               L.DomUtil.addClass(this._container, 'leaflet-control-layers-expanded');
-               this._form.style.height = null;
-               var acceptableHeight = this._map.getSize().y - (this._container.offsetTop + 50);
-               if (acceptableHeight < this._form.clientHeight) {
-                       L.DomUtil.addClass(this._form, 'leaflet-control-layers-scrollbar');
-                       this._form.style.height = acceptableHeight + 'px';
-               } else {
-                       L.DomUtil.removeClass(this._form, 'leaflet-control-layers-scrollbar');
-               }
-               this._checkDisabledLayers();
-               return this;
+       _destroy: function () {
+               remove(this._pane);
+               delete this._pane;
        },
 
-       // @method collapse(): this
-       // Collapse the control container if expanded.
-       collapse: function () {
-               L.DomUtil.removeClass(this._container, 'leaflet-control-layers-expanded');
-               return this;
+       _resetState: function () {
+               this._resetStateTimeout = 0;
+               this._moved = false;
        },
 
-       _initLayout: function () {
-               var className = 'leaflet-control-layers',
-                   container = this._container = L.DomUtil.create('div', className);
+       _clearDeferredResetState: function () {
+               if (this._resetStateTimeout !== 0) {
+                       clearTimeout(this._resetStateTimeout);
+                       this._resetStateTimeout = 0;
+               }
+       },
 
-               // makes this work on IE touch devices by stopping it from firing a mouseout event when the touch is released
-               container.setAttribute('aria-haspopup', true);
+       _onMouseDown: function (e) {
+               if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
 
-               L.DomEvent.disableClickPropagation(container);
-               if (!L.Browser.touch) {
-                       L.DomEvent.disableScrollPropagation(container);
-               }
+               // Clear the deferred resetState if it hasn't executed yet, otherwise it
+               // will interrupt the interaction and orphan a box element in the container.
+               this._clearDeferredResetState();
+               this._resetState();
 
-               var form = this._form = L.DomUtil.create('form', className + '-list');
+               disableTextSelection();
+               disableImageDrag();
 
-               if (this.options.collapsed) {
-                       if (!L.Browser.android) {
-                               L.DomEvent.on(container, {
-                                       mouseenter: this.expand,
-                                       mouseleave: this.collapse
-                               }, this);
-                       }
+               this._startPoint = this._map.mouseEventToContainerPoint(e);
 
-                       var link = this._layersLink = L.DomUtil.create('a', className + '-toggle', container);
-                       link.href = '#';
-                       link.title = 'Layers';
+               on(document, {
+                       contextmenu: stop,
+                       mousemove: this._onMouseMove,
+                       mouseup: this._onMouseUp,
+                       keydown: this._onKeyDown
+               }, this);
+       },
 
-                       if (L.Browser.touch) {
-                               L.DomEvent
-                                   .on(link, 'click', L.DomEvent.stop)
-                                   .on(link, 'click', this.expand, this);
-                       } else {
-                               L.DomEvent.on(link, 'focus', this.expand, this);
-                       }
+       _onMouseMove: function (e) {
+               if (!this._moved) {
+                       this._moved = true;
 
-                       // 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._box = create$1('div', 'leaflet-zoom-box', this._container);
+                       addClass(this._container, 'leaflet-crosshair');
 
-                       this._map.on('click', this.collapse, this);
-                       // TODO keyboard accessibility
-               } else {
-                       this.expand();
+                       this._map.fire('boxzoomstart');
                }
 
-               this._baseLayersList = L.DomUtil.create('div', className + '-base', form);
-               this._separator = L.DomUtil.create('div', className + '-separator', form);
-               this._overlaysList = L.DomUtil.create('div', className + '-overlays', form);
+               this._point = this._map.mouseEventToContainerPoint(e);
 
-               container.appendChild(form);
-       },
+               var bounds = new Bounds(this._point, this._startPoint),
+                   size = bounds.getSize();
 
-       _getLayer: function (id) {
-               for (var i = 0; i < this._layers.length; i++) {
+               setPosition(this._box, bounds.min);
 
-                       if (this._layers[i] && L.stamp(this._layers[i].layer) === id) {
-                               return this._layers[i];
-                       }
-               }
+               this._box.style.width  = size.x + 'px';
+               this._box.style.height = size.y + 'px';
        },
 
-       _addLayer: function (layer, name, overlay) {
-               layer.on('add remove', this._onLayerChange, this);
-
-               this._layers.push({
-                       layer: layer,
-                       name: name,
-                       overlay: overlay
-               });
-
-               if (this.options.autoZIndex && layer.setZIndex) {
-                       this._lastZIndex++;
-                       layer.setZIndex(this._lastZIndex);
+       _finish: function () {
+               if (this._moved) {
+                       remove(this._box);
+                       removeClass(this._container, 'leaflet-crosshair');
                }
-       },
 
-       _update: function () {
-               if (!this._container) { return this; }
+               enableTextSelection();
+               enableImageDrag();
 
-               L.DomUtil.empty(this._baseLayersList);
-               L.DomUtil.empty(this._overlaysList);
+               off(document, {
+                       contextmenu: stop,
+                       mousemove: this._onMouseMove,
+                       mouseup: this._onMouseUp,
+                       keydown: this._onKeyDown
+               }, this);
+       },
 
-               var baseLayersPresent, overlaysPresent, i, obj, baseLayersCount = 0;
+       _onMouseUp: function (e) {
+               if ((e.which !== 1) && (e.button !== 1)) { return; }
 
-               for (i = 0; i < this._layers.length; i++) {
-                       obj = this._layers[i];
-                       this._addItem(obj);
-                       overlaysPresent = overlaysPresent || obj.overlay;
-                       baseLayersPresent = baseLayersPresent || !obj.overlay;
-                       baseLayersCount += !obj.overlay ? 1 : 0;
-               }
+               this._finish();
 
-               // Hide base layers section if there's only one layer.
-               if (this.options.hideSingleBase) {
-                       baseLayersPresent = baseLayersPresent && baseLayersCount > 1;
-                       this._baseLayersList.style.display = baseLayersPresent ? '' : 'none';
-               }
+               if (!this._moved) { return; }
+               // Postpone to next JS tick so internal click event handling
+               // still see it as "moved".
+               this._clearDeferredResetState();
+               this._resetStateTimeout = setTimeout(bind(this._resetState, this), 0);
 
-               this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none';
+               var bounds = new LatLngBounds(
+                       this._map.containerPointToLatLng(this._startPoint),
+                       this._map.containerPointToLatLng(this._point));
 
-               return this;
+               this._map
+                       .fitBounds(bounds)
+                       .fire('boxzoomend', {boxZoomBounds: bounds});
        },
 
-       _onLayerChange: function (e) {
-               if (!this._handlingClick) {
-                       this._update();
+       _onKeyDown: function (e) {
+               if (e.keyCode === 27) {
+                       this._finish();
                }
+       }
+});
 
-               var obj = this._getLayer(L.stamp(e.target));
-
-               // @namespace Map
-               // @section Layer events
-               // @event baselayerchange: LayersControlEvent
-               // Fired when the base layer is changed through the [layer control](#control-layers).
-               // @event overlayadd: LayersControlEvent
-               // Fired when an overlay is selected through the [layer control](#control-layers).
-               // @event overlayremove: LayersControlEvent
-               // Fired when an overlay is deselected through the [layer control](#control-layers).
-               // @namespace Control.Layers
-               var type = obj.overlay ?
-                       (e.type === 'add' ? 'overlayadd' : 'overlayremove') :
-                       (e.type === 'add' ? 'baselayerchange' : null);
+// @section Handlers
+// @property boxZoom: Handler
+// Box (shift-drag with mouse) zoom handler.
+Map.addInitHook('addHandler', 'boxZoom', BoxZoom);
 
-               if (type) {
-                       this._map.fire(type, obj);
-               }
-       },
+/*
+ * L.Handler.DoubleClickZoom is used to handle double-click zoom on the map, enabled by default.
+ */
 
-       // IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see http://bit.ly/PqYLBe)
-       _createRadioElement: function (name, checked) {
+// @namespace Map
+// @section Interaction Options
 
-               var radioHtml = '<input type="radio" class="leaflet-control-layers-selector" name="' +
-                               name + '"' + (checked ? ' checked="checked"' : '') + '/>';
+Map.mergeOptions({
+       // @option doubleClickZoom: Boolean|String = true
+       // Whether the map can be zoomed in by double clicking on it and
+       // zoomed out by double clicking while holding shift. If passed
+       // `'center'`, double-click zoom will zoom to the center of the
+       //  view regardless of where the mouse was.
+       doubleClickZoom: true
+});
 
-               var radioFragment = document.createElement('div');
-               radioFragment.innerHTML = radioHtml;
+var DoubleClickZoom = Handler.extend({
+       addHooks: function () {
+               this._map.on('dblclick', this._onDoubleClick, this);
+       },
 
-               return radioFragment.firstChild;
+       removeHooks: function () {
+               this._map.off('dblclick', this._onDoubleClick, this);
        },
 
-       _addItem: function (obj) {
-               var label = document.createElement('label'),
-                   checked = this._map.hasLayer(obj.layer),
-                   input;
+       _onDoubleClick: function (e) {
+               var map = this._map,
+                   oldZoom = map.getZoom(),
+                   delta = map.options.zoomDelta,
+                   zoom = e.originalEvent.shiftKey ? oldZoom - delta : oldZoom + delta;
 
-               if (obj.overlay) {
-                       input = document.createElement('input');
-                       input.type = 'checkbox';
-                       input.className = 'leaflet-control-layers-selector';
-                       input.defaultChecked = checked;
+               if (map.options.doubleClickZoom === 'center') {
+                       map.setZoom(zoom);
                } else {
-                       input = this._createRadioElement('leaflet-base-layers', checked);
+                       map.setZoomAround(e.containerPoint, zoom);
                }
+       }
+});
 
-               input.layerId = L.stamp(obj.layer);
-
-               L.DomEvent.on(input, 'click', this._onInputClick, this);
-
-               var name = document.createElement('span');
-               name.innerHTML = ' ' + obj.name;
-
-               // Helps from preventing layer control flicker when checkboxes are disabled
-               // https://github.com/Leaflet/Leaflet/issues/2771
-               var holder = document.createElement('div');
-
-               label.appendChild(holder);
-               holder.appendChild(input);
-               holder.appendChild(name);
+// @section Handlers
+//
+// Map properties include interaction handlers that allow you to control
+// interaction behavior in runtime, enabling or disabling certain features such
+// as dragging or touch zoom (see `Handler` methods). For example:
+//
+// ```js
+// map.doubleClickZoom.disable();
+// ```
+//
+// @property doubleClickZoom: Handler
+// Double click zoom handler.
+Map.addInitHook('addHandler', 'doubleClickZoom', DoubleClickZoom);
 
-               var container = obj.overlay ? this._overlaysList : this._baseLayersList;
-               container.appendChild(label);
+/*
+ * L.Handler.MapDrag is used to make the map draggable (with panning inertia), enabled by default.
+ */
 
-               this._checkDisabledLayers();
-               return label;
-       },
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+       // @option dragging: Boolean = true
+       // Whether the map be draggable with mouse/touch or not.
+       dragging: true,
 
-       _onInputClick: function () {
-               var inputs = this._form.getElementsByTagName('input'),
-                   input, layer, hasLayer;
-               var addedLayers = [],
-                   removedLayers = [];
+       // @section Panning Inertia Options
+       // @option inertia: Boolean = *
+       // If enabled, panning of the map will have an inertia effect where
+       // the map builds momentum while dragging and continues moving in
+       // the same direction for some time. Feels especially nice on touch
+       // devices. Enabled by default unless running on old Android devices.
+       inertia: !android23,
 
-               this._handlingClick = true;
+       // @option inertiaDeceleration: Number = 3000
+       // The rate with which the inertial movement slows down, in pixels/second².
+       inertiaDeceleration: 3400, // px/s^2
 
-               for (var i = inputs.length - 1; i >= 0; i--) {
-                       input = inputs[i];
-                       layer = this._getLayer(input.layerId).layer;
-                       hasLayer = this._map.hasLayer(layer);
+       // @option inertiaMaxSpeed: Number = Infinity
+       // Max speed of the inertial movement, in pixels/second.
+       inertiaMaxSpeed: Infinity, // px/s
 
-                       if (input.checked && !hasLayer) {
-                               addedLayers.push(layer);
+       // @option easeLinearity: Number = 0.2
+       easeLinearity: 0.2,
 
-                       } else if (!input.checked && hasLayer) {
-                               removedLayers.push(layer);
-                       }
-               }
+       // TODO refactor, move to CRS
+       // @option worldCopyJump: Boolean = false
+       // With this option enabled, the map tracks when you pan to another "copy"
+       // of the world and seamlessly jumps to the original one so that all overlays
+       // like markers and vector layers are still visible.
+       worldCopyJump: false,
 
-               // Bugfix issue 2318: Should remove all old layers before readding new ones
-               for (i = 0; i < removedLayers.length; i++) {
-                       this._map.removeLayer(removedLayers[i]);
-               }
-               for (i = 0; i < addedLayers.length; i++) {
-                       this._map.addLayer(addedLayers[i]);
-               }
+       // @option maxBoundsViscosity: Number = 0.0
+       // If `maxBounds` is set, this option will control how solid the bounds
+       // are when dragging the map around. The default value of `0.0` allows the
+       // user to drag outside the bounds at normal speed, higher values will
+       // slow down map dragging outside bounds, and `1.0` makes the bounds fully
+       // solid, preventing the user from dragging outside the bounds.
+       maxBoundsViscosity: 0.0
+});
 
-               this._handlingClick = false;
+var Drag = Handler.extend({
+       addHooks: function () {
+               if (!this._draggable) {
+                       var map = this._map;
 
-               this._refocusOnMap();
-       },
+                       this._draggable = new Draggable(map._mapPane, map._container);
 
-       _checkDisabledLayers: function () {
-               var inputs = this._form.getElementsByTagName('input'),
-                   input,
-                   layer,
-                   zoom = this._map.getZoom();
+                       this._draggable.on({
+                               dragstart: this._onDragStart,
+                               drag: this._onDrag,
+                               dragend: this._onDragEnd
+                       }, this);
 
-               for (var i = inputs.length - 1; i >= 0; i--) {
-                       input = inputs[i];
-                       layer = this._getLayer(input.layerId).layer;
-                       input.disabled = (layer.options.minZoom !== undefined && zoom < layer.options.minZoom) ||
-                                        (layer.options.maxZoom !== undefined && zoom > layer.options.maxZoom);
+                       this._draggable.on('predrag', this._onPreDragLimit, this);
+                       if (map.options.worldCopyJump) {
+                               this._draggable.on('predrag', this._onPreDragWrap, this);
+                               map.on('zoomend', this._onZoomEnd, this);
 
+                               map.whenReady(this._onZoomEnd, this);
+                       }
                }
+               addClass(this._map._container, 'leaflet-grab leaflet-touch-drag');
+               this._draggable.enable();
+               this._positions = [];
+               this._times = [];
        },
 
-       _expand: function () {
-               // Backward compatibility, remove me in 1.1.
-               return this.expand();
+       removeHooks: function () {
+               removeClass(this._map._container, 'leaflet-grab');
+               removeClass(this._map._container, 'leaflet-touch-drag');
+               this._draggable.disable();
        },
 
-       _collapse: function () {
-               // Backward compatibility, remove me in 1.1.
-               return this.collapse();
-       }
+       moved: function () {
+               return this._draggable && this._draggable._moved;
+       },
 
-});
+       moving: function () {
+               return this._draggable && this._draggable._moving;
+       },
 
+       _onDragStart: function () {
+               var map = this._map;
 
-// @factory L.control.layers(baselayers?: Object, overlays?: Object, options?: Control.Layers options)
-// Creates an attribution control with the given layers. Base layers will be switched with radio buttons, while overlays will be switched with checkboxes. Note that all base layers should be passed in the base layers object, but only one should be added to the map during map instantiation.
-L.control.layers = function (baseLayers, overlays, options) {
-       return new L.Control.Layers(baseLayers, overlays, options);
-};
+               map._stop();
+               if (this._map.options.maxBounds && this._map.options.maxBoundsViscosity) {
+                       var bounds = toLatLngBounds(this._map.options.maxBounds);
 
+                       this._offsetLimit = toBounds(
+                               this._map.latLngToContainerPoint(bounds.getNorthWest()).multiplyBy(-1),
+                               this._map.latLngToContainerPoint(bounds.getSouthEast()).multiplyBy(-1)
+                                       .add(this._map.getSize()));
 
+                       this._viscosity = Math.min(1.0, Math.max(0.0, this._map.options.maxBoundsViscosity));
+               } else {
+                       this._offsetLimit = null;
+               }
 
-/*
- * @class PosAnimation
- * @aka L.PosAnimation
- * @inherits Evented
- * Used internally for panning animations, utilizing CSS3 Transitions for modern browsers and a timer fallback for IE6-9.
- *
- * @example
- * ```js
- * var fx = new L.PosAnimation();
- * fx.run(el, [300, 500], 0.5);
- * ```
- *
- * @constructor L.PosAnimation()
- * Creates a `PosAnimation` object.
- *
- */
+               map
+                   .fire('movestart')
+                   .fire('dragstart');
 
-L.PosAnimation = L.Evented.extend({
+               if (map.options.inertia) {
+                       this._positions = [];
+                       this._times = [];
+               }
+       },
 
-       // @method run(el: HTMLElement, newPos: Point, duration?: Number, easeLinearity?: Number)
-       // Run an animation of a given element to a new position, optionally setting
-       // duration in seconds (`0.25` by default) and easing linearity factor (3rd
-       // argument of the [cubic bezier curve](http://cubic-bezier.com/#0,0,.5,1),
-       // `0.5` by default).
-       run: function (el, newPos, duration, easeLinearity) {
-               this.stop();
+       _onDrag: function (e) {
+               if (this._map.options.inertia) {
+                       var time = this._lastTime = +new Date(),
+                           pos = this._lastPos = this._draggable._absPos || this._draggable._newPos;
 
-               this._el = el;
-               this._inProgress = true;
-               this._duration = duration || 0.25;
-               this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
+                       this._positions.push(pos);
+                       this._times.push(time);
 
-               this._startPos = L.DomUtil.getPosition(el);
-               this._offset = newPos.subtract(this._startPos);
-               this._startTime = +new Date();
+                       this._prunePositions(time);
+               }
 
-               // @event start: Event
-               // Fired when the animation starts
-               this.fire('start');
+               this._map
+                   .fire('move', e)
+                   .fire('drag', e);
+       },
 
-               this._animate();
+       _prunePositions: function (time) {
+               while (this._positions.length > 1 && time - this._times[0] > 50) {
+                       this._positions.shift();
+                       this._times.shift();
+               }
        },
 
-       // @method stop()
-       // Stops the animation (if currently running).
-       stop: function () {
-               if (!this._inProgress) { return; }
+       _onZoomEnd: function () {
+               var pxCenter = this._map.getSize().divideBy(2),
+                   pxWorldCenter = this._map.latLngToLayerPoint([0, 0]);
 
-               this._step(true);
-               this._complete();
+               this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
+               this._worldWidth = this._map.getPixelWorldBounds().getSize().x;
        },
 
-       _animate: function () {
-               // animation loop
-               this._animId = L.Util.requestAnimFrame(this._animate, this);
-               this._step();
+       _viscousLimit: function (value, threshold) {
+               return value - (value - threshold) * this._viscosity;
        },
 
-       _step: function (round) {
-               var elapsed = (+new Date()) - this._startTime,
-                   duration = this._duration * 1000;
+       _onPreDragLimit: function () {
+               if (!this._viscosity || !this._offsetLimit) { return; }
 
-               if (elapsed < duration) {
-                       this._runFrame(this._easeOut(elapsed / duration), round);
-               } else {
-                       this._runFrame(1);
-                       this._complete();
-               }
-       },
+               var offset = this._draggable._newPos.subtract(this._draggable._startPos);
 
-       _runFrame: function (progress, round) {
-               var pos = this._startPos.add(this._offset.multiplyBy(progress));
-               if (round) {
-                       pos._round();
-               }
-               L.DomUtil.setPosition(this._el, pos);
+               var limit = this._offsetLimit;
+               if (offset.x < limit.min.x) { offset.x = this._viscousLimit(offset.x, limit.min.x); }
+               if (offset.y < limit.min.y) { offset.y = this._viscousLimit(offset.y, limit.min.y); }
+               if (offset.x > limit.max.x) { offset.x = this._viscousLimit(offset.x, limit.max.x); }
+               if (offset.y > limit.max.y) { offset.y = this._viscousLimit(offset.y, limit.max.y); }
 
-               // @event step: Event
-               // Fired continuously during the animation.
-               this.fire('step');
+               this._draggable._newPos = this._draggable._startPos.add(offset);
        },
 
-       _complete: function () {
-               L.Util.cancelAnimFrame(this._animId);
+       _onPreDragWrap: function () {
+               // TODO refactor to be able to adjust map pane position after zoom
+               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._inProgress = false;
-               // @event end: Event
-               // Fired when the animation ends.
-               this.fire('end');
+               this._draggable._absPos = this._draggable._newPos.clone();
+               this._draggable._newPos.x = newX;
        },
 
-       _easeOut: function (t) {
-               return 1 - Math.pow(1 - t, this._easeOutPower);
-       }
-});
+       _onDragEnd: function (e) {
+               var map = this._map,
+                   options = map.options,
 
+                   noInertia = !options.inertia || this._times.length < 2;
 
+               map.fire('dragend', e);
 
-/*
- * Extends L.Map to handle panning animations.
- */
+               if (noInertia) {
+                       map.fire('moveend');
 
-L.Map.include({
+               } else {
+                       this._prunePositions(+new Date());
 
-       setView: function (center, zoom, options) {
+                       var direction = this._lastPos.subtract(this._positions[0]),
+                           duration = (this._lastTime - this._times[0]) / 1000,
+                           ease = options.easeLinearity,
 
-               zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom);
-               center = this._limitCenter(L.latLng(center), zoom, this.options.maxBounds);
-               options = options || {};
+                           speedVector = direction.multiplyBy(ease / duration),
+                           speed = speedVector.distanceTo([0, 0]),
 
-               this._stop();
+                           limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
+                           limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
 
-               if (this._loaded && !options.reset && options !== true) {
+                           decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
+                           offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
 
-                       if (options.animate !== undefined) {
-                               options.zoom = L.extend({animate: options.animate}, options.zoom);
-                               options.pan = L.extend({animate: options.animate, duration: options.duration}, options.pan);
-                       }
+                       if (!offset.x && !offset.y) {
+                               map.fire('moveend');
 
-                       // try animating pan or zoom
-                       var moved = (this._zoom !== zoom) ?
-                               this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) :
-                               this._tryAnimatedPan(center, options.pan);
+                       } else {
+                               offset = map._limitOffset(offset, map.options.maxBounds);
 
-                       if (moved) {
-                               // prevent resize handler call, the view will refresh after animation anyway
-                               clearTimeout(this._sizeTimer);
-                               return this;
+                               requestAnimFrame(function () {
+                                       map.panBy(offset, {
+                                               duration: decelerationDuration,
+                                               easeLinearity: ease,
+                                               noMoveStart: true,
+                                               animate: true
+                                       });
+                               });
                        }
                }
+       }
+});
 
-               // animation didn't start, just reset the map view
-               this._resetView(center, zoom);
+// @section Handlers
+// @property dragging: Handler
+// Map dragging handler (by both mouse and touch).
+Map.addInitHook('addHandler', 'dragging', Drag);
 
-               return this;
-       },
+/*
+ * L.Map.Keyboard is handling keyboard interaction with the map, enabled by default.
+ */
 
-       panBy: function (offset, options) {
-               offset = L.point(offset).round();
-               options = options || {};
+// @namespace Map
+// @section Keyboard Navigation Options
+Map.mergeOptions({
+       // @option keyboard: Boolean = true
+       // Makes the map focusable and allows users to navigate the map with keyboard
+       // arrows and `+`/`-` keys.
+       keyboard: true,
 
-               if (!offset.x && !offset.y) {
-                       return this.fire('moveend');
-               }
-               // If we pan too far, Chrome gets issues with tiles
-               // and makes them disappear or appear in the wrong place (slightly offset) #2602
-               if (options.animate !== true && !this.getSize().contains(offset)) {
-                       this._resetView(this.unproject(this.project(this.getCenter()).add(offset)), this.getZoom());
-                       return this;
-               }
+       // @option keyboardPanDelta: Number = 80
+       // Amount of pixels to pan when pressing an arrow key.
+       keyboardPanDelta: 80
+});
 
-               if (!this._panAnim) {
-                       this._panAnim = new L.PosAnimation();
+var Keyboard = Handler.extend({
 
-                       this._panAnim.on({
-                               'step': this._onPanTransitionStep,
-                               'end': this._onPanTransitionEnd
-                       }, this);
-               }
+       keyCodes: {
+               left:    [37],
+               right:   [39],
+               down:    [40],
+               up:      [38],
+               zoomIn:  [187, 107, 61, 171],
+               zoomOut: [189, 109, 54, 173]
+       },
 
-               // don't fire movestart if animating inertia
-               if (!options.noMoveStart) {
-                       this.fire('movestart');
-               }
+       initialize: function (map) {
+               this._map = map;
 
-               // animate pan unless animate: false specified
-               if (options.animate !== false) {
-                       L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim');
+               this._setPanDelta(map.options.keyboardPanDelta);
+               this._setZoomDelta(map.options.zoomDelta);
+       },
 
-                       var newPos = this._getMapPanePos().subtract(offset).round();
-                       this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity);
-               } else {
-                       this._rawPanBy(offset);
-                       this.fire('move').fire('moveend');
-               }
+       addHooks: function () {
+               var container = this._map._container;
 
-               return this;
-       },
+               // make the container focusable by tabbing
+               if (container.tabIndex <= 0) {
+                       container.tabIndex = '0';
+               }
 
-       _onPanTransitionStep: function () {
-               this.fire('move');
-       },
+               on(container, {
+                       focus: this._onFocus,
+                       blur: this._onBlur,
+                       mousedown: this._onMouseDown
+               }, this);
 
-       _onPanTransitionEnd: function () {
-               L.DomUtil.removeClass(this._mapPane, 'leaflet-pan-anim');
-               this.fire('moveend');
+               this._map.on({
+                       focus: this._addHooks,
+                       blur: this._removeHooks
+               }, this);
        },
 
-       _tryAnimatedPan: function (center, options) {
-               // difference between the new and current centers in pixels
-               var offset = this._getCenterOffset(center)._floor();
-
-               // don't animate too far unless animate: true specified in options
-               if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; }
+       removeHooks: function () {
+               this._removeHooks();
 
-               this.panBy(offset, options);
+               off(this._map._container, {
+                       focus: this._onFocus,
+                       blur: this._onBlur,
+                       mousedown: this._onMouseDown
+               }, this);
 
-               return true;
-       }
-});
+               this._map.off({
+                       focus: this._addHooks,
+                       blur: this._removeHooks
+               }, this);
+       },
 
+       _onMouseDown: function () {
+               if (this._focused) { return; }
 
+               var body = document.body,
+                   docEl = document.documentElement,
+                   top = body.scrollTop || docEl.scrollTop,
+                   left = body.scrollLeft || docEl.scrollLeft;
 
-/*
- * Extends L.Map to handle zoom animations.
- */
+               this._map._container.focus();
 
-// @namespace Map
-// @section Animation Options
-L.Map.mergeOptions({
-       // @option zoomAnimation: Boolean = true
-       // Whether the map zoom animation is enabled. By default it's enabled
-       // in all browsers that support CSS3 Transitions except Android.
-       zoomAnimation: true,
-
-       // @option zoomAnimationThreshold: Number = 4
-       // Won't animate zoom if the zoom difference exceeds this value.
-       zoomAnimationThreshold: 4
-});
+               window.scrollTo(left, top);
+       },
 
-var zoomAnimated = L.DomUtil.TRANSITION && L.Browser.any3d && !L.Browser.mobileOpera;
+       _onFocus: function () {
+               this._focused = true;
+               this._map.fire('focus');
+       },
 
-if (zoomAnimated) {
+       _onBlur: function () {
+               this._focused = false;
+               this._map.fire('blur');
+       },
 
-       L.Map.addInitHook(function () {
-               // don't animate on browsers without hardware-accelerated transitions or old Android/Opera
-               this._zoomAnimated = this.options.zoomAnimation;
+       _setPanDelta: function (panDelta) {
+               var keys = this._panKeys = {},
+                   codes = this.keyCodes,
+                   i, len;
 
-               // 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) {
+               for (i = 0, len = codes.left.length; i < len; i++) {
+                       keys[codes.left[i]] = [-1 * panDelta, 0];
+               }
+               for (i = 0, len = codes.right.length; i < len; i++) {
+                       keys[codes.right[i]] = [panDelta, 0];
+               }
+               for (i = 0, len = codes.down.length; i < len; i++) {
+                       keys[codes.down[i]] = [0, panDelta];
+               }
+               for (i = 0, len = codes.up.length; i < len; i++) {
+                       keys[codes.up[i]] = [0, -1 * panDelta];
+               }
+       },
 
-                       this._createAnimProxy();
+       _setZoomDelta: function (zoomDelta) {
+               var keys = this._zoomKeys = {},
+                   codes = this.keyCodes,
+                   i, len;
 
-                       L.DomEvent.on(this._proxy, L.DomUtil.TRANSITION_END, this._catchTransitionEnd, this);
+               for (i = 0, len = codes.zoomIn.length; i < len; i++) {
+                       keys[codes.zoomIn[i]] = zoomDelta;
                }
-       });
-}
+               for (i = 0, len = codes.zoomOut.length; i < len; i++) {
+                       keys[codes.zoomOut[i]] = -zoomDelta;
+               }
+       },
 
-L.Map.include(!zoomAnimated ? {} : {
+       _addHooks: function () {
+               on(document, 'keydown', this._onKeyDown, this);
+       },
 
-       _createAnimProxy: function () {
+       _removeHooks: function () {
+               off(document, 'keydown', this._onKeyDown, this);
+       },
 
-               var proxy = this._proxy = L.DomUtil.create('div', 'leaflet-proxy leaflet-zoom-animated');
-               this._panes.mapPane.appendChild(proxy);
+       _onKeyDown: function (e) {
+               if (e.altKey || e.ctrlKey || e.metaKey) { return; }
 
-               this.on('zoomanim', function (e) {
-                       var prop = L.DomUtil.TRANSFORM,
-                           transform = proxy.style[prop];
+               var key = e.keyCode,
+                   map = this._map,
+                   offset;
+
+               if (key in this._panKeys) {
+                       if (!map._panAnim || !map._panAnim._inProgress) {
+                               offset = this._panKeys[key];
+                               if (e.shiftKey) {
+                                       offset = toPoint(offset).multiplyBy(3);
+                               }
 
-                       L.DomUtil.setTransform(proxy, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1));
+                               map.panBy(offset);
 
-                       // workaround for case when transform is the same and so transitionend event is not fired
-                       if (transform === proxy.style[prop] && this._animatingZoom) {
-                               this._onZoomTransitionEnd();
+                               if (map.options.maxBounds) {
+                                       map.panInsideBounds(map.options.maxBounds);
+                               }
                        }
-               }, this);
+               } else if (key in this._zoomKeys) {
+                       map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
 
-               this.on('load moveend', function () {
-                       var c = this.getCenter(),
-                           z = this.getZoom();
-                       L.DomUtil.setTransform(proxy, this.project(c, z), this.getZoomScale(z, 1));
-               }, this);
-       },
+               } else if (key === 27 && map._popup && map._popup.options.closeOnEscapeKey) {
+                       map.closePopup();
 
-       _catchTransitionEnd: function (e) {
-               if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) {
-                       this._onZoomTransitionEnd();
+               } else {
+                       return;
                }
-       },
 
-       _nothingToAnimate: function () {
-               return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
-       },
+               stop(e);
+       }
+});
 
-       _tryAnimatedZoom: function (center, zoom, options) {
+// @section Handlers
+// @section Handlers
+// @property keyboard: Handler
+// Keyboard navigation handler.
+Map.addInitHook('addHandler', 'keyboard', Keyboard);
 
-               if (this._animatingZoom) { return true; }
+/*
+ * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.
+ */
 
-               options = options || {};
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+       // @section Mousewheel options
+       // @option scrollWheelZoom: Boolean|String = true
+       // Whether the map can be zoomed by using the mouse wheel. If passed `'center'`,
+       // it will zoom to the center of the view regardless of where the mouse was.
+       scrollWheelZoom: true,
 
-               // 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; }
+       // @option wheelDebounceTime: Number = 40
+       // Limits the rate at which a wheel can fire (in milliseconds). By default
+       // user can't zoom via wheel more often than once per 40 ms.
+       wheelDebounceTime: 40,
 
-               // 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);
+       // @option wheelPxPerZoomLevel: Number = 60
+       // How many scroll pixels (as reported by [L.DomEvent.getWheelDelta](#domevent-getwheeldelta))
+       // mean a change of one full zoom level. Smaller values will make wheel-zooming
+       // faster (and vice versa).
+       wheelPxPerZoomLevel: 60
+});
 
-               // 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 ScrollWheelZoom = Handler.extend({
+       addHooks: function () {
+               on(this._map._container, 'mousewheel', this._onWheelScroll, this);
 
-               L.Util.requestAnimFrame(function () {
-                       this
-                           ._moveStart(true)
-                           ._animateZoom(center, zoom, true);
-               }, this);
+               this._delta = 0;
+       },
 
-               return true;
+       removeHooks: function () {
+               off(this._map._container, 'mousewheel', this._onWheelScroll, this);
        },
 
-       _animateZoom: function (center, zoom, startAnim, noUpdate) {
-               if (startAnim) {
-                       this._animatingZoom = true;
+       _onWheelScroll: function (e) {
+               var delta = getWheelDelta(e);
 
-                       // remember what center/zoom to set after animation
-                       this._animateToCenter = center;
-                       this._animateToZoom = zoom;
+               var debounce = this._map.options.wheelDebounceTime;
 
-                       L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
+               this._delta += delta;
+               this._lastMousePos = this._map.mouseEventToContainerPoint(e);
+
+               if (!this._startTime) {
+                       this._startTime = +new Date();
                }
 
-               // @event zoomanim: ZoomAnimEvent
-               // Fired on every frame of a zoom animation
-               this.fire('zoomanim', {
-                       center: center,
-                       zoom: zoom,
-                       noUpdate: noUpdate
-               });
+               var left = Math.max(debounce - (+new Date() - this._startTime), 0);
 
-               // Work around webkit not firing 'transitionend', see https://github.com/Leaflet/Leaflet/issues/3689, 2693
-               setTimeout(L.bind(this._onZoomTransitionEnd, this), 250);
+               clearTimeout(this._timer);
+               this._timer = setTimeout(bind(this._performZoom, this), left);
+
+               stop(e);
        },
 
-       _onZoomTransitionEnd: function () {
-               if (!this._animatingZoom) { return; }
+       _performZoom: function () {
+               var map = this._map,
+                   zoom = map.getZoom(),
+                   snap = this._map.options.zoomSnap || 0;
 
-               L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
+               map._stop(); // stop panning and fly animations if any
 
-               this._animatingZoom = false;
+               // map the delta with a sigmoid function to -4..4 range leaning on -1..1
+               var d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4),
+                   d3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2,
+                   d4 = snap ? Math.ceil(d3 / snap) * snap : d3,
+                   delta = map._limitZoom(zoom + (this._delta > 0 ? d4 : -d4)) - zoom;
 
-               this._move(this._animateToCenter, this._animateToZoom);
+               this._delta = 0;
+               this._startTime = null;
 
-               // This anim frame should prevent an obscure iOS webkit tile loading race condition.
-               L.Util.requestAnimFrame(function () {
-                       this._moveEnd(true);
-               }, this);
+               if (!delta) { return; }
+
+               if (map.options.scrollWheelZoom === 'center') {
+                       map.setZoom(zoom + delta);
+               } else {
+                       map.setZoomAround(this._lastMousePos, zoom + delta);
+               }
        }
 });
 
+// @section Handlers
+// @property scrollWheelZoom: Handler
+// Scroll wheel zoom handler.
+Map.addInitHook('addHandler', 'scrollWheelZoom', ScrollWheelZoom);
 
+/*
+ * L.Map.Tap is used to enable mobile hacks like quick taps and long hold.
+ */
 
 // @namespace Map
-// @section Methods for modifying map state
-L.Map.include({
-
-       // @method flyTo(latlng: LatLng, zoom?: Number, options?: Zoom/pan options): this
-       // Sets the view of the map (geographical center and zoom) performing a smooth
-       // pan-zoom animation.
-       flyTo: function (targetCenter, targetZoom, options) {
-
-               options = options || {};
-               if (options.animate === false || !L.Browser.any3d) {
-                       return this.setView(targetCenter, targetZoom, options);
-               }
+// @section Interaction Options
+Map.mergeOptions({
+       // @section Touch interaction options
+       // @option tap: Boolean = true
+       // Enables mobile hacks for supporting instant taps (fixing 200ms click
+       // delay on iOS/Android) and touch holds (fired as `contextmenu` events).
+       tap: true,
 
-               this._stop();
+       // @option tapTolerance: Number = 15
+       // The max number of pixels a user can shift his finger during touch
+       // for it to be considered a valid tap.
+       tapTolerance: 15
+});
 
-               var from = this.project(this.getCenter()),
-                   to = this.project(targetCenter),
-                   size = this.getSize(),
-                   startZoom = this._zoom;
+var Tap = Handler.extend({
+       addHooks: function () {
+               on(this._map._container, 'touchstart', this._onDown, this);
+       },
 
-               targetCenter = L.latLng(targetCenter);
-               targetZoom = targetZoom === undefined ? startZoom : targetZoom;
+       removeHooks: function () {
+               off(this._map._container, 'touchstart', this._onDown, this);
+       },
 
-               var w0 = Math.max(size.x, size.y),
-                   w1 = w0 * this.getZoomScale(startZoom, targetZoom),
-                   u1 = (to.distanceTo(from)) || 1,
-                   rho = 1.42,
-                   rho2 = rho * rho;
+       _onDown: function (e) {
+               if (!e.touches) { return; }
 
-               function r(i) {
-                       var s1 = i ? -1 : 1,
-                           s2 = i ? w1 : w0,
-                           t1 = w1 * w1 - w0 * w0 + s1 * rho2 * rho2 * u1 * u1,
-                           b1 = 2 * s2 * rho2 * u1,
-                           b = t1 / b1,
-                           sq = Math.sqrt(b * b + 1) - b;
+               preventDefault(e);
 
-                           // workaround for floating point precision bug when sq = 0, log = -Infinite,
-                           // thus triggering an infinite loop in flyTo
-                           var log = sq < 0.000000001 ? -18 : Math.log(sq);
+               this._fireClick = true;
 
-                       return log;
+               // don't simulate click or track longpress if more than 1 touch
+               if (e.touches.length > 1) {
+                       this._fireClick = false;
+                       clearTimeout(this._holdTimeout);
+                       return;
                }
 
-               function sinh(n) { return (Math.exp(n) - Math.exp(-n)) / 2; }
-               function cosh(n) { return (Math.exp(n) + Math.exp(-n)) / 2; }
-               function tanh(n) { return sinh(n) / cosh(n); }
+               var first = e.touches[0],
+                   el = first.target;
 
-               var r0 = r(0);
+               this._startPos = this._newPos = new Point(first.clientX, first.clientY);
 
-               function w(s) { return w0 * (cosh(r0) / cosh(r0 + rho * s)); }
-               function u(s) { return w0 * (cosh(r0) * tanh(r0 + rho * s) - sinh(r0)) / rho2; }
+               // if touching a link, highlight it
+               if (el.tagName && el.tagName.toLowerCase() === 'a') {
+                       addClass(el, 'leaflet-active');
+               }
 
-               function easeOut(t) { return 1 - Math.pow(1 - t, 1.5); }
+               // simulate long hold but setting a timeout
+               this._holdTimeout = setTimeout(bind(function () {
+                       if (this._isTapValid()) {
+                               this._fireClick = false;
+                               this._onUp();
+                               this._simulateEvent('contextmenu', first);
+                       }
+               }, this), 1000);
 
-               var start = Date.now(),
-                   S = (r(1) - r0) / rho,
-                   duration = options.duration ? 1000 * options.duration : 1000 * S * 0.8;
+               this._simulateEvent('mousedown', first);
 
-               function frame() {
-                       var t = (Date.now() - start) / duration,
-                           s = easeOut(t) * S;
+               on(document, {
+                       touchmove: this._onMove,
+                       touchend: this._onUp
+               }, this);
+       },
 
-                       if (t <= 1) {
-                               this._flyToFrame = L.Util.requestAnimFrame(frame, this);
+       _onUp: function (e) {
+               clearTimeout(this._holdTimeout);
 
-                               this._move(
-                                       this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom),
-                                       this.getScaleZoom(w0 / w(s), startZoom),
-                                       {flyTo: true});
+               off(document, {
+                       touchmove: this._onMove,
+                       touchend: this._onUp
+               }, this);
 
-                       } else {
-                               this
-                                       ._move(targetCenter, targetZoom)
-                                       ._moveEnd(true);
+               if (this._fireClick && e && e.changedTouches) {
+
+                       var first = e.changedTouches[0],
+                           el = first.target;
+
+                       if (el && el.tagName && el.tagName.toLowerCase() === 'a') {
+                               removeClass(el, 'leaflet-active');
+                       }
+
+                       this._simulateEvent('mouseup', first);
+
+                       // simulate click if the touch didn't move too much
+                       if (this._isTapValid()) {
+                               this._simulateEvent('click', first);
                        }
                }
+       },
 
-               this._moveStart(true);
+       _isTapValid: function () {
+               return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance;
+       },
 
-               frame.call(this);
-               return this;
+       _onMove: function (e) {
+               var first = e.touches[0];
+               this._newPos = new Point(first.clientX, first.clientY);
+               this._simulateEvent('mousemove', first);
        },
 
-       // @method flyToBounds(bounds: LatLngBounds, options?: fitBounds options): this
-       // Sets the view of the map with a smooth animation like [`flyTo`](#map-flyto),
-       // but takes a bounds parameter like [`fitBounds`](#map-fitbounds).
-       flyToBounds: function (bounds, options) {
-               var target = this._getBoundsCenterZoom(bounds, options);
-               return this.flyTo(target.center, target.zoom, options);
+       _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);
        }
 });
 
-
+// @section Handlers
+// @property tap: Handler
+// Mobile touch hacks (quick tap and touch hold) handler.
+if (touch && !pointer) {
+       Map.addInitHook('addHandler', 'tap', Tap);
+}
 
 /*
- * Provides L.Map with convenient shortcuts for using browser geolocation features.
+ * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.
  */
 
 // @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+       // @section Touch interaction options
+       // @option touchZoom: Boolean|String = *
+       // Whether the map can be zoomed by touch-dragging with two fingers. If
+       // passed `'center'`, it will zoom to the center of the view regardless of
+       // where the touch events (fingers) were. Enabled for touch-capable web
+       // browsers except for old Androids.
+       touchZoom: touch && !android23,
 
-L.Map.include({
-       // @section Geolocation methods
-       _defaultLocateOptions: {
-               timeout: 10000,
-               watch: false
-               // setView: false
-               // maxZoom: <Number>
-               // maximumAge: 0
-               // enableHighAccuracy: false
+       // @option bounceAtZoomLimits: Boolean = true
+       // Set it to false if you don't want the map to zoom beyond min/max zoom
+       // and then bounce back when pinch-zooming.
+       bounceAtZoomLimits: true
+});
+
+var TouchZoom = Handler.extend({
+       addHooks: function () {
+               addClass(this._map._container, 'leaflet-touch-zoom');
+               on(this._map._container, 'touchstart', this._onTouchStart, this);
        },
 
-       // @method locate(options?: Locate options): this
-       // Tries to locate the user using the Geolocation API, firing a [`locationfound`](#map-locationfound)
-       // event with location data on success or a [`locationerror`](#map-locationerror) event on failure,
-       // and optionally sets the map view to the user's location with respect to
-       // detection accuracy (or to the world view if geolocation failed).
-       // Note that, if your page doesn't use HTTPS, this method will fail in
-       // modern browsers ([Chrome 50 and newer](https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-powerful-features-on-insecure-origins))
-       // See `Locate options` for more details.
-       locate: function (options) {
+       removeHooks: function () {
+               removeClass(this._map._container, 'leaflet-touch-zoom');
+               off(this._map._container, 'touchstart', this._onTouchStart, this);
+       },
 
-               options = this._locateOptions = L.extend({}, this._defaultLocateOptions, options);
+       _onTouchStart: function (e) {
+               var map = this._map;
+               if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
 
-               if (!('geolocation' in navigator)) {
-                       this._handleGeolocationError({
-                               code: 0,
-                               message: 'Geolocation not supported.'
-                       });
-                       return this;
+               var p1 = map.mouseEventToContainerPoint(e.touches[0]),
+                   p2 = map.mouseEventToContainerPoint(e.touches[1]);
+
+               this._centerPoint = map.getSize()._divideBy(2);
+               this._startLatLng = map.containerPointToLatLng(this._centerPoint);
+               if (map.options.touchZoom !== 'center') {
+                       this._pinchStartLatLng = map.containerPointToLatLng(p1.add(p2)._divideBy(2));
                }
 
-               var onResponse = L.bind(this._handleGeolocationResponse, this),
-                   onError = L.bind(this._handleGeolocationError, this);
+               this._startDist = p1.distanceTo(p2);
+               this._startZoom = map.getZoom();
 
-               if (options.watch) {
-                       this._locationWatchId =
-                               navigator.geolocation.watchPosition(onResponse, onError, options);
-               } else {
-                       navigator.geolocation.getCurrentPosition(onResponse, onError, options);
-               }
-               return this;
+               this._moved = false;
+               this._zooming = true;
+
+               map._stop();
+
+               on(document, 'touchmove', this._onTouchMove, this);
+               on(document, 'touchend', this._onTouchEnd, this);
+
+               preventDefault(e);
        },
 
-       // @method stopLocate(): this
-       // Stops watching location previously initiated by `map.locate({watch: true})`
-       // and aborts resetting the map view if map.locate was called with
-       // `{setView: true}`.
-       stopLocate: function () {
-               if (navigator.geolocation && navigator.geolocation.clearWatch) {
-                       navigator.geolocation.clearWatch(this._locationWatchId);
-               }
-               if (this._locateOptions) {
-                       this._locateOptions.setView = false;
+       _onTouchMove: function (e) {
+               if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; }
+
+               var map = this._map,
+                   p1 = map.mouseEventToContainerPoint(e.touches[0]),
+                   p2 = map.mouseEventToContainerPoint(e.touches[1]),
+                   scale = p1.distanceTo(p2) / this._startDist;
+
+               this._zoom = map.getScaleZoom(scale, this._startZoom);
+
+               if (!map.options.bounceAtZoomLimits && (
+                       (this._zoom < map.getMinZoom() && scale < 1) ||
+                       (this._zoom > map.getMaxZoom() && scale > 1))) {
+                       this._zoom = map._limitZoom(this._zoom);
                }
-               return this;
-       },
 
-       _handleGeolocationError: function (error) {
-               var c = error.code,
-                   message = error.message ||
-                           (c === 1 ? 'permission denied' :
-                           (c === 2 ? 'position unavailable' : 'timeout'));
+               if (map.options.touchZoom === 'center') {
+                       this._center = this._startLatLng;
+                       if (scale === 1) { return; }
+               } else {
+                       // Get delta from pinch to center, so centerLatLng is delta applied to initial pinchLatLng
+                       var delta = p1._add(p2)._divideBy(2)._subtract(this._centerPoint);
+                       if (scale === 1 && delta.x === 0 && delta.y === 0) { return; }
+                       this._center = map.unproject(map.project(this._pinchStartLatLng, this._zoom).subtract(delta), this._zoom);
+               }
 
-               if (this._locateOptions.setView && !this._loaded) {
-                       this.fitWorld();
+               if (!this._moved) {
+                       map._moveStart(true, false);
+                       this._moved = true;
                }
 
-               // @section Location events
-               // @event locationerror: ErrorEvent
-               // Fired when geolocation (using the [`locate`](#map-locate) method) failed.
-               this.fire('locationerror', {
-                       code: c,
-                       message: 'Geolocation error: ' + message + '.'
-               });
-       },
+               cancelAnimFrame(this._animRequest);
 
-       _handleGeolocationResponse: function (pos) {
-               var lat = pos.coords.latitude,
-                   lng = pos.coords.longitude,
-                   latlng = new L.LatLng(lat, lng),
-                   bounds = latlng.toBounds(pos.coords.accuracy),
-                   options = this._locateOptions;
+               var moveFn = bind(map._move, map, this._center, this._zoom, {pinch: true, round: false});
+               this._animRequest = requestAnimFrame(moveFn, this, true);
 
-               if (options.setView) {
-                       var zoom = this.getBoundsZoom(bounds);
-                       this.setView(latlng, options.maxZoom ? Math.min(zoom, options.maxZoom) : zoom);
+               preventDefault(e);
+       },
+
+       _onTouchEnd: function () {
+               if (!this._moved || !this._zooming) {
+                       this._zooming = false;
+                       return;
                }
 
-               var data = {
-                       latlng: latlng,
-                       bounds: bounds,
-                       timestamp: pos.timestamp
-               };
+               this._zooming = false;
+               cancelAnimFrame(this._animRequest);
 
-               for (var i in pos.coords) {
-                       if (typeof pos.coords[i] === 'number') {
-                               data[i] = pos.coords[i];
-                       }
-               }
+               off(document, 'touchmove', this._onTouchMove);
+               off(document, 'touchend', this._onTouchEnd);
 
-               // @event locationfound: LocationEvent
-               // Fired when geolocation (using the [`locate`](#map-locate) method)
-               // went successfully.
-               this.fire('locationfound', data);
+               // Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.
+               if (this._map.options.zoomAnimation) {
+                       this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);
+               } else {
+                       this._map._resetView(this._center, this._map._limitZoom(this._zoom));
+               }
        }
 });
 
+// @section Handlers
+// @property touchZoom: Handler
+// Touch zoom handler.
+Map.addInitHook('addHandler', 'touchZoom', TouchZoom);
+
+Map.BoxZoom = BoxZoom;
+Map.DoubleClickZoom = DoubleClickZoom;
+Map.Drag = Drag;
+Map.Keyboard = Keyboard;
+Map.ScrollWheelZoom = ScrollWheelZoom;
+Map.Tap = Tap;
+Map.TouchZoom = TouchZoom;
+
+Object.freeze = freeze;
+
+exports.version = version;
+exports.Control = Control;
+exports.control = control;
+exports.Browser = Browser;
+exports.Evented = Evented;
+exports.Mixin = Mixin;
+exports.Util = Util;
+exports.Class = Class;
+exports.Handler = Handler;
+exports.extend = extend;
+exports.bind = bind;
+exports.stamp = stamp;
+exports.setOptions = setOptions;
+exports.DomEvent = DomEvent;
+exports.DomUtil = DomUtil;
+exports.PosAnimation = PosAnimation;
+exports.Draggable = Draggable;
+exports.LineUtil = LineUtil;
+exports.PolyUtil = PolyUtil;
+exports.Point = Point;
+exports.point = toPoint;
+exports.Bounds = Bounds;
+exports.bounds = toBounds;
+exports.Transformation = Transformation;
+exports.transformation = toTransformation;
+exports.Projection = index;
+exports.LatLng = LatLng;
+exports.latLng = toLatLng;
+exports.LatLngBounds = LatLngBounds;
+exports.latLngBounds = toLatLngBounds;
+exports.CRS = CRS;
+exports.GeoJSON = GeoJSON;
+exports.geoJSON = geoJSON;
+exports.geoJson = geoJson;
+exports.Layer = Layer;
+exports.LayerGroup = LayerGroup;
+exports.layerGroup = layerGroup;
+exports.FeatureGroup = FeatureGroup;
+exports.featureGroup = featureGroup;
+exports.ImageOverlay = ImageOverlay;
+exports.imageOverlay = imageOverlay;
+exports.VideoOverlay = VideoOverlay;
+exports.videoOverlay = videoOverlay;
+exports.SVGOverlay = SVGOverlay;
+exports.svgOverlay = svgOverlay;
+exports.DivOverlay = DivOverlay;
+exports.Popup = Popup;
+exports.popup = popup;
+exports.Tooltip = Tooltip;
+exports.tooltip = tooltip;
+exports.Icon = Icon;
+exports.icon = icon;
+exports.DivIcon = DivIcon;
+exports.divIcon = divIcon;
+exports.Marker = Marker;
+exports.marker = marker;
+exports.TileLayer = TileLayer;
+exports.tileLayer = tileLayer;
+exports.GridLayer = GridLayer;
+exports.gridLayer = gridLayer;
+exports.SVG = SVG;
+exports.svg = svg$1;
+exports.Renderer = Renderer;
+exports.Canvas = Canvas;
+exports.canvas = canvas$1;
+exports.Path = Path;
+exports.CircleMarker = CircleMarker;
+exports.circleMarker = circleMarker;
+exports.Circle = Circle;
+exports.circle = circle;
+exports.Polyline = Polyline;
+exports.polyline = polyline;
+exports.Polygon = Polygon;
+exports.polygon = polygon;
+exports.Rectangle = Rectangle;
+exports.rectangle = rectangle;
+exports.Map = Map;
+exports.map = createMap;
+
+var oldL = window.L;
+exports.noConflict = function() {
+       window.L = oldL;
+       return this;
+}
 
+// Always export us to window global (see #2364)
+window.L = exports;
 
-}(window, document));
-//# sourceMappingURL=leaflet-src.map
\ No newline at end of file
+})));
+//# sourceMappingURL=leaflet-src.js.map