From 25b683af31559d1e3edb5c0ec00bf16202801a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabr=C3=ADcio?= Date: Fri, 29 Apr 2016 00:37:21 -0300 Subject: [PATCH 1/2] Support for Leaflet-1.0.0rc1 This is my pull request for Leaflet-1.0.0rc1 support. Same changes need to be done in the CustomScale version. --- leaflet.nauticscale/leaflet.nauticscale.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/leaflet.nauticscale/leaflet.nauticscale.js b/leaflet.nauticscale/leaflet.nauticscale.js index 5f801b7..196acf3 100644 --- a/leaflet.nauticscale/leaflet.nauticscale.js +++ b/leaflet.nauticscale/leaflet.nauticscale.js @@ -6,24 +6,24 @@ L.Control.ScaleNautic = L.Control.Scale.extend({ _addScales: function(options, className, container) { L.Control.Scale.prototype._addScales.call(this, options, className, container); - var options = this.options; + if (options.nautic) { - this._nScale = L.DomUtil.create('div', className + '-line', container); + this._nScale = L.DomUtil.create('div', className, container); } }, - _updateScales: function (options, maxMeters) { - L.Control.Scale.prototype._updateScales.call(this, options, maxMeters); + _updateScales: function (maxMeters) { + L.Control.Scale.prototype._updateScales.call(this, maxMeters); + - var options = this.options; - if (options.nautic && maxMeters) { + if (this.options.nautic && maxMeters) { this._updateNautic(maxMeters); } }, _updateNautic: function (maxMeters) { - var scale = this._nScale, - maxNauticalMiles = maxMeters / 1852, nauticalMiles; + + var maxNauticalMiles = maxMeters / 1852, nauticalMiles; if(maxMeters >= 1852) { nauticalMiles = L.Control.Scale.prototype._getRoundNum.call(this, maxNauticalMiles); @@ -31,8 +31,10 @@ L.Control.ScaleNautic = L.Control.Scale.extend({ nauticalMiles = maxNauticalMiles > 0.1 ? Math.round(maxNauticalMiles * 10) / 10 : Math.round(maxNauticalMiles * 100) / 100; } - scale.style.width = this._getScaleWidth(nauticalMiles / maxNauticalMiles) + 'px'; - scale.innerHTML = nauticalMiles + ' nm'; + console.log(maxMeters + " " + nauticalMiles); + L.Control.Scale.prototype._updateScale.call(this, this._nScale, nauticalMiles + " nm", nauticalMiles / maxNauticalMiles); + + }, }); From aaa71e8efc69f3e999ac3e28ebfd2cdd625912d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabr=C3=ADcio?= Date: Fri, 29 Apr 2016 00:42:34 -0300 Subject: [PATCH 2/2] Update leaflet.nauticscale.js --- leaflet.nauticscale/leaflet.nauticscale.js | 1 - 1 file changed, 1 deletion(-) diff --git a/leaflet.nauticscale/leaflet.nauticscale.js b/leaflet.nauticscale/leaflet.nauticscale.js index 196acf3..693c9c8 100644 --- a/leaflet.nauticscale/leaflet.nauticscale.js +++ b/leaflet.nauticscale/leaflet.nauticscale.js @@ -31,7 +31,6 @@ L.Control.ScaleNautic = L.Control.Scale.extend({ nauticalMiles = maxNauticalMiles > 0.1 ? Math.round(maxNauticalMiles * 10) / 10 : Math.round(maxNauticalMiles * 100) / 100; } - console.log(maxMeters + " " + nauticalMiles); L.Control.Scale.prototype._updateScale.call(this, this._nScale, nauticalMiles + " nm", nauticalMiles / maxNauticalMiles);