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

Jump to bottom

Remove dead code in Viewport class #3669

Merged
merged 1 commit into from Sep 20, 2019
Merged

Remove dead code in Viewport class #3669

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 0 additions & 20 deletions modules/core/src/viewports/viewport.js
View file
Open in desktop
Expand Up @@ -43,8 +43,6 @@ const ZERO_VECTOR = [0, 0, 0];

const DEFAULT_ZOOM = 0;

const ERR_ARGUMENT = 'Illegal argument to Viewport';

export default class Viewport {
/**
* @classdesc
Expand Down Expand Up @@ -288,24 +286,6 @@ export default class Viewport {

// INTERNAL METHODS

// TODO - these are duplicating WebMercator methods
_addMetersToLngLat(lngLatZ, xyz) {
const [lng, lat, Z = 0] = lngLatZ;
const [deltaLng, deltaLat, deltaZ = 0] = this._metersToLngLatDelta(xyz);
return lngLatZ.length === 2
? [lng + deltaLng, lat + deltaLat]
: [lng + deltaLng, lat + deltaLat, Z + deltaZ];
}

_metersToLngLatDelta(xyz) {
const [x, y, z = 0] = xyz;
assert(Number.isFinite(x) && Number.isFinite(y) && Number.isFinite(z), ERR_ARGUMENT);
const {pixelsPerMeter, degreesPerPixel} = this.distanceScales;
const deltaLng = x * pixelsPerMeter[0] * degreesPerPixel[0];
const deltaLat = y * pixelsPerMeter[1] * degreesPerPixel[1];
return xyz.length === 2 ? [deltaLng, deltaLat] : [deltaLng, deltaLat, z];
}

_createProjectionMatrix({orthographic, fovyRadians, aspect, focalDistance, near, far}) {
assert(Number.isFinite(fovyRadians));
return orthographic
Expand Down
1 change: 0 additions & 1 deletion modules/core/src/viewports/web-mercator-viewport.js
View file
Open in desktop
Expand Up @@ -123,7 +123,6 @@ export default class WebMercatorViewport extends Viewport {
// Bind methods
this.metersToLngLatDelta = this.metersToLngLatDelta.bind(this);
this.lngLatDeltaToMeters = this.lngLatDeltaToMeters.bind(this);
this.addMetersToLngLat = this.addMetersToLngLat.bind(this);

Object.freeze(this);
}
Expand Down