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

Merge pull request #10060 from mike-000/patch-1

Browse Source 
Ensure zoom level is not less than minimum integer zoom level for extent
This commit is contained in:
Olivier Guyot
2019-09-30 17:34:45 +02:00
committed by GitHub
parent 526679433e 733b883ac0
commit 176dccd6df
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/resolutionconstraint.js
View File

@@ -127,10 +127,14 @@ export function createSnapToPower(power, maxResolution, opt_minResolution, opt_s
return getSmoothClampedResolution(resolution, cappedMaxRes, minResolution); return getSmoothClampedResolution(resolution, cappedMaxRes, minResolution);
} }
const offset = -direction * (0.5 - 1e-9) + 0.5; const tolerance = 1e-9;
const minZoomLevel = Math.ceil(
Math.log(maxResolution / cappedMaxRes) / Math.log(power) - tolerance);
const offset = -direction * (0.5 - tolerance) + 0.5;
const capped = Math.min(cappedMaxRes, resolution); const capped = Math.min(cappedMaxRes, resolution);
const zoomLevel = Math.floor( const cappedZoomLevel = Math.floor(
Math.log(maxResolution / capped) / Math.log(power) + offset); Math.log(maxResolution / capped) / Math.log(power) + offset);
const zoomLevel = Math.max(minZoomLevel, cappedZoomLevel);
const newResolution = maxResolution / Math.pow(power, zoomLevel); const newResolution = maxResolution / Math.pow(power, zoomLevel);
return clamp(newResolution, minResolution, cappedMaxRes); return clamp(newResolution, minResolution, cappedMaxRes);
} else { } else {

2
test/spec/ol/view.test.js
View File

@@ -454,7 +454,7 @@ describe('ol.View', function() {
maxResolution: maxResolution, maxResolution: maxResolution,
constrainResolution: true constrainResolution: true
}); });
expect(fn(defaultMaxRes, 0, size)).to.be(defaultMaxRes / 2); expect(fn(defaultMaxRes, 0, size)).to.be(maxResolution / 4);
}); });
it('enabled, with constrainResolution', function() { it('enabled, with constrainResolution', function() {