Skip to content

Commit

Permalink
Avoid needless destructuring
Browse files Browse the repository at this point in the history
  • Loading branch information
felixpalmer committed Jul 21, 2021
1 parent ddd7e74 commit c4ffacf
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions modules/core/src/viewports/web-mercator-viewport.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,9 @@ export default class WebMercatorViewport extends Viewport {
altitude = Math.max(0.75, altitude);

let fovy;
let projectionParameters;
let projectionParameters = null;
if (projectionMatrix) {
fovy = altitudeToFovy(projectionMatrix[5] / 2);
projectionParameters = {focalDistance: altitude, projectionMatrix};
} else {
fovy = altitudeToFovy(altitude);
const {aspect, fov: fovyRadians, near, far} = getProjectionParameters({
Expand All @@ -87,10 +86,8 @@ export default class WebMercatorViewport extends Viewport {
farZMultiplier
});
projectionParameters = {
orthographic,
fovyRadians,
aspect,
focalDistance: altitude,
near,
far
};
Expand Down Expand Up @@ -126,7 +123,9 @@ export default class WebMercatorViewport extends Viewport {
zoom,

// projection matrix parameters
...projectionParameters
...projectionParameters,
fovy,
focalDistance: altitude
});

// Save parameters
Expand Down

0 comments on commit c4ffacf

Please sign in to comment.