change getScaleFromResolution() to return big scale value instead of normalized. update tests

git-svn-id: http://svn.openlayers.org/trunk/openlayers@1535 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2006-10-03 03:44:37 +00:00
parent a758efb2f2
commit 628409a993
2 changed files with 3 additions and 3 deletions

View File

@@ -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;
};

View File

@@ -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");
}