proj4 2.20.7 → 2.20.9

package/dist/proj4-src.js

@@ -1724,7 +1724,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$y() {
+  function init$z() {
     var con = this.b / this.a;
     this.es = 1 - con * con;
     if (!('x0' in this)) {
@@ -1754,7 +1754,7 @@
   /* Mercator forward equations--mapping lat,long to x,y
     -------------------------------------------------- */
 
-  function forward$w(p) {
+  function forward$x(p) {
     var lon = p.x;
     var lat = p.y;
     // convert to radians
@@ -1783,7 +1783,7 @@
 
   /* Mercator inverse equations--mapping x,y to lat/long
     -------------------------------------------------- */
-  function inverse$w(p) {
+  function inverse$x(p) {
     var x = p.x - this.x0;
     var y = p.y - this.y0;
     var lon, lat;
@@ -1804,32 +1804,32 @@
     return p;
   }
 
-  var names$y = ['Mercator', 'Popular Visualisation Pseudo Mercator', 'Mercator_1SP', 'Mercator_Auxiliary_Sphere', 'Mercator_Variant_A', 'merc'];
+  var names$z = ['Mercator', 'Popular Visualisation Pseudo Mercator', 'Mercator_1SP', 'Mercator_Auxiliary_Sphere', 'Mercator_Variant_A', 'merc'];
   var merc = {
-    init: init$y,
-    forward: forward$w,
-    inverse: inverse$w,
-    names: names$y
+    init: init$z,
+    forward: forward$x,
+    inverse: inverse$x,
+    names: names$z
   };
 
-  function init$x() {
+  function init$y() {
     // no-op for longlat
   }
 
   function identity(pt) {
     return pt;
   }
-  var names$x = ['longlat', 'identity'];
+  var names$y = ['longlat', 'identity'];
   var longlat = {
-    init: init$x,
+    init: init$y,
     forward: identity,
     inverse: identity,
-    names: names$x
+    names: names$y
   };
 
   /** @type {Array<Partial<import('./Proj').default>>} */
   var projs = [merc, longlat];
-  var names$w = {};
+  var names$x = {};
   var projStore = [];
 
   /**
@@ -1844,7 +1844,7 @@
     }
     projStore[len] = proj;
     proj.names.forEach(function (n) {
-      names$w[n.toLowerCase()] = len;
+      names$x[n.toLowerCase()] = len;
     });
     return this;
   }
@@ -1863,12 +1863,12 @@
       return false;
     }
     var n = name.toLowerCase();
-    if (typeof names$w[n] !== 'undefined' && projStore[names$w[n]]) {
-      return projStore[names$w[n]];
+    if (typeof names$x[n] !== 'undefined' && projStore[names$x[n]]) {
+      return projStore[names$x[n]];
     }
     n = getNormalizedProjName(n);
-    if (n in names$w && projStore[names$w[n]]) {
-      return projStore[names$w[n]];
+    if (n in names$x && projStore[names$x[n]]) {
+      return projStore[names$x[n]];
     }
   }
 
@@ -3515,14 +3515,10 @@
 
   function datum(datumCode, datum_params, a, b, es, ep2, nadgrids) {
     var out = {};
-
-    if (datumCode === undefined || datumCode === 'none') {
-      out.datum_type = PJD_NODATUM;
-    } else {
-      out.datum_type = PJD_WGS84;
-    }
+    out.datum_type = PJD_NODATUM;
 
     if (datum_params) {
+      out.datum_type = PJD_WGS84;
       out.datum_params = datum_params.map(parseFloat);
       if (out.datum_params[0] !== 0 || out.datum_params[1] !== 0 || out.datum_params[2] !== 0) {
         out.datum_type = PJD_3PARAM;
@@ -3591,22 +3587,6 @@
 
   /** @typedef {{header: NadgridHeader, subgrids: Array<Subgrid>}} NADGrid */
 
-  /**
-   * @typedef {Object} GeoTIFF
-   * @property {() => Promise<number>} getImageCount - Returns the number of images in the GeoTIFF.
-   * @property {(index: number) => Promise<GeoTIFFImage>} getImage - Returns a GeoTIFFImage for the given index.
-   */
-
-  /**
-   * @typedef {Object} GeoTIFFImage
-   * @property {() => number} getWidth - Returns the width of the image.
-   * @property {() => number} getHeight - Returns the height of the image.
-   * @property {() => number[]} getBoundingBox - Returns the bounding box as [minX, minY, maxX, maxY] in degrees.
-   * @property {() => Promise<ArrayLike<ArrayLike<number>>>} readRasters - Returns the raster data as an array of bands.
-   * @property {Object} fileDirectory - The file directory object containing metadata.
-   * @property {Object} fileDirectory.ModelPixelScale - The pixel scale array [scaleX, scaleY, scaleZ] in degrees.
-   */
-
   var loadedNadgrids = {};
 
   /**
@@ -3619,14 +3599,14 @@
   /**
    * @overload
    * @param {string} key - The key to associate with the loaded grid.
-   * @param {GeoTIFF} data - The GeoTIFF instance to read the grid from.
+   * @param {import('geotiff').GeoTIFF} data - The GeoTIFF instance to read the grid from.
    * @returns {{ready: Promise<NADGrid>}} - A promise that resolves to the loaded grid information.
    */
   /**
    * Load either a NTv2 file (.gsb) or a Geotiff (.tif) to a key that can be used in a proj string like +nadgrids=<key>. Pass the NTv2 file
    * as an ArrayBuffer. Pass Geotiff as a GeoTIFF instance from the geotiff.js library.
    * @param {string} key - The key to associate with the loaded grid.
-   * @param {ArrayBuffer|GeoTIFF} data The data to load, either an ArrayBuffer for NTv2 or a GeoTIFF instance.
+   * @param {ArrayBuffer|import('geotiff').GeoTIFF} data The data to load, either an ArrayBuffer for NTv2 or a GeoTIFF instance.
    * @param {NTV2GridOptions} [options] Optional parameters.
    * @returns {{ready: Promise<NADGrid>}|NADGrid} - A promise that resolves to the loaded grid information.
    */
@@ -3659,7 +3639,7 @@
 
   /**
    * @param {string} key The key to associate with the loaded grid.
-   * @param {GeoTIFF} tiff The GeoTIFF instance to read the grid from.
+   * @param {import('geotiff').GeoTIFF} tiff The GeoTIFF instance to read the grid from.
    * @returns {Promise<NADGrid>} A promise that resolves to the loaded NAD grid information.
    */
   async function readGeotiffGrid(key, tiff) {
@@ -3673,7 +3653,12 @@
       var data = rasters;
       var lim = [image.getWidth(), image.getHeight()];
       var imageBBoxRadians = image.getBoundingBox().map(degreesToRadians);
-      var del = [image.fileDirectory.ModelPixelScale[0], image.fileDirectory.ModelPixelScale[1]].map(degreesToRadians);
+      var modelPixelScale = typeof image.fileDirectory.getValue === 'function'
+        // geotiff v3
+        ? image.fileDirectory.getValue('ModelPixelScale')
+        // geotiff v2
+        : /** @type {any} */ (image.fileDirectory).ModelPixelScale;
+      var del = [modelPixelScale[0], modelPixelScale[1]].map(degreesToRadians);
 
       var maxX = imageBBoxRadians[0] + (lim[0] - 1) * del[0];
       var minY = imageBBoxRadians[3] - (lim[1] - 1) * del[1];
@@ -3882,6 +3867,8 @@
     this.init = null;
     /** @type {string} */
     this.name;
+    /** @type {string} */
+    this.axis;
     /** @type {Array<string>} */
     this.names = null;
     /** @type {string} */
@@ -4373,60 +4360,82 @@
     return val;
   }
 
-  function adjust_axis (crs, denorm, point) {
-    var xin = point.x,
-      yin = point.y,
-      zin = point.z || 0.0;
-    var v, t, i;
+  var order = ['x', 'y', 'z'];
+
+  /**
+   * Convert a point in a given CRS axis order to ENU (east/north/up) order
+   * @param {import('./defs').ProjectionDefinition} crs
+   * @param {import('./core').InterfaceCoordinates} point
+   * @returns {import('./core').InterfaceCoordinates | null}
+   */
+  function adjustAxisToEnu(crs, point) {
     /** @type {import("./core").InterfaceCoordinates} */
-    var out = {};
-    for (i = 0; i < 3; i++) {
-      if (denorm && i === 2 && point.z === undefined) {
+    const out = {};
+    for (let i = 0, ii = crs.axis.length; i < ii; i++) {
+      if (i === 2 && point.z === undefined) {
         continue;
       }
-      if (i === 0) {
-        v = xin;
-        if ('ew'.indexOf(crs.axis[i]) !== -1) {
-          t = 'x';
-        } else {
-          t = 'y';
-        }
-      } else if (i === 1) {
-        v = yin;
-        if ('ns'.indexOf(crs.axis[i]) !== -1) {
-          t = 'y';
-        } else {
-          t = 'x';
-        }
-      } else {
-        v = zin;
-        t = 'z';
+      let v = point[order[i]];
+      switch (crs.axis[i]) {
+        case 'e':
+          out.x = v;
+          break;
+        case 'w':
+          out.x = -v;
+          break;
+        case 'n':
+          out.y = v;
+          break;
+        case 's':
+          out.y = -v;
+          break;
+        case 'u':
+          out.z = v;
+          break;
+        case 'd':
+          out.z = -v;
+          break;
+        default:
+          // console.log("ERROR: unknown axis ("+crs.axis[i]+") - check definition of "+crs.projName);
+          return null;
+      }
+    }
+    return out;
+  }
+
+  /**
+   * Convert a point in ENU (east/north/up) order to the given CRS axis order.
+   * @param {import('./defs').ProjectionDefinition} crs
+   * @param {import('./core').InterfaceCoordinates} point
+   * @returns {import('./core').InterfaceCoordinates | null}
+   */
+  function adjustAxisFromEnu(crs, point) {
+    const out = /** @type {import("./core").InterfaceCoordinates} */ ({});
+    for (let i = 0, ii = crs.axis.length; i < ii; i++) {
+      if (i === 2 && point.z === undefined) {
+        continue;
       }
       switch (crs.axis[i]) {
         case 'e':
-          out[t] = v;
+          out[order[i]] = point.x;
           break;
         case 'w':
-          out[t] = -v;
+          out[order[i]] = -point.x;
           break;
         case 'n':
-          out[t] = v;
+          out[order[i]] = point.y;
           break;
         case 's':
-          out[t] = -v;
+          out[order[i]] = -point.y;
           break;
         case 'u':
-          if (point[t] !== undefined) {
-            out.z = v;
-          }
+          out[order[i]] = point.z;
           break;
         case 'd':
-          if (point[t] !== undefined) {
-            out.z = -v;
-          }
+          out[order[i]] = -point.z;
           break;
         default:
-        // console.log("ERROR: unknow axis ("+crs.axis[i]+") - check definition of "+crs.projName);
+          // console.log("ERROR: unknown axis ("+crs.axis[i]+") - check definition of "+crs.projName);
           return null;
       }
     }
@@ -4474,36 +4483,26 @@
   }
 
   /**
+   * Internal transform: accepts an already-cloned point object, returns transformed point object.
    * @param {import('./defs').ProjectionDefinition} source
    * @param {import('./defs').ProjectionDefinition} dest
-   * @param {import('./core').TemplateCoordinates} point
-   * @param {boolean} enforceAxis
+   * @param {import('./core').InterfaceCoordinates} point
+   * @param {boolean} [enforceAxis]
    * @returns {import('./core').InterfaceCoordinates | undefined}
    */
-  function transform(source, dest, point, enforceAxis) {
+  function transformInternal(source, dest, point, enforceAxis) {
     var wgs84;
-    if (Array.isArray(point)) {
-      point = common(point);
-    } else {
-      // Clone the point object so inputs don't get modified
-      point = {
-        x: point.x,
-        y: point.y,
-        z: point.z,
-        m: point.m
-      };
-    }
     var hasZ = point.z !== undefined;
     checkSanity(point);
     // Workaround for datum shifts towgs84, if either source or destination projection is not wgs84
     if (source.datum && dest.datum && checkNotWGS(source, dest)) {
       wgs84 = new Projection('WGS84');
-      point = transform(source, wgs84, point, enforceAxis);
+      point = transformInternal(source, wgs84, point, enforceAxis);
       source = wgs84;
     }
     // DGR, 2010/11/12
     if (enforceAxis && source.axis !== 'enu') {
-      point = adjust_axis(source, false, point);
+      point = adjustAxisToEnu(source, point);
     }
     // Transform source points to long/lat, if they aren't already.
     if (source.projName === 'longlat') {
@@ -4567,7 +4566,7 @@
 
     // DGR, 2010/11/12
     if (enforceAxis && dest.axis !== 'enu') {
-      return adjust_axis(dest, true, point);
+      return adjustAxisFromEnu(dest, point);
     }
 
     if (point && !hasZ && dest.projName !== 'geocent') {
@@ -4576,6 +4575,24 @@
     return point;
   }
 
+  /**
+   * @param {import('./defs').ProjectionDefinition} source
+   * @param {import('./defs').ProjectionDefinition} dest
+   * @param {import('./core').TemplateCoordinates} point
+   * @param {boolean} [enforceAxis]
+   * @returns {import('./core').InterfaceCoordinates | undefined}
+   */
+  function transform(source, dest, point, enforceAxis) {
+    var pt;
+    if (Array.isArray(point)) {
+      pt = common(point);
+    } else {
+      // Clone the point object so inputs don't get modified
+      pt = { x: point.x, y: point.y, z: point.z, m: point.m };
+    }
+    return transformInternal(source, dest, pt, enforceAxis);
+  }
+
   var wgs84 = Projection('WGS84');
 
   /**
@@ -4658,37 +4675,36 @@
    * @returns {T}
    */
   function transformer(from, to, coords, enforceAxis) {
-    var transformedArray, out, keys;
+    var out, geocent, keys;
     if (Array.isArray(coords)) {
-      transformedArray = transform(from, to, coords, enforceAxis) || { x: NaN, y: NaN };
+      out = transformInternal(from, to, common(coords), enforceAxis) || { x: NaN, y: NaN };
       if (coords.length > 2) {
-        if ((typeof from.name !== 'undefined' && from.name === 'geocent') || (typeof to.name !== 'undefined' && to.name === 'geocent')) {
-          if (typeof transformedArray.z === 'number') {
-            return /** @type {T} */ ([transformedArray.x, transformedArray.y, transformedArray.z].concat(coords.slice(3)));
-          } else {
-            return /** @type {T} */ ([transformedArray.x, transformedArray.y, coords[2]].concat(coords.slice(3)));
+        geocent = (typeof from.name !== 'undefined' && from.name === 'geocent') || (typeof to.name !== 'undefined' && to.name === 'geocent');
+        if (geocent) {
+          if (typeof out.z === 'number') {
+            return /** @type {T} */ ([out.x, out.y, out.z].concat(coords.slice(3)));
           }
-        } else {
-          return /** @type {T} */ ([transformedArray.x, transformedArray.y].concat(coords.slice(2)));
+          return /** @type {T} */ ([out.x, out.y, coords[2]].concat(coords.slice(3)));
         }
-      } else {
-        return /** @type {T} */ ([transformedArray.x, transformedArray.y]);
+        if (enforceAxis && typeof out.z === 'number') {
+          return /** @type {T} */ ([out.x, out.y, out.z].concat(coords.slice(3)));
+        }
+        return /** @type {T} */ ([out.x, out.y].concat(coords.slice(2)));
       }
+      return /** @type {T} */ ([out.x, out.y]);
     } else {
-      out = transform(from, to, coords, enforceAxis);
+      out = transformInternal(from, to, { x: coords.x, y: coords.y, z: coords.z, m: coords.m }, enforceAxis) || { x: NaN, y: NaN };
       keys = Object.keys(coords);
       if (keys.length === 2) {
         return /** @type {T} */ (out);
       }
+      geocent = (typeof from.name !== 'undefined' && from.name === 'geocent') || (typeof to.name !== 'undefined' && to.name === 'geocent');
       keys.forEach(function (key) {
-        if ((typeof from.name !== 'undefined' && from.name === 'geocent') || (typeof to.name !== 'undefined' && to.name === 'geocent')) {
-          if (key === 'x' || key === 'y' || key === 'z') {
-            return;
-          }
-        } else {
-          if (key === 'x' || key === 'y') {
-            return;
-          }
+        if (key === 'x' || key === 'y') {
+          return;
+        }
+        if (key === 'z' && (geocent || enforceAxis)) {
+          return;
         }
         out[key] = coords[key];
       });
@@ -4827,8 +4843,8 @@
   var V = 86; // V
   var Z = 90; // Z
   var mgrs = {
-    forward: forward$v,
-    inverse: inverse$v,
+    forward: forward$w,
+    inverse: inverse$w,
     toPoint: toPoint
   };
   /**
@@ -4840,7 +4856,7 @@
    *      100 m, 2 for 1000 m or 1 for 10000 m). Optional, default is 5.
    * @return {string} the MGRS string for the given location and accuracy.
    */
-  function forward$v(ll, accuracy) {
+  function forward$w(ll, accuracy) {
     accuracy = accuracy || 5; // default accuracy 1m
     return encode(LLtoUTM({
       lat: ll[1],
@@ -4855,7 +4871,7 @@
    *     (longitude) and top (latitude) values in WGS84, representing the
    *     bounding box for the provided MGRS reference.
    */
-  function inverse$v(mgrs) {
+  function inverse$w(mgrs) {
     var bbox = UTMtoLL(decode(mgrs.toUpperCase()));
     if (bbox.lat && bbox.lon) {
       return [bbox.lon, bbox.lat, bbox.lon, bbox.lat];
@@ -5573,7 +5589,7 @@
     return new Point(toPoint(mgrsStr));
   };
   Point.prototype.toMGRS = function (accuracy) {
-    return forward$v([this.x, this.y], accuracy);
+    return forward$w([this.x, this.y], accuracy);
   };
 
   var C00 = 1;
@@ -5639,7 +5655,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$w() {
+  function init$x() {
     this.x0 = this.x0 !== undefined ? this.x0 : 0;
     this.y0 = this.y0 !== undefined ? this.y0 : 0;
     this.long0 = this.long0 !== undefined ? this.long0 : 0;
@@ -5655,7 +5671,7 @@
       Transverse Mercator Forward  - long/lat to x/y
       long/lat in radians
     */
-  function forward$u(p) {
+  function forward$v(p) {
     var lon = p.x;
     var lat = p.y;
 
@@ -5726,7 +5742,7 @@
   /**
       Transverse Mercator Inverse  -  x/y to long/lat
     */
-  function inverse$u(p) {
+  function inverse$v(p) {
     var con, phi;
     var lat, lon;
     var x = (p.x - this.x0) * (1 / this.a);
@@ -5787,12 +5803,12 @@
     return p;
   }
 
-  var names$v = ['Fast_Transverse_Mercator', 'Fast Transverse Mercator'];
+  var names$w = ['Fast_Transverse_Mercator', 'Fast Transverse Mercator'];
   var tmerc = {
-    init: init$w,
-    forward: forward$u,
-    inverse: inverse$u,
-    names: names$v
+    init: init$x,
+    forward: forward$v,
+    inverse: inverse$v,
+    names: names$w
   };
 
   function sinh (x) {
@@ -5908,7 +5924,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$v() {
+  function init$w() {
     if (!this.approx && (isNaN(this.es) || this.es <= 0)) {
       throw new Error('Incorrect elliptical usage. Try using the +approx option in the proj string, or PROJECTION["Fast_Transverse_Mercator"] in the WKT.');
     }
@@ -5985,7 +6001,7 @@
     this.Zb = -this.Qn * (Z + clens(this.gtu, 2 * Z));
   }
 
-  function forward$t(p) {
+  function forward$u(p) {
     var Ce = adjust_lon(p.x - this.long0, this.over);
     var Cn = p.y;
 
@@ -6021,7 +6037,7 @@
     return p;
   }
 
-  function inverse$t(p) {
+  function inverse$u(p) {
     var Ce = (p.x - this.x0) * (1 / this.a);
     var Cn = (p.y - this.y0) * (1 / this.a);
 
@@ -6059,12 +6075,12 @@
     return p;
   }
 
-  var names$u = ['Extended_Transverse_Mercator', 'Extended Transverse Mercator', 'etmerc', 'Transverse_Mercator', 'Transverse Mercator', 'Gauss Kruger', 'Gauss_Kruger', 'tmerc'];
+  var names$v = ['Extended_Transverse_Mercator', 'Extended Transverse Mercator', 'etmerc', 'Transverse_Mercator', 'Transverse Mercator', 'Gauss Kruger', 'Gauss_Kruger', 'tmerc'];
   var etmerc = {
-    init: init$v,
-    forward: forward$t,
-    inverse: inverse$t,
-    names: names$u
+    init: init$w,
+    forward: forward$u,
+    inverse: inverse$u,
+    names: names$v
   };
 
   function adjust_zone (zone, lon) {
@@ -6083,7 +6099,7 @@
   var dependsOn = 'etmerc';
 
   /** @this {import('../defs.js').ProjectionDefinition} */
-  function init$u() {
+  function init$v() {
     var zone = adjust_zone(this.zone, this.long0);
     if (zone === undefined) {
       throw new Error('unknown utm zone');
@@ -6099,10 +6115,10 @@
     this.inverse = etmerc.inverse;
   }
 
-  var names$t = ['Universal Transverse Mercator System', 'utm'];
+  var names$u = ['Universal Transverse Mercator System', 'utm'];
   var utm = {
-    init: init$u,
-    names: names$t,
+    init: init$v,
+    names: names$u,
     dependsOn: dependsOn
   };
 
@@ -6124,7 +6140,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$t() {
+  function init$u() {
     var sphi = Math.sin(this.lat0);
     var cphi = Math.cos(this.lat0);
     cphi *= cphi;
@@ -6135,7 +6151,7 @@
     this.K = Math.tan(0.5 * this.phic0 + FORTPI) / (Math.pow(Math.tan(0.5 * this.lat0 + FORTPI), this.C) * srat(this.e * sphi, this.ratexp));
   }
 
-  function forward$s(p) {
+  function forward$t(p) {
     var lon = p.x;
     var lat = p.y;
 
@@ -6144,7 +6160,7 @@
     return p;
   }
 
-  function inverse$s(p) {
+  function inverse$t(p) {
     var DEL_TOL = 1e-14;
     var lon = p.x / this.C;
     var lat = p.y;
@@ -6165,9 +6181,9 @@
     return p;
   }
   var gauss = {
-    init: init$t,
-    forward: forward$s,
-    inverse: inverse$s};
+    init: init$u,
+    forward: forward$t,
+    inverse: inverse$t};
 
   /**
    * @typedef {Object} LocalThis
@@ -6179,7 +6195,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$s() {
+  function init$t() {
     gauss.init.apply(this);
     if (!this.rc) {
       return;
@@ -6192,7 +6208,7 @@
     }
   }
 
-  function forward$r(p) {
+  function forward$s(p) {
     var sinc, cosc, cosl, k;
     p.x = adjust_lon(p.x - this.long0, this.over);
     gauss.forward.apply(this, [p]);
@@ -6207,7 +6223,7 @@
     return p;
   }
 
-  function inverse$r(p) {
+  function inverse$s(p) {
     var sinc, cosc, lon, lat, rho;
     p.x = (p.x - this.x0) / this.a;
     p.y = (p.y - this.y0) / this.a;
@@ -6232,12 +6248,12 @@
     return p;
   }
 
-  var names$s = ['Stereographic_North_Pole', 'Oblique_Stereographic', 'sterea', 'Oblique Stereographic Alternative', 'Double_Stereographic'];
+  var names$t = ['Stereographic_North_Pole', 'Oblique_Stereographic', 'sterea', 'Oblique Stereographic Alternative', 'Double_Stereographic'];
   var sterea = {
-    init: init$s,
-    forward: forward$r,
-    inverse: inverse$r,
-    names: names$s
+    init: init$t,
+    forward: forward$s,
+    inverse: inverse$s,
+    names: names$t
   };
 
   /**
@@ -6259,7 +6275,7 @@
   }
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$r() {
+  function init$s() {
     // setting default parameters
     this.x0 = this.x0 || 0;
     this.y0 = this.y0 || 0;
@@ -6298,7 +6314,7 @@
   }
 
   // Stereographic forward equations--mapping lat,long to x,y
-  function forward$q(p) {
+  function forward$r(p) {
     var lon = p.x;
     var lat = p.y;
     var sinlat = Math.sin(lat);
@@ -6348,7 +6364,7 @@
   }
 
   //* Stereographic inverse equations--mapping x,y to lat/long
-  function inverse$q(p) {
+  function inverse$r(p) {
     p.x -= this.x0;
     p.y -= this.y0;
     var lon, lat, ts, ce, Chi;
@@ -6409,12 +6425,12 @@
     return p;
   }
 
-  var names$r = ['stere', 'Stereographic_South_Pole', 'Polar_Stereographic_variant_A', 'Polar_Stereographic_variant_B', 'Polar_Stereographic'];
+  var names$s = ['stere', 'Stereographic_South_Pole', 'Polar_Stereographic_variant_A', 'Polar_Stereographic_variant_B', 'Polar_Stereographic'];
   var stere = {
-    init: init$r,
-    forward: forward$q,
-    inverse: inverse$q,
-    names: names$r,
+    init: init$s,
+    forward: forward$r,
+    inverse: inverse$r,
+    names: names$s,
     ssfn_: ssfn_
   };
 
@@ -6436,7 +6452,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$q() {
+  function init$r() {
     var phy0 = this.lat0;
     this.lambda0 = this.long0;
     var sinPhy0 = Math.sin(phy0);
@@ -6454,7 +6470,7 @@
     this.K = k1 - this.alpha * k2 + this.alpha * e / 2 * k3;
   }
 
-  function forward$p(p) {
+  function forward$q(p) {
     var Sa1 = Math.log(Math.tan(Math.PI / 4 - p.y / 2));
     var Sa2 = this.e / 2 * Math.log((1 + this.e * Math.sin(p.y)) / (1 - this.e * Math.sin(p.y)));
     var S = -this.alpha * (Sa1 + Sa2) + this.K;
@@ -6475,7 +6491,7 @@
     return p;
   }
 
-  function inverse$p(p) {
+  function inverse$q(p) {
     var Y = p.x - this.x0;
     var X = p.y - this.y0;
 
@@ -6507,12 +6523,12 @@
     return p;
   }
 
-  var names$q = ['somerc'];
+  var names$r = ['somerc'];
   var somerc = {
-    init: init$q,
-    forward: forward$p,
-    inverse: inverse$p,
-    names: names$q
+    init: init$r,
+    forward: forward$q,
+    inverse: inverse$q,
+    names: names$r
   };
 
   /**
@@ -6551,7 +6567,7 @@
    * Initialize the Oblique Mercator  projection
    * @this {import('../defs.js').ProjectionDefinition & LocalThis}
    */
-  function init$p() {
+  function init$q() {
     var con, com, cosph0, D, F, H, L, sinph0, p, J, gamma = 0,
       gamma0, lamc = 0, lam1 = 0, lam2 = 0, phi1 = 0, phi2 = 0, alpha_c = 0;
 
@@ -6576,6 +6592,10 @@
 
     if (gam) {
       gamma = this.rectified_grid_angle;
+      if (!alp) {
+        alpha_c = 0;
+        alp = true;
+      }
     }
 
     if (alp || gam) {
@@ -6680,7 +6700,7 @@
 
   /* Oblique Mercator forward equations--mapping lat,long to x,y
       ---------------------------------------------------------- */
-  function forward$o(p) {
+  function forward$p(p) {
     var coords = {};
     var S, T, U, V, W, temp, u, v;
     p.x = p.x - this.lam0;
@@ -6726,7 +6746,7 @@
     return coords;
   }
 
-  function inverse$o(p) {
+  function inverse$p(p) {
     var u, v, Qp, Sp, Tp, Vp, Up;
     var coords = {};
 
@@ -6766,12 +6786,12 @@
     return coords;
   }
 
-  var names$p = ['Hotine_Oblique_Mercator', 'Hotine Oblique Mercator', 'Hotine_Oblique_Mercator_variant_A', 'Hotine_Oblique_Mercator_Variant_B', 'Hotine_Oblique_Mercator_Azimuth_Natural_Origin', 'Hotine_Oblique_Mercator_Two_Point_Natural_Origin', 'Hotine_Oblique_Mercator_Azimuth_Center', 'Oblique_Mercator', 'omerc'];
+  var names$q = ['Hotine_Oblique_Mercator', 'Hotine Oblique Mercator', 'Hotine_Oblique_Mercator_variant_A', 'Hotine_Oblique_Mercator_Variant_B', 'Hotine_Oblique_Mercator_Azimuth_Natural_Origin', 'Hotine_Oblique_Mercator_Two_Point_Natural_Origin', 'Hotine_Oblique_Mercator_Azimuth_Center', 'Oblique_Mercator', 'omerc'];
   var omerc = {
-    init: init$p,
-    forward: forward$o,
-    inverse: inverse$o,
-    names: names$p
+    init: init$q,
+    forward: forward$p,
+    inverse: inverse$p,
+    names: names$q
   };
 
   /**
@@ -6783,7 +6803,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$o() {
+  function init$p() {
     // double lat0;                    /* the reference latitude               */
     // double long0;                   /* the reference longitude              */
     // double lat1;                    /* first standard parallel              */
@@ -6843,7 +6863,7 @@
 
   // Lambert Conformal conic forward equations--mapping lat,long to x,y
   // -----------------------------------------------------------------
-  function forward$n(p) {
+  function forward$o(p) {
     var lon = p.x;
     var lat = p.y;
 
@@ -6873,7 +6893,7 @@
 
   // Lambert Conformal Conic inverse equations--mapping x,y to lat/long
   // -----------------------------------------------------------------
-  function inverse$n(p) {
+  function inverse$o(p) {
     var rh1, con, ts;
     var lat, lon;
     var x = (p.x - this.x0) / this.k0;
@@ -6906,7 +6926,7 @@
     return p;
   }
 
-  var names$o = [
+  var names$p = [
     'Lambert Tangential Conformal Conic Projection',
     'Lambert_Conformal_Conic',
     'Lambert_Conformal_Conic_1SP',
@@ -6917,13 +6937,13 @@
   ];
 
   var lcc = {
-    init: init$o,
-    forward: forward$n,
-    inverse: inverse$n,
-    names: names$o
+    init: init$p,
+    forward: forward$o,
+    inverse: inverse$o,
+    names: names$p
   };
 
-  function init$n() {
+  function init$o() {
     this.a = 6377397.155;
     this.es = 0.006674372230614;
     this.e = Math.sqrt(this.es);
@@ -6958,7 +6978,7 @@
   /* ellipsoid */
   /* calculate xy from lat/lon */
   /* Constants, identical to inverse transform function */
-  function forward$m(p) {
+  function forward$n(p) {
     var gfi, u, deltav, s, d, eps, ro;
     var lon = p.x;
     var lat = p.y;
@@ -6982,7 +7002,7 @@
   }
 
   /* calculate lat/lon from xy */
-  function inverse$m(p) {
+  function inverse$n(p) {
     var u, deltav, s, d, eps, ro, fi1;
     var ok;
 
@@ -7020,12 +7040,12 @@
     return (p);
   }
 
-  var names$n = ['Krovak', 'Krovak Modified', 'Krovak (North Orientated)', 'Krovak Modified (North Orientated)', 'krovak'];
+  var names$o = ['Krovak', 'Krovak Modified', 'Krovak (North Orientated)', 'Krovak Modified (North Orientated)', 'krovak'];
   var krovak = {
-    init: init$n,
-    forward: forward$m,
-    inverse: inverse$m,
-    names: names$n
+    init: init$o,
+    forward: forward$n,
+    inverse: inverse$n,
+    names: names$o
   };
 
   function mlfn (e0, e1, e2, e3, phi) {
@@ -7085,7 +7105,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$m() {
+  function init$n() {
     if (!this.sphere) {
       this.e0 = e0fn(this.es);
       this.e1 = e1fn(this.es);
@@ -7097,7 +7117,7 @@
 
   /* Cassini forward equations--mapping lat,long to x,y
     ----------------------------------------------------------------------- */
-  function forward$l(p) {
+  function forward$m(p) {
     /* Forward equations
         ----------------- */
     var x, y;
@@ -7130,7 +7150,7 @@
 
   /* Inverse equations
     ----------------- */
-  function inverse$l(p) {
+  function inverse$m(p) {
     p.x -= this.x0;
     p.y -= this.y0;
     var x = p.x / this.a;
@@ -7168,12 +7188,12 @@
     return p;
   }
 
-  var names$m = ['Cassini', 'Cassini_Soldner', 'cass'];
+  var names$n = ['Cassini', 'Cassini_Soldner', 'cass'];
   var cass = {
-    init: init$m,
-    forward: forward$l,
-    inverse: inverse$l,
-    names: names$m
+    init: init$n,
+    forward: forward$m,
+    inverse: inverse$m,
+    names: names$n
   };
 
   function qsfnz (eccent, sinphi) {
@@ -7186,6 +7206,32 @@
     }
   }
 
+  var P00 = 0.33333333333333333333;
+  var P01 = 0.17222222222222222222;
+  var P02 = 0.10257936507936507936;
+  var P10 = 0.06388888888888888888;
+  var P11 = 0.06640211640211640211;
+  var P20 = 0.01641501294219154443;
+
+  function authset(es) {
+    var t;
+    var APA = [];
+    APA[0] = es * P00;
+    t = es * es;
+    APA[0] += t * P01;
+    APA[1] = t * P10;
+    t *= es;
+    APA[0] += t * P02;
+    APA[1] += t * P11;
+    APA[2] = t * P20;
+    return APA;
+  }
+
+  function authlat(beta, APA) {
+    var t = beta + beta;
+    return (beta + APA[0] * Math.sin(t) + APA[1] * Math.sin(t + t) + APA[2] * Math.sin(t + t + t));
+  }
+
   /**
    * @typedef {Object} LocalThis
    * @property {number} mode
@@ -7219,7 +7265,7 @@
    * Initialize the Lambert Azimuthal Equal Area projection
    * @this {import('../defs.js').ProjectionDefinition & LocalThis}
    */
-  function init$l() {
+  function init$m() {
     var t = Math.abs(this.lat0);
     if (Math.abs(t - HALF_PI) < EPSLN) {
       this.mode = this.lat0 < 0 ? S_POLE : N_POLE;
@@ -7267,7 +7313,7 @@
 
   /* Lambert Azimuthal Equal Area forward equations--mapping lat,long to x,y
     ----------------------------------------------------------------------- */
-  function forward$k(p) {
+  function forward$l(p) {
     /* Forward equations
         ----------------- */
     var x, y, coslam, sinlam, sinphi, q, sinb, cosb, b, cosphi;
@@ -7360,7 +7406,7 @@
 
   /* Inverse equations
     ----------------- */
-  function inverse$k(p) {
+  function inverse$l(p) {
     p.x -= this.x0;
     p.y -= this.y0;
     var x = p.x / this.a;
@@ -7447,40 +7493,12 @@
     return p;
   }
 
-  /* determine latitude from authalic latitude */
-  var P00 = 0.33333333333333333333;
-
-  var P01 = 0.17222222222222222222;
-  var P02 = 0.10257936507936507936;
-  var P10 = 0.06388888888888888888;
-  var P11 = 0.06640211640211640211;
-  var P20 = 0.01641501294219154443;
-
-  function authset(es) {
-    var t;
-    var APA = [];
-    APA[0] = es * P00;
-    t = es * es;
-    APA[0] += t * P01;
-    APA[1] = t * P10;
-    t *= es;
-    APA[0] += t * P02;
-    APA[1] += t * P11;
-    APA[2] = t * P20;
-    return APA;
-  }
-
-  function authlat(beta, APA) {
-    var t = beta + beta;
-    return (beta + APA[0] * Math.sin(t) + APA[1] * Math.sin(t + t) + APA[2] * Math.sin(t + t + t));
-  }
-
-  var names$l = ['Lambert Azimuthal Equal Area', 'Lambert_Azimuthal_Equal_Area', 'laea'];
+  var names$m = ['Lambert Azimuthal Equal Area', 'Lambert_Azimuthal_Equal_Area', 'laea'];
   var laea = {
-    init: init$l,
-    forward: forward$k,
-    inverse: inverse$k,
-    names: names$l,
+    init: init$m,
+    forward: forward$l,
+    inverse: inverse$l,
+    names: names$m,
     S_POLE: S_POLE,
     N_POLE: N_POLE,
     EQUIT: EQUIT,
@@ -7518,7 +7536,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$k() {
+  function init$l() {
     if (Math.abs(this.lat1 + this.lat2) < EPSLN) {
       return;
     }
@@ -7556,7 +7574,7 @@
   /* Albers Conical Equal Area forward equations--mapping lat,long to x,y
     ------------------------------------------------------------------- */
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function forward$j(p) {
+  function forward$k(p) {
     var lon = p.x;
     var lat = p.y;
 
@@ -7574,7 +7592,7 @@
     return p;
   }
 
-  function inverse$j(p) {
+  function inverse$k(p) {
     var rh1, qs, con, theta, lon, lat;
 
     p.x -= this.x0;
@@ -7629,12 +7647,12 @@
     return null;
   }
 
-  var names$k = ['Albers_Conic_Equal_Area', 'Albers_Equal_Area', 'Albers', 'aea'];
+  var names$l = ['Albers_Conic_Equal_Area', 'Albers_Equal_Area', 'Albers', 'aea'];
   var aea = {
-    init: init$k,
-    forward: forward$j,
-    inverse: inverse$j,
-    names: names$k,
+    init: init$l,
+    forward: forward$k,
+    inverse: inverse$k,
+    names: names$l,
     phi1z: phi1z
   };
 
@@ -7653,7 +7671,7 @@
       Accessed: 12th November 2009
      @this {import('../defs.js').ProjectionDefinition & LocalThis}
    */
-  function init$j() {
+  function init$k() {
     /* Place parameters in static storage for common use
         ------------------------------------------------- */
     this.sin_p14 = Math.sin(this.lat0);
@@ -7665,7 +7683,7 @@
 
   /* Gnomonic forward equations--mapping lat,long to x,y
       --------------------------------------------------- */
-  function forward$i(p) {
+  function forward$j(p) {
     var sinphi, cosphi; /* sin and cos value        */
     var dlon; /* delta longitude value      */
     var coslon; /* cos of longitude        */
@@ -7703,7 +7721,7 @@
     return p;
   }
 
-  function inverse$i(p) {
+  function inverse$j(p) {
     var rh; /* Rho */
     var sinc, cosc;
     var c;
@@ -7735,12 +7753,12 @@
     return p;
   }
 
-  var names$j = ['gnom'];
+  var names$k = ['gnom'];
   var gnom = {
-    init: init$j,
-    forward: forward$i,
-    inverse: inverse$i,
-    names: names$j
+    init: init$k,
+    forward: forward$j,
+    inverse: inverse$j,
+    names: names$k
   };
 
   function iqsfnz (eccent, q) {
@@ -7785,7 +7803,7 @@
       USGS Open File Report 90-284and Release 4 Interim Reports (2003)
     @this {import('../defs.js').ProjectionDefinition & LocalThis}
   */
-  function init$i() {
+  function init$j() {
     // no-op
     if (!this.sphere) {
       this.k0 = msfnz(this.e, Math.sin(this.lat_ts), Math.cos(this.lat_ts));
@@ -7794,7 +7812,7 @@
 
   /* Cylindrical Equal Area forward equations--mapping lat,long to x,y
       ------------------------------------------------------------ */
-  function forward$h(p) {
+  function forward$i(p) {
     var lon = p.x;
     var lat = p.y;
     var x, y;
@@ -7817,7 +7835,7 @@
 
   /* Cylindrical Equal Area inverse equations--mapping x,y to lat/long
       ------------------------------------------------------------ */
-  function inverse$h(p) {
+  function inverse$i(p) {
     p.x -= this.x0;
     p.y -= this.y0;
     var lon, lat;
@@ -7835,15 +7853,15 @@
     return p;
   }
 
-  var names$i = ['cea'];
+  var names$j = ['cea'];
   var cea = {
-    init: init$i,
-    forward: forward$h,
-    inverse: inverse$h,
-    names: names$i
+    init: init$j,
+    forward: forward$i,
+    inverse: inverse$i,
+    names: names$j
   };
 
-  function init$h() {
+  function init$i() {
     this.x0 = this.x0 || 0;
     this.y0 = this.y0 || 0;
     this.lat0 = this.lat0 || 0;
@@ -7856,7 +7874,7 @@
 
   // forward equations--mapping lat,long to x,y
   // -----------------------------------------------------------------
-  function forward$g(p) {
+  function forward$h(p) {
     var lon = p.x;
     var lat = p.y;
 
@@ -7869,7 +7887,7 @@
 
   // inverse equations--mapping x,y to lat/long
   // -----------------------------------------------------------------
-  function inverse$g(p) {
+  function inverse$h(p) {
     var x = p.x;
     var y = p.y;
 
@@ -7878,12 +7896,12 @@
     return p;
   }
 
-  var names$h = ['Equirectangular', 'Equidistant_Cylindrical', 'Equidistant_Cylindrical_Spherical', 'eqc'];
+  var names$i = ['Equirectangular', 'Equidistant_Cylindrical', 'Equidistant_Cylindrical_Spherical', 'eqc'];
   var eqc = {
-    init: init$h,
-    forward: forward$g,
-    inverse: inverse$g,
-    names: names$h
+    init: init$i,
+    forward: forward$h,
+    inverse: inverse$h,
+    names: names$i
   };
 
   /**
@@ -7901,7 +7919,7 @@
   var MAX_ITER$1 = 20;
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$g() {
+  function init$h() {
     /* Place parameters in static storage for common use
         ------------------------------------------------- */
     this.temp = this.b / this.a;
@@ -7916,7 +7934,7 @@
 
   /* Polyconic forward equations--mapping lat,long to x,y
       --------------------------------------------------- */
-  function forward$f(p) {
+  function forward$g(p) {
     var lon = p.x;
     var lat = p.y;
     var x, y, el;
@@ -7947,7 +7965,7 @@
 
   /* Inverse equations
     ----------------- */
-  function inverse$f(p) {
+  function inverse$g(p) {
     var lon, lat, x, y, i;
     var al, bl;
     var phi, dphi;
@@ -8009,15 +8027,15 @@
     return p;
   }
 
-  var names$g = ['Polyconic', 'American_Polyconic', 'poly'];
+  var names$h = ['Polyconic', 'American_Polyconic', 'poly'];
   var poly = {
-    init: init$g,
-    forward: forward$f,
-    inverse: inverse$f,
-    names: names$g
+    init: init$h,
+    forward: forward$g,
+    inverse: inverse$g,
+    names: names$h
   };
 
-  function init$f() {
+  function init$g() {
     this.A = [];
     this.A[1] = 0.6399175073;
     this.A[2] = -0.1358797613;
@@ -8076,7 +8094,7 @@
       New Zealand Map Grid Forward  - long/lat to x/y
       long/lat in radians
     */
-  function forward$e(p) {
+  function forward$f(p) {
     var n;
     var lon = p.x;
     var lat = p.y;
@@ -8127,7 +8145,7 @@
   /**
       New Zealand Map Grid Inverse  -  x/y to long/lat
     */
-  function inverse$e(p) {
+  function inverse$f(p) {
     var n;
     var x = p.x;
     var y = p.y;
@@ -8218,12 +8236,12 @@
     return p;
   }
 
-  var names$f = ['New_Zealand_Map_Grid', 'nzmg'];
+  var names$g = ['New_Zealand_Map_Grid', 'nzmg'];
   var nzmg = {
-    init: init$f,
-    forward: forward$e,
-    inverse: inverse$e,
-    names: names$f
+    init: init$g,
+    forward: forward$f,
+    inverse: inverse$f,
+    names: names$g
   };
 
   /*
@@ -8234,13 +8252,13 @@
 
   /* Initialize the Miller Cylindrical projection
     ------------------------------------------- */
-  function init$e() {
+  function init$f() {
     // no-op
   }
 
   /* Miller Cylindrical forward equations--mapping lat,long to x,y
       ------------------------------------------------------------ */
-  function forward$d(p) {
+  function forward$e(p) {
     var lon = p.x;
     var lat = p.y;
     /* Forward equations
@@ -8256,7 +8274,7 @@
 
   /* Miller Cylindrical inverse equations--mapping x,y to lat/long
       ------------------------------------------------------------ */
-  function inverse$d(p) {
+  function inverse$e(p) {
     p.x -= this.x0;
     p.y -= this.y0;
 
@@ -8268,12 +8286,12 @@
     return p;
   }
 
-  var names$e = ['Miller_Cylindrical', 'mill'];
+  var names$f = ['Miller_Cylindrical', 'mill'];
   var mill = {
-    init: init$e,
-    forward: forward$d,
-    inverse: inverse$d,
-    names: names$e
+    init: init$f,
+    forward: forward$e,
+    inverse: inverse$e,
+    names: names$f
   };
 
   var MAX_ITER = 20;
@@ -8289,7 +8307,7 @@
    */
 
   /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
-  function init$d() {
+  function init$e() {
     /* Place parameters in static storage for common use
       ------------------------------------------------- */
     this.long0 = this.long0 || 0;
@@ -8307,7 +8325,7 @@
 
   /* Sinusoidal forward equations--mapping lat,long to x,y
     ----------------------------------------------------- */
-  function forward$c(p) {
+  function forward$d(p) {
     var x, y;
     var lon = p.x;
     var lat = p.y;
@@ -8342,7 +8360,7 @@
     return p;
   }
 
-  function inverse$c(p) {
+  function inverse$d(p) {
     var lat, temp, lon, s;
 
     p.x -= this.x0;
@@ -8377,8 +8395,45 @@
     return p;
   }
 
-  var names$d = ['Sinusoidal', 'sinu'];
+  var names$e = ['Sinusoidal', 'sinu'];
   var sinu = {
+    init: init$e,
+    forward: forward$d,
+    inverse: inverse$d,
+    names: names$e
+  };
+
+  /**
+   * Eckert VI projection — spherical sinusoidal variant with m=1, n=1+π/2.
+   * Always forces spherical computation regardless of the ellipsoid.
+   *
+   * @typedef {Object} LocalThis
+   * @property {number} m
+   * @property {number} n
+   * @property {number} C_y
+   * @property {number} C_x
+   * @property {number} es
+   */
+
+  /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
+  function init$d() {
+    /* Force spherical handling */
+    this.sphere = true;
+    this.b = this.a;
+
+    this.m = 1.0;
+    this.n = 2.570796326794896619231321691; /* 1 + π/2 */
+    this.es = 0;
+
+    this.C_y = Math.sqrt((this.m + 1.0) / this.n);
+    this.C_x = this.C_y / (this.m + 1.0);
+  }
+
+  var forward$c = forward$d;
+  var inverse$c = inverse$d;
+
+  var names$d = ['Eckert_VI', 'eck6'];
+  var eck6 = {
     init: init$d,
     forward: forward$c,
     inverse: inverse$c,
@@ -10055,32 +10110,62 @@
     A4 = 0.003796,
     M = Math.sqrt(3) / 2.0;
 
+  /**
+   * @typedef {Object} LocalThis
+   * @property {number} es
+   * @property {number} e
+   * @property {Array<number>} apa
+   * @property {number} qp
+   * @property {number} rqda
+   */
+
+  /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
   function init$2() {
-    this.es = 0;
     this.long0 = this.long0 !== undefined ? this.long0 : 0;
     this.x0 = this.x0 !== undefined ? this.x0 : 0;
     this.y0 = this.y0 !== undefined ? this.y0 : 0;
+    if (this.es !== 0) {
+      this.apa = authset(this.es);
+      this.qp = qsfnz(this.e, 1);
+      this.rqda = Math.sqrt(0.5 * this.qp);
+    }
   }
 
+  /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
   function forward$1(p) {
     var lam = adjust_lon(p.x - this.long0, this.over);
     var phi = p.y;
-    var paramLat = Math.asin(M * Math.sin(phi)),
+    var sinphi = Math.sin(phi);
+    if (this.es !== 0) {
+      sinphi = qsfnz(this.e, sinphi) / this.qp;
+    }
+    var paramLat = Math.asin(M * sinphi),
       paramLatSq = paramLat * paramLat,
       paramLatPow6 = paramLatSq * paramLatSq * paramLatSq;
     p.x = lam * Math.cos(paramLat)
       / (M * (A1 + 3 * A2 * paramLatSq + paramLatPow6 * (7 * A3 + 9 * A4 * paramLatSq)));
     p.y = paramLat * (A1 + A2 * paramLatSq + paramLatPow6 * (A3 + A4 * paramLatSq));
 
+    if (this.es !== 0) {
+      p.x *= this.rqda;
+      p.y *= this.rqda;
+    }
+
     p.x = this.a * p.x + this.x0;
     p.y = this.a * p.y + this.y0;
     return p;
   }
 
+  /** @this {import('../defs.js').ProjectionDefinition & LocalThis} */
   function inverse$1(p) {
     p.x = (p.x - this.x0) / this.a;
     p.y = (p.y - this.y0) / this.a;
 
+    if (this.es !== 0) {
+      p.x /= this.rqda;
+      p.y /= this.rqda;
+    }
+
     var EPS = 1e-9,
       NITER = 12,
       paramLat = p.y,
@@ -10102,6 +10187,10 @@
       / Math.cos(paramLat);
     p.y = Math.asin(Math.sin(paramLat) / M);
 
+    if (this.es !== 0) {
+      p.y = authlat(p.y, this.apa);
+    }
+
     p.x = adjust_lon(p.x + this.long0, this.over);
     return p;
   }
@@ -10319,7 +10408,7 @@
     this.y0 = this.y0 || 0;
     this.long0 = this.long0 || 0;
     this.title = this.title || 'General Oblique Transformation';
-    this.isIdentity = names$x.includes(this.o_proj);
+    this.isIdentity = names$y.includes(this.o_proj);
 
     /** Verify required parameters exist */
     if (!this.o_proj) {
@@ -10476,7 +10565,7 @@
    */
   function forwardOblique(self, lp) {
     let { x: lam, y: phi } = lp;
-    lam += self.long0;
+    lam = adjust_lon(lam - self.long0, self.over);
     const coslam = Math.cos(lam);
     const sinphi = Math.sin(phi);
     const cosphi = Math.cos(phi);
@@ -10506,7 +10595,7 @@
    */
   function forwardTransverse(self, lp) {
     let { x: lam, y: phi } = lp;
-    lam += self.long0;
+    lam = adjust_lon(lam - self.long0, self.over);
     const cosphi = Math.cos(phi);
     const coslam = Math.cos(lam);
     lp.x = adjust_lon(
@@ -10616,6 +10705,7 @@
     proj4.Proj.projections.add(nzmg);
     proj4.Proj.projections.add(mill);
     proj4.Proj.projections.add(sinu);
+    proj4.Proj.projections.add(eck6);
     proj4.Proj.projections.add(moll);
     proj4.Proj.projections.add(eqdc);
     proj4.Proj.projections.add(vandg);
@@ -10660,7 +10750,7 @@
     nadgrid,
     transform,
     mgrs,
-    version: '2.20.7'
+    version: '2.20.9'
   });
   includedProjections(proj4);