Merge pull request #6928 from ahocevar/reproj-resolution

Only adjust resolution when center within projection extent
This commit is contained in:
Andreas Hocevar
2017-06-14 16:31:00 +02:00
committed by GitHub
+8 -6
View File
@@ -40,12 +40,14 @@ ol.reproj.calculateSourceResolution = function(sourceProj, targetProj,
// coordinates may be slightly different. We need to reverse-compensate this // coordinates may be slightly different. We need to reverse-compensate this
// in order to achieve optimal results. // in order to achieve optimal results.
var compensationFactor = var sourceExtent = sourceProj.getExtent();
ol.proj.getPointResolution(sourceProj, sourceResolution, sourceCenter) / if (!sourceExtent || ol.extent.containsCoordinate(sourceExtent, sourceCenter)) {
sourceResolution; var compensationFactor =
ol.proj.getPointResolution(sourceProj, sourceResolution, sourceCenter) /
if (isFinite(compensationFactor) && compensationFactor > 0) { sourceResolution;
sourceResolution /= compensationFactor; if (isFinite(compensationFactor) && compensationFactor > 0) {
sourceResolution /= compensationFactor;
}
} }
return sourceResolution; return sourceResolution;