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

Restore simple axis order handling with fixed proj4

Browse Source
This commit is contained in:
Andreas Hocevar
2021-07-22 13:41:19 +02:00
parent 8004e0faad
commit a5a156525f
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/proj/proj4.js
View File

@@ -10,7 +10,6 @@ import {
createSafeCoordinateTransform,
get,
} from '../proj.js';
import {assign} from '../obj.js';
import {get as getTransform} from './transforms.js';
/**
@@ -53,16 +52,10 @@ export function register(proj4) {
const code2 = projCodes[j];
const proj2 = get(code2);
if (!getTransform(code1, code2)) {
const def1 = proj4.defs(code1);
const def2 = proj4.defs(code2);
if (def1 === def2) {
if (proj4.defs[code1] === proj4.defs[code2]) {
addEquivalentProjections([proj1, proj2]);
} else {
// Reset axis because OpenLayers always uses x, y axis order
const transform = proj4(
assign({}, def1, {axis: undefined}),
assign({}, def2, {axis: undefined})
);
const transform = proj4(code1, code2);
addCoordinateTransforms(
proj1,
proj2,