X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4d19c6892c74655860ee623baf77b8516c446d5d..78f608b114c05f1147936a57b930831e28000c1a:/vendor/assets/leaflet/leaflet.js
diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index 7c5b717e7..5503592a0 100644
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -1,7 +1,7 @@
/*
Copyright (c) 2010-2012, CloudMade, Vladimir Agafonkin
Leaflet is an open-source JavaScript library for mobile-friendly interactive maps.
- http://leaflet.cloudmade.com
+ http://leafletjs.com
*/
(function (window, undefined) {
@@ -29,11 +29,13 @@ L.version = '0.4.4';
*/
L.Util = {
- extend: function (/*Object*/ dest) /*-> Object*/ { // merge src properties into dest
- var sources = Array.prototype.slice.call(arguments, 1);
- for (var j = 0, len = sources.length, src; j < len; j++) {
+ extend: function (dest) { // (Object[, Object, ...]) ->
+ var sources = Array.prototype.slice.call(arguments, 1),
+ i, j, len, src;
+
+ for (j = 0, len = sources.length; j < len; j++) {
src = sources[j] || {};
- for (var i in src) {
+ for (i in src) {
if (src.hasOwnProperty(i)) {
dest[i] = src[i];
}
@@ -97,7 +99,7 @@ L.Util = {
},
setOptions: function (obj, options) {
- obj.options = L.Util.extend({}, obj.options, options);
+ obj.options = L.extend({}, obj.options, options);
return obj.options;
},
@@ -130,7 +132,7 @@ L.Util = {
function getPrefixed(name) {
var i, fn,
- prefixes = ['webkit', 'moz', 'o', 'ms'];
+ prefixes = ['webkit', 'moz', 'o', 'ms'];
for (i = 0; i < prefixes.length && !fn; i++) {
fn = window[prefixes[i] + name];
@@ -143,25 +145,23 @@ L.Util = {
function timeoutDefer(fn) {
var time = +new Date(),
- timeToCall = Math.max(0, 16 - (time - lastTime));
+ timeToCall = Math.max(0, 16 - (time - lastTime));
lastTime = time + timeToCall;
return window.setTimeout(fn, timeToCall);
}
var requestFn = window.requestAnimationFrame ||
- getPrefixed('RequestAnimationFrame') || timeoutDefer;
+ getPrefixed('RequestAnimationFrame') || timeoutDefer;
var cancelFn = window.cancelAnimationFrame ||
- getPrefixed('CancelAnimationFrame') ||
- getPrefixed('CancelRequestAnimationFrame') ||
- function (id) {
- window.clearTimeout(id);
- };
+ getPrefixed('CancelAnimationFrame') ||
+ getPrefixed('CancelRequestAnimationFrame') ||
+ function (id) { window.clearTimeout(id); };
L.Util.requestAnimFrame = function (fn, context, immediate, element) {
- fn = L.Util.bind(fn, context);
+ fn = L.bind(fn, context);
if (immediate && requestFn === timeoutDefer) {
fn();
@@ -178,6 +178,12 @@ L.Util = {
}());
+// shortcuts for most used utility functions
+L.extend = L.Util.extend;
+L.bind = L.Util.bind;
+L.stamp = L.Util.stamp;
+L.setOptions = L.Util.setOptions;
+
/*
* Class powers the OOP facilities of the library. Thanks to John Resig and Dean Edwards for inspiration!
@@ -212,7 +218,7 @@ L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
// mix static properties into the class
if (props.statics) {
- L.Util.extend(NewClass, props.statics);
+ L.extend(NewClass, props.statics);
delete props.statics;
}
@@ -224,11 +230,11 @@ L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
// merge options
if (props.options && proto.options) {
- props.options = L.Util.extend({}, proto.options, props.options);
+ props.options = L.extend({}, proto.options, props.options);
}
// mix given properties into the prototype
- L.Util.extend(proto, props);
+ L.extend(proto, props);
return NewClass;
};
@@ -236,13 +242,14 @@ L.Class.extend = function (/*Object*/ props) /*-> Class*/ {
// method for adding properties to prototype
L.Class.include = function (props) {
- L.Util.extend(this.prototype, props);
+ L.extend(this.prototype, props);
};
L.Class.mergeOptions = function (options) {
- L.Util.extend(this.prototype.options, options);
+ L.extend(this.prototype.options, options);
};
+
/*
* L.Mixin.Events adds custom events functionality to Leaflet classes
*/
@@ -252,11 +259,11 @@ var key = '_leaflet_events';
L.Mixin = {};
L.Mixin.Events = {
-
+
addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object])
var events = this[key] = this[key] || {},
type, i, len;
-
+
// Types can be a map of types/handlers
if (typeof types === 'object') {
for (type in types) {
@@ -264,12 +271,12 @@ L.Mixin.Events = {
this.addEventListener(type, types[type], fn);
}
}
-
+
return this;
}
-
+
types = L.Util.splitWords(types);
-
+
for (i = 0, len = types.length; i < len; i++) {
events[types[i]] = events[types[i]] || [];
events[types[i]].push({
@@ -277,7 +284,7 @@ L.Mixin.Events = {
context: context || this
});
}
-
+
return this;
},
@@ -288,24 +295,24 @@ L.Mixin.Events = {
removeEventListener: function (types, fn, context) { // (String[, Function, Object]) or (Object[, Object])
var events = this[key],
type, i, len, listeners, j;
-
+
if (typeof types === 'object') {
for (type in types) {
if (types.hasOwnProperty(type)) {
this.removeEventListener(type, types[type], fn);
}
}
-
+
return this;
}
-
+
types = L.Util.splitWords(types);
for (i = 0, len = types.length; i < len; i++) {
if (this.hasEventListeners(types[i])) {
listeners = events[types[i]];
-
+
for (j = listeners.length - 1; j >= 0; j--) {
if (
(!fn || listeners[j].action === fn) &&
@@ -316,7 +323,7 @@ L.Mixin.Events = {
}
}
}
-
+
return this;
},
@@ -325,7 +332,7 @@ L.Mixin.Events = {
return this;
}
- var event = L.Util.extend({
+ var event = L.extend({
type: type,
target: this
}, data);
@@ -346,34 +353,46 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
(function () {
- var ua = navigator.userAgent.toLowerCase(),
- ie = !!window.ActiveXObject,
- ie6 = ie && !window.XMLHttpRequest,
- webkit = ua.indexOf("webkit") !== -1,
- gecko = ua.indexOf("gecko") !== -1,
- //Terrible browser detection to work around a safari / iOS / android browser bug. See TileLayer._addTile and debug/hacks/jitter.html
- chrome = ua.indexOf("chrome") !== -1,
- opera = window.opera,
- android = ua.indexOf("android") !== -1,
- android23 = ua.search("android [23]") !== -1,
- mobile = typeof orientation !== undefined + '' ? true : false,
- doc = document.documentElement,
- ie3d = ie && ('transition' in doc.style),
- webkit3d = webkit && ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),
- gecko3d = gecko && ('MozPerspective' in doc.style),
- opera3d = opera && ('OTransition' in doc.style);
+
+ var ie = !!window.ActiveXObject,
+ // http://tanalin.com/en/articles/ie-version-js/
+ ie6 = ie && !window.XMLHttpRequest,
+ ie7 = ie && !document.querySelector,
+
+ // terrible browser detection to work around Safari / iOS / Android browser bugs
+ // see TileLayer._addTile and debug/hacks/jitter.html
+
+ ua = navigator.userAgent.toLowerCase(),
+ webkit = ua.indexOf("webkit") !== -1,
+ chrome = ua.indexOf("chrome") !== -1,
+ android = ua.indexOf("android") !== -1,
+ android23 = ua.search("android [23]") !== -1,
+
+ mobile = typeof orientation !== undefined + '',
+ msTouch = (window.navigator && window.navigator.msPointerEnabled && window.navigator.msMaxTouchPoints),
+ retina = (('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
+ ('matchMedia' in window && window.matchMedia("(min-resolution:144dpi)").matches)),
+
+ doc = document.documentElement,
+ ie3d = ie && ('transition' in doc.style),
+ webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),
+ gecko3d = 'MozPerspective' in doc.style,
+ opera3d = 'OTransition' in doc.style,
+ any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d);
+
var touch = !window.L_NO_TOUCH && (function () {
+
var startName = 'ontouchstart';
- // WebKit, etc
- if (startName in doc) {
+ // IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.MsTouch) or WebKit, etc.
+ if (msTouch || (startName in doc)) {
return true;
}
// Firefox/Gecko
var div = document.createElement('div'),
- supported = false;
+ supported = false;
if (!div.setAttribute) {
return false;
@@ -390,15 +409,12 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
return supported;
}());
- var retina = (('devicePixelRatio' in window && window.devicePixelRatio > 1) || ('matchMedia' in window && window.matchMedia("(min-resolution:144dpi)").matches));
L.Browser = {
- ua: ua,
- ie: ie,
ie6: ie6,
+ ie7: ie7,
webkit: webkit,
- gecko: gecko,
- opera: opera,
+
android: android,
android23: android23,
@@ -408,17 +424,19 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
webkit3d: webkit3d,
gecko3d: gecko3d,
opera3d: opera3d,
- any3d: !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d),
+ any3d: any3d,
mobile: mobile,
mobileWebkit: mobile && webkit,
mobileWebkit3d: mobile && webkit3d,
- mobileOpera: mobile && opera,
+ mobileOpera: mobile && window.opera,
touch: touch,
+ msTouch: msTouch,
retina: retina
};
+
}());
@@ -503,15 +521,15 @@ L.Point.prototype = {
point = L.point(point);
var x = point.x - this.x,
- y = point.y - this.y;
+ y = point.y - this.y;
return Math.sqrt(x * x + y * y);
},
toString: function () {
return 'Point(' +
- L.Util.formatNum(this.x) + ', ' +
- L.Util.formatNum(this.y) + ')';
+ L.Util.formatNum(this.x) + ', ' +
+ L.Util.formatNum(this.y) + ')';
}
};
@@ -563,8 +581,8 @@ L.Bounds = L.Class.extend({
getCenter: function (round) { // (Boolean) -> Point
return new L.Point(
- (this.min.x + this.max.x) / 2,
- (this.min.y + this.max.y) / 2, round);
+ (this.min.x + this.max.x) / 2,
+ (this.min.y + this.max.y) / 2, round);
},
getBottomLeft: function () { // -> Point
@@ -592,21 +610,20 @@ L.Bounds = L.Class.extend({
}
return (min.x >= this.min.x) &&
- (max.x <= this.max.x) &&
- (min.y >= this.min.y) &&
- (max.y <= this.max.y);
+ (max.x <= this.max.x) &&
+ (min.y >= this.min.y) &&
+ (max.y <= this.max.y);
},
intersects: function (bounds) { // (Bounds) -> Boolean
bounds = L.bounds(bounds);
var min = this.min,
- max = this.max,
- min2 = bounds.min,
- max2 = bounds.max;
-
- var xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
- yIntersects = (max2.y >= min.y) && (min2.y <= max.y);
+ max = this.max,
+ min2 = bounds.min,
+ max2 = bounds.max,
+ xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
+ yIntersects = (max2.y >= min.y) && (min2.y <= max.y);
return xIntersects && yIntersects;
},
@@ -651,8 +668,8 @@ L.Transformation = L.Class.extend({
untransform: function (/*Point*/ point, /*Number*/ scale) /*-> Point*/ {
scale = scale || 1;
return new L.Point(
- (point.x / scale - this._b) / this._a,
- (point.y / scale - this._d) / this._c);
+ (point.x / scale - this._b) / this._a,
+ (point.y / scale - this._d) / this._c);
}
});
@@ -674,7 +691,7 @@ L.DomUtil = {
value = el.currentStyle[style];
}
- if (!value || value === 'auto') {
+ if ((!value || value === 'auto') && document.defaultView) {
var css = document.defaultView.getComputedStyle(el, null);
value = css ? css[style] : null;
}
@@ -685,13 +702,14 @@ L.DomUtil = {
getViewportOffset: function (element) {
var top = 0,
- left = 0,
- el = element,
- docBody = document.body,
- pos;
+ left = 0,
+ el = element,
+ docBody = document.body,
+ pos,
+ ie7 = L.Browser.ie7;
do {
- top += el.offsetTop || 0;
+ top += el.offsetTop || 0;
left += el.offsetLeft || 0;
pos = L.DomUtil.getStyle(el, 'position');
@@ -714,12 +732,33 @@ L.DomUtil = {
top -= el.scrollTop || 0;
left -= el.scrollLeft || 0;
+ // webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
+ // https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
+ if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
+ left += el.scrollWidth - el.clientWidth;
+
+ // ie7 shows the scrollbar by default and provides clientWidth counting it, so we
+ // need to add it back in if it is visible; scrollbar is on the left as we are RTL
+ if (ie7 && L.DomUtil.getStyle(el, 'overflow-y') !== 'hidden' &&
+ L.DomUtil.getStyle(el, 'overflow') !== 'hidden') {
+ left += 17;
+ }
+ }
+
el = el.parentNode;
} while (el);
return new L.Point(left, top);
},
+ documentIsLtr: function () {
+ if (!L.DomUtil._docIsLtrCached) {
+ L.DomUtil._docIsLtrCached = true;
+ L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === "ltr";
+ }
+ return L.DomUtil._docIsLtr;
+ },
+
create: function (tagName, className, container) {
var el = document.createElement(tagName);
@@ -751,7 +790,7 @@ L.DomUtil = {
hasClass: function (el, name) {
return (el.className.length > 0) &&
- new RegExp("(^|\\s)" + name + "(\\s|$)").test(el.className);
+ new RegExp("(^|\\s)" + name + "(\\s|$)").test(el.className);
},
addClass: function (el, name) {
@@ -768,8 +807,8 @@ L.DomUtil = {
}
el.className = el.className
- .replace(/(\S+)\s*/g, replaceFn)
- .replace(/(^\s+|\s+$)/, '');
+ .replace(/(\S+)\s*/g, replaceFn)
+ .replace(/(^\s+|\s+$)/, '');
},
setOpacity: function (el, value) {
@@ -777,10 +816,10 @@ L.DomUtil = {
if ('opacity' in el.style) {
el.style.opacity = value;
- } else if (L.Browser.ie) {
+ } else if ('filter' in el.style) {
var filter = false,
- filterName = 'DXImageTransform.Microsoft.Alpha';
+ filterName = 'DXImageTransform.Microsoft.Alpha';
// filters collection throws an error if we try to retrieve a filter that doesn't exist
try { filter = el.filters.item(filterName); } catch (e) {}
@@ -814,8 +853,8 @@ L.DomUtil = {
// (same speed either way), Opera 12 doesn't support translate3d
var is3d = L.Browser.webkit3d,
- open = 'translate' + (is3d ? '3d' : '') + '(',
- close = (is3d ? ',0' : '') + ')';
+ open = 'translate' + (is3d ? '3d' : '') + '(',
+ close = (is3d ? ',0' : '') + ')';
return open + point.x + 'px,' + point.y + 'px' + close;
},
@@ -856,14 +895,14 @@ L.DomUtil = {
// prefix style property names
L.DomUtil.TRANSFORM = L.DomUtil.testProp(
- ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+ ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
L.DomUtil.TRANSITION = L.DomUtil.testProp(
- ['transition', 'webkitTransition', 'OTransition', 'MozTransition', 'msTransition']);
+ ['transition', 'webkitTransition', 'OTransition', 'MozTransition', 'msTransition']);
L.DomUtil.TRANSITION_END =
- L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?
- L.DomUtil.TRANSITION + 'End' : 'transitionend';
+ L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?
+ L.DomUtil.TRANSITION + 'End' : 'transitionend';
/*
@@ -872,7 +911,7 @@ L.DomUtil.TRANSITION_END =
L.LatLng = function (rawLat, rawLng, noWrap) { // (Number, Number[, Boolean])
var lat = parseFloat(rawLat),
- lng = parseFloat(rawLng);
+ lng = parseFloat(rawLng);
if (isNaN(lat) || isNaN(lng)) {
throw new Error('Invalid LatLng object: (' + rawLat + ', ' + rawLng + ')');
@@ -887,7 +926,7 @@ L.LatLng = function (rawLat, rawLng, noWrap) { // (Number, Number[, Boolean])
this.lng = lng;
};
-L.Util.extend(L.LatLng, {
+L.extend(L.LatLng, {
DEG_TO_RAD: Math.PI / 180,
RAD_TO_DEG: 180 / Math.PI,
MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check
@@ -905,8 +944,8 @@ L.LatLng.prototype = {
toString: function (precision) { // -> String
return 'LatLng(' +
- L.Util.formatNum(this.lat, precision) + ', ' +
- L.Util.formatNum(this.lng, precision) + ')';
+ L.Util.formatNum(this.lat, precision) + ', ' +
+ L.Util.formatNum(this.lng, precision) + ')';
},
// Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula
@@ -914,13 +953,13 @@ L.LatLng.prototype = {
other = L.latLng(other);
var R = 6378137, // earth radius in meters
- d2r = L.LatLng.DEG_TO_RAD,
- dLat = (other.lat - this.lat) * d2r,
- dLon = (other.lng - this.lng) * d2r,
- lat1 = this.lat * d2r,
- lat2 = other.lat * d2r,
- sin1 = Math.sin(dLat / 2),
- sin2 = Math.sin(dLon / 2);
+ d2r = L.LatLng.DEG_TO_RAD,
+ dLat = (other.lat - this.lat) * d2r,
+ dLon = (other.lng - this.lng) * d2r,
+ lat1 = this.lat * d2r,
+ lat2 = other.lat * d2r,
+ sin1 = Math.sin(dLat / 2),
+ sin2 = Math.sin(dLon / 2);
var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2);
@@ -979,7 +1018,7 @@ L.LatLngBounds = L.Class.extend({
}
} else if (obj instanceof L.LatLngBounds) {
this.extend(obj._southWest);
- this.extend(obj._northEast);
+ this.extend(obj._northEast);
}
return this;
},
@@ -987,19 +1026,19 @@ L.LatLngBounds = L.Class.extend({
// extend the bounds by a percentage
pad: function (bufferRatio) { // (Number) -> LatLngBounds
var sw = this._southWest,
- ne = this._northEast,
- heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
- widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
+ ne = this._northEast,
+ heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
+ widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
return new L.LatLngBounds(
- new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
- new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+ new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+ new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
},
getCenter: function () { // -> LatLng
return new L.LatLng(
- (this._southWest.lat + this._northEast.lat) / 2,
- (this._southWest.lng + this._northEast.lng) / 2);
+ (this._southWest.lat + this._northEast.lat) / 2,
+ (this._southWest.lng + this._northEast.lng) / 2);
},
getSouthWest: function () {
@@ -1026,8 +1065,8 @@ L.LatLngBounds = L.Class.extend({
}
var sw = this._southWest,
- ne = this._northEast,
- sw2, ne2;
+ ne = this._northEast,
+ sw2, ne2;
if (obj instanceof L.LatLngBounds) {
sw2 = obj.getSouthWest();
@@ -1037,26 +1076,27 @@ L.LatLngBounds = L.Class.extend({
}
return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
- (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
+ (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
},
intersects: function (bounds) { // (LatLngBounds)
bounds = L.latLngBounds(bounds);
var sw = this._southWest,
- ne = this._northEast,
- sw2 = bounds.getSouthWest(),
- ne2 = bounds.getNorthEast();
+ ne = this._northEast,
+ sw2 = bounds.getSouthWest(),
+ ne2 = bounds.getNorthEast(),
- var latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
- lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
+ latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+ lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
return latIntersects && lngIntersects;
},
toBBoxString: function () {
var sw = this._southWest,
- ne = this._northEast;
+ ne = this._northEast;
+
return [sw.lng, sw.lat, ne.lng, ne.lat].join(',');
},
@@ -1097,10 +1137,11 @@ L.Projection.SphericalMercator = {
project: function (latlng) { // (LatLng) -> Point
var d = L.LatLng.DEG_TO_RAD,
- max = this.MAX_LATITUDE,
- lat = Math.max(Math.min(max, latlng.lat), -max),
- x = latlng.lng * d,
- y = lat * d;
+ max = this.MAX_LATITUDE,
+ lat = Math.max(Math.min(max, latlng.lat), -max),
+ x = latlng.lng * d,
+ y = lat * d;
+
y = Math.log(Math.tan((Math.PI / 4) + (y / 2)));
return new L.Point(x, y);
@@ -1108,8 +1149,8 @@ L.Projection.SphericalMercator = {
unproject: function (point) { // (Point, Boolean) -> LatLng
var d = L.LatLng.RAD_TO_DEG,
- lng = point.x * d,
- lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;
+ lng = point.x * d,
+ lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;
// TODO refactor LatLng wrapping
return new L.LatLng(lat, lng, true);
@@ -1156,7 +1197,14 @@ L.CRS = {
-L.CRS.EPSG3857 = L.Util.extend({}, L.CRS, {
+L.CRS.Simple = L.extend({}, L.CRS, {
+ projection: L.Projection.LonLat,
+ transformation: new L.Transformation(1, 0, 1, 0)
+});
+
+
+
+L.CRS.EPSG3857 = L.extend({}, L.CRS, {
code: 'EPSG:3857',
projection: L.Projection.SphericalMercator,
@@ -1164,18 +1212,18 @@ L.CRS.EPSG3857 = L.Util.extend({}, L.CRS, {
project: function (latlng) { // (LatLng) -> Point
var projectedPoint = this.projection.project(latlng),
- earthRadius = 6378137;
+ earthRadius = 6378137;
return projectedPoint.multiplyBy(earthRadius);
}
});
-L.CRS.EPSG900913 = L.Util.extend({}, L.CRS.EPSG3857, {
+L.CRS.EPSG900913 = L.extend({}, L.CRS.EPSG3857, {
code: 'EPSG:900913'
});
-L.CRS.EPSG4326 = L.Util.extend({}, L.CRS, {
+L.CRS.EPSG4326 = L.extend({}, L.CRS, {
code: 'EPSG:4326',
projection: L.Projection.LonLat,
@@ -1206,7 +1254,7 @@ L.Map = L.Class.extend({
},
initialize: function (id, options) { // (HTMLElement or String, Object)
- options = L.Util.setOptions(this, options);
+ options = L.setOptions(this, options);
this._initContainer(id);
this._initLayout();
@@ -1326,7 +1374,7 @@ L.Map = L.Class.extend({
addLayer: function (layer) {
// TODO method is too big, refactor
- var id = L.Util.stamp(layer);
+ var id = L.stamp(layer);
if (this._layers[id]) { return this; }
@@ -1356,7 +1404,7 @@ L.Map = L.Class.extend({
},
removeLayer: function (layer) {
- var id = L.Util.stamp(layer);
+ var id = L.stamp(layer);
if (!this._layers[id]) { return; }
@@ -1375,7 +1423,7 @@ L.Map = L.Class.extend({
},
hasLayer: function (layer) {
- var id = L.Util.stamp(layer);
+ var id = L.stamp(layer);
return this._layers.hasOwnProperty(id);
},
@@ -1400,7 +1448,7 @@ L.Map = L.Class.extend({
this.fire('move');
clearTimeout(this._sizeTimer);
- this._sizeTimer = setTimeout(L.Util.bind(this.fire, this, 'moveend'), 200);
+ this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200);
}
return this;
},
@@ -1473,7 +1521,10 @@ L.Map = L.Class.extend({
zoom++;
nePoint = this.project(ne, zoom);
swPoint = this.project(sw, zoom);
- boundsSize = new L.Point(Math.abs(nePoint.x - swPoint.x), Math.abs(swPoint.y - nePoint.y));
+
+ boundsSize = new L.Point(
+ Math.abs(nePoint.x - swPoint.x),
+ Math.abs(swPoint.y - nePoint.y));
if (!inside) {
zoomNotFound = boundsSize.x <= size.x && boundsSize.y <= size.y;
@@ -1627,8 +1678,7 @@ L.Map = L.Class.extend({
this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);
this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);
- this._objectsPane = panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);
-
+ panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);
panes.shadowPane = this._createPane('leaflet-shadow-pane');
panes.overlayPane = this._createPane('leaflet-overlay-pane');
panes.markerPane = this._createPane('leaflet-marker-pane');
@@ -1644,7 +1694,7 @@ L.Map = L.Class.extend({
},
_createPane: function (className, container) {
- return L.DomUtil.create('div', className, container || this._objectsPane);
+ return L.DomUtil.create('div', className, container || this._panes.objectsPane);
},
_initializers: [],
@@ -1726,8 +1776,9 @@ L.Map = L.Class.extend({
L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
- var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'mousemove', 'contextmenu'],
- i, len;
+ var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter',
+ 'mouseleave', 'mousemove', 'contextmenu'],
+ i, len;
for (i = 0, len = events.length; i < len; i++) {
L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
@@ -1740,7 +1791,8 @@ L.Map = L.Class.extend({
_onResize: function () {
L.Util.cancelAnimFrame(this._resizeRequest);
- this._resizeRequest = L.Util.requestAnimFrame(this.invalidateSize, this, false, this._container);
+ this._resizeRequest = L.Util.requestAnimFrame(
+ this.invalidateSize, this, false, this._container);
},
_onMouseClick: function (e) {
@@ -1764,8 +1816,8 @@ L.Map = L.Class.extend({
}
var containerPoint = this.mouseEventToContainerPoint(e),
- layerPoint = this.containerPointToLayerPoint(containerPoint),
- latlng = this.layerPointToLatLng(layerPoint);
+ layerPoint = this.containerPointToLayerPoint(containerPoint),
+ latlng = this.layerPointToLatLng(layerPoint);
this.fire(type, {
latlng: latlng,
@@ -1781,7 +1833,7 @@ L.Map = L.Class.extend({
this._tileLayersToLoad--;
if (this._tileLayersNum && !this._tileLayersToLoad && this._tileBg) {
clearTimeout(this._clearTileBgTimer);
- this._clearTileBgTimer = setTimeout(L.Util.bind(this._clearTileBg, this), 500);
+ this._clearTileBgTimer = setTimeout(L.bind(this._clearTileBg, this), 500);
}
},
@@ -1830,7 +1882,7 @@ L.Map = L.Class.extend({
_limitZoom: function (zoom) {
var min = this.getMinZoom(),
- max = this.getMaxZoom();
+ max = this.getMaxZoom();
return Math.max(min, Math.min(max, zoom));
}
@@ -1860,15 +1912,15 @@ L.Projection.Mercator = {
project: function (latlng) { // (LatLng) -> Point
var d = L.LatLng.DEG_TO_RAD,
- max = this.MAX_LATITUDE,
- lat = Math.max(Math.min(max, latlng.lat), -max),
- r = this.R_MAJOR,
- r2 = this.R_MINOR,
- x = latlng.lng * d * r,
- y = lat * d,
- tmp = r2 / r,
- eccent = Math.sqrt(1.0 - tmp * tmp),
- con = eccent * Math.sin(y);
+ max = this.MAX_LATITUDE,
+ lat = Math.max(Math.min(max, latlng.lat), -max),
+ r = this.R_MAJOR,
+ r2 = this.R_MINOR,
+ x = latlng.lng * d * r,
+ y = lat * d,
+ tmp = r2 / r,
+ eccent = Math.sqrt(1.0 - tmp * tmp),
+ con = eccent * Math.sin(y);
con = Math.pow((1 - con) / (1 + con), eccent * 0.5);
@@ -1880,22 +1932,23 @@ L.Projection.Mercator = {
unproject: function (point) { // (Point, Boolean) -> LatLng
var d = L.LatLng.RAD_TO_DEG,
- r = this.R_MAJOR,
- r2 = this.R_MINOR,
- lng = point.x * d / r,
- tmp = r2 / r,
- eccent = Math.sqrt(1 - (tmp * tmp)),
- ts = Math.exp(- point.y / r2),
- phi = (Math.PI / 2) - 2 * Math.atan(ts),
- numIter = 15,
- tol = 1e-7,
- i = numIter,
- dphi = 0.1,
- con;
+ r = this.R_MAJOR,
+ r2 = this.R_MINOR,
+ lng = point.x * d / r,
+ tmp = r2 / r,
+ eccent = Math.sqrt(1 - (tmp * tmp)),
+ ts = Math.exp(- point.y / r2),
+ 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;
+ dphi = (Math.PI / 2) - 2 * Math.atan(ts *
+ Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi;
phi += dphi;
}
@@ -1905,15 +1958,15 @@ L.Projection.Mercator = {
-L.CRS.EPSG3395 = L.Util.extend({}, L.CRS, {
+L.CRS.EPSG3395 = L.extend({}, L.CRS, {
code: 'EPSG:3395',
projection: L.Projection.Mercator,
transformation: (function () {
var m = L.Projection.Mercator,
- r = m.R_MAJOR,
- r2 = m.R_MINOR;
+ r = m.R_MAJOR,
+ r2 = m.R_MINOR;
return new L.Transformation(0.5 / (Math.PI * r), 0.5, -0.5 / (Math.PI * r2), 0.5);
}())
@@ -1950,7 +2003,7 @@ L.TileLayer = L.Class.extend({
},
initialize: function (url, options) {
- options = L.Util.setOptions(this, options);
+ options = L.setOptions(this, options);
// detecting retina displays, adjusting tileSize and zoom levels
if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {
@@ -2089,10 +2142,10 @@ L.TileLayer = L.Class.extend({
_setAutoZIndex: function (pane, compare) {
var layers = pane.getElementsByClassName('leaflet-layer'),
- edgeZIndex = -compare(Infinity, -Infinity), // -Ifinity for max, Infinity for min
- zIndex;
+ edgeZIndex = -compare(Infinity, -Infinity), // -Ifinity for max, Infinity for min
+ zIndex, i, len;
- for (var i = 0, len = layers.length; i < len; i++) {
+ for (i = 0, len = layers.length; i < len; i++) {
if (layers[i] !== this._container) {
zIndex = parseInt(layers[i].style.zIndex, 10);
@@ -2103,7 +2156,8 @@ L.TileLayer = L.Class.extend({
}
}
- this.options.zIndex = this._container.style.zIndex = (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);
+ this.options.zIndex = this._container.style.zIndex =
+ (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);
},
_updateOpacity: function () {
@@ -2111,7 +2165,7 @@ L.TileLayer = L.Class.extend({
// stupid webkit hack to force redrawing of tiles
var i,
- tiles = this._tiles;
+ tiles = this._tiles;
if (L.Browser.webkit) {
for (i in tiles) {
@@ -2143,10 +2197,9 @@ L.TileLayer = L.Class.extend({
},
_reset: function (clearOldContainer) {
- var key,
- tiles = this._tiles;
+ var tiles = this._tiles;
- for (key in tiles) {
+ for (var key in tiles) {
if (tiles.hasOwnProperty(key)) {
this.fire('tileunload', {tile: tiles[key]});
}
@@ -2170,8 +2223,8 @@ L.TileLayer = L.Class.extend({
if (!this._map) { return; }
- var bounds = this._map.getPixelBounds(),
- zoom = this._map.getZoom(),
+ var bounds = this._map.getPixelBounds(),
+ zoom = this._map.getZoom(),
tileSize = this.options.tileSize;
if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
@@ -2179,12 +2232,14 @@ L.TileLayer = L.Class.extend({
}
var nwTilePoint = new L.Point(
- Math.floor(bounds.min.x / tileSize),
- Math.floor(bounds.min.y / tileSize)),
- seTilePoint = new L.Point(
- Math.floor(bounds.max.x / tileSize),
- Math.floor(bounds.max.y / tileSize)),
- tileBounds = new L.Bounds(nwTilePoint, seTilePoint);
+ Math.floor(bounds.min.x / tileSize),
+ Math.floor(bounds.min.y / tileSize)),
+
+ seTilePoint = new L.Point(
+ Math.floor(bounds.max.x / tileSize),
+ Math.floor(bounds.max.y / tileSize)),
+
+ tileBounds = new L.Bounds(nwTilePoint, seTilePoint);
this._addTilesFromCenterOut(tileBounds);
@@ -2195,7 +2250,7 @@ L.TileLayer = L.Class.extend({
_addTilesFromCenterOut: function (bounds) {
var queue = [],
- center = bounds.getCenter();
+ center = bounds.getCenter();
var j, i, point;
@@ -2276,11 +2331,13 @@ L.TileLayer = L.Class.extend({
if (this.options.reuseTiles) {
L.DomUtil.removeClass(tile, 'leaflet-tile-loaded');
this._unusedTiles.push(tile);
+
} else if (tile.parentNode === this._container) {
this._container.removeChild(tile);
}
- if (!L.Browser.android) { //For https://github.com/CloudMade/Leaflet/issues/137
+ // for https://github.com/CloudMade/Leaflet/issues/137
+ if (!L.Browser.android) {
tile.src = L.Util.emptyImageUrl;
}
@@ -2293,11 +2350,14 @@ L.TileLayer = L.Class.extend({
// get unused tile - or create a new tile
var tile = this._getTile();
- // Chrome 20 layouts much faster with top/left (Verify with timeline, frames)
- // android 4 browser has display issues with top/left and requires transform instead
- // android 3 browser not tested
- // android 2 browser requires top/left or tiles disappear on load or first drag (reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866
- // (other browsers don't currently care) - see debug/hacks/jitter.html for an example
+ /*
+ Chrome 20 layouts much faster with top/left (verify with timeline, frames)
+ Android 4 browser has display issues with top/left and requires transform instead
+ Android 3 browser not tested
+ Android 2 browser requires top/left or tiles disappear on load or first drag
+ (reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866
+ (other browsers don't currently care) - see debug/hacks/jitter.html for an example
+ */
L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);
this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
@@ -2312,7 +2372,7 @@ L.TileLayer = L.Class.extend({
_getZoomForUrl: function () {
var options = this.options,
- zoom = this._map.getZoom();
+ zoom = this._map.getZoom();
if (options.zoomReverse) {
zoom = options.maxZoom - zoom;
@@ -2323,7 +2383,7 @@ L.TileLayer = L.Class.extend({
_getTilePos: function (tilePoint) {
var origin = this._map.getPixelOrigin(),
- tileSize = this.options.tileSize;
+ tileSize = this.options.tileSize;
return tilePoint.multiplyBy(tileSize).subtract(origin);
},
@@ -2333,7 +2393,7 @@ L.TileLayer = L.Class.extend({
getTileUrl: function (tilePoint) {
this._adjustTilePoint(tilePoint);
- return L.Util.template(this._url, L.Util.extend({
+ return L.Util.template(this._url, L.extend({
s: this._getSubdomain(tilePoint),
z: this._getZoomForUrl(),
x: tilePoint.x,
@@ -2367,11 +2427,8 @@ L.TileLayer = L.Class.extend({
_createTileProto: function () {
var img = this._tileImg = L.DomUtil.create('img', 'leaflet-tile');
+ img.style.width = img.style.height = this.options.tileSize + 'px';
img.galleryimg = 'no';
-
- var tileSize = this.options.tileSize;
- img.style.width = tileSize + 'px';
- img.style.height = tileSize + 'px';
},
_getTile: function () {
@@ -2462,7 +2519,7 @@ L.TileLayer.WMS = L.TileLayer.extend({
this._url = url;
- var wmsParams = L.Util.extend({}, this.defaultWmsParams);
+ var wmsParams = L.extend({}, this.defaultWmsParams);
if (options.detectRetina && L.Browser.retina) {
wmsParams.width = wmsParams.height = this.options.tileSize * 2;
@@ -2479,7 +2536,7 @@ L.TileLayer.WMS = L.TileLayer.extend({
this.wmsParams = wmsParams;
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
},
onAdd: function (map) {
@@ -2493,25 +2550,25 @@ L.TileLayer.WMS = L.TileLayer.extend({
getTileUrl: function (tilePoint, zoom) { // (Point, Number) -> String
var map = this._map,
- crs = map.options.crs,
- tileSize = this.options.tileSize,
+ crs = map.options.crs,
+ tileSize = this.options.tileSize,
- nwPoint = tilePoint.multiplyBy(tileSize),
- sePoint = nwPoint.add(new L.Point(tileSize, tileSize)),
+ nwPoint = tilePoint.multiplyBy(tileSize),
+ sePoint = nwPoint.add(new L.Point(tileSize, tileSize)),
- nw = crs.project(map.unproject(nwPoint, zoom)),
- se = crs.project(map.unproject(sePoint, zoom)),
+ nw = crs.project(map.unproject(nwPoint, zoom)),
+ se = crs.project(map.unproject(sePoint, zoom)),
- bbox = [nw.x, se.y, se.x, nw.y].join(','),
+ bbox = [nw.x, se.y, se.x, nw.y].join(','),
- url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});
+ url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});
return url + L.Util.getParamString(this.wmsParams) + "&bbox=" + bbox;
},
setParams: function (params, noRedraw) {
- L.Util.extend(this.wmsParams, params);
+ L.extend(this.wmsParams, params);
if (!noRedraw) {
this.redraw();
@@ -2532,14 +2589,13 @@ L.TileLayer.Canvas = L.TileLayer.extend({
},
initialize: function (options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
},
redraw: function () {
- var i,
- tiles = this._tiles;
+ var tiles = this._tiles;
- for (i in tiles) {
+ for (var i in tiles) {
if (tiles.hasOwnProperty(i)) {
this._redrawTile(tiles[i]);
}
@@ -2547,15 +2603,12 @@ L.TileLayer.Canvas = L.TileLayer.extend({
},
_redrawTile: function (tile) {
- this.drawTile(tile, tile._tilePoint, tile._zoom);
+ this.drawTile(tile, tile._tilePoint, this._map._zoom);
},
_createTileProto: function () {
var proto = this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile');
-
- var tileSize = this.options.tileSize;
- proto.width = tileSize;
- proto.height = tileSize;
+ proto.width = proto.height = this.options.tileSize;
},
_createTile: function () {
@@ -2564,19 +2617,18 @@ L.TileLayer.Canvas = L.TileLayer.extend({
return tile;
},
- _loadTile: function (tile, tilePoint, zoom) {
+ _loadTile: function (tile, tilePoint) {
tile._layer = this;
tile._tilePoint = tilePoint;
- tile._zoom = zoom;
- this.drawTile(tile, tilePoint, zoom);
+ this._redrawTile(tile);
if (!this.options.async) {
this.tileDrawn(tile);
}
},
- drawTile: function (tile, tilePoint, zoom) {
+ drawTile: function (tile, tilePoint) {
// override with rendering code
},
@@ -2590,6 +2642,7 @@ L.tileLayer.canvas = function (options) {
return new L.TileLayer.Canvas(options);
};
+
L.ImageOverlay = L.Class.extend({
includes: L.Mixin.Events,
@@ -2601,7 +2654,7 @@ L.ImageOverlay = L.Class.extend({
this._url = url;
this._bounds = L.latLngBounds(bounds);
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
},
onAdd: function (map) {
@@ -2671,18 +2724,18 @@ L.ImageOverlay = L.Class.extend({
this._updateOpacity();
//TODO createImage util method to remove duplication
- L.Util.extend(this._image, {
+ L.extend(this._image, {
galleryimg: 'no',
onselectstart: L.Util.falseFn,
onmousemove: L.Util.falseFn,
- onload: L.Util.bind(this._onImageLoad, this),
+ onload: L.bind(this._onImageLoad, this),
src: this._url
});
},
_animateZoom: function (e) {
var map = this._map,
- image = this._image,
+ image = this._image,
scale = map.getZoomScale(e.zoom),
nw = this._bounds.getNorthWest(),
se = this._bounds.getSouthEast(),
@@ -2692,7 +2745,8 @@ L.ImageOverlay = L.Class.extend({
currentSize = map.latLngToLayerPoint(se)._subtract(map.latLngToLayerPoint(nw)),
origin = topLeft._add(size._subtract(currentSize)._divideBy(2));
- image.style[L.DomUtil.TRANSFORM] = L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';
+ image.style[L.DomUtil.TRANSFORM] =
+ L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';
},
_reset: function () {
@@ -2725,7 +2779,7 @@ L.Icon = L.Class.extend({
/*
iconUrl: (String) (required)
iconSize: (Point) (can be set through CSS)
- iconAnchor: (Point) (centered by default if size is specified, can be set in CSS with negative margins)
+ iconAnchor: (Point) (centered by default, can be set in CSS with negative margins)
popupAnchor: (Point) (if not specified, popup opens in the anchor point)
shadowUrl: (Point) (no shadow by default)
shadowSize: (Point)
@@ -2735,7 +2789,7 @@ L.Icon = L.Class.extend({
},
initialize: function (options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
},
createIcon: function () {
@@ -2764,8 +2818,8 @@ L.Icon = L.Class.extend({
_setIconStyles: function (img, name) {
var options = this.options,
- size = L.point(options[name + 'Size']),
- anchor;
+ size = L.point(options[name + 'Size']),
+ anchor;
if (name === 'shadow') {
anchor = L.point(options.shadowAnchor || options.iconAnchor);
@@ -2798,7 +2852,8 @@ L.Icon = L.Class.extend({
el.src = src;
} else {
el = document.createElement('div');
- el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
+ el.style.filter =
+ 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
}
return el;
},
@@ -2872,11 +2927,13 @@ L.Marker = L.Class.extend({
clickable: true,
draggable: false,
zIndexOffset: 0,
- opacity: 1
+ opacity: 1,
+ riseOnHover: false,
+ riseOffset: 250
},
initialize: function (latlng, options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
this._latlng = L.latLng(latlng);
},
@@ -2966,7 +3023,14 @@ L.Marker = L.Class.extend({
needOpacityUpdate = (this.options.opacity < 1);
L.DomUtil.addClass(this._icon, classToAdd);
+
+ if (options.riseOnHover) {
+ L.DomEvent
+ .on(this._icon, 'mouseover', this._bringToFront, this)
+ .on(this._icon, 'mouseout', this._resetZIndex, this);
+ }
}
+
if (!this._shadow) {
this._shadow = options.icon.createShadow();
@@ -2992,6 +3056,12 @@ L.Marker = L.Class.extend({
_removeIcon: function () {
var panes = this._map._panes;
+ if (this.options.riseOnHover) {
+ L.DomEvent
+ .off(this._icon, 'mouseover', this._bringToFront)
+ .off(this._icon, 'mouseout', this._resetZIndex);
+ }
+
panes.markerPane.removeChild(this._icon);
if (this._shadow) {
@@ -3008,7 +3078,13 @@ L.Marker = L.Class.extend({
L.DomUtil.setPosition(this._shadow, pos);
}
- this._icon.style.zIndex = pos.y + this.options.zIndexOffset;
+ this._zIndex = pos.y + this.options.zIndexOffset;
+
+ this._resetZIndex();
+ },
+
+ _updateZIndex: function (offset) {
+ this._icon.style.zIndex = this._zIndex + offset;
},
_animateZoom: function (opt) {
@@ -3023,7 +3099,7 @@ L.Marker = L.Class.extend({
}
var icon = this._icon,
- events = ['dblclick', 'mousedown', 'mouseover', 'mouseout'];
+ events = ['dblclick', 'mousedown', 'mouseover', 'mouseout'];
L.DomUtil.addClass(icon, 'leaflet-clickable');
L.DomEvent.on(icon, 'click', this._onMouseClick, this);
@@ -3042,10 +3118,11 @@ L.Marker = L.Class.extend({
},
_onMouseClick: function (e) {
- if (this.hasEventListeners(e.type)) {
+ var wasDragged = this.dragging && this.dragging.moved();
+ if (this.hasEventListeners(e.type) || wasDragged) {
L.DomEvent.stopPropagation(e);
}
- if (this.dragging && this.dragging.moved()) { return; }
+ if (wasDragged) { return; }
if (this._map.dragging && this._map.dragging.moved()) { return; }
this.fire(e.type, {
originalEvent: e
@@ -3073,6 +3150,14 @@ L.Marker = L.Class.extend({
if (this._shadow) {
L.DomUtil.setOpacity(this._shadow, this.options.opacity);
}
+ },
+
+ _bringToFront: function () {
+ this._updateZIndex(this.options.riseOffset);
+ },
+
+ _resetZIndex: function () {
+ this._updateZIndex(0);
}
});
@@ -3103,7 +3188,7 @@ L.DivIcon = L.Icon.extend({
if (options.bgPos) {
div.style.backgroundPosition =
- (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
+ (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
}
this._setIconStyles(div, 'icon');
@@ -3140,7 +3225,7 @@ L.Popup = L.Class.extend({
},
initialize: function (options, source) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
this._source = source;
},
@@ -3224,25 +3309,28 @@ L.Popup = L.Class.extend({
map._popup = null;
map
- .removeLayer(this)
- .fire('popupclose', {popup: this});
+ .removeLayer(this)
+ .fire('popupclose', {popup: this});
}
},
_initLayout: function () {
var prefix = 'leaflet-popup',
- container = this._container = L.DomUtil.create('div', prefix + ' ' + this.options.className + ' leaflet-zoom-animated'),
+ containerClass = prefix + ' ' + this.options.className + ' leaflet-zoom-animated',
+ container = this._container = L.DomUtil.create('div', containerClass),
closeButton;
if (this.options.closeButton) {
- closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
+ closeButton = this._closeButton =
+ L.DomUtil.create('a', prefix + '-close-button', container);
closeButton.href = '#close';
closeButton.innerHTML = '×';
L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
}
- var wrapper = this._wrapper = L.DomUtil.create('div', prefix + '-content-wrapper', container);
+ var wrapper = this._wrapper =
+ L.DomUtil.create('div', prefix + '-content-wrapper', container);
L.DomEvent.disableClickPropagation(wrapper);
this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
@@ -3282,7 +3370,7 @@ L.Popup = L.Class.extend({
_updateLayout: function () {
var container = this._contentNode,
- style = container.style;
+ style = container.style;
style.width = '';
style.whiteSpace = 'nowrap';
@@ -3297,8 +3385,8 @@ L.Popup = L.Class.extend({
style.height = '';
var height = container.offsetHeight,
- maxHeight = this.options.maxHeight,
- scrolledClass = 'leaflet-popup-scrolled';
+ maxHeight = this.options.maxHeight,
+ scrolledClass = 'leaflet-popup-scrolled';
if (maxHeight && height > maxHeight) {
style.height = maxHeight + 'px';
@@ -3311,9 +3399,11 @@ L.Popup = L.Class.extend({
},
_updatePosition: function () {
+ if (!this._map) { return; }
+
var pos = this._map.latLngToLayerPoint(this._latlng),
- is3d = L.Browser.any3d,
- offset = this.options.offset;
+ is3d = L.Browser.any3d,
+ offset = this.options.offset;
if (is3d) {
L.DomUtil.setPosition(this._container, pos);
@@ -3337,20 +3427,20 @@ L.Popup = L.Class.extend({
if (!this.options.autoPan) { return; }
var map = this._map,
- containerHeight = this._container.offsetHeight,
- containerWidth = this._containerWidth,
+ containerHeight = this._container.offsetHeight,
+ containerWidth = this._containerWidth,
- layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);
+ layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);
if (L.Browser.any3d) {
layerPos._add(L.DomUtil.getPosition(this._container));
}
var containerPos = map.layerPointToContainerPoint(layerPos),
- padding = this.options.autoPanPadding,
- size = map.getSize(),
- dx = 0,
- dy = 0;
+ padding = this.options.autoPanPadding,
+ size = map.getSize(),
+ dx = 0,
+ dy = 0;
if (containerPos.x < 0) {
dx = containerPos.x - padding.x;
@@ -3411,13 +3501,13 @@ L.Marker.include({
anchor = anchor.add(options.offset);
}
- options = L.Util.extend({offset: anchor}, options);
+ options = L.extend({offset: anchor}, options);
if (!this._popup) {
this
- .on('click', this.openPopup, this)
- .on('remove', this.closePopup, this)
- .on('move', this._movePopup, this);
+ .on('click', this.openPopup, this)
+ .on('remove', this.closePopup, this)
+ .on('move', this._movePopup, this);
}
this._popup = new L.Popup(options, this)
@@ -3430,9 +3520,9 @@ L.Marker.include({
if (this._popup) {
this._popup = null;
this
- .off('click', this.openPopup)
- .off('remove', this.closePopup)
- .off('move', this._movePopup);
+ .off('click', this.openPopup)
+ .off('remove', this.closePopup)
+ .off('move', this._movePopup);
}
return this;
},
@@ -3451,8 +3541,8 @@ L.Map.include({
this._popup = popup;
return this
- .addLayer(popup)
- .fire('popupopen', {popup: this._popup});
+ .addLayer(popup)
+ .fire('popupopen', {popup: this._popup});
},
closePopup: function () {
@@ -3463,6 +3553,7 @@ L.Map.include({
}
});
+
/*
* L.LayerGroup is a class to combine several layers so you can manipulate the group (e.g. add/remove it) as one layer.
*/
@@ -3481,7 +3572,7 @@ L.LayerGroup = L.Class.extend({
},
addLayer: function (layer) {
- var id = L.Util.stamp(layer);
+ var id = L.stamp(layer);
this._layers[id] = layer;
@@ -3493,7 +3584,7 @@ L.LayerGroup = L.Class.extend({
},
removeLayer: function (layer) {
- var id = L.Util.stamp(layer);
+ var id = L.stamp(layer);
delete this._layers[id];
@@ -3511,7 +3602,7 @@ L.LayerGroup = L.Class.extend({
invoke: function (methodName) {
var args = Array.prototype.slice.call(arguments, 1),
- i, layer;
+ i, layer;
for (i in this._layers) {
if (this._layers.hasOwnProperty(i)) {
@@ -3562,12 +3653,16 @@ L.layerGroup = function (layers) {
L.FeatureGroup = L.LayerGroup.extend({
includes: L.Mixin.Events,
+ statics: {
+ EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu'
+ },
+
addLayer: function (layer) {
- if (this._layers[L.Util.stamp(layer)]) {
+ if (this._layers[L.stamp(layer)]) {
return this;
}
- layer.on('click dblclick mouseover mouseout mousemove contextmenu', this._propagateEvent, this);
+ layer.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
L.LayerGroup.prototype.addLayer.call(this, layer);
@@ -3575,19 +3670,20 @@ L.FeatureGroup = L.LayerGroup.extend({
layer.bindPopup(this._popupContent);
}
- return this;
+ return this.fire('layeradd', {layer: layer});
},
removeLayer: function (layer) {
- layer.off('click dblclick mouseover mouseout mousemove contextmenu', this._propagateEvent, this);
+ layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
L.LayerGroup.prototype.removeLayer.call(this, layer);
+
if (this._popupContent) {
- return this.invoke('unbindPopup');
- } else {
- return this;
+ this.invoke('unbindPopup');
}
+
+ return this.fire('layerremove', {layer: layer});
},
bindPopup: function (content) {
@@ -3609,9 +3705,11 @@ L.FeatureGroup = L.LayerGroup.extend({
getBounds: function () {
var bounds = new L.LatLngBounds();
+
this.eachLayer(function (layer) {
bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds());
- }, this);
+ });
+
return bounds;
},
@@ -3629,7 +3727,7 @@ L.featureGroup = function (layers) {
/*
- * L.Path is a base class for rendering vector paths on a map. It's inherited by Polyline, Circle, etc.
+ * L.Path is a base class for rendering vector paths on a map. Inherited by Polyline, Circle, etc.
*/
L.Path = L.Class.extend({
@@ -3638,11 +3736,10 @@ L.Path = L.Class.extend({
statics: {
// how much to extend the clip area around the map view
// (relative to its size, e.g. 0.5 is half the screen in each direction)
- // set in such way that SVG element doesn't exceed 1280px (vector layers flicker on dragend if it is)
+ // set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)
CLIP_PADDING: L.Browser.mobile ?
Math.max(0, Math.min(0.5,
- (1280 / Math.max(window.innerWidth, window.innerHeight) - 1) / 2))
- : 0.5
+ (1280 / Math.max(window.innerWidth, window.innerHeight) - 1) / 2)) : 0.5
},
options: {
@@ -3660,7 +3757,7 @@ L.Path = L.Class.extend({
},
initialize: function (options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
},
onAdd: function (map) {
@@ -3713,7 +3810,7 @@ L.Path = L.Class.extend({
},
setStyle: function (style) {
- L.Util.setOptions(this, style);
+ L.setOptions(this, style);
if (this._container) {
this._updateStyle();
@@ -3734,10 +3831,10 @@ L.Path = L.Class.extend({
L.Map.include({
_updatePathViewport: function () {
var p = L.Path.CLIP_PADDING,
- size = this.getSize(),
- panePos = L.DomUtil.getPosition(this._mapPane),
- min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),
- max = min.add(size.multiplyBy(1 + p * 2)._round());
+ size = this.getSize(),
+ panePos = L.DomUtil.getPosition(this._mapPane),
+ min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),
+ max = min.add(size.multiplyBy(1 + p * 2)._round());
this._pathViewport = new L.Bounds(min, max);
}
@@ -3755,7 +3852,7 @@ L.Path = L.Path.extend({
bringToFront: function () {
var root = this._map._pathRoot,
- path = this._container;
+ path = this._container;
if (path && root.lastChild !== path) {
root.appendChild(path);
@@ -3765,8 +3862,8 @@ L.Path = L.Path.extend({
bringToBack: function () {
var root = this._map._pathRoot,
- path = this._container,
- first = root.firstChild;
+ path = this._container,
+ first = root.firstChild;
if (path && first !== path) {
root.insertBefore(path, first);
@@ -3845,7 +3942,8 @@ L.Path = L.Path.extend({
L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
- var events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'mousemove', 'contextmenu'];
+ var events = ['dblclick', 'mousedown', 'mouseover',
+ 'mouseout', 'mousemove', 'contextmenu'];
for (var i = 0; i < events.length; i++) {
L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
}
@@ -3853,22 +3951,18 @@ L.Path = L.Path.extend({
},
_onMouseClick: function (e) {
- if (this._map.dragging && this._map.dragging.moved()) {
- return;
- }
+ if (this._map.dragging && this._map.dragging.moved()) { return; }
this._fireMouseEvent(e);
},
_fireMouseEvent: function (e) {
- if (!this.hasEventListeners(e.type)) {
- return;
- }
+ if (!this.hasEventListeners(e.type)) { return; }
var map = this._map,
- containerPoint = map.mouseEventToContainerPoint(e),
- layerPoint = map.containerPointToLayerPoint(containerPoint),
- latlng = map.layerPointToLatLng(layerPoint);
+ containerPoint = map.mouseEventToContainerPoint(e),
+ layerPoint = map.containerPointToLayerPoint(containerPoint),
+ latlng = map.layerPointToLatLng(layerPoint);
this.fire(e.type, {
latlng: latlng,
@@ -3880,7 +3974,9 @@ L.Path = L.Path.extend({
if (e.type === 'contextmenu') {
L.DomEvent.preventDefault(e);
}
- L.DomEvent.stopPropagation(e);
+ if (e.type !== 'mousemove') {
+ L.DomEvent.stopPropagation(e);
+ }
}
});
@@ -3908,11 +4004,11 @@ L.Map.include({
_animatePathZoom: function (opt) {
var scale = this.getZoomScale(opt.zoom),
- offset = this._getCenterOffset(opt.center).divideBy(1 - 1 / scale),
- viewportPos = this.containerPointToLayerPoint(this.getSize().multiplyBy(-L.Path.CLIP_PADDING)),
- origin = viewportPos.add(offset).round();
+ offset = this._getCenterOffset(opt.center),
+ translate = offset.multiplyBy(-scale)._add(this._pathViewport.min);
- this._pathRoot.style[L.DomUtil.TRANSFORM] = L.DomUtil.getTranslateString((origin.multiplyBy(-1).add(L.DomUtil.getPosition(this._pathRoot)).multiplyBy(scale).add(origin))) + ' scale(' + scale + ') ';
+ this._pathRoot.style[L.DomUtil.TRANSFORM] =
+ L.DomUtil.getTranslateString(translate) + ' scale(' + scale + ') ';
this._pathZooming = true;
},
@@ -3922,6 +4018,7 @@ L.Map.include({
},
_updateSvgViewport: function () {
+
if (this._pathZooming) {
// Do not update SVGs while a zoom animation is going on otherwise the animation will break.
// When the zoom animation ends we will be updated again anyway
@@ -3932,12 +4029,12 @@ L.Map.include({
this._updatePathViewport();
var vp = this._pathViewport,
- min = vp.min,
- max = vp.max,
- width = max.x - min.x,
- height = max.y - min.y,
- root = this._pathRoot,
- pane = this._panes.overlayPane;
+ min = vp.min,
+ max = vp.max,
+ width = max.x - min.x,
+ height = max.y - min.y,
+ root = this._pathRoot,
+ pane = this._panes.overlayPane;
// Hack to make flicker on drag end on mobile webkit less irritating
if (L.Browser.mobileWebkit) {
@@ -3964,7 +4061,7 @@ L.Path.include({
bindPopup: function (content, options) {
- if (!this._popup || this._popup.options !== options) {
+ if (!this._popup || options) {
this._popup = new L.Popup(options, this);
}
@@ -3972,8 +4069,9 @@ L.Path.include({
if (!this._popupHandlersAdded) {
this
- .on('click', this._openPopup, this)
- .on('remove', this._closePopup, this);
+ .on('click', this._openPopup, this)
+ .on('remove', this.closePopup, this);
+
this._popupHandlersAdded = true;
}
@@ -3984,8 +4082,10 @@ L.Path.include({
if (this._popup) {
this._popup = null;
this
- .off('click', this.openPopup)
- .off('remove', this.closePopup);
+ .off('click', this.openPopup)
+ .off('remove', this.closePopup);
+
+ this._popupHandlersAdded = false;
}
return this;
},
@@ -3993,8 +4093,9 @@ L.Path.include({
openPopup: function (latlng) {
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)];
+ this._latlngs[Math.floor(this._latlngs.length / 2)];
this._openPopup({latlng: latlng});
}
@@ -4002,13 +4103,16 @@ L.Path.include({
return this;
},
+ closePopup: function () {
+ if (this._popup) {
+ this._popup._close();
+ }
+ return this;
+ },
+
_openPopup: function (e) {
this._popup.setLatLng(e.latlng);
this._map.openPopup(this._popup);
- },
-
- _closePopup: function () {
- this._popup._close();
}
});
@@ -4027,6 +4131,7 @@ L.Browser.vml = !L.Browser.svg && (function () {
shape.style.behavior = 'url(#default#VML)';
return shape && (typeof shape.adj === 'object');
+
} catch (e) {
return false;
}
@@ -4046,7 +4151,8 @@ L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
};
} catch (e) {
return function (name) {
- return document.createElement('<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
+ return document.createElement(
+ '<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
};
}
}()),
@@ -4071,9 +4177,9 @@ L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
_updateStyle: function () {
var stroke = this._stroke,
- fill = this._fill,
- options = this.options,
- container = this._container;
+ fill = this._fill,
+ options = this.options,
+ container = this._container;
container.stroked = options.stroke;
container.filled = options.fill;
@@ -4157,7 +4263,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
},
setStyle: function (style) {
- L.Util.setOptions(this, style);
+ L.setOptions(this, style);
if (this._map) {
this._updateStyle();
@@ -4231,7 +4337,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
if (this._checkIfEmpty()) { return; }
var ctx = this._ctx,
- options = this.options;
+ options = this.options;
this._drawPath();
ctx.save();
@@ -4274,7 +4380,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {} : {
_initPathRoot: function () {
var root = this._pathRoot,
- ctx;
+ ctx;
if (!root) {
root = this._pathRoot = document.createElement("canvas");
@@ -4297,16 +4403,14 @@ L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {}
},
_updateCanvasViewport: function () {
- if (this._pathZooming) {
- //Don't redraw while zooming. See _updateSvgViewport for more details
- return;
- }
+ // don't redraw while zooming. See _updateSvgViewport for more details
+ if (this._pathZooming) { return; }
this._updatePathViewport();
var vp = this._pathViewport,
- min = vp.min,
- size = vp.max.subtract(min),
- root = this._pathRoot;
+ min = vp.min,
+ size = vp.max.subtract(min),
+ root = this._pathRoot;
//TODO check if this works properly on mobile webkit
L.DomUtil.setPosition(root, min);
@@ -4356,15 +4460,15 @@ L.LineUtil = {
_simplifyDP: function (points, sqTolerance) {
var len = points.length,
- ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
- markers = new ArrayConstructor(len);
+ ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
+ markers = new ArrayConstructor(len);
markers[0] = markers[len - 1] = 1;
this._simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
var i,
- newPoints = [];
+ newPoints = [];
for (i = 0; i < len; i++) {
if (markers[i]) {
@@ -4378,7 +4482,7 @@ L.LineUtil = {
_simplifyDPStep: function (points, markers, sqTolerance, first, last) {
var maxSqDist = 0,
- index, i, sqDist;
+ index, i, sqDist;
for (i = first + 1; i <= last - 1; i++) {
sqDist = this._sqClosestPointOnSegment(points[i], points[first], points[last], true);
@@ -4420,10 +4524,12 @@ L.LineUtil = {
clipSegment: function (a, b, bounds, useLastCode) {
var min = bounds.min,
- max = bounds.max;
+ max = bounds.max,
+
+ codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),
+ codeB = this._getBitCode(b, bounds),
- var codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),
- codeB = this._getBitCode(b, bounds);
+ codeOut, p, newCode;
// save 2nd code to avoid calculating it on the next segment
this._lastCode = codeB;
@@ -4437,9 +4543,9 @@ L.LineUtil = {
return false;
// other cases
} else {
- var codeOut = codeA || codeB,
- p = this._getEdgeIntersection(a, b, codeOut, bounds),
- newCode = this._getBitCode(p, bounds);
+ codeOut = codeA || codeB,
+ p = this._getEdgeIntersection(a, b, codeOut, bounds),
+ newCode = this._getBitCode(p, bounds);
if (codeOut === codeA) {
a = p;
@@ -4454,9 +4560,9 @@ L.LineUtil = {
_getEdgeIntersection: function (a, b, code, bounds) {
var dx = b.x - a.x,
- dy = b.y - a.y,
- min = bounds.min,
- max = bounds.max;
+ dy = b.y - a.y,
+ min = bounds.min,
+ max = bounds.max;
if (code & 8) { // top
return new L.Point(a.x + dx * (max.y - a.y) / dy, max.y);
@@ -4491,18 +4597,18 @@ L.LineUtil = {
// square distance (to avoid unnecessary Math.sqrt calls)
_sqDist: function (p1, p2) {
var dx = p2.x - p1.x,
- dy = p2.y - p1.y;
+ dy = p2.y - p1.y;
return dx * dx + dy * dy;
},
// return closest point on segment or distance to that point
_sqClosestPointOnSegment: function (p, p1, p2, sqDist) {
var x = p1.x,
- y = p1.y,
- dx = p2.x - x,
- dy = p2.y - y,
- dot = dx * dx + dy * dy,
- t;
+ y = p1.y,
+ dx = p2.x - x,
+ dy = p2.y - y,
+ dot = dx * dx + dy * dy,
+ t;
if (dot > 0) {
t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
@@ -4605,12 +4711,15 @@ L.Polyline = L.Path.extend({
},
getBounds: function () {
- var b = new L.LatLngBounds();
- var latLngs = this.getLatLngs();
- for (var i = 0, len = latLngs.length; i < len; i++) {
- b.extend(latLngs[i]);
+ var bounds = new L.LatLngBounds(),
+ latLngs = this.getLatLngs(),
+ i, len;
+
+ for (i = 0, len = latLngs.length; i < len; i++) {
+ bounds.extend(latLngs[i]);
}
- return b;
+
+ return bounds;
},
// TODO refactor: move to Polyline.Edit.js
@@ -4660,8 +4769,8 @@ L.Polyline = L.Path.extend({
_clipPoints: function () {
var points = this._originalPoints,
- len = points.length,
- i, k, segment;
+ len = points.length,
+ i, k, segment;
if (this.options.noClip) {
this._parts = [points];
@@ -4671,8 +4780,8 @@ L.Polyline = L.Path.extend({
this._parts = [];
var parts = this._parts,
- vp = this._map._pathViewport,
- lu = L.LineUtil;
+ vp = this._map._pathViewport,
+ lu = L.LineUtil;
for (i = 0, k = 0; i < len - 1; i++) {
segment = lu.clipSegment(points[i], points[i + 1], vp, i);
@@ -4694,7 +4803,7 @@ L.Polyline = L.Path.extend({
// simplify each clipped part of the polyline
_simplifyPoints: function () {
var parts = this._parts,
- lu = L.LineUtil;
+ lu = L.LineUtil;
for (var i = 0, len = parts.length; i < len; i++) {
parts[i] = lu.simplify(parts[i], this.options.smoothFactor);
@@ -4730,13 +4839,13 @@ L.PolyUtil = {};
*/
L.PolyUtil.clipPolygon = function (points, bounds) {
var min = bounds.min,
- max = bounds.max,
- clippedPoints,
- edges = [1, 4, 2, 8],
- i, j, k,
- a, b,
- len, edge, p,
- lu = L.LineUtil;
+ max = bounds.max,
+ clippedPoints,
+ edges = [1, 4, 2, 8],
+ i, j, k,
+ a, b,
+ len, edge, p,
+ lu = L.LineUtil;
for (i = 0, len = points.length; i < len; i++) {
points[i]._code = lu._getBitCode(points[i], bounds);
@@ -4802,14 +4911,14 @@ L.Polygon = L.Polyline.extend({
// TODO move this logic to Polyline to get rid of duplication
this._holePoints = [];
- if (!this._holes) {
- return;
- }
+ if (!this._holes) { return; }
- for (var i = 0, len = this._holes.length, hole; i < len; i++) {
+ var i, j, len, len2, hole;
+
+ for (i = 0, len = this._holes.length; i < len; i++) {
this._holePoints[i] = [];
- for (var j = 0, len2 = this._holes[i].length; j < len2; j++) {
+ for (j = 0, len2 = this._holes[i].length; j < len2; j++) {
this._holePoints[i][j] = this._map.latLngToLayerPoint(this._holes[i][j]);
}
}
@@ -4817,20 +4926,17 @@ L.Polygon = L.Polyline.extend({
_clipPoints: function () {
var points = this._originalPoints,
- newParts = [];
+ newParts = [];
this._parts = [points].concat(this._holePoints);
- if (this.options.noClip) {
- return;
- }
+ if (this.options.noClip) { return; }
for (var i = 0, len = this._parts.length; i < len; i++) {
var clipped = L.PolyUtil.clipPolygon(this._parts[i], this._map._pathViewport);
- if (!clipped.length) {
- continue;
+ if (clipped.length) {
+ newParts.push(clipped);
}
- newParts.push(clipped);
}
this._parts = newParts;
@@ -4853,7 +4959,9 @@ L.polygon = function (latlngs, options) {
(function () {
function createMulti(Klass) {
+
return L.FeatureGroup.extend({
+
initialize: function (latlngs, options) {
this._layers = {};
this._options = options;
@@ -4861,7 +4969,8 @@ L.polygon = function (latlngs, options) {
},
setLatLngs: function (latlngs) {
- var i = 0, len = latlngs.length;
+ var i = 0,
+ len = latlngs.length;
this.eachLayer(function (layer) {
if (i < len) {
@@ -4908,13 +5017,13 @@ L.Rectangle = L.Polygon.extend({
_boundsToLatLngs: function (latLngBounds) {
latLngBounds = L.latLngBounds(latLngBounds);
- return [
- latLngBounds.getSouthWest(),
- latLngBounds.getNorthWest(),
- latLngBounds.getNorthEast(),
- latLngBounds.getSouthEast(),
- latLngBounds.getSouthWest()
- ];
+ return [
+ latLngBounds.getSouthWest(),
+ latLngBounds.getNorthWest(),
+ latLngBounds.getNorthEast(),
+ latLngBounds.getSouthEast(),
+ latLngBounds.getSouthWest()
+ ];
}
});
@@ -4951,8 +5060,8 @@ L.Circle = L.Path.extend({
projectLatlngs: function () {
var lngRadius = this._getLngRadius(),
- latlng2 = new L.LatLng(this._latlng.lat, this._latlng.lng - lngRadius, true),
- point2 = this._map.latLngToLayerPoint(latlng2);
+ latlng2 = new L.LatLng(this._latlng.lat, this._latlng.lng - lngRadius, true),
+ point2 = this._map.latLngToLayerPoint(latlng2);
this._point = this._map.latLngToLayerPoint(this._latlng);
this._radius = Math.max(Math.round(this._point.x - point2.x), 1);
@@ -4960,10 +5069,10 @@ L.Circle = L.Path.extend({
getBounds: function () {
var lngRadius = this._getLngRadius(),
- latRadius = (this._mRadius / 40075017) * 360,
- latlng = this._latlng,
- sw = new L.LatLng(latlng.lat - latRadius, latlng.lng - lngRadius),
- ne = new L.LatLng(latlng.lat + latRadius, latlng.lng + lngRadius);
+ latRadius = (this._mRadius / 40075017) * 360,
+ latlng = this._latlng,
+ sw = new L.LatLng(latlng.lat - latRadius, latlng.lng - lngRadius),
+ ne = new L.LatLng(latlng.lat + latRadius, latlng.lng + lngRadius);
return new L.LatLngBounds(sw, ne);
},
@@ -4974,7 +5083,7 @@ L.Circle = L.Path.extend({
getPathString: function () {
var p = this._point,
- r = this._radius;
+ r = this._radius;
if (this._checkIfEmpty()) {
return '';
@@ -4982,8 +5091,8 @@ L.Circle = L.Path.extend({
if (L.Browser.svg) {
return "M" + p.x + "," + (p.y - r) +
- "A" + r + "," + r + ",0,1,1," +
- (p.x - 0.1) + "," + (p.y - r) + " z";
+ "A" + r + "," + r + ",0,1,1," +
+ (p.x - 0.1) + "," + (p.y - r) + " z";
} else {
p._round();
r = Math.round(r);
@@ -5010,11 +5119,11 @@ L.Circle = L.Path.extend({
return false;
}
var vp = this._map._pathViewport,
- r = this._radius,
- p = this._point;
+ r = this._radius,
+ p = this._point;
return p.x - r > vp.max.x || p.y - r > vp.max.y ||
- p.x + r < vp.min.x || p.y + r < vp.min.y;
+ p.x + r < vp.min.x || p.y + r < vp.min.y;
}
});
@@ -5057,7 +5166,7 @@ L.circleMarker = function (latlng, options) {
L.Polyline.include(!L.Path.CANVAS ? {} : {
_containsPoint: function (p, closed) {
var i, j, k, len, len2, dist, part,
- w = this.options.weight / 2;
+ w = this.options.weight / 2;
if (L.Browser.touch) {
w += 10; // polyline click tolerance on touch devices
@@ -5086,9 +5195,9 @@ L.Polyline.include(!L.Path.CANVAS ? {} : {
L.Polygon.include(!L.Path.CANVAS ? {} : {
_containsPoint: function (p) {
var inside = false,
- part, p1, p2,
- i, j, k,
- len, len2;
+ part, p1, p2,
+ i, j, k,
+ len, len2;
// TODO optimization: check if within bounds first
@@ -5131,7 +5240,7 @@ L.Circle.include(!L.Path.CANVAS ? {} : {
_containsPoint: function (p) {
var center = this._point,
- w2 = this.options.stroke ? this.options.weight / 2 : 0;
+ w2 = this.options.stroke ? this.options.weight / 2 : 0;
return (p.distanceTo(center) <= this._radius + w2);
}
@@ -5140,7 +5249,7 @@ L.Circle.include(!L.Path.CANVAS ? {} : {
L.GeoJSON = L.FeatureGroup.extend({
initialize: function (geojson, options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
this._layers = {};
@@ -5199,7 +5308,7 @@ L.GeoJSON = L.FeatureGroup.extend({
}
});
-L.Util.extend(L.GeoJSON, {
+L.extend(L.GeoJSON, {
geometryToLayer: function (geojson, pointToLayer) {
var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
coords = geometry.coordinates,
@@ -5261,8 +5370,8 @@ L.Util.extend(L.GeoJSON, {
for (i = 0, len = coords.length; i < len; i++) {
latlng = levelsDeep ?
- this.coordsToLatLngs(coords[i], levelsDeep - 1, reverse) :
- this.coordsToLatLng(coords[i], reverse);
+ this.coordsToLatLngs(coords[i], levelsDeep - 1, reverse) :
+ this.coordsToLatLng(coords[i], reverse);
latlngs.push(latlng);
}
@@ -5284,9 +5393,9 @@ L.DomEvent = {
/* inpired by John Resig, Dean Edwards and YUI addEvent implementations */
addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
- var id = L.Util.stamp(fn),
- key = '_leaflet_' + type + id,
- handler, originalHandler, newType;
+ var id = L.stamp(fn),
+ key = '_leaflet_' + type + id,
+ handler, originalHandler, newType;
if (obj[key]) { return this; }
@@ -5294,11 +5403,13 @@ L.DomEvent = {
return fn.call(context || obj, e || L.DomEvent._getEvent());
};
- if (L.Browser.touch && (type === 'dblclick') && this.addDoubleTapListener) {
+ if (L.Browser.msTouch && type.indexOf('touch') === 0) {
+ return this.addMsTouchListener(obj, type, handler, id);
+ } else if (L.Browser.touch && (type === 'dblclick') && this.addDoubleTapListener) {
return this.addDoubleTapListener(obj, handler, id);
} else if ('addEventListener' in obj) {
-
+
if (type === 'mousewheel') {
obj.addEventListener('DOMMouseScroll', handler, false);
obj.addEventListener(type, handler, false);
@@ -5330,13 +5441,15 @@ L.DomEvent = {
removeListener: function (obj, type, fn) { // (HTMLElement, String, Function)
- var id = L.Util.stamp(fn),
- key = '_leaflet_' + type + id,
- handler = obj[key];
+ var id = L.stamp(fn),
+ key = '_leaflet_' + type + id,
+ handler = obj[key];
if (!handler) { return; }
- if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {
+ if (L.Browser.msTouch && type.indexOf('touch') === 0) {
+ this.removeMsTouchListener(obj, type, id);
+ } else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {
this.removeDoubleTapListener(obj, id);
} else if ('removeEventListener' in obj) {
@@ -5372,7 +5485,7 @@ L.DomEvent = {
disableClickPropagation: function (el) {
var stop = L.DomEvent.stopPropagation;
-
+
return L.DomEvent
.addListener(el, L.Draggable.START, stop)
.addListener(el, 'click', stop)
@@ -5396,10 +5509,10 @@ L.DomEvent = {
getMousePosition: function (e, container) {
var body = document.body,
- docEl = document.documentElement,
- x = e.pageX ? e.pageX : e.clientX + body.scrollLeft + docEl.scrollLeft,
- y = e.pageY ? e.pageY : e.clientY + body.scrollTop + docEl.scrollTop,
- pos = new L.Point(x, y);
+ docEl = document.documentElement,
+ x = e.pageX ? e.pageX : e.clientX + body.scrollLeft + docEl.scrollLeft,
+ y = e.pageY ? e.pageY : e.clientY + body.scrollTop + docEl.scrollTop,
+ pos = new L.Point(x, y);
return (container ? pos._subtract(L.DomUtil.getViewportOffset(container)) : pos);
},
@@ -5456,6 +5569,7 @@ L.DomEvent = {
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.
*/
@@ -5470,23 +5584,22 @@ L.Draggable = L.Class.extend({
TAP_TOLERANCE: 15
},
- initialize: function (element, dragStartTarget) {
+ initialize: function (element, dragStartTarget, longPress) {
this._element = element;
this._dragStartTarget = dragStartTarget || element;
+ this._longPress = longPress && !L.Browser.msTouch;
},
enable: function () {
- if (this._enabled) {
- return;
- }
+ if (this._enabled) { return; }
+
L.DomEvent.on(this._dragStartTarget, L.Draggable.START, this._onDown, this);
this._enabled = true;
},
disable: function () {
- if (!this._enabled) {
- return;
- }
+ if (!this._enabled) { return; }
+
L.DomEvent.off(this._dragStartTarget, L.Draggable.START, this._onDown);
this._enabled = false;
this._moved = false;
@@ -5494,9 +5607,10 @@ L.Draggable = L.Class.extend({
_onDown: function (e) {
if ((!L.Browser.touch && e.shiftKey) ||
- ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
+ ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
L.DomEvent.preventDefault(e);
+ L.DomEvent.stopPropagation(e);
if (L.Draggable._disabled) { return; }
@@ -5504,24 +5618,36 @@ L.Draggable = L.Class.extend({
if (e.touches && e.touches.length > 1) {
this._simulateClick = false;
+ clearTimeout(this._longPressTimeout);
return;
}
var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
- el = first.target;
+ el = first.target;
if (L.Browser.touch && el.tagName.toLowerCase() === 'a') {
L.DomUtil.addClass(el, 'leaflet-active');
}
this._moved = false;
- if (this._moving) {
- return;
- }
+ if (this._moving) { return; }
this._startPoint = new L.Point(first.clientX, first.clientY);
this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
+ //Touch contextmenu event emulation
+ if (e.touches && e.touches.length === 1 && L.Browser.touch && this._longPress) {
+ this._longPressTimeout = setTimeout(L.bind(function () {
+ var dist = (this._newPos && this._newPos.distanceTo(this._startPos)) || 0;
+
+ if (dist < L.Draggable.TAP_TOLERANCE) {
+ this._simulateClick = false;
+ this._onUp();
+ this._simulateEvent('contextmenu', first);
+ }
+ }, this), 1000);
+ }
+
L.DomEvent.on(document, L.Draggable.MOVE, this._onMove, this);
L.DomEvent.on(document, L.Draggable.END, this._onUp, this);
},
@@ -5530,8 +5656,8 @@ L.Draggable = L.Class.extend({
if (e.touches && e.touches.length > 1) { return; }
var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
- newPoint = new L.Point(first.clientX, first.clientY),
- diffVec = newPoint.subtract(this._startPoint);
+ newPoint = new L.Point(first.clientX, first.clientY),
+ diffVec = newPoint.subtract(this._startPoint);
if (!diffVec.x && !diffVec.y) { return; }
@@ -5563,17 +5689,19 @@ L.Draggable = L.Class.extend({
},
_onUp: function (e) {
+ var simulateClickTouch;
+ clearTimeout(this._longPressTimeout);
if (this._simulateClick && e.changedTouches) {
var first = e.changedTouches[0],
- el = first.target,
- dist = (this._newPos && this._newPos.distanceTo(this._startPos)) || 0;
+ el = first.target,
+ dist = (this._newPos && this._newPos.distanceTo(this._startPos)) || 0;
if (el.tagName.toLowerCase() === 'a') {
L.DomUtil.removeClass(el, 'leaflet-active');
}
if (dist < L.Draggable.TAP_TOLERANCE) {
- this._simulateEvent('click', first);
+ simulateClickTouch = first;
}
}
@@ -5592,6 +5720,11 @@ L.Draggable = L.Class.extend({
this.fire('dragend');
}
this._moving = false;
+
+ if (simulateClickTouch) {
+ this._moved = false;
+ this._simulateEvent('click', simulateClickTouch);
+ }
},
_setMovingCursor: function () {
@@ -5606,10 +5739,10 @@ L.Draggable = L.Class.extend({
var simulatedEvent = document.createEvent('MouseEvents');
simulatedEvent.initMouseEvent(
- type, true, true, window, 1,
- e.screenX, e.screenY,
- e.clientX, e.clientY,
- false, false, false, false, 0, null);
+ type, true, true, window, 1,
+ e.screenX, e.screenY,
+ e.clientX, e.clientY,
+ false, false, false, false, 0, null);
e.target.dispatchEvent(simulatedEvent);
}
@@ -5654,8 +5787,11 @@ L.Map.mergeOptions({
inertia: !L.Browser.android23,
inertiaDeceleration: 3400, // px/s^2
- inertiaMaxSpeed: 6000, // px/s
+ inertiaMaxSpeed: Infinity, // px/s
inertiaThreshold: L.Browser.touch ? 32 : 18, // ms
+ easeLinearity: 0.25,
+
+ longPress: true,
// TODO refactor, move to CRS
worldCopyJump: true
@@ -5664,7 +5800,9 @@ L.Map.mergeOptions({
L.Map.Drag = L.Handler.extend({
addHooks: function () {
if (!this._draggable) {
- this._draggable = new L.Draggable(this._map._mapPane, this._map._container);
+ var map = this._map;
+
+ this._draggable = new L.Draggable(map._mapPane, map._container, map.options.longPress);
this._draggable.on({
'dragstart': this._onDragStart,
@@ -5672,11 +5810,9 @@ L.Map.Drag = L.Handler.extend({
'dragend': this._onDragEnd
}, this);
- var options = this._map.options;
-
- if (options.worldCopyJump) {
+ if (map.options.worldCopyJump) {
this._draggable.on('predrag', this._onPreDrag, this);
- this._map.on('viewreset', this._onViewReset, this);
+ map.on('viewreset', this._onViewReset, this);
}
}
this._draggable.enable();
@@ -5698,8 +5834,8 @@ L.Map.Drag = L.Handler.extend({
}
map
- .fire('movestart')
- .fire('dragstart');
+ .fire('movestart')
+ .fire('dragstart');
if (map.options.inertia) {
this._positions = [];
@@ -5722,13 +5858,13 @@ L.Map.Drag = L.Handler.extend({
}
this._map
- .fire('move')
- .fire('drag');
+ .fire('move')
+ .fire('drag');
},
_onViewReset: function () {
var pxCenter = this._map.getSize()._divideBy(2),
- pxWorldCenter = this._map.latLngToLayerPoint(new L.LatLng(0, 0));
+ pxWorldCenter = this._map.latLngToLayerPoint(new L.LatLng(0, 0));
this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
this._worldWidth = this._map.project(new L.LatLng(0, 180)).x;
@@ -5737,25 +5873,25 @@ L.Map.Drag = L.Handler.extend({
_onPreDrag: function () {
// TODO refactor to be able to adjust map pane position after zoom
var map = this._map,
- worldWidth = this._worldWidth,
- halfWidth = Math.round(worldWidth / 2),
- dx = this._initialWorldOffset,
- x = this._draggable._newPos.x,
- newX1 = (x - halfWidth + dx) % worldWidth + halfWidth - dx,
- newX2 = (x + halfWidth + dx) % worldWidth - halfWidth - dx,
- newX = Math.abs(newX1 + dx) < Math.abs(newX2 + dx) ? newX1 : newX2;
+ worldWidth = this._worldWidth,
+ halfWidth = Math.round(worldWidth / 2),
+ dx = this._initialWorldOffset,
+ x = this._draggable._newPos.x,
+ newX1 = (x - halfWidth + dx) % worldWidth + halfWidth - dx,
+ newX2 = (x + halfWidth + dx) % worldWidth - halfWidth - dx,
+ newX = Math.abs(newX1 + dx) < Math.abs(newX2 + dx) ? newX1 : newX2;
this._draggable._newPos.x = newX;
},
_onDragEnd: function () {
var map = this._map,
- options = map.options,
- delay = +new Date() - this._lastTime,
+ options = map.options,
+ delay = +new Date() - this._lastTime,
- noInertia = !options.inertia ||
- delay > options.inertiaThreshold ||
- this._positions[0] === undefined;
+ noInertia = !options.inertia ||
+ delay > options.inertiaThreshold ||
+ !this._positions[0];
if (noInertia) {
map.fire('moveend');
@@ -5763,20 +5899,20 @@ L.Map.Drag = L.Handler.extend({
} else {
var direction = this._lastPos.subtract(this._positions[0]),
- duration = (this._lastTime + delay - this._times[0]) / 1000,
+ duration = (this._lastTime + delay - this._times[0]) / 1000,
- speedVector = direction.multiplyBy(0.58 / duration),
- speed = speedVector.distanceTo(new L.Point(0, 0)),
+ speedVector = direction.multiplyBy(options.easeLinearity / duration),
+ speed = speedVector.distanceTo(new L.Point(0, 0)),
- limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
- limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
+ limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
+ limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
- decelerationDuration = limitedSpeed / options.inertiaDeceleration,
- offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
+ decelerationDuration = limitedSpeed / (options.inertiaDeceleration * options.easeLinearity),
+ offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
- L.Util.requestAnimFrame(L.Util.bind(function () {
- this._map.panBy(offset, decelerationDuration);
- }, this));
+ L.Util.requestAnimFrame(function () {
+ map.panBy(offset, decelerationDuration, options.easeLinearity);
+ });
}
map.fire('dragend');
@@ -5820,11 +5956,11 @@ L.Map.DoubleClickZoom = L.Handler.extend({
L.Map.addInitHook('addHandler', 'doubleClickZoom', L.Map.DoubleClickZoom);
/*
- * L.Handler.ScrollWheelZoom is used internally by L.Map to enable mouse scroll wheel zooming on the map.
+ * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.
*/
L.Map.mergeOptions({
- scrollWheelZoom: !L.Browser.touch
+ scrollWheelZoom: !L.Browser.touch || L.Browser.msTouch
});
L.Map.ScrollWheelZoom = L.Handler.extend({
@@ -5850,7 +5986,7 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
var left = Math.max(40 - (+new Date() - this._startTime), 0);
clearTimeout(this._timer);
- this._timer = setTimeout(L.Util.bind(this._performZoom, this), left);
+ this._timer = setTimeout(L.bind(this._performZoom, this), left);
L.DomEvent.preventDefault(e);
L.DomEvent.stopPropagation(e);
@@ -5858,8 +5994,8 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
_performZoom: function () {
var map = this._map,
- delta = Math.round(this._delta),
- zoom = map.getZoom();
+ delta = Math.round(this._delta),
+ zoom = map.getZoom();
delta = Math.max(Math.min(delta, 4), -4);
delta = map._limitZoom(zoom + delta) - zoom;
@@ -5871,17 +6007,17 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
if (!delta) { return; }
var newZoom = zoom + delta,
- newCenter = this._getCenterForScrollWheelZoom(newZoom);
+ newCenter = this._getCenterForScrollWheelZoom(newZoom);
map.setView(newCenter, newZoom);
},
_getCenterForScrollWheelZoom: function (newZoom) {
var map = this._map,
- scale = map.getZoomScale(newZoom),
- viewHalf = map.getSize()._divideBy(2),
- centerOffset = this._lastMousePos._subtract(viewHalf)._multiplyBy(1 - 1 / scale),
- newCenterPoint = map._getTopLeftPoint()._add(viewHalf)._add(centerOffset);
+ scale = map.getZoomScale(newZoom),
+ viewHalf = map.getSize()._divideBy(2),
+ centerOffset = this._lastMousePos._subtract(viewHalf)._multiplyBy(1 - 1 / scale),
+ newCenterPoint = map._getTopLeftPoint()._add(viewHalf)._add(centerOffset);
return map.unproject(newCenterPoint);
}
@@ -5890,31 +6026,67 @@ L.Map.ScrollWheelZoom = L.Handler.extend({
L.Map.addInitHook('addHandler', 'scrollWheelZoom', L.Map.ScrollWheelZoom);
-L.Util.extend(L.DomEvent, {
+L.extend(L.DomEvent, {
+
+ _touchstart: L.Browser.msTouch ? 'MSPointerDown' : 'touchstart',
+ _touchend: L.Browser.msTouch ? 'MSPointerUp' : 'touchend',
+
// inspired by Zepto touch code by Thomas Fuchs
addDoubleTapListener: function (obj, handler, id) {
var last,
- doubleTap = false,
- delay = 250,
- touch,
- pre = '_leaflet_',
- touchstart = 'touchstart',
- touchend = 'touchend';
+ doubleTap = false,
+ delay = 250,
+ touch,
+ pre = '_leaflet_',
+ touchstart = this._touchstart,
+ touchend = this._touchend,
+ trackedTouches = [];
function onTouchStart(e) {
- if (e.touches.length !== 1) {
+ var count;
+ if (L.Browser.msTouch) {
+ trackedTouches.push(e.pointerId);
+ count = trackedTouches.length;
+ } else {
+ count = e.touches.length;
+ }
+ if (count > 1) {
return;
}
var now = Date.now(),
delta = now - (last || now);
- touch = e.touches[0];
+ touch = e.touches ? e.touches[0] : e;
doubleTap = (delta > 0 && delta <= delay);
last = now;
}
function onTouchEnd(e) {
+ if (L.Browser.msTouch) {
+ var idx = trackedTouches.indexOf(e.pointerId);
+ if (idx === -1) {
+ return;
+ }
+ trackedTouches.splice(idx, 1);
+ }
+
if (doubleTap) {
+ if (L.Browser.msTouch) {
+ //Work around .type being readonly with MSPointer* events
+ var newTouch = { },
+ prop;
+ for (var i in touch) {
+ if (true) { //Make JSHint happy, we want to copy all properties
+ prop = touch[i];
+ if (typeof prop === 'function') {
+ newTouch[i] = prop.bind(touch);
+ } else {
+ newTouch[i] = prop;
+ }
+ }
+ }
+ touch = newTouch;
+ }
touch.type = 'dblclick';
handler(touch);
last = null;
@@ -5923,22 +6095,176 @@ L.Util.extend(L.DomEvent, {
obj[pre + touchstart + id] = onTouchStart;
obj[pre + touchend + id] = onTouchEnd;
+ //On msTouch we need to listen on the document otherwise a drag starting on the map and moving off screen will not come through to us
+ // so we will lose track of how many touches are ongoing
+ var endElement = L.Browser.msTouch ? document.documentElement : obj;
+
obj.addEventListener(touchstart, onTouchStart, false);
- obj.addEventListener(touchend, onTouchEnd, false);
+ endElement.addEventListener(touchend, onTouchEnd, false);
+ if (L.Browser.msTouch) {
+ endElement.addEventListener('MSPointerCancel', onTouchEnd, false);
+ }
return this;
},
removeDoubleTapListener: function (obj, id) {
var pre = '_leaflet_';
- obj.removeEventListener(obj, obj[pre + 'touchstart' + id], false);
- obj.removeEventListener(obj, obj[pre + 'touchend' + id], false);
+ obj.removeEventListener(this._touchstart, obj[pre + this._touchstart + id], false);
+ (L.Browser.msTouch ? document.documentElement : obj).removeEventListener(this._touchend, obj[pre + this._touchend + id], false);
+ if (L.Browser.msTouch) {
+ document.documentElement.removeEventListener('MSPointerCancel', obj[pre + this._touchend + id], false);
+ }
+ return this;
+ }
+});
+
+
+L.extend(L.DomEvent, {
+
+ _msTouches: [],
+ _msDocumentListener: false,
+
+ // Provides a touch events wrapper for msPointer events.
+ // Based on changes by veproza https://github.com/CloudMade/Leaflet/pull/1019
+
+ addMsTouchListener: function (obj, type, handler, id) {
+
+ switch (type) {
+ case 'touchstart':
+ return this.addMsTouchListenerStart(obj, type, handler, id);
+ case 'touchend':
+ return this.addMsTouchListenerEnd(obj, type, handler, id);
+ case 'touchmove':
+ return this.addMsTouchListenerMove(obj, type, handler, id);
+ default:
+ throw 'Unknown touch event type';
+ }
+ },
+
+ addMsTouchListenerStart: function (obj, type, handler, id) {
+ var pre = '_leaflet_',
+ touches = this._msTouches;
+
+ var cb = function (e) {
+
+ var alreadyInArray = false;
+ for (var i = 0; i < touches.length; i++) {
+ if (touches[i].pointerId === e.pointerId) {
+ alreadyInArray = true;
+ break;
+ }
+ }
+ if (!alreadyInArray) {
+ touches.push(e);
+ }
+
+ e.touches = touches.slice();
+ e.changedTouches = [e];
+
+ handler(e);
+ };
+
+ obj[pre + 'touchstart' + id] = cb;
+ obj.addEventListener('MSPointerDown', cb, false);
+
+ // need to also listen for end events to keep the _msTouches list accurate
+ // this needs to be on the body and never go away
+ if (!this._msDocumentListener) {
+ var internalCb = function (e) {
+ for (var i = 0; i < touches.length; i++) {
+ if (touches[i].pointerId === e.pointerId) {
+ touches.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('MSPointerUp', internalCb, false);
+ document.documentElement.addEventListener('MSPointerCancel', internalCb, false);
+
+ this._msDocumentListener = true;
+ }
+
+ return this;
+ },
+
+ addMsTouchListenerMove: function (obj, type, handler, id) {
+ var pre = '_leaflet_',
+ touches = this._msTouches;
+
+ function cb(e) {
+
+ // don't fire touch moves when mouse isn't down
+ if (e.pointerType === e.MSPOINTER_TYPE_MOUSE && e.buttons === 0) { return; }
+
+ for (var i = 0; i < touches.length; i++) {
+ if (touches[i].pointerId === e.pointerId) {
+ touches[i] = e;
+ break;
+ }
+ }
+
+ e.touches = touches.slice();
+ e.changedTouches = [e];
+
+ handler(e);
+ }
+
+ obj[pre + 'touchmove' + id] = cb;
+ obj.addEventListener('MSPointerMove', cb, false);
+
+ return this;
+ },
+
+ addMsTouchListenerEnd: function (obj, type, handler, id) {
+ var pre = '_leaflet_',
+ touches = this._msTouches;
+
+ var cb = function (e) {
+ for (var i = 0; i < touches.length; i++) {
+ if (touches[i].pointerId === e.pointerId) {
+ touches.splice(i, 1);
+ break;
+ }
+ }
+
+ e.touches = touches.slice();
+ e.changedTouches = [e];
+
+ handler(e);
+ };
+
+ obj[pre + 'touchend' + id] = cb;
+ obj.addEventListener('MSPointerUp', cb, false);
+ obj.addEventListener('MSPointerCancel', cb, false);
+
+ return this;
+ },
+
+ removeMsTouchListener: function (obj, type, id) {
+ var pre = '_leaflet_',
+ cb = obj[pre + type + id];
+
+ switch (type) {
+ case 'touchstart':
+ obj.removeEventListener('MSPointerDown', cb, false);
+ break;
+ case 'touchmove':
+ obj.removeEventListener('MSPointerMove', cb, false);
+ break;
+ case 'touchend':
+ obj.removeEventListener('MSPointerUp', cb, false);
+ obj.removeEventListener('MSPointerCancel', cb, false);
+ break;
+ }
+
return this;
}
});
/*
- * L.Handler.TouchZoom is used internally by L.Map to add touch-zooming on Webkit-powered mobile browsers.
+ * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.
*/
L.Map.mergeOptions({
@@ -5960,8 +6286,8 @@ L.Map.TouchZoom = L.Handler.extend({
if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
var p1 = map.mouseEventToLayerPoint(e.touches[0]),
- p2 = map.mouseEventToLayerPoint(e.touches[1]),
- viewCenter = map._getCenterLayerPoint();
+ p2 = map.mouseEventToLayerPoint(e.touches[1]),
+ viewCenter = map._getCenterLayerPoint();
this._startCenter = p1.add(p2)._divideBy(2);
this._startDist = p1.distanceTo(p2);
@@ -5976,8 +6302,8 @@ L.Map.TouchZoom = L.Handler.extend({
}
L.DomEvent
- .on(document, 'touchmove', this._onTouchMove, this)
- .on(document, 'touchend', this._onTouchEnd, this);
+ .on(document, 'touchmove', this._onTouchMove, this)
+ .on(document, 'touchend', this._onTouchEnd, this);
L.DomEvent.preventDefault(e);
},
@@ -5988,7 +6314,7 @@ L.Map.TouchZoom = L.Handler.extend({
var map = this._map;
var p1 = map.mouseEventToLayerPoint(e.touches[0]),
- p2 = map.mouseEventToLayerPoint(e.touches[1]);
+ p2 = map.mouseEventToLayerPoint(e.touches[1]);
this._scale = p1.distanceTo(p2) / this._startDist;
this._delta = p1._add(p2)._divideBy(2)._subtract(this._startCenter);
@@ -5999,23 +6325,24 @@ L.Map.TouchZoom = L.Handler.extend({
L.DomUtil.addClass(map._mapPane, 'leaflet-zoom-anim leaflet-touching');
map
- .fire('movestart')
- .fire('zoomstart')
- ._prepareTileBg();
+ .fire('movestart')
+ .fire('zoomstart')
+ ._prepareTileBg();
this._moved = true;
}
L.Util.cancelAnimFrame(this._animRequest);
- this._animRequest = L.Util.requestAnimFrame(this._updateOnMove, this, true, this._map._container);
+ this._animRequest = L.Util.requestAnimFrame(
+ this._updateOnMove, this, true, this._map._container);
L.DomEvent.preventDefault(e);
},
_updateOnMove: function () {
var map = this._map,
- origin = this._getScaleOrigin(),
- center = map.layerPointToLatLng(origin);
+ origin = this._getScaleOrigin(),
+ center = map.layerPointToLatLng(origin);
map.fire('zoomanim', {
center: center,
@@ -6026,8 +6353,8 @@ L.Map.TouchZoom = L.Handler.extend({
// it didn't count the origin on the first touch-zoom but worked correctly afterwards
map._tileBg.style[L.DomUtil.TRANSFORM] =
- L.DomUtil.getTranslateString(this._delta) + ' ' +
- L.DomUtil.getScaleString(this._scale, this._startCenter);
+ L.DomUtil.getTranslateString(this._delta) + ' ' +
+ L.DomUtil.getScaleString(this._scale, this._startCenter);
},
_onTouchEnd: function (e) {
@@ -6039,16 +6366,18 @@ L.Map.TouchZoom = L.Handler.extend({
L.DomUtil.removeClass(map._mapPane, 'leaflet-touching');
L.DomEvent
- .off(document, 'touchmove', this._onTouchMove)
- .off(document, 'touchend', this._onTouchEnd);
+ .off(document, 'touchmove', this._onTouchMove)
+ .off(document, 'touchend', this._onTouchEnd);
var origin = this._getScaleOrigin(),
- center = map.layerPointToLatLng(origin),
+ center = map.layerPointToLatLng(origin),
+
+ oldZoom = map.getZoom(),
+ floatZoomDelta = map.getScaleZoom(this._scale) - oldZoom,
+ roundZoomDelta = (floatZoomDelta > 0 ?
+ Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)),
- oldZoom = map.getZoom(),
- floatZoomDelta = map.getScaleZoom(this._scale) - oldZoom,
- roundZoomDelta = (floatZoomDelta > 0 ? Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)),
- zoom = map._limitZoom(oldZoom + roundZoomDelta);
+ zoom = map._limitZoom(oldZoom + roundZoomDelta);
map.fire('zoomanim', {
center: center,
@@ -6104,29 +6433,29 @@ L.Map.BoxZoom = L.Handler.extend({
this._container.style.cursor = 'crosshair';
L.DomEvent
- .on(document, 'mousemove', this._onMouseMove, this)
- .on(document, 'mouseup', this._onMouseUp, this)
- .preventDefault(e);
-
+ .on(document, 'mousemove', this._onMouseMove, this)
+ .on(document, 'mouseup', this._onMouseUp, this)
+ .preventDefault(e);
+
this._map.fire("boxzoomstart");
},
_onMouseMove: function (e) {
var startPoint = this._startLayerPoint,
- box = this._box,
+ box = this._box,
- layerPoint = this._map.mouseEventToLayerPoint(e),
- offset = layerPoint.subtract(startPoint),
+ layerPoint = this._map.mouseEventToLayerPoint(e),
+ offset = layerPoint.subtract(startPoint),
- newPos = new L.Point(
- Math.min(layerPoint.x, startPoint.x),
- Math.min(layerPoint.y, startPoint.y));
+ newPos = new L.Point(
+ Math.min(layerPoint.x, startPoint.x),
+ Math.min(layerPoint.y, startPoint.y));
L.DomUtil.setPosition(box, newPos);
// TODO refactor: remove hardcoded 4 pixels
- box.style.width = (Math.abs(offset.x) - 4) + 'px';
- box.style.height = (Math.abs(offset.y) - 4) + 'px';
+ box.style.width = (Math.max(0, Math.abs(offset.x) - 4)) + 'px';
+ box.style.height = (Math.max(0, Math.abs(offset.y) - 4)) + 'px';
},
_onMouseUp: function (e) {
@@ -6136,18 +6465,18 @@ L.Map.BoxZoom = L.Handler.extend({
L.DomUtil.enableTextSelection();
L.DomEvent
- .off(document, 'mousemove', this._onMouseMove)
- .off(document, 'mouseup', this._onMouseUp);
+ .off(document, 'mousemove', this._onMouseMove)
+ .off(document, 'mouseup', this._onMouseUp);
var map = this._map,
- layerPoint = map.mouseEventToLayerPoint(e);
+ layerPoint = map.mouseEventToLayerPoint(e),
- var bounds = new L.LatLngBounds(
- map.layerPointToLatLng(this._startLayerPoint),
- map.layerPointToLatLng(layerPoint));
+ bounds = new L.LatLngBounds(
+ map.layerPointToLatLng(this._startLayerPoint),
+ map.layerPointToLatLng(layerPoint));
map.fitBounds(bounds);
-
+
map.fire("boxzoomend", {
boxZoomBounds: bounds
});
@@ -6191,27 +6520,28 @@ L.Map.Keyboard = L.Handler.extend({
}
L.DomEvent
- .addListener(container, 'focus', this._onFocus, this)
- .addListener(container, 'blur', this._onBlur, this)
- .addListener(container, 'mousedown', this._onMouseDown, this);
+ .addListener(container, 'focus', this._onFocus, this)
+ .addListener(container, 'blur', this._onBlur, this)
+ .addListener(container, 'mousedown', this._onMouseDown, this);
this._map
- .on('focus', this._addHooks, this)
- .on('blur', this._removeHooks, this);
+ .on('focus', this._addHooks, this)
+ .on('blur', this._removeHooks, this);
},
removeHooks: function () {
this._removeHooks();
var container = this._map._container;
+
L.DomEvent
- .removeListener(container, 'focus', this._onFocus, this)
- .removeListener(container, 'blur', this._onBlur, this)
- .removeListener(container, 'mousedown', this._onMouseDown, this);
+ .removeListener(container, 'focus', this._onFocus, this)
+ .removeListener(container, 'blur', this._onBlur, this)
+ .removeListener(container, 'mousedown', this._onMouseDown, this);
this._map
- .off('focus', this._addHooks, this)
- .off('blur', this._removeHooks, this);
+ .off('focus', this._addHooks, this)
+ .off('blur', this._removeHooks, this);
},
_onMouseDown: function () {
@@ -6251,7 +6581,7 @@ L.Map.Keyboard = L.Handler.extend({
_setZoomOffset: function (zoom) {
var keys = this._zoomKeys = {},
- codes = this.keyCodes,
+ codes = this.keyCodes,
i, len;
for (i = 0, len = codes.zoomIn.length; i < len; i++) {
@@ -6303,9 +6633,9 @@ L.Handler.MarkerDrag = L.Handler.extend({
var icon = this._marker._icon;
if (!this._draggable) {
this._draggable = new L.Draggable(icon, icon)
- .on('dragstart', this._onDragStart, this)
- .on('drag', this._onDrag, this)
- .on('dragend', this._onDragEnd, this);
+ .on('dragstart', this._onDragStart, this)
+ .on('drag', this._onDrag, this)
+ .on('dragend', this._onDragEnd, this);
}
this._draggable.enable();
},
@@ -6320,16 +6650,16 @@ L.Handler.MarkerDrag = L.Handler.extend({
_onDragStart: function (e) {
this._marker
- .closePopup()
- .fire('movestart')
- .fire('dragstart');
+ .closePopup()
+ .fire('movestart')
+ .fire('dragstart');
},
_onDrag: function (e) {
var marker = this._marker,
- shadow = marker._shadow,
- iconPos = L.DomUtil.getPosition(marker._icon),
- latlng = marker._map.layerPointToLatLng(iconPos);
+ shadow = marker._shadow,
+ iconPos = L.DomUtil.getPosition(marker._icon),
+ latlng = marker._map.layerPointToLatLng(iconPos);
// update shadow position
if (shadow) {
@@ -6339,14 +6669,14 @@ L.Handler.MarkerDrag = L.Handler.extend({
marker._latlng = latlng;
marker
- .fire('move', { latlng: latlng })
- .fire('drag');
+ .fire('move', {latlng: latlng})
+ .fire('drag');
},
_onDragEnd: function () {
this._marker
- .fire('moveend')
- .fire('dragend');
+ .fire('moveend')
+ .fire('dragend');
}
});
@@ -6361,7 +6691,7 @@ L.Handler.PolyEdit = L.Handler.extend({
initialize: function (poly, options) {
this._poly = poly;
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
},
addHooks: function () {
@@ -6443,7 +6773,7 @@ L.Handler.PolyEdit = L.Handler.extend({
_onMarkerDrag: function (e) {
var marker = e.target;
- L.Util.extend(marker._origLatLng, marker._latlng);
+ L.extend(marker._origLatLng, marker._latlng);
if (marker._middleLeft) {
marker._middleLeft.setLatLng(this._getMiddleLatLng(marker._prev, marker));
@@ -6456,36 +6786,40 @@ L.Handler.PolyEdit = L.Handler.extend({
},
_onMarkerClick: function (e) {
- // Default action on marker click is to remove that marker, but if we remove the marker when latlng count < 3, we don't have a valid polyline anymore
- if (this._poly._latlngs.length < 3) {
- return;
- }
+ // we want to remove the marker on click, but if latlng count < 3, polyline would be invalid
+ if (this._poly._latlngs.length < 3) { return; }
var marker = e.target,
i = marker._index;
- // Check existence of previous and next markers since they wouldn't exist for edge points on the polyline
- if (marker._prev && marker._next) {
- this._createMiddleMarker(marker._prev, marker._next);
- } else if (!marker._prev) {
- marker._next._middleLeft = null;
- } else if (!marker._next) {
- marker._prev._middleRight = null;
- }
+ // remove the marker
+ this._markerGroup.removeLayer(marker);
+ this._markers.splice(i, 1);
+ this._poly.spliceLatLngs(i, 1);
+ this._updateIndexes(i, -1);
+
+ // update prev/next links of adjacent markers
this._updatePrevNext(marker._prev, marker._next);
- // The marker itself is guaranteed to exist and present in the layer, since we managed to click on it
- this._markerGroup.removeLayer(marker);
- // Check for the existence of middle left or middle right
+ // remove ghost markers near the removed marker
if (marker._middleLeft) {
this._markerGroup.removeLayer(marker._middleLeft);
}
if (marker._middleRight) {
this._markerGroup.removeLayer(marker._middleRight);
}
- this._markers.splice(i, 1);
- this._poly.spliceLatLngs(i, 1);
- this._updateIndexes(i, -1);
+
+ // create a ghost marker in place of the removed one
+ if (marker._prev && marker._next) {
+ this._createMiddleMarker(marker._prev, marker._next);
+
+ } else if (!marker._prev) {
+ marker._next._middleLeft = null;
+
+ } else if (!marker._next) {
+ marker._prev._middleRight = null;
+ }
+
this._poly.fire('edit');
},
@@ -6499,10 +6833,10 @@ L.Handler.PolyEdit = L.Handler.extend({
_createMiddleMarker: function (marker1, marker2) {
var latlng = this._getMiddleLatLng(marker1, marker2),
- marker = this._createMarker(latlng),
- onClick,
- onDragStart,
- onDragEnd;
+ marker = this._createMarker(latlng),
+ onClick,
+ onDragStart,
+ onDragEnd;
marker.setOpacity(0.6);
@@ -6514,8 +6848,8 @@ L.Handler.PolyEdit = L.Handler.extend({
marker._index = i;
marker
- .off('click', onClick)
- .on('click', this._onMarkerClick, this);
+ .off('click', onClick)
+ .on('click', this._onMarkerClick, this);
latlng.lat = marker.getLatLng().lat;
latlng.lng = marker.getLatLng().lng;
@@ -6545,9 +6879,9 @@ L.Handler.PolyEdit = L.Handler.extend({
};
marker
- .on('click', onClick, this)
- .on('dragstart', onDragStart, this)
- .on('dragend', onDragEnd, this);
+ .on('click', onClick, this)
+ .on('dragstart', onDragStart, this)
+ .on('dragend', onDragEnd, this);
this._markerGroup.addLayer(marker);
},
@@ -6578,7 +6912,7 @@ L.Control = L.Class.extend({
},
initialize: function (options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
},
getPosition: function () {
@@ -6606,7 +6940,7 @@ L.Control = L.Class.extend({
var container = this._container = this.onAdd(map),
pos = this.getPosition(),
- corner = map._controlCorners[pos];
+ corner = map._controlCorners[pos];
L.DomUtil.addClass(container, 'leaflet-control');
@@ -6621,7 +6955,7 @@ L.Control = L.Class.extend({
removeFrom: function (map) {
var pos = this.getPosition(),
- corner = map._controlCorners[pos];
+ corner = map._controlCorners[pos];
corner.removeChild(this._container);
this._map = null;
@@ -6654,13 +6988,12 @@ L.Map.include({
var corners = this._controlCorners = {},
l = 'leaflet-',
container = this._controlContainer =
- L.DomUtil.create('div', l + 'control-container', this._container);
+ L.DomUtil.create('div', l + 'control-container', this._container);
function createCorner(vSide, hSide) {
var className = l + vSide + ' ' + l + hSide;
- corners[vSide + hSide] =
- L.DomUtil.create('div', className, container);
+ corners[vSide + hSide] = L.DomUtil.create('div', className, container);
}
createCorner('top', 'left');
@@ -6702,11 +7035,11 @@ L.Control.Zoom = L.Control.extend({
link.title = title;
L.DomEvent
- .on(link, 'click', L.DomEvent.stopPropagation)
- .on(link, 'mousedown', L.DomEvent.stopPropagation)
- .on(link, 'dblclick', L.DomEvent.stopPropagation)
- .on(link, 'click', L.DomEvent.preventDefault)
- .on(link, 'click', fn, context);
+ .on(link, 'click', L.DomEvent.stopPropagation)
+ .on(link, 'mousedown', L.DomEvent.stopPropagation)
+ .on(link, 'dblclick', L.DomEvent.stopPropagation)
+ .on(link, 'click', L.DomEvent.preventDefault)
+ .on(link, 'click', fn, context);
return link;
}
@@ -6732,11 +7065,11 @@ L.control.zoom = function (options) {
L.Control.Attribution = L.Control.extend({
options: {
position: 'bottomright',
- prefix: 'Powered by Leaflet'
+ prefix: 'Powered by Leaflet'
},
initialize: function (options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
this._attributions = {};
},
@@ -6746,8 +7079,8 @@ L.Control.Attribution = L.Control.extend({
L.DomEvent.disableClickPropagation(this._container);
map
- .on('layeradd', this._onLayerAdd, this)
- .on('layerremove', this._onLayerRemove, this);
+ .on('layeradd', this._onLayerAdd, this)
+ .on('layerremove', this._onLayerRemove, this);
this._update();
@@ -6756,8 +7089,8 @@ L.Control.Attribution = L.Control.extend({
onRemove: function (map) {
map
- .off('layeradd', this._onLayerAdd)
- .off('layerremove', this._onLayerRemove);
+ .off('layeradd', this._onLayerAdd)
+ .off('layerremove', this._onLayerRemove);
},
@@ -6913,8 +7246,8 @@ L.Control.Scale = L.Control.extend({
_updateImperial: function (maxMeters) {
var maxFeet = maxMeters * 3.2808399,
- scale = this._iScale,
- maxMiles, miles, feet;
+ scale = this._iScale,
+ maxMiles, miles, feet;
if (maxFeet > 5280) {
maxMiles = maxFeet / 5280;
@@ -6958,10 +7291,11 @@ L.Control.Layers = L.Control.extend({
},
initialize: function (baseLayers, overlays, options) {
- L.Util.setOptions(this, options);
+ L.setOptions(this, options);
this._layers = {};
this._lastZIndex = 0;
+ this._handlingClick = false;
for (var i in baseLayers) {
if (baseLayers.hasOwnProperty(i)) {
@@ -6980,9 +7314,19 @@ L.Control.Layers = L.Control.extend({
this._initLayout();
this._update();
+ map
+ .on('layeradd', this._update, this)
+ .on('layerremove', this._update, this);
+
return this._container;
},
+ onRemove: function (map) {
+ map
+ .off('layeradd', this._update)
+ .off('layerremove', this._update);
+ },
+
addBaseLayer: function (layer, name) {
this._addLayer(layer, name);
this._update();
@@ -6996,7 +7340,7 @@ L.Control.Layers = L.Control.extend({
},
removeLayer: function (layer) {
- var id = L.Util.stamp(layer);
+ var id = L.stamp(layer);
delete this._layers[id];
this._update();
return this;
@@ -7016,8 +7360,8 @@ L.Control.Layers = L.Control.extend({
if (this.options.collapsed) {
L.DomEvent
- .on(container, 'mouseover', this._expand, this)
- .on(container, 'mouseout', this._collapse, this);
+ .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 = '#';
@@ -7025,9 +7369,9 @@ L.Control.Layers = L.Control.extend({
if (L.Browser.touch) {
L.DomEvent
- .on(link, 'click', L.DomEvent.stopPropagation)
- .on(link, 'click', L.DomEvent.preventDefault)
- .on(link, 'click', this._expand, this);
+ .on(link, 'click', L.DomEvent.stopPropagation)
+ .on(link, 'click', L.DomEvent.preventDefault)
+ .on(link, 'click', this._expand, this);
}
else {
L.DomEvent.on(link, 'focus', this._expand, this);
@@ -7047,7 +7391,7 @@ L.Control.Layers = L.Control.extend({
},
_addLayer: function (layer, name, overlay) {
- var id = L.Util.stamp(layer);
+ var id = L.stamp(layer);
this._layers[id] = {
layer: layer,
@@ -7062,7 +7406,7 @@ L.Control.Layers = L.Control.extend({
},
_update: function () {
- if (!this._container) {
+ if (!this._container || this._handlingClick) {
return;
}
@@ -7070,7 +7414,7 @@ L.Control.Layers = L.Control.extend({
this._overlaysList.innerHTML = '';
var baseLayersPresent = false,
- overlaysPresent = false;
+ overlaysPresent = false;
for (var i in this._layers) {
if (this._layers.hasOwnProperty(i)) {
@@ -7113,7 +7457,7 @@ L.Control.Layers = L.Control.extend({
input = this._createRadioElement('leaflet-base-layers', checked);
}
- input.layerId = L.Util.stamp(obj.layer);
+ input.layerId = L.stamp(obj.layer);
L.DomEvent.on(input, 'click', this._onInputClick, this);
@@ -7129,9 +7473,11 @@ L.Control.Layers = L.Control.extend({
_onInputClick: function () {
var i, input, obj,
- inputs = this._form.getElementsByTagName('input'),
- inputsLen = inputs.length,
- baseLayer;
+ inputs = this._form.getElementsByTagName('input'),
+ inputsLen = inputs.length,
+ baseLayer;
+
+ this._handlingClick = true;
for (i = 0; i < inputsLen; i++) {
input = inputs[i];
@@ -7150,6 +7496,8 @@ L.Control.Layers = L.Control.extend({
if (baseLayer) {
this._map.fire('baselayerchange', {layer: baseLayer});
}
+
+ this._handlingClick = false;
},
_expand: function () {
@@ -7173,7 +7521,7 @@ L.control.layers = function (baseLayers, overlays, options) {
L.PosAnimation = L.Class.extend({
includes: L.Mixin.Events,
- run: function (el, newPos, duration, easing) { // (HTMLElement, Point[, Number, String])
+ run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])
this.stop();
this._el = el;
@@ -7181,7 +7529,8 @@ L.PosAnimation = L.Class.extend({
this.fire('start');
- el.style[L.DomUtil.TRANSITION] = 'all ' + (duration || 0.25) + 's ' + (easing || 'ease-out');
+ el.style[L.DomUtil.TRANSITION] = 'all ' + (duration || 0.25) +
+ 's cubic-bezier(0,0,' + (easeLinearity || 0.5) + ',1)';
L.DomEvent.on(el, L.DomUtil.TRANSITION_END, this._onTransitionEnd, this);
L.DomUtil.setPosition(el, newPos);
@@ -7190,7 +7539,7 @@ L.PosAnimation = L.Class.extend({
L.Util.falseFn(el.offsetWidth);
// there's no native way to track value updates of tranisitioned properties, so we imitate this
- this._stepTimer = setInterval(L.Util.bind(this.fire, this, 'step'), 50);
+ this._stepTimer = setInterval(L.bind(this.fire, this, 'step'), 50);
},
stop: function () {
@@ -7201,6 +7550,7 @@ L.PosAnimation = L.Class.extend({
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
},
// you can't easily get intermediate values of properties animated with CSS3 Transitions,
@@ -7210,8 +7560,8 @@ L.PosAnimation = L.Class.extend({
_getPos: function () {
var left, top, matches,
- el = this._el,
- style = window.getComputedStyle(el);
+ el = this._el,
+ style = window.getComputedStyle(el);
if (L.Browser.any3d) {
matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);
@@ -7256,8 +7606,8 @@ L.Map.include({
}
var done = (zoomChanged ?
- this._zoomToIfClose && this._zoomToIfClose(center, zoom) :
- this._panByIfClose(center));
+ this._zoomToIfClose && this._zoomToIfClose(center, zoom) :
+ this._panByIfClose(center));
// exit if animated pan or zoom started
if (done) {
@@ -7272,7 +7622,7 @@ L.Map.include({
return this;
},
- panBy: function (offset, duration) {
+ panBy: function (offset, duration, easeLinearity) {
offset = L.point(offset);
if (!(offset.x || offset.y)) {
@@ -7293,7 +7643,7 @@ L.Map.include({
L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim');
var newPos = L.DomUtil.getPosition(this._mapPane).subtract(offset);
- this._panAnim.run(this._mapPane, newPos, duration || 0.25);
+ this._panAnim.run(this._mapPane, newPos, duration || 0.25, easeLinearity);
return this;
},
@@ -7320,10 +7670,10 @@ L.Map.include({
_offsetIsWithinView: function (offset, multiplyFactor) {
var m = multiplyFactor || 1,
- size = this.getSize();
+ size = this.getSize();
return (Math.abs(offset.x) <= size.x * m) &&
- (Math.abs(offset.y) <= size.y * m);
+ (Math.abs(offset.y) <= size.y * m);
}
});
@@ -7335,13 +7685,13 @@ L.Map.include({
L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
- run: function (el, newPos, duration, easing) { // (HTMLElement, Point[, Number, String])
+ run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])
this.stop();
this._el = el;
this._inProgress = true;
this._duration = duration || 0.25;
- this._ease = this._easings[easing || 'ease-out'];
+ this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
this._startPos = L.DomUtil.getPosition(el);
this._offset = newPos.subtract(this._startPos);
@@ -7367,10 +7717,10 @@ L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
_step: function () {
var elapsed = (+new Date()) - this._startTime,
- duration = this._duration * 1000;
+ duration = this._duration * 1000;
if (elapsed < duration) {
- this._runFrame(this._ease(elapsed / duration));
+ this._runFrame(this._easeOut(elapsed / duration));
} else {
this._runFrame(1);
this._complete();
@@ -7391,12 +7741,9 @@ L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
this.fire('end');
},
- // easing functions, they map time progress to movement progress
- _easings: {
- 'ease-out': function (t) { return t * (2 - t); },
- 'linear': function (t) { return t; }
+ _easeOut: function (t) {
+ return 1 - Math.pow(1 - t, this._easeOutPower);
}
-
});
@@ -7419,7 +7766,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
if (!this.options.zoomAnimation) { return false; }
var scale = this.getZoomScale(zoom),
- offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale);
+ offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale);
// if offset does not exceed half of the view
if (!this._offsetIsWithinView(offset, 1)) { return false; }
@@ -7427,8 +7774,8 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
this
- .fire('movestart')
- .fire('zoomstart');
+ .fire('movestart')
+ .fire('zoomstart');
this.fire('zoomanim', {
center: center,
@@ -7459,28 +7806,27 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
}
var transform = L.DomUtil.TRANSFORM,
- tileBg = this._tileBg;
+ tileBg = this._tileBg;
clearTimeout(this._clearTileBgTimer);
L.Util.falseFn(tileBg.offsetWidth); //hack to make sure transform is updated before running animation
var scaleStr = L.DomUtil.getScaleString(scale, origin),
- oldTransform = tileBg.style[transform];
+ oldTransform = tileBg.style[transform];
tileBg.style[transform] = backwardsTransform ?
- oldTransform + ' ' + scaleStr :
- scaleStr + ' ' + oldTransform;
+ oldTransform + ' ' + scaleStr :
+ scaleStr + ' ' + oldTransform;
},
_prepareTileBg: function () {
var tilePane = this._tilePane,
- tileBg = this._tileBg;
+ tileBg = this._tileBg;
// If foreground layer doesn't have many tiles but bg layer does, keep the existing bg layer and just zoom it some more
- if (tileBg &&
- this._getLoadedTilesPercentage(tileBg) > 0.5 &&
- this._getLoadedTilesPercentage(tilePane) < 0.5) {
+ if (tileBg && this._getLoadedTilesPercentage(tileBg) > 0.5 &&
+ this._getLoadedTilesPercentage(tilePane) < 0.5) {
tilePane.style.visibility = 'hidden';
tilePane.empty = true;
@@ -7512,7 +7858,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
_getLoadedTilesPercentage: function (container) {
var tiles = container.getElementsByTagName('img'),
- i, len, count = 0;
+ i, len, count = 0;
for (i = 0, len = tiles.length; i < len; i++) {
if (tiles[i].complete) {
@@ -7525,7 +7871,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
// stops loading all tiles in the background layer
_stopLoadingImages: function (container) {
var tiles = Array.prototype.slice.call(container.getElementsByTagName('img')),
- i, len, tile;
+ i, len, tile;
for (i = 0, len = tiles.length; i < len; i++) {
tile = tiles[i];
@@ -7584,7 +7930,7 @@ L.Map.include({
locate: function (/*Object*/ options) {
- options = this._locationOptions = L.Util.extend(this._defaultLocateOptions, options);
+ options = this._locationOptions = L.extend(this._defaultLocateOptions, options);
if (!navigator.geolocation) {
this._handleGeolocationError({
@@ -7594,11 +7940,12 @@ L.Map.include({
return this;
}
- var onResponse = L.Util.bind(this._handleGeolocationResponse, this),
- onError = L.Util.bind(this._handleGeolocationError, this);
+ var onResponse = L.bind(this._handleGeolocationResponse, this),
+ onError = L.bind(this._handleGeolocationError, this);
if (options.watch) {
- this._locationWatchId = navigator.geolocation.watchPosition(onResponse, onError, options);
+ this._locationWatchId =
+ navigator.geolocation.watchPosition(onResponse, onError, options);
} else {
navigator.geolocation.getCurrentPosition(onResponse, onError, options);
}
@@ -7614,9 +7961,9 @@ L.Map.include({
_handleGeolocationError: function (error) {
var c = error.code,
- message = error.message ||
- (c === 1 ? "permission denied" :
- (c === 2 ? "position unavailable" : "timeout"));
+ message = error.message ||
+ (c === 1 ? "permission denied" :
+ (c === 2 ? "position unavailable" : "timeout"));
if (this._locationOptions.setView && !this._loaded) {
this.fitWorld();
@@ -7630,17 +7977,17 @@ L.Map.include({
_handleGeolocationResponse: function (pos) {
var latAccuracy = 180 * pos.coords.accuracy / 4e7,
- lngAccuracy = latAccuracy * 2,
+ lngAccuracy = latAccuracy * 2,
- lat = pos.coords.latitude,
- lng = pos.coords.longitude,
- latlng = new L.LatLng(lat, lng),
+ lat = pos.coords.latitude,
+ lng = pos.coords.longitude,
+ latlng = new L.LatLng(lat, lng),
- sw = new L.LatLng(lat - latAccuracy, lng - lngAccuracy),
- ne = new L.LatLng(lat + latAccuracy, lng + lngAccuracy),
- bounds = new L.LatLngBounds(sw, ne),
+ sw = new L.LatLng(lat - latAccuracy, lng - lngAccuracy),
+ ne = new L.LatLng(lat + latAccuracy, lng + lngAccuracy),
+ bounds = new L.LatLngBounds(sw, ne),
- options = this._locationOptions;
+ options = this._locationOptions;
if (options.setView) {
var zoom = Math.min(this.getBoundsZoom(bounds), options.maxZoom);
@@ -7658,4 +8005,4 @@ L.Map.include({
-}(this));
\ No newline at end of file
+}(this));