ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Making it so OpenLayers.Util.getResolutionFromScale returns undefined resolution when given a falsey scale. r=ahocevar (closes #2464, see #2462)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10019 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2010-02-04 17:02:23 +00:00
parent ae73ca0679
commit 37e881bc54
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/OpenLayers/Util.js
View File

@@ -1182,18 +1182,19 @@ OpenLayers.Util.normalizeScale = function (scale) {
*
* Returns:
* {Float} The corresponding resolution given passed-in scale and unit
* parameters.
* parameters. If the given scale is falsey, the returned resolution will
* be undefined.
*/
OpenLayers.Util.getResolutionFromScale = function (scale, units) {
if (units == null) {
units = "degrees";
var resolution;
if (scale) {
if (units == null) {
units = "degrees";
}
var normScale = OpenLayers.Util.normalizeScale(scale);
resolution = 1 / (normScale * OpenLayers.INCHES_PER_UNIT[units]
* OpenLayers.DOTS_PER_INCH);
}
var normScale = OpenLayers.Util.normalizeScale(scale);
var resolution = 1 / (normScale * OpenLayers.INCHES_PER_UNIT[units]
* OpenLayers.DOTS_PER_INCH);
return resolution;
};

7
tests/Util.html
View File

@@ -670,7 +670,7 @@
}
function test_Util_getScaleResolutionTranslation(t) {
t.plan(4);
t.plan(5);
var scale = 1/150000000;
var resolution = OpenLayers.Util.getResolutionFromScale(scale);
@@ -687,6 +687,11 @@
scale = 150000000;
resolution = OpenLayers.Util.getResolutionFromScale(scale);
t.eq(OpenLayers.Util.getScaleFromResolution(resolution), scale, "scale->resolution->scale works");
scale = null;
resolution = OpenLayers.Util.getResolutionFromScale(scale);
t.eq(resolution, undefined, "falsey scale results in undefined resolution");
}
function test_Util_getImgLocation(t) {