ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace proj/Units enum with typedef

Browse Source
This commit is contained in:
Maximilian Krög
2022-07-17 00:36:18 +02:00
parent 361f1ab837
commit 7ac61fdc70
14 changed files with 52 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/node/ol/proj.test.js
View File

@@ -1,5 +1,4 @@
import Projection from '../../../src/ol/proj/Projection.js';
import Units from '../../../src/ol/proj/Units.js';
import View from '../../../src/ol/View.js';
import expect from '../expect.js';
import proj4 from 'proj4';
@@ -159,13 +158,13 @@ describe('ol/proj.js', function () {
describe('fromUserResolution()', function () {
it("adjusts a resolution for the user projection's units", function () {
useGeographic();
const user = 1 / METERS_PER_UNIT['degrees'];
const user = 1 / METERS_PER_UNIT.degrees;
const resolution = fromUserResolution(user, 'EPSG:3857');
expect(resolution).to.roughlyEqual(1, 1e-9);
});
it('returns the original if no user projection is set', function () {
const user = METERS_PER_UNIT['meters'];
const user = METERS_PER_UNIT.meters;
const resolution = fromUserResolution(user, 'EPSG:3857');
expect(resolution).to.eql(user);
});
@@ -176,11 +175,11 @@ describe('ol/proj.js', function () {
useGeographic();
const dest = 1;
const resolution = toUserResolution(dest, 'EPSG:3857');
expect(resolution).to.eql(1 / METERS_PER_UNIT['degrees']);
expect(resolution).to.eql(1 / METERS_PER_UNIT.degrees);
});
it('returns the original if no user projection is set', function () {
const dest = METERS_PER_UNIT['degrees'];
const dest = METERS_PER_UNIT.degrees;
const resolution = toUserResolution(dest, 'EPSG:3857');
expect(resolution).to.eql(dest);
});
@@ -435,7 +434,7 @@ describe('ol/proj.js', function () {
it('returns the correct point resolution for EPSG:3857 with custom units', function () {
let pointResolution = getPointResolution(
'EPSG:3857',
METERS_PER_UNIT['degrees'],
METERS_PER_UNIT.degrees,
[0, 0],
'degrees'
);
@@ -506,7 +505,7 @@ describe('ol/proj.js', function () {
const proj = getProjection('EPSG:4258');
expect(proj.getCode()).to.eql('EPSG:4258');
expect(proj.getUnits()).to.eql('degrees');
expect(proj.getMetersPerUnit()).to.eql(METERS_PER_UNIT[Units.DEGREES]);
expect(proj.getMetersPerUnit()).to.eql(METERS_PER_UNIT.degrees);
delete proj4.defs['EPSG:4258'];
});

2
test/node/ol/tilegrid/TileGrid.test.js
View File

@@ -444,7 +444,7 @@ describe('ol/tilegrid/TileGrid.js', function () {
const grid = createForProjection(projection);
const resolutions = grid.getResolutions();
expect(resolutions[5]).to.be(
(360 * METERS_PER_UNIT['degrees']) / DEFAULT_TILE_SIZE / Math.pow(2, 5)
(360 * METERS_PER_UNIT.degrees) / DEFAULT_TILE_SIZE / Math.pow(2, 5)
);
});