Merge pull request #353 from manthey/fix-axis-inversion

ahocevar · web-flow · commit b90773e4a60a · 2020-06-03T08:13:10.000+02:00
Revert a change that broke axis inversion.
diff --git a/lib/adjust_axis.js b/lib/adjust_axis.js
@@ -31,11 +31,17 @@ export default function(crs, denorm, point) {
     }
     switch (crs.axis[i]) {
     case 'e':
+      out[t] = v;
+      break;
     case 'w':
+      out[t] = -v;
+      break;
     case 'n':
-    case 's':
       out[t] = v;
       break;
+    case 's':
+      out[t] = -v;
+      break;
     case 'u':
       if (point[t] !== undefined) {
         out.z = v;
diff --git a/test/test.js b/test/test.js
@@ -248,6 +248,18 @@ function startTests(chai, proj4, testPoints) {
       assert.closeTo(rslt.y, 10.2, 0.000001);
     });
 
+    it('axes should be invertable', function () {
+      var enu = '+proj=longlat +axis=enu';
+      var esu = '+proj=longlat +axis=esu';
+      var wnu = '+proj=longlat +axis=wnu';
+      var result = proj4(enu, esu).forward({x: 40, y: 50});
+      assert.closeTo(result.x, 40, 0.000001);
+      assert.closeTo(result.y, -50, 0.000001);
+      var result = proj4(enu, wnu).forward({x: 40, y: 50});
+      assert.closeTo(result.x, -40, 0.000001);
+      assert.closeTo(result.y, 50, 0.000001);
+    });
+
     describe('defs', function () {
       assert.equal(proj4.defs('testmerc'), proj4.defs['testmerc']);
       proj4.defs('foo', '+proj=merc +lon_0=5.937 +lat_ts=45.027 +ellps=sphere');
