Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display an error message for impossible values of minZoom and maxZoom #4324

Merged
merged 9 commits into from
Mar 1, 2017
Merged

Display an error message for impossible values of minZoom and maxZoom #4324

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8ab0d0
Display error message for impossible values of minZoom and maxZoom
joswinter Feb 23, 2017
94376f1
Throw same error message when maxZoom is smaller than minZoom
joswinter Feb 23, 2017
71439ea
Added test for maxZoom smaller than minZoom case
joswinter Feb 23, 2017
b3ede06
Use error events instead of throwing them on invalid max and min zoom…
joswinter Feb 23, 2017
378d421
Added tests for maxZoom and minZoom setters
joswinter Feb 23, 2017
3daae4d
Removed incorrect maxZoom smaller than minZoom tests
joswinter Feb 28, 2017
56e8b7b
Moved maxZoom smaller than minZoom validation to Map
joswinter Feb 28, 2017
3e9f595
Added maxZoom smaller than minZoom at init test
joswinter Feb 28, 2017
be7c41c
Added correct null check for invalid maxZoom and minZoom
joswinter Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/geo/transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class Transform {
this.tileSize = 512; // constant

this._renderWorldCopies = renderWorldCopies === undefined ? true : renderWorldCopies;
this._minZoom = minZoom || 0;
this._maxZoom = maxZoom || 22;
this.minZoom = minZoom || 0;
this.maxZoom = maxZoom || 22;

this.latRange = [-85.05113, 85.05113];

Expand All @@ -43,13 +43,17 @@ class Transform {
if (this._minZoom === zoom) return;
this._minZoom = zoom;
this.zoom = Math.max(this.zoom, zoom);
if (this._maxZoom != null && this._minZoom > this._maxZoom)
return this.fire('error', new Error('maxZoom must always be greater than minZoom'));
}

get maxZoom() { return this._maxZoom; }
set maxZoom(zoom) {
if (this._maxZoom === zoom) return;
this._maxZoom = zoom;
this.zoom = Math.min(this.zoom, zoom);
if (this._minZoom != null && this._minZoom > this._maxZoom)
return this.fire('error', new Error('maxZoom must always be greater than minZoom'));
}

get worldSize() {
Expand Down
25 changes: 25 additions & 0 deletions test/unit/geo/transform.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,31 @@ test('transform', (t) => {
t.end();
});

t.test('fire on maxZoom smaller than minZoom at init', (t) => {
t.throws(() => {
new Transform(20, 10);
}, Error, 'maxZoom must always be greater than minZoom');
t.end();
});

t.test('fire on maxZoom smaller than minZoom at set maxZoom', (t) => {
t.throws(() => {
const transform = new Transform(10, 15);

transform.maxZoom = 5;
}, Error, 'maxZoom must always be greater than minZoom');
t.end();
});

t.test('fire on maxZoom smaller than minZoom at set minZoom', (t) => {
t.throws(() => {
const transform = new Transform(10, 15);

transform.minZoom = 20;
}, Error, 'maxZoom must always be greater than minZoom');
t.end();
});

t.test('clamps pitch', (t) => {
const transform = new Transform();

Expand Down