Fix initializing map in a non-empty div, close #278
This commit is contained in:
Mourner
parent
40c974ee8c
commit
b0205094c1
@ -53,6 +53,7 @@ Leaflet Changelog
|
||||
* Fixed a bug related to clearing background tiles after zooming (by [@neno-giscloud](https://github.com/neno-giscloud) & [@dravnic](https://github.com/dravnic)).
|
||||
* Fixed a bug related to cleaning up after removing tile layers (by [@dravnic](https://github.com/dravnic)). [#276](https://github.com/CloudMade/Leaflet/pull/276)
|
||||
* Fixed a bug that made selecting text in the attribution control impossible. [#279](https://github.com/CloudMade/Leaflet/issues/279)
|
||||
* Fixed a bug when initializing a map in a non-empty div. [#278](https://github.com/CloudMade/Leaflet/issues/278)
|
||||
|
||||
#### Browser bugfixes
|
||||
|
||||
|
||||
6
dist/leaflet.js
vendored
6
dist/leaflet.js
vendored
@ -109,9 +109,9 @@ this._layers},invalidateSize:function(){var a=this.getSize();this._sizeChanged=!
|
||||
a.max.y)),a=this.unproject(new L.Point(a.max.x,a.min.y));return new L.LatLngBounds(b,a)},getMinZoom:function(){return isNaN(this.options.minZoom)?this._layersMinZoom||0:this.options.minZoom},getMaxZoom:function(){return isNaN(this.options.maxZoom)?this._layersMaxZoom||Infinity:this.options.maxZoom},getBoundsZoom:function(a){var b=this.getSize(),c=this.getMinZoom(),d=this.getMaxZoom(),e=a.getNorthEast(),a=a.getSouthWest(),f,g;do c++,f=this.project(e,c),g=this.project(a,c),f=new L.Point(f.x-g.x,g.y-
|
||||
f.y);while(f.x<=b.x&&f.y<=b.y&&c<=d);return c-1},getSize:function(){if(!this._size||this._sizeChanged)this._size=new L.Point(this._container.clientWidth,this._container.clientHeight),this._sizeChanged=!1;return this._size},getPixelBounds:function(){var a=this._getTopLeftPoint(),b=this.getSize();return new L.Bounds(a,a.add(b))},getPixelOrigin:function(){return this._initialTopLeftPoint},getPanes:function(){return this._panes},mouseEventToContainerPoint:function(a){return L.DomEvent.getMousePosition(a,
|
||||
this._container)},mouseEventToLayerPoint:function(a){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(a))},mouseEventToLatLng:function(a){return this.layerPointToLatLng(this.mouseEventToLayerPoint(a))},containerPointToLayerPoint:function(a){return a.subtract(L.DomUtil.getPosition(this._mapPane))},layerPointToContainerPoint:function(a){return a.add(L.DomUtil.getPosition(this._mapPane))},layerPointToLatLng:function(a){return this.unproject(a.add(this._initialTopLeftPoint))},latLngToLayerPoint:function(a){return this.project(a)._round()._subtract(this._initialTopLeftPoint)},
|
||||
project:function(a,b){b=typeof b=="undefined"?this._zoom:b;return this.options.crs.latLngToPoint(a,this.options.scale(b))},unproject:function(a,b,c){b=typeof b=="undefined"?this._zoom:b;return this.options.crs.pointToLatLng(a,this.options.scale(b),c)},_initLayout:function(){var a=this._container;a.className+=" leaflet-container";this.options.fadeAnimation&&(a.className+=" leaflet-fade-anim");var b=L.DomUtil.getStyle(a,"position");if(b!="absolute"&&b!="relative")a.style.position="relative";this._initPanes();
|
||||
this._initControlPos&&this._initControlPos()},_initPanes:function(){var a=this._panes={};this._mapPane=a.mapPane=this._createPane("leaflet-map-pane",this._container);this._tilePane=a.tilePane=this._createPane("leaflet-tile-pane",this._mapPane);this._objectsPane=a.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane);a.shadowPane=this._createPane("leaflet-shadow-pane");a.overlayPane=this._createPane("leaflet-overlay-pane");a.markerPane=this._createPane("leaflet-marker-pane");a.popupPane=
|
||||
this._createPane("leaflet-popup-pane")},_createPane:function(a,b){return L.DomUtil.create("div",a,b||this._objectsPane)},_resetView:function(a,b,c){var d=this._zoom!=b;this.fire("movestart");this._zoom=b;this._initialTopLeftPoint=this._getNewTopLeftPoint(a);c?this._initialTopLeftPoint._add(L.DomUtil.getPosition(this._mapPane)):L.DomUtil.setPosition(this._mapPane,new L.Point(0,0));this._tileLayersToLoad=this._tileLayersNum;this.fire("viewreset",{hard:!c});this.fire("move");d&&this.fire("zoomend");
|
||||
project:function(a,b){b=typeof b=="undefined"?this._zoom:b;return this.options.crs.latLngToPoint(a,this.options.scale(b))},unproject:function(a,b,c){b=typeof b=="undefined"?this._zoom:b;return this.options.crs.pointToLatLng(a,this.options.scale(b),c)},_initLayout:function(){var a=this._container;a.innerHTML="";a.className+=" leaflet-container";this.options.fadeAnimation&&(a.className+=" leaflet-fade-anim");var b=L.DomUtil.getStyle(a,"position");if(b!="absolute"&&b!="relative")a.style.position="relative";
|
||||
this._initPanes();this._initControlPos&&this._initControlPos()},_initPanes:function(){var a=this._panes={};this._mapPane=a.mapPane=this._createPane("leaflet-map-pane",this._container);this._tilePane=a.tilePane=this._createPane("leaflet-tile-pane",this._mapPane);this._objectsPane=a.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane);a.shadowPane=this._createPane("leaflet-shadow-pane");a.overlayPane=this._createPane("leaflet-overlay-pane");a.markerPane=this._createPane("leaflet-marker-pane");
|
||||
a.popupPane=this._createPane("leaflet-popup-pane")},_createPane:function(a,b){return L.DomUtil.create("div",a,b||this._objectsPane)},_resetView:function(a,b,c){var d=this._zoom!=b;this.fire("movestart");this._zoom=b;this._initialTopLeftPoint=this._getNewTopLeftPoint(a);c?this._initialTopLeftPoint._add(L.DomUtil.getPosition(this._mapPane)):L.DomUtil.setPosition(this._mapPane,new L.Point(0,0));this._tileLayersToLoad=this._tileLayersNum;this.fire("viewreset",{hard:!c});this.fire("move");d&&this.fire("zoomend");
|
||||
this.fire("moveend");if(!this._loaded)this._loaded=!0,this.fire("load")},_initLayers:function(a){this._layers={};for(var b=0,c=a.length;b<c;b++)this.addLayer(a[b])},_initControls:function(){this.options.zoomControl&&this.addControl(new L.Control.Zoom);if(this.options.attributionControl)this.attributionControl=new L.Control.Attribution,this.addControl(this.attributionControl)},_rawPanBy:function(a){var b=L.DomUtil.getPosition(this._mapPane);L.DomUtil.setPosition(this._mapPane,b.subtract(a))},_initEvents:function(){L.DomEvent.addListener(this._container,
|
||||
"click",this._onMouseClick,this);for(var a=["dblclick","mousedown","mouseenter","mouseleave","mousemove"],b=0;b<a.length;b++)L.DomEvent.addListener(this._container,a[b],this._fireMouseEvent,this);this.options.trackResize&&L.DomEvent.addListener(window,"resize",this._onResize,this)},_onResize:function(){L.Util.requestAnimFrame(this.invalidateSize,this,!1,this._container)},_onMouseClick:function(a){if(!this.dragging||!this.dragging.moved())this.fire("pre"+a.type),this._fireMouseEvent(a)},_fireMouseEvent:function(a){var b=
|
||||
a.type,b=b=="mouseenter"?"mouseover":b=="mouseleave"?"mouseout":b;this.hasEventListeners(b)&&this.fire(b,{latlng:this.mouseEventToLatLng(a),layerPoint:this.mouseEventToLayerPoint(a)})},_initInteraction:function(){var a={dragging:L.Handler.MapDrag,touchZoom:L.Handler.TouchZoom,doubleClickZoom:L.Handler.DoubleClickZoom,scrollWheelZoom:L.Handler.ScrollWheelZoom,shiftDragZoom:L.Handler.ShiftDragZoom},b;for(b in a)a.hasOwnProperty(b)&&a[b]&&(this[b]=new a[b](this),this.options[b]&&this[b].enable())},_onTileLayerLoad:function(){this._tileLayersToLoad--;
|
||||
|
||||
222
src/map/Map.js
222
src/map/Map.js
@ -4,56 +4,56 @@
|
||||
|
||||
L.Map = L.Class.extend({
|
||||
includes: L.Mixin.Events,
|
||||
|
||||
|
||||
options: {
|
||||
// projection
|
||||
crs: L.CRS.EPSG3857 || L.CRS.EPSG4326,
|
||||
scale: function(zoom) { return 256 * (1 << zoom); },
|
||||
|
||||
|
||||
// state
|
||||
center: null,
|
||||
zoom: null,
|
||||
layers: [],
|
||||
|
||||
|
||||
// interaction
|
||||
dragging: true,
|
||||
touchZoom: L.Browser.touch && !L.Browser.android,
|
||||
scrollWheelZoom: !L.Browser.touch,
|
||||
doubleClickZoom: true,
|
||||
shiftDragZoom: true,
|
||||
|
||||
|
||||
// controls
|
||||
zoomControl: true,
|
||||
attributionControl: true,
|
||||
|
||||
|
||||
// animation
|
||||
fadeAnimation: L.DomUtil.TRANSITION && !L.Browser.android,
|
||||
zoomAnimation: L.DomUtil.TRANSITION && !L.Browser.android && !L.Browser.mobileOpera,
|
||||
|
||||
|
||||
// misc
|
||||
trackResize: true,
|
||||
closePopupOnClick: true
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
// constructor
|
||||
|
||||
|
||||
initialize: function(/*HTMLElement or String*/ id, /*Object*/ options) {
|
||||
L.Util.setOptions(this, options);
|
||||
|
||||
|
||||
this._container = L.DomUtil.get(id);
|
||||
|
||||
|
||||
this._initLayout();
|
||||
|
||||
if (L.DomEvent) {
|
||||
this._initEvents();
|
||||
|
||||
if (L.DomEvent) {
|
||||
this._initEvents();
|
||||
if (L.Handler) { this._initInteraction(); }
|
||||
if (L.Control) { this._initControls(); }
|
||||
}
|
||||
|
||||
|
||||
var center = this.options.center,
|
||||
zoom = this.options.zoom;
|
||||
|
||||
|
||||
if (center !== null && zoom !== null) {
|
||||
this.setView(center, zoom, true);
|
||||
}
|
||||
@ -63,63 +63,63 @@ L.Map = L.Class.extend({
|
||||
this._tileLayersNum = 0;
|
||||
this._initLayers(layers);
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
// public methods that modify map state
|
||||
|
||||
|
||||
// replaced by animation-powered implementation in Map.PanAnimation.js
|
||||
setView: function(center, zoom, forceReset) {
|
||||
// reset the map view
|
||||
// reset the map view
|
||||
this._resetView(center, this._limitZoom(zoom));
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
setZoom: function(/*Number*/ zoom) {
|
||||
return this.setView(this.getCenter(), zoom);
|
||||
},
|
||||
|
||||
|
||||
zoomIn: function() {
|
||||
return this.setZoom(this._zoom + 1);
|
||||
},
|
||||
|
||||
|
||||
zoomOut: function() {
|
||||
return this.setZoom(this._zoom - 1);
|
||||
},
|
||||
|
||||
|
||||
fitBounds: function(/*LatLngBounds*/ bounds) {
|
||||
var zoom = this.getBoundsZoom(bounds);
|
||||
return this.setView(bounds.getCenter(), zoom);
|
||||
},
|
||||
|
||||
|
||||
fitWorld: function() {
|
||||
var sw = new L.LatLng(-60, -170),
|
||||
ne = new L.LatLng(85, 179);
|
||||
return this.fitBounds(new L.LatLngBounds(sw, ne));
|
||||
},
|
||||
|
||||
|
||||
panTo: function(/*LatLng*/ center) {
|
||||
return this.setView(center, this._zoom);
|
||||
},
|
||||
|
||||
|
||||
panBy: function(/*Point*/ offset) {
|
||||
// replaced with animated panBy in Map.Animation.js
|
||||
this.fire('movestart');
|
||||
|
||||
|
||||
this._rawPanBy(offset);
|
||||
|
||||
|
||||
this.fire('move');
|
||||
this.fire('moveend');
|
||||
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
addLayer: function(layer, insertAtTheTop) {
|
||||
var id = L.Util.stamp(layer);
|
||||
|
||||
|
||||
if (this._layers[id]) return this;
|
||||
|
||||
|
||||
this._layers[id] = layer;
|
||||
|
||||
|
||||
if (layer.options && !isNaN(layer.options.maxZoom)) {
|
||||
this._layersMaxZoom = Math.max(this._layersMaxZoom || 0, layer.options.maxZoom);
|
||||
}
|
||||
@ -127,7 +127,7 @@ L.Map = L.Class.extend({
|
||||
this._layersMinZoom = Math.min(this._layersMinZoom || Infinity, layer.options.minZoom);
|
||||
}
|
||||
//TODO getMaxZoom, getMinZoom in ILayer (instead of options)
|
||||
|
||||
|
||||
if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
|
||||
this._tileLayersNum++;
|
||||
layer.on('load', this._onTileLayerLoad, this);
|
||||
@ -135,28 +135,28 @@ L.Map = L.Class.extend({
|
||||
if (this.attributionControl && layer.getAttribution) {
|
||||
this.attributionControl.addAttribution(layer.getAttribution());
|
||||
}
|
||||
|
||||
|
||||
var onMapLoad = function() {
|
||||
layer.onAdd(this, insertAtTheTop);
|
||||
this.fire('layeradd', {layer: layer});
|
||||
};
|
||||
|
||||
|
||||
if (this._loaded) {
|
||||
onMapLoad.call(this);
|
||||
} else {
|
||||
this.on('load', onMapLoad, this);
|
||||
}
|
||||
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
removeLayer: function(layer) {
|
||||
var id = L.Util.stamp(layer);
|
||||
|
||||
|
||||
if (this._layers[id]) {
|
||||
layer.onRemove(this);
|
||||
delete this._layers[id];
|
||||
|
||||
|
||||
if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
|
||||
this._tileLayersNum--;
|
||||
layer.off('load', this._onTileLayerLoad, this);
|
||||
@ -164,80 +164,80 @@ L.Map = L.Class.extend({
|
||||
if (this.attributionControl && layer.getAttribution) {
|
||||
this.attributionControl.removeAttribution(layer.getAttribution());
|
||||
}
|
||||
|
||||
|
||||
this.fire('layerremove', {layer: layer});
|
||||
}
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
hasLayer: function(layer) {
|
||||
var id = L.Util.stamp(layer);
|
||||
|
||||
|
||||
return (id in this._layers);
|
||||
},
|
||||
|
||||
|
||||
invalidateSize: function() {
|
||||
var oldSize = this.getSize();
|
||||
this._sizeChanged = true;
|
||||
this._rawPanBy(oldSize.subtract(this.getSize()).divideBy(2));
|
||||
|
||||
|
||||
this.fire('move');
|
||||
|
||||
|
||||
clearTimeout(this._sizeTimer);
|
||||
this._sizeTimer = setTimeout(L.Util.bind(function() {
|
||||
this.fire('moveend');
|
||||
}, this), 200);
|
||||
}, this), 200);
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
// public methods for getting map state
|
||||
|
||||
|
||||
|
||||
// public methods for getting map state
|
||||
|
||||
getCenter: function(/*Boolean*/ unbounded) {
|
||||
var viewHalf = this.getSize().divideBy(2),
|
||||
centerPoint = this._getTopLeftPoint().add(viewHalf);
|
||||
return this.unproject(centerPoint, this._zoom, unbounded);
|
||||
},
|
||||
|
||||
|
||||
getZoom: function() {
|
||||
return this._zoom;
|
||||
},
|
||||
|
||||
|
||||
getBounds: function() {
|
||||
var bounds = this.getPixelBounds(),
|
||||
sw = this.unproject(new L.Point(bounds.min.x, bounds.max.y)),
|
||||
ne = this.unproject(new L.Point(bounds.max.x, bounds.min.y));
|
||||
return new L.LatLngBounds(sw, ne);
|
||||
},
|
||||
|
||||
|
||||
getMinZoom: function() {
|
||||
return isNaN(this.options.minZoom) ? this._layersMinZoom || 0 : this.options.minZoom;
|
||||
},
|
||||
|
||||
|
||||
getMaxZoom: function() {
|
||||
return isNaN(this.options.maxZoom) ? this._layersMaxZoom || Infinity : this.options.maxZoom;
|
||||
},
|
||||
|
||||
|
||||
getBoundsZoom: function(/*LatLngBounds*/ bounds) {
|
||||
var size = this.getSize(),
|
||||
zoom = this.getMinZoom(),
|
||||
maxZoom = this.getMaxZoom(),
|
||||
ne = bounds.getNorthEast(),
|
||||
sw = bounds.getSouthWest(),
|
||||
boundsSize,
|
||||
boundsSize,
|
||||
nePoint, swPoint;
|
||||
do {
|
||||
zoom++;
|
||||
nePoint = this.project(ne, zoom);
|
||||
swPoint = this.project(sw, zoom);
|
||||
boundsSize = new L.Point(nePoint.x - swPoint.x, swPoint.y - nePoint.y);
|
||||
} while ((boundsSize.x <= size.x) &&
|
||||
} while ((boundsSize.x <= size.x) &&
|
||||
(boundsSize.y <= size.y) && (zoom <= maxZoom));
|
||||
|
||||
|
||||
return zoom - 1;
|
||||
},
|
||||
|
||||
|
||||
getSize: function() {
|
||||
if (!this._size || this._sizeChanged) {
|
||||
this._size = new L.Point(this._container.clientWidth, this._container.clientHeight);
|
||||
@ -251,42 +251,42 @@ L.Map = L.Class.extend({
|
||||
size = this.getSize();
|
||||
return new L.Bounds(topLeftPoint, topLeftPoint.add(size));
|
||||
},
|
||||
|
||||
|
||||
getPixelOrigin: function() {
|
||||
return this._initialTopLeftPoint;
|
||||
},
|
||||
|
||||
|
||||
getPanes: function() {
|
||||
return this._panes;
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
// conversion methods
|
||||
|
||||
|
||||
mouseEventToContainerPoint: function(/*MouseEvent*/ e) {
|
||||
return L.DomEvent.getMousePosition(e, this._container);
|
||||
},
|
||||
|
||||
|
||||
mouseEventToLayerPoint: function(/*MouseEvent*/ e) {
|
||||
return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));
|
||||
},
|
||||
|
||||
|
||||
mouseEventToLatLng: function(/*MouseEvent*/ e) {
|
||||
return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
|
||||
},
|
||||
|
||||
|
||||
containerPointToLayerPoint: function(/*Point*/ point) {
|
||||
return point.subtract(L.DomUtil.getPosition(this._mapPane));
|
||||
},
|
||||
|
||||
|
||||
layerPointToContainerPoint: function(/*Point*/ point) {
|
||||
return point.add(L.DomUtil.getPosition(this._mapPane));
|
||||
},
|
||||
|
||||
|
||||
layerPointToLatLng: function(/*Point*/ point) {
|
||||
return this.unproject(point.add(this._initialTopLeftPoint));
|
||||
},
|
||||
|
||||
|
||||
latLngToLayerPoint: function(/*LatLng*/ latlng) {
|
||||
return this.project(latlng)._round()._subtract(this._initialTopLeftPoint);
|
||||
},
|
||||
@ -295,88 +295,90 @@ L.Map = L.Class.extend({
|
||||
zoom = (typeof zoom == 'undefined' ? this._zoom : zoom);
|
||||
return this.options.crs.latLngToPoint(latlng, this.options.scale(zoom));
|
||||
},
|
||||
|
||||
|
||||
unproject: function(/*Point*/ point, /*(optional) Number*/ zoom, /*(optional) Boolean*/ unbounded)/*-> Object*/ {
|
||||
zoom = (typeof zoom == 'undefined' ? this._zoom : zoom);
|
||||
return this.options.crs.pointToLatLng(point, this.options.scale(zoom), unbounded);
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
// private methods that modify map state
|
||||
|
||||
|
||||
_initLayout: function() {
|
||||
var container = this._container;
|
||||
|
||||
|
||||
container.innerHTML = '';
|
||||
|
||||
container.className += ' leaflet-container';
|
||||
|
||||
|
||||
if (this.options.fadeAnimation) {
|
||||
container.className += ' leaflet-fade-anim';
|
||||
}
|
||||
|
||||
|
||||
var position = L.DomUtil.getStyle(container, 'position');
|
||||
if (position != 'absolute' && position != 'relative') {
|
||||
container.style.position = 'relative';
|
||||
}
|
||||
|
||||
|
||||
this._initPanes();
|
||||
|
||||
|
||||
if (this._initControlPos) this._initControlPos();
|
||||
},
|
||||
|
||||
|
||||
_initPanes: function() {
|
||||
var panes = this._panes = {};
|
||||
|
||||
|
||||
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.shadowPane = this._createPane('leaflet-shadow-pane');
|
||||
panes.overlayPane = this._createPane('leaflet-overlay-pane');
|
||||
panes.markerPane = this._createPane('leaflet-marker-pane');
|
||||
panes.popupPane = this._createPane('leaflet-popup-pane');
|
||||
},
|
||||
|
||||
|
||||
_createPane: function(className, container) {
|
||||
return L.DomUtil.create('div', className, container || this._objectsPane);
|
||||
},
|
||||
|
||||
|
||||
_resetView: function(center, zoom, preserveMapOffset) {
|
||||
var zoomChanged = (this._zoom != zoom);
|
||||
|
||||
|
||||
this.fire('movestart');
|
||||
|
||||
|
||||
this._zoom = zoom;
|
||||
|
||||
|
||||
this._initialTopLeftPoint = this._getNewTopLeftPoint(center);
|
||||
|
||||
|
||||
if (!preserveMapOffset) {
|
||||
L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
|
||||
} else {
|
||||
var offset = L.DomUtil.getPosition(this._mapPane);
|
||||
this._initialTopLeftPoint._add(offset);
|
||||
}
|
||||
|
||||
|
||||
this._tileLayersToLoad = this._tileLayersNum;
|
||||
this.fire('viewreset', {hard: !preserveMapOffset});
|
||||
|
||||
this.fire('move');
|
||||
if (zoomChanged) { this.fire('zoomend'); }
|
||||
this.fire('moveend');
|
||||
|
||||
|
||||
if (!this._loaded) {
|
||||
this._loaded = true;
|
||||
this.fire('load');
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
_initLayers: function(layers) {
|
||||
this._layers = {};
|
||||
for (var i = 0, len = layers.length; i < len; i++) {
|
||||
this.addLayer(layers[i]);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
_initControls: function() {
|
||||
if (this.options.zoomControl) {
|
||||
this.addControl(new L.Control.Zoom());
|
||||
@ -391,34 +393,34 @@ L.Map = L.Class.extend({
|
||||
var mapPaneOffset = L.DomUtil.getPosition(this._mapPane);
|
||||
L.DomUtil.setPosition(this._mapPane, mapPaneOffset.subtract(offset));
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
// map events
|
||||
|
||||
|
||||
_initEvents: function() {
|
||||
L.DomEvent.addListener(this._container, 'click', this._onMouseClick, this);
|
||||
|
||||
|
||||
var events = ['dblclick', 'mousedown', 'mouseenter', 'mouseleave', 'mousemove'];
|
||||
for (var i = 0; i < events.length; i++) {
|
||||
L.DomEvent.addListener(this._container, events[i], this._fireMouseEvent, this);
|
||||
}
|
||||
|
||||
|
||||
if (this.options.trackResize) {
|
||||
L.DomEvent.addListener(window, 'resize', this._onResize, this);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
_onResize: function() {
|
||||
L.Util.requestAnimFrame(this.invalidateSize, this, false, this._container);
|
||||
},
|
||||
|
||||
|
||||
_onMouseClick: function(e) {
|
||||
if (this.dragging && this.dragging.moved()) { return; }
|
||||
|
||||
|
||||
this.fire('pre' + e.type);
|
||||
this._fireMouseEvent(e);
|
||||
},
|
||||
|
||||
|
||||
_fireMouseEvent: function(e) {
|
||||
var type = e.type;
|
||||
type = (type == 'mouseenter' ? 'mouseover' : (type == 'mouseleave' ? 'mouseout' : type));
|
||||
@ -428,7 +430,7 @@ L.Map = L.Class.extend({
|
||||
layerPoint: this.mouseEventToLayerPoint(e)
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
_initInteraction: function() {
|
||||
var handlers = {
|
||||
dragging: L.Handler.MapDrag,
|
||||
@ -444,7 +446,7 @@ L.Map = L.Class.extend({
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
_onTileLayerLoad: function() {
|
||||
// clear scaled tiles after all new tiles are loaded (for performance)
|
||||
this._tileLayersToLoad--;
|
||||
@ -453,21 +455,21 @@ L.Map = L.Class.extend({
|
||||
this._clearTileBgTimer = setTimeout(L.Util.bind(this._clearTileBg, this), 500);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
|
||||
// private methods for getting map state
|
||||
|
||||
|
||||
_getTopLeftPoint: function() {
|
||||
if (!this._loaded) throw new Error('Set map center and zoom first.');
|
||||
var offset = L.DomUtil.getPosition(this._mapPane);
|
||||
return this._initialTopLeftPoint.subtract(offset);
|
||||
},
|
||||
|
||||
|
||||
_getNewTopLeftPoint: function(center) {
|
||||
var viewHalf = this.getSize().divideBy(2);
|
||||
return this.project(center).subtract(viewHalf).round();
|
||||
},
|
||||
|
||||
|
||||
_limitZoom: function(zoom) {
|
||||
var min = this.getMinZoom();
|
||||
var max = this.getMaxZoom();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user