Skip to content

getFitZoomForCamera z value null defense #2558

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

Merged
fuzhenn merged 1 commit into from
Jun 3, 2025
Merged

getFitZoomForCamera z value null defense #2558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions packages/maptalks/src/map/Map.Camera.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,11 @@ Map.include(/** @lends Map.prototype */{
this._calcMatrices();
},

getFitZoomForCamera(cameraPosition, pitch) {
const z = Array.isArray(cameraPosition) ? cameraPosition[2] : cameraPosition.z;
getFitZoomForCamera(cameraPosition: Array<number> | Coordinate, pitch: number) {
if (!isNumber(pitch)) {
pitch = 0;
}
const z = Array.isArray(cameraPosition) ? cameraPosition[2] || 0 : cameraPosition.z || 0;
const cameraAltitude = z * this._meterToGLPoint;

const centerAltitude = this.centerAltitude || 0;
Expand Down Expand Up @@ -641,8 +644,8 @@ Map.include(/** @lends Map.prototype */{
const cp = [0, 0, 0],
coord0 = [0, 0, 0, 1],
coord1 = [0, 0, 0, 1];
return function (from: Vector3, to: Vector3, containerPoint: Point, near:number = 0, far:number = 1) {
const w2 = this.width / 2 || 1,
return function (from: Vector3, to: Vector3, containerPoint: Point, near: number = 0, far: number = 1) {
const w2 = this.width / 2 || 1,
h2 = this.height / 2 || 1;
const p = containerPoint;
set(cp as Vector3, (p.x - w2) / w2, (h2 - p.y) / h2, 0);
Expand Down