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

boundsFromZoomAndCenter returned incorrect values. #625

Merged
merged 2 commits into from
Oct 13, 2016
Merged

boundsFromZoomAndCenter returned incorrect values. #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093b61d
boundsFromZoomAndCenter returned incorrect values.
manthey Oct 13, 2016
b78ba96
Merge branch 'master' into fix-get-bounds
jbeezley Oct 13, 2016
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
2 changes: 1 addition & 1 deletion src/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,7 +1426,7 @@ var map = function (arg) {
// preprocess the arguments
zoom = fix_zoom(zoom, ignoreDiscreteZoom);
units = m_this.unitsPerPixel(zoom);
center = m_this.gcsToWorld(center, gcs);
center = m_this.gcsToWorld(center, null);

// get half the width and height in world coordinates
width = m_width * units;
Expand Down
22 changes: 21 additions & 1 deletion tests/cases/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ describe('geo.core.map', function () {
expect(m.scale()).toEqual({x: 1, y: 1, z: 1});
});
it('gcs and ingcs', function () {
var m = create_map(), units = m.unitsPerPixel();
var m = create_map(), units = m.unitsPerPixel(), bounds;
var error = console.error;
expect(m.gcs()).toBe('EPSG:3857');
expect(m.ingcs()).toBe('EPSG:4326');
Expand All @@ -162,6 +162,26 @@ describe('geo.core.map', function () {
left: -128 * units, top: 128 * units,
right: 128 * units, bottom: -128 * units,
width: 256 * units, height: 256 * units})).toBe(true);
// test with a different non-zero center
m.ingcs('EPSG:4326');
m.bounds({left: -180, top: 65, right: -45, bottom: 45});
bounds = m.bounds();
// compare left, top, right, bottom separately from width and height to
// use different precisions in the comparison
expect(closeToEqual({
left: bounds.left, top: bounds.top,
right: bounds.right, bottom: bounds.bottom
}, {
left: -180, top: 79.340, right: -45, bottom: 0.906
})).toBe(true);
expect(closeToEqual({width: bounds.width, height: bounds.height}, {
width: 96 * units, height: 96 * units}, -2)).toBe(true);
expect(closeToEqual(m.bounds(undefined, null), {
left: -128 * units, top: 96.6444 * units,
right: -32 * units, bottom: 0.6444 * units,
width: 96 * units, height: 96 * units}, -2)).toBe(true);
m.bounds({left: -180, top: 5, right: 180, bottom: -5});
// test with different projections
m.unitsPerPixel(0, 1);
m.gcs('+proj=longlat +axis=enu');
expect(m.gcs()).toBe('+proj=longlat +axis=enu');
Expand Down