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

Also update zoom property

Browse Source
This commit is contained in:
Andreas Hocevar
2021-12-16 09:54:06 +01:00
parent f6cb4c296d
commit 628e5c1c90
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/View.js
+3 -4
View File
@@ -480,8 +480,7 @@ class View extends BaseObject {
); );
if (options.resolution !== undefined) { if (options.resolution !== undefined) {
this.setResolution(options.resolution); this.setResolution(options.resolution);
} } else if (options.zoom !== undefined) {
if (options.zoom !== undefined) {
this.setZoom(options.zoom); this.setZoom(options.zoom);
} }
} }
@@ -530,8 +529,7 @@ class View extends BaseObject {
// preserve resolution (or zoom) // preserve resolution (or zoom)
if (options.resolution !== undefined) { if (options.resolution !== undefined) {
options.resolution = this.getResolution(); options.resolution = this.getResolution();
} } else {
if (options.zoom !== undefined) {
options.zoom = this.getZoom(); options.zoom = this.getZoom();
} }
@@ -1731,6 +1729,7 @@ class View extends BaseObject {
} }
if (this.get(ViewProperty.RESOLUTION) !== newResolution) { if (this.get(ViewProperty.RESOLUTION) !== newResolution) {
this.set(ViewProperty.RESOLUTION, newResolution); this.set(ViewProperty.RESOLUTION, newResolution);
this.set('zoom', this.getZoom(), true);
} }
if ( if (
!newCenter || !newCenter ||
test/browser/spec/ol/View.test.js
+7 -3
View File
@@ -623,11 +623,15 @@ describe('ol/View', function () {
minZoom: 2, minZoom: 2,
zoom: 10, zoom: 10,
}); });
const options = view.getProperties(); view.setZoom(8);
view.setCenter([1, 2]);
view.setRotation(1);
expect(options.center).to.eql([0, 0]); const options = view.getProperties();
expect(options.minZoom).to.eql(2); expect(options.minZoom).to.eql(2);
expect(options.zoom).to.eql(10); expect(options.zoom).to.eql(8);
expect(options.center).to.eql([1, 2]);
expect(options.rotation).to.eql(1);
}); });
it('applies the current zoom', function () { it('applies the current zoom', function () {