diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js index 7c7a1b553a..0ff965905f 100644 --- a/lib/OpenLayers/Util.js +++ b/lib/OpenLayers/Util.js @@ -533,8 +533,8 @@ OpenLayers.Util.getScaleFromResolution = function (resolution, units) { units = "degrees"; } - var scale = 1 / (resolution * OpenLayers.INCHES_PER_UNIT[units] - * OpenLayers.DOTS_PER_INCH); + var scale = resolution * OpenLayers.INCHES_PER_UNIT[units] * + OpenLayers.DOTS_PER_INCH; return scale; }; diff --git a/tests/test_Util.html b/tests/test_Util.html index 5e98da912c..ab4c5e16e8 100644 --- a/tests/test_Util.html +++ b/tests/test_Util.html @@ -448,7 +448,7 @@ resolution = OpenLayers.Util.getResolutionFromScale(scale); t.eq(resolution.toFixed(6), "0.476217", "Calculated correct resolution for " + scale); - scale = 1/150000000; + scale = 150000000; resolution = OpenLayers.Util.getResolutionFromScale(scale); t.eq(OpenLayers.Util.getScaleFromResolution(resolution), scale, "scale->resolution->scale works"); }