]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/leaflet/leaflet.js
Added helper function set_references for mail header
[rails.git] / vendor / assets / leaflet / leaflet.js
index 2b66295fc11d550ff12ac9f474b6684a0b635689..a845eb6aeeccd94d1cd79a2ac770d0c83c06f442 100644 (file)
-/*
- Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com
- (c) 2010-2013, Vladimir Agafonkin
- (c) 2010-2011, CloudMade
-*/
-(function (window, document, undefined) {
-var oldL = window.L,
-    L = {};
-
-L.version = '0.7';
-
-// 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
-
-L.noConflict = function () {
-       window.L = oldL;
-       return this;
-};
+/* @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
+ */
 
 
-window.L = L;
+(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";
 
 /*
 
 /*
- * L.Util contains various utility functions used throughout Leaflet code.
+ * @namespace Util
+ *
+ * Various utility functions, used by Leaflet internally.
  */
 
  */
 
-L.Util = {
-       extend: function (dest) { // (Object[, Object, ...]) ->
-               var sources = Array.prototype.slice.call(arguments, 1),
-                   i, j, len, src;
+var freeze = Object.freeze;
+Object.freeze = function (obj) { return obj; };
 
 
-               for (j = 0, len = sources.length; j < len; j++) {
-                       src = sources[j] || {};
-                       for (i in src) {
-                               if (src.hasOwnProperty(i)) {
-                                       dest[i] = src[i];
-                               }
-                       }
-               }
-               return dest;
-       },
+// @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;
 
 
-       bind: function (fn, obj) { // (Function, Object) -> Function
-               var args = arguments.length > 2 ? Array.prototype.slice.call(arguments, 2) : null;
-               return function () {
-                       return fn.apply(obj, args || arguments);
-               };
-       },
+       for (j = 1, len = arguments.length; j < len; j++) {
+               src = arguments[j];
+               for (i in src) {
+                       dest[i] = src[i];
+               }
+       }
+       return dest;
+}
 
 
-       stamp: (function () {
-               var lastId = 0,
-                   key = '_leaflet_id';
-               return function (obj) {
-                       obj[key] = obj[key] || ++lastId;
-                       return obj[key];
-               };
-       }()),
+// @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();
+       };
+})();
 
 
-       invokeEach: function (obj, method, context) {
-               var i, args;
+// @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;
 
 
-               if (typeof obj === 'object') {
-                       args = Array.prototype.slice.call(arguments, 3);
+       if (fn.bind) {
+               return fn.bind.apply(fn, slice.call(arguments, 1));
+       }
 
 
-                       for (i in obj) {
-                               method.apply(context, [i, obj[i]].concat(args));
-                       }
-                       return true;
-               }
+       var args = slice.call(arguments, 2);
 
 
-               return false;
-       },
+       return function () {
+               return fn.apply(obj, args.length ? args.concat(slice.call(arguments)) : arguments);
+       };
+}
 
 
-       limitExecByInterval: function (fn, time, context) {
-               var lock, execOnUnlock;
+// @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 */
+}
 
 
-               return function wrapperFn() {
-                       var args = arguments;
+// @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;
+               }
+       };
 
 
-                       if (lock) {
-                               execOnUnlock = true;
-                               return;
-                       }
+       wrapperFn = function () {
+               if (lock) {
+                       // called too soon, queue to call later
+                       args = arguments;
 
 
+               } else {
+                       // call and lock until later
+                       fn.apply(context, arguments);
+                       setTimeout(later, time);
                        lock = true;
                        lock = true;
+               }
+       };
 
 
-                       setTimeout(function () {
-                               lock = false;
+       return wrapperFn;
+}
 
 
-                               if (execOnUnlock) {
-                                       wrapperFn.apply(context, args);
-                                       execOnUnlock = false;
-                               }
-                       }, time);
+// @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;
+}
 
 
-                       fn.apply(context, args);
-               };
-       },
+// @function falseFn(): Function
+// Returns a function which always returns `false`.
+function falseFn() { return false; }
 
 
-       falseFn: function () {
-               return false;
-       },
+// @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));
+}
 
 
-       formatNum: function (num, digits) {
-               var pow = Math.pow(10, digits || 5);
-               return Math.round(num * pow) / pow;
-       },
+// @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, '');
+}
 
 
-       trim: function (str) {
-               return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
-       },
+// @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+/);
+}
 
 
-       splitWords: function (str) {
-               return L.Util.trim(str).split(/\s+/);
-       },
+// @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;
+}
 
 
-       setOptions: function (obj, options) {
-               obj.options = L.extend({}, obj.options, options);
-               return obj.options;
-       },
+// @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('&');
+}
 
 
-       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('&');
-       },
+var templateRe = /\{ *([\w_-]+) *\}/g;
 
 
-       compileTemplate: function (str, data) {
-               // based on https://gist.github.com/padolsey/6008842
-               str = str.replace(/"/g, '\\\"');
-               str = str.replace(/\{ *([\w_]+) *\}/g, function (str, key) {
-                       return '" + o["' + key + '"]' + (typeof data[key] === 'function' ? '(o)' : '') + ' + "';
-               });
-               // jshint evil: true
-               return new Function('o', 'return "' + str + '";');
-       },
+// @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];
 
 
-       template: function (str, data) {
-               var cache = L.Util._templateCache = L.Util._templateCache || {};
-               cache[str] = cache[str] || L.Util.compileTemplate(str, data);
-               return cache[str](data);
-       },
+               if (value === undefined) {
+                       throw new Error('No value provided for variable ' + str);
 
 
-       isArray: Array.isArray || function (obj) {
-               return (Object.prototype.toString.call(obj) === '[object Array]');
-       },
+               } else if (typeof value === 'function') {
+                       value = value(data);
+               }
+               return value;
+       });
+}
 
 
-       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) {
-               var i, fn,
-                   prefixes = ['webkit', 'moz', 'o', 'ms'];
-
-               for (i = 0; i < prefixes.length && !fn; i++) {
-                       fn = window[prefixes[i] + name];
-               }
-
-               return fn;
+// @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;
+// @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=';
 
 
-       function timeoutDefer(fn) {
-               var time = +new Date(),
-                   timeToCall = Math.max(0, 16 - (time - lastTime));
+// inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/
 
 
-               lastTime = time + timeToCall;
-               return window.setTimeout(fn, timeToCall);
-       }
+function getPrefixed(name) {
+       return window['webkit' + name] || window['moz' + name] || window['ms' + name];
+}
 
 
-       var requestFn = window.requestAnimationFrame ||
-               getPrefixed('RequestAnimationFrame') || timeoutDefer;
+var lastTime = 0;
 
 
-       var cancelFn = window.cancelAnimationFrame ||
-               getPrefixed('CancelAnimationFrame') ||
-               getPrefixed('CancelRequestAnimationFrame') ||
-               function (id) { window.clearTimeout(id); };
+// fallback for IE 7-8
+function timeoutDefer(fn) {
+       var time = +new Date(),
+           timeToCall = Math.max(0, 16 - (time - lastTime));
 
 
+       lastTime = time + timeToCall;
+       return window.setTimeout(fn, timeToCall);
+}
 
 
-       L.Util.requestAnimFrame = function (fn, context, immediate, element) {
-               fn = L.bind(fn, context);
+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));
+       }
+}
 
 
-               if (immediate && requestFn === timeoutDefer) {
-                       fn();
-               } else {
-                       return requestFn.call(window, fn, element);
-               }
-       };
+// @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);
+       }
+}
 
 
-       L.Util.cancelAnimFrame = function (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
+});
 
 
-// shortcuts for most used utility functions
-L.extend = L.Util.extend;
-L.bind = L.Util.bind;
-L.stamp = L.Util.stamp;
-L.setOptions = L.Util.setOptions;
+// @class Class
+// @aka L.Class
 
 
+// @section
+// @uninheritable
 
 
-/*
- * L.Class powers the OOP facilities of the library.
- * Thanks to John Resig and Dean Edwards for inspiration!
- */
+// Thanks to John Resig and Dean Edwards for inspiration!
 
 
-L.Class = function () {};
+function Class() {}
 
 
-L.Class.extend = function (props) {
+Class.extend = function (props) {
 
 
-       // extended class with the new prototype
+       // @function extend(props: Object): Function
+       // [Extends the current class](#class-inheritance) given the properties to be included.
+       // Returns a Javascript function that is a class constructor (to be called with `new`).
        var NewClass = function () {
 
                // call the constructor
        var NewClass = function () {
 
                // call the constructor
@@ -235,60 +302,53 @@ L.Class.extend = function (props) {
                }
 
                // call all constructor hooks
                }
 
                // call all constructor hooks
-               if (this._initHooks) {
-                       this.callInitHooks();
-               }
+               this.callInitHooks();
        };
 
        };
 
-       // instantiate class without calling constructor
-       var F = function () {};
-       F.prototype = this.prototype;
+       var parentProto = NewClass.__super__ = this.prototype;
 
 
-       var proto = new F();
+       var proto = create(parentProto);
        proto.constructor = NewClass;
 
        NewClass.prototype = proto;
 
        proto.constructor = NewClass;
 
        NewClass.prototype = proto;
 
-       //inherit parent's statics
+       // inherit parent's statics
        for (var i in this) {
        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) {
                        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) {
                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
                delete props.includes;
        }
 
        // merge options
-       if (props.options && proto.options) {
-               props.options = L.extend({}, proto.options, props.options);
+       if (proto.options) {
+               props.options = extend(create(proto.options), props.options);
        }
 
        // mix given properties into the prototype
        }
 
        // mix given properties into the prototype
-       L.extend(proto, props);
+       extend(proto, props);
 
        proto._initHooks = [];
 
 
        proto._initHooks = [];
 
-       var parent = this;
-       // jshint camelcase: false
-       NewClass.__super__ = parent.prototype;
-
        // add method for calling all hooks
        proto.callInitHooks = function () {
 
                if (this._initHooksCalled) { return; }
 
        // add method for calling all hooks
        proto.callInitHooks = function () {
 
                if (this._initHooksCalled) { return; }
 
-               if (parent.prototype.callInitHooks) {
-                       parent.prototype.callInitHooks.call(this);
+               if (parentProto.callInitHooks) {
+                       parentProto.callInitHooks.call(this);
                }
 
                this._initHooksCalled = true;
                }
 
                this._initHooksCalled = true;
@@ -302,18 +362,23 @@ L.Class.extend = function (props) {
 };
 
 
 };
 
 
-// method for adding properties to prototype
-L.Class.include = function (props) {
-       L.extend(this.prototype, props);
+// @function include(properties: Object): this
+// [Includes a mixin](#class-includes) into the current class.
+Class.include = function (props) {
+       extend(this.prototype, props);
+       return this;
 };
 
 };
 
-// merge new default options to the Class
-L.Class.mergeOptions = function (options) {
-       L.extend(this.prototype.options, options);
+// @function mergeOptions(options: Object): this
+// [Merges `options`](#class-options) into the defaults of the class.
+Class.mergeOptions = function (options) {
+       extend(this.prototype.options, options);
+       return this;
 };
 
 };
 
-// add a constructor hook
-L.Class.addInitHook = function (fn) { // (Function) || (String, args...)
+// @function addInitHook(fn: Function): this
+// Adds a [constructor hook](#class-constructor-hooks) to the class.
+Class.addInitHook = function (fn) { // (Function) || (String, args...)
        var args = Array.prototype.slice.call(arguments, 1);
 
        var init = typeof fn === 'function' ? fn : function () {
        var args = Array.prototype.slice.call(arguments, 1);
 
        var init = typeof fn === 'function' ? fn : function () {
@@ -322,317 +387,377 @@ L.Class.addInitHook = function (fn) { // (Function) || (String, args...)
 
        this.prototype._initHooks = this.prototype._initHooks || [];
        this.prototype._initHooks.push(init);
 
        this.prototype._initHooks = this.prototype._initHooks || [];
        this.prototype._initHooks.push(init);
+       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);
+               }
+       }
+}
 
 /*
 
 /*
- * L.Mixin.Events is used to add custom events functionality to Leaflet classes.
+ * @class Evented
+ * @aka L.Evented
+ * @inherits Class
+ *
+ * A set of methods shared between event-powered classes (like `Map` and `Marker`). Generally, events allow you to execute some function when something happens with an object (e.g. the user clicks on the map, causing the map to fire `'click'` event).
+ *
+ * @example
+ *
+ * ```js
+ * map.on('click', function(e) {
+ *     alert(e.latlng);
+ * } );
+ * ```
+ *
+ * Leaflet deals with event listeners by reference, so if you want to add a listener and then remove it, define it as a function:
+ *
+ * ```js
+ * function onClick(e) { ... }
+ *
+ * map.on('click', onClick);
+ * map.off('click', onClick);
+ * ```
  */
 
  */
 
-var eventsKey = '_leaflet_events';
-
-L.Mixin = {};
+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'`).
+        *
+        * @alternative
+        * @method on(eventMap: Object): this
+        * Adds a set of type/listener pairs, e.g. `{click: onClick, mousemove: onMouseMove}`
+        */
+       on: function (types, fn, context) {
 
 
-L.Mixin.Events = {
+               // types can be a map of types/handlers
+               if (typeof types === 'object') {
+                       for (var type in types) {
+                               // we don't process space-separated events here for performance;
+                               // it's a hot path since Layer uses the on(obj) syntax
+                               this._on(type, types[type], fn);
+                       }
 
 
-       addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object])
+               } else {
+                       // types can be a string of space-separated words
+                       types = splitWords(types);
 
 
-               // types can be a map of types/handlers
-               if (L.Util.invokeEach(types, this.addEventListener, this, fn, context)) { return this; }
+                       for (var i = 0, len = types.length; i < len; i++) {
+                               this._on(types[i], fn, context);
+                       }
+               }
 
 
-               var events = this[eventsKey] = this[eventsKey] || {},
-                   contextId = context && context !== this && L.stamp(context),
-                   i, len, event, type, indexKey, indexLenKey, typeIndex;
+               return this;
+       },
 
 
-               // types can be a string of space-separated words
-               types = L.Util.splitWords(types);
+       /* @method off(type: 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 event from the object. Note that if you passed a custom context to `on`, you must pass the same context to `off` in order to remove the listener.
+        *
+        * @alternative
+        * @method off(eventMap: Object): this
+        * Removes a set of type/listener pairs.
+        *
+        * @alternative
+        * @method off: this
+        * Removes all listeners to all events on the object. This includes implicitly attached events.
+        */
+       off: function (types, fn, context) {
 
 
-               for (i = 0, len = types.length; i < len; i++) {
-                       event = {
-                               action: fn,
-                               context: context || this
-                       };
-                       type = types[i];
+               if (!types) {
+                       // clear all listeners if called without arguments
+                       delete this._events;
 
 
-                       if (contextId) {
-                               // store listeners of a particular context in a separate hash (if it has an id)
-                               // gives a major performance boost when removing thousands of map layers
+               } else if (typeof types === 'object') {
+                       for (var type in types) {
+                               this._off(type, types[type], fn);
+                       }
 
 
-                               indexKey = type + '_idx';
-                               indexLenKey = indexKey + '_len';
+               } else {
+                       types = splitWords(types);
 
 
-                               typeIndex = events[indexKey] = events[indexKey] || {};
+                       for (var i = 0, len = types.length; i < len; i++) {
+                               this._off(types[i], fn, context);
+                       }
+               }
 
 
-                               if (!typeIndex[contextId]) {
-                                       typeIndex[contextId] = [];
+               return this;
+       },
 
 
-                                       // keep track of the number of keys in the index to quickly check if it's empty
-                                       events[indexLenKey] = (events[indexLenKey] || 0) + 1;
-                               }
+       // attach listener (without syntactic sugar now)
+       _on: function (type, fn, context) {
+               this._events = this._events || {};
 
 
-                               typeIndex[contextId].push(event);
+               /* get/init listeners for type */
+               var typeListeners = this._events[type];
+               if (!typeListeners) {
+                       typeListeners = [];
+                       this._events[type] = typeListeners;
+               }
 
 
+               if (context === this) {
+                       // Less memory footprint.
+                       context = undefined;
+               }
+               var newListener = {fn: fn, ctx: context},
+                   listeners = typeListeners;
 
 
-                       } else {
-                               events[type] = events[type] || [];
-                               events[type].push(event);
+               // check if fn already there
+               for (var i = 0, len = listeners.length; i < len; i++) {
+                       if (listeners[i].fn === fn && listeners[i].ctx === context) {
+                               return;
                        }
                }
 
                        }
                }
 
-               return this;
+               listeners.push(newListener);
        },
 
        },
 
-       hasEventListeners: function (type) { // (String) -> Boolean
-               var events = this[eventsKey];
-               return !!events && ((type in events && events[type].length > 0) ||
-                                   (type + '_idx' in events && events[type + '_idx_len'] > 0));
-       },
+       _off: function (type, fn, context) {
+               var listeners,
+                   i,
+                   len;
 
 
-       removeEventListener: function (types, fn, context) { // ([String, Function, Object]) or (Object[, Object])
+               if (!this._events) { return; }
 
 
-               if (!this[eventsKey]) {
-                       return this;
-               }
+               listeners = this._events[type];
 
 
-               if (!types) {
-                       return this.clearAllEventListeners();
+               if (!listeners) {
+                       return;
                }
 
                }
 
-               if (L.Util.invokeEach(types, this.removeEventListener, this, fn, context)) { return this; }
-
-               var events = this[eventsKey],
-                   contextId = context && context !== this && L.stamp(context),
-                   i, len, type, listeners, j, indexKey, indexLenKey, typeIndex, removed;
+               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 = falseFn;
+                       }
+                       // clear all listeners for a type if function isn't specified
+                       delete this._events[type];
+                       return;
+               }
 
 
-               types = L.Util.splitWords(types);
+               if (context === this) {
+                       context = undefined;
+               }
 
 
-               for (i = 0, len = types.length; i < len; i++) {
-                       type = types[i];
-                       indexKey = type + '_idx';
-                       indexLenKey = indexKey + '_len';
+               if (listeners) {
 
 
-                       typeIndex = events[indexKey];
+                       // find fn and remove it
+                       for (i = 0, len = listeners.length; i < len; i++) {
+                               var l = listeners[i];
+                               if (l.ctx !== context) { continue; }
+                               if (l.fn === fn) {
 
 
-                       if (!fn) {
-                               // clear all listeners for a type if function isn't specified
-                               delete events[type];
-                               delete events[indexKey];
-                               delete events[indexLenKey];
+                                       // set the removed listener to noop so that's not called if remove happens in fire
+                                       l.fn = falseFn;
 
 
-                       } else {
-                               listeners = contextId && typeIndex ? typeIndex[contextId] : events[type];
-
-                               if (listeners) {
-                                       for (j = listeners.length - 1; j >= 0; j--) {
-                                               if ((listeners[j].action === fn) && (!context || (listeners[j].context === context))) {
-                                                       removed = listeners.splice(j, 1);
-                                                       // set the old action to a no-op, because it is possible
-                                                       // that the listener is being iterated over as part of a dispatch
-                                                       removed[0].action = L.Util.falseFn;
-                                               }
+                                       if (this._firingCount) {
+                                               /* copy array in case events are being fired */
+                                               this._events[type] = listeners = listeners.slice();
                                        }
                                        }
+                                       listeners.splice(i, 1);
 
 
-                                       if (context && typeIndex && (listeners.length === 0)) {
-                                               delete typeIndex[contextId];
-                                               events[indexLenKey]--;
-                                       }
+                                       return;
                                }
                        }
                }
                                }
                        }
                }
-
-               return this;
-       },
-
-       clearAllEventListeners: function () {
-               delete this[eventsKey];
-               return this;
        },
 
        },
 
-       fireEvent: function (type, data) { // (String[, Object])
-               if (!this.hasEventListeners(type)) {
-                       return this;
-               }
+       // @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 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
+               });
 
 
-               var events = this[eventsKey],
-                   listeners, i, len, typeIndex, contextId;
+               if (this._events) {
+                       var listeners = this._events[type];
 
 
-               if (events[type]) {
-                       // make sure adding/removing listeners inside other listeners won't cause infinite loop
-                       listeners = events[type].slice();
+                       if (listeners) {
+                               this._firingCount = (this._firingCount + 1) || 1;
+                               for (var i = 0, len = listeners.length; i < len; i++) {
+                                       var l = listeners[i];
+                                       l.fn.call(l.ctx || this, event);
+                               }
 
 
-                       for (i = 0, len = listeners.length; i < len; i++) {
-                               listeners[i].action.call(listeners[i].context, event);
+                               this._firingCount--;
                        }
                }
 
                        }
                }
 
-               // fire event for the context-indexed listeners as well
-               typeIndex = events[type + '_idx'];
+               if (propagate) {
+                       // propagate the event to parents (set with addEventParent)
+                       this._propagateEvent(event);
+               }
+
+               return this;
+       },
 
 
-               for (contextId in typeIndex) {
-                       listeners = typeIndex[contextId].slice();
+       // @method listens(type: String): Boolean
+       // Returns `true` if a particular event type has any listeners attached to it.
+       listens: function (type, propagate) {
+               var listeners = this._events && this._events[type];
+               if (listeners && listeners.length) { return true; }
 
 
-                       if (listeners) {
-                               for (i = 0, len = listeners.length; i < len; i++) {
-                                       listeners[i].action.call(listeners[i].context, event);
-                               }
+               if (propagate) {
+                       // also check parents for listeners if event propagates
+                       for (var id in this._eventParents) {
+                               if (this._eventParents[id].listens(type, propagate)) { return true; }
                        }
                }
                        }
                }
-
-               return this;
+               return false;
        },
 
        },
 
-       addOneTimeEventListener: function (types, fn, context) {
+       // @method once(…): this
+       // Behaves as [`on(…)`](#evented-on), except the listener will only get fired once and then removed.
+       once: function (types, fn, context) {
 
 
-               if (L.Util.invokeEach(types, this.addOneTimeEventListener, this, fn, context)) { return this; }
+               if (typeof types === 'object') {
+                       for (var type in types) {
+                               this.once(type, types[type], fn);
+                       }
+                       return this;
+               }
 
 
-               var handler = L.bind(function () {
+               var handler = bind(function () {
                        this
                        this
-                           .removeEventListener(types, fn, context)
-                           .removeEventListener(types, handler, context);
+                           .off(types, fn, context)
+                           .off(types, handler, context);
                }, this);
 
                }, this);
 
+               // add a listener that's executed once and removed after that
                return this
                return this
-                   .addEventListener(types, fn, context)
-                   .addEventListener(types, handler, context);
-       }
-};
-
-L.Mixin.Events.on = L.Mixin.Events.addEventListener;
-L.Mixin.Events.off = L.Mixin.Events.removeEventListener;
-L.Mixin.Events.once = L.Mixin.Events.addOneTimeEventListener;
-L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
-
-
-/*
- * L.Browser handles different browser and feature detections for internal Leaflet use.
- */
-
-(function () {
-
-       var ie = 'ActiveXObject' in window,
-               ielt9 = ie && !document.addEventListener,
-
-           // terrible browser detection to work around Safari / iOS / Android browser bugs
-           ua = navigator.userAgent.toLowerCase(),
-           webkit = ua.indexOf('webkit') !== -1,
-           chrome = ua.indexOf('chrome') !== -1,
-           phantomjs = ua.indexOf('phantom') !== -1,
-           android = ua.indexOf('android') !== -1,
-           android23 = ua.search('android [23]') !== -1,
-               gecko = ua.indexOf('gecko') !== -1,
-
-           mobile = typeof orientation !== undefined + '',
-           msPointer = window.navigator && window.navigator.msPointerEnabled &&
-                     window.navigator.msMaxTouchPoints && !window.PointerEvent,
-               pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) ||
-                                 msPointer,
-           retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
-                    ('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
-                     window.matchMedia('(min-resolution:144dpi)').matches),
-
-           doc = document.documentElement,
-           ie3d = ie && ('transition' in doc.style),
-           webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),
-           gecko3d = 'MozPerspective' in doc.style,
-           opera3d = 'OTransition' in doc.style,
-           any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d) && !phantomjs;
-
-
-       // PhantomJS has 'ontouchstart' in document.documentElement, but doesn't actually support touch.
-       // https://github.com/Leaflet/Leaflet/pull/1434#issuecomment-13843151
-
-       var touch = !window.L_NO_TOUCH && !phantomjs && (function () {
-
-               var startName = 'ontouchstart';
-
-               // IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.Pointer) or WebKit, etc.
-               if (pointer || (startName in doc)) {
-                       return true;
-               }
+                   .on(types, fn, context)
+                   .on(types, handler, context);
+       },
 
 
-               // Firefox/Gecko
-               var div = document.createElement('div'),
-                   supported = false;
+       // @method addEventParent(obj: Evented): this
+       // Adds an event parent - an `Evented` that will receive propagated events
+       addEventParent: function (obj) {
+               this._eventParents = this._eventParents || {};
+               this._eventParents[stamp(obj)] = obj;
+               return this;
+       },
 
 
-               if (!div.setAttribute) {
-                       return false;
+       // @method removeEventParent(obj: Evented): this
+       // Removes an event parent, so it will stop receiving propagated events
+       removeEventParent: function (obj) {
+               if (this._eventParents) {
+                       delete this._eventParents[stamp(obj)];
                }
                }
-               div.setAttribute(startName, 'return;');
+               return this;
+       },
 
 
-               if (typeof div[startName] === 'function') {
-                       supported = true;
+       _propagateEvent: function (e) {
+               for (var id in this._eventParents) {
+                       this._eventParents[id].fire(e.type, extend({
+                               layer: e.target,
+                               propagatedFrom: e.target
+                       }, e), true);
                }
                }
+       }
+};
 
 
-               div.removeAttribute(startName);
-               div = null;
-
-               return supported;
-       }());
-
-
-       L.Browser = {
-               ie: ie,
-               ielt9: ielt9,
-               webkit: webkit,
-               gecko: gecko && !webkit && !window.opera && !ie,
-
-               android: android,
-               android23: android23,
+// aliases; we should ditch those eventually
 
 
-               chrome: chrome,
+// @method addEventListener(…): this
+// Alias to [`on(…)`](#evented-on)
+Events.addEventListener = Events.on;
 
 
-               ie3d: ie3d,
-               webkit3d: webkit3d,
-               gecko3d: gecko3d,
-               opera3d: opera3d,
-               any3d: any3d,
+// @method removeEventListener(…): this
+// Alias to [`off(…)`](#evented-off)
 
 
-               mobile: mobile,
-               mobileWebkit: mobile && webkit,
-               mobileWebkit3d: mobile && webkit3d,
-               mobileOpera: mobile && window.opera,
+// @method clearAllEventListeners(…): this
+// Alias to [`off()`](#evented-off)
+Events.removeEventListener = Events.clearAllEventListeners = Events.off;
 
 
-               touch: touch,
-               msPointer: msPointer,
-               pointer: pointer,
+// @method addOneTimeEventListener(…): this
+// Alias to [`once(…)`](#evented-once)
+Events.addOneTimeEventListener = Events.once;
 
 
-               retina: retina
-       };
+// @method fireEvent(…): this
+// Alias to [`fire(…)`](#evented-fire)
+Events.fireEvent = Events.fire;
 
 
-}());
+// @method hasEventListeners(…): Boolean
+// Alias to [`listens(…)`](#evented-listens)
+Events.hasEventListeners = Events.listens;
 
 
+var Evented = Class.extend(Events);
 
 /*
 
 /*
- * L.Point represents a point with x and y coordinates.
+ * @class Point
+ * @aka L.Point
+ *
+ * Represents a point with `x` and `y` coordinates in pixels.
+ *
+ * @example
+ *
+ * ```js
+ * var point = L.point(200, 300);
+ * ```
+ *
+ * All Leaflet methods and options that accept `Point` objects also accept them in a simple Array form (unless noted otherwise), so these lines are equivalent:
+ *
+ * ```js
+ * 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 (/*Number*/ x, /*Number*/ y, /*Boolean*/ round) {
+function Point(x, y, round) {
+       // @property x: Number; The `x` coordinate of the point
        this.x = (round ? Math.round(x) : x);
        this.x = (round ? Math.round(x) : x);
+       // @property y: Number; The `y` coordinate of the point
        this.y = (round ? Math.round(y) : y);
        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 () {
        clone: function () {
-               return new L.Point(this.x, this.y);
+               return new Point(this.x, this.y);
        },
 
        },
 
-       // non-destructive, returns a new point
+       // @method add(otherPoint: Point): Point
+       // Returns the result of addition of the current and the given points.
        add: function (point) {
        add: function (point) {
-               return this.clone()._add(L.point(point));
+               // non-destructive, returns a new point
+               return this.clone()._add(toPoint(point));
        },
 
        },
 
-       // destructive, used directly for performance in situations where it's safe to modify existing point
        _add: function (point) {
        _add: function (point) {
+               // destructive, used directly for performance in situations where it's safe to modify existing point
                this.x += point.x;
                this.y += point.y;
                return this;
        },
 
                this.x += point.x;
                this.y += point.y;
                return this;
        },
 
+       // @method subtract(otherPoint: Point): Point
+       // Returns the result of subtraction of the given point from the current.
        subtract: function (point) {
        subtract: function (point) {
-               return this.clone()._subtract(L.point(point));
+               return this.clone()._subtract(toPoint(point));
        },
 
        _subtract: function (point) {
        },
 
        _subtract: function (point) {
@@ -641,6 +766,8 @@ L.Point.prototype = {
                return this;
        },
 
                return this;
        },
 
+       // @method divideBy(num: Number): Point
+       // Returns the result of division of the current point by the given number.
        divideBy: function (num) {
                return this.clone()._divideBy(num);
        },
        divideBy: function (num) {
                return this.clone()._divideBy(num);
        },
@@ -651,6 +778,8 @@ L.Point.prototype = {
                return this;
        },
 
                return this;
        },
 
+       // @method multiplyBy(num: Number): Point
+       // Returns the result of multiplication of the current point by the given number.
        multiplyBy: function (num) {
                return this.clone()._multiplyBy(num);
        },
        multiplyBy: function (num) {
                return this.clone()._multiplyBy(num);
        },
@@ -661,6 +790,24 @@ L.Point.prototype = {
                return this;
        },
 
                return this;
        },
 
+       // @method scaleBy(scale: Point): Point
+       // Multiply each coordinate of the current point by each coordinate of
+       // `scale`. In linear algebra terms, multiply the point by the
+       // [scaling matrix](https://en.wikipedia.org/wiki/Scaling_%28geometry%29#Matrix_representation)
+       // defined by `scale`.
+       scaleBy: function (point) {
+               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 Point(this.x / point.x, this.y / point.y);
+       },
+
+       // @method round(): Point
+       // Returns a copy of the current point with rounded coordinates.
        round: function () {
                return this.clone()._round();
        },
        round: function () {
                return this.clone()._round();
        },
@@ -671,6 +818,8 @@ L.Point.prototype = {
                return this;
        },
 
                return this;
        },
 
+       // @method floor(): Point
+       // Returns a copy of the current point with floored coordinates (rounded down).
        floor: function () {
                return this.clone()._floor();
        },
        floor: function () {
                return this.clone()._floor();
        },
@@ -681,8 +830,34 @@ L.Point.prototype = {
                return this;
        },
 
                return this;
        },
 
+       // @method ceil(): Point
+       // Returns a copy of the current point with ceiled coordinates (rounded up).
+       ceil: function () {
+               return this.clone()._ceil();
+       },
+
+       _ceil: function () {
+               this.x = Math.ceil(this.x);
+               this.y = Math.ceil(this.y);
+               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) {
        distanceTo: function (point) {
-               point = L.point(point);
+               point = toPoint(point);
 
                var x = point.x - this.x,
                    y = point.y - this.y;
 
                var x = point.x - this.x,
                    y = point.y - this.y;
@@ -690,46 +865,85 @@ L.Point.prototype = {
                return Math.sqrt(x * x + y * y);
        },
 
                return Math.sqrt(x * x + y * y);
        },
 
+       // @method equals(otherPoint: Point): Boolean
+       // Returns `true` if the given point has the same coordinates.
        equals: function (point) {
        equals: function (point) {
-               point = L.point(point);
+               point = toPoint(point);
 
                return point.x === this.x &&
                       point.y === this.y;
        },
 
 
                return point.x === this.x &&
                       point.y === this.y;
        },
 
+       // @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) {
        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);
        },
 
 
                return Math.abs(point.x) <= Math.abs(this.x) &&
                       Math.abs(point.y) <= Math.abs(this.y);
        },
 
+       // @method toString(): String
+       // Returns a string representation of the point for debugging purposes.
        toString: function () {
                return 'Point(' +
        toString: function () {
                return 'Point(' +
-                       L.Util.formatNum(this.x) + ', ' +
-                       L.Util.formatNum(this.y) + ')';
+                       formatNum(this.x) + ', ' +
+                       formatNum(this.y) + ')';
        }
 };
 
        }
 };
 
-L.point = function (x, y, round) {
-       if (x instanceof L.Point) {
+// @factory L.point(x: Number, y: Number, round?: Boolean)
+// Creates a Point object with the given `x` and `y` coordinates. If optional `round` is set to true, rounds the `x` and `y` values.
+
+// @alternative
+// @factory L.point(coords: Number[])
+// Expects an array of the form `[x, y]` instead.
+
+// @alternative
+// @factory L.point(coords: Object)
+// Expects a plain object of the form `{x: Number, y: Number}` instead.
+function toPoint(x, y, round) {
+       if (x instanceof Point) {
                return x;
        }
                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 (x === undefined || x === null) {
                return x;
        }
-       return new L.Point(x, y, round);
-};
-
+       if (typeof x === 'object' && 'x' in x && 'y' in x) {
+               return new Point(x.x, x.y);
+       }
+       return new Point(x, y, round);
+}
 
 /*
 
 /*
- * L.Bounds represents a rectangular area on the screen in pixel coordinates.
+ * @class Bounds
+ * @aka L.Bounds
+ *
+ * Represents a rectangular area in pixel coordinates.
+ *
+ * @example
+ *
+ * ```js
+ * var p1 = L.point(10, 10),
+ * p2 = L.point(40, 60),
+ * bounds = L.bounds(p1, p2);
+ * ```
+ *
+ * All Leaflet methods that accept `Bounds` objects also accept them in a simple Array form (unless noted otherwise), so the bounds example above can be passed like this:
+ *
+ * ```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) { //(Point, Point) or Point[]
+function Bounds(a, b) {
        if (!a) { return; }
 
        var points = b ? [a, b] : a;
        if (!a) { return; }
 
        var points = b ? [a, b] : a;
@@ -737,13 +951,18 @@ L.Bounds = function (a, b) { //(Point, Point) or Point[]
        for (var i = 0, len = points.length; i < len; i++) {
                this.extend(points[i]);
        }
        for (var i = 0, len = points.length; i < len; i++) {
                this.extend(points[i]);
        }
-};
+}
 
 
-L.Bounds.prototype = {
-       // extend the bounds to contain the given point
+Bounds.prototype = {
+       // @method extend(point: Point): this
+       // Extends the bounds to contain the given point.
        extend: function (point) { // (Point)
        extend: function (point) { // (Point)
-               point = L.point(point);
+               point = toPoint(point);
 
 
+               // @property min: Point
+               // The top left corner of the rectangle.
+               // @property max: Point
+               // The bottom right corner of the rectangle.
                if (!this.min && !this.max) {
                        this.min = point.clone();
                        this.max = point.clone();
                if (!this.min && !this.max) {
                        this.min = point.clone();
                        this.max = point.clone();
@@ -756,34 +975,59 @@ L.Bounds.prototype = {
                return this;
        },
 
                return this;
        },
 
-       getCenter: function (round) { // (Boolean) -> Point
-               return new L.Point(
+       // @method getCenter(round?: Boolean): Point
+       // Returns the center point of the bounds.
+       getCenter: function (round) {
+               return new Point(
                        (this.min.x + this.max.x) / 2,
                        (this.min.y + this.max.y) / 2, round);
        },
 
                        (this.min.x + this.max.x) / 2,
                        (this.min.y + this.max.y) / 2, round);
        },
 
-       getBottomLeft: function () { // -> Point
-               return new L.Point(this.min.x, this.max.y);
+       // @method getBottomLeft(): Point
+       // Returns the bottom-left point of the bounds.
+       getBottomLeft: function () {
+               return new Point(this.min.x, this.max.y);
        },
 
        },
 
+       // @method getTopRight(): Point
+       // Returns the top-right point of the bounds.
        getTopRight: function () { // -> Point
        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
+       // Returns the size of the given bounds
        getSize: function () {
                return this.max.subtract(this.min);
        },
 
        getSize: function () {
                return this.max.subtract(this.min);
        },
 
-       contains: function (obj) { // (Bounds) or (Point) -> Boolean
+       // @method contains(otherBounds: Bounds): Boolean
+       // Returns `true` if the rectangle contains the given one.
+       // @alternative
+       // @method contains(point: Point): Boolean
+       // Returns `true` if the rectangle contains the given point.
+       contains: function (obj) {
                var min, max;
 
                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 {
                } else {
-                       obj = L.bounds(obj);
+                       obj = toBounds(obj);
                }
 
                }
 
-               if (obj instanceof L.Bounds) {
+               if (obj instanceof Bounds) {
                        min = obj.min;
                        max = obj.max;
                } else {
                        min = obj.min;
                        max = obj.max;
                } else {
@@ -796,8 +1040,11 @@ L.Bounds.prototype = {
                       (max.y <= this.max.y);
        },
 
                       (max.y <= this.max.y);
        },
 
+       // @method intersects(otherBounds: Bounds): 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) -> Boolean
        intersects: function (bounds) { // (Bounds) -> Boolean
-               bounds = L.bounds(bounds);
+               bounds = toBounds(bounds);
 
                var min = this.min,
                    max = this.max,
 
                var min = this.min,
                    max = this.max,
@@ -809,8383 +1056,12965 @@ L.Bounds.prototype = {
                return xIntersects && yIntersects;
        },
 
                return xIntersects && yIntersects;
        },
 
+       // @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) -> Boolean
+               bounds = toBounds(bounds);
+
+               var min = this.min,
+                   max = this.max,
+                   min2 = bounds.min,
+                   max2 = bounds.max,
+                   xOverlaps = (max2.x > min.x) && (min2.x < max.x),
+                   yOverlaps = (max2.y > min.y) && (min2.y < max.y);
+
+               return xOverlaps && yOverlaps;
+       },
+
        isValid: function () {
                return !!(this.min && this.max);
        }
 };
 
        isValid: function () {
                return !!(this.min && this.max);
        }
 };
 
-L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[])
-       if (!a || a instanceof L.Bounds) {
+
+// @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 given array of points.
+function toBounds(a, b) {
+       if (!a || a instanceof Bounds) {
                return a;
        }
                return a;
        }
-       return new L.Bounds(a, b);
-};
-
+       return new Bounds(a, b);
+}
 
 /*
 
 /*
- * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix.
+ * @class LatLngBounds
+ * @aka L.LatLngBounds
+ *
+ * Represents a rectangular geographical area on a map.
+ *
+ * @example
+ *
+ * ```js
+ * 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.
  */
 
  */
 
-L.Transformation = function (a, b, c, d) {
-       this._a = a;
-       this._b = b;
-       this._c = c;
-       this._d = d;
-};
+function LatLngBounds(corner1, corner2) { // (LatLng, LatLng) or (LatLng[])
+       if (!corner1) { return; }
 
 
-L.Transformation.prototype = {
-       transform: function (point, scale) { // (Point, Number) -> Point
-               return this._transform(point.clone(), scale);
-       },
+       var latlngs = corner2 ? [corner1, corner2] : corner1;
 
 
-       // 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;
-       },
+       for (var i = 0, len = latlngs.length; i < len; i++) {
+               this.extend(latlngs[i]);
+       }
+}
 
 
-       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);
-       }
-};
+LatLngBounds.prototype = {
 
 
+       // @method extend(latlng: LatLng): this
+       // Extend the bounds to contain the given point
 
 
-/*
- * L.DomUtil contains various utility functions for working with DOM.
- */
+       // @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;
 
 
-L.DomUtil = {
-       get: function (id) {
-               return (typeof id === 'string' ? document.getElementById(id) : id);
-       },
+               if (obj instanceof LatLng) {
+                       sw2 = obj;
+                       ne2 = obj;
 
 
-       getStyle: function (el, style) {
+               } else if (obj instanceof LatLngBounds) {
+                       sw2 = obj._southWest;
+                       ne2 = obj._northEast;
 
 
-               var value = el.style[style];
+                       if (!sw2 || !ne2) { return this; }
 
 
-               if (!value && el.currentStyle) {
-                       value = el.currentStyle[style];
+               } else {
+                       return obj ? this.extend(toLatLng(obj) || toLatLngBounds(obj)) : this;
                }
 
                }
 
-               if ((!value || value === 'auto') && document.defaultView) {
-                       var css = document.defaultView.getComputedStyle(el, null);
-                       value = css ? css[style] : null;
+               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 value === 'auto' ? null : value;
+               return this;
        },
 
        },
 
-       getViewportOffset: function (element) {
-
-               var top = 0,
-                   left = 0,
-                   el = element,
-                   docBody = document.body,
-                   docEl = document.documentElement,
-                   pos;
-
-               do {
-                       top  += el.offsetTop  || 0;
-                       left += el.offsetLeft || 0;
-
-                       //add borders
-                       top += parseInt(L.DomUtil.getStyle(el, 'borderTopWidth'), 10) || 0;
-                       left += parseInt(L.DomUtil.getStyle(el, 'borderLeftWidth'), 10) || 0;
-
-                       pos = L.DomUtil.getStyle(el, 'position');
-
-                       if (el.offsetParent === docBody && pos === 'absolute') { break; }
-
-                       if (pos === 'fixed') {
-                               top  += docBody.scrollTop  || docEl.scrollTop  || 0;
-                               left += docBody.scrollLeft || docEl.scrollLeft || 0;
-                               break;
-                       }
-
-                       if (pos === 'relative' && !el.offsetLeft) {
-                               var width = L.DomUtil.getStyle(el, 'width'),
-                                   maxWidth = L.DomUtil.getStyle(el, 'max-width'),
-                                   r = el.getBoundingClientRect();
-
-                               if (width !== 'none' || maxWidth !== 'none') {
-                                       left += r.left + el.clientLeft;
-                               }
-
-                               //calculate full y offset since we're breaking out of the loop
-                               top += r.top + (docBody.scrollTop  || docEl.scrollTop  || 0);
-
-                               break;
-                       }
-
-                       el = el.offsetParent;
-
-               } while (el);
-
-               el = element;
-
-               do {
-                       if (el === docBody) { break; }
+       // @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;
 
 
-                       top  -= el.scrollTop  || 0;
-                       left -= el.scrollLeft || 0;
+               return new LatLngBounds(
+                       new LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+                       new LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+       },
 
 
-                       el = el.parentNode;
-               } while (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);
+       },
 
 
-               return new L.Point(left, top);
+       // @method getSouthWest(): LatLng
+       // Returns the south-west point of the bounds.
+       getSouthWest: function () {
+               return this._southWest;
        },
 
        },
 
-       documentIsLtr: function () {
-               if (!L.DomUtil._docIsLtrCached) {
-                       L.DomUtil._docIsLtrCached = true;
-                       L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === 'ltr';
-               }
-               return L.DomUtil._docIsLtr;
+       // @method getNorthEast(): LatLng
+       // Returns the north-east point of the bounds.
+       getNorthEast: function () {
+               return this._northEast;
        },
 
        },
 
-       create: function (tagName, className, container) {
+       // @method getNorthWest(): LatLng
+       // Returns the north-west point of the bounds.
+       getNorthWest: function () {
+               return new LatLng(this.getNorth(), this.getWest());
+       },
 
 
-               var el = document.createElement(tagName);
-               el.className = className;
+       // @method getSouthEast(): LatLng
+       // Returns the south-east point of the bounds.
+       getSouthEast: function () {
+               return new LatLng(this.getSouth(), this.getEast());
+       },
 
 
-               if (container) {
-                       container.appendChild(el);
-               }
+       // @method getWest(): Number
+       // Returns the west longitude of the bounds
+       getWest: function () {
+               return this._southWest.lng;
+       },
 
 
-               return el;
+       // @method getSouth(): Number
+       // Returns the south latitude of the bounds
+       getSouth: function () {
+               return this._southWest.lat;
        },
 
        },
 
-       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 getEast(): Number
+       // Returns the east longitude of the bounds
+       getEast: function () {
+               return this._northEast.lng;
        },
 
        },
 
-       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 getNorth(): Number
+       // Returns the north latitude of the bounds
+       getNorth: function () {
+               return this._northEast.lat;
        },
 
        },
 
-       removeClass: function (el, name) {
-               if (el.classList !== undefined) {
-                       el.classList.remove(name);
+       // @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 LatLng || 'lat' in obj) {
+                       obj = toLatLng(obj);
                } else {
                } else {
-                       L.DomUtil._setClass(el, L.Util.trim((' ' + L.DomUtil._getClass(el) + ' ').replace(' ' + name + ' ', ' ')));
+                       obj = toLatLngBounds(obj);
                }
                }
-       },
 
 
-       _setClass: function (el, name) {
-               if (el.className.baseVal === undefined) {
-                       el.className = name;
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2, ne2;
+
+               if (obj instanceof LatLngBounds) {
+                       sw2 = obj.getSouthWest();
+                       ne2 = obj.getNorthEast();
                } else {
                } else {
-                       // in case of SVG element
-                       el.className.baseVal = name;
+                       sw2 = ne2 = obj;
                }
                }
-       },
 
 
-       _getClass: function (el) {
-               return el.className.baseVal === undefined ? el.className : el.className.baseVal;
+               return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
+                      (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
        },
 
        },
 
-       setOpacity: function (el, value) {
-
-               if ('opacity' in el.style) {
-                       el.style.opacity = value;
+       // @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);
 
 
-               } else if ('filter' in el.style) {
-
-                       var filter = false,
-                           filterName = 'DXImageTransform.Microsoft.Alpha';
-
-                       // filters collection throws an error if we try to retrieve a filter that doesn't exist
-                       try {
-                               filter = el.filters.item(filterName);
-                       } catch (e) {
-                               // 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; }
-                       }
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2 = bounds.getSouthWest(),
+                   ne2 = bounds.getNorthEast(),
 
 
-                       value = Math.round(value * 100);
+                   latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+                   lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
 
 
-                       if (filter) {
-                               filter.Enabled = (value !== 100);
-                               filter.Opacity = value;
-                       } else {
-                               el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
-                       }
-               }
+               return latIntersects && lngIntersects;
        },
 
        },
 
-       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;
-       },
+       // @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);
 
 
-       getTranslateString: function (point) {
-               // on WebKit browsers (Chrome/Safari/iOS Safari/Android) using translate3d instead of translate
-               // makes animation smoother as it ensures HW accel is used. Firefox 13 doesn't care
-               // (same speed either way), Opera 12 doesn't support translate3d
+               var sw = this._southWest,
+                   ne = this._northEast,
+                   sw2 = bounds.getSouthWest(),
+                   ne2 = bounds.getNorthEast(),
 
 
-               var is3d = L.Browser.webkit3d,
-                   open = 'translate' + (is3d ? '3d' : '') + '(',
-                   close = (is3d ? ',0' : '') + ')';
+                   latOverlaps = (ne2.lat > sw.lat) && (sw2.lat < ne.lat),
+                   lngOverlaps = (ne2.lng > sw.lng) && (sw2.lng < ne.lng);
 
 
-               return open + point.x + 'px,' + point.y + 'px' + close;
+               return latOverlaps && lngOverlaps;
        },
 
        },
 
-       getScaleString: function (scale, origin) {
-
-               var preTranslateStr = L.DomUtil.getTranslateString(origin.add(origin.multiplyBy(-1 * scale))),
-                   scaleStr = ' scale(' + scale + ') ';
-
-               return preTranslateStr + scaleStr;
+       // @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(',');
        },
 
        },
 
-       setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean])
-
-               // jshint camelcase: false
-               el._leaflet_pos = point;
+       // @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; }
 
 
-               if (!disable3D && L.Browser.any3d) {
-                       el.style[L.DomUtil.TRANSFORM] =  L.DomUtil.getTranslateString(point);
+               bounds = toLatLngBounds(bounds);
 
 
-                       // workaround for Android 2/3 stability (https://github.com/CloudMade/Leaflet/issues/69)
-                       if (L.Browser.mobileWebkit3d) {
-                               el.style.WebkitBackfaceVisibility = 'hidden';
-                       }
-               } else {
-                       el.style.left = point.x + 'px';
-                       el.style.top = point.y + 'px';
-               }
+               return this._southWest.equals(bounds.getSouthWest(), maxMargin) &&
+                      this._northEast.equals(bounds.getNorthEast(), maxMargin);
        },
 
        },
 
-       getPosition: function (el) {
-               // this method is only used for elements previously positioned using setPosition,
-               // so it's safe to cache the position for performance
-
-               // jshint camelcase: false
-               return el._leaflet_pos;
+       // @method isValid(): Boolean
+       // Returns `true` if the bounds are properly initialized.
+       isValid: function () {
+               return !!(this._southWest && this._northEast);
        }
 };
 
        }
 };
 
+// TODO International date line?
 
 
-// prefix style property names
-
-L.DomUtil.TRANSFORM = L.DomUtil.testProp(
-        ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
-
-// webkitTransition comes first because some browser versions that drop vendor prefix don't do
-// the same for the transitionend event, in particular the Android 4.1 stock browser
-
-L.DomUtil.TRANSITION = L.DomUtil.testProp(
-        ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);
-
-L.DomUtil.TRANSITION_END =
-        L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?
-        L.DomUtil.TRANSITION + 'End' : 'transitionend';
-
-(function () {
-    if ('onselectstart' in document) {
-        L.extend(L.DomUtil, {
-            disableTextSelection: function () {
-                L.DomEvent.on(window, 'selectstart', L.DomEvent.preventDefault);
-            },
-
-            enableTextSelection: function () {
-                L.DomEvent.off(window, 'selectstart', L.DomEvent.preventDefault);
-            }
-        });
-    } else {
-        var userSelectProperty = L.DomUtil.testProp(
-            ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
-
-        L.extend(L.DomUtil, {
-            disableTextSelection: function () {
-                if (userSelectProperty) {
-                    var style = document.documentElement.style;
-                    this._userSelect = style[userSelectProperty];
-                    style[userSelectProperty] = 'none';
-                }
-            },
-
-            enableTextSelection: function () {
-                if (userSelectProperty) {
-                    document.documentElement.style[userSelectProperty] = this._userSelect;
-                    delete this._userSelect;
-                }
-            }
-        });
-    }
-
-       L.extend(L.DomUtil, {
-               disableImageDrag: function () {
-                       L.DomEvent.on(window, 'dragstart', L.DomEvent.preventDefault);
-               },
-
-               enableImageDrag: function () {
-                       L.DomEvent.off(window, 'dragstart', L.DomEvent.preventDefault);
-               }
-       });
-})();
+// @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);
+}
 
 
-/*
- * L.LatLng represents a geographical point with latitude and longitude coordinates.
+/* @class LatLng
+ * @aka L.LatLng
+ *
+ * Represents a geographical point with a certain latitude and longitude.
+ *
+ * @example
+ *
+ * ```
+ * var latlng = L.latLng(50.5, 30.5);
+ * ```
+ *
+ * All Leaflet methods that accept LatLng objects also accept them in a simple Array form and simple object form (unless noted otherwise), so these lines are equivalent:
+ *
+ * ```
+ * map.panTo([50, 30]);
+ * map.panTo({lon: 30, lat: 50});
+ * 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) { // (Number, Number, Number)
-       lat = parseFloat(lat);
-       lng = parseFloat(lng);
-
+function LatLng(lat, lng, alt) {
        if (isNaN(lat) || isNaN(lng)) {
                throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');
        }
 
        if (isNaN(lat) || isNaN(lng)) {
                throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');
        }
 
-       this.lat = lat;
-       this.lng = lng;
+       // @property lat: Number
+       // Latitude in degrees
+       this.lat = +lat;
 
 
+       // @property lng: Number
+       // Longitude in degrees
+       this.lng = +lng;
+
+       // @property alt: Number
+       // Altitude in meters (optional)
        if (alt !== undefined) {
        if (alt !== undefined) {
-               this.alt = parseFloat(alt);
+               this.alt = +alt;
        }
        }
-};
-
-L.extend(L.LatLng, {
-       DEG_TO_RAD: Math.PI / 180,
-       RAD_TO_DEG: 180 / Math.PI,
-       MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check
-});
+}
 
 
-L.LatLng.prototype = {
-       equals: function (obj) { // (LatLng) -> Boolean
+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 overridden by setting `maxMargin` to a small number.
+       equals: function (obj, maxMargin) {
                if (!obj) { return false; }
 
                if (!obj) { return false; }
 
-               obj = L.latLng(obj);
+               obj = toLatLng(obj);
 
                var margin = Math.max(
                        Math.abs(this.lat - obj.lat),
                        Math.abs(this.lng - obj.lng));
 
 
                var margin = Math.max(
                        Math.abs(this.lat - obj.lat),
                        Math.abs(this.lng - obj.lng));
 
-               return margin <= L.LatLng.MAX_MARGIN;
+               return margin <= (maxMargin === undefined ? 1.0E-9 : maxMargin);
        },
 
        },
 
-       toString: function (precision) { // (Number) -> String
+       // @method toString(): String
+       // Returns a string representation of the point (for debugging purposes).
+       toString: function (precision) {
                return 'LatLng(' +
                return 'LatLng(' +
-                       L.Util.formatNum(this.lat, precision) + ', ' +
-                       L.Util.formatNum(this.lng, precision) + ')';
+                       formatNum(this.lat, precision) + ', ' +
+                       formatNum(this.lng, precision) + ')';
        },
 
        },
 
-       // Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula
-       // TODO move to projection code, LatLng shouldn't know about Earth
-       distanceTo: function (other) { // (LatLng) -> Number
-               other = L.latLng(other);
+       // @method distanceTo(otherLatLng: LatLng): Number
+       // 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 Earth.distance(this, toLatLng(other));
+       },
 
 
-               var R = 6378137, // earth radius in meters
-                   d2r = L.LatLng.DEG_TO_RAD,
-                   dLat = (other.lat - this.lat) * d2r,
-                   dLon = (other.lng - this.lng) * d2r,
-                   lat1 = this.lat * d2r,
-                   lat2 = other.lat * d2r,
-                   sin1 = Math.sin(dLat / 2),
-                   sin2 = Math.sin(dLon / 2);
+       // @method wrap(): LatLng
+       // Returns a new `LatLng` object with the longitude wrapped so it's always between -180 and +180 degrees.
+       wrap: function () {
+               return Earth.wrapLatLng(this);
+       },
 
 
-               var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2);
+       // @method toBounds(sizeInMeters: Number): LatLngBounds
+       // 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 R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+               return toLatLngBounds(
+                       [this.lat - latAccuracy, this.lng - lngAccuracy],
+                       [this.lat + latAccuracy, this.lng + lngAccuracy]);
        },
 
        },
 
-       wrap: function (a, b) { // (Number, Number) -> LatLng
-               var lng = this.lng;
+       clone: function () {
+               return new LatLng(this.lat, this.lng, this.alt);
+       }
+};
+
 
 
-               a = a || -180;
-               b = b ||  180;
 
 
-               lng = (lng + b) % (b - a) + (lng < a || lng === b ? b : a);
+// @factory L.latLng(latitude: Number, longitude: Number, altitude?: Number): LatLng
+// Creates an object representing a geographical point with the given latitude and longitude (and optionally altitude).
 
 
-               return new L.LatLng(this.lat, lng);
-       }
-};
+// @alternative
+// @factory L.latLng(coords: Array): LatLng
+// Expects an array of the form `[Number, Number]` or `[Number, Number, Number]` instead.
+
+// @alternative
+// @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) { // (LatLng) or ([Number, Number]) or (Number, Number)
-       if (a instanceof L.LatLng) {
+function toLatLng(a, b, c) {
+       if (a instanceof LatLng) {
                return a;
        }
                return a;
        }
-       if (L.Util.isArray(a)) {
-               if (typeof a[0] === 'number' || typeof a[0] === 'string') {
-                       return new L.LatLng(a[0], a[1], a[2]);
-               } else {
-                       return null;
+       if (isArray(a) && typeof a[0] !== 'object') {
+               if (a.length === 3) {
+                       return new LatLng(a[0], a[1], a[2]);
                }
                }
+               if (a.length === 2) {
+                       return new LatLng(a[0], a[1]);
+               }
+               return null;
        }
        if (a === undefined || a === null) {
                return a;
        }
        if (typeof a === 'object' && 'lat' in a) {
        }
        if (a === undefined || a === null) {
                return a;
        }
        if (typeof a === 'object' && 'lat' in a) {
-               return new L.LatLng(a.lat, 'lng' in a ? a.lng : a.lon);
+               return new LatLng(a.lat, 'lng' in a ? a.lng : a.lon, a.alt);
        }
        if (b === undefined) {
                return null;
        }
        }
        if (b === undefined) {
                return null;
        }
-       return new L.LatLng(a, b);
-};
-
-
+       return new LatLng(a, b, c);
+}
 
 /*
 
 /*
- * L.LatLngBounds represents a rectangular area on the map in geographical coordinates.
+ * @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).
+ *
+ * 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.
+ *
+ * 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 latlngs = northEast ? [southWest, northEast] : southWest;
-
-       for (var i = 0, len = latlngs.length; i < len; i++) {
-               this.extend(latlngs[i]);
-       }
-};
-
-L.LatLngBounds.prototype = {
-       // extend the bounds to contain the given point or bounds
-       extend: function (obj) { // (LatLng) or (LatLngBounds)
-               if (!obj) { return this; }
-
-               var latLng = L.latLng(obj);
-               if (latLng !== null) {
-                       obj = latLng;
-               } else {
-                       obj = L.latLngBounds(obj);
-               }
-
-               if (obj instanceof L.LatLng) {
-                       if (!this._southWest && !this._northEast) {
-                               this._southWest = new L.LatLng(obj.lat, obj.lng);
-                               this._northEast = new L.LatLng(obj.lat, obj.lng);
-                       } else {
-                               this._southWest.lat = Math.min(obj.lat, this._southWest.lat);
-                               this._southWest.lng = Math.min(obj.lng, this._southWest.lng);
-
-                               this._northEast.lat = Math.max(obj.lat, this._northEast.lat);
-                               this._northEast.lng = Math.max(obj.lng, this._northEast.lng);
-                       }
-               } else if (obj instanceof L.LatLngBounds) {
-                       this.extend(obj._southWest);
-                       this.extend(obj._northEast);
-               }
-               return this;
-       },
-
-       // extend the bounds by a percentage
-       pad: function (bufferRatio) { // (Number) -> LatLngBounds
-               var sw = this._southWest,
-                   ne = this._northEast,
-                   heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
-                   widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
+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);
 
 
-               return new L.LatLngBounds(
-                       new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
-                       new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+               return this.transformation._transform(projectedPoint, scale);
        },
 
        },
 
-       getCenter: function () { // -> LatLng
-               return new L.LatLng(
-                       (this._southWest.lat + this._northEast.lat) / 2,
-                       (this._southWest.lng + this._northEast.lng) / 2);
-       },
+       // @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);
 
 
-       getSouthWest: function () {
-               return this._southWest;
+               return this.projection.unproject(untransformedPoint);
        },
 
        },
 
-       getNorthEast: function () {
-               return this._northEast;
+       // @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);
        },
 
        },
 
-       getNorthWest: function () {
-               return new L.LatLng(this.getNorth(), this.getWest());
+       // @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);
        },
 
        },
 
-       getSouthEast: function () {
-               return new L.LatLng(this.getSouth(), this.getEast());
+       // @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);
        },
 
        },
 
-       getWest: function () {
-               return this._southWest.lng;
+       // @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;
        },
 
        },
 
-       getSouth: function () {
-               return this._southWest.lat;
-       },
+       // @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; }
 
 
-       getEast: function () {
-               return this._northEast.lng;
-       },
+               var b = this.projection.bounds,
+                   s = this.scale(zoom),
+                   min = this.transformation.transform(b.min, s),
+                   max = this.transformation.transform(b.max, s);
 
 
-       getNorth: function () {
-               return this._northEast.lat;
+               return new Bounds(min, max);
        },
 
        },
 
-       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;
-
-               if (obj instanceof L.LatLngBounds) {
-                       sw2 = obj.getSouthWest();
-                       ne2 = obj.getNorthEast();
-               } else {
-                       sw2 = ne2 = obj;
-               }
-
-               return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
-                      (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
-       },
+       // @method distance(latlng1: LatLng, latlng2: LatLng): Number
+       // Returns the distance between two geographical coordinates.
 
 
-       intersects: function (bounds) { // (LatLngBounds)
-               bounds = L.latLngBounds(bounds);
+       // @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.
 
 
-               var sw = this._southWest,
-                   ne = this._northEast,
-                   sw2 = bounds.getSouthWest(),
-                   ne2 = bounds.getNorthEast(),
+       // wrapLng: [min, max],
+       // wrapLat: [min, max],
 
 
-                   latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
-                   lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
+       // @property infinite: Boolean
+       // If true, the coordinate space will be unbounded (infinite in both axes)
+       infinite: false,
 
 
-               return latIntersects && lngIntersects;
-       },
+       // @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;
 
 
-       toBBoxString: function () {
-               return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(',');
+               return new LatLng(lat, lng, alt);
        },
 
        },
 
-       equals: function (bounds) { // (LatLngBounds)
-               if (!bounds) { return false; }
+       // @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;
 
 
-               bounds = L.latLngBounds(bounds);
+               if (latShift === 0 && lngShift === 0) {
+                       return bounds;
+               }
 
 
-               return this._southWest.equals(bounds.getSouthWest()) &&
-                      this._northEast.equals(bounds.getNorthEast());
-       },
+               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);
 
 
-       isValid: function () {
-               return !!(this._southWest && this._northEast);
+               return new LatLngBounds(newSw, newNe);
        }
 };
 
        }
 };
 
-//TODO International date line?
+/*
+ * @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.latLngBounds = function (a, b) { // (LatLngBounds) or (LatLng, LatLng)
-       if (!a || a instanceof L.LatLngBounds) {
-               return a;
+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;
        }
        }
-       return new L.LatLngBounds(a, b);
-};
-
+});
 
 /*
 
 /*
- * L.Projection contains various geographical projections used by CRS classes.
+ * @namespace Projection
+ * @projection L.Projection.SphericalMercator
+ *
+ * Spherical Mercator projection — the most common projection for online maps,
+ * used by almost all free and commercial tile providers. Assumes that Earth is
+ * a sphere. Used by the `EPSG:3857` CRS.
  */
 
  */
 
-L.Projection = {};
+var earthRadius = 6378137;
 
 
+var SphericalMercator = {
 
 
-/*
- * Spherical Mercator is the most popular map projection, used by EPSG:3857 CRS used by default.
- */
-
-L.Projection.SphericalMercator = {
+       R: earthRadius,
        MAX_LATITUDE: 85.0511287798,
 
        MAX_LATITUDE: 85.0511287798,
 
-       project: function (latlng) { // (LatLng) -> Point
-               var d = L.LatLng.DEG_TO_RAD,
+       project: function (latlng) {
+               var d = Math.PI / 180,
                    max = this.MAX_LATITUDE,
                    lat = Math.max(Math.min(max, latlng.lat), -max),
                    max = this.MAX_LATITUDE,
                    lat = Math.max(Math.min(max, latlng.lat), -max),
-                   x = latlng.lng * d,
-                   y = lat * d;
+                   sin = Math.sin(lat * d);
 
 
-               y = Math.log(Math.tan((Math.PI / 4) + (y / 2)));
-
-               return new L.Point(x, y);
+               return new Point(
+                       this.R * latlng.lng * d,
+                       this.R * Math.log((1 + sin) / (1 - sin)) / 2);
        },
 
        },
 
-       unproject: function (point) { // (Point, Boolean) -> LatLng
-               var d = L.LatLng.RAD_TO_DEG,
-                   lng = point.x * d,
-                   lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;
+       unproject: function (point) {
+               var d = 180 / Math.PI;
 
 
-               return new L.LatLng(lat, lng);
-       }
-};
+               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 = earthRadius * Math.PI;
+               return new Bounds([-d, -d], [d, d]);
+       })()
+};
 
 /*
 
 /*
- * Simple equirectangular (Plate Carree) projection, used by CRS like EPSG:4326 and Simple.
+ * @class Transformation
+ * @aka L.Transformation
+ *
+ * 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.Projection.LonLat = {
-       project: function (latlng) {
-               return new L.Point(latlng.lng, latlng.lat);
-       },
 
 
-       unproject: function (point) {
-               return new L.LatLng(point.y, point.x);
+// 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;
        }
        }
-};
-
-
-/*
- * L.CRS is a base object for all defined CRS (Coordinate Reference Systems) in Leaflet.
- */
-
-L.CRS = {
-       latLngToPoint: function (latlng, zoom) { // (LatLng, Number) -> Point
-               var projectedPoint = this.projection.project(latlng),
-                   scale = this.scale(zoom);
-
-               return this.transformation._transform(projectedPoint, scale);
-       },
-
-       pointToLatLng: function (point, zoom) { // (Point, Number[, Boolean]) -> LatLng
-               var scale = this.scale(zoom),
-                   untransformedPoint = this.transformation.untransform(point, scale);
-
-               return this.projection.unproject(untransformedPoint);
-       },
+       this._a = a;
+       this._b = b;
+       this._c = c;
+       this._d = d;
+}
 
 
-       project: function (latlng) {
-               return this.projection.project(latlng);
+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);
        },
 
        },
 
-       scale: function (zoom) {
-               return 256 * Math.pow(2, zoom);
+       // 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;
        },
 
        },
 
-       getSize: function (zoom) {
-               var s = this.scale(zoom);
-               return L.point(s, s);
+       // @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)
 
 
-/*
- * A simple CRS that can be used for flat non-Earth maps like panoramas or game maps.
- */
-
-L.CRS.Simple = L.extend({}, L.CRS, {
-       projection: L.Projection.LonLat,
-       transformation: new L.Transformation(1, 0, -1, 0),
+// @factory L.transformation(a: Number, b: Number, c: Number, d: Number)
+// Instantiates a Transformation object with the given coefficients.
 
 
-       scale: function (zoom) {
-               return Math.pow(2, zoom);
-       }
-});
+// @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);
+}
 
 /*
 
 /*
- * L.CRS.EPSG3857 (Spherical Mercator) is the most common CRS for web mapping
- * and is used by Leaflet by default.
+ * @namespace CRS
+ * @crs L.CRS.EPSG3857
+ *
+ * The most common CRS for online maps, used by almost all free and commercial
+ * tile providers. Uses Spherical Mercator projection. Set in by default in
+ * Map's `crs` option.
  */
 
  */
 
-L.CRS.EPSG3857 = L.extend({}, L.CRS, {
+var EPSG3857 = extend({}, Earth, {
        code: 'EPSG:3857',
        code: 'EPSG:3857',
+       projection: SphericalMercator,
 
 
-       projection: L.Projection.SphericalMercator,
-       transformation: new L.Transformation(0.5 / Math.PI, 0.5, -0.5 / Math.PI, 0.5),
-
-       project: function (latlng) { // (LatLng) -> Point
-               var projectedPoint = this.projection.project(latlng),
-                   earthRadius = 6378137;
-               return projectedPoint.multiplyBy(earthRadius);
-       }
+       transformation: (function () {
+               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'
 });
 
        code: 'EPSG:900913'
 });
 
+// @namespace SVG; @section
+// There are several static functions which can be called without instantiating L.SVG:
 
 
-/*
- * L.CRS.EPSG4326 is a CRS popular among advanced GIS specialists.
- */
+// @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);
+}
 
 
-L.CRS.EPSG4326 = L.extend({}, L.CRS, {
-       code: 'EPSG:4326',
+// @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;
 
 
-       projection: L.Projection.LonLat,
-       transformation: new L.Transformation(1 / 360, 0.5, -1 / 360, 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';
+}
 
 /*
 
 /*
- * L.Map is the central class of the API - it is used to create a map.
+ * @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!');
+ * }
+ * ```
  */
 
  */
 
-L.Map = L.Class.extend({
+var style$1 = document.documentElement.style;
 
 
-       includes: L.Mixin.Events,
+// @property ie: Boolean; `true` for all Internet Explorer versions (not Edge).
+var ie = 'ActiveXObject' in window;
 
 
-       options: {
-               crs: L.CRS.EPSG3857,
+// @property ielt9: Boolean; `true` for Internet Explorer versions less than 9.
+var ielt9 = ie && !document.addEventListener;
 
 
-               /*
-               center: LatLng,
-               zoom: Number,
-               layers: Array,
-               */
+// @property edge: Boolean; `true` for the Edge web browser.
+var edge = 'msLaunchUri' in navigator && !('documentMode' in document);
 
 
-               fadeAnimation: L.DomUtil.TRANSITION && !L.Browser.android23,
-               trackResize: true,
-               markerZoomAnimation: L.DomUtil.TRANSITION && L.Browser.any3d
-       },
+// @property webkit: Boolean;
+// `true` for webkit-based browsers like Chrome and Safari (including mobile versions).
+var webkit = userAgentContains('webkit');
 
 
-       initialize: function (id, options) { // (HTMLElement or String, Object)
-               options = L.setOptions(this, options);
+// @property android: Boolean
+// `true` for any browser running on an Android platform.
+var android = userAgentContains('android');
 
 
+// @property android23: Boolean; `true` for browsers running on Android 2 or Android 3.
+var android23 = userAgentContains('android 2') || userAgentContains('android 3');
 
 
-               this._initContainer(id);
-               this._initLayout();
+/* 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);
 
 
-               // hack for https://github.com/Leaflet/Leaflet/issues/1980
-               this._onResize = L.bind(this._onResize, this);
+// @property opera: Boolean; `true` for the Opera browser
+var opera = !!window.opera;
 
 
-               this._initEvents();
+// @property chrome: Boolean; `true` for the Chrome browser.
+var chrome = userAgentContains('chrome');
 
 
-               if (options.maxBounds) {
-                       this.setMaxBounds(options.maxBounds);
-               }
+// @property gecko: Boolean; `true` for gecko-based browsers like Firefox.
+var gecko = userAgentContains('gecko') && !webkit && !opera && !ie;
 
 
-               if (options.center && options.zoom !== undefined) {
-                       this.setView(L.latLng(options.center), options.zoom, {reset: true});
-               }
+// @property safari: Boolean; `true` for the Safari browser.
+var safari = !chrome && userAgentContains('safari');
 
 
-               this._handlers = [];
+var phantom = userAgentContains('phantom');
 
 
-               this._layers = {};
-               this._zoomBoundLayers = {};
-               this._tileLayersNum = 0;
+// @property opera12: Boolean
+// `true` for the Opera browser supporting CSS transforms (version 12 or later).
+var opera12 = 'OTransition' in style$1;
 
 
-               this.callInitHooks();
+// @property win: Boolean; `true` when the browser is running in a Windows platform
+var win = navigator.platform.indexOf('Win') === 0;
 
 
-               this._addLayers(options.layers);
-       },
+// @property ie3d: Boolean; `true` for all Internet Explorer versions supporting CSS transforms.
+var ie3d = ie && ('transition' in style$1);
 
 
+// @property webkit3d: Boolean; `true` for webkit-based browsers supporting CSS transforms.
+var webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()) && !android23;
 
 
-       // public methods that modify map state
+// @property gecko3d: Boolean; `true` for gecko-based browsers supporting CSS transforms.
+var gecko3d = 'MozPerspective' in style$1;
 
 
-       // replaced by animation-powered implementation in Map.PanAnimation.js
-       setView: function (center, zoom) {
-               zoom = zoom === undefined ? this.getZoom() : zoom;
-               this._resetView(L.latLng(center), this._limitZoom(zoom));
-               return this;
-       },
+// @property any3d: Boolean
+// `true` for all browsers supporting CSS transforms.
+var any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d) && !opera12 && !phantom;
 
 
-       setZoom: function (zoom, options) {
-               if (!this._loaded) {
-                       this._zoom = this._limitZoom(zoom);
-                       return this;
-               }
-               return this.setView(this.getCenter(), zoom, {zoom: options});
-       },
+// @property mobile: Boolean; `true` for all browsers running in a mobile device.
+var mobile = typeof orientation !== 'undefined' || userAgentContains('mobile');
 
 
-       zoomIn: function (delta, options) {
-               return this.setZoom(this._zoom + (delta || 1), options);
-       },
+// @property mobileWebkit: Boolean; `true` for all webkit-based browsers in a mobile device.
+var mobileWebkit = mobile && webkit;
 
 
-       zoomOut: function (delta, options) {
-               return this.setZoom(this._zoom - (delta || 1), options);
-       },
+// @property mobileWebkit3d: Boolean
+// `true` for all webkit-based browsers in a mobile device supporting CSS transforms.
+var mobileWebkit3d = mobile && webkit3d;
 
 
-       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 msPointer: Boolean
+// `true` for browsers implementing the Microsoft touch events model (notably IE10).
+var msPointer = !window.PointerEvent && window.MSPointerEvent;
 
 
-                   centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale),
-                   newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset));
+// @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);
 
 
-               return this.setView(newCenter, zoom, {zoom: options});
-       },
+// @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));
 
 
-       fitBounds: function (bounds, options) {
+// @property mobileOpera: Boolean; `true` for the Opera browser in a mobile device.
+var mobileOpera = mobile && opera;
 
 
-               options = options || {};
-               bounds = bounds.getBounds ? bounds.getBounds() : L.latLngBounds(bounds);
+// @property mobileGecko: Boolean
+// `true` for gecko-based browsers running in a mobile device.
+var mobileGecko = mobile && gecko;
 
 
-               var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]),
-                   paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]),
+// @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;
 
 
-                   zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)),
-                   paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
 
 
-                   swPoint = this.project(bounds.getSouthWest(), zoom),
-                   nePoint = this.project(bounds.getNorthEast(), zoom),
-                   center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);
+// @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;
+}());
 
 
-               zoom = options && options.maxZoom ? Math.min(options.maxZoom, zoom) : zoom;
+// @property svg: Boolean
+// `true` when the browser supports [SVG](https://developer.mozilla.org/docs/Web/SVG).
+var svg = !!(document.createElementNS && svgCreate('svg').createSVGRect);
 
 
-               return this.setView(center, zoom, options);
-       },
+// @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"/>';
 
 
-       fitWorld: function (options) {
-               return this.fitBounds([[-90, -180], [90, 180]], options);
-       },
+               var shape = div.firstChild;
+               shape.style.behavior = 'url(#default#VML)';
 
 
-       panTo: function (center, options) { // (LatLng)
-               return this.setView(center, this._zoom, {pan: options});
-       },
+               return shape && (typeof shape.adj === 'object');
 
 
-       panBy: function (offset) { // (Point)
-               // replaced with animated panBy in Map.PanAnimation.js
-               this.fire('movestart');
+       } catch (e) {
+               return false;
+       }
+}());
 
 
-               this._rawPanBy(L.point(offset));
 
 
-               this.fire('move');
-               return this.fire('moveend');
-       },
+function userAgentContains(str) {
+       return navigator.userAgent.toLowerCase().indexOf(str) >= 0;
+}
 
 
-       setMaxBounds: function (bounds) {
-               bounds = L.latLngBounds(bounds);
 
 
-               this.options.maxBounds = bounds;
+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
+});
 
 
-               if (!bounds) {
-                       return this.off('moveend', this._panInsideMaxBounds, this);
-               }
+/*
+ * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
+ */
 
 
-               if (this._loaded) {
-                       this._panInsideMaxBounds();
-               }
 
 
-               return this.on('moveend', this._panInsideMaxBounds, this);
-       },
+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'];
 
 
-       panInsideBounds: function (bounds, options) {
-               var center = this.getCenter(),
-                       newCenter = this._limitCenter(center, this._zoom, bounds);
+var _pointers = {};
+var _pointerDocListener = false;
 
 
-               if (center.equals(newCenter)) { return this; }
+// DomEvent.DoubleTap needs to know about this
+var _pointersCount = 0;
 
 
-               return this.panTo(newCenter, options);
-       },
+// 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
 
 
-       addLayer: function (layer) {
-               // TODO method is too big, refactor
+function addPointerListener(obj, type, handler, id) {
+       if (type === 'touchstart') {
+               _addPointerStart(obj, handler, id);
 
 
-               var id = L.stamp(layer);
+       } else if (type === 'touchmove') {
+               _addPointerMove(obj, handler, id);
 
 
-               if (this._layers[id]) { return this; }
+       } else if (type === 'touchend') {
+               _addPointerEnd(obj, handler, id);
+       }
 
 
-               this._layers[id] = layer;
+       return this;
+}
 
 
-               // TODO getMaxZoom, getMinZoom in ILayer (instead of options)
-               if (layer.options && (!isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom))) {
-                       this._zoomBoundLayers[id] = layer;
-                       this._updateZoomLevels();
-               }
+function removePointerListener(obj, type, id) {
+       var handler = obj['_leaflet_' + type + id];
 
 
-               // TODO looks ugly, refactor!!!
-               if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
-                       this._tileLayersNum++;
-                       this._tileLayersToLoad++;
-                       layer.on('load', this._onTileLayerLoad, this);
-               }
+       if (type === 'touchstart') {
+               obj.removeEventListener(POINTER_DOWN, handler, false);
 
 
-               if (this._loaded) {
-                       this._layerAdd(layer);
+       } else if (type === 'touchmove') {
+               obj.removeEventListener(POINTER_MOVE, handler, false);
+
+       } else if (type === 'touchend') {
+               obj.removeEventListener(POINTER_UP, handler, false);
+               obj.removeEventListener(POINTER_CANCEL, handler, false);
+       }
+
+       return this;
+}
+
+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;
-       },
+               _handlePointer(e, handler);
+       });
 
 
-       removeLayer: function (layer) {
-               var id = L.stamp(layer);
+       obj['_leaflet_touchstart' + id] = onDown;
+       obj.addEventListener(POINTER_DOWN, onDown, false);
 
 
-               if (!this._layers[id]) { return this; }
+       // 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);
 
 
-               if (this._loaded) {
-                       layer.onRemove(this);
-               }
+               _pointerDocListener = true;
+       }
+}
 
 
-               delete this._layers[id];
+function _globalPointerDown(e) {
+       _pointers[e.pointerId] = e;
+       _pointersCount++;
+}
 
 
-               if (this._loaded) {
-                       this.fire('layerremove', {layer: layer});
-               }
+function _globalPointerMove(e) {
+       if (_pointers[e.pointerId]) {
+               _pointers[e.pointerId] = e;
+       }
+}
 
 
-               if (this._zoomBoundLayers[id]) {
-                       delete this._zoomBoundLayers[id];
-                       this._updateZoomLevels();
-               }
+function _globalPointerUp(e) {
+       delete _pointers[e.pointerId];
+       _pointersCount--;
+}
 
 
-               // TODO looks ugly, refactor
-               if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
-                       this._tileLayersNum--;
-                       this._tileLayersToLoad--;
-                       layer.off('load', this._onTileLayerLoad, this);
-               }
+function _handlePointer(e, handler) {
+       e.touches = [];
+       for (var i in _pointers) {
+               e.touches.push(_pointers[i]);
+       }
+       e.changedTouches = [e];
 
 
-               return this;
-       },
+       handler(e);
+}
 
 
-       hasLayer: function (layer) {
-               if (!layer) { return false; }
+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; }
 
 
-               return (L.stamp(layer) in this._layers);
-       },
+               _handlePointer(e, handler);
+       };
 
 
-       eachLayer: function (method, context) {
-               for (var i in this._layers) {
-                       method.call(context, this._layers[i]);
-               }
-               return this;
-       },
+       obj['_leaflet_touchmove' + id] = onMove;
+       obj.addEventListener(POINTER_MOVE, onMove, false);
+}
 
 
-       invalidateSize: function (options) {
-               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._initialCenter = null;
+       obj['_leaflet_touchend' + id] = onUp;
+       obj.addEventListener(POINTER_UP, onUp, false);
+       obj.addEventListener(POINTER_CANCEL, onUp, false);
+}
 
 
-               if (!this._loaded) { return this; }
+/*
+ * Extends the event handling code with double tap support for mobile browsers.
+ */
 
 
-               var newSize = this.getSize(),
-                   oldCenter = oldSize.divideBy(2).round(),
-                   newCenter = newSize.divideBy(2).round(),
-                   offset = oldCenter.subtract(newCenter);
+var _touchstart = msPointer ? 'MSPointerDown' : pointer ? 'pointerdown' : 'touchstart';
+var _touchend = msPointer ? 'MSPointerUp' : pointer ? 'pointerup' : 'touchend';
+var _pre = '_leaflet_';
 
 
-               if (!offset.x && !offset.y) { return this; }
+// inspired by Zepto touch code by Thomas Fuchs
+function addDoubleTapListener(obj, handler, id) {
+       var last, touch$$1,
+           doubleTap = false,
+           delay = 250;
 
 
-               if (options.animate && options.pan) {
-                       this.panBy(offset);
+       function onTouchStart(e) {
+               var count;
 
 
+               if (pointer) {
+                       if ((!edge) || e.pointerType === 'mouse') { return; }
+                       count = _pointersCount;
                } else {
                } 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;
                }
                }
+       }
 
 
-               return this.fire('resize', {
-                       oldSize: oldSize,
-                       newSize: newSize
-               });
-       },
+       obj[_pre + _touchstart + id] = onTouchStart;
+       obj[_pre + _touchend + id] = onTouchEnd;
+       obj[_pre + 'dblclick' + id] = handler;
 
 
-       // TODO handler.addTo
-       addHandler: function (name, HandlerClass) {
-               if (!HandlerClass) { return this; }
+       obj.addEventListener(_touchstart, onTouchStart, false);
+       obj.addEventListener(_touchend, onTouchEnd, false);
 
 
-               var handler = this[name] = new HandlerClass(this);
+       // 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);
 
 
-               this._handlers.push(handler);
+       return this;
+}
 
 
-               if (this.options[name]) {
-                       handler.enable();
-               }
+function removeDoubleTapListener(obj, id) {
+       var touchstart = obj[_pre + _touchstart + id],
+           touchend = obj[_pre + _touchend + id],
+           dblclick = obj[_pre + 'dblclick' + id];
 
 
-               return this;
-       },
+       obj.removeEventListener(_touchstart, touchstart, false);
+       obj.removeEventListener(_touchend, touchend, false);
+       if (!edge) {
+               obj.removeEventListener('dblclick', dblclick, false);
+       }
 
 
-       remove: function () {
-               if (this._loaded) {
-                       this.fire('unload');
-               }
+       return this;
+}
 
 
-               this._initEvents('off');
+/*
+ * @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.
+ */
 
 
-               try {
-                       // throws error in IE6-8
-                       delete this._container._leaflet;
-               } catch (e) {
-                       this._container._leaflet = undefined;
-               }
-
-               this._clearPanes();
-               if (this._clearControlPos) {
-                       this._clearControlPos();
-               }
-
-               this._clearHandlers();
 
 
-               return this;
-       },
+// @property TRANSFORM: String
+// Vendor-prefixed transform style name (e.g. `'webkitTransform'` for WebKit).
+var TRANSFORM = testProp(
+       ['transform', 'webkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
 
 
+// webkitTransition comes first because some browser versions that drop vendor prefix don't do
+// the same for the transitionend event, in particular the Android 4.1 stock browser
 
 
-       // public methods for getting map state
+// @property TRANSITION: String
+// Vendor-prefixed transition style name.
+var TRANSITION = testProp(
+       ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);
 
 
-       getCenter: function () { // (Boolean) -> LatLng
-               this._checkIfLoaded();
+// @property TRANSITION_END: String
+// Vendor-prefixed transitionend event name.
+var TRANSITION_END =
+       TRANSITION === 'webkitTransition' || TRANSITION === 'OTransition' ? TRANSITION + 'End' : 'transitionend';
 
 
-               if (this._initialCenter && !this._moved()) {
-                       return this._initialCenter;
-               }
-               return this.layerPointToLatLng(this._getCenterLayerPoint());
-       },
 
 
-       getZoom: function () {
-               return this._zoom;
-       },
+// @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;
+}
 
 
-       getBounds: function () {
-               var bounds = this.getPixelBounds(),
-                   sw = this.unproject(bounds.getBottomLeft()),
-                   ne = this.unproject(bounds.getTopRight());
+// @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]);
 
 
-               return new L.LatLngBounds(sw, ne);
-       },
+       if ((!value || value === 'auto') && document.defaultView) {
+               var css = document.defaultView.getComputedStyle(el, null);
+               value = css ? css[style] : null;
+       }
+       return value === 'auto' ? null : value;
+}
 
 
-       getMinZoom: function () {
-               return this.options.minZoom === undefined ?
-                       (this._layersMinZoom === undefined ? 0 : this._layersMinZoom) :
-                       this.options.minZoom;
-       },
+// @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 || '';
 
 
-       getMaxZoom: function () {
-               return this.options.maxZoom === undefined ?
-                       (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
-                       this.options.maxZoom;
-       },
+       if (container) {
+               container.appendChild(el);
+       }
+       return el;
+}
 
 
-       getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number
-               bounds = L.latLngBounds(bounds);
+// @function remove(el: HTMLElement)
+// Removes `el` from its parent element
+function remove(el) {
+       var parent = el.parentNode;
+       if (parent) {
+               parent.removeChild(el);
+       }
+}
 
 
-               var zoom = this.getMinZoom() - (inside ? 1 : 0),
-                   maxZoom = this.getMaxZoom(),
-                   size = this.getSize(),
+// @function empty(el: HTMLElement)
+// Removes all of `el`'s children elements from `el`
+function empty(el) {
+       while (el.firstChild) {
+               el.removeChild(el.firstChild);
+       }
+}
 
 
-                   nw = bounds.getNorthWest(),
-                   se = bounds.getSouthEast(),
+// @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);
+       }
+}
 
 
-                   zoomNotFound = true,
-                   boundsSize;
+// @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);
+       }
+}
 
 
-               padding = L.point(padding || [0, 0]);
+// @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);
+}
 
 
-               do {
-                       zoom++;
-                       boundsSize = this.project(se, zoom).subtract(this.project(nw, zoom)).add(padding);
-                       zoomNotFound = !inside ? size.contains(boundsSize) : boundsSize.x < size.x || boundsSize.y < size.y;
+// @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);
+       }
+}
 
 
-               } while (zoomNotFound && zoom <= maxZoom);
+// @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 + ' ', ' ')));
+       }
+}
 
 
-               if (zoomNotFound && inside) {
-                       return null;
-               }
+// @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;
+       }
+}
 
 
-               return inside ? zoom : zoom - 1;
-       },
+// @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;
+}
 
 
-       getSize: function () {
-               if (!this._size || this._sizeChanged) {
-                       this._size = new L.Point(
-                               this._container.clientWidth,
-                               this._container.clientHeight);
+// @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);
+       }
+}
 
 
-                       this._sizeChanged = false;
-               }
-               return this._size.clone();
-       },
+function _setOpacityIE(el, value) {
+       var filter = false,
+           filterName = 'DXImageTransform.Microsoft.Alpha';
 
 
-       getPixelBounds: function () {
-               var topLeftPoint = this._getTopLeftPoint();
-               return new L.Bounds(topLeftPoint, topLeftPoint.add(this.getSize()));
-       },
+       // 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; }
+       }
 
 
-       getPixelOrigin: function () {
-               this._checkIfLoaded();
-               return this._initialTopLeftPoint;
-       },
+       value = Math.round(value * 100);
 
 
-       getPanes: function () {
-               return this._panes;
-       },
+       if (filter) {
+               filter.Enabled = (value !== 100);
+               filter.Opacity = value;
+       } else {
+               el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
+       }
+}
 
 
-       getContainer: function () {
-               return this._container;
-       },
+// @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;
 
 
+       for (var i = 0; i < props.length; i++) {
+               if (props[i] in style) {
+                       return props[i];
+               }
+       }
+       return false;
+}
 
 
-       // TODO replace with universal implementation after refactoring projections
+// @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 + ')' : '');
+}
 
 
-       getZoomScale: function (toZoom) {
-               var crs = this.options.crs;
-               return crs.scale(toZoom) / crs.scale(this._zoom);
-       },
+// @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) {
+
+       /*eslint-disable */
+       el._leaflet_pos = point;
+       /* eslint-enable */
+
+       if (any3d) {
+               setTransform(el, point);
+       } else {
+               el.style.left = point.x + 'px';
+               el.style.top = point.y + 'px';
+       }
+}
 
 
-       getScaleZoom: function (scale) {
-               return this._zoom + (Math.log(scale) / Math.LN2);
-       },
+// @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
 
 
+       return el._leaflet_pos || new Point(0, 0);
+}
 
 
-       // conversion methods
+// @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']);
 
 
-       project: function (latlng, zoom) { // (LatLng[, Number]) -> Point
-               zoom = zoom === undefined ? this._zoom : zoom;
-               return this.options.crs.latLngToPoint(L.latLng(latlng), zoom);
-       },
+       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;
+               }
+       };
+}
 
 
-       unproject: function (point, zoom) { // (Point[, Number]) -> LatLng
-               zoom = zoom === undefined ? this._zoom : zoom;
-               return this.options.crs.pointToLatLng(L.point(point), zoom);
-       },
+// @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);
+}
 
 
-       layerPointToLatLng: function (point) { // (Point)
-               var projectedPoint = L.point(point).add(this.getPixelOrigin());
-               return this.unproject(projectedPoint);
-       },
+// @function enableImageDrag()
+// Cancels the effects of a previous [`L.DomUtil.disableImageDrag`](#domutil-disabletextselection).
+function enableImageDrag() {
+       off(window, 'dragstart', preventDefault);
+}
 
 
-       latLngToLayerPoint: function (latlng) { // (LatLng)
-               var projectedPoint = this.project(L.latLng(latlng))._round();
-               return projectedPoint._subtract(this.getPixelOrigin());
-       },
+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);
+}
 
 
-       containerPointToLayerPoint: function (point) { // (Point)
-               return L.point(point).subtract(this._getMapPanePos());
-       },
+// @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);
+}
 
 
-       layerPointToContainerPoint: function (point) { // (Point)
-               return L.point(point).add(this._getMapPanePos());
-       },
+// @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;
+}
 
 
-       containerPointToLatLng: function (point) {
-               var layerPoint = this.containerPointToLayerPoint(L.point(point));
-               return this.layerPointToLatLng(layerPoint);
-       },
+// @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
+       };
+}
 
 
-       latLngToContainerPoint: function (latlng) {
-               return this.layerPointToContainerPoint(this.latLngToLayerPoint(L.latLng(latlng)));
-       },
 
 
-       mouseEventToContainerPoint: function (e) { // (MouseEvent)
-               return L.DomEvent.getMousePosition(e, this._container);
-       },
+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
+});
 
 
-       mouseEventToLayerPoint: function (e) { // (MouseEvent)
-               return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));
-       },
+/*
+ * @namespace DomEvent
+ * Utility functions to work with the [DOM events](https://developer.mozilla.org/docs/Web/API/Event), used by Leaflet internally.
+ */
 
 
-       mouseEventToLatLng: function (e) { // (MouseEvent)
-               return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
-       },
+// Inspired by John Resig, Dean Edwards and YUI addEvent implementations.
 
 
+// @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'`).
 
 
-       // map initialization methods
+// @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) {
 
 
-       _initContainer: function (id) {
-               var container = this._container = L.DomUtil.get(id);
+       if (typeof types === 'object') {
+               for (var type in types) {
+                       addOne(obj, type, types[type], fn);
+               }
+       } else {
+               types = splitWords(types);
 
 
-               if (!container) {
-                       throw new Error('Map container not found.');
-               } else if (container._leaflet) {
-                       throw new Error('Map container is already initialized.');
+               for (var i = 0, len = types.length; i < len; i++) {
+                       addOne(obj, types[i], fn, context);
                }
                }
+       }
 
 
-               container._leaflet = true;
-       },
+       return this;
+}
 
 
-       _initLayout: function () {
-               var container = this._container;
+var eventsKey = '_leaflet_events';
 
 
-               L.DomUtil.addClass(container, 'leaflet-container' +
-                       (L.Browser.touch ? ' leaflet-touch' : '') +
-                       (L.Browser.retina ? ' leaflet-retina' : '') +
-                       (L.Browser.ielt9 ? ' leaflet-oldie' : '') +
-                       (this.options.fadeAnimation ? ' leaflet-fade-anim' : ''));
+// @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.
 
 
-               var position = L.DomUtil.getStyle(container, 'position');
+// @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) {
 
 
-               if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') {
-                       container.style.position = 'relative';
+       if (typeof types === 'object') {
+               for (var type in types) {
+                       removeOne(obj, type, types[type], fn);
                }
                }
+       } else if (types) {
+               types = splitWords(types);
 
 
-               this._initPanes();
-
-               if (this._initControlPos) {
-                       this._initControlPos();
+               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];
+       }
 
 
-       _initPanes: function () {
-               var panes = this._panes = {};
+       return this;
+}
 
 
-               this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);
+function addOne(obj, type, fn, context) {
+       var id = type + stamp(fn) + (context ? '_' + stamp(context) : '');
 
 
-               this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);
-               panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);
-               panes.shadowPane = this._createPane('leaflet-shadow-pane');
-               panes.overlayPane = this._createPane('leaflet-overlay-pane');
-               panes.markerPane = this._createPane('leaflet-marker-pane');
-               panes.popupPane = this._createPane('leaflet-popup-pane');
+       if (obj[eventsKey] && obj[eventsKey][id]) { return this; }
 
 
-               var zoomHide = ' leaflet-zoom-hide';
+       var handler = function (e) {
+               return fn.call(context || obj, e || window.event);
+       };
 
 
-               if (!this.options.markerZoomAnimation) {
-                       L.DomUtil.addClass(panes.markerPane, zoomHide);
-                       L.DomUtil.addClass(panes.shadowPane, zoomHide);
-                       L.DomUtil.addClass(panes.popupPane, zoomHide);
-               }
-       },
+       var originalHandler = handler;
 
 
-       _createPane: function (className, container) {
-               return L.DomUtil.create('div', className, container || this._panes.objectsPane);
-       },
+       if (pointer && type.indexOf('touch') === 0) {
+               // Needs DomEvent.Pointer.js
+               addPointerListener(obj, type, handler, id);
 
 
-       _clearPanes: function () {
-               this._container.removeChild(this._mapPane);
-       },
+       } else if (touch && (type === 'dblclick') && addDoubleTapListener &&
+                  !(pointer && chrome)) {
+               // Chrome >55 does not need the synthetic dblclicks from addDoubleTapListener
+               // See #5180
+               addDoubleTapListener(obj, handler, id);
 
 
-       _addLayers: function (layers) {
-               layers = layers ? (L.Util.isArray(layers) ? layers : [layers]) : [];
+       } else if ('addEventListener' in obj) {
 
 
-               for (var i = 0, len = layers.length; i < len; i++) {
-                       this.addLayer(layers[i]);
+               if (type === 'mousewheel') {
+                       obj.addEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
+
+               } 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);
+
+               } else {
+                       if (type === 'click' && android) {
+                               handler = function (e) {
+                                       filterClick(e, originalHandler);
+                               };
+                       }
+                       obj.addEventListener(type, handler, false);
                }
                }
-       },
 
 
+       } else if ('attachEvent' in obj) {
+               obj.attachEvent('on' + type, handler);
+       }
 
 
-       // private methods that modify map state
+       obj[eventsKey] = obj[eventsKey] || {};
+       obj[eventsKey][id] = handler;
+}
 
 
-       _resetView: function (center, zoom, preserveMapOffset, afterZoomAnim) {
+function removeOne(obj, type, fn, context) {
 
 
-               var zoomChanged = (this._zoom !== zoom);
+       var id = type + stamp(fn) + (context ? '_' + stamp(context) : ''),
+           handler = obj[eventsKey] && obj[eventsKey][id];
 
 
-               if (!afterZoomAnim) {
-                       this.fire('movestart');
+       if (!handler) { return this; }
 
 
-                       if (zoomChanged) {
-                               this.fire('zoomstart');
-                       }
-               }
+       if (pointer && type.indexOf('touch') === 0) {
+               removePointerListener(obj, type, id);
 
 
-               this._zoom = zoom;
-               this._initialCenter = center;
+       } else if (touch && (type === 'dblclick') && removeDoubleTapListener &&
+                  !(pointer && chrome)) {
+               removeDoubleTapListener(obj, id);
 
 
-               this._initialTopLeftPoint = this._getNewTopLeftPoint(center);
+       } else if ('removeEventListener' in obj) {
+
+               if (type === 'mousewheel') {
+                       obj.removeEventListener('onwheel' in obj ? 'wheel' : 'mousewheel', handler, false);
 
 
-               if (!preserveMapOffset) {
-                       L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
                } else {
                } else {
-                       this._initialTopLeftPoint._add(this._getMapPanePos());
+                       obj.removeEventListener(
+                               type === 'mouseenter' ? 'mouseover' :
+                               type === 'mouseleave' ? 'mouseout' : type, handler, false);
                }
 
                }
 
-               this._tileLayersToLoad = this._tileLayersNum;
-
-               var loading = !this._loaded;
-               this._loaded = true;
+       } else if ('detachEvent' in obj) {
+               obj.detachEvent('on' + type, handler);
+       }
 
 
-               if (loading) {
-                       this.fire('load');
-                       this.eachLayer(this._layerAdd, this);
-               }
+       obj[eventsKey][id] = null;
+}
 
 
-               this.fire('viewreset', {hard: !preserveMapOffset});
+// @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) {
+
+       if (e.stopPropagation) {
+               e.stopPropagation();
+       } else if (e.originalEvent) {  // In case of Leaflet event.
+               e.originalEvent._stopped = true;
+       } else {
+               e.cancelBubble = true;
+       }
+       skipped(e);
 
 
-               this.fire('move');
+       return this;
+}
 
 
-               if (zoomChanged || afterZoomAnim) {
-                       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;
+}
 
 
-               this.fire('moveend', {hard: !preserveMapOffset});
-       },
+// @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;
+}
 
 
-       _rawPanBy: function (offset) {
-               L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
-       },
+// @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;
+}
 
 
-       _getZoomSpan: function () {
-               return this.getMaxZoom() - this.getMinZoom();
-       },
+// @function stop(ev: DOMEvent): this
+// Does `stopPropagation` and `preventDefault` at the same time.
+function stop(e) {
+       preventDefault(e);
+       stopPropagation(e);
+       return this;
+}
 
 
-       _updateZoomLevels: function () {
-               var i,
-                       minZoom = Infinity,
-                       maxZoom = -Infinity,
-                       oldZoomSpan = this._getZoomSpan();
-
-               for (i in this._zoomBoundLayers) {
-                       var layer = this._zoomBoundLayers[i];
-                       if (!isNaN(layer.options.minZoom)) {
-                               minZoom = Math.min(minZoom, layer.options.minZoom);
-                       }
-                       if (!isNaN(layer.options.maxZoom)) {
-                               maxZoom = Math.max(maxZoom, layer.options.maxZoom);
-                       }
-               }
+// @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);
+       }
 
 
-               if (i === undefined) { // we have no tilelayers
-                       this._layersMaxZoom = this._layersMinZoom = undefined;
-               } else {
-                       this._layersMaxZoom = maxZoom;
-                       this._layersMinZoom = minZoom;
-               }
+       var scale = getScale(container),
+           offset = scale.boundingClientRect; // left and top  values are in page scale (like the event clientX/Y)
 
 
-               if (oldZoomSpan !== this._getZoomSpan()) {
-                       this.fire('zoomlevelschange');
-               }
-       },
+       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
+       );
+}
 
 
-       _panInsideMaxBounds: function () {
-               this.panInsideBounds(this.options.maxBounds);
-       },
+// 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;
+}
 
 
-       _checkIfLoaded: function () {
-               if (!this._loaded) {
-                       throw new Error('Set map center and zoom first.');
-               }
-       },
+var skipEvents = {};
 
 
-       // map events
+function fakeStop(e) {
+       // fakes stopPropagation by setting a special event flag, checked/reset with skipped(e)
+       skipEvents[e.type] = true;
+}
 
 
-       _initEvents: function (onOff) {
-               if (!L.DomEvent) { return; }
+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;
+}
 
 
-               onOff = onOff || 'on';
+// check if element really left/entered the event target (for mouseenter/mouseleave)
+function isExternalTarget(el, e) {
 
 
-               L.DomEvent[onOff](this._container, 'click', this._onMouseClick, this);
+       var related = e.relatedTarget;
 
 
-               var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter',
-                             'mouseleave', 'mousemove', 'contextmenu'],
-                   i, len;
+       if (!related) { return true; }
 
 
-               for (i = 0, len = events.length; i < len; i++) {
-                       L.DomEvent[onOff](this._container, events[i], this._fireMouseEvent, this);
+       try {
+               while (related && (related !== el)) {
+                       related = related.parentNode;
                }
                }
+       } catch (err) {
+               return false;
+       }
+       return (related !== el);
+}
 
 
-               if (this.options.trackResize) {
-                       L.DomEvent[onOff](window, 'resize', this._onResize, this);
-               }
-       },
+var lastClick;
 
 
-       _onResize: function () {
-               L.Util.cancelAnimFrame(this._resizeRequest);
-               this._resizeRequest = L.Util.requestAnimFrame(
-                       function () { this.invalidateSize({debounceMoveend: true}); }, this, false, this._container);
-       },
+// 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);
 
 
-       _onMouseClick: function (e) {
-               if (!this._loaded || (!e._simulated &&
-                       ((this.dragging && this.dragging.moved()) ||
-                        (this.boxZoom  && this.boxZoom.moved()))) ||
-                           L.DomEvent._skipped(e)) { return; }
+       // 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
 
 
-               this.fire('preclick');
-               this._fireMouseEvent(e);
-       },
+       if ((elapsed && elapsed > 100 && elapsed < 500) || (e.target._simulatedClick && !e._simulated)) {
+               stop(e);
+               return;
+       }
+       lastClick = timeStamp;
 
 
-       _fireMouseEvent: function (e) {
-               if (!this._loaded || L.DomEvent._skipped(e)) { return; }
+       handler(e);
+}
 
 
-               var type = e.type;
 
 
-               type = (type === 'mouseenter' ? 'mouseover' : (type === 'mouseleave' ? 'mouseout' : type));
 
 
-               if (!this.hasEventListeners(type)) { return; }
 
 
-               if (type === 'contextmenu') {
-                       L.DomEvent.preventDefault(e);
-               }
+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
+});
 
 
-               var containerPoint = this.mouseEventToContainerPoint(e),
-                   layerPoint = this.containerPointToLayerPoint(containerPoint),
-                   latlng = this.layerPointToLatLng(layerPoint);
+/*
+ * @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.
+ *
+ */
 
 
-               this.fire(type, {
+var PosAnimation = Evented.extend({
+
+       // @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();
+
+               this._el = el;
+               this._inProgress = true;
+               this._duration = duration || 0.25;
+               this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
+
+               this._startPos = getPosition(el);
+               this._offset = newPos.subtract(this._startPos);
+               this._startTime = +new Date();
+
+               // @event start: Event
+               // Fired when the animation starts
+               this.fire('start');
+
+               this._animate();
+       },
+
+       // @method stop()
+       // Stops the animation (if currently running).
+       stop: function () {
+               if (!this._inProgress) { return; }
+
+               this._step(true);
+               this._complete();
+       },
+
+       _animate: function () {
+               // animation loop
+               this._animId = requestAnimFrame(this._animate, this);
+               this._step();
+       },
+
+       _step: function (round) {
+               var elapsed = (+new Date()) - this._startTime,
+                   duration = this._duration * 1000;
+
+               if (elapsed < duration) {
+                       this._runFrame(this._easeOut(elapsed / duration), round);
+               } else {
+                       this._runFrame(1);
+                       this._complete();
+               }
+       },
+
+       _runFrame: function (progress, round) {
+               var pos = this._startPos.add(this._offset.multiplyBy(progress));
+               if (round) {
+                       pos._round();
+               }
+               setPosition(this._el, pos);
+
+               // @event step: Event
+               // Fired continuously during the animation.
+               this.fire('step');
+       },
+
+       _complete: function () {
+               cancelAnimFrame(this._animId);
+
+               this._inProgress = false;
+               // @event end: Event
+               // Fired when the animation ends.
+               this.fire('end');
+       },
+
+       _easeOut: function (t) {
+               return 1 - Math.pow(1 - t, this._easeOutPower);
+       }
+});
+
+/*
+ * @class Map
+ * @aka L.Map
+ * @inherits Evented
+ *
+ * The central class of the API — it is used to create a map on a page and manipulate it.
+ *
+ * @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
+ * });
+ * ```
+ *
+ */
+
+var Map = 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: EPSG3857,
+
+               // @option center: LatLng = undefined
+               // Initial geographic center of the map
+               center: undefined,
+
+               // @option zoom: Number = undefined
+               // Initial map zoom level
+               zoom: undefined,
+
+               // @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,
+
+               // @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,
+
+               // @option layers: Layer[] = []
+               // Array of layers that will be added to the map initially
+               layers: [],
+
+               // @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,
+
+               // @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,
+
+
+               // @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,
+
+               // @option zoomAnimationThreshold: Number = 4
+               // Won't animate zoom if the zoom difference exceeds this value.
+               zoomAnimationThreshold: 4,
+
+               // @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,
+
+               // @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,
+
+               // @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,
+
+               // @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,
+
+               // @option trackResize: Boolean = true
+               // Whether the map automatically handles browser window resize to update itself.
+               trackResize: true
+       },
+
+       initialize: function (id, options) { // (HTMLElement or String, Object)
+               options = setOptions(this, options);
+
+               // 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;
+
+               this._initContainer(id);
+               this._initLayout();
+
+               // hack for https://github.com/Leaflet/Leaflet/issues/1980
+               this._onResize = bind(this._onResize, this);
+
+               this._initEvents();
+
+               if (options.maxBounds) {
+                       this.setMaxBounds(options.maxBounds);
+               }
+
+               if (options.zoom !== undefined) {
+                       this._zoom = this._limitZoom(options.zoom);
+               }
+
+               if (options.center && options.zoom !== undefined) {
+                       this.setView(toLatLng(options.center), options.zoom, {reset: true});
+               }
+
+               this.callInitHooks();
+
+               // don't animate on browsers without hardware-accelerated transitions or old Android/Opera
+               this._zoomAnimated = TRANSITION && any3d && !mobileOpera &&
+                               this.options.zoomAnimation;
+
+               // 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);
+               }
+
+               this._addLayers(this.options.layers);
+       },
+
+
+       // @section Methods for modifying map state
+
+       // @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) {
+
+               zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom);
+               center = this._limitCenter(toLatLng(center), zoom, this.options.maxBounds);
+               options = options || {};
+
+               this._stop();
+
+               if (this._loaded && !options.reset && options !== true) {
+
+                       if (options.animate !== undefined) {
+                               options.zoom = extend({animate: options.animate}, options.zoom);
+                               options.pan = extend({animate: options.animate, duration: options.duration}, options.pan);
+                       }
+
+                       // 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;
+                       }
+               }
+
+               // animation didn't start, just reset the map view
+               this._resetView(center, zoom);
+
+               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);
+       },
+
+       // @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),
+
+                   centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale),
+                   newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset));
+
+               return this.setView(newCenter, zoom, {zoom: options});
+       },
+
+       _getBoundsCenterZoom: function (bounds, options) {
+
+               options = options || {};
+               bounds = bounds.getBounds ? bounds.getBounds() : toLatLngBounds(bounds);
+
+               var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]),
+                   paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]),
+
+                   zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));
+
+               zoom = (typeof options.maxZoom === 'number') ? Math.min(options.maxZoom, zoom) : zoom;
+
+               if (zoom === Infinity) {
+                       return {
+                               center: bounds.getCenter(),
+                               zoom: zoom
+                       };
+               }
+
+               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
+               };
+       },
+
+       // @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) {
+
+               bounds = toLatLngBounds(bounds);
+
+               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);
+       },
+
+       // @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 || {};
+
+               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;
+               }
+
+               if (!this._panAnim) {
+                       this._panAnim = new PosAnimation();
+
+                       this._panAnim.on({
+                               'step': this._onPanTransitionStep,
+                               'end': this._onPanTransitionEnd
+                       }, this);
+               }
+
+               // don't fire movestart if animating inertia
+               if (!options.noMoveStart) {
+                       this.fire('movestart');
+               }
+
+               // animate pan unless animate: false specified
+               if (options.animate !== false) {
+                       addClass(this._mapPane, 'leaflet-pan-anim');
+
+                       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');
+               }
+
+               return this;
+       },
+
+       // @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 || !any3d) {
+                       return this.setView(targetCenter, targetZoom, options);
+               }
+
+               this._stop();
+
+               var from = this.project(this.getCenter()),
+                   to = this.project(targetCenter),
+                   size = this.getSize(),
+                   startZoom = this._zoom;
+
+               targetCenter = toLatLng(targetCenter);
+               targetZoom = targetZoom === undefined ? startZoom : targetZoom;
+
+               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,
                        latlng: latlng,
-                       layerPoint: layerPoint,
-                       containerPoint: containerPoint,
+                       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;
+       },
+
+       // @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);
+       },
+
+       // @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;
+       },
+
+       // @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;
+       },
+
+       // @method getContainer: HTMLElement
+       // Returns the HTML element that contains the map.
+       getContainer: function () {
+               return this._container;
+       },
+
+
+       // @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);
+       },
+
+       // @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;
+       },
+
+       // @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');
+               }
+       },
+
+       _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;
+       },
+
+       _move: function (center, zoom, data) {
+               if (zoom === undefined) {
+                       zoom = this._zoom;
+               }
+               var zoomChanged = this._zoom !== zoom;
+
+               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);
+       },
+
+       _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');
+       },
+
+       _stop: function () {
+               cancelAnimFrame(this._flyToFrame);
+               if (this._panAnim) {
+                       this._panAnim.stop();
+               }
+               return this;
+       },
+
+       _rawPanBy: function (offset) {
+               setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
+       },
+
+       _getZoomSpan: function () {
+               return this.getMaxZoom() - this.getMinZoom();
+       },
+
+       _panInsideMaxBounds: function () {
+               if (!this._enforcingBounds) {
+                       this.panInsideBounds(this.options.maxBounds);
+               }
+       },
+
+       _checkIfLoaded: function () {
+               if (!this._loaded) {
+                       throw new Error('Set map center and zoom first.');
+               }
+       },
+
+       // DOM event handling
+
+       // @section Interaction events
+       _initEvents: function (remove$$1) {
+               this._targets = {};
+               this._targets[stamp(this._container)] = this;
+
+               var onOff = remove$$1 ? off : on;
+
+               // @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);
+               }
+
+               if (any3d && this.options.transform3DLimit) {
+                       (remove$$1 ? this.off : this.on).call(this, 'moveend', this._onMoveEnd);
+               }
+       },
+
+       _onResize: function () {
+               cancelAnimFrame(this._resizeRequest);
+               this._resizeRequest = requestAnimFrame(
+                       function () { this.invalidateSize({debounceMoveend: true}); }, this);
+       },
+
+       _onScroll: function () {
+               this._container.scrollTop  = 0;
+               this._container.scrollLeft = 0;
+       },
+
+       _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());
+               }
+       },
+
+       _findEventTargets: function (e, type) {
+               var targets = [],
+                   target,
+                   isHover = type === 'mouseout' || type === 'mouseover',
+                   src = e.target || e.srcElement,
+                   dragging = false;
+
+               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;
+       },
+
+       _handleDOMEvent: function (e) {
+               if (!this._loaded || skipped(e)) { return; }
+
+               var type = e.type;
+
+               if (type === 'mousedown' || type === 'keypress' || type === 'keyup' || type === 'keydown') {
+                       // prevents outline when clicking on keyboard-focusable element
+                       preventOutline(e.target || e.srcElement);
+               }
+
+               this._fireDOMEvent(e, type);
+       },
+
+       _mouseEvents: ['click', 'dblclick', 'mouseover', 'mouseout', 'contextmenu'],
+
+       _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 = extend({}, e);
+                       synth.type = 'preclick';
+                       this._fireDOMEvent(synth, synth.type, targets);
+               }
+
+               if (e._stopped) { return; }
+
+               // Find the layer the event is propagating from and its parents.
+               targets = (targets || []).concat(this._findEventTargets(e, type));
+
+               if (!targets.length) { return; }
+
+               var target = targets[0];
+               if (type === 'contextmenu' && target.listens(type, true)) {
+                       preventDefault(e);
+               }
+
+               var data = {
                        originalEvent: e
                        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();
+               }
+       },
+
+       // @section Other Methods
+
+       // @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;
+       },
+
+
+       // private methods for getting map state
+
+       _getMapPanePos: function () {
+               return getPosition(this._mapPane) || new 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);
+       },
+
+       _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)
+               ]);
+       },
+
+       // 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 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;
+               }
+
+               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 Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset));
+
+               return offset.add(this._getBoundsOffset(newBounds, bounds));
+       },
+
+       // returns offset needed for pxBounds to get inside maxBounds at a specified zoom
+       _getBoundsOffset: function (pxBounds, maxBounds, zoom) {
+               var projectedMaxBounds = toBounds(
+                       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 Point(dx, dy);
+       },
+
+       _rebound: function (left, right) {
+               return left + right > 0 ?
+                       Math.round(left - right) / 2 :
+                       Math.max(0, Math.ceil(left)) - Math.max(0, Math.floor(right));
+       },
+
+       _limitZoom: function (zoom) {
+               var min = this.getMinZoom(),
+                   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));
+       },
+
+       _onPanTransitionStep: function () {
+               this.fire('move');
+       },
+
+       _onPanTransitionEnd: function () {
+               removeClass(this._mapPane, 'leaflet-pan-anim');
+               this.fire('moveend');
+       },
+
+       _tryAnimatedPan: function (center, options) {
+               // difference between the new and current centers in pixels
+               var offset = this._getCenterOffset(center)._trunc();
+
+               // don't animate too far unless animate: true specified in options
+               if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; }
+
+               this.panBy(offset, options);
+
+               return true;
+       },
+
+       _createAnimProxy: function () {
+
+               var proxy = this._proxy = create$1('div', 'leaflet-proxy leaflet-zoom-animated');
+               this._panes.mapPane.appendChild(proxy);
+
+               this.on('zoomanim', function (e) {
+                       var prop = TRANSFORM,
+                           transform = this._proxy.style[prop];
+
+                       setTransform(this._proxy, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 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);
+
+               this.on('load moveend', function () {
+                       var c = this.getCenter(),
+                           z = this.getZoom();
+                       setTransform(this._proxy, this.project(c, z), this.getZoomScale(z, 1));
+               }, this);
+
+               this._on('unload', this._destroyAnimProxy, this);
+       },
+
+       _destroyAnimProxy: function () {
+               remove(this._proxy);
+               delete this._proxy;
+       },
+
+       _catchTransitionEnd: function (e) {
+               if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) {
+                       this._onZoomTransitionEnd();
+               }
+       },
+
+       _nothingToAnimate: function () {
+               return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
+       },
+
+       _tryAnimatedZoom: function (center, zoom, options) {
+
+               if (this._animatingZoom) { return true; }
+
+               options = options || {};
+
+               // 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; }
+
+               // 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);
+
+               // 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;
+       },
+
+       _animateZoom: function (center, zoom, startAnim, noUpdate) {
+               if (!this._mapPane) { return; }
+
+               if (startAnim) {
+                       this._animatingZoom = true;
+
+                       // remember what center/zoom to set after animation
+                       this._animateToCenter = center;
+                       this._animateToZoom = zoom;
+
+                       addClass(this._mapPane, 'leaflet-zoom-anim');
+               }
+
+               // @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
                });
                });
+
+               // Work around webkit not firing 'transitionend', see https://github.com/Leaflet/Leaflet/issues/3689, 2693
+               setTimeout(bind(this._onZoomTransitionEnd, this), 250);
        },
 
        },
 
-       _onTileLayerLoad: function () {
-               this._tileLayersToLoad--;
-               if (this._tileLayersNum && !this._tileLayersToLoad) {
-                       this.fire('tilelayersload');
+       _onZoomTransitionEnd: function () {
+               if (!this._animatingZoom) { return; }
+
+               if (this._mapPane) {
+                       removeClass(this._mapPane, 'leaflet-zoom-anim');
                }
                }
+
+               this._animatingZoom = false;
+
+               this._move(this._animateToCenter, this._animateToZoom);
+
+               // This anim frame should prevent an obscure iOS webkit tile loading race condition.
+               requestAnimFrame(function () {
+                       this._moveEnd(true);
+               }, this);
+       }
+});
+
+// @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`.
+function createMap(id, options) {
+       return new Map(id, options);
+}
+
+/*
+ * @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.
+ */
+
+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'
        },
 
        },
 
-       _clearHandlers: function () {
-               for (var i = 0, len = this._handlers.length; i < len; i++) {
-                       this._handlers[i].disable();
+       initialize: function (options) {
+               setOptions(this, options);
+       },
+
+       /* @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;
+       },
+
+       // @method setPosition(position: string): this
+       // Sets the position of the control.
+       setPosition: function (position) {
+               var map = this._map;
+
+               if (map) {
+                       map.removeControl(this);
+               }
+
+               this.options.position = position;
+
+               if (map) {
+                       map.addControl(this);
                }
                }
+
+               return this;
        },
 
        },
 
-       whenReady: function (callback, context) {
-               if (this._loaded) {
-                       callback.call(context || this, this);
+       // @method getContainer: HTMLElement
+       // Returns the HTMLElement that contains the control.
+       getContainer: function () {
+               return this._container;
+       },
+
+       // @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];
+
+               addClass(container, 'leaflet-control');
+
+               if (pos.indexOf('bottom') !== -1) {
+                       corner.insertBefore(container, corner.firstChild);
                } else {
                } else {
-                       this.on('load', callback, context);
+                       corner.appendChild(container);
                }
                }
+
+               this._map.on('unload', this.remove, this);
+
                return this;
        },
 
                return this;
        },
 
-       _layerAdd: function (layer) {
-               layer.onAdd(this);
-               this.fire('layeradd', {layer: layer});
+       // @method remove: this
+       // Removes the control from the map it is currently active on.
+       remove: function () {
+               if (!this._map) {
+                       return this;
+               }
+
+               remove(this._container);
+
+               if (this.onRemove) {
+                       this.onRemove(this._map);
+               }
+
+               this._map.off('unload', this.remove, this);
+               this._map = null;
+
+               return this;
        },
 
        },
 
+       _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();
+               }
+       }
+});
 
 
-       // private methods for getting map state
+var control = function (options) {
+       return new Control(options);
+};
 
 
-       _getMapPanePos: function () {
-               return L.DomUtil.getPosition(this._mapPane);
+/* @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;
        },
 
        },
 
-       _moved: function () {
-               var pos = this._getMapPanePos();
-               return pos && !pos.equals([0, 0]);
+       // @method removeControl(control: Control): this
+       // Removes the given control from the map
+       removeControl: function (control) {
+               control.remove();
+               return this;
        },
 
        },
 
-       _getTopLeftPoint: function () {
-               return this.getPixelOrigin().subtract(this._getMapPanePos());
+       _initControlPos: function () {
+               var corners = this._controlCorners = {},
+                   l = 'leaflet-',
+                   container = this._controlContainer =
+                           create$1('div', l + 'control-container', this._container);
+
+               function createCorner(vSide, hSide) {
+                       var className = l + vSide + ' ' + l + hSide;
+
+                       corners[vSide + hSide] = create$1('div', className, container);
+               }
+
+               createCorner('top', 'left');
+               createCorner('top', 'right');
+               createCorner('bottom', 'left');
+               createCorner('bottom', 'right');
        },
 
        },
 
-       _getNewTopLeftPoint: function (center, zoom) {
-               var viewHalf = this.getSize()._divideBy(2);
-               // TODO round on display, not calculation to increase precision?
-               return this.project(center, zoom)._subtract(viewHalf)._round();
+       _clearControlPos: function () {
+               for (var i in this._controlCorners) {
+                       remove(this._controlCorners[i]);
+               }
+               remove(this._controlContainer);
+               delete this._controlCorners;
+               delete this._controlContainer;
+       }
+});
+
+/*
+ * @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}
+ * ```
+ */
+
+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',
+
+               // @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,
+
+               // @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,
+
+               // @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);
+               }
        },
 
        },
 
-       _latLngToNewLayerPoint: function (latlng, newZoom, newCenter) {
-               var topLeft = this._getNewTopLeftPoint(newCenter, newZoom).add(this._getMapPanePos());
-               return this.project(latlng, newZoom)._subtract(topLeft);
+       initialize: function (baseLayers, overlays, options) {
+               setOptions(this, options);
+
+               this._layerControlInputs = [];
+               this._layers = [];
+               this._lastZIndex = 0;
+               this._handlingClick = false;
+
+               for (var i in baseLayers) {
+                       this._addLayer(baseLayers[i], i);
+               }
+
+               for (i in overlays) {
+                       this._addLayer(overlays[i], i, true);
+               }
        },
 
        },
 
-       // layer point of the current center
-       _getCenterLayerPoint: function () {
-               return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
+       onAdd: function (map) {
+               this._initLayout();
+               this._update();
+
+               this._map = map;
+               map.on('zoomend', this._checkDisabledLayers, this);
+
+               for (var i = 0; i < this._layers.length; i++) {
+                       this._layers[i].layer.on('add remove', this._onLayerChange, this);
+               }
+
+               return this._container;
        },
 
        },
 
-       // offset of the specified place to the current center in pixels
-       _getCenterOffset: function (latlng) {
-               return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint());
+       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();
        },
 
        },
 
-       // adjust center for view to get inside bounds
-       _limitCenter: function (center, zoom, bounds) {
+       onRemove: function () {
+               this._map.off('zoomend', this._checkDisabledLayers, this);
 
 
-               if (!bounds) { return center; }
+               for (var i = 0; i < this._layers.length; i++) {
+                       this._layers[i].layer.off('add remove', this._onLayerChange, this);
+               }
+       },
 
 
-               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);
+       // @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;
+       },
 
 
-               return this.unproject(centerPoint.add(offset), zoom);
+       // @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;
        },
 
        },
 
-       // adjust offset for view to get inside bounds
-       _limitOffset: function (offset, bounds) {
-               if (!bounds) { return offset; }
+       // @method removeLayer(layer: Layer): this
+       // Remove the given layer from the control.
+       removeLayer: function (layer) {
+               layer.off('add remove', this._onLayerChange, this);
 
 
-               var viewBounds = this.getPixelBounds(),
-                   newBounds = new L.Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset));
+               var obj = this._getLayer(stamp(layer));
+               if (obj) {
+                       this._layers.splice(this._layers.indexOf(obj), 1);
+               }
+               return (this._map) ? this._update() : this;
+       },
 
 
-               return offset.add(this._getBoundsOffset(newBounds, bounds));
+       // @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;
        },
 
        },
 
-       // returns offset needed for pxBounds to get inside maxBounds at a specified zoom
-       _getBoundsOffset: function (pxBounds, maxBounds, zoom) {
-               var nwOffset = this.project(maxBounds.getNorthWest(), zoom).subtract(pxBounds.min),
-                   seOffset = this.project(maxBounds.getSouthEast(), zoom).subtract(pxBounds.max),
+       // @method collapse(): this
+       // Collapse the control container if expanded.
+       collapse: function () {
+               removeClass(this._container, 'leaflet-control-layers-expanded');
+               return this;
+       },
+
+       _initLayout: function () {
+               var className = 'leaflet-control-layers',
+                   container = this._container = create$1('div', className),
+                   collapsed = this.options.collapsed;
+
+               // 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);
+
+               disableClickPropagation(container);
+               disableScrollPropagation(container);
+
+               var section = this._section = create$1('section', className + '-list');
+
+               if (collapsed) {
+                       this._map.on('click', this.collapse, this);
+
+                       if (!android) {
+                               on(container, {
+                                       mouseenter: this.expand,
+                                       mouseleave: this.collapse
+                               }, this);
+                       }
+               }
 
 
-                   dx = this._rebound(nwOffset.x, -seOffset.x),
-                   dy = this._rebound(nwOffset.y, -seOffset.y);
+               var link = this._layersLink = create$1('a', className + '-toggle', container);
+               link.href = '#';
+               link.title = 'Layers';
+
+               if (touch) {
+                       on(link, 'click', stop);
+                       on(link, 'click', this.expand, this);
+               } else {
+                       on(link, 'focus', this.expand, this);
+               }
 
 
-               return new L.Point(dx, dy);
+               if (!collapsed) {
+                       this.expand();
+               }
+
+               this._baseLayersList = create$1('div', className + '-base', section);
+               this._separator = create$1('div', className + '-separator', section);
+               this._overlaysList = create$1('div', className + '-overlays', section);
+
+               container.appendChild(section);
        },
 
        },
 
-       _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));
+       _getLayer: function (id) {
+               for (var i = 0; i < this._layers.length; i++) {
+
+                       if (this._layers[i] && stamp(this._layers[i].layer) === id) {
+                               return this._layers[i];
+                       }
+               }
        },
 
        },
 
-       _limitZoom: function (zoom) {
-               var min = this.getMinZoom(),
-                   max = this.getMaxZoom();
+       _addLayer: function (layer, name, overlay) {
+               if (this._map) {
+                       layer.on('add remove', this._onLayerChange, this);
+               }
 
 
-               return Math.max(min, Math.min(max, zoom));
-       }
-});
+               this._layers.push({
+                       layer: layer,
+                       name: name,
+                       overlay: overlay
+               });
 
 
-L.map = function (id, options) {
-       return new L.Map(id, options);
-};
+               if (this.options.sortLayers) {
+                       this._layers.sort(bind(function (a, b) {
+                               return this.options.sortFunction(a.layer, b.layer, a.name, b.name);
+                       }, this));
+               }
+
+               if (this.options.autoZIndex && layer.setZIndex) {
+                       this._lastZIndex++;
+                       layer.setZIndex(this._lastZIndex);
+               }
+
+               this._expandIfNotCollapsed();
+       },
+
+       _update: function () {
+               if (!this._container) { return this; }
+
+               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;
+               }
+
+               // 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';
 
 
+               return this;
+       },
 
 
-/*
- * Mercator projection that takes into account that the Earth is not a perfect sphere.
- * Less popular than spherical mercator; used by projections like EPSG:3395.
- */
+       _onLayerChange: function (e) {
+               if (!this._handlingClick) {
+                       this._update();
+               }
 
 
-L.Projection.Mercator = {
-       MAX_LATITUDE: 85.0840591556,
+               var obj = this._getLayer(stamp(e.target));
 
 
-       R_MINOR: 6356752.314245179,
-       R_MAJOR: 6378137,
+               // @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);
 
 
-       project: function (latlng) { // (LatLng) -> Point
-               var d = L.LatLng.DEG_TO_RAD,
-                   max = this.MAX_LATITUDE,
-                   lat = Math.max(Math.min(max, latlng.lat), -max),
-                   r = this.R_MAJOR,
-                   r2 = this.R_MINOR,
-                   x = latlng.lng * d * r,
-                   y = lat * d,
-                   tmp = r2 / r,
-                   eccent = Math.sqrt(1.0 - tmp * tmp),
-                   con = eccent * Math.sin(y);
-
-               con = Math.pow((1 - con) / (1 + con), eccent * 0.5);
-
-               var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con;
-               y = -r * Math.log(ts);
-
-               return new L.Point(x, y);
-       },
-
-       unproject: function (point) { // (Point, Boolean) -> LatLng
-               var d = L.LatLng.RAD_TO_DEG,
-                   r = this.R_MAJOR,
-                   r2 = this.R_MINOR,
-                   lng = point.x * d / r,
-                   tmp = r2 / r,
-                   eccent = Math.sqrt(1 - (tmp * tmp)),
-                   ts = Math.exp(- point.y / r),
-                   phi = (Math.PI / 2) - 2 * Math.atan(ts),
-                   numIter = 15,
-                   tol = 1e-7,
-                   i = numIter,
-                   dphi = 0.1,
-                   con;
-
-               while ((Math.abs(dphi) > tol) && (--i > 0)) {
-                       con = eccent * Math.sin(phi);
-                       dphi = (Math.PI / 2) - 2 * Math.atan(ts *
-                                   Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi;
-                       phi += dphi;
+               if (type) {
+                       this._map.fire(type, obj);
                }
                }
+       },
 
 
-               return new L.LatLng(phi * d, lng);
-       }
-};
+       // 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;
 
 
-L.CRS.EPSG3395 = L.extend({}, L.CRS, {
-       code: 'EPSG:3395',
+               return radioFragment.firstChild;
+       },
 
 
-       projection: L.Projection.Mercator,
+       _addItem: function (obj) {
+               var label = document.createElement('label'),
+                   checked = this._map.hasLayer(obj.layer),
+                   input;
 
 
-       transformation: (function () {
-               var m = L.Projection.Mercator,
-                   r = m.R_MAJOR,
-                   scale = 0.5 / (Math.PI * r);
+               if (obj.overlay) {
+                       input = document.createElement('input');
+                       input.type = 'checkbox';
+                       input.className = 'leaflet-control-layers-selector';
+                       input.defaultChecked = checked;
+               } else {
+                       input = this._createRadioElement('leaflet-base-layers_' + stamp(this), checked);
+               }
 
 
-               return new L.Transformation(scale, 0.5, -scale, 0.5);
-       }())
-});
+               this._layerControlInputs.push(input);
+               input.layerId = stamp(obj.layer);
 
 
+               on(input, 'click', this._onInputClick, this);
 
 
-/*
- * L.TileLayer is used for standard xyz-numbered tile layers.
- */
+               var name = document.createElement('span');
+               name.innerHTML = ' ' + obj.name;
 
 
-L.TileLayer = L.Class.extend({
-       includes: L.Mixin.Events,
+               // Helps from preventing layer control flicker when checkboxes are disabled
+               // https://github.com/Leaflet/Leaflet/issues/2771
+               var holder = document.createElement('div');
 
 
-       options: {
-               minZoom: 0,
-               maxZoom: 18,
-               tileSize: 256,
-               subdomains: 'abc',
-               errorTileUrl: '',
-               attribution: '',
-               zoomOffset: 0,
-               opacity: 1,
-               /*
-               maxNativeZoom: null,
-               zIndex: null,
-               tms: false,
-               continuousWorld: false,
-               noWrap: false,
-               zoomReverse: false,
-               detectRetina: false,
-               reuseTiles: false,
-               bounds: false,
-               */
-               unloadInvisibleTiles: L.Browser.mobile,
-               updateWhenIdle: L.Browser.mobile
+               label.appendChild(holder);
+               holder.appendChild(input);
+               holder.appendChild(name);
+
+               var container = obj.overlay ? this._overlaysList : this._baseLayersList;
+               container.appendChild(label);
+
+               this._checkDisabledLayers();
+               return label;
        },
 
        },
 
-       initialize: function (url, options) {
-               options = L.setOptions(this, options);
+       _onInputClick: function () {
+               var inputs = this._layerControlInputs,
+                   input, layer;
+               var addedLayers = [],
+                   removedLayers = [];
 
 
-               // detecting retina displays, adjusting tileSize and zoom levels
-               if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {
+               this._handlingClick = true;
 
 
-                       options.tileSize = Math.floor(options.tileSize / 2);
-                       options.zoomOffset++;
+               for (var i = inputs.length - 1; i >= 0; i--) {
+                       input = inputs[i];
+                       layer = this._getLayer(input.layerId).layer;
 
 
-                       if (options.minZoom > 0) {
-                               options.minZoom--;
+                       if (input.checked) {
+                               addedLayers.push(layer);
+                       } else if (!input.checked) {
+                               removedLayers.push(layer);
                        }
                        }
-                       this.options.maxZoom--;
                }
 
                }
 
-               if (options.bounds) {
-                       options.bounds = L.latLngBounds(options.bounds);
+               // 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]);
+                       }
                }
                }
-
-               this._url = url;
-
-               var subdomains = this.options.subdomains;
-
-               if (typeof subdomains === 'string') {
-                       this.options.subdomains = subdomains.split('');
+               for (i = 0; i < addedLayers.length; i++) {
+                       if (!this._map.hasLayer(addedLayers[i])) {
+                               this._map.addLayer(addedLayers[i]);
+                       }
                }
                }
-       },
 
 
-       onAdd: function (map) {
-               this._map = map;
-               this._animated = map._zoomAnimated;
+               this._handlingClick = false;
 
 
-               // create a container div for tiles
-               this._initContainer();
+               this._refocusOnMap();
+       },
 
 
-               // set up events
-               map.on({
-                       'viewreset': this._reset,
-                       'moveend': this._update
-               }, this);
+       _checkDisabledLayers: function () {
+               var inputs = this._layerControlInputs,
+                   input,
+                   layer,
+                   zoom = this._map.getZoom();
 
 
-               if (this._animated) {
-                       map.on({
-                               'zoomanim': this._animateZoom,
-                               'zoomend': this._endZoomAnim
-                       }, 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);
 
 
-               if (!this.options.updateWhenIdle) {
-                       this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this);
-                       map.on('move', this._limitedUpdate, this);
                }
                }
-
-               this._reset();
-               this._update();
        },
 
        },
 
-       addTo: function (map) {
-               map.addLayer(this);
+       _expandIfNotCollapsed: function () {
+               if (this._map && !this.options.collapsed) {
+                       this.expand();
+               }
                return this;
        },
 
                return this;
        },
 
-       onRemove: function (map) {
-               this._container.parentNode.removeChild(this._container);
-
-               map.off({
-                       'viewreset': this._reset,
-                       'moveend': this._update
-               }, this);
+       _expand: function () {
+               // Backward compatibility, remove me in 1.1.
+               return this.expand();
+       },
 
 
-               if (this._animated) {
-                       map.off({
-                               'zoomanim': this._animateZoom,
-                               'zoomend': this._endZoomAnim
-                       }, this);
-               }
+       _collapse: function () {
+               // Backward compatibility, remove me in 1.1.
+               return this.collapse();
+       }
 
 
-               if (!this.options.updateWhenIdle) {
-                       map.off('move', this._limitedUpdate, this);
-               }
+});
 
 
-               this._container = null;
-               this._map = null;
-       },
 
 
-       bringToFront: function () {
-               var pane = this._map._panes.tilePane;
+// @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);
+};
 
 
-               if (this._container) {
-                       pane.appendChild(this._container);
-                       this._setAutoZIndex(pane, Math.max);
-               }
+/*
+ * @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`.
+ */
 
 
-               return this;
-       },
+var Zoom = Control.extend({
+       // @section
+       // @aka Control.Zoom options
+       options: {
+               position: 'topleft',
 
 
-       bringToBack: function () {
-               var pane = this._map._panes.tilePane;
+               // @option zoomInText: String = '+'
+               // The text set on the 'zoom in' button.
+               zoomInText: '+',
 
 
-               if (this._container) {
-                       pane.insertBefore(this._container, pane.firstChild);
-                       this._setAutoZIndex(pane, Math.min);
-               }
+               // @option zoomInTitle: String = 'Zoom in'
+               // The title set on the 'zoom in' button.
+               zoomInTitle: 'Zoom in',
 
 
-               return this;
-       },
+               // @option zoomOutText: String = '&#x2212;'
+               // The text set on the 'zoom out' button.
+               zoomOutText: '&#x2212;',
 
 
-       getAttribution: function () {
-               return this.options.attribution;
+               // @option zoomOutTitle: String = 'Zoom out'
+               // The title set on the 'zoom out' button.
+               zoomOutTitle: 'Zoom out'
        },
 
        },
 
-       getContainer: function () {
-               return this._container;
-       },
+       onAdd: function (map) {
+               var zoomName = 'leaflet-control-zoom',
+                   container = create$1('div', zoomName + ' leaflet-bar'),
+                   options = this.options;
 
 
-       setOpacity: function (opacity) {
-               this.options.opacity = opacity;
+               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);
 
 
-               if (this._map) {
-                       this._updateOpacity();
-               }
+               this._updateDisabled();
+               map.on('zoomend zoomlevelschange', this._updateDisabled, this);
 
 
-               return this;
+               return container;
        },
 
        },
 
-       setZIndex: function (zIndex) {
-               this.options.zIndex = zIndex;
-               this._updateZIndex();
+       onRemove: function (map) {
+               map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+       },
 
 
+       disable: function () {
+               this._disabled = true;
+               this._updateDisabled();
                return this;
        },
 
                return this;
        },
 
-       setUrl: function (url, noRedraw) {
-               this._url = url;
-
-               if (!noRedraw) {
-                       this.redraw();
-               }
-
+       enable: function () {
+               this._disabled = false;
+               this._updateDisabled();
                return this;
        },
 
                return this;
        },
 
-       redraw: function () {
-               if (this._map) {
-                       this._reset({hard: true});
-                       this._update();
+       _zoomIn: function (e) {
+               if (!this._disabled && this._map._zoom < this._map.getMaxZoom()) {
+                       this._map.zoomIn(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
                }
                }
-               return this;
        },
 
        },
 
-       _updateZIndex: function () {
-               if (this._container && this.options.zIndex !== undefined) {
-                       this._container.style.zIndex = this.options.zIndex;
+       _zoomOut: function (e) {
+               if (!this._disabled && this._map._zoom > this._map.getMinZoom()) {
+                       this._map.zoomOut(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1));
                }
        },
 
                }
        },
 
-       _setAutoZIndex: function (pane, compare) {
+       _createButton: function (html, title, className, container, fn) {
+               var link = create$1('a', className, container);
+               link.innerHTML = html;
+               link.href = '#';
+               link.title = title;
 
 
-               var layers = pane.children,
-                   edgeZIndex = -compare(Infinity, -Infinity), // -Infinity for max, Infinity for min
-                   zIndex, i, len;
+               /*
+                * Will force screen readers like VoiceOver to read this as "Zoom in - button"
+                */
+               link.setAttribute('role', 'button');
+               link.setAttribute('aria-label', title);
 
 
-               for (i = 0, len = layers.length; i < len; i++) {
+               disableClickPropagation(link);
+               on(link, 'click', stop);
+               on(link, 'click', fn, this);
+               on(link, 'click', this._refocusOnMap, this);
 
 
-                       if (layers[i] !== this._container) {
-                               zIndex = parseInt(layers[i].style.zIndex, 10);
+               return link;
+       },
 
 
-                               if (!isNaN(zIndex)) {
-                                       edgeZIndex = compare(edgeZIndex, zIndex);
-                               }
-                       }
+       _updateDisabled: function () {
+               var map = this._map,
+                   className = 'leaflet-disabled';
+
+               removeClass(this._zoomInButton, className);
+               removeClass(this._zoomOutButton, className);
+
+               if (this._disabled || map._zoom === map.getMinZoom()) {
+                       addClass(this._zoomOutButton, className);
                }
                }
+               if (this._disabled || map._zoom === map.getMaxZoom()) {
+                       addClass(this._zoomInButton, className);
+               }
+       }
+});
 
 
-               this.options.zIndex = this._container.style.zIndex =
-                       (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);
-       },
+// @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
+});
 
 
-       _updateOpacity: function () {
-               var i,
-                   tiles = this._tiles;
+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);
+       }
+});
 
 
-               if (L.Browser.ielt9) {
-                       for (i in tiles) {
-                               L.DomUtil.setOpacity(tiles[i], this.options.opacity);
-                       }
-               } else {
-                       L.DomUtil.setOpacity(this._container, this.options.opacity);
-               }
-       },
+// @namespace Control.Zoom
+// @factory L.control.zoom(options: Control.Zoom options)
+// Creates a zoom control
+var zoom = function (options) {
+       return new Zoom(options);
+};
 
 
-       _initContainer: function () {
-               var tilePane = this._map._panes.tilePane;
+/*
+ * @class Control.Scale
+ * @aka L.Control.Scale
+ * @inherits Control
+ *
+ * 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
+ * L.control.scale().addTo(map);
+ * ```
+ */
 
 
-               if (!this._container) {
-                       this._container = L.DomUtil.create('div', 'leaflet-layer');
+var Scale = Control.extend({
+       // @section
+       // @aka Control.Scale options
+       options: {
+               position: 'bottomleft',
 
 
-                       this._updateZIndex();
+               // @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,
 
 
-                       if (this._animated) {
-                               var className = 'leaflet-tile-container';
+               // @option metric: Boolean = True
+               // Whether to show the metric scale line (m/km).
+               metric: true,
 
 
-                               this._bgBuffer = L.DomUtil.create('div', className, this._container);
-                               this._tileContainer = L.DomUtil.create('div', className, this._container);
+               // @option imperial: Boolean = True
+               // Whether to show the imperial scale line (mi/ft).
+               imperial: true
 
 
-                       } else {
-                               this._tileContainer = this._container;
-                       }
+               // @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)).
+       },
 
 
-                       tilePane.appendChild(this._container);
+       onAdd: function (map) {
+               var className = 'leaflet-control-scale',
+                   container = create$1('div', className),
+                   options = this.options;
 
 
-                       if (this.options.opacity < 1) {
-                               this._updateOpacity();
-                       }
-               }
+               this._addScales(options, className + '-line', container);
+
+               map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+               map.whenReady(this._update, this);
+
+               return container;
        },
 
        },
 
-       _reset: function (e) {
-               for (var key in this._tiles) {
-                       this.fire('tileunload', {tile: this._tiles[key]});
+       onRemove: function (map) {
+               map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+       },
+
+       _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);
                }
                }
+       },
 
 
-               this._tiles = {};
-               this._tilesToLoad = 0;
+       _update: function () {
+               var map = this._map,
+                   y = map.getSize().y / 2;
 
 
-               if (this.options.reuseTiles) {
-                       this._unusedTiles = [];
-               }
+               var maxMeters = map.distance(
+                       map.containerPointToLatLng([0, y]),
+                       map.containerPointToLatLng([this.options.maxWidth, y]));
 
 
-               this._tileContainer.innerHTML = '';
+               this._updateScales(maxMeters);
+       },
 
 
-               if (this._animated && e && e.hard) {
-                       this._clearBgBuffer();
+       _updateScales: function (maxMeters) {
+               if (this.options.metric && maxMeters) {
+                       this._updateMetric(maxMeters);
                }
                }
+               if (this.options.imperial && maxMeters) {
+                       this._updateImperial(maxMeters);
+               }
+       },
 
 
-               this._initContainer();
+       _updateMetric: function (maxMeters) {
+               var meters = this._getRoundNum(maxMeters),
+                   label = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km';
+
+               this._updateScale(this._mScale, label, meters / maxMeters);
        },
 
        },
 
-       _getTileSize: function () {
-               var map = this._map,
-                   zoom = map.getZoom() + this.options.zoomOffset,
-                   zoomN = this.options.maxNativeZoom,
-                   tileSize = this.options.tileSize;
+       _updateImperial: function (maxMeters) {
+               var maxFeet = maxMeters * 3.2808399,
+                   maxMiles, miles, feet;
+
+               if (maxFeet > 5280) {
+                       maxMiles = maxFeet / 5280;
+                       miles = this._getRoundNum(maxMiles);
+                       this._updateScale(this._iScale, miles + ' mi', miles / maxMiles);
 
 
-               if (zoomN && zoom > zoomN) {
-                       tileSize = Math.round(map.getZoomScale(zoom) / map.getZoomScale(zoomN) * tileSize);
+               } else {
+                       feet = this._getRoundNum(maxFeet);
+                       this._updateScale(this._iScale, feet + ' ft', feet / maxFeet);
                }
                }
+       },
 
 
-               return tileSize;
+       _updateScale: function (scale, text, ratio) {
+               scale.style.width = Math.round(this.options.maxWidth * ratio) + 'px';
+               scale.innerHTML = text;
        },
 
        },
 
-       _update: function () {
+       _getRoundNum: function (num) {
+               var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1),
+                   d = num / pow10;
+
+               d = d >= 10 ? 10 :
+                   d >= 5 ? 5 :
+                   d >= 3 ? 3 :
+                   d >= 2 ? 2 : 1;
 
 
-               if (!this._map) { return; }
+               return pow10 * d;
+       }
+});
 
 
-               var map = this._map,
-                   bounds = map.getPixelBounds(),
-                   zoom = map.getZoom(),
-                   tileSize = this._getTileSize();
 
 
-               if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
-                       return;
-               }
+// @factory L.control.scale(options?: Control.Scale options)
+// Creates an scale control with the given options.
+var scale = function (options) {
+       return new Scale(options);
+};
 
 
-               var tileBounds = L.bounds(
-                       bounds.min.divideBy(tileSize)._floor(),
-                       bounds.max.divideBy(tileSize)._floor());
+/*
+ * @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.
+ */
 
 
-               this._addTilesFromCenterOut(tileBounds);
+var Attribution = Control.extend({
+       // @section
+       // @aka Control.Attribution options
+       options: {
+               position: 'bottomright',
 
 
-               if (this.options.unloadInvisibleTiles || this.options.reuseTiles) {
-                       this._removeOtherTiles(tileBounds);
-               }
+               // @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>'
        },
 
        },
 
-       _addTilesFromCenterOut: function (bounds) {
-               var queue = [],
-                   center = bounds.getCenter();
+       initialize: function (options) {
+               setOptions(this, options);
 
 
-               var j, i, point;
+               this._attributions = {};
+       },
 
 
-               for (j = bounds.min.y; j <= bounds.max.y; j++) {
-                       for (i = bounds.min.x; i <= bounds.max.x; i++) {
-                               point = new L.Point(i, j);
+       onAdd: function (map) {
+               map.attributionControl = this;
+               this._container = create$1('div', 'leaflet-control-attribution');
+               disableClickPropagation(this._container);
 
 
-                               if (this._tileShouldBeLoaded(point)) {
-                                       queue.push(point);
-                               }
+               // TODO ugly, refactor
+               for (var i in map._layers) {
+                       if (map._layers[i].getAttribution) {
+                               this.addAttribution(map._layers[i].getAttribution());
                        }
                }
 
                        }
                }
 
-               var tilesToLoad = queue.length;
+               this._update();
 
 
-               if (tilesToLoad === 0) { return; }
+               return this._container;
+       },
 
 
-               // load tiles in order of their distance to center
-               queue.sort(function (a, b) {
-                       return a.distanceTo(center) - b.distanceTo(center);
-               });
+       // @method setPrefix(prefix: String): this
+       // Sets the text before the attributions.
+       setPrefix: function (prefix) {
+               this.options.prefix = prefix;
+               this._update();
+               return this;
+       },
 
 
-               var fragment = document.createDocumentFragment();
+       // @method addAttribution(text: String): this
+       // Adds an attribution text (e.g. `'Vector data &copy; Mapbox'`).
+       addAttribution: function (text) {
+               if (!text) { return this; }
 
 
-               // if its the first batch of tiles to load
-               if (!this._tilesToLoad) {
-                       this.fire('loading');
+               if (!this._attributions[text]) {
+                       this._attributions[text] = 0;
                }
                }
+               this._attributions[text]++;
 
 
-               this._tilesToLoad += tilesToLoad;
-
-               for (i = 0; i < tilesToLoad; i++) {
-                       this._addTile(queue[i], fragment);
-               }
+               this._update();
 
 
-               this._tileContainer.appendChild(fragment);
+               return this;
        },
 
        },
 
-       _tileShouldBeLoaded: function (tilePoint) {
-               if ((tilePoint.x + ':' + tilePoint.y) in this._tiles) {
-                       return false; // already loaded
-               }
-
-               var options = this.options;
-
-               if (!options.continuousWorld) {
-                       var limit = this._getWrapTileNum();
-
-                       // don't load if exceeds world bounds
-                       if ((options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit.x)) ||
-                               tilePoint.y < 0 || tilePoint.y >= limit.y) { return false; }
-               }
-
-               if (options.bounds) {
-                       var tileSize = options.tileSize,
-                           nwPoint = tilePoint.multiplyBy(tileSize),
-                           sePoint = nwPoint.add([tileSize, tileSize]),
-                           nw = this._map.unproject(nwPoint),
-                           se = this._map.unproject(sePoint);
-
-                       // TODO temporary hack, will be removed after refactoring projections
-                       // https://github.com/Leaflet/Leaflet/issues/1618
-                       if (!options.continuousWorld && !options.noWrap) {
-                               nw = nw.wrap();
-                               se = se.wrap();
-                       }
+       // @method removeAttribution(text: String): this
+       // Removes an attribution text.
+       removeAttribution: function (text) {
+               if (!text) { return this; }
 
 
-                       if (!options.bounds.intersects([nw, se])) { return false; }
+               if (this._attributions[text]) {
+                       this._attributions[text]--;
+                       this._update();
                }
 
                }
 
-               return true;
+               return this;
        },
 
        },
 
-       _removeOtherTiles: function (bounds) {
-               var kArr, x, y, key;
+       _update: function () {
+               if (!this._map) { return; }
 
 
-               for (key in this._tiles) {
-                       kArr = key.split(':');
-                       x = parseInt(kArr[0], 10);
-                       y = parseInt(kArr[1], 10);
+               var attribs = [];
 
 
-                       // remove tile if it's out of bounds
-                       if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) {
-                               this._removeTile(key);
+               for (var i in this._attributions) {
+                       if (this._attributions[i]) {
+                               attribs.push(i);
                        }
                }
                        }
                }
-       },
-
-       _removeTile: function (key) {
-               var tile = this._tiles[key];
 
 
-               this.fire('tileunload', {tile: tile, url: tile.src});
-
-               if (this.options.reuseTiles) {
-                       L.DomUtil.removeClass(tile, 'leaflet-tile-loaded');
-                       this._unusedTiles.push(tile);
+               var prefixAndAttribs = [];
 
 
-               } else if (tile.parentNode === this._tileContainer) {
-                       this._tileContainer.removeChild(tile);
+               if (this.options.prefix) {
+                       prefixAndAttribs.push(this.options.prefix);
                }
                }
-
-               // for https://github.com/CloudMade/Leaflet/issues/137
-               if (!L.Browser.android) {
-                       tile.onload = null;
-                       tile.src = L.Util.emptyImageUrl;
+               if (attribs.length) {
+                       prefixAndAttribs.push(attribs.join(', '));
                }
 
                }
 
-               delete this._tiles[key];
-       },
-
-       _addTile: function (tilePoint, container) {
-               var tilePos = this._getTilePos(tilePoint);
-
-               // get unused tile - or create a new tile
-               var tile = this._getTile();
-
-               /*
-               Chrome 20 layouts much faster with top/left (verify with timeline, frames)
-               Android 4 browser has display issues with top/left and requires transform instead
-               Android 2 browser requires top/left or tiles disappear on load or first drag
-               (reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866
-               (other browsers don't currently care) - see debug/hacks/jitter.html for an example
-               */
-               L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);
+               this._container.innerHTML = prefixAndAttribs.join(' | ');
+       }
+});
 
 
-               this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
+// @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
+});
 
 
-               this._loadTile(tile, tilePoint);
+Map.addInitHook(function () {
+       if (this.options.attributionControl) {
+               new Attribution().addTo(this);
+       }
+});
 
 
-               if (tile.parentNode !== this._tileContainer) {
-                       container.appendChild(tile);
-               }
-       },
+// @namespace Control.Attribution
+// @factory L.control.attribution(options: Control.Attribution options)
+// Creates an attribution control.
+var attribution = function (options) {
+       return new Attribution(options);
+};
 
 
-       _getZoomForUrl: function () {
+Control.Layers = Layers;
+Control.Zoom = Zoom;
+Control.Scale = Scale;
+Control.Attribution = Attribution;
 
 
-               var options = this.options,
-                   zoom = this._map.getZoom();
+control.layers = layers;
+control.zoom = zoom;
+control.scale = scale;
+control.attribution = attribution;
 
 
-               if (options.zoomReverse) {
-                       zoom = options.maxZoom - zoom;
-               }
+/*
+       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.
+*/
 
 
-               zoom += options.zoomOffset;
+// @class Handler
+// @aka L.Handler
+// Abstract class for map interaction handlers
 
 
-               return options.maxNativeZoom ? Math.min(zoom, options.maxNativeZoom) : zoom;
+var Handler = Class.extend({
+       initialize: function (map) {
+               this._map = map;
        },
 
        },
 
-       _getTilePos: function (tilePoint) {
-               var origin = this._map.getPixelOrigin(),
-                   tileSize = this._getTileSize();
+       // @method enable(): this
+       // Enables the handler
+       enable: function () {
+               if (this._enabled) { return this; }
 
 
-               return tilePoint.multiplyBy(tileSize).subtract(origin);
+               this._enabled = true;
+               this.addHooks();
+               return this;
        },
 
        },
 
-       // image-specific code (override to implement e.g. Canvas or SVG tile layer)
-
-       getTileUrl: function (tilePoint) {
-               return L.Util.template(this._url, L.extend({
-                       s: this._getSubdomain(tilePoint),
-                       z: tilePoint.z,
-                       x: tilePoint.x,
-                       y: tilePoint.y
-               }, this.options));
-       },
+       // @method disable(): this
+       // Disables the handler
+       disable: function () {
+               if (!this._enabled) { return this; }
 
 
-       _getWrapTileNum: function () {
-               var crs = this._map.options.crs,
-                   size = crs.getSize(this._map.getZoom());
-               return size.divideBy(this.options.tileSize);
+               this._enabled = false;
+               this.removeHooks();
+               return this;
        },
 
        },
 
-       _adjustTilePoint: function (tilePoint) {
+       // @method enabled(): Boolean
+       // Returns `true` if the handler is enabled
+       enabled: function () {
+               return !!this._enabled;
+       }
 
 
-               var limit = this._getWrapTileNum();
+       // @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.
+});
 
 
-               // wrap tile coordinates
-               if (!this.options.continuousWorld && !this.options.noWrap) {
-                       tilePoint.x = ((tilePoint.x % limit.x) + limit.x) % limit.x;
-               }
+// @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;
+};
 
 
-               if (this.options.tms) {
-                       tilePoint.y = limit.y - tilePoint.y - 1;
-               }
+var Mixin = {Events: Events};
 
 
-               tilePoint.z = this._getZoomForUrl();
-       },
+/*
+ * @class Draggable
+ * @aka L.Draggable
+ * @inherits Evented
+ *
+ * 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
+ * var draggable = new L.Draggable(elementToDrag);
+ * draggable.enable();
+ * ```
+ */
 
 
-       _getSubdomain: function (tilePoint) {
-               var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length;
-               return this.options.subdomains[index];
-       },
+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'
+};
 
 
-       _getTile: function () {
-               if (this.options.reuseTiles && this._unusedTiles.length > 0) {
-                       var tile = this._unusedTiles.pop();
-                       this._resetTile(tile);
-                       return tile;
-               }
-               return this._createTile();
-       },
 
 
-       // Override if data stored on a tile needs to be cleaned up before reuse
-       _resetTile: function (/*tile*/) {},
+var Draggable = Evented.extend({
 
 
-       _createTile: function () {
-               var tile = L.DomUtil.create('img', 'leaflet-tile');
-               tile.style.width = tile.style.height = this._getTileSize() + 'px';
-               tile.galleryimg = 'no';
+       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
+       },
 
 
-               tile.onselectstart = tile.onmousemove = L.Util.falseFn;
+       // @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);
 
 
-               if (L.Browser.ielt9 && this.options.opacity !== undefined) {
-                       L.DomUtil.setOpacity(tile, this.options.opacity);
-               }
-               // without this hack, tiles disappear after zoom on Chrome for Android
-               // https://github.com/Leaflet/Leaflet/issues/2078
-               if (L.Browser.mobileWebkit3d) {
-                       tile.style.WebkitBackfaceVisibility = 'hidden';
-               }
-               return tile;
+               this._element = element;
+               this._dragStartTarget = dragStartTarget || element;
+               this._preventOutline = preventOutline$$1;
        },
 
        },
 
-       _loadTile: function (tile, tilePoint) {
-               tile._layer  = this;
-               tile.onload  = this._tileOnLoad;
-               tile.onerror = this._tileOnError;
+       // @method enable()
+       // Enables the dragging ability
+       enable: function () {
+               if (this._enabled) { return; }
 
 
-               this._adjustTilePoint(tilePoint);
-               tile.src     = this.getTileUrl(tilePoint);
+               on(this._dragStartTarget, START, this._onDown, this);
 
 
-               this.fire('tileloadstart', {
-                       tile: tile,
-                       url: tile.src
-               });
+               this._enabled = true;
        },
 
        },
 
-       _tileLoaded: function () {
-               this._tilesToLoad--;
+       // @method disable()
+       // Disables the dragging ability
+       disable: function () {
+               if (!this._enabled) { return; }
 
 
-               if (this._animated) {
-                       L.DomUtil.addClass(this._tileContainer, 'leaflet-zoom-animated');
+               // If we're currently dragging this draggable,
+               // disabling it counts as first ending the drag.
+               if (Draggable._dragging === this) {
+                       this.finishDrag();
                }
 
                }
 
-               if (!this._tilesToLoad) {
-                       this.fire('load');
+               off(this._dragStartTarget, START, this._onDown, this);
 
 
-                       if (this._animated) {
-                               // clear scaled tiles after all new tiles are loaded (for performance)
-                               clearTimeout(this._clearBgBufferTimer);
-                               this._clearBgBufferTimer = setTimeout(L.bind(this._clearBgBuffer, this), 500);
-                       }
-               }
+               this._enabled = false;
+               this._moved = false;
        },
 
        },
 
-       _tileOnLoad: function () {
-               var layer = this._layer;
-
-               //Only if we are loading an actual image
-               if (this.src !== L.Util.emptyImageUrl) {
-                       L.DomUtil.addClass(this, 'leaflet-tile-loaded');
-
-                       layer.fire('tileload', {
-                               tile: this,
-                               url: this.src
-                       });
-               }
+       _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; }
 
 
-               layer._tileLoaded();
-       },
+               this._moved = false;
 
 
-       _tileOnError: function () {
-               var layer = this._layer;
+               if (hasClass(this._element, 'leaflet-zoom-anim')) { return; }
 
 
-               layer.fire('tileerror', {
-                       tile: this,
-                       url: this.src
-               });
+               if (Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
+               Draggable._dragging = this;  // Prevent dragging multiple objects at once.
 
 
-               var newUrl = layer.options.errorTileUrl;
-               if (newUrl) {
-                       this.src = newUrl;
+               if (this._preventOutline) {
+                       preventOutline(this._element);
                }
 
                }
 
-               layer._tileLoaded();
-       }
-});
+               disableImageDrag();
+               disableTextSelection();
 
 
-L.tileLayer = function (url, options) {
-       return new L.TileLayer(url, options);
-};
+               if (this._moving) { return; }
 
 
+               // @event down: Event
+               // Fired when a drag is about to start.
+               this.fire('down');
 
 
-/*
- * L.TileLayer.WMS is used for putting WMS tile layers on the map.
- */
+               var first = e.touches ? e.touches[0] : e,
+                   sizedParent = getSizedParentNode(this._element);
 
 
-L.TileLayer.WMS = L.TileLayer.extend({
+               this._startPoint = new Point(first.clientX, first.clientY);
 
 
-       defaultWmsParams: {
-               service: 'WMS',
-               request: 'GetMap',
-               version: '1.1.1',
-               layers: '',
-               styles: '',
-               format: 'image/jpeg',
-               transparent: false
+               // 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);
        },
 
        },
 
-       initialize: function (url, options) { // (String, Object)
+       _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; }
 
 
-               this._url = url;
+               if (e.touches && e.touches.length > 1) {
+                       this._moved = true;
+                       return;
+               }
 
 
-               var wmsParams = L.extend({}, this.defaultWmsParams),
-                   tileSize = options.tileSize || this.options.tileSize;
+               var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
+                   offset = new Point(first.clientX, first.clientY)._subtract(this._startPoint);
 
 
-               if (options.detectRetina && L.Browser.retina) {
-                       wmsParams.width = wmsParams.height = tileSize * 2;
-               } else {
-                       wmsParams.width = wmsParams.height = tileSize;
-               }
+               if (!offset.x && !offset.y) { return; }
+               if (Math.abs(offset.x) + Math.abs(offset.y) < this.options.clickTolerance) { return; }
 
 
-               for (var i in options) {
-                       // all keys that are not TileLayer options go to WMS params
-                       if (!this.options.hasOwnProperty(i) && i !== 'crs') {
-                               wmsParams[i] = options[i];
-                       }
-               }
+               // 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;
 
 
-               this.wmsParams = wmsParams;
+               preventDefault(e);
 
 
-               L.setOptions(this, options);
-       },
+               if (!this._moved) {
+                       // @event dragstart: Event
+                       // Fired when a drag starts
+                       this.fire('dragstart');
 
 
-       onAdd: function (map) {
+                       this._moved = true;
+                       this._startPos = getPosition(this._element).subtract(offset);
 
 
-               this._crs = this.options.crs || map.options.crs;
+                       addClass(document.body, 'leaflet-dragging');
 
 
-               this._wmsVersion = parseFloat(this.wmsParams.version);
+                       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');
+               }
 
 
-               var projectionKey = this._wmsVersion >= 1.3 ? 'crs' : 'srs';
-               this.wmsParams[projectionKey] = this._crs.code;
+               this._newPos = this._startPos.add(offset);
+               this._moving = true;
 
 
-               L.TileLayer.prototype.onAdd.call(this, map);
+               cancelAnimFrame(this._animRequest);
+               this._lastEvent = e;
+               this._animRequest = requestAnimFrame(this._updatePosition, this, true);
        },
 
        },
 
-       getTileUrl: function (tilePoint) { // (Point, Number) -> String
+       _updatePosition: function () {
+               var e = {originalEvent: this._lastEvent};
 
 
-               var map = this._map,
-                   tileSize = this.options.tileSize,
+               // @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);
 
 
-                   nwPoint = tilePoint.multiplyBy(tileSize),
-                   sePoint = nwPoint.add([tileSize, tileSize]),
+               // @event drag: Event
+               // Fired continuously during dragging.
+               this.fire('drag', e);
+       },
 
 
-                   nw = this._crs.project(map.unproject(nwPoint, tilePoint.z)),
-                   se = this._crs.project(map.unproject(sePoint, tilePoint.z)),
-                   bbox = this._wmsVersion >= 1.3 && this._crs === L.CRS.EPSG4326 ?
-                       [se.y, nw.x, nw.y, se.x].join(',') :
-                       [nw.x, se.y, se.x, nw.y].join(','),
+       _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();
+       },
 
 
-                   url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});
+       finishDrag: function () {
+               removeClass(document.body, 'leaflet-dragging');
 
 
-               return url + L.Util.getParamString(this.wmsParams, url, true) + '&BBOX=' + bbox;
-       },
+               if (this._lastTarget) {
+                       removeClass(this._lastTarget, 'leaflet-drag-target');
+                       this._lastTarget = null;
+               }
 
 
-       setParams: function (params, noRedraw) {
+               for (var i in MOVE) {
+                       off(document, MOVE[i], this._onMove, this);
+                       off(document, END[i], this._onUp, this);
+               }
 
 
-               L.extend(this.wmsParams, params);
+               enableImageDrag();
+               enableTextSelection();
 
 
-               if (!noRedraw) {
-                       this.redraw();
+               if (this._moved && this._moving) {
+                       // ensure drag is not fired after dragend
+                       cancelAnimFrame(this._animRequest);
+
+                       // @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;
        }
        }
-});
-
-L.tileLayer.wms = function (url, options) {
-       return new L.TileLayer.WMS(url, options);
-};
 
 
+});
 
 /*
 
 /*
- * L.TileLayer.Canvas is a class that you can use as a base for creating
- * dynamically drawn Canvas-based tile layers.
+ * @namespace LineUtil
+ *
+ * Various utility functions for polyline points processing, used by Leaflet internally to make polylines lightning-fast.
  */
 
  */
 
-L.TileLayer.Canvas = L.TileLayer.extend({
-       options: {
-               async: false
-       },
-
-       initialize: function (options) {
-               L.setOptions(this, options);
-       },
-
-       redraw: function () {
-               if (this._map) {
-                       this._reset({hard: true});
-                       this._update();
-               }
-
-               for (var i in this._tiles) {
-                       this._redrawTile(this._tiles[i]);
-               }
-               return this;
-       },
-
-       _redrawTile: function (tile) {
-               this.drawTile(tile, tile._tilePoint, this._map._zoom);
-       },
+// 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();
+       }
 
 
-       _createTile: function () {
-               var tile = L.DomUtil.create('canvas', 'leaflet-tile');
-               tile.width = tile.height = this.options.tileSize;
-               tile.onselectstart = tile.onmousemove = L.Util.falseFn;
-               return tile;
-       },
+       var sqTolerance = tolerance * tolerance;
 
 
-       _loadTile: function (tile, tilePoint) {
-               tile._layer = this;
-               tile._tilePoint = tilePoint;
+           // stage 1: vertex reduction
+           points = _reducePoints(points, sqTolerance);
 
 
-               this._redrawTile(tile);
+           // stage 2: Douglas-Peucker simplification
+           points = _simplifyDP(points, sqTolerance);
 
 
-               if (!this.options.async) {
-                       this.tileDrawn(tile);
-               }
-       },
+       return points;
+}
 
 
-       drawTile: function (/*tile, tilePoint*/) {
-               // override with rendering code
-       },
+// @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));
+}
 
 
-       tileDrawn: function (tile) {
-               this._tileOnLoad.call(tile);
-       }
-});
+// @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);
+}
 
 
+// Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm
+function _simplifyDP(points, sqTolerance) {
 
 
-L.tileLayer.canvas = function (options) {
-       return new L.TileLayer.Canvas(options);
-};
+       var len = points.length,
+           ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
+           markers = new ArrayConstructor(len);
 
 
+           markers[0] = markers[len - 1] = 1;
 
 
-/*
- * L.ImageOverlay is used to overlay images over the map (to specific geographical bounds).
- */
+       _simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
 
 
-L.ImageOverlay = L.Class.extend({
-       includes: L.Mixin.Events,
+       var i,
+           newPoints = [];
 
 
-       options: {
-               opacity: 1
-       },
+       for (i = 0; i < len; i++) {
+               if (markers[i]) {
+                       newPoints.push(points[i]);
+               }
+       }
 
 
-       initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)
-               this._url = url;
-               this._bounds = L.latLngBounds(bounds);
+       return newPoints;
+}
 
 
-               L.setOptions(this, options);
-       },
+function _simplifyDPStep(points, markers, sqTolerance, first, last) {
 
 
-       onAdd: function (map) {
-               this._map = map;
+       var maxSqDist = 0,
+       index, i, sqDist;
 
 
-               if (!this._image) {
-                       this._initImage();
+       for (i = first + 1; i <= last - 1; i++) {
+               sqDist = _sqClosestPointOnSegment(points[i], points[first], points[last], true);
+
+               if (sqDist > maxSqDist) {
+                       index = i;
+                       maxSqDist = sqDist;
                }
                }
+       }
 
 
-               map._panes.overlayPane.appendChild(this._image);
+       if (maxSqDist > sqTolerance) {
+               markers[index] = 1;
 
 
-               map.on('viewreset', this._reset, this);
+               _simplifyDPStep(points, markers, sqTolerance, first, index);
+               _simplifyDPStep(points, markers, sqTolerance, index, last);
+       }
+}
 
 
-               if (map.options.zoomAnimation && L.Browser.any3d) {
-                       map.on('zoomanim', this._animateZoom, this);
+// 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._reset();
-       },
+var _lastCode;
 
 
-       onRemove: function (map) {
-               map.getPanes().overlayPane.removeChild(this._image);
+// @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),
 
 
-               map.off('viewreset', this._reset, this);
+           codeOut, p, newCode;
 
 
-               if (map.options.zoomAnimation) {
-                       map.off('zoomanim', this._animateZoom, this);
+           // save 2nd code to avoid calculating it on the next segment
+           _lastCode = codeB;
+
+       while (true) {
+               // if a,b is inside the clip window (trivial accept)
+               if (!(codeA | codeB)) {
+                       return [a, b];
                }
                }
-       },
 
 
-       addTo: function (map) {
-               map.addLayer(this);
-               return this;
-       },
+               // if a,b is outside the clip window (trivial reject)
+               if (codeA & codeB) {
+                       return false;
+               }
 
 
-       setOpacity: function (opacity) {
-               this.options.opacity = opacity;
-               this._updateOpacity();
-               return this;
-       },
+               // other cases
+               codeOut = codeA || codeB;
+               p = _getEdgeIntersection(a, b, codeOut, bounds, round);
+               newCode = _getBitCode(p, bounds);
 
 
-       // TODO remove bringToFront/bringToBack duplication from TileLayer/Path
-       bringToFront: function () {
-               if (this._image) {
-                       this._map._panes.overlayPane.appendChild(this._image);
+               if (codeOut === codeA) {
+                       a = p;
+                       codeA = newCode;
+               } else {
+                       b = p;
+                       codeB = newCode;
                }
                }
-               return this;
-       },
+       }
+}
 
 
-       bringToBack: function () {
-               var pane = this._map._panes.overlayPane;
-               if (this._image) {
-                       pane.insertBefore(this._image, pane.firstChild);
-               }
-               return this;
-       },
+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;
 
 
-       setUrl: function (url) {
-               this._url = url;
-               this._image.src = this._url;
-       },
+       if (code & 8) { // top
+               x = a.x + dx * (max.y - a.y) / dy;
+               y = max.y;
 
 
-       getAttribution: function () {
-               return this.options.attribution;
-       },
+       } else if (code & 4) { // bottom
+               x = a.x + dx * (min.y - a.y) / dy;
+               y = min.y;
 
 
-       _initImage: function () {
-               this._image = L.DomUtil.create('img', 'leaflet-image-layer');
+       } else if (code & 2) { // right
+               x = max.x;
+               y = a.y + dy * (max.x - a.x) / dx;
 
 
-               if (this._map.options.zoomAnimation && L.Browser.any3d) {
-                       L.DomUtil.addClass(this._image, 'leaflet-zoom-animated');
-               } else {
-                       L.DomUtil.addClass(this._image, 'leaflet-zoom-hide');
-               }
+       } else if (code & 1) { // left
+               x = min.x;
+               y = a.y + dy * (min.x - a.x) / dx;
+       }
 
 
-               this._updateOpacity();
+       return new Point(x, y, round);
+}
 
 
-               //TODO createImage util method to remove duplication
-               L.extend(this._image, {
-                       galleryimg: 'no',
-                       onselectstart: L.Util.falseFn,
-                       onmousemove: L.Util.falseFn,
-                       onload: L.bind(this._onImageLoad, this),
-                       src: this._url
-               });
-       },
+function _getBitCode(p, bounds) {
+       var code = 0;
 
 
-       _animateZoom: function (e) {
-               var map = this._map,
-                   image = this._image,
-                   scale = map.getZoomScale(e.zoom),
-                   nw = this._bounds.getNorthWest(),
-                   se = this._bounds.getSouthEast(),
+       if (p.x < bounds.min.x) { // left
+               code |= 1;
+       } else if (p.x > bounds.max.x) { // right
+               code |= 2;
+       }
 
 
-                   topLeft = map._latLngToNewLayerPoint(nw, e.zoom, e.center),
-                   size = map._latLngToNewLayerPoint(se, e.zoom, e.center)._subtract(topLeft),
-                   origin = topLeft._add(size._multiplyBy((1 / 2) * (1 - 1 / scale)));
+       if (p.y < bounds.min.y) { // bottom
+               code |= 4;
+       } else if (p.y > bounds.max.y) { // top
+               code |= 8;
+       }
 
 
-               image.style[L.DomUtil.TRANSFORM] =
-                       L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';
-       },
+       return code;
+}
 
 
-       _reset: function () {
-               var image   = this._image,
-                   topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
-                   size = this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(topLeft);
+// 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;
+}
 
 
-               L.DomUtil.setPosition(image, topLeft);
+// 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;
+               }
+       }
 
 
-               image.style.width  = size.x + 'px';
-               image.style.height = size.y + 'px';
-       },
+       dx = p.x - x;
+       dy = p.y - y;
 
 
-       _onImageLoad: function () {
-               this.fire('load');
-       },
+       return sqDist ? dx * dx + dy * dy : new Point(x, y);
+}
 
 
-       _updateOpacity: function () {
-               L.DomUtil.setOpacity(this._image, this.options.opacity);
-       }
-});
 
 
-L.imageOverlay = function (url, bounds, options) {
-       return new L.ImageOverlay(url, bounds, 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);
+}
+
 
 
+var LineUtil = (Object.freeze || Object)({
+       simplify: simplify,
+       pointToSegmentDistance: pointToSegmentDistance,
+       closestPointOnSegment: closestPointOnSegment,
+       clipSegment: clipSegment,
+       _getEdgeIntersection: _getEdgeIntersection,
+       _getBitCode: _getBitCode,
+       _sqClosestPointOnSegment: _sqClosestPointOnSegment,
+       isFlat: isFlat,
+       _flat: _flat
+});
 
 /*
 
 /*
- * L.Icon is an image-based icon class that you can use with L.Marker for custom markers.
+ * @namespace PolyUtil
+ * Various utility functions for polygon geometries.
  */
 
  */
 
-L.Icon = L.Class.extend({
-       options: {
-               /*
-               iconUrl: (String) (required)
-               iconRetinaUrl: (String) (optional, used for retina devices if detected)
-               iconSize: (Point) (can be set through CSS)
-               iconAnchor: (Point) (centered by default, can be set in CSS with negative margins)
-               popupAnchor: (Point) (if not specified, popup opens in the anchor point)
-               shadowUrl: (String) (no shadow by default)
-               shadowRetinaUrl: (String) (optional, used for retina devices if detected)
-               shadowSize: (Point)
-               shadowAnchor: (Point)
-               */
-               className: ''
-       },
+/* @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;
 
 
-       initialize: function (options) {
-               L.setOptions(this, options);
-       },
+       for (i = 0, len = points.length; i < len; i++) {
+               points[i]._code = _getBitCode(points[i], bounds);
+       }
 
 
-       createIcon: function (oldIcon) {
-               return this._createIcon('icon', oldIcon);
-       },
+       // for each edge (left, bottom, right, top)
+       for (k = 0; k < 4; k++) {
+               edge = edges[k];
+               clippedPoints = [];
 
 
-       createShadow: function (oldIcon) {
-               return this._createIcon('shadow', oldIcon);
-       },
+               for (i = 0, len = points.length, j = len - 1; i < len; j = i++) {
+                       a = points[i];
+                       b = points[j];
 
 
-       _createIcon: function (name, oldIcon) {
-               var src = this._getIconUrl(name);
+                       // 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 (!src) {
-                       if (name === 'icon') {
-                               throw new Error('iconUrl not set in Icon options (see the docs).');
+                       // 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);
                        }
                        }
-                       return null;
-               }
-
-               var img;
-               if (!oldIcon || oldIcon.tagName !== 'IMG') {
-                       img = this._createImg(src);
-               } else {
-                       img = this._createImg(src, oldIcon);
                }
                }
-               this._setIconStyles(img, name);
-
-               return img;
-       },
-
-       _setIconStyles: function (img, name) {
-               var options = this.options,
-                   size = L.point(options[name + 'Size']),
-                   anchor;
+               points = clippedPoints;
+       }
 
 
-               if (name === 'shadow') {
-                       anchor = L.point(options.shadowAnchor || options.iconAnchor);
-               } else {
-                       anchor = L.point(options.iconAnchor);
-               }
+       return points;
+}
 
 
-               if (!anchor && size) {
-                       anchor = size.divideBy(2, true);
-               }
 
 
-               img.className = 'leaflet-marker-' + name + ' ' + options.className;
+var PolyUtil = (Object.freeze || Object)({
+       clipPolygon: clipPolygon
+});
 
 
-               if (anchor) {
-                       img.style.marginLeft = (-anchor.x) + 'px';
-                       img.style.marginTop  = (-anchor.y) + 'px';
-               }
+/*
+ * @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.
+ */
 
 
-               if (size) {
-                       img.style.width  = size.x + 'px';
-                       img.style.height = size.y + 'px';
-               }
+var LonLat = {
+       project: function (latlng) {
+               return new Point(latlng.lng, latlng.lat);
        },
 
        },
 
-       _createImg: function (src, el) {
-               el = el || document.createElement('img');
-               el.src = src;
-               return el;
+       unproject: function (point) {
+               return new LatLng(point.y, point.x);
        },
 
        },
 
-       _getIconUrl: function (name) {
-               if (L.Browser.retina && this.options[name + 'RetinaUrl']) {
-                       return this.options[name + 'RetinaUrl'];
-               }
-               return this.options[name + 'Url'];
-       }
-});
-
-L.icon = function (options) {
-       return new L.Icon(options);
+       bounds: new Bounds([-180, -90], [180, 90])
 };
 
 };
 
-
 /*
 /*
- * L.Icon.Default is the blue marker icon used by default in Leaflet.
+ * @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.
  */
 
  */
 
-L.Icon.Default = L.Icon.extend({
-
-       options: {
-               iconSize: [25, 41],
-               iconAnchor: [12, 41],
-               popupAnchor: [1, -34],
-
-               shadowSize: [41, 41]
-       },
+var Mercator = {
+       R: 6378137,
+       R_MINOR: 6356752.314245179,
 
 
-       _getIconUrl: function (name) {
-               var key = name + 'Url';
+       bounds: new Bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]),
 
 
-               if (this.options[key]) {
-                       return this.options[key];
-               }
+       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);
 
 
-               if (L.Browser.retina && name === 'icon') {
-                       name += '-2x';
-               }
+               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));
 
 
-               var path = L.Icon.Default.imagePath;
+               return new Point(latlng.lng * d * r, y);
+       },
 
 
-               if (!path) {
-                       throw new Error('Couldn\'t autodetect L.Icon.Default.imagePath, set it manually.');
+       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);
+
+               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 path + '/marker-' + name + '.png';
+               return new LatLng(phi * d, point.x * d / r);
        }
        }
-});
+};
 
 
-L.Icon.Default.imagePath = (function () {
-       var scripts = document.getElementsByTagName('script'),
-           leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;
+/*
+ * @class Projection
 
 
-       var i, len, src, matches, path;
+ * 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).
 
 
-       for (i = 0, len = scripts.length; i < len; i++) {
-               src = scripts[i].src;
-               matches = src.match(leafletRe);
+ * @property bounds: Bounds
+ * The bounds (specified in CRS units) where the projection is valid
 
 
-               if (matches) {
-                       path = src.split(leafletRe)[0];
-                       return (path ? path + '/' : '') + 'images';
-               }
-       }
-}());
+ * @method project(latlng: LatLng): Point
+ * Projects geographical coordinates into a 2D point.
+ * Only accepts actual `L.LatLng` instances, not arrays.
 
 
+ * @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.
+
+ * 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.
 
 
-/*
- * L.Marker is used to display clickable/draggable icons on the map.
  */
 
  */
 
-L.Marker = L.Class.extend({
 
 
-       includes: L.Mixin.Events,
 
 
-       options: {
-               icon: new L.Icon.Default(),
-               title: '',
-               alt: '',
-               clickable: true,
-               draggable: false,
-               keyboard: true,
-               zIndexOffset: 0,
-               opacity: 1,
-               riseOnHover: false,
-               riseOffset: 250
-       },
 
 
-       initialize: function (latlng, options) {
-               L.setOptions(this, options);
-               this._latlng = L.latLng(latlng);
-       },
+var index = (Object.freeze || Object)({
+       LonLat: LonLat,
+       Mercator: Mercator,
+       SphericalMercator: SphericalMercator
+});
 
 
-       onAdd: function (map) {
-               this._map = map;
+/*
+ * @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,
 
 
-               map.on('viewreset', this.update, this);
+       transformation: (function () {
+               var scale = 0.5 / (Math.PI * Mercator.R);
+               return toTransformation(scale, 0.5, -scale, 0.5);
+       }())
+});
 
 
-               this._initIcon();
-               this.update();
-               this.fire('add');
+/*
+ * @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 (map.options.zoomAnimation && map.options.markerZoomAnimation) {
-                       map.on('zoomanim', this._animateZoom, this);
-               }
-       },
+var EPSG4326 = extend({}, Earth, {
+       code: 'EPSG:4326',
+       projection: LonLat,
+       transformation: toTransformation(1 / 180, 1, -1 / 180, 0.5)
+});
 
 
-       addTo: function (map) {
-               map.addLayer(this);
-               return this;
-       },
+/*
+ * @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.
+ */
 
 
-       onRemove: function (map) {
-               if (this.dragging) {
-                       this.dragging.disable();
-               }
+var Simple = extend({}, CRS, {
+       projection: LonLat,
+       transformation: toTransformation(1, 0, -1, 0),
 
 
-               this._removeIcon();
-               this._removeShadow();
+       scale: function (zoom) {
+               return Math.pow(2, zoom);
+       },
 
 
-               this.fire('remove');
+       zoom: function (scale) {
+               return Math.log(scale) / Math.LN2;
+       },
 
 
-               map.off({
-                       'viewreset': this.update,
-                       'zoomanim': this._animateZoom
-               }, this);
+       distance: function (latlng1, latlng2) {
+               var dx = latlng2.lng - latlng1.lng,
+                   dy = latlng2.lat - latlng1.lat;
 
 
-               this._map = null;
+               return Math.sqrt(dx * dx + dy * dy);
        },
 
        },
 
-       getLatLng: function () {
-               return this._latlng;
-       },
+       infinite: true
+});
 
 
-       setLatLng: function (latlng) {
-               this._latlng = L.latLng(latlng);
+CRS.Earth = Earth;
+CRS.EPSG3395 = EPSG3395;
+CRS.EPSG3857 = EPSG3857;
+CRS.EPSG900913 = EPSG900913;
+CRS.EPSG4326 = EPSG4326;
+CRS.Simple = Simple;
 
 
-               this.update();
+/*
+ * @class Layer
+ * @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`.
+ *
+ * @example
+ *
+ * ```js
+ * var layer = L.marker(latlng).addTo(map);
+ * layer.addTo(map);
+ * layer.remove();
+ * ```
+ *
+ * @event add: Event
+ * Fired after the layer is added to a map
+ *
+ * @event remove: Event
+ * Fired after the layer is removed from a map
+ */
 
 
-               return this.fire('move', { latlng: this._latlng });
-       },
 
 
-       setZIndexOffset: function (offset) {
-               this.options.zIndexOffset = offset;
-               this.update();
+var Layer = 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',
+
+               // @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,
 
 
-               return this;
+               bubblingMouseEvents: true
        },
 
        },
 
-       setIcon: function (icon) {
+       /* @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;
+       },
 
 
-               this.options.icon = icon;
+       // @method remove: this
+       // Removes the layer from the map it is currently active on.
+       remove: function () {
+               return this.removeFrom(this._map || this._mapToAdd);
+       },
 
 
-               if (this._map) {
-                       this._initIcon();
-                       this.update();
+       // @method removeFrom(map: Map): this
+       // Removes the layer from the given map
+       removeFrom: function (obj) {
+               if (obj) {
+                       obj.removeLayer(this);
                }
                }
+               return this;
+       },
 
 
-               if (this._popup) {
-                       this.bindPopup(this._popup);
-               }
+       // @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);
+       },
 
 
+       addInteractiveTarget: function (targetEl) {
+               this._map._targets[stamp(targetEl)] = this;
                return this;
        },
 
                return this;
        },
 
-       update: function () {
-               if (this._icon) {
-                       var pos = this._map.latLngToLayerPoint(this._latlng).round();
-                       this._setPos(pos);
-               }
-
+       removeInteractiveTarget: function (targetEl) {
+               delete this._map._targets[stamp(targetEl)];
                return this;
        },
 
                return this;
        },
 
-       _initIcon: function () {
-               var options = this.options,
-                   map = this._map,
-                   animation = (map.options.zoomAnimation && map.options.markerZoomAnimation),
-                   classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide';
+       // @method getAttribution: String
+       // Used by the `attribution control`, returns the [attribution option](#gridlayer-attribution).
+       getAttribution: function () {
+               return this.options.attribution;
+       },
 
 
-               var icon = options.icon.createIcon(this._icon),
-                       addIcon = false;
+       _layerAdd: function (e) {
+               var map = e.target;
 
 
-               // 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;
+               // check in case layer gets added and then removed before the map is ready
+               if (!map.hasLayer(this)) { return; }
 
 
-                       if (options.title) {
-                               icon.title = options.title;
-                       }
-                       
-                       if (options.alt) {
-                               icon.alt = options.alt;
-                       }
+               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);
                }
 
                }
 
-               L.DomUtil.addClass(icon, classToAdd);
+               this.onAdd(map);
 
 
-               if (options.keyboard) {
-                       icon.tabIndex = '0';
+               if (this.getAttribution && map.attributionControl) {
+                       map.attributionControl.addAttribution(this.getAttribution());
                }
 
                }
 
-               this._icon = icon;
+               this.fire('add');
+               map.fire('layeradd', {layer: this});
+       }
+});
 
 
-               this._initInteraction();
+/* @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.
+ */
 
 
-               if (options.riseOnHover) {
-                       L.DomEvent
-                               .on(icon, 'mouseover', this._bringToFront, this)
-                               .on(icon, 'mouseout', this._resetZIndex, this);
+
+/* @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.');
                }
 
                }
 
-               var newShadow = options.icon.createShadow(this._shadow),
-                       addShadow = false;
+               var id = stamp(layer);
+               if (this._layers[id]) { return this; }
+               this._layers[id] = layer;
 
 
-               if (newShadow !== this._shadow) {
-                       this._removeShadow();
-                       addShadow = true;
-               }
+               layer._mapToAdd = this;
 
 
-               if (newShadow) {
-                       L.DomUtil.addClass(newShadow, classToAdd);
+               if (layer.beforeAdd) {
+                       layer.beforeAdd(this);
                }
                }
-               this._shadow = newShadow;
 
 
+               this.whenReady(layer._layerAdd, layer);
 
 
-               if (options.opacity < 1) {
-                       this._updateOpacity();
-               }
+               return this;
+       },
 
 
+       // @method removeLayer(layer: Layer): this
+       // Removes the given layer from the map.
+       removeLayer: function (layer) {
+               var id = stamp(layer);
 
 
-               var panes = this._map._panes;
+               if (!this._layers[id]) { return this; }
 
 
-               if (addIcon) {
-                       panes.markerPane.appendChild(this._icon);
+               if (this._loaded) {
+                       layer.onRemove(this);
                }
 
                }
 
-               if (newShadow && addShadow) {
-                       panes.shadowPane.appendChild(this._shadow);
+               if (layer.getAttribution && this.attributionControl) {
+                       this.attributionControl.removeAttribution(layer.getAttribution());
                }
                }
-       },
 
 
-       _removeIcon: function () {
-               if (this.options.riseOnHover) {
-                       L.DomEvent
-                           .off(this._icon, 'mouseover', this._bringToFront)
-                           .off(this._icon, 'mouseout', this._resetZIndex);
+               delete this._layers[id];
+
+               if (this._loaded) {
+                       this.fire('layerremove', {layer: layer});
+                       layer.fire('remove');
                }
 
                }
 
-               this._map._panes.markerPane.removeChild(this._icon);
+               layer._map = layer._mapToAdd = null;
 
 
-               this._icon = null;
+               return this;
        },
 
        },
 
-       _removeShadow: function () {
-               if (this._shadow) {
-                       this._map._panes.shadowPane.removeChild(this._shadow);
-               }
-               this._shadow = null;
+       // @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);
        },
 
        },
 
-       _setPos: function (pos) {
-               L.DomUtil.setPosition(this._icon, pos);
-
-               if (this._shadow) {
-                       L.DomUtil.setPosition(this._shadow, pos);
+       /* @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;
+       },
 
 
-               this._zIndex = pos.y + this.options.zIndexOffset;
+       _addLayers: function (layers) {
+               layers = layers ? (isArray(layers) ? layers : [layers]) : [];
 
 
-               this._resetZIndex();
+               for (var i = 0, len = layers.length; i < len; i++) {
+                       this.addLayer(layers[i]);
+               }
        },
 
        },
 
-       _updateZIndex: function (offset) {
-               this._icon.style.zIndex = this._zIndex + offset;
+       _addZoomLimit: function (layer) {
+               if (isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom)) {
+                       this._zoomBoundLayers[stamp(layer)] = layer;
+                       this._updateZoomLevels();
+               }
        },
 
        },
 
-       _animateZoom: function (opt) {
-               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round();
+       _removeZoomLimit: function (layer) {
+               var id = stamp(layer);
 
 
-               this._setPos(pos);
+               if (this._zoomBoundLayers[id]) {
+                       delete this._zoomBoundLayers[id];
+                       this._updateZoomLevels();
+               }
        },
 
        },
 
-       _initInteraction: function () {
+       _updateZoomLevels: function () {
+               var minZoom = Infinity,
+                   maxZoom = -Infinity,
+                   oldZoomSpan = this._getZoomSpan();
 
 
-               if (!this.options.clickable) { return; }
+               for (var i in this._zoomBoundLayers) {
+                       var options = this._zoomBoundLayers[i].options;
 
 
-               // TODO refactor into something shared with Map/Path/etc. to DRY it up
+                       minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom);
+                       maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom);
+               }
 
 
-               var icon = this._icon,
-                   events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'contextmenu'];
+               this._layersMaxZoom = maxZoom === -Infinity ? undefined : maxZoom;
+               this._layersMinZoom = minZoom === Infinity ? undefined : minZoom;
 
 
-               L.DomUtil.addClass(icon, 'leaflet-clickable');
-               L.DomEvent.on(icon, 'click', this._onMouseClick, this);
-               L.DomEvent.on(icon, 'keypress', this._onKeyPress, this);
+               // @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');
+               }
 
 
-               for (var i = 0; i < events.length; i++) {
-                       L.DomEvent.on(icon, events[i], this._fireMouseEvent, this);
+               if (this.options.maxZoom === undefined && this._layersMaxZoom && this.getZoom() > this._layersMaxZoom) {
+                       this.setZoom(this._layersMaxZoom);
                }
                }
+               if (this.options.minZoom === undefined && this._layersMinZoom && this.getZoom() < this._layersMinZoom) {
+                       this.setZoom(this._layersMinZoom);
+               }
+       }
+});
+
+/*
+ * @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`.
+ *
+ * @example
+ *
+ * ```js
+ * L.layerGroup([marker1, marker2])
+ *     .addLayer(polyline)
+ *     .addTo(map);
+ * ```
+ */
 
 
-               if (L.Handler.MarkerDrag) {
-                       this.dragging = new L.Handler.MarkerDrag(this);
+var LayerGroup = Layer.extend({
 
 
-                       if (this.options.draggable) {
-                               this.dragging.enable();
+       initialize: function (layers, options) {
+               setOptions(this, options);
+
+               this._layers = {};
+
+               var i, len;
+
+               if (layers) {
+                       for (i = 0, len = layers.length; i < len; i++) {
+                               this.addLayer(layers[i]);
                        }
                }
        },
 
                        }
                }
        },
 
-       _onMouseClick: function (e) {
-               var wasDragged = this.dragging && this.dragging.moved();
+       // @method addLayer(layer: Layer): this
+       // Adds the given layer to the group.
+       addLayer: function (layer) {
+               var id = this.getLayerId(layer);
+
+               this._layers[id] = layer;
 
 
-               if (this.hasEventListeners(e.type) || wasDragged) {
-                       L.DomEvent.stopPropagation(e);
+               if (this._map) {
+                       this._map.addLayer(layer);
                }
 
                }
 
-               if (wasDragged) { return; }
+               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);
+
+               if (this._map && this._layers[id]) {
+                       this._map.removeLayer(this._layers[id]);
+               }
 
 
-               if ((!this.dragging || !this.dragging._enabled) && this._map.dragging && this._map.dragging.moved()) { return; }
+               delete this._layers[id];
 
 
-               this.fire(e.type, {
-                       originalEvent: e,
-                       latlng: this._latlng
-               });
+               return this;
        },
 
        },
 
-       _onKeyPress: function (e) {
-               if (e.keyCode === 13) {
-                       this.fire('click', {
-                               originalEvent: e,
-                               latlng: this._latlng
-                       });
-               }
+       // @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);
        },
 
        },
 
-       _fireMouseEvent: function (e) {
+       // @method clearLayers(): this
+       // Removes all the layers from the group.
+       clearLayers: function () {
+               return this.eachLayer(this.removeLayer, this);
+       },
 
 
-               this.fire(e.type, {
-                       originalEvent: e,
-                       latlng: 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;
 
 
-               // TODO proper custom event propagation
-               // this line will always be called if marker is in a FeatureGroup
-               if (e.type === 'contextmenu' && this.hasEventListeners(e.type)) {
-                       L.DomEvent.preventDefault(e);
-               }
-               if (e.type !== 'mousedown') {
-                       L.DomEvent.stopPropagation(e);
-               } else {
-                       L.DomEvent.preventDefault(e);
-               }
-       },
+               for (i in this._layers) {
+                       layer = this._layers[i];
 
 
-       setOpacity: function (opacity) {
-               this.options.opacity = opacity;
-               if (this._map) {
-                       this._updateOpacity();
+                       if (layer[methodName]) {
+                               layer[methodName].apply(layer, args);
+                       }
                }
 
                return this;
        },
 
                }
 
                return this;
        },
 
-       _updateOpacity: function () {
-               L.DomUtil.setOpacity(this._icon, this.options.opacity);
-               if (this._shadow) {
-                       L.DomUtil.setOpacity(this._shadow, this.options.opacity);
+       onAdd: function (map) {
+               this.eachLayer(map.addLayer, map);
+       },
+
+       onRemove: function (map) {
+               this.eachLayer(map.removeLayer, map);
+       },
+
+       // @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;
        },
 
        },
 
-       _bringToFront: function () {
-               this._updateZIndex(this.options.riseOffset);
+       // @method getLayer(id: Number): Layer
+       // Returns the layer with the given internal ID.
+       getLayer: function (id) {
+               return this._layers[id];
        },
 
        },
 
-       _resetZIndex: function () {
-               this._updateZIndex(0);
+       // @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;
+       },
+
+       // @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);
+       },
+
+       // @method getLayerId(layer: Layer): Number
+       // Returns the internal ID for a layer
+       getLayerId: function (layer) {
+               return stamp(layer);
        }
 });
 
        }
 });
 
-L.marker = function (latlng, options) {
-       return new L.Marker(latlng, options);
-};
 
 
+// @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);
+};
 
 /*
 
 /*
- * L.DivIcon is a lightweight HTML-based icon class (as opposed to the image-based L.Icon)
- * to use with L.Marker.
+ * @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);
+ * ```
  */
 
  */
 
-L.DivIcon = L.Icon.extend({
-       options: {
-               iconSize: [12, 12], // also can be set through CSS
-               /*
-               iconAnchor: (Point)
-               popupAnchor: (Point)
-               html: (String)
-               bgPos: (Point)
-               */
-               className: 'leaflet-div-icon',
-               html: false
-       },
-
-       createIcon: function (oldIcon) {
-               var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
-                   options = this.options;
+var FeatureGroup = LayerGroup.extend({
 
 
-               if (options.html !== false) {
-                       div.innerHTML = options.html;
-               } else {
-                       div.innerHTML = '';
+       addLayer: function (layer) {
+               if (this.hasLayer(layer)) {
+                       return this;
                }
 
                }
 
-               if (options.bgPos) {
-                       div.style.backgroundPosition =
-                               (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
+               layer.addEventParent(this);
+
+               LayerGroup.prototype.addLayer.call(this, layer);
+
+               // @event layeradd: LayerEvent
+               // Fired when a layer is added to this `FeatureGroup`
+               return this.fire('layeradd', {layer: layer});
+       },
+
+       removeLayer: function (layer) {
+               if (!this.hasLayer(layer)) {
+                       return this;
+               }
+               if (layer in this._layers) {
+                       layer = this._layers[layer];
                }
 
                }
 
-               this._setIconStyles(div, 'icon');
-               return div;
+               layer.removeEventParent(this);
+
+               LayerGroup.prototype.removeLayer.call(this, layer);
+
+               // @event layerremove: LayerEvent
+               // Fired when a layer is removed from this `FeatureGroup`
+               return this.fire('layerremove', {layer: layer});
        },
 
        },
 
-       createShadow: function () {
-               return null;
+       // @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');
+       },
+
+       // @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;
        }
 });
 
        }
 });
 
-L.divIcon = function (options) {
-       return new L.DivIcon(options);
+// @factory L.featureGroup(layers: Layer[])
+// Create a feature group, optionally given an initial set of layers.
+var featureGroup = function (layers) {
+       return new FeatureGroup(layers);
 };
 
 };
 
-
 /*
 /*
- * L.Popup is used for displaying popups on the map.
+ * @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.
+ *
  */
 
  */
 
-L.Map.mergeOptions({
-       closePopupOnClick: true
-});
-
-L.Popup = L.Class.extend({
-       includes: L.Mixin.Events,
+var Icon = Class.extend({
+
+       /* @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.
+        */
 
        options: {
 
        options: {
-               minWidth: 50,
-               maxWidth: 300,
-               // maxHeight: null,
-               autoPan: true,
-               closeButton: true,
-               offset: [0, 7],
-               autoPanPadding: [5, 5],
-               // autoPanPaddingTopLeft: null,
-               // autoPanPaddingBottomRight: null,
-               keepInView: false,
-               className: '',
-               zoomAnimation: true
+               popupAnchor: [0, 0],
+               tooltipAnchor: [0, 0]
        },
 
        },
 
-       initialize: function (options, source) {
-               L.setOptions(this, options);
-
-               this._source = source;
-               this._animated = L.Browser.any3d && this.options.zoomAnimation;
-               this._isOpen = false;
+       initialize: function (options) {
+               setOptions(this, options);
        },
 
        },
 
-       onAdd: function (map) {
-               this._map = map;
+       // @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);
+       },
 
 
-               if (!this._container) {
-                       this._initLayout();
-               }
+       // @method createShadow(oldIcon?: HTMLElement): HTMLElement
+       // As `createIcon`, but for the shadow beneath it.
+       createShadow: function (oldIcon) {
+               return this._createIcon('shadow', oldIcon);
+       },
 
 
-               var animFade = map.options.fadeAnimation;
+       _createIcon: function (name, oldIcon) {
+               var src = this._getIconUrl(name);
 
 
-               if (animFade) {
-                       L.DomUtil.setOpacity(this._container, 0);
+               if (!src) {
+                       if (name === 'icon') {
+                               throw new Error('iconUrl not set in Icon options (see the docs).');
+                       }
+                       return null;
                }
                }
-               map._panes.popupPane.appendChild(this._container);
 
 
-               map.on(this._getEvents(), this);
+               var img = this._createImg(src, oldIcon && oldIcon.tagName === 'IMG' ? oldIcon : null);
+               this._setIconStyles(img, name);
+
+               return img;
+       },
 
 
-               this.update();
+       _setIconStyles: function (img, name) {
+               var options = this.options;
+               var sizeOption = options[name + 'Size'];
 
 
-               if (animFade) {
-                       L.DomUtil.setOpacity(this._container, 1);
+               if (typeof sizeOption === 'number') {
+                       sizeOption = [sizeOption, sizeOption];
                }
 
                }
 
-               this.fire('open');
+               var size = toPoint(sizeOption),
+                   anchor = toPoint(name === 'shadow' && options.shadowAnchor || options.iconAnchor ||
+                           size && size.divideBy(2, true));
 
 
-               map.fire('popupopen', {popup: this});
+               img.className = 'leaflet-marker-' + name + ' ' + (options.className || '');
 
 
-               if (this._source) {
-                       this._source.fire('popupopen', {popup: this});
+               if (anchor) {
+                       img.style.marginLeft = (-anchor.x) + 'px';
+                       img.style.marginTop  = (-anchor.y) + 'px';
                }
                }
-       },
 
 
-       addTo: function (map) {
-               map.addLayer(this);
-               return this;
+               if (size) {
+                       img.style.width  = size.x + 'px';
+                       img.style.height = size.y + 'px';
+               }
        },
 
        },
 
-       openOn: function (map) {
-               map.openPopup(this);
-               return this;
+       _createImg: function (src, el) {
+               el = el || document.createElement('img');
+               el.src = src;
+               return el;
        },
 
        },
 
-       onRemove: function (map) {
-               map._panes.popupPane.removeChild(this._container);
-
-               L.Util.falseFn(this._container.offsetWidth); // force reflow
+       _getIconUrl: function (name) {
+               return retina && this.options[name + 'RetinaUrl'] || this.options[name + 'Url'];
+       }
+});
 
 
-               map.off(this._getEvents(), this);
 
 
-               if (map.options.fadeAnimation) {
-                       L.DomUtil.setOpacity(this._container, 0);
-               }
+// @factory L.icon(options: Icon options)
+// Creates an icon instance with the given options.
+function icon(options) {
+       return new Icon(options);
+}
 
 
-               this._map = null;
+/*
+ * @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.
+ */
 
 
-               this.fire('close');
+var IconDefault = Icon.extend({
 
 
-               map.fire('popupclose', {popup: 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]
+       },
 
 
-               if (this._source) {
-                       this._source.fire('popupclose', {popup: this});
+       _getIconUrl: function (name) {
+               if (!IconDefault.imagePath) {   // Deprecated, backwards-compatibility only
+                       IconDefault.imagePath = this._detectIconPath();
                }
                }
-       },
 
 
-       getLatLng: function () {
-               return this._latlng;
+               // @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);
        },
 
        },
 
-       setLatLng: function (latlng) {
-               this._latlng = L.latLng(latlng);
-               if (this._map) {
-                       this._updatePosition();
-                       this._adjustPan();
-               }
-               return this;
-       },
+       _detectIconPath: function () {
+               var el = create$1('div',  'leaflet-default-icon-path', document.body);
+               var path = getStyle(el, 'background-image') ||
+                          getStyle(el, 'backgroundImage');     // IE8
 
 
-       getContent: function () {
-               return this._content;
-       },
+               document.body.removeChild(el);
 
 
-       setContent: function (content) {
-               this._content = content;
-               this.update();
-               return this;
-       },
+               if (path === null || path.indexOf('url') !== 0) {
+                       path = '';
+               } else {
+                       path = path.replace(/^url\(["']?/, '').replace(/marker-icon\.png["']?\)$/, '');
+               }
 
 
-       update: function () {
-               if (!this._map) { return; }
+               return path;
+       }
+});
 
 
-               this._container.style.visibility = 'hidden';
+/*
+ * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
+ */
 
 
-               this._updateContent();
-               this._updateLayout();
-               this._updatePosition();
 
 
-               this._container.style.visibility = '';
+/* @namespace Marker
+ * @section Interaction handlers
+ *
+ * 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
+ * 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)).
+ */
 
 
-               this._adjustPan();
+var MarkerDrag = Handler.extend({
+       initialize: function (marker) {
+               this._marker = marker;
        },
 
        },
 
-       _getEvents: function () {
-               var events = {
-                       viewreset: this._updatePosition
-               };
+       addHooks: function () {
+               var icon = this._marker._icon;
 
 
-               if (this._animated) {
-                       events.zoomanim = this._zoomAnimation;
-               }
-               if ('closeOnClick' in this.options ? this.options.closeOnClick : this._map.options.closePopupOnClick) {
-                       events.preclick = this._close;
-               }
-               if (this.options.keepInView) {
-                       events.moveend = this._adjustPan;
+               if (!this._draggable) {
+                       this._draggable = new Draggable(icon, icon, true);
                }
 
                }
 
-               return events;
+               this._draggable.on({
+                       dragstart: this._onDragStart,
+                       predrag: this._onPreDrag,
+                       drag: this._onDrag,
+                       dragend: this._onDragEnd
+               }, this).enable();
+
+               addClass(icon, 'leaflet-marker-draggable');
        },
 
        },
 
-       _close: function () {
-               if (this._map) {
-                       this._map.closePopup(this);
+       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');
                }
        },
 
                }
        },
 
-       _initLayout: function () {
-               var prefix = 'leaflet-popup',
-                       containerClass = prefix + ' ' + this.options.className + ' leaflet-zoom-' +
-                               (this._animated ? 'animated' : 'hide'),
-                       container = this._container = L.DomUtil.create('div', containerClass),
-                       closeButton;
+       moved: function () {
+               return this._draggable && this._draggable._moved;
+       },
 
 
-               if (this.options.closeButton) {
-                       closeButton = this._closeButton =
-                               L.DomUtil.create('a', prefix + '-close-button', container);
-                       closeButton.href = '#close';
-                       closeButton.innerHTML = '&#215;';
-                       L.DomEvent.disableClickPropagation(closeButton);
+       _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();
 
 
-                       L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
-               }
+               var panBounds = toBounds(
+                       bounds.min._subtract(origin).add(padding),
+                       bounds.max._subtract(origin).subtract(padding)
+               );
 
 
-               var wrapper = this._wrapper =
-                       L.DomUtil.create('div', prefix + '-content-wrapper', container);
-               L.DomEvent.disableClickPropagation(wrapper);
+               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),
 
 
-               this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
+                               (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);
 
 
-               L.DomEvent.disableScrollPropagation(this._contentNode);
-               L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
+                       map.panBy(movement, {animate: false});
 
 
-               this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
-               this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
-       },
+                       this._draggable._newPos._add(movement);
+                       this._draggable._startPos._add(movement);
 
 
-       _updateContent: function () {
-               if (!this._content) { return; }
+                       setPosition(marker._icon, this._draggable._newPos);
+                       this._onDrag(e);
 
 
-               if (typeof this._content === 'string') {
-                       this._contentNode.innerHTML = this._content;
-               } else {
-                       while (this._contentNode.hasChildNodes()) {
-                               this._contentNode.removeChild(this._contentNode.firstChild);
-                       }
-                       this._contentNode.appendChild(this._content);
+                       this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e));
                }
                }
-               this.fire('contentupdate');
        },
 
        },
 
-       _updateLayout: function () {
-               var container = this._contentNode,
-                   style = container.style;
-
-               style.width = '';
-               style.whiteSpace = 'nowrap';
-
-               var width = container.offsetWidth;
-               width = Math.min(width, this.options.maxWidth);
-               width = Math.max(width, this.options.minWidth);
-
-               style.width = (width + 1) + 'px';
-               style.whiteSpace = '';
+       _onDragStart: function () {
+               // @section Dragging events
+               // @event dragstart: Event
+               // Fired when the user starts dragging the marker.
 
 
-               style.height = '';
+               // @event movestart: Event
+               // Fired when the marker starts moving (because of dragging).
 
 
-               var height = container.offsetHeight,
-                   maxHeight = this.options.maxHeight,
-                   scrolledClass = 'leaflet-popup-scrolled';
+               this._oldLatLng = this._marker.getLatLng();
+               this._marker
+                   .closePopup()
+                   .fire('movestart')
+                   .fire('dragstart');
+       },
 
 
-               if (maxHeight && height > maxHeight) {
-                       style.height = maxHeight + 'px';
-                       L.DomUtil.addClass(container, scrolledClass);
-               } else {
-                       L.DomUtil.removeClass(container, scrolledClass);
+       _onPreDrag: function (e) {
+               if (this._marker.options.autoPan) {
+                       cancelAnimFrame(this._panRequest);
+                       this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e));
                }
                }
-
-               this._containerWidth = this._container.offsetWidth;
        },
 
        },
 
-       _updatePosition: function () {
-               if (!this._map) { return; }
-
-               var pos = this._map.latLngToLayerPoint(this._latlng),
-                   animated = this._animated,
-                   offset = L.point(this.options.offset);
+       _onDrag: function (e) {
+               var marker = this._marker,
+                   shadow = marker._shadow,
+                   iconPos = getPosition(marker._icon),
+                   latlng = marker._map.layerPointToLatLng(iconPos);
 
 
-               if (animated) {
-                       L.DomUtil.setPosition(this._container, pos);
+               // update shadow position
+               if (shadow) {
+                       setPosition(shadow, iconPos);
                }
 
                }
 
-               this._containerBottom = -offset.y - (animated ? 0 : pos.y);
-               this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (animated ? 0 : pos.x);
+               marker._latlng = latlng;
+               e.latlng = latlng;
+               e.oldLatLng = this._oldLatLng;
 
 
-               // bottom position the popup in case the height of the popup changes (images loading etc)
-               this._container.style.bottom = this._containerBottom + 'px';
-               this._container.style.left = this._containerLeft + 'px';
+               // @event drag: Event
+               // Fired repeatedly while the user drags the marker.
+               marker
+                   .fire('move', e)
+                   .fire('drag', e);
        },
 
        },
 
-       _zoomAnimation: function (opt) {
-               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);
-
-               L.DomUtil.setPosition(this._container, pos);
-       },
+       _onDragEnd: function (e) {
+               // @event dragend: DragEndEvent
+               // Fired when the user stops dragging the marker.
 
 
-       _adjustPan: function () {
-               if (!this.options.autoPan) { return; }
+                cancelAnimFrame(this._panRequest);
 
 
-               var map = this._map,
-                   containerHeight = this._container.offsetHeight,
-                   containerWidth = this._containerWidth,
+               // @event moveend: Event
+               // Fired when the marker stops moving (because of dragging).
+               delete this._oldLatLng;
+               this._marker
+                   .fire('moveend')
+                   .fire('dragend', e);
+       }
+});
 
 
-                   layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);
+/*
+ * @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.marker([50.5, 30.5]).addTo(map);
+ * ```
+ */
 
 
-               if (this._animated) {
-                       layerPos._add(L.DomUtil.getPosition(this._container));
-               }
+var Marker = Layer.extend({
 
 
-               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;
+       // @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(),
 
 
-               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;
-               }
+               // Option inherited from "Interactive layer" abstract class
+               interactive: true,
 
 
-               if (dx || dy) {
-                       map
-                           .fire('autopanstart')
-                           .panBy([dx, dy]);
-               }
-       },
+               // @option keyboard: Boolean = true
+               // Whether the marker can be tabbed to with a keyboard and clicked by pressing enter.
+               keyboard: true,
 
 
-       _onCloseButtonClick: function (e) {
-               this._close();
-               L.DomEvent.stop(e);
-       }
-});
+               // @option title: String = ''
+               // Text for the browser tooltip that appear on marker hover (no tooltip by default).
+               title: '',
 
 
-L.popup = function (options, source) {
-       return new L.Popup(options, source);
-};
+               // @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,
 
 
-L.Map.include({
-       openPopup: function (popup, latlng, options) { // (Popup) or (String || HTMLElement, LatLng[, Object])
-               this.closePopup();
+               // @option opacity: Number = 1.0
+               // The opacity of the marker.
+               opacity: 1,
 
 
-               if (!(popup instanceof L.Popup)) {
-                       var content = popup;
+               // @option riseOnHover: Boolean = false
+               // If `true`, the marker will get on top of others when you hover the mouse over it.
+               riseOnHover: false,
 
 
-                       popup = new L.Popup(options)
-                           .setLatLng(latlng)
-                           .setContent(content);
-               }
-               popup._isOpen = true;
+               // @option riseOffset: Number = 250
+               // The z-index offset used for the `riseOnHover` feature.
+               riseOffset: 250,
 
 
-               this._popup = popup;
-               return this.addLayer(popup);
-       },
+               // @option pane: String = 'markerPane'
+               // `Map pane` where the markers icon will be added.
+               pane: 'markerPane',
 
 
-       closePopup: function (popup) {
-               if (!popup || popup === this._popup) {
-                       popup = this._popup;
-                       this._popup = null;
-               }
-               if (popup) {
-                       this.removeLayer(popup);
-                       popup._isOpen = false;
-               }
-               return this;
-       }
-});
+               // @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,
 
 
-/*
- * Popup extension to L.Marker, adding popup-related methods.
- */
+               // @section Draggable marker options
+               // @option draggable: Boolean = false
+               // Whether the marker is draggable with mouse/touch or not.
+               draggable: false,
 
 
-L.Marker.include({
-       openPopup: function () {
-               if (this._popup && this._map && !this._map.hasLayer(this._popup)) {
-                       this._popup.setLatLng(this._latlng);
-                       this._map.openPopup(this._popup);
-               }
+               // @option autoPan: Boolean = false
+               // Whether to pan the map when dragging this marker near its edge or not.
+               autoPan: false,
 
 
-               return this;
-       },
+               // @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],
 
 
-       closePopup: function () {
-               if (this._popup) {
-                       this._popup._close();
-               }
-               return this;
+               // @option autoPanSpeed: Number = 10
+               // Number of pixels the map should pan by.
+               autoPanSpeed: 10
        },
 
        },
 
-       togglePopup: function () {
-               if (this._popup) {
-                       if (this._popup._isOpen) {
-                               this.closePopup();
-                       } else {
-                               this.openPopup();
-                       }
-               }
-               return this;
-       },
+       /* @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:
+        */
 
 
-       bindPopup: function (content, options) {
-               var anchor = L.point(this.options.icon.options.popupAnchor || [0, 0]);
+       initialize: function (latlng, options) {
+               setOptions(this, options);
+               this._latlng = toLatLng(latlng);
+       },
 
 
-               anchor = anchor.add(L.Popup.prototype.options.offset);
+       onAdd: function (map) {
+               this._zoomAnimated = this._zoomAnimated && map.options.markerZoomAnimation;
 
 
-               if (options && options.offset) {
-                       anchor = anchor.add(options.offset);
+               if (this._zoomAnimated) {
+                       map.on('zoomanim', this._animateZoom, this);
                }
 
                }
 
-               options = L.extend({offset: anchor}, options);
+               this._initIcon();
+               this.update();
+       },
 
 
-               if (!this._popupHandlersAdded) {
-                       this
-                           .on('click', this.togglePopup, this)
-                           .on('remove', this.closePopup, this)
-                           .on('move', this._movePopup, this);
-                       this._popupHandlersAdded = true;
+       onRemove: function (map) {
+               if (this.dragging && this.dragging.enabled()) {
+                       this.options.draggable = true;
+                       this.dragging.removeHooks();
                }
                }
+               delete this.dragging;
 
 
-               if (content instanceof L.Popup) {
-                       L.setOptions(content, options);
-                       this._popup = content;
-               } else {
-                       this._popup = new L.Popup(options, this)
-                               .setContent(content);
+               if (this._zoomAnimated) {
+                       map.off('zoomanim', this._animateZoom, this);
                }
 
                }
 
-               return this;
-       },
-
-       setPopupContent: function (content) {
-               if (this._popup) {
-                       this._popup.setContent(content);
-               }
-               return this;
+               this._removeIcon();
+               this._removeShadow();
        },
 
        },
 
-       unbindPopup: function () {
-               if (this._popup) {
-                       this._popup = null;
-                       this
-                           .off('click', this.togglePopup, this)
-                           .off('remove', this.closePopup, this)
-                           .off('move', this._movePopup, this);
-                       this._popupHandlersAdded = false;
-               }
-               return this;
+       getEvents: function () {
+               return {
+                       zoom: this.update,
+                       viewreset: this.update
+               };
        },
 
        },
 
-       getPopup: function () {
-               return this._popup;
+       // @method getLatLng: LatLng
+       // Returns the current geographical position of the marker.
+       getLatLng: function () {
+               return this._latlng;
        },
 
        },
 
-       _movePopup: function (e) {
-               this._popup.setLatLng(e.latlng);
-       }
-});
-
-
-/*
- * L.LayerGroup is a class to combine several layers into one so that
- * you can manipulate the group (e.g. add/remove it) as one layer.
- */
+       // @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();
 
 
-L.LayerGroup = L.Class.extend({
-       initialize: function (layers) {
-               this._layers = {};
+               // @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});
+       },
 
 
-               var i, len;
+       // @method setZIndexOffset(offset: Number): this
+       // Changes the [zIndex offset](#marker-zindexoffset) of the marker.
+       setZIndexOffset: function (offset) {
+               this.options.zIndexOffset = offset;
+               return this.update();
+       },
 
 
-               if (layers) {
-                       for (i = 0, len = layers.length; i < len; i++) {
-                               this.addLayer(layers[i]);
-                       }
-               }
+       // @method getIcon: Icon
+       // Returns the current icon used by the marker
+       getIcon: function () {
+               return this.options.icon;
        },
 
        },
 
-       addLayer: function (layer) {
-               var id = this.getLayerId(layer);
+       // @method setIcon(icon: Icon): this
+       // Changes the marker icon.
+       setIcon: function (icon) {
 
 
-               this._layers[id] = layer;
+               this.options.icon = icon;
 
                if (this._map) {
 
                if (this._map) {
-                       this._map.addLayer(layer);
+                       this._initIcon();
+                       this.update();
+               }
+
+               if (this._popup) {
+                       this.bindPopup(this._popup, this._popup.options);
                }
 
                return this;
        },
 
                }
 
                return this;
        },
 
-       removeLayer: function (layer) {
-               var id = layer in this._layers ? layer : this.getLayerId(layer);
+       getElement: function () {
+               return this._icon;
+       },
 
 
-               if (this._map && this._layers[id]) {
-                       this._map.removeLayer(this._layers[id]);
-               }
+       update: function () {
 
 
-               delete this._layers[id];
+               if (this._icon && this._map) {
+                       var pos = this._map.latLngToLayerPoint(this._latlng).round();
+                       this._setPos(pos);
+               }
 
                return this;
        },
 
 
                return this;
        },
 
-       hasLayer: function (layer) {
-               if (!layer) { return false; }
-
-               return (layer in this._layers || this.getLayerId(layer) in this._layers);
-       },
+       _initIcon: function () {
+               var options = this.options,
+                   classToAdd = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
 
 
-       clearLayers: function () {
-               this.eachLayer(this.removeLayer, this);
-               return this;
-       },
+               var icon = options.icon.createIcon(this._icon),
+                   addIcon = false;
 
 
-       invoke: function (methodName) {
-               var args = Array.prototype.slice.call(arguments, 1),
-                   i, layer;
+               // 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;
 
 
-               for (i in this._layers) {
-                       layer = this._layers[i];
+                       if (options.title) {
+                               icon.title = options.title;
+                       }
 
 
-                       if (layer[methodName]) {
-                               layer[methodName].apply(layer, args);
+                       if (icon.tagName === 'IMG') {
+                               icon.alt = options.alt || '';
                        }
                }
 
                        }
                }
 
-               return this;
-       },
-
-       onAdd: function (map) {
-               this._map = map;
-               this.eachLayer(map.addLayer, map);
-       },
+               addClass(icon, classToAdd);
 
 
-       onRemove: function (map) {
-               this.eachLayer(map.removeLayer, map);
-               this._map = null;
-       },
+               if (options.keyboard) {
+                       icon.tabIndex = '0';
+               }
 
 
-       addTo: function (map) {
-               map.addLayer(this);
-               return this;
-       },
+               this._icon = icon;
 
 
-       eachLayer: function (method, context) {
-               for (var i in this._layers) {
-                       method.call(context, this._layers[i]);
+               if (options.riseOnHover) {
+                       this.on({
+                               mouseover: this._bringToFront,
+                               mouseout: this._resetZIndex
+                       });
                }
                }
-               return this;
-       },
 
 
-       getLayer: function (id) {
-               return this._layers[id];
-       },
+               var newShadow = options.icon.createShadow(this._shadow),
+                   addShadow = false;
 
 
-       getLayers: function () {
-               var layers = [];
+               if (newShadow !== this._shadow) {
+                       this._removeShadow();
+                       addShadow = true;
+               }
 
 
-               for (var i in this._layers) {
-                       layers.push(this._layers[i]);
+               if (newShadow) {
+                       addClass(newShadow, classToAdd);
+                       newShadow.alt = '';
                }
                }
-               return layers;
-       },
+               this._shadow = newShadow;
 
 
-       setZIndex: function (zIndex) {
-               return this.invoke('setZIndex', zIndex);
-       },
 
 
-       getLayerId: function (layer) {
-               return L.stamp(layer);
-       }
-});
+               if (options.opacity < 1) {
+                       this._updateOpacity();
+               }
 
 
-L.layerGroup = function (layers) {
-       return new L.LayerGroup(layers);
-};
 
 
+               if (addIcon) {
+                       this.getPane().appendChild(this._icon);
+               }
+               this._initInteraction();
+               if (newShadow && addShadow) {
+                       this.getPane(options.shadowPane).appendChild(this._shadow);
+               }
+       },
 
 
-/*
- * L.FeatureGroup extends L.LayerGroup by introducing mouse events and additional methods
- * shared between a group of interactive layers (like vectors or markers).
- */
+       _removeIcon: function () {
+               if (this.options.riseOnHover) {
+                       this.off({
+                               mouseover: this._bringToFront,
+                               mouseout: this._resetZIndex
+                       });
+               }
 
 
-L.FeatureGroup = L.LayerGroup.extend({
-       includes: L.Mixin.Events,
+               remove(this._icon);
+               this.removeInteractiveTarget(this._icon);
 
 
-       statics: {
-               EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose'
+               this._icon = null;
        },
 
        },
 
-       addLayer: function (layer) {
-               if (this.hasLayer(layer)) {
-                       return this;
+       _removeShadow: function () {
+               if (this._shadow) {
+                       remove(this._shadow);
                }
                }
+               this._shadow = null;
+       },
+
+       _setPos: function (pos) {
+               setPosition(this._icon, pos);
 
 
-               if ('on' in layer) {
-                       layer.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+               if (this._shadow) {
+                       setPosition(this._shadow, pos);
                }
 
                }
 
-               L.LayerGroup.prototype.addLayer.call(this, layer);
+               this._zIndex = pos.y + this.options.zIndexOffset;
 
 
-               if (this._popupContent && layer.bindPopup) {
-                       layer.bindPopup(this._popupContent, this._popupOptions);
-               }
+               this._resetZIndex();
+       },
 
 
-               return this.fire('layeradd', {layer: layer});
+       _updateZIndex: function (offset) {
+               this._icon.style.zIndex = this._zIndex + offset;
        },
 
        },
 
-       removeLayer: function (layer) {
-               if (!this.hasLayer(layer)) {
-                       return this;
-               }
-               if (layer in this._layers) {
-                       layer = this._layers[layer];
-               }
+       _animateZoom: function (opt) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round();
+
+               this._setPos(pos);
+       },
 
 
-               layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+       _initInteraction: function () {
 
 
-               L.LayerGroup.prototype.removeLayer.call(this, layer);
+               if (!this.options.interactive) { return; }
 
 
-               if (this._popupContent) {
-                       this.invoke('unbindPopup');
-               }
+               addClass(this._icon, 'leaflet-interactive');
 
 
-               return this.fire('layerremove', {layer: layer});
-       },
+               this.addInteractiveTarget(this._icon);
 
 
-       bindPopup: function (content, options) {
-               this._popupContent = content;
-               this._popupOptions = options;
-               return this.invoke('bindPopup', content, options);
+               if (MarkerDrag) {
+                       var draggable = this.options.draggable;
+                       if (this.dragging) {
+                               draggable = this.dragging.enabled();
+                               this.dragging.disable();
+                       }
+
+                       this.dragging = new MarkerDrag(this);
+
+                       if (draggable) {
+                               this.dragging.enable();
+                       }
+               }
        },
 
        },
 
-       openPopup: function (latlng) {
-               // open popup on the first layer
-               for (var id in this._layers) {
-                       this._layers[id].openPopup(latlng);
-                       break;
+       // @method setOpacity(opacity: Number): this
+       // Changes the opacity of the marker.
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
+               if (this._map) {
+                       this._updateOpacity();
                }
                }
+
                return this;
        },
 
                return this;
        },
 
-       setStyle: function (style) {
-               return this.invoke('setStyle', style);
-       },
+       _updateOpacity: function () {
+               var opacity = this.options.opacity;
 
 
-       bringToFront: function () {
-               return this.invoke('bringToFront');
-       },
+               if (this._icon) {
+                       setOpacity(this._icon, opacity);
+               }
 
 
-       bringToBack: function () {
-               return this.invoke('bringToBack');
+               if (this._shadow) {
+                       setOpacity(this._shadow, opacity);
+               }
        },
 
        },
 
-       getBounds: function () {
-               var bounds = new L.LatLngBounds();
+       _bringToFront: function () {
+               this._updateZIndex(this.options.riseOffset);
+       },
 
 
-               this.eachLayer(function (layer) {
-                       bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds());
-               });
+       _resetZIndex: function () {
+               this._updateZIndex(0);
+       },
 
 
-               return bounds;
+       _getPopupAnchor: function () {
+               return this.options.icon.options.popupAnchor;
        },
 
        },
 
-       _propagateEvent: function (e) {
-               e = L.extend({}, e, {
-                       layer: e.target,
-                       target: this
-               });
-               this.fire(e.type, e);
+       _getTooltipAnchor: function () {
+               return this.options.icon.options.tooltipAnchor;
        }
 });
 
        }
 });
 
-L.featureGroup = function (layers) {
-       return new L.FeatureGroup(layers);
-};
 
 
+// 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);
+}
 
 /*
 
 /*
- * L.Path is a base class for rendering vector paths on a map. Inherited by Polyline, Circle, etc.
+ * @class Path
+ * @aka L.Path
+ * @inherits Interactive layer
+ *
+ * An abstract class that contains options and constants shared between vector
+ * overlays (Polygon, Polyline, Circle). Do not use it directly. Extends `Layer`.
  */
 
  */
 
-L.Path = L.Class.extend({
-       includes: [L.Mixin.Events],
-
-       statics: {
-               // how much to extend the clip area around the map view
-               // (relative to its size, e.g. 0.5 is half the screen in each direction)
-               // set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)
-               CLIP_PADDING: (function () {
-                       var max = L.Browser.mobile ? 1280 : 2000,
-                           target = (max / Math.max(window.outerWidth, window.outerHeight) - 1) / 2;
-                       return Math.max(0, Math.min(0.5, target));
-               })()
-       },
+var Path = Layer.extend({
 
 
+       // @section
+       // @aka Path options
        options: {
        options: {
+               // @option stroke: Boolean = true
+               // Whether to draw stroke along the path. Set it to `false` to disable borders on polygons or circles.
                stroke: true,
                stroke: true,
-               color: '#0033ff',
-               dashArray: null,
-               lineCap: null,
-               lineJoin: null,
-               weight: 5,
-               opacity: 0.5,
 
 
-               fill: false,
-               fillColor: null, //same as color by default
-               fillOpacity: 0.2,
+               // @option color: String = '#3388ff'
+               // Stroke color
+               color: '#3388ff',
 
 
-               clickable: true
-       },
+               // @option weight: Number = 3
+               // Stroke width in pixels
+               weight: 3,
 
 
-       initialize: function (options) {
-               L.setOptions(this, options);
-       },
+               // @option opacity: Number = 1.0
+               // Stroke opacity
+               opacity: 1,
 
 
-       onAdd: function (map) {
-               this._map = map;
+               // @option lineCap: String= 'round'
+               // A string that defines [shape to be used at the end](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linecap) of the stroke.
+               lineCap: 'round',
 
 
-               if (!this._container) {
-                       this._initElements();
-                       this._initEvents();
-               }
+               // @option lineJoin: String = 'round'
+               // A string that defines [shape to be used at the corners](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linejoin) of the stroke.
+               lineJoin: 'round',
 
 
-               this.projectLatlngs();
-               this._updatePath();
+               // @option dashArray: String = null
+               // A string that defines the stroke [dash pattern](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dasharray). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility).
+               dashArray: null,
 
 
-               if (this._container) {
-                       this._map._pathRoot.appendChild(this._container);
-               }
+               // @option dashOffset: String = null
+               // A string that defines the [distance into the dash pattern to start the dash](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dashoffset). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility).
+               dashOffset: null,
 
 
-               this.fire('add');
+               // @option fill: Boolean = depends
+               // Whether to fill the path with color. Set it to `false` to disable filling on polygons or circles.
+               fill: false,
 
 
-               map.on({
-                       'viewreset': this.projectLatlngs,
-                       'moveend': this._updatePath
-               }, this);
-       },
+               // @option fillColor: String = *
+               // Fill color. Defaults to the value of the [`color`](#path-color) option
+               fillColor: null,
 
 
-       addTo: function (map) {
-               map.addLayer(this);
-               return this;
-       },
+               // @option fillOpacity: Number = 0.2
+               // Fill opacity.
+               fillOpacity: 0.2,
 
 
-       onRemove: function (map) {
-               map._pathRoot.removeChild(this._container);
+               // @option fillRule: String = 'evenodd'
+               // A string that defines [how the inside of a shape](https://developer.mozilla.org/docs/Web/SVG/Attribute/fill-rule) is determined.
+               fillRule: 'evenodd',
 
 
-               // Need to fire remove event before we set _map to null as the event hooks might need the object
-               this.fire('remove');
-               this._map = null;
+               // className: '',
 
 
-               if (L.Browser.vml) {
-                       this._container = null;
-                       this._stroke = null;
-                       this._fill = null;
-               }
+               // Option inherited from "Interactive layer" abstract class
+               interactive: true,
 
 
-               map.off({
-                       'viewreset': this.projectLatlngs,
-                       'moveend': this._updatePath
-               }, this);
+               // @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
        },
 
        },
 
-       projectLatlngs: function () {
-               // do all projection stuff here
+       beforeAdd: function (map) {
+               // Renderer is set here because we need to call renderer.getEvents
+               // before this.getEvents.
+               this._renderer = map.getRenderer(this);
        },
 
        },
 
-       setStyle: function (style) {
-               L.setOptions(this, style);
-
-               if (this._container) {
-                       this._updateStyle();
-               }
+       onAdd: function () {
+               this._renderer._initPath(this);
+               this._reset();
+               this._renderer._addPath(this);
+       },
 
 
-               return this;
+       onRemove: function () {
+               this._renderer._removePath(this);
        },
 
        },
 
+       // @method redraw(): this
+       // Redraws the layer. Sometimes useful after you changed the coordinates that the path uses.
        redraw: function () {
                if (this._map) {
        redraw: function () {
                if (this._map) {
-                       this.projectLatlngs();
-                       this._updatePath();
+                       this._renderer._updatePath(this);
                }
                return this;
                }
                return this;
-       }
-});
-
-L.Map.include({
-       _updatePathViewport: function () {
-               var p = L.Path.CLIP_PADDING,
-                   size = this.getSize(),
-                   panePos = L.DomUtil.getPosition(this._mapPane),
-                   min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),
-                   max = min.add(size.multiplyBy(1 + p * 2)._round());
-
-               this._pathViewport = new L.Bounds(min, max);
-       }
-});
-
-
-/*
- * Extends L.Path with SVG-specific rendering code.
- */
-
-L.Path.SVG_NS = 'http://www.w3.org/2000/svg';
-
-L.Browser.svg = !!(document.createElementNS && document.createElementNS(L.Path.SVG_NS, 'svg').createSVGRect);
+       },
 
 
-L.Path = L.Path.extend({
-       statics: {
-               SVG: L.Browser.svg
+       // @method setStyle(style: Path options): this
+       // Changes the appearance of a Path based on the options in the `Path options` object.
+       setStyle: function (style) {
+               setOptions(this, style);
+               if (this._renderer) {
+                       this._renderer._updateStyle(this);
+                       if (this.options.stroke && style.hasOwnProperty('weight')) {
+                               this._updateBounds();
+                       }
+               }
+               return this;
        },
 
        },
 
+       // @method bringToFront(): this
+       // Brings the layer to the top of all path layers.
        bringToFront: function () {
        bringToFront: function () {
-               var root = this._map._pathRoot,
-                   path = this._container;
-
-               if (path && root.lastChild !== path) {
-                       root.appendChild(path);
+               if (this._renderer) {
+                       this._renderer._bringToFront(this);
                }
                return this;
        },
 
                }
                return this;
        },
 
+       // @method bringToBack(): this
+       // Brings the layer to the bottom of all path layers.
        bringToBack: function () {
        bringToBack: function () {
-               var root = this._map._pathRoot,
-                   path = this._container,
-                   first = root.firstChild;
-
-               if (path && first !== path) {
-                       root.insertBefore(path, first);
+               if (this._renderer) {
+                       this._renderer._bringToBack(this);
                }
                return this;
        },
 
                }
                return this;
        },
 
-       getPathString: function () {
-               // form path string here
+       getElement: function () {
+               return this._path;
        },
 
        },
 
-       _createElement: function (name) {
-               return document.createElementNS(L.Path.SVG_NS, name);
+       _reset: function () {
+               // defined in child classes
+               this._project();
+               this._update();
        },
 
        },
 
-       _initElements: function () {
-               this._map._initPathRoot();
-               this._initPath();
-               this._initStyle();
-       },
+       _clickTolerance: function () {
+               // used when doing hit detection for Canvas layers
+               return (this.options.stroke ? this.options.weight / 2 : 0) + this._renderer.options.tolerance;
+       }
+});
 
 
-       _initPath: function () {
-               this._container = this._createElement('g');
+/*
+ * @class CircleMarker
+ * @aka L.CircleMarker
+ * @inherits Path
+ *
+ * A circle of a fixed size with radius specified in pixels. Extends `Path`.
+ */
 
 
-               this._path = this._createElement('path');
+var CircleMarker = Path.extend({
 
 
-               if (this.options.className) {
-                       L.DomUtil.addClass(this._path, this.options.className);
-               }
+       // @section
+       // @aka CircleMarker options
+       options: {
+               fill: true,
 
 
-               this._container.appendChild(this._path);
+               // @option radius: Number = 10
+               // Radius of the circle marker, in pixels
+               radius: 10
        },
 
        },
 
-       _initStyle: function () {
-               if (this.options.stroke) {
-                       this._path.setAttribute('stroke-linejoin', 'round');
-                       this._path.setAttribute('stroke-linecap', 'round');
-               }
-               if (this.options.fill) {
-                       this._path.setAttribute('fill-rule', 'evenodd');
-               }
-               if (this.options.pointerEvents) {
-                       this._path.setAttribute('pointer-events', this.options.pointerEvents);
-               }
-               if (!this.options.clickable && !this.options.pointerEvents) {
-                       this._path.setAttribute('pointer-events', 'none');
-               }
-               this._updateStyle();
+       initialize: function (latlng, options) {
+               setOptions(this, options);
+               this._latlng = toLatLng(latlng);
+               this._radius = this.options.radius;
        },
 
        },
 
-       _updateStyle: function () {
-               if (this.options.stroke) {
-                       this._path.setAttribute('stroke', this.options.color);
-                       this._path.setAttribute('stroke-opacity', this.options.opacity);
-                       this._path.setAttribute('stroke-width', this.options.weight);
-                       if (this.options.dashArray) {
-                               this._path.setAttribute('stroke-dasharray', this.options.dashArray);
-                       } else {
-                               this._path.removeAttribute('stroke-dasharray');
-                       }
-                       if (this.options.lineCap) {
-                               this._path.setAttribute('stroke-linecap', this.options.lineCap);
-                       }
-                       if (this.options.lineJoin) {
-                               this._path.setAttribute('stroke-linejoin', this.options.lineJoin);
-                       }
-               } else {
-                       this._path.setAttribute('stroke', 'none');
-               }
-               if (this.options.fill) {
-                       this._path.setAttribute('fill', this.options.fillColor || this.options.color);
-                       this._path.setAttribute('fill-opacity', this.options.fillOpacity);
-               } else {
-                       this._path.setAttribute('fill', 'none');
-               }
+       // @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});
        },
 
        },
 
-       _updatePath: function () {
-               var str = this.getPathString();
-               if (!str) {
-                       // fix webkit empty string parsing bug
-                       str = 'M0 0';
-               }
-               this._path.setAttribute('d', str);
+       // @method getLatLng(): LatLng
+       // Returns the current geographical position of the circle marker
+       getLatLng: function () {
+               return this._latlng;
        },
 
        },
 
-       // TODO remove duplication with L.Map
-       _initEvents: function () {
-               if (this.options.clickable) {
-                       if (L.Browser.svg || !L.Browser.vml) {
-                               L.DomUtil.addClass(this._path, 'leaflet-clickable');
-                       }
+       // @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();
+       },
 
 
-                       L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
+       // @method getRadius(): Number
+       // Returns the current radius of the circle
+       getRadius: function () {
+               return this._radius;
+       },
 
 
-                       var events = ['dblclick', 'mousedown', 'mouseover',
-                                     'mouseout', 'mousemove', 'contextmenu'];
-                       for (var i = 0; i < events.length; i++) {
-                               L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
-                       }
-               }
+       setStyle : function (options) {
+               var radius = options && options.radius || this._radius;
+               Path.prototype.setStyle.call(this, options);
+               this.setRadius(radius);
+               return this;
        },
 
        },
 
-       _onMouseClick: function (e) {
-               if (this._map.dragging && this._map.dragging.moved()) { return; }
+       _project: function () {
+               this._point = this._map.latLngToLayerPoint(this._latlng);
+               this._updateBounds();
+       },
 
 
-               this._fireMouseEvent(e);
+       _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));
        },
 
        },
 
-       _fireMouseEvent: function (e) {
-               if (!this.hasEventListeners(e.type)) { return; }
+       _update: function () {
+               if (this._map) {
+                       this._updatePath();
+               }
+       },
 
 
-               var map = this._map,
-                   containerPoint = map.mouseEventToContainerPoint(e),
-                   layerPoint = map.containerPointToLayerPoint(containerPoint),
-                   latlng = map.layerPointToLatLng(layerPoint);
+       _updatePath: function () {
+               this._renderer._updateCircle(this);
+       },
 
 
-               this.fire(e.type, {
-                       latlng: latlng,
-                       layerPoint: layerPoint,
-                       containerPoint: containerPoint,
-                       originalEvent: e
-               });
+       _empty: function () {
+               return this._radius && !this._renderer._bounds.intersects(this._pxBounds);
+       },
 
 
-               if (e.type === 'contextmenu') {
-                       L.DomEvent.preventDefault(e);
-               }
-               if (e.type !== 'mousemove') {
-                       L.DomEvent.stopPropagation(e);
-               }
+       // Needed by the `Canvas` renderer for interactivity
+       _containsPoint: function (p) {
+               return p.distanceTo(this._point) <= this._radius + this._clickTolerance();
        }
 });
 
        }
 });
 
-L.Map.include({
-       _initPathRoot: function () {
-               if (!this._pathRoot) {
-                       this._pathRoot = L.Path.prototype._createElement('svg');
-                       this._panes.overlayPane.appendChild(this._pathRoot);
 
 
-                       if (this.options.zoomAnimation && L.Browser.any3d) {
-                               L.DomUtil.addClass(this._pathRoot, 'leaflet-zoom-animated');
+// @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);
+}
 
 
-                               this.on({
-                                       'zoomanim': this._animatePathZoom,
-                                       'zoomend': this._endPathZoom
-                               });
-                       } else {
-                               L.DomUtil.addClass(this._pathRoot, 'leaflet-zoom-hide');
-                       }
+/*
+ * @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);
+ * ```
+ */
 
 
-                       this.on('moveend', this._updateSvgViewport);
-                       this._updateSvgViewport();
+var Circle = CircleMarker.extend({
+
+       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);
 
 
-       _animatePathZoom: function (e) {
-               var scale = this.getZoomScale(e.zoom),
-                   offset = this._getCenterOffset(e.center)._multiplyBy(-scale)._add(this._pathViewport.min);
+               if (isNaN(this.options.radius)) { throw new Error('Circle radius cannot be NaN'); }
 
 
-               this._pathRoot.style[L.DomUtil.TRANSFORM] =
-                       L.DomUtil.getTranslateString(offset) + ' scale(' + scale + ') ';
+               // @section
+               // @aka Circle options
+               // @option radius: Number; Radius of the circle, in meters.
+               this._mRadius = this.options.radius;
+       },
 
 
-               this._pathZooming = true;
+       // @method setRadius(radius: Number): this
+       // Sets the radius of a circle. Units are in meters.
+       setRadius: function (radius) {
+               this._mRadius = radius;
+               return this.redraw();
        },
 
        },
 
-       _endPathZoom: function () {
-               this._pathZooming = false;
+       // @method getRadius(): Number
+       // Returns the current radius of a circle. Units are in meters.
+       getRadius: function () {
+               return this._mRadius;
        },
 
        },
 
-       _updateSvgViewport: function () {
+       // @method getBounds(): LatLngBounds
+       // Returns the `LatLngBounds` of the path.
+       getBounds: function () {
+               var half = [this._radius, this._radiusY || this._radius];
 
 
-               if (this._pathZooming) {
-                       // Do not update SVGs while a zoom animation is going on otherwise the animation will break.
-                       // When the zoom animation ends we will be updated again anyway
-                       // This fixes the case where you do a momentum move and zoom while the move is still ongoing.
-                       return;
-               }
+               return new LatLngBounds(
+                       this._map.layerPointToLatLng(this._point.subtract(half)),
+                       this._map.layerPointToLatLng(this._point.add(half)));
+       },
 
 
-               this._updatePathViewport();
+       setStyle: Path.prototype.setStyle,
 
 
-               var vp = this._pathViewport,
-                   min = vp.min,
-                   max = vp.max,
-                   width = max.x - min.x,
-                   height = max.y - min.y,
-                   root = this._pathRoot,
-                   pane = this._panes.overlayPane;
+       _project: function () {
 
 
-               // Hack to make flicker on drag end on mobile webkit less irritating
-               if (L.Browser.mobileWebkit) {
-                       pane.removeChild(root);
-               }
+               var lng = this._latlng.lng,
+                   lat = this._latlng.lat,
+                   map = this._map,
+                   crs = map.options.crs;
+
+               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;
+
+                       if (isNaN(lngR) || lngR === 0) {
+                               lngR = latR / Math.cos(Math.PI / 180 * lat); // Fallback for edge case, #2425
+                       }
+
+                       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;
 
 
-               L.DomUtil.setPosition(root, min);
-               root.setAttribute('width', width);
-               root.setAttribute('height', height);
-               root.setAttribute('viewBox', [min.x, min.y, width, height].join(' '));
+               } else {
+                       var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0]));
 
 
-               if (L.Browser.mobileWebkit) {
-                       pane.appendChild(root);
+                       this._point = map.latLngToLayerPoint(this._latlng);
+                       this._radius = this._point.x - map.latLngToLayerPoint(latlng2).x;
                }
                }
+
+               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);
+}
 
 /*
 
 /*
- * Popup extension to L.Path (polylines, polygons, circles), adding popup-related methods.
+ * @class Polyline
+ * @aka L.Polyline
+ * @inherits Path
+ *
+ * A class for drawing polyline overlays on a map. Extends `Path`.
+ *
+ * @example
+ *
+ * ```js
+ * // create a red polyline from an array of LatLng points
+ * var latlngs = [
+ *     [45.51, -122.68],
+ *     [37.77, -122.43],
+ *     [34.04, -118.2]
+ * ];
+ *
+ * var polyline = L.polyline(latlngs, {color: 'red'}).addTo(map);
+ *
+ * // zoom the map to the polyline
+ * map.fitBounds(polyline.getBounds());
+ * ```
+ *
+ * You can also pass a multi-dimensional array to represent a `MultiPolyline` shape:
+ *
+ * ```js
+ * // create a red polyline from an array of arrays of LatLng points
+ * var latlngs = [
+ *     [[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.Path.include({
 
 
-       bindPopup: function (content, options) {
+var Polyline = Path.extend({
 
 
-               if (content instanceof L.Popup) {
-                       this._popup = content;
-               } else {
-                       if (!this._popup || options) {
-                               this._popup = new L.Popup(options, this);
-                       }
-                       this._popup.setContent(content);
-               }
+       // @section
+       // @aka Polyline options
+       options: {
+               // @option smoothFactor: Number = 1.0
+               // How much to simplify the polyline on each zoom level. More means
+               // better performance and smoother look, and less means more accurate representation.
+               smoothFactor: 1.0,
 
 
-               if (!this._popupHandlersAdded) {
-                       this
-                           .on('click', this._openPopup, this)
-                           .on('remove', this.closePopup, this);
+               // @option noClip: Boolean = false
+               // Disable polyline clipping.
+               noClip: false
+       },
 
 
-                       this._popupHandlersAdded = true;
-               }
+       initialize: function (latlngs, options) {
+               setOptions(this, options);
+               this._setLatLngs(latlngs);
+       },
 
 
-               return this;
+       // @method getLatLngs(): LatLng[]
+       // Returns an array of the points in the path, or nested arrays of points in case of multi-polyline.
+       getLatLngs: function () {
+               return this._latlngs;
        },
 
        },
 
-       unbindPopup: function () {
-               if (this._popup) {
-                       this._popup = null;
-                       this
-                           .off('click', this._openPopup)
-                           .off('remove', this.closePopup);
+       // @method setLatLngs(latlngs: LatLng[]): this
+       // Replaces all the points in the polyline with the given array of geographical points.
+       setLatLngs: function (latlngs) {
+               this._setLatLngs(latlngs);
+               return this.redraw();
+       },
 
 
-                       this._popupHandlersAdded = false;
-               }
-               return this;
+       // @method isEmpty(): Boolean
+       // Returns `true` if the Polyline has no LatLngs.
+       isEmpty: function () {
+               return !this._latlngs.length;
        },
 
        },
 
-       openPopup: function (latlng) {
+       // @method closestLayerPoint(p: Point): Point
+       // Returns the point closest to `p` on the Polyline.
+       closestLayerPoint: function (p) {
+               var minDistance = Infinity,
+                   minPoint = null,
+                   closest = _sqClosestPointOnSegment,
+                   p1, p2;
 
 
-               if (this._popup) {
-                       // open the popup from one of the path's points if not specified
-                       latlng = latlng || this._latlng ||
-                                this._latlngs[Math.floor(this._latlngs.length / 2)];
+               for (var j = 0, jLen = this._parts.length; j < jLen; j++) {
+                       var points = this._parts[j];
 
 
-                       this._openPopup({latlng: latlng});
-               }
+                       for (var i = 1, len = points.length; i < len; i++) {
+                               p1 = points[i - 1];
+                               p2 = points[i];
 
 
-               return this;
-       },
+                               var sqDist = closest(p, p1, p2, true);
 
 
-       closePopup: function () {
-               if (this._popup) {
-                       this._popup._close();
+                               if (sqDist < minDistance) {
+                                       minDistance = sqDist;
+                                       minPoint = closest(p, p1, p2);
+                               }
+                       }
                }
                }
-               return this;
+               if (minPoint) {
+                       minPoint.distance = Math.sqrt(minDistance);
+               }
+               return minPoint;
        },
 
        },
 
-       _openPopup: function (e) {
-               this._popup.setLatLng(e.latlng);
-               this._map.openPopup(this._popup);
-       }
-});
+       // @method getCenter(): LatLng
+       // Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the polyline.
+       getCenter: function () {
+               // throws error when not yet added to map as this center calculation requires projected coordinates
+               if (!this._map) {
+                       throw new Error('Must add layer to map before using getCenter()');
+               }
 
 
+               var i, halfDist, segDist, dist, p1, p2, ratio,
+                   points = this._rings[0],
+                   len = points.length;
 
 
-/*
- * Vector rendering for IE6-8 through VML.
- * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!
- */
+               if (!len) { return null; }
 
 
-L.Browser.vml = !L.Browser.svg && (function () {
-       try {
-               var div = document.createElement('div');
-               div.innerHTML = '<v:shape adj="1"/>';
+               // polyline centroid algorithm; only uses the first ring if there are multiple
 
 
-               var shape = div.firstChild;
-               shape.style.behavior = 'url(#default#VML)';
+               for (i = 0, halfDist = 0; i < len - 1; i++) {
+                       halfDist += points[i].distanceTo(points[i + 1]) / 2;
+               }
 
 
-               return shape && (typeof shape.adj === 'object');
+               // The line is so small in the current view that all points are on the same pixel.
+               if (halfDist === 0) {
+                       return this._map.layerPointToLatLng(points[0]);
+               }
 
 
-       } catch (e) {
-               return false;
-       }
-}());
+               for (i = 0, dist = 0; i < len - 1; i++) {
+                       p1 = points[i];
+                       p2 = points[i + 1];
+                       segDist = p1.distanceTo(p2);
+                       dist += segDist;
 
 
-L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
-       statics: {
-               VML: true,
-               CLIP_PADDING: 0.02
+                       if (dist > halfDist) {
+                               ratio = (dist - halfDist) / segDist;
+                               return this._map.layerPointToLatLng([
+                                       p2.x - ratio * (p2.x - p1.x),
+                                       p2.y - ratio * (p2.y - p1.y)
+                               ]);
+                       }
+               }
        },
 
        },
 
-       _createElement: (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">');
-                       };
-               }
-       }()),
+       // @method getBounds(): LatLngBounds
+       // Returns the `LatLngBounds` of the path.
+       getBounds: function () {
+               return this._bounds;
+       },
+
+       // @method addLatLng(latlng: LatLng, latlngs? LatLng[]): this
+       // Adds a given point to the polyline. By default, adds to the first ring of
+       // the polyline in case of a multi-polyline, but can be overridden by passing
+       // 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 = toLatLng(latlng);
+               latlngs.push(latlng);
+               this._bounds.extend(latlng);
+               return this.redraw();
+       },
+
+       _setLatLngs: function (latlngs) {
+               this._bounds = new LatLngBounds();
+               this._latlngs = this._convertLatLngs(latlngs);
+       },
 
 
-       _initPath: function () {
-               var container = this._container = this._createElement('shape');
+       _defaultShape: function () {
+               return isFlat(this._latlngs) ? this._latlngs : this._latlngs[0];
+       },
 
 
-               L.DomUtil.addClass(container, 'leaflet-vml-shape' +
-                       (this.options.className ? ' ' + this.options.className : ''));
+       // recursively convert latlngs input into actual LatLng instances; calculate bounds along the way
+       _convertLatLngs: function (latlngs) {
+               var result = [],
+                   flat = isFlat(latlngs);
 
 
-               if (this.options.clickable) {
-                       L.DomUtil.addClass(container, 'leaflet-clickable');
+               for (var i = 0, len = latlngs.length; i < len; i++) {
+                       if (flat) {
+                               result[i] = toLatLng(latlngs[i]);
+                               this._bounds.extend(result[i]);
+                       } else {
+                               result[i] = this._convertLatLngs(latlngs[i]);
+                       }
                }
 
                }
 
-               container.coordsize = '1 1';
+               return result;
+       },
 
 
-               this._path = this._createElement('path');
-               container.appendChild(this._path);
+       _project: function () {
+               var pxBounds = new Bounds();
+               this._rings = [];
+               this._projectLatlngs(this._latlngs, this._rings, pxBounds);
+
+               if (this._bounds.isValid() && pxBounds.isValid()) {
+                       this._rawPxBounds = pxBounds;
+                       this._updateBounds();
+               }
+       },
 
 
-               this._map._pathRoot.appendChild(container);
+       _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)
+               ]);
        },
 
        },
 
-       _initStyle: function () {
-               this._updateStyle();
+       // recursively turns latlngs into a set of rings with projected coordinates
+       _projectLatlngs: function (latlngs, result, projectedBounds) {
+               var flat = latlngs[0] instanceof LatLng,
+                   len = latlngs.length,
+                   i, ring;
+
+               if (flat) {
+                       ring = [];
+                       for (i = 0; i < len; i++) {
+                               ring[i] = this._map.latLngToLayerPoint(latlngs[i]);
+                               projectedBounds.extend(ring[i]);
+                       }
+                       result.push(ring);
+               } else {
+                       for (i = 0; i < len; i++) {
+                               this._projectLatlngs(latlngs[i], result, projectedBounds);
+                       }
+               }
        },
 
        },
 
-       _updateStyle: function () {
-               var stroke = this._stroke,
-                   fill = this._fill,
-                   options = this.options,
-                   container = this._container;
+       // clip polyline by renderer bounds so that we have less to render for performance
+       _clipPoints: function () {
+               var bounds = this._renderer._bounds;
+
+               this._parts = [];
+               if (!this._pxBounds || !this._pxBounds.intersects(bounds)) {
+                       return;
+               }
+
+               if (this.options.noClip) {
+                       this._parts = this._rings;
+                       return;
+               }
+
+               var parts = this._parts,
+                   i, j, k, len, len2, segment, points;
+
+               for (i = 0, k = 0, len = this._rings.length; i < len; i++) {
+                       points = this._rings[i];
+
+                       for (j = 0, len2 = points.length; j < len2 - 1; j++) {
+                               segment = clipSegment(points[j], points[j + 1], bounds, j, true);
+
+                               if (!segment) { continue; }
 
 
-               container.stroked = options.stroke;
-               container.filled = options.fill;
+                               parts[k] = parts[k] || [];
+                               parts[k].push(segment[0]);
 
 
-               if (options.stroke) {
-                       if (!stroke) {
-                               stroke = this._stroke = this._createElement('stroke');
-                               stroke.endcap = 'round';
-                               container.appendChild(stroke);
+                               // if segment goes out of screen, or it's the last one, it's the end of the line part
+                               if ((segment[1] !== points[j + 1]) || (j === len2 - 2)) {
+                                       parts[k].push(segment[1]);
+                                       k++;
+                               }
                        }
                        }
-                       stroke.weight = options.weight + 'px';
-                       stroke.color = options.color;
-                       stroke.opacity = options.opacity;
+               }
+       },
 
 
-                       if (options.dashArray) {
-                               stroke.dashStyle = L.Util.isArray(options.dashArray) ?
-                                   options.dashArray.join(' ') :
-                                   options.dashArray.replace(/( *, *)/g, ' ');
-                       } else {
-                               stroke.dashStyle = '';
-                       }
-                       if (options.lineCap) {
-                               stroke.endcap = options.lineCap.replace('butt', 'flat');
-                       }
-                       if (options.lineJoin) {
-                               stroke.joinstyle = options.lineJoin;
-                       }
+       // simplify each clipped part of the polyline for performance
+       _simplifyPoints: function () {
+               var parts = this._parts,
+                   tolerance = this.options.smoothFactor;
 
 
-               } else if (stroke) {
-                       container.removeChild(stroke);
-                       this._stroke = null;
+               for (var i = 0, len = parts.length; i < len; i++) {
+                       parts[i] = simplify(parts[i], tolerance);
                }
                }
+       },
 
 
-               if (options.fill) {
-                       if (!fill) {
-                               fill = this._fill = this._createElement('fill');
-                               container.appendChild(fill);
-                       }
-                       fill.color = options.fillColor || options.color;
-                       fill.opacity = options.fillOpacity;
+       _update: function () {
+               if (!this._map) { return; }
 
 
-               } else if (fill) {
-                       container.removeChild(fill);
-                       this._fill = null;
-               }
+               this._clipPoints();
+               this._simplifyPoints();
+               this._updatePath();
        },
 
        _updatePath: function () {
        },
 
        _updatePath: function () {
-               var style = this._container.style;
+               this._renderer._updatePoly(this);
+       },
 
 
-               style.display = 'none';
-               this._path.v = this.getPathString() + ' '; // the space fixes IE empty path string bug
-               style.display = '';
-       }
-});
+       // Needed by the `Canvas` renderer for interactivity
+       _containsPoint: function (p, closed) {
+               var i, j, k, len, len2, part,
+                   w = this._clickTolerance();
 
 
-L.Map.include(L.Browser.svg || !L.Browser.vml ? {} : {
-       _initPathRoot: function () {
-               if (this._pathRoot) { return; }
+               if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; }
 
 
-               var root = this._pathRoot = document.createElement('div');
-               root.className = 'leaflet-vml-container';
-               this._panes.overlayPane.appendChild(root);
+               // hit detection for polylines
+               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++) {
+                               if (!closed && (j === 0)) { continue; }
 
 
-               this.on('moveend', this._updatePathViewport);
-               this._updatePathViewport();
+                               if (pointToSegmentDistance(p, part[k], part[j]) <= w) {
+                                       return true;
+                               }
+                       }
+               }
+               return false;
        }
 });
 
        }
 });
 
+// @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;
 
 /*
 
 /*
- * Vector rendering for all browsers that support canvas.
+ * @class Polygon
+ * @aka L.Polygon
+ * @inherits Polyline
+ *
+ * A class for drawing polygon overlays on a map. Extends `Polyline`.
+ *
+ * Note that points you pass when creating a polygon shouldn't have an additional last point equal to the first one — it's better to filter out such points.
+ *
+ *
+ * @example
+ *
+ * ```js
+ * // create a red polygon from an array of LatLng points
+ * var latlngs = [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]];
+ *
+ * var polygon = L.polygon(latlngs, {color: 'red'}).addTo(map);
+ *
+ * // zoom the map to the polygon
+ * map.fitBounds(polygon.getBounds());
+ * ```
+ *
+ * You can also pass an array of arrays of latlngs, with the first array representing the outer shape and the other arrays representing holes in the outer shape:
+ *
+ * ```js
+ * var latlngs = [
+ *   [[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
+ * ];
+ * ```
+ *
+ * Additionally, you can pass a multi-dimensional array to represent a MultiPolygon shape.
+ *
+ * ```js
+ * var latlngs = [
+ *   [ // first polygon
+ *     [[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
+ *     [[41, -111.03],[45, -111.04],[45, -104.05],[41, -104.05]]
+ *   ]
+ * ];
+ * ```
  */
 
  */
 
-L.Browser.canvas = (function () {
-       return !!document.createElement('canvas').getContext;
-}());
+var Polygon = Polyline.extend({
 
 
-L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path : L.Path.extend({
-       statics: {
-               //CLIP_PADDING: 0.02, // not sure if there's a need to set it to a small value
-               CANVAS: true,
-               SVG: false
+       options: {
+               fill: true
        },
 
        },
 
-       redraw: function () {
-               if (this._map) {
-                       this.projectLatlngs();
-                       this._requestUpdate();
-               }
-               return this;
+       isEmpty: function () {
+               return !this._latlngs.length || !this._latlngs[0].length;
        },
 
        },
 
-       setStyle: function (style) {
-               L.setOptions(this, style);
-
-               if (this._map) {
-                       this._updateStyle();
-                       this._requestUpdate();
+       getCenter: function () {
+               // throws error when not yet added to map as this center calculation requires projected coordinates
+               if (!this._map) {
+                       throw new Error('Must add layer to map before using getCenter()');
                }
                }
-               return this;
-       },
 
 
-       onRemove: function (map) {
-               map
-                   .off('viewreset', this.projectLatlngs, this)
-                   .off('moveend', this._updatePath, this);
+               var i, j, p1, p2, f, area, x, y, center,
+                   points = this._rings[0],
+                   len = points.length;
 
 
-               if (this.options.clickable) {
-                       this._map.off('click', this._onClick, this);
-                       this._map.off('mousemove', this._onMouseMove, this);
-               }
+               if (!len) { return null; }
 
 
-               this._requestUpdate();
+               // polygon centroid algorithm; only uses the first ring if there are multiple
 
 
-               this._map = null;
+               area = x = y = 0;
+
+               for (i = 0, j = len - 1; i < len; j = i++) {
+                       p1 = points[i];
+                       p2 = points[j];
+
+                       f = p1.y * p2.x - p2.y * p1.x;
+                       x += (p1.x + p2.x) * f;
+                       y += (p1.y + p2.y) * f;
+                       area += f * 3;
+               }
+
+               if (area === 0) {
+                       // Polygon is so small that all points are on same pixel.
+                       center = points[0];
+               } else {
+                       center = [x / area, y / area];
+               }
+               return this._map.layerPointToLatLng(center);
        },
 
        },
 
-       _requestUpdate: function () {
-               if (this._map && !L.Path._updateRequest) {
-                       L.Path._updateRequest = L.Util.requestAnimFrame(this._fireMapMoveEnd, this._map);
+       _convertLatLngs: function (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 LatLng && result[0].equals(result[len - 1])) {
+                       result.pop();
                }
                }
+               return result;
        },
 
        },
 
-       _fireMapMoveEnd: function () {
-               L.Path._updateRequest = null;
-               this.fire('moveend');
+       _setLatLngs: function (latlngs) {
+               Polyline.prototype._setLatLngs.call(this, latlngs);
+               if (isFlat(this._latlngs)) {
+                       this._latlngs = [this._latlngs];
+               }
        },
 
        },
 
-       _initElements: function () {
-               this._map._initPathRoot();
-               this._ctx = this._map._canvasCtx;
+       _defaultShape: function () {
+               return isFlat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0];
        },
 
        },
 
-       _updateStyle: function () {
-               var options = this.options;
+       _clipPoints: function () {
+               // polygons need a different clipping algorithm so we redefine that
 
 
-               if (options.stroke) {
-                       this._ctx.lineWidth = options.weight;
-                       this._ctx.strokeStyle = options.color;
-               }
-               if (options.fill) {
-                       this._ctx.fillStyle = options.fillColor || options.color;
-               }
-       },
+               var bounds = this._renderer._bounds,
+                   w = this.options.weight,
+                   p = new Point(w, w);
 
 
-       _drawPath: function () {
-               var i, j, len, len2, point, drawMethod;
+               // increase clip padding by stroke width to avoid stroke on clip edges
+               bounds = new Bounds(bounds.min.subtract(p), bounds.max.add(p));
 
 
-               this._ctx.beginPath();
+               this._parts = [];
+               if (!this._pxBounds || !this._pxBounds.intersects(bounds)) {
+                       return;
+               }
 
 
-               for (i = 0, len = this._parts.length; i < len; i++) {
-                       for (j = 0, len2 = this._parts[i].length; j < len2; j++) {
-                               point = this._parts[i][j];
-                               drawMethod = (j === 0 ? 'move' : 'line') + 'To';
+               if (this.options.noClip) {
+                       this._parts = this._rings;
+                       return;
+               }
 
 
-                               this._ctx[drawMethod](point.x, point.y);
-                       }
-                       // TODO refactor ugly hack
-                       if (this instanceof L.Polygon) {
-                               this._ctx.closePath();
+               for (var i = 0, len = this._rings.length, clipped; i < len; i++) {
+                       clipped = clipPolygon(this._rings[i], bounds, true);
+                       if (clipped.length) {
+                               this._parts.push(clipped);
                        }
                }
        },
 
                        }
                }
        },
 
-       _checkIfEmpty: function () {
-               return !this._parts.length;
+       _updatePath: function () {
+               this._renderer._updatePoly(this, true);
        },
 
        },
 
-       _updatePath: function () {
-               if (this._checkIfEmpty()) { return; }
+       // Needed by the `Canvas` renderer for interactivity
+       _containsPoint: function (p) {
+               var inside = false,
+                   part, p1, p2, i, j, k, len, len2;
 
 
-               var ctx = this._ctx,
-                   options = this.options;
+               if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; }
 
 
-               this._drawPath();
-               ctx.save();
-               this._updateStyle();
+               // ray casting algorithm for detecting if point is in polygon
+               for (i = 0, len = this._parts.length; i < len; i++) {
+                       part = this._parts[i];
 
 
-               if (options.fill) {
-                       ctx.globalAlpha = options.fillOpacity;
-                       ctx.fill();
-               }
+                       for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
+                               p1 = part[j];
+                               p2 = part[k];
 
 
-               if (options.stroke) {
-                       ctx.globalAlpha = options.opacity;
-                       ctx.stroke();
+                               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;
+                               }
+                       }
                }
 
                }
 
-               ctx.restore();
+               // also check if it's on polygon stroke
+               return inside || Polyline.prototype._containsPoint.call(this, p, true);
+       }
 
 
-               // TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature
-       },
+});
 
 
-       _initEvents: function () {
-               if (this.options.clickable) {
-                       // TODO dblclick
-                       this._map.on('mousemove', this._onMouseMove, this);
-                       this._map.on('click', this._onClick, this);
-               }
-       },
 
 
-       _onClick: function (e) {
-               if (this._containsPoint(e.layerPoint)) {
-                       this.fire('click', e);
+// @factory L.polygon(latlngs: LatLng[], options?: Polyline options)
+function polygon(latlngs, options) {
+       return new Polygon(latlngs, options);
+}
+
+/*
+ * @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);
+ * ```
+ */
+
+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);
                }
        },
 
                }
        },
 
-       _onMouseMove: function (e) {
-               if (!this._map || this._map._animatingZoom) { return; }
-
-               // TODO don't do on each move
-               if (this._containsPoint(e.layerPoint)) {
-                       this._ctx.canvas.style.cursor = 'pointer';
-                       this._mouseInside = true;
-                       this.fire('mouseover', e);
+       // @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;
 
 
-               } else if (this._mouseInside) {
-                       this._ctx.canvas.style.cursor = '';
-                       this._mouseInside = false;
-                       this.fire('mouseout', 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;
                }
                }
-       }
-});
 
 
-L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {} : {
-       _initPathRoot: function () {
-               var root = this._pathRoot,
-                   ctx;
+               var options = this.options;
 
 
-               if (!root) {
-                       root = this._pathRoot = document.createElement('canvas');
-                       root.style.position = 'absolute';
-                       ctx = this._canvasCtx = root.getContext('2d');
+               if (options.filter && !options.filter(geojson)) { return this; }
 
 
-                       ctx.lineCap = 'round';
-                       ctx.lineJoin = 'round';
+               var layer = geometryToLayer(geojson, options);
+               if (!layer) {
+                       return this;
+               }
+               layer.feature = asFeature(geojson);
 
 
-                       this._panes.overlayPane.appendChild(root);
+               layer.defaultOptions = layer.options;
+               this.resetStyle(layer);
 
 
-                       if (this.options.zoomAnimation) {
-                               this._pathRoot.className = 'leaflet-zoom-animated';
-                               this.on('zoomanim', this._animatePathZoom);
-                               this.on('zoomend', this._endPathZoom);
-                       }
-                       this.on('moveend', this._updateCanvasViewport);
-                       this._updateCanvasViewport();
+               if (options.onEachFeature) {
+                       options.onEachFeature(geojson, layer);
                }
                }
+
+               return this.addLayer(layer);
        },
 
        },
 
-       _updateCanvasViewport: function () {
-               // don't redraw while zooming. See _updateSvgViewport for more details
-               if (this._pathZooming) { return; }
-               this._updatePathViewport();
+       // @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;
+       },
 
 
-               var vp = this._pathViewport,
-                   min = vp.min,
-                   size = vp.max.subtract(min),
-                   root = this._pathRoot;
+       // @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);
+       },
 
 
-               //TODO check if this works properly on mobile webkit
-               L.DomUtil.setPosition(root, min);
-               root.width = size.x;
-               root.height = size.y;
-               root.getContext('2d').translate(-min.x, -min.y);
+       _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:
 
 
-/*
- * L.LineUtil contains different utility functions for line segments
- * and polylines (clipping, simplification, distances, etc.)
- */
+// @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) {
 
 
-/*jshint bitwise:false */ // allow bitwise oprations for this file
+       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;
 
 
-L.LineUtil = {
+       if (!coords && !geometry) {
+               return null;
+       }
 
 
-       // Simplify polyline with vertex reduction and Douglas-Peucker simplification.
-       // Improves rendering performance dramatically by lessening the number of points to draw.
+       switch (geometry.type) {
+       case 'Point':
+               latlng = _coordsToLatLng(coords);
+               return pointToLayer ? pointToLayer(geojson, latlng) : new Marker(latlng);
 
 
-       simplify: function (/*Point[]*/ points, /*Number*/ tolerance) {
-               if (!tolerance || !points.length) {
-                       return points.slice();
+       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);
 
 
-               var sqTolerance = tolerance * tolerance;
+       default:
+               throw new Error('Invalid GeoJSON object.');
+       }
+}
 
 
-               // stage 1: vertex reduction
-               points = this._reducePoints(points, sqTolerance);
+// @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]);
+}
 
 
-               // stage 2: Douglas-Peucker simplification
-               points = this._simplifyDP(points, sqTolerance);
+// @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 = [];
 
 
-               return points;
-       },
+       for (var i = 0, len = coords.length, latlng; i < len; i++) {
+               latlng = levelsDeep ?
+                       coordsToLatLngs(coords[i], levelsDeep - 1, _coordsToLatLng) :
+                       (_coordsToLatLng || coordsToLatLng)(coords[i]);
 
 
-       // distance from a point to a segment between two points
-       pointToSegmentDistance:  function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {
-               return Math.sqrt(this._sqClosestPointOnSegment(p, p1, p2, true));
-       },
+               latlngs.push(latlng);
+       }
 
 
-       closestPointOnSegment: function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {
-               return this._sqClosestPointOnSegment(p, p1, p2);
-       },
+       return latlngs;
+}
 
 
-       // Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm
-       _simplifyDP: function (points, sqTolerance) {
+// @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)];
+}
 
 
-               var len = points.length,
-                   ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
-                   markers = new ArrayConstructor(len);
+// @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 = [];
 
 
-               markers[0] = markers[len - 1] = 1;
+       for (var i = 0, len = latlngs.length; i < len; i++) {
+               coords.push(levelsDeep ?
+                       latLngsToCoords(latlngs[i], levelsDeep - 1, closed, precision) :
+                       latLngToCoords(latlngs[i], precision));
+       }
 
 
-               this._simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
+       if (!levelsDeep && closed) {
+               coords.push(coords[0]);
+       }
 
 
-               var i,
-                   newPoints = [];
+       return coords;
+}
 
 
-               for (i = 0; i < len; i++) {
-                       if (markers[i]) {
-                               newPoints.push(points[i]);
-                       }
-               }
+function getFeature(layer, newGeometry) {
+       return layer.feature ?
+               extend({}, layer.feature, {geometry: newGeometry}) :
+               asFeature(newGeometry);
+}
 
 
-               return newPoints;
-       },
+// @function asFeature(geojson: Object): Object
+// Normalize GeoJSON geometries/features into GeoJSON features.
+function asFeature(geojson) {
+       if (geojson.type === 'Feature' || geojson.type === 'FeatureCollection') {
+               return geojson;
+       }
 
 
-       _simplifyDPStep: function (points, markers, sqTolerance, first, last) {
+       return {
+               type: 'Feature',
+               properties: {},
+               geometry: geojson
+       };
+}
 
 
-               var maxSqDist = 0,
-                   index, i, sqDist;
+var PointToGeoJSON = {
+       toGeoJSON: function (precision) {
+               return getFeature(this, {
+                       type: 'Point',
+                       coordinates: latLngToCoords(this.getLatLng(), precision)
+               });
+       }
+};
 
 
-               for (i = first + 1; i <= last - 1; i++) {
-                       sqDist = this._sqClosestPointOnSegment(points[i], points[first], points[last], true);
+// @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);
+
+
+// @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);
+
+               var coords = latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision);
+
+               return getFeature(this, {
+                       type: (multi ? 'Multi' : '') + 'LineString',
+                       coordinates: coords
+               });
+       }
+});
 
 
-                       if (sqDist > maxSqDist) {
-                               index = i;
-                               maxSqDist = sqDist;
-                       }
-               }
+// @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]);
 
 
-               if (maxSqDist > sqTolerance) {
-                       markers[index] = 1;
+               var coords = latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision);
 
 
-                       this._simplifyDPStep(points, markers, sqTolerance, first, index);
-                       this._simplifyDPStep(points, markers, sqTolerance, index, last);
+               if (!holes) {
+                       coords = [coords];
                }
                }
-       },
 
 
-       // reduce points that are too close to each other to a single point
-       _reducePoints: function (points, sqTolerance) {
-               var reducedPoints = [points[0]];
+               return getFeature(this, {
+                       type: (multi ? 'Multi' : '') + 'Polygon',
+                       coordinates: coords
+               });
+       }
+});
 
 
-               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]);
-               }
-               return reducedPoints;
-       },
 
 
-       // Cohen-Sutherland line clipping algorithm.
-       // Used to avoid rendering parts of a polyline that are not currently visible.
+// @namespace LayerGroup
+LayerGroup.include({
+       toMultiPoint: function (precision) {
+               var coords = [];
 
 
-       clipSegment: function (a, b, bounds, useLastCode) {
-               var codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),
-                   codeB = this._getBitCode(b, bounds),
+               this.eachLayer(function (layer) {
+                       coords.push(layer.toGeoJSON(precision).geometry.coordinates);
+               });
 
 
-                   codeOut, p, newCode;
+               return getFeature(this, {
+                       type: 'MultiPoint',
+                       coordinates: coords
+               });
+       },
 
 
-               // save 2nd code to avoid calculating it on the next segment
-               this._lastCode = codeB;
+       // @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) {
 
 
-               while (true) {
-                       // if a,b is inside the clip window (trivial accept)
-                       if (!(codeA | codeB)) {
-                               return [a, b];
-                       // if a,b is outside the clip window (trivial reject)
-                       } else if (codeA & codeB) {
-                               return false;
-                       // other cases
-                       } else {
-                               codeOut = codeA || codeB;
-                               p = this._getEdgeIntersection(a, b, codeOut, bounds);
-                               newCode = this._getBitCode(p, bounds);
+               var type = this.feature && this.feature.geometry && this.feature.geometry.type;
 
 
-                               if (codeOut === codeA) {
-                                       a = p;
-                                       codeA = newCode;
-                               } else {
-                                       b = p;
-                                       codeB = newCode;
-                               }
-                       }
+               if (type === 'MultiPoint') {
+                       return this.toMultiPoint(precision);
                }
                }
-       },
-
-       _getEdgeIntersection: function (a, b, code, bounds) {
-               var dx = b.x - a.x,
-                   dy = b.y - a.y,
-                   min = bounds.min,
-                   max = bounds.max;
 
 
-               if (code & 8) { // top
-                       return new L.Point(a.x + dx * (max.y - a.y) / dy, max.y);
-               } else if (code & 4) { // bottom
-                       return new L.Point(a.x + dx * (min.y - a.y) / dy, min.y);
-               } else if (code & 2) { // right
-                       return new L.Point(max.x, a.y + dy * (max.x - a.x) / dx);
-               } else if (code & 1) { // left
-                       return new L.Point(min.x, a.y + dy * (min.x - a.x) / dx);
-               }
-       },
+               var isGeometryCollection = type === 'GeometryCollection',
+                   jsons = [];
 
 
-       _getBitCode: function (/*Point*/ p, bounds) {
-               var code = 0;
+               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 (p.x < bounds.min.x) { // left
-                       code |= 1;
-               } else if (p.x > bounds.max.x) { // right
-                       code |= 2;
-               }
-               if (p.y < bounds.min.y) { // bottom
-                       code |= 4;
-               } else if (p.y > bounds.max.y) { // top
-                       code |= 8;
+               if (isGeometryCollection) {
+                       return getFeature(this, {
+                               geometries: jsons,
+                               type: 'GeometryCollection'
+                       });
                }
 
                }
 
-               return code;
-       },
+               return {
+                       type: 'FeatureCollection',
+                       features: jsons
+               };
+       }
+});
 
 
-       // 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;
-       },
+// @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);
+}
 
 
-       // 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;
+// Backward compatibility.
+var geoJson = geoJSON;
 
 
-               if (dot > 0) {
-                       t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
+/*
+ * @class ImageOverlay
+ * @aka L.ImageOverlay
+ * @inherits Interactive layer
+ *
+ * Used to load and display a single image over specific bounds of the map. Extends `Layer`.
+ *
+ * @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);
+ * ```
+ */
 
 
-                       if (t > 1) {
-                               x = p2.x;
-                               y = p2.y;
-                       } else if (t > 0) {
-                               x += dx * t;
-                               y += dy * t;
-                       }
-               }
+var ImageOverlay = Layer.extend({
 
 
-               dx = p.x - x;
-               dy = p.y - y;
+       // @section
+       // @aka ImageOverlay options
+       options: {
+               // @option opacity: Number = 1.0
+               // The opacity of the image overlay.
+               opacity: 1,
 
 
-               return sqDist ? dx * dx + dy * dy : new L.Point(x, y);
-       }
-};
+               // @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,
 
 
-/*
- * L.Polyline is used to display polylines on a map.
- */
+               // @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.Polyline = L.Path.extend({
-       initialize: function (latlngs, options) {
-               L.Path.prototype.initialize.call(this, options);
+               // @option errorOverlayUrl: String = ''
+               // URL to the overlay image to show in place of the overlay that failed to load.
+               errorOverlayUrl: '',
 
 
-               this._latlngs = this._convertLatLngs(latlngs);
+               // @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,
+
+               // @option className: String = ''
+               // A custom class name to assign to the image. Empty by default.
+               className: ''
        },
 
        },
 
-       options: {
-               // how much to simplify the polyline on each zoom level
-               // more = better performance and smoother look, less = more accurate
-               smoothFactor: 1.0,
-               noClip: false
+       initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)
+               this._url = url;
+               this._bounds = toLatLngBounds(bounds);
+
+               setOptions(this, options);
        },
 
        },
 
-       projectLatlngs: function () {
-               this._originalPoints = [];
+       onAdd: function () {
+               if (!this._image) {
+                       this._initImage();
 
 
-               for (var i = 0, len = this._latlngs.length; i < len; i++) {
-                       this._originalPoints[i] = this._map.latLngToLayerPoint(this._latlngs[i]);
+                       if (this.options.opacity < 1) {
+                               this._updateOpacity();
+                       }
                }
                }
-       },
 
 
-       getPathString: function () {
-               for (var i = 0, len = this._parts.length, str = ''; i < len; i++) {
-                       str += this._getPathPartStr(this._parts[i]);
+               if (this.options.interactive) {
+                       addClass(this._image, 'leaflet-interactive');
+                       this.addInteractiveTarget(this._image);
                }
                }
-               return str;
-       },
 
 
-       getLatLngs: function () {
-               return this._latlngs;
+               this.getPane().appendChild(this._image);
+               this._reset();
        },
 
        },
 
-       setLatLngs: function (latlngs) {
-               this._latlngs = this._convertLatLngs(latlngs);
-               return this.redraw();
+       onRemove: function () {
+               remove(this._image);
+               if (this.options.interactive) {
+                       this.removeInteractiveTarget(this._image);
+               }
        },
 
        },
 
-       addLatLng: function (latlng) {
-               this._latlngs.push(L.latLng(latlng));
-               return this.redraw();
-       },
+       // @method setOpacity(opacity: Number): this
+       // Sets the opacity of the overlay.
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
 
 
-       spliceLatLngs: function () { // (Number index, Number howMany)
-               var removed = [].splice.apply(this._latlngs, arguments);
-               this._convertLatLngs(this._latlngs, true);
-               this.redraw();
-               return removed;
+               if (this._image) {
+                       this._updateOpacity();
+               }
+               return this;
        },
 
        },
 
-       closestLayerPoint: function (p) {
-               var minDistance = Infinity, parts = this._parts, p1, p2, minPoint = null;
-
-               for (var j = 0, jLen = parts.length; j < jLen; j++) {
-                       var points = parts[j];
-                       for (var i = 1, len = points.length; i < len; i++) {
-                               p1 = points[i - 1];
-                               p2 = points[i];
-                               var sqDist = L.LineUtil._sqClosestPointOnSegment(p, p1, p2, true);
-                               if (sqDist < minDistance) {
-                                       minDistance = sqDist;
-                                       minPoint = L.LineUtil._sqClosestPointOnSegment(p, p1, p2);
-                               }
-                       }
+       setStyle: function (styleOpts) {
+               if (styleOpts.opacity) {
+                       this.setOpacity(styleOpts.opacity);
                }
                }
-               if (minPoint) {
-                       minPoint.distance = Math.sqrt(minDistance);
-               }
-               return minPoint;
+               return this;
        },
 
        },
 
-       getBounds: function () {
-               return new L.LatLngBounds(this.getLatLngs());
+       // @method bringToFront(): this
+       // Brings the layer to the top of all overlays.
+       bringToFront: function () {
+               if (this._map) {
+                       toFront(this._image);
+               }
+               return this;
        },
 
        },
 
-       _convertLatLngs: function (latlngs, overwrite) {
-               var i, len, target = overwrite ? latlngs : [];
-
-               for (i = 0, len = latlngs.length; i < len; i++) {
-                       if (L.Util.isArray(latlngs[i]) && typeof latlngs[i][0] !== 'number') {
-                               return;
-                       }
-                       target[i] = L.latLng(latlngs[i]);
+       // @method bringToBack(): this
+       // Brings the layer to the bottom of all overlays.
+       bringToBack: function () {
+               if (this._map) {
+                       toBack(this._image);
                }
                }
-               return target;
+               return this;
        },
 
        },
 
-       _initEvents: function () {
-               L.Path.prototype._initEvents.call(this);
+       // @method setUrl(url: String): this
+       // Changes the URL of the image.
+       setUrl: function (url) {
+               this._url = url;
+
+               if (this._image) {
+                       this._image.src = url;
+               }
+               return this;
        },
 
        },
 
-       _getPathPartStr: function (points) {
-               var round = L.Path.VML;
+       // @method setBounds(bounds: LatLngBounds): this
+       // Update the bounds that this ImageOverlay covers
+       setBounds: function (bounds) {
+               this._bounds = toLatLngBounds(bounds);
 
 
-               for (var j = 0, len2 = points.length, str = '', p; j < len2; j++) {
-                       p = points[j];
-                       if (round) {
-                               p._round();
-                       }
-                       str += (j ? 'L' : 'M') + p.x + ' ' + p.y;
+               if (this._map) {
+                       this._reset();
                }
                }
-               return str;
+               return this;
        },
 
        },
 
-       _clipPoints: function () {
-               var points = this._originalPoints,
-                   len = points.length,
-                   i, k, segment;
+       getEvents: function () {
+               var events = {
+                       zoom: this._reset,
+                       viewreset: this._reset
+               };
 
 
-               if (this.options.noClip) {
-                       this._parts = [points];
-                       return;
+               if (this._zoomAnimated) {
+                       events.zoomanim = this._animateZoom;
                }
 
                }
 
-               this._parts = [];
-
-               var parts = this._parts,
-                   vp = this._map._pathViewport,
-                   lu = L.LineUtil;
+               return events;
+       },
 
 
-               for (i = 0, k = 0; i < len - 1; i++) {
-                       segment = lu.clipSegment(points[i], points[i + 1], vp, i);
-                       if (!segment) {
-                               continue;
-                       }
+       // @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;
+       },
 
 
-                       parts[k] = parts[k] || [];
-                       parts[k].push(segment[0]);
+       // @method getBounds(): LatLngBounds
+       // Get the bounds that this ImageOverlay covers
+       getBounds: function () {
+               return this._bounds;
+       },
 
 
-                       // if segment goes out of screen, or it's the last one, it's the end of the line part
-                       if ((segment[1] !== points[i + 1]) || (i === len - 2)) {
-                               parts[k].push(segment[1]);
-                               k++;
-                       }
-               }
+       // @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;
        },
 
        },
 
-       // simplify each clipped part of the polyline
-       _simplifyPoints: function () {
-               var parts = this._parts,
-                   lu = L.LineUtil;
+       _initImage: function () {
+               var wasElementSupplied = this._url.tagName === 'IMG';
+               var img = this._image = wasElementSupplied ? this._url : create$1('img');
 
 
-               for (var i = 0, len = parts.length; i < len; i++) {
-                       parts[i] = lu.simplify(parts[i], this.options.smoothFactor);
-               }
-       },
+               addClass(img, 'leaflet-image-layer');
+               if (this._zoomAnimated) { addClass(img, 'leaflet-zoom-animated'); }
+               if (this.options.className) { addClass(img, this.options.className); }
 
 
-       _updatePath: function () {
-               if (!this._map) { return; }
+               img.onselectstart = falseFn;
+               img.onmousemove = falseFn;
 
 
-               this._clipPoints();
-               this._simplifyPoints();
+               // @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');
 
 
-               L.Path.prototype._updatePath.call(this);
-       }
-});
+               if (this.options.crossOrigin || this.options.crossOrigin === '') {
+                       img.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;
+               }
 
 
-L.polyline = function (latlngs, options) {
-       return new L.Polyline(latlngs, options);
-};
+               if (this.options.zIndex) {
+                       this._updateZIndex();
+               }
 
 
+               if (wasElementSupplied) {
+                       this._url = img.src;
+                       return;
+               }
 
 
-/*
- * L.PolyUtil contains utility functions for polygons (clipping, etc.).
- */
+               img.src = this._url;
+               img.alt = this.options.alt;
+       },
 
 
-/*jshint bitwise:false */ // allow bitwise operations here
+       _animateZoom: function (e) {
+               var scale = this._map.getZoomScale(e.zoom),
+                   offset = this._map._latLngBoundsToNewLayerBounds(this._bounds, e.zoom, e.center).min;
 
 
-L.PolyUtil = {};
+               setTransform(this._image, offset, scale);
+       },
 
 
-/*
- * Sutherland-Hodgeman polygon clipping algorithm.
- * Used to avoid rendering parts of a polygon that are not currently visible.
- */
-L.PolyUtil.clipPolygon = function (points, bounds) {
-       var clippedPoints,
-           edges = [1, 4, 2, 8],
-           i, j, k,
-           a, b,
-           len, edge, p,
-           lu = L.LineUtil;
+       _reset: function () {
+               var image = this._image,
+                   bounds = new Bounds(
+                       this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
+                       this._map.latLngToLayerPoint(this._bounds.getSouthEast())),
+                   size = bounds.getSize();
 
 
-       for (i = 0, len = points.length; i < len; i++) {
-               points[i]._code = lu._getBitCode(points[i], bounds);
-       }
+               setPosition(image, bounds.min);
 
 
-       // for each edge (left, bottom, right, top)
-       for (k = 0; k < 4; k++) {
-               edge = edges[k];
-               clippedPoints = [];
+               image.style.width  = size.x + 'px';
+               image.style.height = size.y + 'px';
+       },
 
 
-               for (i = 0, len = points.length, j = len - 1; i < len; j = i++) {
-                       a = points[i];
-                       b = points[j];
+       _updateOpacity: function () {
+               setOpacity(this._image, this.options.opacity);
+       },
 
 
-                       // 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);
-                                       p._code = lu._getBitCode(p, bounds);
-                                       clippedPoints.push(p);
-                               }
-                               clippedPoints.push(a);
+       _updateZIndex: function () {
+               if (this._image && this.options.zIndex !== undefined && this.options.zIndex !== null) {
+                       this._image.style.zIndex = this.options.zIndex;
+               }
+       },
 
 
-                       // 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);
-                               p._code = lu._getBitCode(p, bounds);
-                               clippedPoints.push(p);
-                       }
+       _overlayOnError: function () {
+               // @event error: Event
+               // Fired when the ImageOverlay layer fails to load its image
+               this.fire('error');
+
+               var errorUrl = this.options.errorOverlayUrl;
+               if (errorUrl && this._url !== errorUrl) {
+                       this._url = errorUrl;
+                       this._image.src = errorUrl;
                }
                }
-               points = clippedPoints;
        }
        }
+});
 
 
-       return points;
+// @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);
 };
 
 };
 
-
 /*
 /*
- * L.Polygon is used to display polygons on a map.
+ * @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);
+ * ```
  */
 
  */
 
-L.Polygon = L.Polyline.extend({
-       options: {
-               fill: true
-       },
-
-       initialize: function (latlngs, options) {
-               L.Polyline.prototype.initialize.call(this, latlngs, options);
-               this._initWithHoles(latlngs);
-       },
-
-       _initWithHoles: function (latlngs) {
-               var i, len, hole;
-               if (latlngs && L.Util.isArray(latlngs[0]) && (typeof latlngs[0][0] !== 'number')) {
-                       this._latlngs = this._convertLatLngs(latlngs[0]);
-                       this._holes = latlngs.slice(1);
+var VideoOverlay = ImageOverlay.extend({
 
 
-                       for (i = 0, len = this._holes.length; i < len; i++) {
-                               hole = this._holes[i] = this._convertLatLngs(this._holes[i]);
-                               if (hole[0].equals(hole[hole.length - 1])) {
-                                       hole.pop();
-                               }
-                       }
-               }
+       // @section
+       // @aka VideoOverlay options
+       options: {
+               // @option autoplay: Boolean = true
+               // Whether the video starts playing automatically when loaded.
+               autoplay: true,
 
 
-               // filter out last point if its equal to the first one
-               latlngs = this._latlngs;
+               // @option loop: Boolean = true
+               // Whether the video will loop back to the beginning when played.
+               loop: true,
 
 
-               if (latlngs.length >= 2 && latlngs[0].equals(latlngs[latlngs.length - 1])) {
-                       latlngs.pop();
-               }
+               // @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
        },
 
        },
 
-       projectLatlngs: function () {
-               L.Polyline.prototype.projectLatlngs.call(this);
-
-               // project polygon holes points
-               // TODO move this logic to Polyline to get rid of duplication
-               this._holePoints = [];
+       _initImage: function () {
+               var wasElementSupplied = this._url.tagName === 'VIDEO';
+               var vid = this._image = wasElementSupplied ? this._url : create$1('video');
 
 
-               if (!this._holes) { return; }
+               addClass(vid, 'leaflet-image-layer');
+               if (this._zoomAnimated) { addClass(vid, 'leaflet-zoom-animated'); }
 
 
-               var i, j, len, len2;
+               vid.onselectstart = falseFn;
+               vid.onmousemove = falseFn;
 
 
-               for (i = 0, len = this._holes.length; i < len; i++) {
-                       this._holePoints[i] = [];
+               // @event load: Event
+               // Fired when the video has finished loading the first frame
+               vid.onloadeddata = bind(this.fire, this, 'load');
 
 
-                       for (j = 0, len2 = this._holes[i].length; j < len2; j++) {
-                               this._holePoints[i][j] = this._map.latLngToLayerPoint(this._holes[i][j]);
+               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;
                }
                }
-       },
 
 
-       setLatLngs: function (latlngs) {
-               if (latlngs && L.Util.isArray(latlngs[0]) && (typeof latlngs[0][0] !== 'number')) {
-                       this._initWithHoles(latlngs);
-                       return this.redraw();
-               } else {
-                       return L.Polyline.prototype.setLatLngs.call(this, latlngs);
+               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);
                }
                }
-       },
+       }
 
 
-       _clipPoints: function () {
-               var points = this._originalPoints,
-                   newParts = [];
+       // @method getElement(): HTMLVideoElement
+       // Returns the instance of [`HTMLVideoElement`](https://developer.mozilla.org/docs/Web/API/HTMLVideoElement)
+       // used by this overlay.
+});
 
 
-               this._parts = [points].concat(this._holePoints);
 
 
-               if (this.options.noClip) { return; }
+// @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.
 
 
-               for (var i = 0, len = this._parts.length; i < len; i++) {
-                       var clipped = L.PolyUtil.clipPolygon(this._parts[i], this._map._pathViewport);
-                       if (clipped.length) {
-                               newParts.push(clipped);
-                       }
-               }
+function videoOverlay(video, bounds, options) {
+       return new VideoOverlay(video, bounds, options);
+}
 
 
-               this._parts = newParts;
-       },
+/*
+ * @class SVGOverlay
+ * @aka L.SVGOverlay
+ * @inherits ImageOverlay
+ *
+ * Used to load, display and provide DOM access to an SVG file over specific bounds of the map. Extends `ImageOverlay`.
+ *
+ * An SVG overlay uses the [`<svg>`](https://developer.mozilla.org/docs/Web/SVG/Element/svg) element.
+ *
+ * @example
+ *
+ * ```js
+ * 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);
+ * ```
+ */
+
+var SVGOverlay = ImageOverlay.extend({
+       _initImage: function () {
+               var el = this._image = this._url;
+
+               addClass(el, 'leaflet-image-layer');
+               if (this._zoomAnimated) { addClass(el, 'leaflet-zoom-animated'); }
 
 
-       _getPathPartStr: function (points) {
-               var str = L.Polyline.prototype._getPathPartStr.call(this, points);
-               return str + (L.Browser.svg ? 'z' : 'x');
+               el.onselectstart = falseFn;
+               el.onmousemove = falseFn;
        }
        }
+
+       // @method getElement(): SVGElement
+       // Returns the instance of [`SVGElement`](https://developer.mozilla.org/docs/Web/API/SVGElement)
+       // used by this overlay.
 });
 
 });
 
-L.polygon = function (latlngs, options) {
-       return new L.Polygon(latlngs, options);
-};
 
 
+// @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);
+}
 
 /*
 
 /*
- * Contains L.MultiPolyline and L.MultiPolygon layers.
+ * @class DivOverlay
+ * @inherits Layer
+ * @aka L.DivOverlay
+ * Base model for L.Popup and L.Tooltip. Inherit from it for custom popup like plugins.
  */
 
  */
 
-(function () {
-       function createMulti(Klass) {
+// @namespace DivOverlay
+var DivOverlay = Layer.extend({
 
 
-               return L.FeatureGroup.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],
 
 
-                       initialize: function (latlngs, options) {
-                               this._layers = {};
-                               this._options = options;
-                               this.setLatLngs(latlngs);
-                       },
+               // @option className: String = ''
+               // A custom CSS class name to assign to the popup.
+               className: '',
 
 
-                       setLatLngs: function (latlngs) {
-                               var i = 0,
-                                   len = latlngs.length;
+               // @option pane: String = 'popupPane'
+               // `Map pane` where the popup will be added.
+               pane: 'popupPane'
+       },
 
 
-                               this.eachLayer(function (layer) {
-                                       if (i < len) {
-                                               layer.setLatLngs(latlngs[i++]);
-                                       } else {
-                                               this.removeLayer(layer);
-                                       }
-                               }, this);
+       initialize: function (options, source) {
+               setOptions(this, options);
 
 
-                               while (i < len) {
-                                       this.addLayer(new Klass(latlngs[i++], this._options));
-                               }
+               this._source = source;
+       },
 
 
-                               return this;
-                       },
+       onAdd: function (map) {
+               this._zoomAnimated = map._zoomAnimated;
+
+               if (!this._container) {
+                       this._initLayout();
+               }
 
 
-                       getLatLngs: function () {
-                               var latlngs = [];
+               if (map._fadeAnimated) {
+                       setOpacity(this._container, 0);
+               }
 
 
-                               this.eachLayer(function (layer) {
-                                       latlngs.push(layer.getLatLngs());
-                               });
+               clearTimeout(this._removeTimeout);
+               this.getPane().appendChild(this._container);
+               this.update();
 
 
-                               return latlngs;
-                       }
-               });
-       }
+               if (map._fadeAnimated) {
+                       setOpacity(this._container, 1);
+               }
 
 
-       L.MultiPolyline = createMulti(L.Polyline);
-       L.MultiPolygon = createMulti(L.Polygon);
+               this.bringToFront();
+       },
 
 
-       L.multiPolyline = function (latlngs, options) {
-               return new L.MultiPolyline(latlngs, options);
-       };
+       onRemove: function (map) {
+               if (map._fadeAnimated) {
+                       setOpacity(this._container, 0);
+                       this._removeTimeout = setTimeout(bind(remove, undefined, this._container), 200);
+               } else {
+                       remove(this._container);
+               }
+       },
 
 
-       L.multiPolygon = function (latlngs, options) {
-               return new L.MultiPolygon(latlngs, options);
-       };
-}());
+       // @namespace Popup
+       // @method getLatLng: LatLng
+       // Returns the geographical point of popup.
+       getLatLng: function () {
+               return this._latlng;
+       },
 
 
+       // @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.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds object.
- */
+       // @method getContent: String|HTMLElement
+       // Returns the content of the popup.
+       getContent: function () {
+               return this._content;
+       },
 
 
-L.Rectangle = L.Polygon.extend({
-       initialize: function (latLngBounds, options) {
-               L.Polygon.prototype.initialize.call(this, this._boundsToLatLngs(latLngBounds), options);
+       // @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;
        },
 
        },
 
-       setBounds: function (latLngBounds) {
-               this.setLatLngs(this._boundsToLatLngs(latLngBounds));
+       // @method getElement: String|HTMLElement
+       // Alias for [getContent()](#popup-getcontent)
+       getElement: function () {
+               return this._container;
        },
 
        },
 
-       _boundsToLatLngs: function (latLngBounds) {
-               latLngBounds = L.latLngBounds(latLngBounds);
-               return [
-                       latLngBounds.getSouthWest(),
-                       latLngBounds.getNorthWest(),
-                       latLngBounds.getNorthEast(),
-                       latLngBounds.getSouthEast()
-               ];
-       }
-});
+       // @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; }
 
 
-L.rectangle = function (latLngBounds, options) {
-       return new L.Rectangle(latLngBounds, options);
-};
+               this._container.style.visibility = 'hidden';
 
 
+               this._updateContent();
+               this._updateLayout();
+               this._updatePosition();
 
 
-/*
- * L.Circle is a circle overlay (with a certain radius in meters).
- */
+               this._container.style.visibility = '';
 
 
-L.Circle = L.Path.extend({
-       initialize: function (latlng, radius, options) {
-               L.Path.prototype.initialize.call(this, options);
+               this._adjustPan();
+       },
 
 
-               this._latlng = L.latLng(latlng);
-               this._mRadius = radius;
+       getEvents: function () {
+               var events = {
+                       zoom: this._updatePosition,
+                       viewreset: this._updatePosition
+               };
+
+               if (this._zoomAnimated) {
+                       events.zoomanim = this._animateZoom;
+               }
+               return events;
        },
 
        },
 
-       options: {
-               fill: true
+       // @method isOpen: Boolean
+       // Returns `true` when the popup is visible on the map.
+       isOpen: function () {
+               return !!this._map && this._map.hasLayer(this);
        },
 
        },
 
-       setLatLng: function (latlng) {
-               this._latlng = L.latLng(latlng);
-               return this.redraw();
+       // @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;
        },
 
        },
 
-       setRadius: function (radius) {
-               this._mRadius = radius;
-               return this.redraw();
+       // @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;
        },
 
        },
 
-       projectLatlngs: function () {
-               var lngRadius = this._getLngRadius(),
-                   latlng = this._latlng,
-                   pointLeft = this._map.latLngToLayerPoint([latlng.lat, latlng.lng - lngRadius]);
+       _prepareOpen: function (parent, layer, latlng) {
+               if (!(layer instanceof Layer)) {
+                       latlng = layer;
+                       layer = parent;
+               }
 
 
-               this._point = this._map.latLngToLayerPoint(latlng);
-               this._radius = Math.max(this._point.x - pointLeft.x, 1);
-       },
+               if (layer instanceof FeatureGroup) {
+                       for (var id in parent._layers) {
+                               layer = parent._layers[id];
+                               break;
+                       }
+               }
 
 
-       getBounds: function () {
-               var lngRadius = this._getLngRadius(),
-                   latRadius = (this._mRadius / 40075017) * 360,
-                   latlng = this._latlng;
+               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.');
+                       }
+               }
 
 
-               return new L.LatLngBounds(
-                       [latlng.lat - latRadius, latlng.lng - lngRadius],
-                       [latlng.lat + latRadius, latlng.lng + lngRadius]);
-       },
+               // set overlay source to this layer
+               this._source = layer;
 
 
-       getLatLng: function () {
-               return this._latlng;
+               // update the overlay (content, layout, ect...)
+               this.update();
+
+               return latlng;
        },
 
        },
 
-       getPathString: function () {
-               var p = this._point,
-                   r = this._radius;
+       _updateContent: function () {
+               if (!this._content) { return; }
 
 
-               if (this._checkIfEmpty()) {
-                       return '';
-               }
+               var node = this._contentNode;
+               var content = (typeof this._content === 'function') ? this._content(this._source || this) : this._content;
 
 
-               if (L.Browser.svg) {
-                       return 'M' + p.x + ',' + (p.y - r) +
-                              'A' + r + ',' + r + ',0,1,1,' +
-                              (p.x - 0.1) + ',' + (p.y - r) + ' z';
+               if (typeof content === 'string') {
+                       node.innerHTML = content;
                } else {
                } else {
-                       p._round();
-                       r = Math.round(r);
-                       return 'AL ' + p.x + ',' + p.y + ' ' + r + ',' + r + ' 0,' + (65535 * 360);
+                       while (node.hasChildNodes()) {
+                               node.removeChild(node.firstChild);
+                       }
+                       node.appendChild(content);
                }
                }
+               this.fire('contentupdate');
        },
 
        },
 
-       getRadius: function () {
-               return this._mRadius;
-       },
+       _updatePosition: function () {
+               if (!this._map) { return; }
 
 
-       // TODO Earth hardcoded, move into projection code!
+               var pos = this._map.latLngToLayerPoint(this._latlng),
+                   offset = toPoint(this.options.offset),
+                   anchor = this._getAnchor();
 
 
-       _getLatRadius: function () {
-               return (this._mRadius / 40075017) * 360;
-       },
+               if (this._zoomAnimated) {
+                       setPosition(this._container, pos.add(anchor));
+               } else {
+                       offset = offset.add(pos).add(anchor);
+               }
 
 
-       _getLngRadius: function () {
-               return this._getLatRadius() / Math.cos(L.LatLng.DEG_TO_RAD * this._latlng.lat);
-       },
+               var bottom = this._containerBottom = -offset.y,
+                   left = this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x;
 
 
-       _checkIfEmpty: function () {
-               if (!this._map) {
-                       return false;
-               }
-               var vp = this._map._pathViewport,
-                   r = this._radius,
-                   p = this._point;
+               // 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 p.x - r > vp.max.x || p.y - r > vp.max.y ||
-                      p.x + r < vp.min.x || p.y + r < vp.min.y;
+       _getAnchor: function () {
+               return [0, 0];
        }
        }
-});
-
-L.circle = function (latlng, radius, options) {
-       return new L.Circle(latlng, radius, options);
-};
 
 
+});
 
 /*
 
 /*
- * L.CircleMarker is a circle overlay with a permanent pixel radius.
+ * @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);
+ * ```
  */
 
  */
 
-L.CircleMarker = L.Circle.extend({
+
+// @namespace Popup
+var Popup = DivOverlay.extend({
+
+       // @section
+       // @aka Popup options
        options: {
        options: {
-               radius: 10,
-               weight: 2
-       },
+               // @option maxWidth: Number = 300
+               // Max width of the popup, in pixels.
+               maxWidth: 300,
 
 
-       initialize: function (latlng, options) {
-               L.Circle.prototype.initialize.call(this, latlng, null, options);
-               this._radius = this.options.radius;
-       },
+               // @option minWidth: Number = 50
+               // Min width of the popup, in pixels.
+               minWidth: 50,
 
 
-       projectLatlngs: function () {
-               this._point = this._map.latLngToLayerPoint(this._latlng);
-       },
+               // @option maxHeight: Number = null
+               // If set, creates a scrollable container of the given height
+               // inside a popup if its content exceeds it.
+               maxHeight: null,
 
 
-       _updateStyle : function () {
-               L.Circle.prototype._updateStyle.call(this);
-               this.setRadius(this.options.radius);
-       },
+               // @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,
 
 
-       setLatLng: function (latlng) {
-               L.Circle.prototype.setLatLng.call(this, latlng);
-               if (this._popup && this._popup._isOpen) {
-                       this._popup.setLatLng(latlng);
-               }
-       },
+               // @option autoPanPaddingTopLeft: Point = null
+               // The margin between the popup and the top left corner of the map
+               // view after autopanning was performed.
+               autoPanPaddingTopLeft: null,
 
 
-       setRadius: function (radius) {
-               this.options.radius = this._radius = radius;
-               return this.redraw();
-       },
+               // @option autoPanPaddingBottomRight: Point = null
+               // The margin between the popup and the bottom right corner of the map
+               // view after autopanning was performed.
+               autoPanPaddingBottomRight: null,
 
 
-       getRadius: function () {
-               return this._radius;
-       }
-});
+               // @option autoPanPadding: Point = Point(5, 5)
+               // Equivalent of setting both top left and bottom right autopan padding to the same value.
+               autoPanPadding: [5, 5],
 
 
-L.circleMarker = function (latlng, options) {
-       return new L.CircleMarker(latlng, 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,
 
 
+               // @option closeButton: Boolean = true
+               // Controls the presence of a close button in the popup.
+               closeButton: true,
 
 
-/*
- * Extends L.Polyline to be able to manually detect clicks on Canvas-rendered polylines.
- */
+               // @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,
 
 
-L.Polyline.include(!L.Path.CANVAS ? {} : {
-       _containsPoint: function (p, closed) {
-               var i, j, k, len, len2, dist, part,
-                   w = this.options.weight / 2;
+               // @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,
+
+               // @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.
+
+               // @option className: String = ''
+               // A custom CSS class name to assign to the popup.
+               className: ''
+       },
+
+       // @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;
+       },
+
+       onAdd: function (map) {
+               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});
 
 
-               if (L.Browser.touch) {
-                       w += 10; // polyline click tolerance on touch devices
+               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);
+                       }
                }
                }
+       },
 
 
-               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++) {
-                               if (!closed && (j === 0)) {
-                                       continue;
-                               }
+       onRemove: function (map) {
+               DivOverlay.prototype.onRemove.call(this, map);
 
 
-                               dist = L.LineUtil.pointToSegmentDistance(p, part[k], part[j]);
+               // @namespace Map
+               // @section Popup events
+               // @event popupclose: PopupEvent
+               // Fired when a popup in the map is closed
+               map.fire('popupclose', {popup: this});
 
 
-                               if (dist <= w) {
-                                       return true;
-                               }
+               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);
                        }
                }
                        }
                }
-               return false;
-       }
-});
+       },
 
 
+       getEvents: function () {
+               var events = DivOverlay.prototype.getEvents.call(this);
 
 
-/*
- * Extends L.Polygon to be able to manually detect clicks on Canvas-rendered polygons.
- */
+               if (this.options.closeOnClick !== undefined ? this.options.closeOnClick : this._map.options.closePopupOnClick) {
+                       events.preclick = this._close;
+               }
 
 
-L.Polygon.include(!L.Path.CANVAS ? {} : {
-       _containsPoint: function (p) {
-               var inside = false,
-                   part, p1, p2,
-                   i, j, k,
-                   len, len2;
+               if (this.options.keepInView) {
+                       events.moveend = this._adjustPan;
+               }
 
 
-               // TODO optimization: check if within bounds first
+               return events;
+       },
 
 
-               if (L.Polyline.prototype._containsPoint.call(this, p, true)) {
-                       // click on polygon border
-                       return true;
+       _close: function () {
+               if (this._map) {
+                       this._map.closePopup(this);
                }
                }
+       },
 
 
-               // ray casting algorithm for detecting if point is in polygon
+       _initLayout: function () {
+               var prefix = 'leaflet-popup',
+                   container = this._container = create$1('div',
+                       prefix + ' ' + (this.options.className || '') +
+                       ' leaflet-zoom-animated');
 
 
-               for (i = 0, len = this._parts.length; i < len; i++) {
-                       part = this._parts[i];
+               var wrapper = this._wrapper = create$1('div', prefix + '-content-wrapper', container);
+               this._contentNode = create$1('div', prefix + '-content', wrapper);
 
 
-                       for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
-                               p1 = part[j];
-                               p2 = part[k];
+               disableClickPropagation(wrapper);
+               disableScrollPropagation(this._contentNode);
+               on(wrapper, 'contextmenu', stopPropagation);
 
 
-                               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;
-                               }
-                       }
+               this._tipContainer = create$1('div', prefix + '-tip-container', container);
+               this._tip = create$1('div', prefix + '-tip', this._tipContainer);
+
+               if (this.options.closeButton) {
+                       var closeButton = this._closeButton = create$1('a', prefix + '-close-button', container);
+                       closeButton.href = '#close';
+                       closeButton.innerHTML = '&#215;';
+
+                       on(closeButton, 'click', this._onCloseButtonClick, this);
                }
                }
+       },
 
 
-               return inside;
-       }
-});
+       _updateLayout: function () {
+               var container = this._contentNode,
+                   style = container.style;
 
 
+               style.width = '';
+               style.whiteSpace = 'nowrap';
 
 
-/*
- * Extends L.Circle with Canvas-specific code.
- */
+               var width = container.offsetWidth;
+               width = Math.min(width, this.options.maxWidth);
+               width = Math.max(width, this.options.minWidth);
 
 
-L.Circle.include(!L.Path.CANVAS ? {} : {
-       _drawPath: function () {
-               var p = this._point;
-               this._ctx.beginPath();
-               this._ctx.arc(p.x, p.y, this._radius, 0, Math.PI * 2, false);
-       },
+               style.width = (width + 1) + 'px';
+               style.whiteSpace = '';
 
 
-       _containsPoint: function (p) {
-               var center = this._point,
-                   w2 = this.options.stroke ? this.options.weight / 2 : 0;
+               style.height = '';
 
 
-               return (p.distanceTo(center) <= this._radius + w2);
-       }
-});
+               var height = container.offsetHeight,
+                   maxHeight = this.options.maxHeight,
+                   scrolledClass = 'leaflet-popup-scrolled';
 
 
+               if (maxHeight && height > maxHeight) {
+                       style.height = maxHeight + 'px';
+                       addClass(container, scrolledClass);
+               } else {
+                       removeClass(container, scrolledClass);
+               }
 
 
-/*
- * CircleMarker canvas specific drawing parts.
- */
+               this._containerWidth = this._container.offsetWidth;
+       },
 
 
-L.CircleMarker.include(!L.Path.CANVAS ? {} : {
-       _updateStyle: function () {
-               L.Path.prototype._updateStyle.call(this);
-       }
-});
+       _animateZoom: function (e) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center),
+                   anchor = this._getAnchor();
+               setPosition(this._container, pos.add(anchor));
+       },
 
 
+       _adjustPan: function () {
+               if (!this.options.autoPan) { return; }
+               if (this._map._panAnim) { this._map._panAnim.stop(); }
 
 
-/*
- * L.GeoJSON turns any GeoJSON data into a Leaflet layer.
- */
+               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);
 
 
-L.GeoJSON = L.FeatureGroup.extend({
+               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]);
                }
        },
 
                }
        },
 
-       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(features[i]);
-                               }
-                       }
-                       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;
+});
+
+// @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);
+};
 
 
-               if (options.filter && !options.filter(geojson)) { return; }
 
 
-               var layer = L.GeoJSON.geometryToLayer(geojson, options.pointToLayer, options.coordsToLatLng, options);
-               layer.feature = L.GeoJSON.asFeature(geojson);
+/* @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
+});
 
 
-               layer.defaultOptions = layer.options;
-               this.resetStyle(layer);
 
 
-               if (options.onEachFeature) {
-                       options.onEachFeature(geojson, 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);
                }
 
                }
 
-               return this.addLayer(layer);
-       },
+               if (latlng) {
+                       popup.setLatLng(latlng);
+               }
 
 
-       resetStyle: function (layer) {
-               var style = this.options.style;
-               if (style) {
-                       // reset any custom styles
-                       L.Util.extend(layer.options, layer.defaultOptions);
+               if (this.hasLayer(popup)) {
+                       return this;
+               }
 
 
-                       this._setLayerStyle(layer, style);
+               if (this._popup && this._popup.options.autoClose) {
+                       this.closePopup();
                }
                }
-       },
 
 
-       setStyle: function (style) {
-               this.eachLayer(function (layer) {
-                       this._setLayerStyle(layer, style);
-               }, this);
+               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;
        }
 });
 
        }
 });
 
-L.extend(L.GeoJSON, {
-       geometryToLayer: function (geojson, pointToLayer, coordsToLatLng, vectorOptions) {
-               var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
-                   coords = geometry.coordinates,
-                   layers = [],
-                   latlng, latlngs, i, len;
+/*
+ * @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.
+ */
 
 
-               coordsToLatLng = coordsToLatLng || this.coordsToLatLng;
+// @section Popup methods
+Layer.include({
 
 
-               switch (geometry.type) {
-               case 'Point':
-                       latlng = coordsToLatLng(coords);
-                       return pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng);
+       // @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) {
 
 
-               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));
+               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);
+               }
 
 
-               case 'LineString':
-                       latlngs = this.coordsToLatLngs(coords, 0, coordsToLatLng);
-                       return new L.Polyline(latlngs, vectorOptions);
+               if (!this._popupHandlersAdded) {
+                       this.on({
+                               click: this._openPopup,
+                               keypress: this._onKeyPress,
+                               remove: this.closePopup,
+                               move: this._movePopup
+                       });
+                       this._popupHandlersAdded = true;
+               }
 
 
-               case 'Polygon':
-                       if (coords.length === 2 && !coords[1].length) {
-                               throw new Error('Invalid GeoJSON object.');
-                       }
-                       latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng);
-                       return new L.Polygon(latlngs, vectorOptions);
+               return this;
+       },
 
 
-               case 'MultiLineString':
-                       latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng);
-                       return new L.MultiPolyline(latlngs, vectorOptions);
+       // @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;
+       },
 
 
-               case 'MultiPolygon':
-                       latlngs = this.coordsToLatLngs(coords, 2, coordsToLatLng);
-                       return new L.MultiPolygon(latlngs, vectorOptions);
+       // @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);
 
 
-               case 'GeometryCollection':
-                       for (i = 0, len = geometry.geometries.length; i < len; i++) {
+                       // open the popup on the map
+                       this._map.openPopup(this._popup, latlng);
+               }
 
 
-                               layers.push(this.geometryToLayer({
-                                       geometry: geometry.geometries[i],
-                                       type: 'Feature',
-                                       properties: geojson.properties
-                               }, pointToLayer, coordsToLatLng, vectorOptions));
-                       }
-                       return new L.FeatureGroup(layers);
+               return this;
+       },
 
 
-               default:
-                       throw new Error('Invalid GeoJSON object.');
+       // @method closePopup(): this
+       // Closes the popup bound to this layer if it is open.
+       closePopup: function () {
+               if (this._popup) {
+                       this._popup._close();
                }
                }
+               return this;
        },
 
        },
 
-       coordsToLatLng: function (coords) { // (Array[, Boolean]) -> LatLng
-               return new L.LatLng(coords[1], coords[0], coords[2]);
+       // @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 this;
        },
 
        },
 
-       coordsToLatLngs: function (coords, levelsDeep, coordsToLatLng) { // (Array[, Number, Function]) -> Array
-               var latlng, i, len,
-                   latlngs = [];
-
-               for (i = 0, len = coords.length; i < len; i++) {
-                       latlng = levelsDeep ?
-                               this.coordsToLatLngs(coords[i], levelsDeep - 1, coordsToLatLng) :
-                               (coordsToLatLng || this.coordsToLatLng)(coords[i]);
+       // @method isPopupOpen(): boolean
+       // Returns `true` if the popup bound to this layer is currently open.
+       isPopupOpen: function () {
+               return (this._popup ? this._popup.isOpen() : false);
+       },
 
 
-                       latlngs.push(latlng);
+       // @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 latlngs;
+       // @method getPopup(): Popup
+       // Returns the popup bound to this layer.
+       getPopup: function () {
+               return this._popup;
        },
 
        },
 
-       latLngToCoords: function (latlng) {
-               var coords = [latlng.lng, latlng.lat];
+       _openPopup: function (e) {
+               var layer = e.layer || e.target;
+
+               if (!this._popup) {
+                       return;
+               }
 
 
-               if (latlng.alt !== undefined) {
-                       coords.push(latlng.alt);
+               if (!this._map) {
+                       return;
                }
                }
-               return coords;
-       },
 
 
-       latLngsToCoords: function (latLngs) {
-               var coords = [];
+               // prevent map click
+               stop(e);
 
 
-               for (var i = 0, len = latLngs.length; i < len; i++) {
-                       coords.push(L.GeoJSON.latLngToCoords(latLngs[i]));
+               // 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;
                }
 
                }
 
-               return coords;
+               // 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);
+               }
        },
 
        },
 
-       getFeature: function (layer, newGeometry) {
-               return layer.feature ? L.extend({}, layer.feature, {geometry: newGeometry}) : L.GeoJSON.asFeature(newGeometry);
+       _movePopup: function (e) {
+               this._popup.setLatLng(e.latlng);
        },
 
        },
 
-       asFeature: function (geoJSON) {
-               if (geoJSON.type === 'Feature') {
-                       return geoJSON;
+       _onKeyPress: function (e) {
+               if (e.originalEvent.keyCode === 13) {
+                       this._openPopup(e);
                }
                }
-
-               return {
-                       type: 'Feature',
-                       properties: {},
-                       geometry: geoJSON
-               };
-       }
-});
-
-var PointToGeoJSON = {
-       toGeoJSON: function () {
-               return L.GeoJSON.getFeature(this, {
-                       type: 'Point',
-                       coordinates: L.GeoJSON.latLngToCoords(this.getLatLng())
-               });
-       }
-};
-
-L.Marker.include(PointToGeoJSON);
-L.Circle.include(PointToGeoJSON);
-L.CircleMarker.include(PointToGeoJSON);
-
-L.Polyline.include({
-       toGeoJSON: function () {
-               return L.GeoJSON.getFeature(this, {
-                       type: 'LineString',
-                       coordinates: L.GeoJSON.latLngsToCoords(this.getLatLngs())
-               });
        }
 });
 
        }
 });
 
-L.Polygon.include({
-       toGeoJSON: function () {
-               var coords = [L.GeoJSON.latLngsToCoords(this.getLatLngs())],
-                   i, len, hole;
-
-               coords[0].push(coords[0][0]);
-
-               if (this._holes) {
-                       for (i = 0, len = this._holes.length; i < len; i++) {
-                               hole = L.GeoJSON.latLngsToCoords(this._holes[i]);
-                               hole.push(hole[0]);
-                               coords.push(hole);
-                       }
-               }
+/*
+ * @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.
+ */
 
 
-               return L.GeoJSON.getFeature(this, {
-                       type: 'Polygon',
-                       coordinates: coords
-               });
-       }
-});
 
 
-(function () {
-       function multiToGeoJSON(type) {
-               return function () {
-                       var coords = [];
+// @namespace Tooltip
+var Tooltip = DivOverlay.extend({
 
 
-                       this.eachLayer(function (layer) {
-                               coords.push(layer.toGeoJSON().geometry.coordinates);
-                       });
+       // @section
+       // @aka Tooltip options
+       options: {
+               // @option pane: String = 'tooltipPane'
+               // `Map pane` where the tooltip will be added.
+               pane: 'tooltipPane',
 
 
-                       return L.GeoJSON.getFeature(this, {
-                               type: type,
-                               coordinates: coords
-                       });
-               };
-       }
+               // @option offset: Point = Point(0, 0)
+               // Optional offset of the tooltip position.
+               offset: [0, 0],
 
 
-       L.MultiPolyline.include({toGeoJSON: multiToGeoJSON('MultiLineString')});
-       L.MultiPolygon.include({toGeoJSON: multiToGeoJSON('MultiPolygon')});
+               // @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',
 
 
-       L.LayerGroup.include({
-               toGeoJSON: function () {
+               // @option permanent: Boolean = false
+               // Whether to open the tooltip permanently or only on mouseover.
+               permanent: false,
 
 
-                       var geometry = this.feature && this.feature.geometry,
-                               jsons = [],
-                               json;
+               // @option sticky: Boolean = false
+               // If true, the tooltip will follow the mouse instead of being fixed at the feature center.
+               sticky: false,
 
 
-                       if (geometry && geometry.type === 'MultiPoint') {
-                               return multiToGeoJSON('MultiPoint').call(this);
-                       }
+               // @option interactive: Boolean = false
+               // If true, the tooltip will listen to the feature events.
+               interactive: false,
 
 
-                       var isGeometryCollection = geometry && geometry.type === 'GeometryCollection';
+               // @option opacity: Number = 0.9
+               // Tooltip container opacity.
+               opacity: 0.9
+       },
 
 
-                       this.eachLayer(function (layer) {
-                               if (layer.toGeoJSON) {
-                                       json = layer.toGeoJSON();
-                                       jsons.push(isGeometryCollection ? json.geometry : L.GeoJSON.asFeature(json));
-                               }
-                       });
+       onAdd: function (map) {
+               DivOverlay.prototype.onAdd.call(this, map);
+               this.setOpacity(this.options.opacity);
 
 
-                       if (isGeometryCollection) {
-                               return L.GeoJSON.getFeature(this, {
-                                       geometries: jsons,
-                                       type: 'GeometryCollection'
-                               });
-                       }
+               // @namespace Map
+               // @section Tooltip events
+               // @event tooltipopen: TooltipEvent
+               // Fired when a tooltip is opened in the map.
+               map.fire('tooltipopen', {tooltip: this});
 
 
-                       return {
-                               type: 'FeatureCollection',
-                               features: jsons
-                       };
+               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);
                }
                }
-       });
-}());
-
-L.geoJson = function (geojson, options) {
-       return new L.GeoJSON(geojson, options);
-};
+       },
 
 
+       onRemove: function (map) {
+               DivOverlay.prototype.onRemove.call(this, map);
 
 
-/*
- * L.DomEvent contains functions for working with DOM 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 = {
-       /* inspired by John Resig, Dean Edwards and YUI addEvent implementations */
-       addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
+               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);
+               }
+       },
 
 
-               var id = L.stamp(fn),
-                   key = '_leaflet_' + type + id,
-                   handler, originalHandler, newType;
+       getEvents: function () {
+               var events = DivOverlay.prototype.getEvents.call(this);
 
 
-               if (obj[key]) { return this; }
+               if (touch && !this.options.permanent) {
+                       events.preclick = this._close;
+               }
 
 
-               handler = function (e) {
-                       return fn.call(context || obj, e || L.DomEvent._getEvent());
-               };
+               return events;
+       },
 
 
-               if (L.Browser.pointer && type.indexOf('touch') === 0) {
-                       return this.addPointerListener(obj, type, handler, id);
-               }
-               if (L.Browser.touch && (type === 'dblclick') && this.addDoubleTapListener) {
-                       this.addDoubleTapListener(obj, handler, id);
+       _close: function () {
+               if (this._map) {
+                       this._map.closeTooltip(this);
                }
                }
+       },
 
 
-               if ('addEventListener' in obj) {
+       _initLayout: function () {
+               var prefix = 'leaflet-tooltip',
+                   className = prefix + ' ' + (this.options.className || '') + ' leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
 
 
-                       if (type === 'mousewheel') {
-                               obj.addEventListener('DOMMouseScroll', handler, false);
-                               obj.addEventListener(type, handler, false);
+               this._contentNode = this._container = create$1('div', className);
+       },
 
 
-                       } else if ((type === 'mouseenter') || (type === 'mouseleave')) {
+       _updateLayout: function () {},
 
 
-                               originalHandler = handler;
-                               newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout');
+       _adjustPan: function () {},
 
 
-                               handler = function (e) {
-                                       if (!L.DomEvent._checkMouse(obj, e)) { return; }
-                                       return originalHandler(e);
-                               };
+       _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();
+
+               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));
+               }
 
 
-                               obj.addEventListener(newType, handler, false);
+               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);
+       },
 
 
-                       } else if (type === 'click' && L.Browser.android) {
-                               originalHandler = handler;
-                               handler = function (e) {
-                                       return L.DomEvent._filterClick(e, originalHandler);
-                               };
+       _updatePosition: function () {
+               var pos = this._map.latLngToLayerPoint(this._latlng);
+               this._setPosition(pos);
+       },
 
 
-                               obj.addEventListener(type, handler, false);
-                       } else {
-                               obj.addEventListener(type, handler, false);
-                       }
+       setOpacity: function (opacity) {
+               this.options.opacity = opacity;
 
 
-               } else if ('attachEvent' in obj) {
-                       obj.attachEvent('on' + type, handler);
+               if (this._container) {
+                       setOpacity(this._container, opacity);
                }
                }
-
-               obj[key] = handler;
-
-               return this;
        },
 
        },
 
-       removeListener: function (obj, type, fn) {  // (HTMLElement, String, Function)
+       _animateZoom: function (e) {
+               var pos = this._map._latLngToNewLayerPoint(this._latlng, e.zoom, e.center);
+               this._setPosition(pos);
+       },
 
 
-               var id = L.stamp(fn),
-                   key = '_leaflet_' + type + id,
-                   handler = obj[key];
+       _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]);
+       }
 
 
-               if (!handler) { 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 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 ('removeEventListener' in obj) {
+// @namespace Map
+// @section Methods for Layers and Controls
+Map.include({
 
 
-                       if (type === 'mousewheel') {
-                               obj.removeEventListener('DOMMouseScroll', handler, false);
-                               obj.removeEventListener(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 ((type === 'mouseenter') || (type === 'mouseleave')) {
-                               obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);
-                       } else {
-                               obj.removeEventListener(type, handler, false);
-                       }
-               } else if ('detachEvent' in obj) {
-                       obj.detachEvent('on' + type, handler);
+               if (latlng) {
+                       tooltip.setLatLng(latlng);
                }
 
                }
 
-               obj[key] = null;
+               if (this.hasLayer(tooltip)) {
+                       return this;
+               }
 
 
-               return this;
+               return this.addLayer(tooltip);
        },
 
        },
 
-       stopPropagation: function (e) {
-
-               if (e.stopPropagation) {
-                       e.stopPropagation();
-               } else {
-                       e.cancelBubble = true;
+       // @method closeTooltip(tooltip?: Tooltip): this
+       // Closes the tooltip given as parameter.
+       closeTooltip: function (tooltip) {
+               if (tooltip) {
+                       this.removeLayer(tooltip);
                }
                }
-               L.DomEvent._skipped(e);
-
                return this;
                return this;
-       },
-
-       disableScrollPropagation: function (el) {
-               var stop = L.DomEvent.stopPropagation;
-
-               return L.DomEvent
-                       .on(el, 'mousewheel', stop)
-                       .on(el, 'MozMousePixelScroll', stop);
-       },
+       }
 
 
-       disableClickPropagation: function (el) {
-               var stop = L.DomEvent.stopPropagation;
+});
 
 
-               for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
-                       L.DomEvent.on(el, L.Draggable.START[i], stop);
-               }
+/*
+ * @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();
+ * ```
+ */
 
 
-               return L.DomEvent
-                       .on(el, 'click', L.DomEvent._fakeStop)
-                       .on(el, 'dblclick', stop);
-       },
+// @section Tooltip methods
+Layer.include({
 
 
-       preventDefault: function (e) {
+       // @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) {
 
 
-               if (e.preventDefault) {
-                       e.preventDefault();
+               if (content instanceof Tooltip) {
+                       setOptions(content, options);
+                       this._tooltip = content;
+                       content._source = this;
                } else {
                } else {
-                       e.returnValue = false;
-               }
-               return this;
-       },
+                       if (!this._tooltip || options) {
+                               this._tooltip = new Tooltip(options, this);
+                       }
+                       this._tooltip.setContent(content);
 
 
-       stop: function (e) {
-               return L.DomEvent
-                       .preventDefault(e)
-                       .stopPropagation(e);
-       },
+               }
 
 
-       getMousePosition: function (e, container) {
-               var body = document.body,
-                   docEl = document.documentElement,
-                   //gecko makes scrollLeft more negative as you scroll in rtl, other browsers don't
-                       //ref: https://code.google.com/p/closure-library/source/browse/closure/goog/style/bidi.js
-                       x = L.DomUtil.documentIsLtr() ?
-                                       (e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft : e.clientX) :
-                                               (L.Browser.gecko ? e.pageX - body.scrollLeft - docEl.scrollLeft :
-                                                e.pageX ? e.pageX - body.scrollLeft + docEl.scrollLeft : e.clientX),
-                   y = e.pageY ? e.pageY - body.scrollTop - docEl.scrollTop: e.clientY,
-                   pos = new L.Point(x, y);
+               this._initTooltipInteractions();
 
 
-               if (!container) {
-                       return pos;
+               if (this._tooltip.options.permanent && this._map && this._map.hasLayer(this)) {
+                       this.openTooltip();
                }
 
                }
 
-               var rect = container.getBoundingClientRect(),
-                   left = rect.left - container.clientLeft,
-                   top = rect.top - container.clientTop;
-
-               return pos._subtract(new L.Point(left, top));
+               return this;
        },
 
        },
 
-       getWheelDelta: function (e) {
-
-               var delta = 0;
-
-               if (e.wheelDelta) {
-                       delta = e.wheelDelta / 120;
-               }
-               if (e.detail) {
-                       delta = -e.detail / 3;
+       // @method unbindTooltip(): this
+       // Removes the tooltip previously bound with `bindTooltip`.
+       unbindTooltip: function () {
+               if (this._tooltip) {
+                       this._initTooltipInteractions(true);
+                       this.closeTooltip();
+                       this._tooltip = null;
                }
                }
-               return delta;
-       },
-
-       _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;
+               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;
+       _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 {
+                       events.add = this._openTooltip;
+               }
+               this[onOff](events);
+               this._tooltipHandlersAdded = !remove$$1;
        },
 
        },
 
-       // check if element really left/entered the event target (for mouseenter/mouseleave)
-       _checkMouse: function (el, 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);
 
 
-               var related = e.relatedTarget;
+                       // open the tooltip on the map
+                       this._map.openTooltip(this._tooltip, latlng);
 
 
-               if (!related) { return true; }
-
-               try {
-                       while (related && (related !== el)) {
-                               related = related.parentNode;
+                       // 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);
                        }
                        }
-               } catch (err) {
-                       return false;
                }
                }
-               return (related !== el);
+
+               return this;
        },
 
        },
 
-       _getEvent: function () { // evil magic for IE
-               /*jshint noarg:false */
-               var e = window.event;
-               if (!e) {
-                       var caller = arguments.callee.caller;
-                       while (caller) {
-                               e = caller['arguments'][0];
-                               if (e && window.Event === e.constructor) {
-                                       break;
-                               }
-                               caller = caller.caller;
+       // @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 e;
+               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.timeStamp),
-                       elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick);
-
-               // are they closer together than 1000ms yet more than 100ms?
-               // Android typically triggers them ~300ms apart while multiple listeners
-               // on the same event should be triggered far faster;
-               // or check if click is simulated on the element, and if it is, reject any non-simulated events
-
-               if ((elapsed && elapsed > 100 && elapsed < 1000) || (e.target._simulatedClick && !e._simulated)) {
-                       L.DomEvent.stop(e);
-                       return;
+       // @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);
+                       }
                }
                }
-               L.DomEvent._lastClick = timeStamp;
-
-               return handler(e);
-       }
-};
-
-L.DomEvent.on = L.DomEvent.addListener;
-L.DomEvent.off = L.DomEvent.removeListener;
-
-
-/*
- * L.Draggable allows you to add dragging capabilities to any element. Supports mobile devices too.
- */
+               return this;
+       },
 
 
-L.Draggable = L.Class.extend({
-       includes: L.Mixin.Events,
+       // @method isTooltipOpen(): boolean
+       // Returns `true` if the tooltip bound to this layer is currently open.
+       isTooltipOpen: function () {
+               return this._tooltip.isOpen();
+       },
 
 
-       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'
+       // @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 this;
        },
 
        },
 
-       initialize: function (element, dragStartTarget) {
-               this._element = element;
-               this._dragStartTarget = dragStartTarget || element;
+       // @method getTooltip(): Tooltip
+       // Returns the tooltip bound to this layer.
+       getTooltip: function () {
+               return this._tooltip;
        },
 
        },
 
-       enable: function () {
-               if (this._enabled) { return; }
+       _openTooltip: function (e) {
+               var layer = e.layer || e.target;
 
 
-               for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
-                       L.DomEvent.on(this._dragStartTarget, L.Draggable.START[i], this._onDown, this);
+               if (!this._tooltip || !this._map) {
+                       return;
                }
                }
-
-               this._enabled = true;
+               this.openTooltip(layer, this._tooltip.options.sticky ? e.latlng : undefined);
        },
 
        },
 
-       disable: function () {
-               if (!this._enabled) { return; }
-
-               for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
-                       L.DomEvent.off(this._dragStartTarget, L.Draggable.START[i], this._onDown, this);
+       _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);
+       }
+});
 
 
-               this._enabled = false;
-               this._moved = false;
-       },
+/*
+ * @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.
+ */
 
 
-       _onDown: function (e) {
-               this._moved = false;
+var DivIcon = Icon.extend({
+       options: {
+               // @section
+               // @aka DivIcon options
+               iconSize: [12, 12], // also can be set through CSS
 
 
-               if (e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
+               // iconAnchor: (Point),
+               // popupAnchor: (Point),
 
 
-               L.DomEvent.stopPropagation(e);
+               // @option html: String|HTMLElement = ''
+               // Custom HTML code to put inside the div element, empty by default. Alternatively,
+               // an instance of `HTMLElement`.
+               html: false,
 
 
-               if (L.Draggable._disabled) { return; }
+               // @option bgPos: Point = [0, 0]
+               // Optional relative position of the background, in pixels
+               bgPos: null,
 
 
-               L.DomUtil.disableImageDrag();
-               L.DomUtil.disableTextSelection();
+               className: 'leaflet-div-icon'
+       },
 
 
-               if (this._moving) { return; }
+       createIcon: function (oldIcon) {
+               var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
+                   options = this.options;
 
 
-               var first = e.touches ? e.touches[0] : e;
+               if (options.html instanceof Element) {
+                       empty(div);
+                       div.appendChild(options.html);
+               } else {
+                       div.innerHTML = options.html !== false ? options.html : '';
+               }
 
 
-               this._startPoint = new L.Point(first.clientX, first.clientY);
-               this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
+               if (options.bgPos) {
+                       var bgPos = toPoint(options.bgPos);
+                       div.style.backgroundPosition = (-bgPos.x) + 'px ' + (-bgPos.y) + 'px';
+               }
+               this._setIconStyles(div, 'icon');
 
 
-               L.DomEvent
-                   .on(document, L.Draggable.MOVE[e.type], this._onMove, this)
-                   .on(document, L.Draggable.END[e.type], this._onUp, this);
+               return div;
        },
 
        },
 
-       _onMove: function (e) {
-               if (e.touches && e.touches.length > 1) {
-                       this._moved = true;
-                       return;
-               }
+       createShadow: function () {
+               return null;
+       }
+});
 
 
-               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);
+// @factory L.divIcon(options: DivIcon options)
+// Creates a `DivIcon` instance with the given options.
+function divIcon(options) {
+       return new DivIcon(options);
+}
 
 
-               if (!offset.x && !offset.y) { return; }
+Icon.Default = IconDefault;
 
 
-               L.DomEvent.preventDefault(e);
+/*
+ * @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
+ */
 
 
-               if (!this._moved) {
-                       this.fire('dragstart');
 
 
-                       this._moved = true;
-                       this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);
+var GridLayer = Layer.extend({
 
 
-                       L.DomUtil.addClass(document.body, 'leaflet-dragging');
-                       L.DomUtil.addClass((e.target || e.srcElement), 'leaflet-drag-target');
-               }
+       // @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,
 
 
-               this._newPos = this._startPos.add(offset);
-               this._moving = true;
+               // @option opacity: Number = 1.0
+               // Opacity of the tiles. Can be used in the `createTile()` function.
+               opacity: 1,
 
 
-               L.Util.cancelAnimFrame(this._animRequest);
-               this._animRequest = L.Util.requestAnimFrame(this._updatePosition, this, true, this._dragStartTarget);
-       },
+               // @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,
 
 
-       _updatePosition: function () {
-               this.fire('predrag');
-               L.DomUtil.setPosition(this._element, this._newPos);
-               this.fire('drag');
-       },
+               // @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,
 
 
-       _onUp: function (e) {
-               L.DomUtil.removeClass(document.body, 'leaflet-dragging');
-               L.DomUtil.removeClass((e.target || e.srcElement), 'leaflet-drag-target');
+               // @option updateInterval: Number = 200
+               // Tiles will not update more than once every `updateInterval` milliseconds when panning.
+               updateInterval: 200,
 
 
-               for (var i in L.Draggable.MOVE) {
-                       L.DomEvent
-                           .off(document, L.Draggable.MOVE[i], this._onMove)
-                           .off(document, L.Draggable.END[i], this._onUp);
-               }
+               // @option zIndex: Number = 1
+               // The explicit zIndex of the tile layer.
+               zIndex: 1,
 
 
-               L.DomUtil.enableImageDrag();
-               L.DomUtil.enableTextSelection();
+               // @option bounds: LatLngBounds = undefined
+               // If set, tiles will only be loaded inside the set `LatLngBounds`.
+               bounds: null,
 
 
-               if (this._moved) {
-                       // ensure drag is not fired after dragend
-                       L.Util.cancelAnimFrame(this._animRequest);
+               // @option minZoom: Number = 0
+               // The minimum zoom level down to which this layer will be displayed (inclusive).
+               minZoom: 0,
 
 
-                       this.fire('dragend', {
-                               distance: this._newPos.distanceTo(this._startPos)
-                       });
-               }
+               // @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,
+
+               // @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,
+
+               // @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,
 
 
-               this._moving = false;
-       }
-});
+               // @option pane: String = 'tilePane'
+               // `Map pane` where the grid layer will be added.
+               pane: 'tilePane',
 
 
+               // @option className: String = ''
+               // A custom class name to assign to the tile layer. Empty by default.
+               className: '',
 
 
-/*
-       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 keepBuffer: Number = 2
+               // When panning the map, keep this many rows and columns of tiles before unloading them.
+               keepBuffer: 2
+       },
 
 
-L.Handler = L.Class.extend({
-       initialize: function (map) {
-               this._map = map;
+       initialize: function (options) {
+               setOptions(this, options);
        },
 
        },
 
-       enable: function () {
-               if (this._enabled) { return; }
+       onAdd: function () {
+               this._initContainer();
 
 
-               this._enabled = true;
-               this.addHooks();
-       },
+               this._levels = {};
+               this._tiles = {};
 
 
-       disable: function () {
-               if (!this._enabled) { return; }
+               this._resetView();
+               this._update();
+       },
 
 
-               this._enabled = false;
-               this.removeHooks();
+       beforeAdd: function (map) {
+               map._addZoomLimit(this);
        },
 
        },
 
-       enabled: function () {
-               return !!this._enabled;
-       }
-});
+       onRemove: function (map) {
+               this._removeAllTiles();
+               remove(this._container);
+               map._removeZoomLimit(this);
+               this._container = null;
+               this._tileZoom = undefined;
+       },
 
 
+       // @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;
+       },
 
 
-/*
- * L.Handler.MapDrag is used to make the map draggable (with panning inertia), enabled by default.
- */
+       // @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;
+       },
 
 
-L.Map.mergeOptions({
-       dragging: true,
+       // @method getContainer: HTMLElement
+       // Returns the HTML element that contains the tiles for this layer.
+       getContainer: function () {
+               return this._container;
+       },
 
 
-       inertia: !L.Browser.android23,
-       inertiaDeceleration: 3400, // px/s^2
-       inertiaMaxSpeed: Infinity, // px/s
-       inertiaThreshold: L.Browser.touch ? 32 : 18, // ms
-       easeLinearity: 0.25,
+       // @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;
+       },
 
 
-       // TODO refactor, move to CRS
-       worldCopyJump: false
-});
+       // @method setZIndex(zIndex: Number): this
+       // Changes the [zIndex](#gridlayer-zindex) of the grid layer.
+       setZIndex: function (zIndex) {
+               this.options.zIndex = zIndex;
+               this._updateZIndex();
 
 
-L.Map.Drag = L.Handler.extend({
-       addHooks: function () {
-               if (!this._draggable) {
-                       var map = this._map;
+               return this;
+       },
 
 
-                       this._draggable = new L.Draggable(map._mapPane, map._container);
+       // @method isLoading: Boolean
+       // Returns `true` if any tile in the grid layer has not finished loading.
+       isLoading: function () {
+               return this._loading;
+       },
 
 
-                       this._draggable.on({
-                               'dragstart': this._onDragStart,
-                               'drag': this._onDrag,
-                               'dragend': this._onDragEnd
-                       }, this);
+       // @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;
+       },
 
 
-                       if (map.options.worldCopyJump) {
-                               this._draggable.on('predrag', this._onPreDrag, this);
-                               map.on('viewreset', this._onViewReset, this);
+       getEvents: function () {
+               var events = {
+                       viewprereset: this._invalidateAll,
+                       viewreset: this._resetView,
+                       zoom: this._resetView,
+                       moveend: this._onMoveEnd
+               };
 
 
-                               map.whenReady(this._onViewReset, 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);
                        }
                        }
+
+                       events.move = this._onMove;
                }
                }
-               this._draggable.enable();
-       },
 
 
-       removeHooks: function () {
-               this._draggable.disable();
+               if (this._zoomAnimated) {
+                       events.zoomanim = this._animateZoom;
+               }
+
+               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');
        },
 
        },
 
-       _onDragStart: function () {
-               var map = this._map;
+       // @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);
+       },
 
 
-               if (map._panAnim) {
-                       map._panAnim.stop();
+       _updateZIndex: function () {
+               if (this._container && this.options.zIndex !== undefined && this.options.zIndex !== null) {
+                       this._container.style.zIndex = this.options.zIndex;
                }
                }
+       },
 
 
-               map
-                   .fire('movestart')
-                   .fire('dragstart');
+       _setAutoZIndex: function (compare) {
+               // go through all other layers of the same pane, set zIndex to max + 1 (front) or min - 1 (back)
 
 
-               if (map.options.inertia) {
-                       this._positions = [];
-                       this._times = [];
-               }
-       },
+               var layers = this.getPane().children,
+                   edgeZIndex = -compare(-Infinity, Infinity); // -Infinity for max, Infinity for min
 
 
-       _onDrag: function () {
-               if (this._map.options.inertia) {
-                       var time = this._lastTime = +new Date(),
-                           pos = this._lastPos = this._draggable._newPos;
+               for (var i = 0, len = layers.length, zIndex; i < len; i++) {
 
 
-                       this._positions.push(pos);
-                       this._times.push(time);
+                       zIndex = layers[i].style.zIndex;
 
 
-                       if (time - this._times[0] > 200) {
-                               this._positions.shift();
-                               this._times.shift();
+                       if (layers[i] !== this._container && zIndex) {
+                               edgeZIndex = compare(edgeZIndex, +zIndex);
                        }
                }
 
                        }
                }
 
-               this._map
-                   .fire('move')
-                   .fire('drag');
+               if (isFinite(edgeZIndex)) {
+                       this.options.zIndex = edgeZIndex + compare(-1, 1);
+                       this._updateZIndex();
+               }
        },
 
        },
 
-       _onViewReset: function () {
-               // TODO fix hardcoded Earth values
-               var pxCenter = this._map.getSize()._divideBy(2),
-                   pxWorldCenter = this._map.latLngToLayerPoint([0, 0]);
+       _updateOpacity: function () {
+               if (!this._map) { return; }
 
 
-               this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
-               this._worldWidth = this._map.project([0, 180]).x;
-       },
+               // IE doesn't inherit filter opacity properly, so we're forced to set it on tiles
+               if (ielt9) { return; }
 
 
-       _onPreDrag: 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;
+               setOpacity(this._container, this.options.opacity);
 
 
-               this._draggable._newPos.x = newX;
-       },
+               var now = +new Date(),
+                   nextFrame = false,
+                   willPrune = false;
 
 
-       _onDragEnd: function (e) {
-               var map = this._map,
-                   options = map.options,
-                   delay = +new Date() - this._lastTime,
+               for (var key in this._tiles) {
+                       var tile = this._tiles[key];
+                       if (!tile.current || !tile.loaded) { continue; }
 
 
-                   noInertia = !options.inertia || delay > options.inertiaThreshold || !this._positions[0];
+                       var fade = Math.min(1, (now - tile.loaded) / 200);
 
 
-               map.fire('dragend', e);
+                       setOpacity(tile.el, fade);
+                       if (fade < 1) {
+                               nextFrame = true;
+                       } else {
+                               if (tile.active) {
+                                       willPrune = true;
+                               } else {
+                                       this._onOpaqueTile(tile);
+                               }
+                               tile.active = true;
+                       }
+               }
 
 
-               if (noInertia) {
-                       map.fire('moveend');
+               if (willPrune && !this._noPrune) { this._pruneTiles(); }
 
 
-               } else {
+               if (nextFrame) {
+                       cancelAnimFrame(this._fadeFrame);
+                       this._fadeFrame = requestAnimFrame(this._updateOpacity, this);
+               }
+       },
 
 
-                       var direction = this._lastPos.subtract(this._positions[0]),
-                           duration = (this._lastTime + delay - this._times[0]) / 1000,
-                           ease = options.easeLinearity,
+       _onOpaqueTile: falseFn,
 
 
-                           speedVector = direction.multiplyBy(ease / duration),
-                           speed = speedVector.distanceTo([0, 0]),
+       _initContainer: function () {
+               if (this._container) { return; }
 
 
-                           limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
-                           limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
+               this._container = create$1('div', 'leaflet-layer ' + (this.options.className || ''));
+               this._updateZIndex();
 
 
-                           decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
-                           offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
+               if (this.options.opacity < 1) {
+                       this._updateOpacity();
+               }
 
 
-                       if (!offset.x || !offset.y) {
-                               map.fire('moveend');
+               this.getPane().appendChild(this._container);
+       },
 
 
-                       } else {
-                               offset = map._limitOffset(offset, map.options.maxBounds);
+       _updateLevels: function () {
 
 
-                               L.Util.requestAnimFrame(function () {
-                                       map.panBy(offset, {
-                                               duration: decelerationDuration,
-                                               easeLinearity: ease,
-                                               noMoveStart: true
-                                       });
-                               });
+               var zoom = this._tileZoom,
+                   maxZoom = this.options.maxZoom;
+
+               if (zoom === undefined) { return undefined; }
+
+               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];
                        }
                }
                        }
                }
-       }
-});
-
-L.Map.addInitHook('addHandler', 'dragging', L.Map.Drag);
 
 
+               var level = this._levels[zoom],
+                   map = this._map;
 
 
-/*
- * L.Handler.DoubleClickZoom is used to handle double-click zoom on the map, enabled by default.
- */
+               if (!level) {
+                       level = this._levels[zoom] = {};
 
 
-L.Map.mergeOptions({
-       doubleClickZoom: true
-});
+                       level.el = create$1('div', 'leaflet-tile-container leaflet-zoom-animated', this._container);
+                       level.el.style.zIndex = maxZoom;
 
 
-L.Map.DoubleClickZoom = L.Handler.extend({
-       addHooks: function () {
-               this._map.on('dblclick', this._onDoubleClick, this);
-       },
+                       level.origin = map.project(map.unproject(map.getPixelOrigin()), zoom).round();
+                       level.zoom = zoom;
 
 
-       removeHooks: function () {
-               this._map.off('dblclick', this._onDoubleClick, this);
-       },
+                       this._setZoomTransform(level, map.getCenter(), map.getZoom());
 
 
-       _onDoubleClick: function (e) {
-               var map = this._map,
-                   zoom = map.getZoom() + (e.originalEvent.shiftKey ? -1 : 1);
+                       // force the browser to consider the newly added element for transition
+                       falseFn(level.el.offsetWidth);
 
 
-               if (map.options.doubleClickZoom === 'center') {
-                       map.setZoom(zoom);
-               } else {
-                       map.setZoomAround(e.containerPoint, zoom);
+                       this._onCreateLevel(level);
                }
                }
-       }
-});
 
 
-L.Map.addInitHook('addHandler', 'doubleClickZoom', L.Map.DoubleClickZoom);
+               this._level = level;
 
 
+               return level;
+       },
 
 
-/*
- * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.
- */
-
-L.Map.mergeOptions({
-       scrollWheelZoom: true
-});
+       _onUpdateLevel: falseFn,
 
 
-L.Map.ScrollWheelZoom = L.Handler.extend({
-       addHooks: function () {
-               L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);
-               L.DomEvent.on(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);
-               this._delta = 0;
-       },
+       _onRemoveLevel: falseFn,
 
 
-       removeHooks: function () {
-               L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll);
-               L.DomEvent.off(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);
-       },
+       _onCreateLevel: falseFn,
 
 
-       _onWheelScroll: function (e) {
-               var delta = L.DomEvent.getWheelDelta(e);
+       _pruneTiles: function () {
+               if (!this._map) {
+                       return;
+               }
 
 
-               this._delta += delta;
-               this._lastMousePos = this._map.mouseEventToContainerPoint(e);
+               var key, tile;
 
 
-               if (!this._startTime) {
-                       this._startTime = +new Date();
+               var zoom = this._map.getZoom();
+               if (zoom > this.options.maxZoom ||
+                       zoom < this.options.minZoom) {
+                       this._removeAllTiles();
+                       return;
                }
 
                }
 
-               var left = Math.max(40 - (+new Date() - this._startTime), 0);
+               for (key in this._tiles) {
+                       tile = this._tiles[key];
+                       tile.retain = tile.current;
+               }
 
 
-               clearTimeout(this._timer);
-               this._timer = setTimeout(L.bind(this._performZoom, this), left);
+               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);
+                               }
+                       }
+               }
 
 
-               L.DomEvent.preventDefault(e);
-               L.DomEvent.stopPropagation(e);
+               for (key in this._tiles) {
+                       if (!this._tiles[key].retain) {
+                               this._removeTile(key);
+                       }
+               }
        },
 
        },
 
-       _performZoom: function () {
-               var map = this._map,
-                   delta = this._delta,
-                   zoom = map.getZoom();
+       _removeTilesAtZoom: function (zoom) {
+               for (var key in this._tiles) {
+                       if (this._tiles[key].coords.z !== zoom) {
+                               continue;
+                       }
+                       this._removeTile(key);
+               }
+       },
 
 
-               delta = delta > 0 ? Math.ceil(delta) : Math.floor(delta);
-               delta = Math.max(Math.min(delta, 4), -4);
-               delta = map._limitZoom(zoom + delta) - zoom;
+       _removeAllTiles: function () {
+               for (var key in this._tiles) {
+                       this._removeTile(key);
+               }
+       },
 
 
-               this._delta = 0;
-               this._startTime = null;
+       _invalidateAll: function () {
+               for (var z in this._levels) {
+                       remove(this._levels[z].el);
+                       this._onRemoveLevel(z);
+                       delete this._levels[z];
+               }
+               this._removeAllTiles();
 
 
-               if (!delta) { return; }
+               this._tileZoom = undefined;
+       },
 
 
-               if (map.options.scrollWheelZoom === 'center') {
-                       map.setZoom(zoom + delta);
-               } else {
-                       map.setZoomAround(this._lastMousePos, zoom + delta);
-               }
-       }
-});
+       _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;
 
 
-L.Map.addInitHook('addHandler', 'scrollWheelZoom', L.Map.ScrollWheelZoom);
+               var key = this._tileCoordsToKey(coords2),
+                   tile = this._tiles[key];
 
 
+               if (tile && tile.active) {
+                       tile.retain = true;
+                       return true;
 
 
-/*
- * Extends the event handling code with double tap support for mobile browsers.
- */
+               } else if (tile && tile.loaded) {
+                       tile.retain = true;
+               }
 
 
-L.extend(L.DomEvent, {
+               if (z2 > minZoom) {
+                       return this._retainParent(x2, y2, z2, minZoom);
+               }
 
 
-       _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
-       _touchend: L.Browser.msPointer ? 'MSPointerUp' : L.Browser.pointer ? 'pointerup' : 'touchend',
+               return false;
+       },
 
 
-       // inspired by Zepto touch code by Thomas Fuchs
-       addDoubleTapListener: function (obj, handler, id) {
-               var last,
-                   doubleTap = false,
-                   delay = 250,
-                   touch,
-                   pre = '_leaflet_',
-                   touchstart = this._touchstart,
-                   touchend = this._touchend,
-                   trackedTouches = [];
+       _retainChildren: function (x, y, z, maxZoom) {
 
 
-               function onTouchStart(e) {
-                       var count;
+               for (var i = 2 * x; i < 2 * x + 2; i++) {
+                       for (var j = 2 * y; j < 2 * y + 2; j++) {
 
 
-                       if (L.Browser.pointer) {
-                               trackedTouches.push(e.pointerId);
-                               count = trackedTouches.length;
-                       } else {
-                               count = e.touches.length;
-                       }
-                       if (count > 1) {
-                               return;
-                       }
+                               var coords = new Point(i, j);
+                               coords.z = z + 1;
 
 
-                       var now = Date.now(),
-                               delta = now - (last || now);
+                               var key = this._tileCoordsToKey(coords),
+                                   tile = this._tiles[key];
 
 
-                       touch = e.touches ? e.touches[0] : e;
-                       doubleTap = (delta > 0 && delta <= delay);
-                       last = now;
-               }
+                               if (tile && tile.active) {
+                                       tile.retain = true;
+                                       continue;
 
 
-               function onTouchEnd(e) {
-                       if (L.Browser.pointer) {
-                               var idx = trackedTouches.indexOf(e.pointerId);
-                               if (idx === -1) {
-                                       return;
+                               } else if (tile && tile.loaded) {
+                                       tile.retain = true;
                                }
                                }
-                               trackedTouches.splice(idx, 1);
-                       }
 
 
-                       if (doubleTap) {
-                               if (L.Browser.pointer) {
-                                       // work around .type being readonly with MSPointer* events
-                                       var newTouch = { },
-                                               prop;
-
-                                       // jshint forin:false
-                                       for (var i in touch) {
-                                               prop = touch[i];
-                                               if (typeof prop === 'function') {
-                                                       newTouch[i] = prop.bind(touch);
-                                               } else {
-                                                       newTouch[i] = prop;
-                                               }
-                                       }
-                                       touch = newTouch;
+                               if (z + 1 < maxZoom) {
+                                       this._retainChildren(i, j, z + 1, maxZoom);
                                }
                                }
-                               touch.type = 'dblclick';
-                               handler(touch);
-                               last = null;
                        }
                }
                        }
                }
-               obj[pre + touchstart + id] = onTouchStart;
-               obj[pre + touchend + id] = onTouchEnd;
+       },
 
 
-               // on pointer we need to listen on the document, otherwise a drag starting on the map and moving off screen
-               // will not come through to us, so we will lose track of how many touches are ongoing
-               var endElement = L.Browser.pointer ? document.documentElement : obj;
+       _resetView: function (e) {
+               var animating = e && (e.pinch || e.flyTo);
+               this._setView(this._map.getCenter(), this._map.getZoom(), animating, animating);
+       },
 
 
-               obj.addEventListener(touchstart, onTouchStart, false);
-               endElement.addEventListener(touchend, onTouchEnd, false);
+       _animateZoom: function (e) {
+               this._setView(e.center, e.zoom, true, e.noUpdate);
+       },
 
 
-               if (L.Browser.pointer) {
-                       endElement.addEventListener(L.DomEvent.POINTER_CANCEL, onTouchEnd, false);
-               }
+       _clampZoom: function (zoom) {
+               var options = this.options;
 
 
-               return this;
-       },
+               if (undefined !== options.minNativeZoom && zoom < options.minNativeZoom) {
+                       return options.minNativeZoom;
+               }
 
 
-       removeDoubleTapListener: function (obj, id) {
-               var pre = '_leaflet_';
+               if (undefined !== options.maxNativeZoom && options.maxNativeZoom < zoom) {
+                       return options.maxNativeZoom;
+               }
 
 
-               obj.removeEventListener(this._touchstart, obj[pre + this._touchstart + id], false);
-               (L.Browser.pointer ? document.documentElement : obj).removeEventListener(
-                       this._touchend, obj[pre + this._touchend + id], false);
+               return zoom;
+       },
 
 
-               if (L.Browser.pointer) {
-                       document.documentElement.removeEventListener(L.DomEvent.POINTER_CANCEL, obj[pre + this._touchend + id],
-                               false);
+       _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;
                }
 
                }
 
-               return this;
-       }
-});
+               var tileZoomChanged = this.options.updateWhenZooming && (tileZoom !== this._tileZoom);
 
 
+               if (!noUpdate || tileZoomChanged) {
 
 
-/*
- * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
- */
+                       this._tileZoom = tileZoom;
+
+                       if (this._abortLoading) {
+                               this._abortLoading();
+                       }
 
 
-L.extend(L.DomEvent, {
+                       this._updateLevels();
+                       this._resetGrid();
 
 
-       //static
-       POINTER_DOWN: L.Browser.msPointer ? 'MSPointerDown' : 'pointerdown',
-       POINTER_MOVE: L.Browser.msPointer ? 'MSPointerMove' : 'pointermove',
-       POINTER_UP: L.Browser.msPointer ? 'MSPointerUp' : 'pointerup',
-       POINTER_CANCEL: L.Browser.msPointer ? 'MSPointerCancel' : 'pointercancel',
+                       if (tileZoom !== undefined) {
+                               this._update(center);
+                       }
 
 
-       _pointers: [],
-       _pointerDocumentListener: false,
+                       if (!noPrune) {
+                               this._pruneTiles();
+                       }
 
 
-       // Provides a touch events wrapper for (ms)pointer events.
-       // Based on changes by veproza https://github.com/CloudMade/Leaflet/pull/1019
-       //ref http://www.w3.org/TR/pointerevents/ https://www.w3.org/Bugs/Public/show_bug.cgi?id=22890
+                       // Flag to prevent _updateOpacity from pruning tiles during
+                       // a zoom anim or a pinch gesture
+                       this._noPrune = !!noPrune;
+               }
 
 
-       addPointerListener: function (obj, type, handler, id) {
+               this._setZoomTransforms(center, zoom);
+       },
 
 
-               switch (type) {
-               case 'touchstart':
-                       return this.addPointerListenerStart(obj, type, handler, id);
-               case 'touchend':
-                       return this.addPointerListenerEnd(obj, type, handler, id);
-               case 'touchmove':
-                       return this.addPointerListenerMove(obj, type, handler, id);
-               default:
-                       throw 'Unknown touch event type';
+       _setZoomTransforms: function (center, zoom) {
+               for (var i in this._levels) {
+                       this._setZoomTransform(this._levels[i], center, zoom);
                }
        },
 
                }
        },
 
-       addPointerListenerStart: function (obj, type, handler, id) {
-               var pre = '_leaflet_',
-                   pointers = this._pointers;
+       _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();
 
 
-               var cb = function (e) {
+               if (any3d) {
+                       setTransform(level.el, translate, scale);
+               } else {
+                       setPosition(level.el, translate);
+               }
+       },
 
 
-                       L.DomEvent.preventDefault(e);
+       _resetGrid: function () {
+               var map = this._map,
+                   crs = map.options.crs,
+                   tileSize = this._tileSize = this.getTileSize(),
+                   tileZoom = this._tileZoom;
 
 
-                       var alreadyInArray = false;
-                       for (var i = 0; i < pointers.length; i++) {
-                               if (pointers[i].pointerId === e.pointerId) {
-                                       alreadyInArray = true;
-                                       break;
-                               }
-                       }
-                       if (!alreadyInArray) {
-                               pointers.push(e);
-                       }
+               var bounds = this._map.getPixelWorldBounds(this._tileZoom);
+               if (bounds) {
+                       this._globalTileRange = this._pxBoundsToTileRange(bounds);
+               }
 
 
-                       e.touches = pointers.slice();
-                       e.changedTouches = [e];
+               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)
+               ];
+       },
 
 
-                       handler(e);
-               };
+       _onMoveEnd: function () {
+               if (!this._map || this._map._animatingZoom) { return; }
 
 
-               obj[pre + 'touchstart' + id] = cb;
-               obj.addEventListener(this.POINTER_DOWN, cb, false);
-
-               // need to also listen for end events to keep the _pointers list accurate
-               // this needs to be on the body and never go away
-               if (!this._pointerDocumentListener) {
-                       var internalCb = function (e) {
-                               for (var i = 0; i < pointers.length; i++) {
-                                       if (pointers[i].pointerId === e.pointerId) {
-                                               pointers.splice(i, 1);
-                                               break;
-                                       }
-                               }
-                       };
-                       //We listen on the documentElement as any drags that end by moving the touch off the screen get fired there
-                       document.documentElement.addEventListener(this.POINTER_UP, internalCb, false);
-                       document.documentElement.addEventListener(this.POINTER_CANCEL, internalCb, false);
+               this._update();
+       },
 
 
-                       this._pointerDocumentListener = true;
-               }
+       _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));
        },
 
        },
 
-       addPointerListenerMove: function (obj, type, handler, id) {
-               var pre = '_leaflet_',
-                   touches = this._pointers;
+       // 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
+
+               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]));
+
+               // 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; }
 
 
-               function cb(e) {
+               // 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;
 
 
-                       // don't fire touch moves when mouse isn't down
-                       if ((e.pointerType === e.MSPOINTER_TYPE_MOUSE || e.pointerType === 'mouse') && e.buttons === 0) { return; }
+                               if (!this._isValidTile(coords)) { continue; }
 
 
-                       for (var i = 0; i < touches.length; i++) {
-                               if (touches[i].pointerId === e.pointerId) {
-                                       touches[i] = e;
-                                       break;
+                               var tile = this._tiles[this._tileCoordsToKey(coords)];
+                               if (tile) {
+                                       tile.current = true;
+                               } else {
+                                       queue.push(coords);
                                }
                        }
                                }
                        }
+               }
+
+               // 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);
+               });
 
 
-                       e.touches = touches.slice();
-                       e.changedTouches = [e];
+               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');
+                       }
 
 
-                       handler(e);
-               }
+                       // create DOM fragment to append tiles in one batch
+                       var fragment = document.createDocumentFragment();
 
 
-               obj[pre + 'touchmove' + id] = cb;
-               obj.addEventListener(this.POINTER_MOVE, cb, false);
+                       for (i = 0; i < queue.length; i++) {
+                               this._addTile(queue[i], fragment);
+                       }
 
 
-               return this;
+                       this._level.el.appendChild(fragment);
+               }
        },
 
        },
 
-       addPointerListenerEnd: function (obj, type, handler, id) {
-               var pre = '_leaflet_',
-                   touches = this._pointers;
+       _isValidTile: function (coords) {
+               var crs = this._map.options.crs;
 
 
-               var cb = function (e) {
-                       for (var i = 0; i < touches.length; i++) {
-                               if (touches[i].pointerId === e.pointerId) {
-                                       touches.splice(i, 1);
-                                       break;
-                               }
-                       }
+               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; }
+               }
 
 
-                       e.touches = touches.slice();
-                       e.changedTouches = [e];
+               if (!this.options.bounds) { return true; }
 
 
-                       handler(e);
-               };
+               // 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);
+       },
 
 
-               obj[pre + 'touchend' + id] = cb;
-               obj.addEventListener(this.POINTER_UP, cb, false);
-               obj.addEventListener(this.POINTER_CANCEL, cb, false);
+       _keyToBounds: function (key) {
+               return this._tileCoordsToBounds(this._keyToTileCoords(key));
+       },
 
 
-               return this;
+       _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];
        },
 
        },
 
-       removePointerListener: function (obj, type, id) {
-               var pre = '_leaflet_',
-                   cb = obj[pre + type + id];
+       // converts tile coordinates to its geographical bounds
+       _tileCoordsToBounds: function (coords) {
+               var bp = this._tileCoordsToNwSe(coords),
+                   bounds = new LatLngBounds(bp[0], bp[1]);
 
 
-               switch (type) {
-               case 'touchstart':
-                       obj.removeEventListener(this.POINTER_DOWN, cb, false);
-                       break;
-               case 'touchmove':
-                       obj.removeEventListener(this.POINTER_MOVE, cb, false);
-                       break;
-               case 'touchend':
-                       obj.removeEventListener(this.POINTER_UP, cb, false);
-                       obj.removeEventListener(this.POINTER_CANCEL, cb, false);
-                       break;
+               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;
+       },
 
 
+       _removeTile: function (key) {
+               var tile = this._tiles[key];
+               if (!tile) { return; }
 
 
-/*
- * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.
- */
+               remove(tile.el);
 
 
-L.Map.mergeOptions({
-       touchZoom: L.Browser.touch && !L.Browser.android23,
-       bounceAtZoomLimits: true
-});
+               delete this._tiles[key];
 
 
-L.Map.TouchZoom = L.Handler.extend({
-       addHooks: function () {
-               L.DomEvent.on(this._map._container, 'touchstart', this._onTouchStart, this);
+               // @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)
+               });
        },
 
        },
 
-       removeHooks: function () {
-               L.DomEvent.off(this._map._container, 'touchstart', this._onTouchStart, this);
-       },
+       _initTile: function (tile) {
+               addClass(tile, 'leaflet-tile');
 
 
-       _onTouchStart: function (e) {
-               var map = this._map;
+               var tileSize = this.getTileSize();
+               tile.style.width = tileSize.x + 'px';
+               tile.style.height = tileSize.y + 'px';
 
 
-               if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
+               tile.onselectstart = falseFn;
+               tile.onmousemove = falseFn;
 
 
-               var p1 = map.mouseEventToLayerPoint(e.touches[0]),
-                   p2 = map.mouseEventToLayerPoint(e.touches[1]),
-                   viewCenter = map._getCenterLayerPoint();
+               // update opacity on tiles in IE7-8 because of filter inheritance problems
+               if (ielt9 && this.options.opacity < 1) {
+                       setOpacity(tile, this.options.opacity);
+               }
 
 
-               this._startCenter = p1.add(p2)._divideBy(2);
-               this._startDist = p1.distanceTo(p2);
+               // 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';
+               }
+       },
 
 
-               this._moved = false;
-               this._zooming = true;
+       _addTile: function (coords, container) {
+               var tilePos = this._getTilePos(coords),
+                   key = this._tileCoordsToKey(coords);
 
 
-               this._centerOffset = viewCenter.subtract(this._startCenter);
+               var tile = this.createTile(this._wrapCoords(coords), bind(this._tileReady, this, coords));
 
 
-               if (map._panAnim) {
-                       map._panAnim.stop();
+               this._initTile(tile);
+
+               // 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));
                }
 
                }
 
-               L.DomEvent
-                   .on(document, 'touchmove', this._onTouchMove, this)
-                   .on(document, 'touchend', this._onTouchEnd, this);
+               setPosition(tile, tilePos);
+
+               // save tile in cache
+               this._tiles[key] = {
+                       el: tile,
+                       coords: coords,
+                       current: true
+               };
 
 
-               L.DomEvent.preventDefault(e);
+               container.appendChild(tile);
+               // @event tileloadstart: TileEvent
+               // Fired when a tile is requested and starts loading.
+               this.fire('tileloadstart', {
+                       tile: tile,
+                       coords: coords
+               });
        },
 
        },
 
-       _onTouchMove: function (e) {
-               var map = this._map;
+       _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
+                       });
+               }
 
 
-               if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; }
+               var key = this._tileCoordsToKey(coords);
 
 
-               var p1 = map.mouseEventToLayerPoint(e.touches[0]),
-                   p2 = map.mouseEventToLayerPoint(e.touches[1]);
+               tile = this._tiles[key];
+               if (!tile) { return; }
 
 
-               this._scale = p1.distanceTo(p2) / this._startDist;
-               this._delta = p1._add(p2)._divideBy(2)._subtract(this._startCenter);
+               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();
+               }
 
 
-               if (this._scale === 1) { return; }
+               if (!err) {
+                       addClass(tile.el, 'leaflet-tile-loaded');
 
 
-               if (!map.options.bounceAtZoomLimits) {
-                       if ((map.getZoom() === map.getMinZoom() && this._scale < 1) ||
-                           (map.getZoom() === map.getMaxZoom() && this._scale > 1)) { return; }
+                       // @event tileload: TileEvent
+                       // Fired when a tile loads.
+                       this.fire('tileload', {
+                               tile: tile.el,
+                               coords: coords
+                       });
                }
 
                }
 
-               if (!this._moved) {
-                       L.DomUtil.addClass(map._mapPane, 'leaflet-touching');
-
-                       map
-                           .fire('movestart')
-                           .fire('zoomstart');
+               if (this._noTilesToLoad()) {
+                       this._loading = false;
+                       // @event load: Event
+                       // Fired when the grid layer loaded all visible tiles.
+                       this.fire('load');
 
 
-                       this._moved = true;
+                       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);
+                       }
                }
                }
+       },
 
 
-               L.Util.cancelAnimFrame(this._animRequest);
-               this._animRequest = L.Util.requestAnimFrame(
-                       this._updateOnMove, this, true, this._map._container);
-
-               L.DomEvent.preventDefault(e);
+       _getTilePos: function (coords) {
+               return coords.scaleBy(this.getTileSize()).subtract(this._level.origin);
        },
 
        },
 
-       _updateOnMove: function () {
-               var map = this._map,
-                   origin = this._getScaleOrigin(),
-                   center = map.layerPointToLatLng(origin),
-                   zoom = map.getScaleZoom(this._scale);
+       _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;
+       },
 
 
-               map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
+       _pxBoundsToTileRange: function (bounds) {
+               var tileSize = this.getTileSize();
+               return new Bounds(
+                       bounds.min.unscaleBy(tileSize).floor(),
+                       bounds.max.unscaleBy(tileSize).ceil().subtract([1, 1]));
        },
 
        },
 
-       _onTouchEnd: function () {
-               if (!this._moved || !this._zooming) {
-                       this._zooming = false;
-                       return;
+       _noTilesToLoad: function () {
+               for (var key in this._tiles) {
+                       if (!this._tiles[key].loaded) { return false; }
                }
                }
+               return true;
+       }
+});
 
 
-               var map = this._map;
+// @factory L.gridLayer(options?: GridLayer options)
+// Creates a new instance of GridLayer with the supplied options.
+function gridLayer(options) {
+       return new GridLayer(options);
+}
 
 
-               this._zooming = false;
-               L.DomUtil.removeClass(map._mapPane, 'leaflet-touching');
-               L.Util.cancelAnimFrame(this._animRequest);
+/*
+ * @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
-                   .off(document, 'touchmove', this._onTouchMove)
-                   .off(document, 'touchend', this._onTouchEnd);
 
 
-               var origin = this._getScaleOrigin(),
-                   center = map.layerPointToLatLng(origin),
+var TileLayer = GridLayer.extend({
 
 
-                   oldZoom = map.getZoom(),
-                   floatZoomDelta = map.getScaleZoom(this._scale) - oldZoom,
-                   roundZoomDelta = (floatZoomDelta > 0 ?
-                           Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)),
+       // @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,
+
+               // @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',
+
+               // @option errorTileUrl: String = ''
+               // URL to the tile image to show in place of the tile that failed to load.
+               errorTileUrl: '',
+
+               // @option zoomOffset: Number = 0
+               // The zoom number used in tile URLs will be offset with this value.
+               zoomOffset: 0,
+
+               // @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,
+
+               // @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,
 
 
-                   zoom = map._limitZoom(oldZoom + roundZoomDelta),
-                   scale = map.getZoomScale(zoom) / this._scale;
+               // @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,
 
 
-               map._animateZoom(center, zoom, origin, scale);
+               // @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
        },
 
        },
 
-       _getScaleOrigin: function () {
-               var centerOffset = this._centerOffset.subtract(this._delta).divideBy(this._scale);
-               return this._startCenter.add(centerOffset);
-       }
-});
+       initialize: function (url, options) {
 
 
-L.Map.addInitHook('addHandler', 'touchZoom', L.Map.TouchZoom);
+               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) {
 
 
-L.Map.mergeOptions({
-       tap: true,
-       tapTolerance: 15
-});
+                       options.tileSize = Math.floor(options.tileSize / 2);
 
 
-L.Map.Tap = L.Handler.extend({
-       addHooks: function () {
-               L.DomEvent.on(this._map._container, 'touchstart', this._onDown, this);
-       },
+                       if (!options.zoomReverse) {
+                               options.zoomOffset++;
+                               options.maxZoom--;
+                       } else {
+                               options.zoomOffset--;
+                               options.minZoom++;
+                       }
 
 
-       removeHooks: function () {
-               L.DomEvent.off(this._map._container, 'touchstart', this._onDown, this);
-       },
+                       options.minZoom = Math.max(0, options.minZoom);
+               }
 
 
-       _onDown: function (e) {
-               if (!e.touches) { return; }
+               if (typeof options.subdomains === 'string') {
+                       options.subdomains = options.subdomains.split('');
+               }
 
 
-               L.DomEvent.preventDefault(e);
+               // for https://github.com/Leaflet/Leaflet/issues/137
+               if (!android) {
+                       this.on('tileunload', this._onTileRemove);
+               }
+       },
 
 
-               this._fireClick = true;
+       // @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;
+               }
 
 
-               // don't simulate click or track longpress if more than 1 touch
-               if (e.touches.length > 1) {
-                       this._fireClick = false;
-                       clearTimeout(this._holdTimeout);
-                       return;
+               this._url = url;
+
+               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);
+               /*
+                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 = '';
+
+               /*
+                Set role="presentation" to force screen readers to ignore this
+                https://www.w3.org/TR/wai-aria/roles#textalternativecomputation
+               */
+               tile.setAttribute('role', 'presentation');
+
+               tile.src = this.getTileUrl(coords);
+
+               return tile;
+       },
+
+       // @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;
                        }
                        }
-               }, this), 1000);
+                       data['-y'] = invertedY;
+               }
 
 
-               L.DomEvent
-                       .on(document, 'touchmove', this._onMove, this)
-                       .on(document, 'touchend', this._onUp, this);
+               return template(this._url, extend(data, this.options));
        },
 
        },
 
-       _onUp: function (e) {
-               clearTimeout(this._holdTimeout);
-
-               L.DomEvent
-                       .off(document, 'touchmove', this._onMove, this)
-                       .off(document, 'touchend', this._onUp, this);
+       _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);
+               }
+       },
 
 
-               if (this._fireClick && e && e.changedTouches) {
+       _tileOnError: function (done, tile, e) {
+               var errorUrl = this.options.errorTileUrl;
+               if (errorUrl && tile.getAttribute('src') !== errorUrl) {
+                       tile.src = errorUrl;
+               }
+               done(e, tile);
+       },
 
 
-                       var first = e.changedTouches[0],
-                           el = first.target;
+       _onTileRemove: function (e) {
+               e.tile.onload = null;
+       },
 
 
-                       if (el && el.tagName && el.tagName.toLowerCase() === 'a') {
-                               L.DomUtil.removeClass(el, 'leaflet-active');
-                       }
+       _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);
+       // 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);
        }
 });
 
        }
 });
 
-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.ShiftDragZoom 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"
+ * });
+ * ```
  */
 
  */
 
-L.Map.mergeOptions({
-       boxZoom: true
-});
-
-L.Map.BoxZoom = L.Handler.extend({
-       initialize: function (map) {
-               this._map = map;
-               this._container = map._container;
-               this._pane = map._panes.overlayPane;
-               this._moved = false;
-       },
-
-       addHooks: function () {
-               L.DomEvent.on(this._container, 'mousedown', this._onMouseDown, this);
-       },
-
-       removeHooks: function () {
-               L.DomEvent.off(this._container, 'mousedown', this._onMouseDown);
-               this._moved = false;
-       },
+var TileLayerWMS = TileLayer.extend({
 
 
-       moved: function () {
-               return this._moved;
-       },
+       // @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',
 
 
-       _onMouseDown: function (e) {
-               this._moved = false;
+               // @option layers: String = ''
+               // **(required)** Comma-separated list of WMS layers to show.
+               layers: '',
 
 
-               if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
+               // @option styles: String = ''
+               // Comma-separated list of WMS styles.
+               styles: '',
 
 
-               L.DomUtil.disableTextSelection();
-               L.DomUtil.disableImageDrag();
+               // @option format: String = 'image/jpeg'
+               // WMS image format (use `'image/png'` for layers with transparency).
+               format: 'image/jpeg',
 
 
-               this._startLayerPoint = this._map.mouseEventToLayerPoint(e);
+               // @option transparent: Boolean = false
+               // If `true`, the WMS service will return images with transparency.
+               transparent: false,
 
 
-               L.DomEvent
-                   .on(document, 'mousemove', this._onMouseMove, this)
-                   .on(document, 'mouseup', this._onMouseUp, this)
-                   .on(document, 'keydown', this._onKeyDown, this);
+               // @option version: String = '1.1.1'
+               // Version of the WMS service to use
+               version: '1.1.1'
        },
 
        },
 
-       _onMouseMove: function (e) {
-               if (!this._moved) {
-                       this._box = L.DomUtil.create('div', 'leaflet-zoom-box', this._pane);
-                       L.DomUtil.setPosition(this._box, this._startLayerPoint);
-
-                       //TODO refactor: move cursor to styles
-                       this._container.style.cursor = 'crosshair';
-                       this._map.fire('boxzoomstart');
-               }
-
-               var startPoint = this._startLayerPoint,
-                   box = this._box,
-
-                   layerPoint = this._map.mouseEventToLayerPoint(e),
-                   offset = layerPoint.subtract(startPoint),
+       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,
 
 
-                   newPos = new L.Point(
-                       Math.min(layerPoint.x, startPoint.x),
-                       Math.min(layerPoint.y, startPoint.y));
+               // @option uppercase: Boolean = false
+               // If `true`, WMS request parameter keys will be uppercase.
+               uppercase: false
+       },
 
 
-               L.DomUtil.setPosition(box, newPos);
+       initialize: function (url, options) {
 
 
-               this._moved = true;
+               this._url = url;
 
 
-               // TODO refactor: remove hardcoded 4 pixels
-               box.style.width  = (Math.max(0, Math.abs(offset.x) - 4)) + 'px';
-               box.style.height = (Math.max(0, Math.abs(offset.y) - 4)) + 'px';
-       },
+               var wmsParams = extend({}, this.defaultWmsParams);
 
 
-       _finish: function () {
-               if (this._moved) {
-                       this._pane.removeChild(this._box);
-                       this._container.style.cursor = '';
+               // 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];
+                       }
                }
 
                }
 
-               L.DomUtil.enableTextSelection();
-               L.DomUtil.enableImageDrag();
+               options = setOptions(this, options);
+
+               var realRetina = options.detectRetina && retina ? 2 : 1;
+               var tileSize = this.getTileSize();
+               wmsParams.width = tileSize.x * realRetina;
+               wmsParams.height = tileSize.y * realRetina;
 
 
-               L.DomEvent
-                   .off(document, 'mousemove', this._onMouseMove)
-                   .off(document, 'mouseup', this._onMouseUp)
-                   .off(document, 'keydown', this._onKeyDown);
+               this.wmsParams = wmsParams;
        },
 
        },
 
-       _onMouseUp: function (e) {
+       onAdd: function (map) {
 
 
-               this._finish();
+               this._crs = this.options.crs || map.options.crs;
+               this._wmsVersion = parseFloat(this.wmsParams.version);
 
 
-               var map = this._map,
-                   layerPoint = map.mouseEventToLayerPoint(e);
+               var projectionKey = this._wmsVersion >= 1.3 ? 'crs' : 'srs';
+               this.wmsParams[projectionKey] = this._crs.code;
 
 
-               if (this._startLayerPoint.equals(layerPoint)) { return; }
+               TileLayer.prototype.onAdd.call(this, map);
+       },
 
 
-               var bounds = new L.LatLngBounds(
-                       map.layerPointToLatLng(this._startLayerPoint),
-                       map.layerPointToLatLng(layerPoint));
+       getTileUrl: function (coords) {
 
 
-               map.fitBounds(bounds);
+               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;
+       },
+
+       // @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) {
 
 
-               map.fire('boxzoomend', {
-                       boxZoomBounds: bounds
-               });
-       },
+               extend(this.wmsParams, params);
 
 
-       _onKeyDown: function (e) {
-               if (e.keyCode === 27) {
-                       this._finish();
+               if (!noRedraw) {
+                       this.redraw();
                }
                }
+
+               return this;
        }
 });
 
        }
 });
 
-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
  */
 
  */
 
-L.Map.mergeOptions({
-       keyboard: true,
-       keyboardPanOffset: 80,
-       keyboardZoomOffset: 1
-});
+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, 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._setPanOffset(map.options.keyboardPanOffset);
-               this._setZoomOffset(map.options.keyboardZoomOffset);
+       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 === -1) {
-                       container.tabIndex = '0';
+                       if (this._zoomAnimated) {
+                               addClass(this._container, 'leaflet-zoom-animated');
+                       }
                }
 
                }
 
-               L.DomEvent
-                   .on(container, 'focus', this._onFocus, this)
-                   .on(container, 'blur', this._onBlur, this)
-                   .on(container, 'mousedown', this._onMouseDown, this);
-
-               this._map
-                   .on('focus', this._addHooks, this)
-                   .on('blur', this._removeHooks, this);
+               this.getPane().appendChild(this._container);
+               this._update();
+               this.on('update', this._updatePaths, this);
        },
 
        },
 
-       removeHooks: function () {
-               this._removeHooks();
+       onRemove: function () {
+               this.off('update', this._updatePaths, this);
+               this._destroyContainer();
+       },
 
 
-               var container = this._map._container;
+       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;
+       },
 
 
-               L.DomEvent
-                   .off(container, 'focus', this._onFocus, this)
-                   .off(container, 'blur', this._onBlur, this)
-                   .off(container, 'mousedown', this._onMouseDown, this);
+       _onAnimZoom: function (ev) {
+               this._updateTransform(ev.center, ev.zoom);
+       },
 
 
-               this._map
-                   .off('focus', this._addHooks, this)
-                   .off('blur', this._removeHooks, this);
+       _onZoom: function () {
+               this._updateTransform(this._map.getCenter(), this._map.getZoom());
        },
 
        },
 
-       _onMouseDown: function () {
-               if (this._focused) { return; }
+       _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),
 
 
-               var body = document.body,
-                   docEl = document.documentElement,
-                   top = body.scrollTop || docEl.scrollTop,
-                   left = body.scrollLeft || docEl.scrollLeft;
+                   topLeftOffset = viewHalf.multiplyBy(-scale).add(position).add(viewHalf).subtract(centerOffset);
 
 
-               this._map._container.focus();
+               if (any3d) {
+                       setTransform(this._container, topLeftOffset, scale);
+               } else {
+                       setPosition(this._container, topLeftOffset);
+               }
+       },
 
 
-               window.scrollTo(left, top);
+       _reset: function () {
+               this._update();
+               this._updateTransform(this._center, this._zoom);
+
+               for (var id in this._layers) {
+                       this._layers[id]._reset();
+               }
        },
 
        },
 
-       _onFocus: function () {
-               this._focused = true;
-               this._map.fire('focus');
+       _onZoomEnd: function () {
+               for (var id in this._layers) {
+                       this._layers[id]._project();
+               }
        },
 
        },
 
-       _onBlur: function () {
-               this._focused = false;
-               this._map.fire('blur');
+       _updatePaths: function () {
+               for (var id in this._layers) {
+                       this._layers[id]._update();
+               }
        },
 
        },
 
-       _setPanOffset: function (pan) {
-               var keys = this._panKeys = {},
-                   codes = this.keyCodes,
-                   i, len;
+       _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();
 
 
-               for (i = 0, len = codes.left.length; i < len; i++) {
-                       keys[codes.left[i]] = [-1 * pan, 0];
-               }
-               for (i = 0, len = codes.right.length; i < len; i++) {
-                       keys[codes.right[i]] = [pan, 0];
-               }
-               for (i = 0, len = codes.down.length; i < len; i++) {
-                       keys[codes.down[i]] = [0, pan];
-               }
-               for (i = 0, len = codes.up.length; i < len; i++) {
-                       keys[codes.up[i]] = [0, -1 * pan];
-               }
+               this._bounds = new Bounds(min, min.add(size.multiplyBy(1 + p * 2)).round());
+
+               this._center = this._map.getCenter();
+               this._zoom = this._map.getZoom();
+       }
+});
+
+/*
+ * @class Canvas
+ * @inherits Renderer
+ * @aka L.Canvas
+ *
+ * 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
+ * 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 Canvas = Renderer.extend({
+       getEvents: function () {
+               var events = Renderer.prototype.getEvents.call(this);
+               events.viewprereset = this._onViewPreReset;
+               return events;
        },
 
        },
 
-       _setZoomOffset: function (zoom) {
-               var keys = this._zoomKeys = {},
-                   codes = this.keyCodes,
-                   i, len;
+       _onViewPreReset: function () {
+               // Set a flag so that a viewprereset+moveend+viewreset only updates&redraws once
+               this._postponeUpdatePaths = true;
+       },
 
 
-               for (i = 0, len = codes.zoomIn.length; i < len; i++) {
-                       keys[codes.zoomIn[i]] = zoom;
-               }
-               for (i = 0, len = codes.zoomOut.length; i < len; i++) {
-                       keys[codes.zoomOut[i]] = -zoom;
-               }
+       onAdd: function () {
+               Renderer.prototype.onAdd.call(this);
+
+               // Redraw vectors since canvas is cleared upon removal,
+               // in case of removing the renderer itself from the map.
+               this._draw();
        },
 
        },
 
-       _addHooks: function () {
-               L.DomEvent.on(document, 'keydown', this._onKeyDown, this);
+       _initContainer: function () {
+               var container = this._container = document.createElement('canvas');
+
+               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);
+
+               this._ctx = container.getContext('2d');
        },
 
        },
 
-       _removeHooks: function () {
-               L.DomEvent.off(document, 'keydown', this._onKeyDown, this);
+       _destroyContainer: function () {
+               cancelAnimFrame(this._redrawRequest);
+               delete this._ctx;
+               remove(this._container);
+               off(this._container);
+               delete this._container;
        },
 
        },
 
-       _onKeyDown: function (e) {
-               var key = e.keyCode,
-                   map = this._map;
+       _updatePaths: function () {
+               if (this._postponeUpdatePaths) { return; }
 
 
-               if (key in this._panKeys) {
+               var layer;
+               this._redrawBounds = null;
+               for (var id in this._layers) {
+                       layer = this._layers[id];
+                       layer._update();
+               }
+               this._redraw();
+       },
 
 
-                       if (map._panAnim && map._panAnim._inProgress) { return; }
+       _update: function () {
+               if (this._map._animatingZoom && this._bounds) { return; }
 
 
-                       map.panBy(this._panKeys[key]);
+               Renderer.prototype._update.call(this);
 
 
-                       if (map.options.maxBounds) {
-                               map.panInsideBounds(map.options.maxBounds);
-                       }
+               var b = this._bounds,
+                   container = this._container,
+                   size = b.getSize(),
+                   m = retina ? 2 : 1;
 
 
-               } else if (key in this._zoomKeys) {
-                       map.setZoom(map.getZoom() + this._zoomKeys[key]);
+               setPosition(container, b.min);
 
 
-               } else {
-                       return;
+               // 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';
+
+               if (retina) {
+                       this._ctx.scale(2, 2);
                }
 
                }
 
-               L.DomEvent.stop(e);
-       }
-});
+               // translate so we use the same path coordinates after canvas element moves
+               this._ctx.translate(-b.min.x, -b.min.y);
 
 
-L.Map.addInitHook('addHandler', 'keyboard', L.Map.Keyboard);
+               // Tell paths to redraw themselves
+               this.fire('update');
+       },
 
 
+       _reset: function () {
+               Renderer.prototype._reset.call(this);
 
 
-/*
- * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
- */
+               if (this._postponeUpdatePaths) {
+                       this._postponeUpdatePaths = false;
+                       this._updatePaths();
+               }
+       },
 
 
-L.Handler.MarkerDrag = L.Handler.extend({
-       initialize: function (marker) {
-               this._marker = marker;
+       _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;
        },
 
        },
 
-       addHooks: function () {
-               var icon = this._marker._icon;
-               if (!this._draggable) {
-                       this._draggable = new L.Draggable(icon, icon);
+       _addPath: function (layer) {
+               this._requestRedraw(layer);
+       },
+
+       _removePath: function (layer) {
+               var order = layer._order;
+               var next = order.next;
+               var prev = order.prev;
+
+               if (next) {
+                       next.prev = prev;
+               } else {
+                       this._drawLast = prev;
+               }
+               if (prev) {
+                       prev.next = next;
+               } else {
+                       this._drawFirst = next;
                }
 
                }
 
-               this._draggable
-                       .on('dragstart', this._onDragStart, this)
-                       .on('drag', this._onDrag, this)
-                       .on('dragend', this._onDragEnd, this);
-               this._draggable.enable();
-               L.DomUtil.addClass(this._marker._icon, 'leaflet-marker-draggable');
-       },
+               delete layer._order;
 
 
-       removeHooks: function () {
-               this._draggable
-                       .off('dragstart', this._onDragStart, this)
-                       .off('drag', this._onDrag, this)
-                       .off('dragend', this._onDragEnd, this);
+               delete this._layers[stamp(layer)];
 
 
-               this._draggable.disable();
-               L.DomUtil.removeClass(this._marker._icon, 'leaflet-marker-draggable');
+               this._requestRedraw(layer);
        },
 
        },
 
-       moved: function () {
-               return this._draggable && this._draggable._moved;
+       _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);
        },
 
        },
 
-       _onDragStart: function () {
-               this._marker
-                   .closePopup()
-                   .fire('movestart')
-                   .fire('dragstart');
+       _updateStyle: function (layer) {
+               this._updateDashArray(layer);
+               this._requestRedraw(layer);
        },
 
        },
 
-       _onDrag: function () {
-               var marker = this._marker,
-                   shadow = marker._shadow,
-                   iconPos = L.DomUtil.getPosition(marker._icon),
-                   latlng = marker._map.layerPointToLatLng(iconPos);
-
-               // update shadow position
-               if (shadow) {
-                       L.DomUtil.setPosition(shadow, iconPos);
+       _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 {
+                       layer.options._dashArray = layer.options.dashArray;
                }
                }
+       },
 
 
-               marker._latlng = latlng;
+       _requestRedraw: function (layer) {
+               if (!this._map) { return; }
 
 
-               marker
-                   .fire('move', {latlng: latlng})
-                   .fire('drag');
+               this._extendRedrawBounds(layer);
+               this._redrawRequest = this._redrawRequest || requestAnimFrame(this._redraw, this);
        },
 
        },
 
-       _onDragEnd: function (e) {
-               this._marker
-                   .fire('moveend')
-                   .fire('dragend', e);
-       }
-});
+       _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]));
+               }
+       },
 
 
+       _redraw: function () {
+               this._redrawRequest = null;
 
 
-/*
- * L.Control is a base class for implementing map controls. Handles positioning.
- * All other controls extend from this class.
- */
+               if (this._redrawBounds) {
+                       this._redrawBounds.min._floor();
+                       this._redrawBounds.max._ceil();
+               }
 
 
-L.Control = L.Class.extend({
-       options: {
-               position: 'topright'
-       },
+               this._clear(); // clear layers in redraw bounds
+               this._draw(); // draw layers
 
 
-       initialize: function (options) {
-               L.setOptions(this, options);
+               this._redrawBounds = null;
        },
 
        },
 
-       getPosition: function () {
-               return this.options.position;
+       _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);
+               }
        },
 
        },
 
-       setPosition: function (position) {
-               var map = this._map;
-
-               if (map) {
-                       map.removeControl(this);
+       _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();
                }
 
                }
 
-               this.options.position = position;
+               this._drawing = true;
 
 
-               if (map) {
-                       map.addControl(this);
+               for (var order = this._drawFirst; order; order = order.next) {
+                       layer = order.layer;
+                       if (!bounds || (layer._pxBounds && layer._pxBounds.intersects(bounds))) {
+                               layer._updatePath();
+                       }
                }
 
                }
 
-               return this;
-       },
+               this._drawing = false;
 
 
-       getContainer: function () {
-               return this._container;
+               this._ctx.restore();  // Restore state before clipping.
        },
 
        },
 
-       addTo: function (map) {
-               this._map = map;
+       _updatePoly: function (layer, closed) {
+               if (!this._drawing) { return; }
 
 
-               var container = this._container = this.onAdd(map),
-                   pos = this.getPosition(),
-                   corner = map._controlCorners[pos];
+               var i, j, len2, p,
+                   parts = layer._parts,
+                   len = parts.length,
+                   ctx = this._ctx;
 
 
-               L.DomUtil.addClass(container, 'leaflet-control');
+               if (!len) { return; }
 
 
-               if (pos.indexOf('bottom') !== -1) {
-                       corner.insertBefore(container, corner.firstChild);
-               } else {
-                       corner.appendChild(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();
+                       }
                }
 
                }
 
-               return this;
+               this._fillStroke(ctx, layer);
+
+               // TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature
        },
 
        },
 
-       removeFrom: function (map) {
-               var pos = this.getPosition(),
-                   corner = map._controlCorners[pos];
+       _updateCircle: function (layer) {
 
 
-               corner.removeChild(this._container);
-               this._map = null;
+               if (!this._drawing || layer._empty()) { return; }
 
 
-               if (this.onRemove) {
-                       this.onRemove(map);
+               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;
+
+               if (s !== 1) {
+                       ctx.save();
+                       ctx.scale(1, s);
                }
 
                }
 
-               return this;
-       },
+               ctx.beginPath();
+               ctx.arc(p.x, p.y / s, r, 0, Math.PI * 2, false);
 
 
-       _refocusOnMap: function () {
-               if (this._map) {
-                       this._map.getContainer().focus();
+               if (s !== 1) {
+                       ctx.restore();
                }
                }
-       }
-});
-
-L.control = function (options) {
-       return new L.Control(options);
-};
 
 
+               this._fillStroke(ctx, layer);
+       },
 
 
-// adds control-related methods to L.Map
+       _fillStroke: function (ctx, layer) {
+               var options = layer.options;
 
 
-L.Map.include({
-       addControl: function (control) {
-               control.addTo(this);
-               return this;
-       },
+               if (options.fill) {
+                       ctx.globalAlpha = options.fillOpacity;
+                       ctx.fillStyle = options.fillColor || options.color;
+                       ctx.fill(options.fillRule || 'evenodd');
+               }
 
 
-       removeControl: function (control) {
-               control.removeFrom(this);
-               return this;
+               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();
+               }
        },
 
        },
 
-       _initControlPos: function () {
-               var corners = this._controlCorners = {},
-                   l = 'leaflet-',
-                   container = this._controlContainer =
-                           L.DomUtil.create('div', l + 'control-container', this._container);
+       // 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
 
 
-               function createCorner(vSide, hSide) {
-                       var className = l + vSide + ' ' + l + hSide;
+       _onClick: function (e) {
+               var point = this._map.mouseEventToLayerPoint(e), layer, clickedLayer;
 
 
-                       corners[vSide + hSide] = L.DomUtil.create('div', className, 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);
                }
                }
-
-               createCorner('top', 'left');
-               createCorner('top', 'right');
-               createCorner('bottom', 'left');
-               createCorner('bottom', 'right');
        },
 
        },
 
-       _clearControlPos: function () {
-               this._container.removeChild(this._controlContainer);
-       }
-});
+       _onMouseMove: function (e) {
+               if (!this._map || this._map.dragging.moving() || this._map._animatingZoom) { return; }
 
 
+               var point = this._map.mouseEventToLayerPoint(e);
+               this._handleMouseHover(e, point);
+       },
 
 
-/*
- * L.Control.Zoom is used for the default zoom buttons on the map.
- */
 
 
-L.Control.Zoom = L.Control.extend({
-       options: {
-               position: 'topleft',
-               zoomInText: '+',
-               zoomInTitle: 'Zoom in',
-               zoomOutText: '-',
-               zoomOutTitle: 'Zoom out'
+       _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;
+               }
        },
 
        },
 
-       onAdd: function (map) {
-               var zoomName = 'leaflet-control-zoom',
-                   container = L.DomUtil.create('div', zoomName + ' leaflet-bar');
+       _handleMouseHover: function (e, point) {
+               var layer, candidateHoveredLayer;
 
 
-               this._map = map;
+               for (var order = this._drawFirst; order; order = order.next) {
+                       layer = order.layer;
+                       if (layer.options.interactive && layer._containsPoint(point)) {
+                               candidateHoveredLayer = layer;
+                       }
+               }
 
 
-               this._zoomInButton  = this._createButton(
-                       this.options.zoomInText, this.options.zoomInTitle,
-                       zoomName + '-in',  container, this._zoomIn,  this);
-               this._zoomOutButton = this._createButton(
-                       this.options.zoomOutText, this.options.zoomOutTitle,
-                       zoomName + '-out', container, this._zoomOut, this);
+               if (candidateHoveredLayer !== this._hoveredLayer) {
+                       this._handleMouseOut(e);
 
 
-               this._updateDisabled();
-               map.on('zoomend zoomlevelschange', this._updateDisabled, this);
+                       if (candidateHoveredLayer) {
+                               addClass(this._container, 'leaflet-interactive'); // change cursor
+                               this._fireEvent([candidateHoveredLayer], e, 'mouseover');
+                               this._hoveredLayer = candidateHoveredLayer;
+                       }
+               }
 
 
-               return container;
+               if (this._hoveredLayer) {
+                       this._fireEvent([this._hoveredLayer], e);
+               }
        },
 
        },
 
-       onRemove: function (map) {
-               map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+       _fireEvent: function (layers, e, type) {
+               this._map._fireDOMEvent(e, type || e.type, layers);
        },
 
        },
 
-       _zoomIn: function (e) {
-               this._map.zoomIn(e.shiftKey ? 3 : 1);
-       },
+       _bringToFront: function (layer) {
+               var order = layer._order;
 
 
-       _zoomOut: function (e) {
-               this._map.zoomOut(e.shiftKey ? 3 : 1);
-       },
+               if (!order) { return; }
 
 
-       _createButton: function (html, title, className, container, fn, context) {
-               var link = L.DomUtil.create('a', className, container);
-               link.innerHTML = html;
-               link.href = '#';
-               link.title = title;
+               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;
+               }
 
 
-               var stop = L.DomEvent.stopPropagation;
+               order.prev = this._drawLast;
+               this._drawLast.next = order;
 
 
-               L.DomEvent
-                   .on(link, 'click', stop)
-                   .on(link, 'mousedown', stop)
-                   .on(link, 'dblclick', stop)
-                   .on(link, 'click', L.DomEvent.preventDefault)
-                   .on(link, 'click', fn, context)
-                   .on(link, 'click', this._refocusOnMap, context);
+               order.next = null;
+               this._drawLast = order;
 
 
-               return link;
+               this._requestRedraw(layer);
        },
 
        },
 
-       _updateDisabled: function () {
-               var map = this._map,
-                       className = 'leaflet-disabled';
+       _bringToBack: function (layer) {
+               var order = layer._order;
+
+               if (!order) { return; }
 
 
-               L.DomUtil.removeClass(this._zoomInButton, className);
-               L.DomUtil.removeClass(this._zoomOutButton, className);
+               var next = order.next;
+               var prev = order.prev;
 
 
-               if (map._zoom === map.getMinZoom()) {
-                       L.DomUtil.addClass(this._zoomOutButton, className);
+               if (prev) {
+                       prev.next = next;
+               } else {
+                       // Already first
+                       return;
                }
                }
-               if (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;
                }
                }
-       }
-});
 
 
-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);
        }
 });
 
        }
 });
 
-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;
+}
 
 /*
 
 /*
- * L.Control.Attribution is used for displaying attribution on the map (added by default).
+ * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!
  */
 
  */
 
-L.Control.Attribution = L.Control.extend({
-       options: {
-               position: 'bottomright',
-               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) {
-               this._container = L.DomUtil.create('div', 'leaflet-control-attribution');
-               L.DomEvent.disableClickPropagation(this._container);
 
 
-               for (var i in map._layers) {
-                       if (map._layers[i].getAttribution) {
-                               this.addAttribution(map._layers[i].getAttribution());
-                       }
-               }
-               
-               map
-                   .on('layeradd', this._onLayerAdd, this)
-                   .on('layerremove', this._onLayerRemove, this);
+/*
+ * @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');
        },
 
        },
 
-       onRemove: function (map) {
-               map
-                   .off('layeradd', this._onLayerAdd)
-                   .off('layerremove', this._onLayerRemove);
-
+       _update: function () {
+               if (this._map._animatingZoom) { return; }
+               Renderer.prototype._update.call(this);
+               this.fire('update');
        },
 
        },
 
-       setPrefix: function (prefix) {
-               this.options.prefix = prefix;
-               this._update();
-               return this;
-       },
+       _initPath: function (layer) {
+               var container = layer._container = vmlCreate('shape');
 
 
-       addAttribution: function (text) {
-               if (!text) { return; }
+               addClass(container, 'leaflet-vml-shape ' + (this.options.className || ''));
 
 
-               if (!this._attributions[text]) {
-                       this._attributions[text] = 0;
-               }
-               this._attributions[text]++;
+               container.coordsize = '1 1';
 
 
-               this._update();
+               layer._path = vmlCreate('path');
+               container.appendChild(layer._path);
 
 
-               return this;
+               this._updateStyle(layer);
+               this._layers[stamp(layer)] = layer;
        },
 
        },
 
-       removeAttribution: function (text) {
-               if (!text) { return; }
+       _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(' | ');
        },
 
        },
 
-       _onLayerAdd: function (e) {
-               if (e.layer.getAttribution) {
-                       this.addAttribution(e.layer.getAttribution());
-               }
+       _updateCircle: function (layer) {
+               var p = layer._point.round(),
+                   r = Math.round(layer._radius),
+                   r2 = Math.round(layer._radiusY || r);
+
+               this._setPath(layer, layer._empty() ? 'M0 0' :
+                       'AL ' + p.x + ',' + p.y + ' ' + r + ',' + r2 + ' 0,' + (65535 * 360));
        },
 
        },
 
-       _onLayerRemove: function (e) {
-               if (e.layer.getAttribution) {
-                       this.removeAttribution(e.layer.getAttribution());
-               }
-       }
-});
+       _setPath: function (layer, path) {
+               layer._path.v = path;
+       },
 
 
-L.Map.mergeOptions({
-       attributionControl: true
-});
+       _bringToFront: function (layer) {
+               toFront(layer._container);
+       },
 
 
-L.Map.addInitHook(function () {
-       if (this.options.attributionControl) {
-               this.attributionControl = (new L.Control.Attribution()).addTo(this);
+       _bringToBack: function (layer) {
+               toBack(layer._container);
        }
        }
-});
-
-L.control.attribution = function (options) {
-       return new L.Control.Attribution(options);
 };
 
 };
 
+var create$2 = vml ? vmlCreate : svgCreate;
 
 /*
 
 /*
- * L.Control.Scale is used for displaying metric/imperial scale on the map.
+ * @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.
+ *
+ * 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
+ * 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({
-       options: {
-               position: 'bottomleft',
-               maxWidth: 100,
-               metric: true,
-               imperial: true,
-               updateWhenIdle: false
-       },
-
-       onAdd: function (map) {
-               this._map = map;
+var SVG = Renderer.extend({
 
 
-               var className = 'leaflet-control-scale',
-                   container = L.DomUtil.create('div', className),
-                   options = this.options;
+       getEvents: function () {
+               var events = Renderer.prototype.getEvents.call(this);
+               events.zoomstart = this._onZoomStart;
+               return events;
+       },
 
 
-               this._addScales(options, className, container);
+       _initContainer: function () {
+               this._container = create$2('svg');
 
 
-               map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
-               map.whenReady(this._update, this);
+               // makes it possible to click through svg root; we'll reset it back in individual paths
+               this._container.setAttribute('pointer-events', 'none');
 
 
-               return container;
+               this._rootGroup = create$2('g');
+               this._container.appendChild(this._rootGroup);
        },
 
        },
 
-       onRemove: function (map) {
-               map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+       _destroyContainer: function () {
+               remove(this._container);
+               off(this._container);
+               delete this._container;
+               delete this._rootGroup;
+               delete this._svgSize;
        },
 
        },
 
-       _addScales: function (options, className, container) {
-               if (options.metric) {
-                       this._mScale = L.DomUtil.create('div', className + '-line', container);
-               }
-               if (options.imperial) {
-                       this._iScale = L.DomUtil.create('div', 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();
        },
 
        _update: function () {
        },
 
        _update: function () {
-               var bounds = this._map.getBounds(),
-                   centerLat = bounds.getCenter().lat,
-                   halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
-                   dist = halfWorldMeters * (bounds.getNorthEast().lng - bounds.getSouthWest().lng) / 180,
+               if (this._map._animatingZoom && this._bounds) { return; }
 
 
-                   size = this._map.getSize(),
-                   options = this.options,
-                   maxMeters = 0;
+               Renderer.prototype._update.call(this);
+
+               var b = this._bounds,
+                   size = b.getSize(),
+                   container = this._container;
 
 
-               if (size.x > 0) {
-                       maxMeters = dist * (options.maxWidth / size.x);
+               // 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);
                }
 
                }
 
-               this._updateScales(options, maxMeters);
+               // 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');
        },
 
        },
 
-       _updateScales: function (options, maxMeters) {
-               if (options.metric && maxMeters) {
-                       this._updateMetric(maxMeters);
+       // 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 (options.imperial && maxMeters) {
-                       this._updateImperial(maxMeters);
+               if (layer.options.interactive) {
+                       addClass(path, 'leaflet-interactive');
                }
                }
+
+               this._updateStyle(layer);
+               this._layers[stamp(layer)] = layer;
        },
 
        },
 
-       _updateMetric: function (maxMeters) {
-               var meters = this._getRoundNum(maxMeters);
+       _addPath: function (layer) {
+               if (!this._rootGroup) { this._initContainer(); }
+               this._rootGroup.appendChild(layer._path);
+               layer.addInteractiveTarget(layer._path);
+       },
 
 
-               this._mScale.style.width = this._getScaleWidth(meters / maxMeters) + 'px';
-               this._mScale.innerHTML = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km';
+       _removePath: function (layer) {
+               remove(layer._path);
+               layer.removeInteractiveTarget(layer._path);
+               delete this._layers[stamp(layer)];
        },
 
        },
 
-       _updateImperial: function (maxMeters) {
-               var maxFeet = maxMeters * 3.2808399,
-                   scale = this._iScale,
-                   maxMiles, miles, feet;
+       _updatePath: function (layer) {
+               layer._project();
+               layer._update();
+       },
 
 
-               if (maxFeet > 5280) {
-                       maxMiles = maxFeet / 5280;
-                       miles = this._getRoundNum(maxMiles);
+       _updateStyle: function (layer) {
+               var path = layer._path,
+                   options = layer.options;
 
 
-                       scale.style.width = this._getScaleWidth(miles / maxMiles) + 'px';
-                       scale.innerHTML = miles + ' mi';
+               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 {
                } else {
-                       feet = this._getRoundNum(maxFeet);
+                       path.setAttribute('stroke', 'none');
+               }
 
 
-                       scale.style.width = this._getScaleWidth(feet / maxFeet) + 'px';
-                       scale.innerHTML = feet + ' ft';
+               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');
                }
        },
 
                }
        },
 
-       _getScaleWidth: function (ratio) {
-               return Math.round(this.options.maxWidth * ratio) - 10;
+       _updatePoly: function (layer, closed) {
+               this._setPath(layer, pointsToPath(layer._parts, closed));
        },
 
        },
 
-       _getRoundNum: function (num) {
-               var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1),
-                   d = num / pow10;
+       _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 ';
 
 
-               d = d >= 10 ? 10 : d >= 5 ? 5 : d >= 3 ? 3 : d >= 2 ? 2 : 1;
+               // 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 ';
 
 
-               return pow10 * d;
+               this._setPath(layer, d);
+       },
+
+       _setPath: function (layer, path) {
+               layer._path.setAttribute('d', path);
+       },
+
+       // SVG does not have the concept of zIndex so we resort to changing the DOM order of elements
+       _bringToFront: function (layer) {
+               toFront(layer._path);
+       },
+
+       _bringToBack: function (layer) {
+               toBack(layer._path);
        }
 });
 
        }
 });
 
-L.control.scale = function (options) {
-       return new L.Control.Scale(options);
-};
-
+if (vml) {
+       SVG.include(vmlMixin);
+}
 
 
-/*
- * L.Control.Layers is a control to allow users to switch between different layers on the map.
- */
+// @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;
+}
 
 
-L.Control.Layers = L.Control.extend({
-       options: {
-               collapsed: true,
-               position: 'topright',
-               autoZIndex: true
-       },
+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;
 
 
-       initialize: function (baseLayers, overlays, options) {
-               L.setOptions(this, options);
+               if (!renderer) {
+                       renderer = this._renderer = this._createRenderer();
+               }
 
 
-               this._layers = {};
-               this._lastZIndex = 0;
-               this._handlingClick = false;
+               if (!this.hasLayer(renderer)) {
+                       this.addLayer(renderer);
+               }
+               return renderer;
+       },
 
 
-               for (var i in baseLayers) {
-                       this._addLayer(baseLayers[i], i);
+       _getPaneRenderer: function (name) {
+               if (name === 'overlayPane' || name === undefined) {
+                       return false;
                }
 
                }
 
-               for (i in overlays) {
-                       this._addLayer(overlays[i], i, true);
+               var renderer = this._paneRenderers[name];
+               if (renderer === undefined) {
+                       renderer = this._createRenderer({pane: name});
+                       this._paneRenderers[name] = renderer;
                }
                }
+               return renderer;
        },
 
        },
 
-       onAdd: function (map) {
-               this._initLayout();
-               this._update();
+       _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);
+       }
+});
 
 
-               map
-                   .on('layeradd', this._onLayerChange, this)
-                   .on('layerremove', this._onLayerChange, this);
+/*
+ * L.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds object.
+ */
 
 
-               return this._container;
+/*
+ * @class Rectangle
+ * @aka L.Rectangle
+ * @inherits Polygon
+ *
+ * A class for drawing rectangle overlays on a map. Extends `Polygon`.
+ *
+ * @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);
+ * ```
+ *
+ */
+
+
+var Rectangle = Polygon.extend({
+       initialize: function (latLngBounds, options) {
+               Polygon.prototype.initialize.call(this, this._boundsToLatLngs(latLngBounds), options);
        },
 
        },
 
-       onRemove: function (map) {
-               map
-                   .off('layeradd', this._onLayerChange)
-                   .off('layerremove', this._onLayerChange);
+       // @method setBounds(latLngBounds: LatLngBounds): this
+       // Redraws the rectangle with the passed bounds.
+       setBounds: function (latLngBounds) {
+               return this.setLatLngs(this._boundsToLatLngs(latLngBounds));
        },
 
        },
 
-       addBaseLayer: function (layer, name) {
-               this._addLayer(layer, name);
-               this._update();
-               return this;
+       _boundsToLatLngs: function (latLngBounds) {
+               latLngBounds = toLatLngBounds(latLngBounds);
+               return [
+                       latLngBounds.getSouthWest(),
+                       latLngBounds.getNorthWest(),
+                       latLngBounds.getNorthEast(),
+                       latLngBounds.getSouthEast()
+               ];
+       }
+});
+
+
+// @factory L.rectangle(latLngBounds: LatLngBounds, options?: Polyline options)
+function rectangle(latLngBounds, options) {
+       return new Rectangle(latLngBounds, options);
+}
+
+SVG.create = create$2;
+SVG.pointsToPath = pointsToPath;
+
+GeoJSON.geometryToLayer = geometryToLayer;
+GeoJSON.coordsToLatLng = coordsToLatLng;
+GeoJSON.coordsToLatLngs = coordsToLatLngs;
+GeoJSON.latLngToCoords = latLngToCoords;
+GeoJSON.latLngsToCoords = latLngsToCoords;
+GeoJSON.getFeature = getFeature;
+GeoJSON.asFeature = asFeature;
+
+/*
+ * L.Handler.BoxZoom is used to add shift-drag zoom interaction to the map
+ * (zoom to a selected bounding box), enabled by default.
+ */
+
+// @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
+});
+
+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);
        },
 
        },
 
-       addOverlay: function (layer, name) {
-               this._addLayer(layer, name, true);
-               this._update();
-               return this;
+       addHooks: function () {
+               on(this._container, 'mousedown', this._onMouseDown, this);
        },
 
        },
 
-       removeLayer: function (layer) {
-               var id = L.stamp(layer);
-               delete this._layers[id];
-               this._update();
-               return this;
+       removeHooks: function () {
+               off(this._container, 'mousedown', this._onMouseDown, this);
        },
 
        },
 
-       _initLayout: function () {
-               var className = 'leaflet-control-layers',
-                   container = this._container = L.DomUtil.create('div', className);
+       moved: function () {
+               return this._moved;
+       },
 
 
-               //Makes this work on IE10 Touch devices by stopping it from firing a mouseout event when the touch is released
-               container.setAttribute('aria-haspopup', true);
+       _destroy: function () {
+               remove(this._pane);
+               delete this._pane;
+       },
 
 
-               if (!L.Browser.touch) {
-                       L.DomEvent
-                               .disableClickPropagation(container)
-                               .disableScrollPropagation(container);
-               } else {
-                       L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
+       _resetState: function () {
+               this._resetStateTimeout = 0;
+               this._moved = false;
+       },
+
+       _clearDeferredResetState: function () {
+               if (this._resetStateTimeout !== 0) {
+                       clearTimeout(this._resetStateTimeout);
+                       this._resetStateTimeout = 0;
                }
                }
+       },
 
 
-               var form = this._form = L.DomUtil.create('form', className + '-list');
+       _onMouseDown: function (e) {
+               if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
 
 
-               if (this.options.collapsed) {
-                       if (!L.Browser.android) {
-                               L.DomEvent
-                                   .on(container, 'mouseover', this._expand, this)
-                                   .on(container, 'mouseout', this._collapse, this);
-                       }
-                       var link = this._layersLink = L.DomUtil.create('a', className + '-toggle', container);
-                       link.href = '#';
-                       link.title = 'Layers';
-
-                       if (L.Browser.touch) {
-                               L.DomEvent
-                                   .on(link, 'click', L.DomEvent.stop)
-                                   .on(link, 'click', this._expand, this);
-                       }
-                       else {
-                               L.DomEvent.on(link, 'focus', this._expand, this);
-                       }
-                       //Work around for Firefox android issue https://github.com/Leaflet/Leaflet/issues/2033
-                       L.DomEvent.on(form, 'click', function () {
-                               setTimeout(L.bind(this._onInputClick, this), 0);
-                       }, this);
+               // 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();
 
 
-                       this._map.on('click', this._collapse, this);
-                       // TODO keyboard accessibility
-               } else {
-                       this._expand();
-               }
+               disableTextSelection();
+               disableImageDrag();
 
 
-               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._startPoint = this._map.mouseEventToContainerPoint(e);
 
 
-               container.appendChild(form);
+               on(document, {
+                       contextmenu: stop,
+                       mousemove: this._onMouseMove,
+                       mouseup: this._onMouseUp,
+                       keydown: this._onKeyDown
+               }, this);
        },
 
        },
 
-       _addLayer: function (layer, name, overlay) {
-               var id = L.stamp(layer);
+       _onMouseMove: function (e) {
+               if (!this._moved) {
+                       this._moved = true;
 
 
-               this._layers[id] = {
-                       layer: layer,
-                       name: name,
-                       overlay: overlay
-               };
+                       this._box = create$1('div', 'leaflet-zoom-box', this._container);
+                       addClass(this._container, 'leaflet-crosshair');
 
 
-               if (this.options.autoZIndex && layer.setZIndex) {
-                       this._lastZIndex++;
-                       layer.setZIndex(this._lastZIndex);
+                       this._map.fire('boxzoomstart');
                }
                }
-       },
 
 
-       _update: function () {
-               if (!this._container) {
-                       return;
-               }
+               this._point = this._map.mouseEventToContainerPoint(e);
 
 
-               this._baseLayersList.innerHTML = '';
-               this._overlaysList.innerHTML = '';
+               var bounds = new Bounds(this._point, this._startPoint),
+                   size = bounds.getSize();
 
 
-               var baseLayersPresent = false,
-                   overlaysPresent = false,
-                   i, obj;
+               setPosition(this._box, bounds.min);
 
 
-               for (i in this._layers) {
-                       obj = this._layers[i];
-                       this._addItem(obj);
-                       overlaysPresent = overlaysPresent || obj.overlay;
-                       baseLayersPresent = baseLayersPresent || !obj.overlay;
+               this._box.style.width  = size.x + 'px';
+               this._box.style.height = size.y + 'px';
+       },
+
+       _finish: function () {
+               if (this._moved) {
+                       remove(this._box);
+                       removeClass(this._container, 'leaflet-crosshair');
                }
 
                }
 
-               this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none';
+               enableTextSelection();
+               enableImageDrag();
+
+               off(document, {
+                       contextmenu: stop,
+                       mousemove: this._onMouseMove,
+                       mouseup: this._onMouseUp,
+                       keydown: this._onKeyDown
+               }, this);
        },
 
        },
 
-       _onLayerChange: function (e) {
-               var obj = this._layers[L.stamp(e.layer)];
+       _onMouseUp: function (e) {
+               if ((e.which !== 1) && (e.button !== 1)) { return; }
 
 
-               if (!obj) { return; }
+               this._finish();
 
 
-               if (!this._handlingClick) {
-                       this._update();
-               }
+               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);
 
 
-               var type = obj.overlay ?
-                       (e.type === 'layeradd' ? 'overlayadd' : 'overlayremove') :
-                       (e.type === 'layeradd' ? 'baselayerchange' : null);
+               var bounds = new LatLngBounds(
+                       this._map.containerPointToLatLng(this._startPoint),
+                       this._map.containerPointToLatLng(this._point));
 
 
-               if (type) {
-                       this._map.fire(type, obj);
-               }
+               this._map
+                       .fitBounds(bounds)
+                       .fire('boxzoomend', {boxZoomBounds: bounds});
        },
 
        },
 
-       // 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 + '"';
-               if (checked) {
-                       radioHtml += ' checked="checked"';
+       _onKeyDown: function (e) {
+               if (e.keyCode === 27) {
+                       this._finish();
                }
                }
-               radioHtml += '/>';
+       }
+});
 
 
-               var radioFragment = document.createElement('div');
-               radioFragment.innerHTML = radioHtml;
+// @section Handlers
+// @property boxZoom: Handler
+// Box (shift-drag with mouse) zoom handler.
+Map.addInitHook('addHandler', 'boxZoom', BoxZoom);
 
 
-               return radioFragment.firstChild;
+/*
+ * L.Handler.DoubleClickZoom is used to handle double-click zoom on the map, enabled by default.
+ */
+
+// @namespace Map
+// @section Interaction Options
+
+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 DoubleClickZoom = Handler.extend({
+       addHooks: function () {
+               this._map.on('dblclick', this._onDoubleClick, this);
        },
 
        },
 
-       _addItem: function (obj) {
-               var label = document.createElement('label'),
-                   input,
-                   checked = this._map.hasLayer(obj.layer);
+       removeHooks: function () {
+               this._map.off('dblclick', this._onDoubleClick, this);
+       },
 
 
-               if (obj.overlay) {
-                       input = document.createElement('input');
-                       input.type = 'checkbox';
-                       input.className = 'leaflet-control-layers-selector';
-                       input.defaultChecked = checked;
+       _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 {
                } else {
-                       input = this._createRadioElement('leaflet-base-layers', checked);
+                       map.setZoomAround(e.containerPoint, zoom);
                }
                }
+       }
+});
 
 
-               input.layerId = L.stamp(obj.layer);
+// @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);
 
 
-               L.DomEvent.on(input, 'click', this._onInputClick, this);
+/*
+ * L.Handler.MapDrag is used to make the map draggable (with panning inertia), enabled by default.
+ */
 
 
-               var name = document.createElement('span');
-               name.innerHTML = ' ' + obj.name;
+// @namespace Map
+// @section Interaction Options
+Map.mergeOptions({
+       // @option dragging: Boolean = true
+       // Whether the map be draggable with mouse/touch or not.
+       dragging: true,
 
 
-               label.appendChild(input);
-               label.appendChild(name);
+       // @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,
 
 
-               var container = obj.overlay ? this._overlaysList : this._baseLayersList;
-               container.appendChild(label);
+       // @option inertiaDeceleration: Number = 3000
+       // The rate with which the inertial movement slows down, in pixels/second².
+       inertiaDeceleration: 3400, // px/s^2
 
 
-               return label;
-       },
+       // @option inertiaMaxSpeed: Number = Infinity
+       // Max speed of the inertial movement, in pixels/second.
+       inertiaMaxSpeed: Infinity, // px/s
 
 
-       _onInputClick: function () {
-               var i, input, obj,
-                   inputs = this._form.getElementsByTagName('input'),
-                   inputsLen = inputs.length;
+       // @option easeLinearity: Number = 0.2
+       easeLinearity: 0.2,
 
 
-               this._handlingClick = true;
+       // 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,
+
+       // @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
+});
 
 
-               for (i = 0; i < inputsLen; i++) {
-                       input = inputs[i];
-                       obj = this._layers[input.layerId];
+var Drag = Handler.extend({
+       addHooks: function () {
+               if (!this._draggable) {
+                       var map = this._map;
+
+                       this._draggable = new Draggable(map._mapPane, map._container);
 
 
-                       if (input.checked && !this._map.hasLayer(obj.layer)) {
-                               this._map.addLayer(obj.layer);
+                       this._draggable.on({
+                               dragstart: this._onDragStart,
+                               drag: this._onDrag,
+                               dragend: this._onDragEnd
+                       }, 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);
 
 
-                       } else if (!input.checked && this._map.hasLayer(obj.layer)) {
-                               this._map.removeLayer(obj.layer);
+                               map.whenReady(this._onZoomEnd, this);
                        }
                }
                        }
                }
+               addClass(this._map._container, 'leaflet-grab leaflet-touch-drag');
+               this._draggable.enable();
+               this._positions = [];
+               this._times = [];
+       },
 
 
-               this._handlingClick = false;
+       removeHooks: function () {
+               removeClass(this._map._container, 'leaflet-grab');
+               removeClass(this._map._container, 'leaflet-touch-drag');
+               this._draggable.disable();
+       },
 
 
-               this._refocusOnMap();
+       moved: function () {
+               return this._draggable && this._draggable._moved;
        },
 
        },
 
-       _expand: function () {
-               L.DomUtil.addClass(this._container, 'leaflet-control-layers-expanded');
+       moving: function () {
+               return this._draggable && this._draggable._moving;
        },
 
        },
 
-       _collapse: function () {
-               this._container.className = this._container.className.replace(' leaflet-control-layers-expanded', '');
-       }
-});
+       _onDragStart: function () {
+               var map = this._map;
 
 
-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()));
 
 
-/*
- * L.PosAnimation is used by Leaflet internally for pan animations.
- */
+                       this._viscosity = Math.min(1.0, Math.max(0.0, this._map.options.maxBoundsViscosity));
+               } else {
+                       this._offsetLimit = null;
+               }
 
 
-L.PosAnimation = L.Class.extend({
-       includes: L.Mixin.Events,
+               map
+                   .fire('movestart')
+                   .fire('dragstart');
 
 
-       run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])
-               this.stop();
+               if (map.options.inertia) {
+                       this._positions = [];
+                       this._times = [];
+               }
+       },
 
 
-               this._el = el;
-               this._inProgress = true;
-               this._newPos = newPos;
+       _onDrag: function (e) {
+               if (this._map.options.inertia) {
+                       var time = this._lastTime = +new Date(),
+                           pos = this._lastPos = this._draggable._absPos || this._draggable._newPos;
 
 
-               this.fire('start');
+                       this._positions.push(pos);
+                       this._times.push(time);
 
 
-               el.style[L.DomUtil.TRANSITION] = 'all ' + (duration || 0.25) +
-                       's cubic-bezier(0,0,' + (easeLinearity || 0.5) + ',1)';
+                       this._prunePositions(time);
+               }
+
+               this._map
+                   .fire('move', e)
+                   .fire('drag', e);
+       },
 
 
-               L.DomEvent.on(el, L.DomUtil.TRANSITION_END, this._onTransitionEnd, this);
-               L.DomUtil.setPosition(el, newPos);
+       _prunePositions: function (time) {
+               while (this._positions.length > 1 && time - this._times[0] > 50) {
+                       this._positions.shift();
+                       this._times.shift();
+               }
+       },
+
+       _onZoomEnd: function () {
+               var pxCenter = this._map.getSize().divideBy(2),
+                   pxWorldCenter = this._map.latLngToLayerPoint([0, 0]);
 
 
-               // toggle reflow, Chrome flickers for some reason if you don't do this
-               L.Util.falseFn(el.offsetWidth);
+               this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
+               this._worldWidth = this._map.getPixelWorldBounds().getSize().x;
+       },
 
 
-               // there's no native way to track value updates of transitioned properties, so we imitate this
-               this._stepTimer = setInterval(L.bind(this._onStep, this), 50);
+       _viscousLimit: function (value, threshold) {
+               return value - (value - threshold) * this._viscosity;
        },
 
        },
 
-       stop: function () {
-               if (!this._inProgress) { return; }
+       _onPreDragLimit: function () {
+               if (!this._viscosity || !this._offsetLimit) { return; }
 
 
-               // if we just removed the transition property, the element would jump to its final position,
-               // so we need to make it stay at the current position
+               var offset = this._draggable._newPos.subtract(this._draggable._startPos);
 
 
-               L.DomUtil.setPosition(this._el, this._getPos());
-               this._onTransitionEnd();
-               L.Util.falseFn(this._el.offsetWidth); // force reflow in case we are about to start a new animation
+               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); }
+
+               this._draggable._newPos = this._draggable._startPos.add(offset);
        },
 
        },
 
-       _onStep: function () {
-               var stepPos = this._getPos();
-               if (!stepPos) {
-                       this._onTransitionEnd();
-                       return;
-               }
-               // jshint camelcase: false
-               // make L.DomUtil.getPosition return intermediate position value during animation
-               this._el._leaflet_pos = stepPos;
+       _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.fire('step');
+               this._draggable._absPos = this._draggable._newPos.clone();
+               this._draggable._newPos.x = newX;
        },
 
        },
 
-       // you can't easily get intermediate values of properties animated with CSS3 Transitions,
-       // we need to parse computed style (in case of transform it returns matrix string)
+       _onDragEnd: function (e) {
+               var map = this._map,
+                   options = map.options,
+
+                   noInertia = !options.inertia || this._times.length < 2;
 
 
-       _transformRe: /([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/,
+               map.fire('dragend', e);
 
 
-       _getPos: function () {
-               var left, top, matches,
-                   el = this._el,
-                   style = window.getComputedStyle(el);
+               if (noInertia) {
+                       map.fire('moveend');
 
 
-               if (L.Browser.any3d) {
-                       matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);
-                       if (!matches) { return; }
-                       left = parseFloat(matches[1]);
-                       top  = parseFloat(matches[2]);
                } else {
                } else {
-                       left = parseFloat(style.left);
-                       top  = parseFloat(style.top);
-               }
+                       this._prunePositions(+new Date());
 
 
-               return new L.Point(left, top, true);
-       },
+                       var direction = this._lastPos.subtract(this._positions[0]),
+                           duration = (this._lastTime - this._times[0]) / 1000,
+                           ease = options.easeLinearity,
 
 
-       _onTransitionEnd: function () {
-               L.DomEvent.off(this._el, L.DomUtil.TRANSITION_END, this._onTransitionEnd, this);
+                           speedVector = direction.multiplyBy(ease / duration),
+                           speed = speedVector.distanceTo([0, 0]),
 
 
-               if (!this._inProgress) { return; }
-               this._inProgress = false;
+                           limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
+                           limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
 
 
-               this._el.style[L.DomUtil.TRANSITION] = '';
+                           decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
+                           offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
 
 
-               // jshint camelcase: false
-               // make sure L.DomUtil.getPosition returns the final position value after animation
-               this._el._leaflet_pos = this._newPos;
+                       if (!offset.x && !offset.y) {
+                               map.fire('moveend');
 
 
-               clearInterval(this._stepTimer);
+                       } else {
+                               offset = map._limitOffset(offset, map.options.maxBounds);
 
 
-               this.fire('step').fire('end');
+                               requestAnimFrame(function () {
+                                       map.panBy(offset, {
+                                               duration: decelerationDuration,
+                                               easeLinearity: ease,
+                                               noMoveStart: true,
+                                               animate: true
+                                       });
+                               });
+                       }
+               }
        }
        }
-
 });
 
 });
 
+// @section Handlers
+// @property dragging: Handler
+// Map dragging handler (by both mouse and touch).
+Map.addInitHook('addHandler', 'dragging', Drag);
 
 /*
 
 /*
- * Extends L.Map to handle panning animations.
+ * L.Map.Keyboard is handling keyboard interaction with the map, enabled by default.
  */
 
  */
 
-L.Map.include({
+// @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,
 
 
-       setView: function (center, zoom, options) {
+       // @option keyboardPanDelta: Number = 80
+       // Amount of pixels to pan when pressing an arrow key.
+       keyboardPanDelta: 80
+});
 
 
-               zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom);
-               center = this._limitCenter(L.latLng(center), zoom, this.options.maxBounds);
-               options = options || {};
+var Keyboard = Handler.extend({
 
 
-               if (this._panAnim) {
-                       this._panAnim.stop();
-               }
+       keyCodes: {
+               left:    [37],
+               right:   [39],
+               down:    [40],
+               up:      [38],
+               zoomIn:  [187, 107, 61, 171],
+               zoomOut: [189, 109, 54, 173]
+       },
 
 
-               if (this._loaded && !options.reset && options !== true) {
+       initialize: function (map) {
+               this._map = map;
 
 
-                       if (options.animate !== undefined) {
-                               options.zoom = L.extend({animate: options.animate}, options.zoom);
-                               options.pan = L.extend({animate: options.animate}, options.pan);
-                       }
+               this._setPanDelta(map.options.keyboardPanDelta);
+               this._setZoomDelta(map.options.zoomDelta);
+       },
 
 
-                       // try animating pan or zoom
-                       var animated = (this._zoom !== zoom) ?
-                               this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) :
-                               this._tryAnimatedPan(center, options.pan);
+       addHooks: function () {
+               var container = this._map._container;
 
 
-                       if (animated) {
-                               // prevent resize handler call, the view will refresh after animation anyway
-                               clearTimeout(this._sizeTimer);
-                               return this;
-                       }
+               // make the container focusable by tabbing
+               if (container.tabIndex <= 0) {
+                       container.tabIndex = '0';
                }
 
                }
 
-               // animation didn't start, just reset the map view
-               this._resetView(center, zoom);
+               on(container, {
+                       focus: this._onFocus,
+                       blur: this._onBlur,
+                       mousedown: this._onMouseDown
+               }, this);
 
 
-               return this;
+               this._map.on({
+                       focus: this._addHooks,
+                       blur: this._removeHooks
+               }, this);
        },
 
        },
 
-       panBy: function (offset, options) {
-               offset = L.point(offset).round();
-               options = options || {};
-
-               if (!offset.x && !offset.y) {
-                       return this;
-               }
+       removeHooks: function () {
+               this._removeHooks();
 
 
-               if (!this._panAnim) {
-                       this._panAnim = new L.PosAnimation();
+               off(this._map._container, {
+                       focus: this._onFocus,
+                       blur: this._onBlur,
+                       mousedown: this._onMouseDown
+               }, this);
 
 
-                       this._panAnim.on({
-                               'step': this._onPanTransitionStep,
-                               'end': this._onPanTransitionEnd
-                       }, this);
-               }
+               this._map.off({
+                       focus: this._addHooks,
+                       blur: this._removeHooks
+               }, this);
+       },
 
 
-               // don't fire movestart if animating inertia
-               if (!options.noMoveStart) {
-                       this.fire('movestart');
-               }
+       _onMouseDown: function () {
+               if (this._focused) { return; }
 
 
-               // animate pan unless animate: false specified
-               if (options.animate !== false) {
-                       L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim');
+               var body = document.body,
+                   docEl = document.documentElement,
+                   top = body.scrollTop || docEl.scrollTop,
+                   left = body.scrollLeft || docEl.scrollLeft;
 
 
-                       var newPos = this._getMapPanePos().subtract(offset);
-                       this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity);
-               } else {
-                       this._rawPanBy(offset);
-                       this.fire('move').fire('moveend');
-               }
+               this._map._container.focus();
 
 
-               return this;
+               window.scrollTo(left, top);
        },
 
        },
 
-       _onPanTransitionStep: function () {
-               this.fire('move');
+       _onFocus: function () {
+               this._focused = true;
+               this._map.fire('focus');
        },
 
        },
 
-       _onPanTransitionEnd: function () {
-               L.DomUtil.removeClass(this._mapPane, 'leaflet-pan-anim');
-               this.fire('moveend');
+       _onBlur: function () {
+               this._focused = false;
+               this._map.fire('blur');
        },
 
        },
 
-       _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; }
-
-               this.panBy(offset, options);
-
-               return true;
-       }
-});
-
-
-/*
- * L.PosAnimation fallback implementation that powers Leaflet pan animations
- * in browsers that don't support CSS3 Transitions.
- */
-
-L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
-
-       run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])
-               this.stop();
-
-               this._el = el;
-               this._inProgress = true;
-               this._duration = duration || 0.25;
-               this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
+       _setPanDelta: function (panDelta) {
+               var keys = this._panKeys = {},
+                   codes = this.keyCodes,
+                   i, len;
 
 
-               this._startPos = L.DomUtil.getPosition(el);
-               this._offset = newPos.subtract(this._startPos);
-               this._startTime = +new Date();
+               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.fire('start');
+       _setZoomDelta: function (zoomDelta) {
+               var keys = this._zoomKeys = {},
+                   codes = this.keyCodes,
+                   i, len;
 
 
-               this._animate();
+               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;
+               }
        },
 
        },
 
-       stop: function () {
-               if (!this._inProgress) { return; }
-
-               this._step();
-               this._complete();
+       _addHooks: function () {
+               on(document, 'keydown', this._onKeyDown, this);
        },
 
        },
 
-       _animate: function () {
-               // animation loop
-               this._animId = L.Util.requestAnimFrame(this._animate, this);
-               this._step();
+       _removeHooks: function () {
+               off(document, 'keydown', this._onKeyDown, this);
        },
 
        },
 
-       _step: function () {
-               var elapsed = (+new Date()) - this._startTime,
-                   duration = this._duration * 1000;
+       _onKeyDown: function (e) {
+               if (e.altKey || e.ctrlKey || e.metaKey) { return; }
 
 
-               if (elapsed < duration) {
-                       this._runFrame(this._easeOut(elapsed / duration));
-               } else {
-                       this._runFrame(1);
-                       this._complete();
-               }
-       },
+               var key = e.keyCode,
+                   map = this._map,
+                   offset;
 
 
-       _runFrame: function (progress) {
-               var pos = this._startPos.add(this._offset.multiplyBy(progress));
-               L.DomUtil.setPosition(this._el, pos);
+               if (key in this._panKeys) {
+                       if (!map._panAnim || !map._panAnim._inProgress) {
+                               offset = this._panKeys[key];
+                               if (e.shiftKey) {
+                                       offset = toPoint(offset).multiplyBy(3);
+                               }
 
 
-               this.fire('step');
-       },
+                               map.panBy(offset);
 
 
-       _complete: function () {
-               L.Util.cancelAnimFrame(this._animId);
+                               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]);
 
 
-               this._inProgress = false;
-               this.fire('end');
-       },
+               } else if (key === 27 && map._popup && map._popup.options.closeOnEscapeKey) {
+                       map.closePopup();
 
 
-       _easeOut: function (t) {
-               return 1 - Math.pow(1 - t, this._easeOutPower);
+               } else {
+                       return;
+               }
+
+               stop(e);
        }
 });
 
        }
 });
 
+// @section Handlers
+// @section Handlers
+// @property keyboard: Handler
+// Keyboard navigation handler.
+Map.addInitHook('addHandler', 'keyboard', Keyboard);
 
 /*
 
 /*
- * Extends L.Map to handle zoom animations.
+ * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.
  */
 
  */
 
-L.Map.mergeOptions({
-       zoomAnimation: true,
-       zoomAnimationThreshold: 4
+// @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,
+
+       // @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,
+
+       // @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
 });
 
 });
 
-if (L.DomUtil.TRANSITION) {
-
-       L.Map.addInitHook(function () {
-               // don't animate on browsers without hardware-accelerated transitions or old Android/Opera
-               this._zoomAnimated = this.options.zoomAnimation && L.DomUtil.TRANSITION &&
-                               L.Browser.any3d && !L.Browser.android23 && !L.Browser.mobileOpera;
-
-               // zoom transitions run with the same duration for all layers, so if one of transitionend events
-               // happens after starting zoom animation (propagating to the map pane), we know that it ended globally
-               if (this._zoomAnimated) {
-                       L.DomEvent.on(this._mapPane, L.DomUtil.TRANSITION_END, this._catchTransitionEnd, this);
-               }
-       });
-}
-
-L.Map.include(!L.DomUtil.TRANSITION ? {} : {
+var ScrollWheelZoom = Handler.extend({
+       addHooks: function () {
+               on(this._map._container, 'mousewheel', this._onWheelScroll, this);
 
 
-       _catchTransitionEnd: function () {
-               if (this._animatingZoom) {
-                       this._onZoomTransitionEnd();
-               }
+               this._delta = 0;
        },
 
        },
 
-       _nothingToAnimate: function () {
-               return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
+       removeHooks: function () {
+               off(this._map._container, 'mousewheel', this._onWheelScroll, this);
        },
 
        },
 
-       _tryAnimatedZoom: function (center, zoom, options) {
-
-               if (this._animatingZoom) { return true; }
-
-               options = options || {};
+       _onWheelScroll: function (e) {
+               var delta = getWheelDelta(e);
 
 
-               // 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; }
+               var debounce = this._map.options.wheelDebounceTime;
 
 
-               // offset is the pixel coords of the zoom origin relative to the current center
-               var scale = this.getZoomScale(zoom),
-                   offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale),
-                       origin = this._getCenterLayerPoint()._add(offset);
+               this._delta += delta;
+               this._lastMousePos = this._map.mouseEventToContainerPoint(e);
 
 
-               // 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; }
+               if (!this._startTime) {
+                       this._startTime = +new Date();
+               }
 
 
-               this
-                   .fire('movestart')
-                   .fire('zoomstart');
+               var left = Math.max(debounce - (+new Date() - this._startTime), 0);
 
 
-               this._animateZoom(center, zoom, origin, scale, null, true);
+               clearTimeout(this._timer);
+               this._timer = setTimeout(bind(this._performZoom, this), left);
 
 
-               return true;
+               stop(e);
        },
 
        },
 
-       _animateZoom: function (center, zoom, origin, scale, delta, backwards) {
-
-               this._animatingZoom = true;
-
-               // put transform transition on all layers with leaflet-zoom-animated class
-               L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
-
-               // remember what center/zoom to set after animation
-               this._animateToCenter = center;
-               this._animateToZoom = zoom;
-
-               // disable any dragging during animation
-               if (L.Draggable) {
-                       L.Draggable._disabled = true;
-               }
-
-               this.fire('zoomanim', {
-                       center: center,
-                       zoom: zoom,
-                       origin: origin,
-                       scale: scale,
-                       delta: delta,
-                       backwards: backwards
-               });
-       },
+       _performZoom: function () {
+               var map = this._map,
+                   zoom = map.getZoom(),
+                   snap = this._map.options.zoomSnap || 0;
 
 
-       _onZoomTransitionEnd: function () {
+               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;
 
 
-               L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
+               this._delta = 0;
+               this._startTime = null;
 
 
-               this._resetView(this._animateToCenter, this._animateToZoom, true, true);
+               if (!delta) { return; }
 
 
-               if (L.Draggable) {
-                       L.Draggable._disabled = false;
+               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);
 
 /*
 
 /*
      Zoom animation logic for L.TileLayer.
-*/
* L.Map.Tap is used to enable mobile hacks like quick taps and long hold.
+ */
 
 
-L.TileLayer.include({
-       _animateZoom: function (e) {
-               if (!this._animating) {
-                       this._animating = true;
-                       this._prepareBgBuffer();
-               }
+// @namespace Map
+// @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,
 
 
-               var bg = this._bgBuffer,
-                   transform = L.DomUtil.TRANSFORM,
-                   initialTransform = e.delta ? L.DomUtil.getTranslateString(e.delta) : bg.style[transform],
-                   scaleStr = L.DomUtil.getScaleString(e.scale, e.origin);
+       // @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
+});
 
 
-               bg.style[transform] = e.backwards ?
-                               scaleStr + ' ' + initialTransform :
-                               initialTransform + ' ' + scaleStr;
+var Tap = Handler.extend({
+       addHooks: function () {
+               on(this._map._container, 'touchstart', this._onDown, this);
        },
 
        },
 
-       _endZoomAnim: function () {
-               var front = this._tileContainer,
-                   bg = this._bgBuffer;
-
-               front.style.visibility = '';
-               front.parentNode.appendChild(front); // Bring to fore
+       removeHooks: function () {
+               off(this._map._container, 'touchstart', this._onDown, this);
+       },
 
 
-               // force reflow
-               L.Util.falseFn(bg.offsetWidth);
+       _onDown: function (e) {
+               if (!e.touches) { return; }
 
 
-               this._animating = false;
-       },
+               preventDefault(e);
 
 
-       _clearBgBuffer: function () {
-               var map = this._map;
+               this._fireClick = true;
 
 
-               if (map && !map._animatingZoom && !map.touchZoom._zooming) {
-                       this._bgBuffer.innerHTML = '';
-                       this._bgBuffer.style[L.DomUtil.TRANSFORM] = '';
+               // don't simulate click or track longpress if more than 1 touch
+               if (e.touches.length > 1) {
+                       this._fireClick = false;
+                       clearTimeout(this._holdTimeout);
+                       return;
                }
                }
-       },
 
 
-       _prepareBgBuffer: function () {
+               var first = e.touches[0],
+                   el = first.target;
+
+               this._startPos = this._newPos = new Point(first.clientX, first.clientY);
 
 
-               var front = this._tileContainer,
-                   bg = this._bgBuffer;
+               // if touching a link, highlight it
+               if (el.tagName && el.tagName.toLowerCase() === 'a') {
+                       addClass(el, 'leaflet-active');
+               }
 
 
-               // if foreground layer doesn't have many tiles but bg layer does,
-               // keep the existing bg layer and just zoom it some more
+               // 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 bgLoaded = this._getLoadedTilesPercentage(bg),
-                   frontLoaded = this._getLoadedTilesPercentage(front);
+               this._simulateEvent('mousedown', first);
 
 
-               if (bg && bgLoaded > 0.5 && frontLoaded < 0.5) {
+               on(document, {
+                       touchmove: this._onMove,
+                       touchend: this._onUp
+               }, this);
+       },
 
 
-                       front.style.visibility = 'hidden';
-                       this._stopLoadingImages(front);
-                       return;
-               }
+       _onUp: function (e) {
+               clearTimeout(this._holdTimeout);
 
 
-               // prepare the buffer to become the front tile pane
-               bg.style.visibility = 'hidden';
-               bg.style[L.DomUtil.TRANSFORM] = '';
+               off(document, {
+                       touchmove: this._onMove,
+                       touchend: this._onUp
+               }, this);
 
 
-               // switch out the current layer to be the new bg layer (and vice-versa)
-               this._tileContainer = bg;
-               bg = this._bgBuffer = front;
+               if (this._fireClick && e && e.changedTouches) {
 
 
-               this._stopLoadingImages(bg);
+                       var first = e.changedTouches[0],
+                           el = first.target;
 
 
-               //prevent bg buffer from clearing right after zoom
-               clearTimeout(this._clearBgBufferTimer);
-       },
+                       if (el && el.tagName && el.tagName.toLowerCase() === 'a') {
+                               removeClass(el, 'leaflet-active');
+                       }
 
 
-       _getLoadedTilesPercentage: function (container) {
-               var tiles = container.getElementsByTagName('img'),
-                   i, len, count = 0;
+                       this._simulateEvent('mouseup', first);
 
 
-               for (i = 0, len = tiles.length; i < len; i++) {
-                       if (tiles[i].complete) {
-                               count++;
+                       // simulate click if the touch didn't move too much
+                       if (this._isTapValid()) {
+                               this._simulateEvent('click', first);
                        }
                }
                        }
                }
-               return count / len;
        },
 
        },
 
-       // stops loading all tiles in the background layer
-       _stopLoadingImages: function (container) {
-               var tiles = Array.prototype.slice.call(container.getElementsByTagName('img')),
-                   i, len, tile;
+       _isTapValid: function () {
+               return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance;
+       },
 
 
-               for (i = 0, len = tiles.length; i < len; i++) {
-                       tile = tiles[i];
+       _onMove: function (e) {
+               var first = e.touches[0];
+               this._newPos = new Point(first.clientX, first.clientY);
+               this._simulateEvent('mousemove', first);
+       },
 
 
-                       if (!tile.complete) {
-                               tile.onload = L.Util.falseFn;
-                               tile.onerror = L.Util.falseFn;
-                               tile.src = L.Util.emptyImageUrl;
+       _simulateEvent: function (type, e) {
+               var simulatedEvent = document.createEvent('MouseEvents');
 
 
-                               tile.parentNode.removeChild(tile);
-                       }
-               }
+               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.
  */
 
  */
 
-L.Map.include({
-       _defaultLocateOptions: {
-               watch: false,
-               setView: false,
-               maxZoom: Infinity,
-               timeout: 10000,
-               maximumAge: 0,
-               enableHighAccuracy: false
+// @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,
+
+       // @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);
+       },
+
+       removeHooks: function () {
+               removeClass(this._map._container, 'leaflet-touch-zoom');
+               off(this._map._container, 'touchstart', this._onTouchStart, this);
        },
 
        },
 
-       locate: function (/*Object*/ options) {
+       _onTouchStart: function (e) {
+               var map = this._map;
+               if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
 
 
-               options = this._locateOptions = L.extend(this._defaultLocateOptions, options);
+               var p1 = map.mouseEventToContainerPoint(e.touches[0]),
+                   p2 = map.mouseEventToContainerPoint(e.touches[1]);
 
 
-               if (!navigator.geolocation) {
-                       this._handleGeolocationError({
-                               code: 0,
-                               message: 'Geolocation not supported.'
-                       });
-                       return this;
+               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;
 
 
-       stopLocate: function () {
-               if (navigator.geolocation) {
-                       navigator.geolocation.clearWatch(this._locationWatchId);
-               }
-               if (this._locateOptions) {
-                       this._locateOptions.setView = false;
-               }
-               return this;
+               map._stop();
+
+               on(document, 'touchmove', this._onTouchMove, this);
+               on(document, 'touchend', this._onTouchEnd, this);
+
+               preventDefault(e);
        },
 
        },
 
-       _handleGeolocationError: function (error) {
-               var c = error.code,
-                   message = error.message ||
-                           (c === 1 ? 'permission denied' :
-                           (c === 2 ? 'position unavailable' : 'timeout'));
+       _onTouchMove: function (e) {
+               if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; }
 
 
-               if (this._locateOptions.setView && !this._loaded) {
-                       this.fitWorld();
+               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);
                }
 
                }
 
-               this.fire('locationerror', {
-                       code: c,
-                       message: 'Geolocation error: ' + message + '.'
-               });
-       },
+               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);
+               }
 
 
-       _handleGeolocationResponse: function (pos) {
-               var lat = pos.coords.latitude,
-                   lng = pos.coords.longitude,
-                   latlng = new L.LatLng(lat, lng),
+               if (!this._moved) {
+                       map._moveStart(true, false);
+                       this._moved = true;
+               }
 
 
-                   latAccuracy = 180 * pos.coords.accuracy / 40075017,
-                   lngAccuracy = latAccuracy / Math.cos(L.LatLng.DEG_TO_RAD * lat),
+               cancelAnimFrame(this._animRequest);
 
 
-                   bounds = L.latLngBounds(
-                           [lat - latAccuracy, lng - lngAccuracy],
-                           [lat + latAccuracy, lng + lngAccuracy]),
+               var moveFn = bind(map._move, map, this._center, this._zoom, {pinch: true, round: false});
+               this._animRequest = requestAnimFrame(moveFn, this, true);
 
 
-                   options = this._locateOptions;
+               preventDefault(e);
+       },
 
 
-               if (options.setView) {
-                       var zoom = Math.min(this.getBoundsZoom(bounds), options.maxZoom);
-                       this.setView(latlng, zoom);
+       _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);
 
 
-               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.js.map