Skip to content

Commit

Permalink
upgrade to latest leaflet (0.7.5)
Browse files Browse the repository at this point in the history 
fixes #206
  • Loading branch information
@tyrasd
tyrasd committed Oct 12, 2015
1 parent 3f57688 commit 88e6749
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 57 deletions.
81 changes: 32 additions & 49 deletions libs/leaflet/leaflet-src.js
View file
Expand Up @@ -7,7 +7,7 @@
var oldL = window.L,
L = {};

L.version = '0.7.3';
L.version = '0.7.5';

// define Leaflet for Node module pattern loaders, including Browserify
if (typeof module === 'object' && typeof module.exports === 'object') {
Expand Down Expand Up @@ -519,8 +519,7 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
gecko = ua.indexOf('gecko') !== -1,

mobile = typeof orientation !== undefined + '',
msPointer = window.navigator && window.navigator.msPointerEnabled &&
window.navigator.msMaxTouchPoints && !window.PointerEvent,
msPointer = !window.PointerEvent && window.MSPointerEvent,
pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) ||
msPointer,
retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
Expand All @@ -534,38 +533,8 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
opera3d = 'OTransition' in doc.style,
any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d) && !phantomjs;


// PhantomJS has 'ontouchstart' in document.documentElement, but doesn't actually support touch.
// https://github.com/Leaflet/Leaflet/pull/1434#issuecomment-13843151

var touch = !window.L_NO_TOUCH && !phantomjs && (function () {

var startName = 'ontouchstart';

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

// Firefox/Gecko
var div = document.createElement('div'),
supported = false;

if (!div.setAttribute) {
return false;
}
div.setAttribute(startName, 'return;');

if (typeof div[startName] === 'function') {
supported = true;
}

div.removeAttribute(startName);
div = null;

return supported;
}());

var touch = !window.L_NO_TOUCH && !phantomjs && (pointer || 'ontouchstart' in window ||
(window.DocumentTouch && document instanceof window.DocumentTouch));

L.Browser = {
ie: ie,
Expand Down Expand Up @@ -1632,15 +1601,16 @@ L.Map = L.Class.extend({
var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]),
paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]),

zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)),
paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));

zoom = (options.maxZoom) ? Math.min(options.maxZoom, zoom) : zoom;

var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),

swPoint = this.project(bounds.getSouthWest(), zoom),
nePoint = this.project(bounds.getNorthEast(), zoom),
center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);

zoom = options && options.maxZoom ? Math.min(options.maxZoom, zoom) : zoom;

return this.setView(center, zoom, options);
},

Expand Down Expand Up @@ -2782,7 +2752,7 @@ L.TileLayer = L.Class.extend({
}

if (options.bounds) {
var tileSize = options.tileSize,
var tileSize = this._getTileSize(),
nwPoint = tilePoint.multiplyBy(tileSize),
sePoint = nwPoint.add([tileSize, tileSize]),
nw = this._map.unproject(nwPoint),
Expand Down Expand Up @@ -3567,10 +3537,8 @@ L.Marker = L.Class.extend({

update: function () {
if (this._icon) {
var pos = this._map.latLngToLayerPoint(this._latlng).round();
this._setPos(pos);
this._setPos(this._map.latLngToLayerPoint(this._latlng).round());
}

return this;
},

Expand All @@ -3593,7 +3561,7 @@ L.Marker = L.Class.extend({
if (options.title) {
icon.title = options.title;
}

if (options.alt) {
icon.alt = options.alt;
}
Expand Down Expand Up @@ -4228,6 +4196,7 @@ L.Marker.include({
if (content instanceof L.Popup) {
L.setOptions(content, options);
this._popup = content;
content._source = this;
} else {
this._popup = new L.Popup(options, this)
.setContent(content);
Expand Down Expand Up @@ -5114,6 +5083,13 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
if (options.fill) {
this._ctx.fillStyle = options.fillColor || options.color;
}

if (options.lineCap) {
this._ctx.lineCap = options.lineCap;
}
if (options.lineJoin) {
this._ctx.lineJoin = options.lineJoin;
}
},

_drawPath: function () {
Expand Down Expand Up @@ -5151,7 +5127,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :

if (options.fill) {
ctx.globalAlpha = options.fillOpacity;
ctx.fill();
ctx.fill(options.fillRule || 'evenodd');
}

if (options.stroke) {
Expand All @@ -5166,15 +5142,14 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :

_initEvents: function () {
if (this.options.clickable) {
// TODO dblclick
this._map.on('mousemove', this._onMouseMove, this);
this._map.on('click', this._onClick, this);
this._map.on('click dblclick contextmenu', this._fireMouseEvent, this);
}
},

_onClick: function (e) {
_fireMouseEvent: function (e) {
if (this._containsPoint(e.layerPoint)) {
this.fire('click', e);
this.fire(e.type, e);
}
},

Expand Down Expand Up @@ -8952,10 +8927,13 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
delta: delta,
backwards: backwards
});
// horrible hack to work around a Chrome bug https://github.com/Leaflet/Leaflet/issues/3689
setTimeout(L.bind(this._onZoomTransitionEnd, this), 250);
}, this);
},

_onZoomTransitionEnd: function () {
if (!this._animatingZoom) { return; }

this._animatingZoom = false;

Expand Down Expand Up @@ -9001,6 +8979,11 @@ L.TileLayer.include({
// force reflow
L.Util.falseFn(bg.offsetWidth);

var zoom = this._map.getZoom();
if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
this._clearBgBuffer();
}

this._animating = false;
},

Expand Down
8 changes: 4 additions & 4 deletions libs/leaflet/leaflet.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions map.html
View file
Expand Up @@ -10,8 +10,8 @@
<!--lodash-->
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.js"></script>
<!--leaflet-->
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.5/leaflet.css" />
<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.5/leaflet.js"></script>
<!--leaflet extensions-->
<script src="js/GeoJsonNoVanish.js"></script>
<script src="js/OSM4Leaflet.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions map_packaged.html
View file
Expand Up @@ -10,8 +10,8 @@
<!--lodash-->
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.js"></script>
<!--leaflet-->
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.5/leaflet.css" />
<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.5/leaflet.js"></script>
<!--own scripts and styles-->
<link rel="stylesheet" href="css/map.css" />
<script src="turbo.map.min.js"></script>
Expand Down

0 comments on commit 88e6749

Please sign in to comment.