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

Merge pull request #12545 from ahocevar/proj4-axis

Browse Source 
Restore simple axis order handling with fixed proj4
This commit is contained in:
Andreas Hocevar
2021-07-22 18:46:20 +02:00
committed by GitHub
parent eb39f59713 a5a156525f
commit 82956aaf5e
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+7 -7
View File
@@ -60,7 +60,7 @@
"mocha": "9.0.2", "mocha": "9.0.2",
"pixelmatch": "^5.1.0", "pixelmatch": "^5.1.0",
"pngjs": "^6.0.0", "pngjs": "^6.0.0",
"proj4": "2.7.4", "proj4": "^2.7.5",
"puppeteer": "10.1.0", "puppeteer": "10.1.0",
"rollup": "^2.42.3", "rollup": "^2.42.3",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
@@ -8456,9 +8456,9 @@
} }
}, },
"node_modules/proj4": { "node_modules/proj4": {
"version": "2.7.4", "version": "2.7.5",
"resolved": "https://registry.npmjs.org/proj4/-/proj4-2.7.4.tgz", "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.7.5.tgz",
"integrity": "sha512-WAY3Rk/PeFrR/Pf2gryrEPFgfo83C4U1ixS8bBr05fJ88z+QsTDR0tzg6k3Q7TBrJUhwB03NMPVT3aVkv9mZ6Q==", "integrity": "sha512-5ecXUXbHAfvdhfBQpU7EhUfPCQGUCPmVup/4gnZA3bJY3JcK/xxzm4QQDz1xiXokN6ux65VDczlCtBtKrTSpAQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"mgrs": "1.0.0", "mgrs": "1.0.0",
@@ -17703,9 +17703,9 @@
"dev": true "dev": true
}, },
"proj4": { "proj4": {
"version": "2.7.4", "version": "2.7.5",
"resolved": "https://registry.npmjs.org/proj4/-/proj4-2.7.4.tgz", "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.7.5.tgz",
"integrity": "sha512-WAY3Rk/PeFrR/Pf2gryrEPFgfo83C4U1ixS8bBr05fJ88z+QsTDR0tzg6k3Q7TBrJUhwB03NMPVT3aVkv9mZ6Q==", "integrity": "sha512-5ecXUXbHAfvdhfBQpU7EhUfPCQGUCPmVup/4gnZA3bJY3JcK/xxzm4QQDz1xiXokN6ux65VDczlCtBtKrTSpAQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"mgrs": "1.0.0", "mgrs": "1.0.0",
package.json
+1 -1
View File
@@ -96,7 +96,7 @@
"mocha": "9.0.2", "mocha": "9.0.2",
"pixelmatch": "^5.1.0", "pixelmatch": "^5.1.0",
"pngjs": "^6.0.0", "pngjs": "^6.0.0",
"proj4": "2.7.4", "proj4": "^2.7.5",
"puppeteer": "10.1.0", "puppeteer": "10.1.0",
"rollup": "^2.42.3", "rollup": "^2.42.3",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
src/ol/proj/proj4.js
+2 -9
View File
@@ -10,7 +10,6 @@ import {
createSafeCoordinateTransform, createSafeCoordinateTransform,
get, get,
} from '../proj.js'; } from '../proj.js';
import {assign} from '../obj.js';
import {get as getTransform} from './transforms.js'; import {get as getTransform} from './transforms.js';
/** /**
@@ -53,16 +52,10 @@ export function register(proj4) {
const code2 = projCodes[j]; const code2 = projCodes[j];
const proj2 = get(code2); const proj2 = get(code2);
if (!getTransform(code1, code2)) { if (!getTransform(code1, code2)) {
const def1 = proj4.defs(code1); if (proj4.defs[code1] === proj4.defs[code2]) {
const def2 = proj4.defs(code2);
if (def1 === def2) {
addEquivalentProjections([proj1, proj2]); addEquivalentProjections([proj1, proj2]);
} else { } else {
// Reset axis because OpenLayers always uses x, y axis order const transform = proj4(code1, code2);
const transform = proj4(
assign({}, def1, {axis: undefined}),
assign({}, def2, {axis: undefined})
);
addCoordinateTransforms( addCoordinateTransforms(
proj1, proj1,
proj2, proj2,