cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update build

Browse Source
This commit is contained in:
mourner 2012-07-30 01:39:13 +03:00
parent 3b2250cd32
commit e55e948986
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dist/leaflet-src.js vendored
View File

@ -6687,12 +6687,7 @@ L.Control.Scale = L.Control.extend({
container = L.DomUtil.create('div', className), container = L.DomUtil.create('div', className),
options = this.options; options = this.options;
if (options.metric) { this._addScales(options, className, container);
this._mScale = L.DomUtil.create('div', className + '-line', container);
}
if (options.imperial) {
this._iScale = L.DomUtil.create('div', className + '-line', container);
}
map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this); map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
this._update(); this._update();
@ -6704,6 +6699,15 @@ L.Control.Scale = L.Control.extend({
map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this); map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
}, },
_addScales: function (options, className, container) {
if (options.metric) {
this._mScale = L.DomUtil.create('div', className + '-line', container);
}
if (options.imperial) {
this._iScale = L.DomUtil.create('div', className + '-line', container);
}
},
_update: function () { _update: function () {
var bounds = this._map.getBounds(), var bounds = this._map.getBounds(),
centerLat = bounds.getCenter().lat, centerLat = bounds.getCenter().lat,
@ -6718,6 +6722,10 @@ L.Control.Scale = L.Control.extend({
maxMeters = dist * (options.maxWidth / size.x); maxMeters = dist * (options.maxWidth / size.x);
} }
this._updateScales(options, maxMeters);
},
_updateScales: function (options, maxMeters) {
if (options.metric && maxMeters) { if (options.metric && maxMeters) {
this._updateMetric(maxMeters); this._updateMetric(maxMeters);
} }
@ -6773,6 +6781,7 @@ L.control.scale = function (options) {
}; };
L.Control.Layers = L.Control.extend({ L.Control.Layers = L.Control.extend({
options: { options: {
collapsed: true, collapsed: true,

2
dist/leaflet.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/control/Control.Scale.js
View File

@ -26,11 +26,10 @@ L.Control.Scale = L.Control.extend({
map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this); map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
}, },
_addScales: function(options, className, container) { _addScales: function (options, className, container) {
if (options.metric) { if (options.metric) {
this._mScale = L.DomUtil.create('div', className + '-line', container); this._mScale = L.DomUtil.create('div', className + '-line', container);
} }
if (options.imperial) { if (options.imperial) {
this._iScale = L.DomUtil.create('div', className + '-line', container); this._iScale = L.DomUtil.create('div', className + '-line', container);
} }