proj4 2.19.10 → 2.20.1-alpha

package/lib/common/adjust_lon.js

@@ -1,6 +1,9 @@
 import { TWO_PI, SPI } from '../constants/values';
 import sign from './sign';
 
-export default function (x) {
+export default function (x, skipAdjust) {
+  if (skipAdjust) {
+    return x;
+  }
   return (Math.abs(x) <= SPI) ? x : (x - (sign(x) * TWO_PI));
 }

package/lib/defs.js

@@ -37,6 +37,8 @@ import wkt from 'wkt-parser';
  * @property {boolean} [sphere]
  * @property {number} [rectified_grid_angle]
  * @property {boolean} [approx]
+ * @property {boolean} [over]
+ * @property {string} [projStr]
  * @property {<T extends import('./core').TemplateCoordinates>(coordinates: T, enforceAxis?: boolean) => T} inverse
  * @property {<T extends import('./core').TemplateCoordinates>(coordinates: T, enforceAxis?: boolean) => T} forward
  */
@@ -73,8 +75,14 @@ function defs(name) {
       } else {
         defs[/** @type {string} */ (name)] = wkt(arguments[1]);
       }
+    } else if (def && typeof def === 'object' && !('projName' in def)) {
+      // PROJJSON
+      defs[/** @type {string} */ (name)] = wkt(arguments[1]);
     } else {
       defs[/** @type {string} */ (name)] = def;
+      if (!def) {
+        delete defs[/** @type {string} */ (name)];
+      }
     }
   } else if (arguments.length === 1) {
     if (Array.isArray(name)) {

package/lib/global.js

@@ -7,6 +7,8 @@ export default function (defs) {
     defs('EPSG:' + (32600 + i), '+proj=utm +zone=' + i + ' +datum=WGS84 +units=m');
     defs('EPSG:' + (32700 + i), '+proj=utm +zone=' + i + ' +south +datum=WGS84 +units=m');
   }
+  defs('EPSG:5041', '+title=WGS 84 / UPS North (E,N) +proj=stere +lat_0=90 +lon_0=0 +k=0.994 +x_0=2000000 +y_0=2000000 +datum=WGS84 +units=m');
+  defs('EPSG:5042', '+title=WGS 84 / UPS South (E,N) +proj=stere +lat_0=-90 +lon_0=0 +k=0.994 +x_0=2000000 +y_0=2000000 +datum=WGS84 +units=m');
 
   defs.WGS84 = defs['EPSG:4326'];
   defs['EPSG:3785'] = defs['EPSG:3857']; // maintain backward compat, official code is 3857

package/lib/includedProjections.js

@@ -28,6 +28,7 @@ import tpers from './projections/tpers';
 import geos from './projections/geos';
 import eqearth from './projections/eqearth';
 import bonne from './projections/bonne';
+import ob_tran from './projections/ob_tran';
 
 var projs = [
   tmerc,
@@ -59,7 +60,8 @@ var projs = [
   tpers,
   geos,
   eqearth,
-  bonne
+  bonne,
+  ob_tran
 ];
 
 export default function (proj4) {

package/lib/projString.js

@@ -125,6 +125,9 @@ export default function (defData) {
     },
     approx: function () {
       self.approx = true;
+    },
+    over: function () {
+      self.over = true;
     }
   };
   for (paramName in paramObj) {
@@ -143,5 +146,6 @@ export default function (defData) {
   if (typeof self.datumCode === 'string' && self.datumCode !== 'WGS84') {
     self.datumCode = self.datumCode.toLowerCase();
   }
+  self['projStr'] = defData;
   return self;
 }

package/lib/projections/aea.js

@@ -75,7 +75,7 @@ export function forward(p) {
 
   var qs = qsfnz(this.e3, this.sin_phi);
   var rh1 = this.a * Math.sqrt(this.c - this.ns0 * qs) / this.ns0;
-  var theta = this.ns0 * adjust_lon(lon - this.long0);
+  var theta = this.ns0 * adjust_lon(lon - this.long0, this.over);
   var x = rh1 * Math.sin(theta) + this.x0;
   var y = this.rh - rh1 * Math.cos(theta) + this.y0;
 
@@ -108,7 +108,7 @@ export function inverse(p) {
     lat = this.phi1z(this.e3, qs);
   }
 
-  lon = adjust_lon(theta / this.ns0 + this.long0);
+  lon = adjust_lon(theta / this.ns0 + this.long0, this.over);
   p.x = lon;
   p.y = lat;
   return p;

package/lib/projections/aeqd.js

@@ -31,7 +31,7 @@ export function forward(p) {
   var lat = p.y;
   var sinphi = Math.sin(p.y);
   var cosphi = Math.cos(p.y);
-  var dlon = adjust_lon(lon - this.long0);
+  var dlon = adjust_lon(lon - this.long0, this.over);
   var e0, e1, e2, e3, Mlp, Ml, c, kp, cos_c, vars, azi1;
   if (this.sphere) {
     if (Math.abs(this.sin_p12 - 1) <= EPSLN) {
@@ -109,12 +109,12 @@ export function inverse(p) {
       con = Math.abs(this.lat0) - HALF_PI;
       if (Math.abs(con) <= EPSLN) {
         if (this.lat0 >= 0) {
-          lon = adjust_lon(this.long0 + Math.atan2(p.x, -p.y));
+          lon = adjust_lon(this.long0 + Math.atan2(p.x, -p.y), this.over);
         } else {
-          lon = adjust_lon(this.long0 - Math.atan2(-p.x, p.y));
+          lon = adjust_lon(this.long0 - Math.atan2(-p.x, p.y), this.over);
         }
       } else {
-        lon = adjust_lon(this.long0 + Math.atan2(p.x * sinz, rh * this.cos_p12 * cosz - p.y * this.sin_p12 * sinz));
+        lon = adjust_lon(this.long0 + Math.atan2(p.x * sinz, rh * this.cos_p12 * cosz - p.y * this.sin_p12 * sinz), this.over);
       }
     }
 
@@ -132,7 +132,7 @@ export function inverse(p) {
       rh = Math.sqrt(p.x * p.x + p.y * p.y);
       M = Mlp - rh;
       lat = imlfn(M / this.a, e0, e1, e2, e3);
-      lon = adjust_lon(this.long0 + Math.atan2(p.x, -1 * p.y));
+      lon = adjust_lon(this.long0 + Math.atan2(p.x, -1 * p.y), this.over);
       p.x = lon;
       p.y = lat;
       return p;
@@ -143,7 +143,7 @@ export function inverse(p) {
       M = rh - Mlp;
 
       lat = imlfn(M / this.a, e0, e1, e2, e3);
-      lon = adjust_lon(this.long0 + Math.atan2(p.x, p.y));
+      lon = adjust_lon(this.long0 + Math.atan2(p.x, p.y), this.over);
       p.x = lon;
       p.y = lat;
       return p;

package/lib/projections/bonne.js

@@ -45,7 +45,7 @@ export function init() {
 }
 
 function e_fwd(p) {
-  var lam = adjust_lon(p.x - (this.long0 || 0));
+  var lam = adjust_lon(p.x - (this.long0 || 0), this.over);
   var phi = p.y;
   var rh, E, c;
   rh = this.am1 + this.m1 - pj_mlfn(phi, E = Math.sin(phi), c = Math.cos(phi), this.en);
@@ -73,13 +73,13 @@ function e_inv(p) {
   } else {
     throw new Error();
   }
-  p.x = adjust_lon(lam + (this.long0 || 0));
+  p.x = adjust_lon(lam + (this.long0 || 0), this.over);
   p.y = adjust_lat(phi);
   return p;
 }
 
 function s_fwd(p) {
-  var lam = adjust_lon(p.x - (this.long0 || 0));
+  var lam = adjust_lon(p.x - (this.long0 || 0), this.over);
   var phi = p.y;
   var E, rh;
   rh = this.cphi1 + this.phi1 - phi;
@@ -110,7 +110,7 @@ function s_inv(p) {
   } else {
     lam = rh * Math.atan2(p.x, p.y) / Math.cos(phi);
   }
-  p.x = adjust_lon(lam + (this.long0 || 0));
+  p.x = adjust_lon(lam + (this.long0 || 0), this.over);
   p.y = adjust_lat(phi);
   return p;
 }

package/lib/projections/cass.js

@@ -38,7 +38,7 @@ export function forward(p) {
   var x, y;
   var lam = p.x;
   var phi = p.y;
-  lam = adjust_lon(lam - this.long0);
+  lam = adjust_lon(lam - this.long0, this.over);
 
   if (this.sphere) {
     x = this.a * Math.asin(Math.cos(phi) * Math.sin(lam));
@@ -98,7 +98,7 @@ export function inverse(p) {
     lam = dl * (1 - dsq * (tl1 / 3 + (1 + 3 * tl1) * tl1 * dsq / 15)) / Math.cos(phi1);
   }
 
-  p.x = adjust_lon(lam + this.long0);
+  p.x = adjust_lon(lam + this.long0, this.over);
   p.y = adjust_lat(phi);
   return p;
 }

package/lib/projections/cea.js

@@ -30,7 +30,7 @@ export function forward(p) {
   var x, y;
   /* Forward equations
       ----------------- */
-  var dlon = adjust_lon(lon - this.long0);
+  var dlon = adjust_lon(lon - this.long0, this.over);
   if (this.sphere) {
     x = this.x0 + this.a * dlon * Math.cos(this.lat_ts);
     y = this.y0 + this.a * Math.sin(lat) / Math.cos(this.lat_ts);
@@ -53,11 +53,11 @@ export function inverse(p) {
   var lon, lat;
 
   if (this.sphere) {
-    lon = adjust_lon(this.long0 + (p.x / this.a) / Math.cos(this.lat_ts));
+    lon = adjust_lon(this.long0 + (p.x / this.a) / Math.cos(this.lat_ts), this.over);
     lat = Math.asin((p.y / this.a) * Math.cos(this.lat_ts));
   } else {
     lat = iqsfnz(this.e, 2 * p.y * this.k0 / this.a);
-    lon = adjust_lon(this.long0 + p.x / (this.a * this.k0));
+    lon = adjust_lon(this.long0 + p.x / (this.a * this.k0), this.over);
   }
 
   p.x = lon;

package/lib/projections/eqc.js

@@ -18,7 +18,7 @@ export function forward(p) {
   var lon = p.x;
   var lat = p.y;
 
-  var dlon = adjust_lon(lon - this.long0);
+  var dlon = adjust_lon(lon - this.long0, this.over);
   var dlat = adjust_lat(lat - this.lat0);
   p.x = this.x0 + (this.a * dlon * this.rc);
   p.y = this.y0 + (this.a * dlat);
@@ -31,7 +31,7 @@ export function inverse(p) {
   var x = p.x;
   var y = p.y;
 
-  p.x = adjust_lon(this.long0 + ((x - this.x0) / (this.a * this.rc)));
+  p.x = adjust_lon(this.long0 + ((x - this.x0) / (this.a * this.rc)), this.over);
   p.y = adjust_lat(this.lat0 + ((y - this.y0) / (this.a)));
   return p;
 }

package/lib/projections/eqdc.js

@@ -82,7 +82,7 @@ export function forward(p) {
     var ml = mlfn(this.e0, this.e1, this.e2, this.e3, lat);
     rh1 = this.a * (this.g - ml);
   }
-  var theta = this.ns * adjust_lon(lon - this.long0);
+  var theta = this.ns * adjust_lon(lon - this.long0, this.over);
   var x = this.x0 + rh1 * Math.sin(theta);
   var y = this.y0 + this.rh - rh1 * Math.cos(theta);
   p.x = x;
@@ -109,7 +109,7 @@ export function inverse(p) {
   }
 
   if (this.sphere) {
-    lon = adjust_lon(this.long0 + theta / this.ns);
+    lon = adjust_lon(this.long0 + theta / this.ns, this.over);
     lat = adjust_lat(this.g - rh1 / this.a);
     p.x = lon;
     p.y = lat;
@@ -117,7 +117,7 @@ export function inverse(p) {
   } else {
     var ml = this.g - rh1 / this.a;
     lat = imlfn(ml, this.e0, this.e1, this.e2, this.e3);
-    lon = adjust_lon(this.long0 + theta / this.ns);
+    lon = adjust_lon(this.long0 + theta / this.ns, this.over);
     p.x = lon;
     p.y = lat;
     return p;

package/lib/projections/eqearth.js

@@ -38,10 +38,12 @@ var A1 = 1.340264,
 export function init() {
   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;
 }
 
 export function forward(p) {
-  var lam = adjust_lon(p.x - this.long0);
+  var lam = adjust_lon(p.x - this.long0, this.over);
   var phi = p.y;
   var paramLat = Math.asin(M * Math.sin(phi)),
     paramLatSq = paramLat * paramLat,
@@ -80,7 +82,7 @@ export function inverse(p) {
     / Math.cos(paramLat);
   p.y = Math.asin(Math.sin(paramLat) / M);
 
-  p.x = adjust_lon(p.x + this.long0);
+  p.x = adjust_lon(p.x + this.long0, this.over);
   return p;
 }
 

package/lib/projections/equi.js

@@ -23,7 +23,7 @@ export function forward(p) {
   var lon = p.x;
   var lat = p.y;
 
-  var dlon = adjust_lon(lon - this.long0);
+  var dlon = adjust_lon(lon - this.long0, this.over);
   var x = this.x0 + this.a * dlon * Math.cos(this.lat0);
   var y = this.y0 + this.a * lat;
 
@@ -41,7 +41,7 @@ export function inverse(p) {
   p.y -= this.y0;
   var lat = p.y / this.a;
 
-  var lon = adjust_lon(this.long0 + p.x / (this.a * Math.cos(this.lat0)));
+  var lon = adjust_lon(this.long0 + p.x / (this.a * Math.cos(this.lat0)), this.over);
   p.x = lon;
   p.y = lat;
 }

package/lib/projections/etmerc.js

@@ -100,7 +100,7 @@ export function init() {
 }
 
 export function forward(p) {
-  var Ce = adjust_lon(p.x - this.long0);
+  var Ce = adjust_lon(p.x - this.long0, this.over);
   var Cn = p.y;
 
   Cn = gatg(this.cbg, Cn);
@@ -160,7 +160,7 @@ export function inverse(p) {
     Cn = Math.atan2(sin_Cn * cos_Ce, hypot(sin_Ce, cos_Ce * cos_Cn));
     Ce = Math.atan2(sin_Ce, cos_Ce * cos_Cn);
 
-    lon = adjust_lon(Ce + this.long0);
+    lon = adjust_lon(Ce + this.long0, this.over);
     lat = gatg(this.cgb, Cn);
   } else {
     lon = Infinity;

package/lib/projections/gnom.js

@@ -40,7 +40,7 @@ export function forward(p) {
   var lat = p.y;
   /* Forward equations
       ----------------- */
-  dlon = adjust_lon(lon - this.long0);
+  dlon = adjust_lon(lon - this.long0, this.over);
 
   sinphi = Math.sin(lat);
   cosphi = Math.cos(lat);
@@ -88,7 +88,7 @@ export function inverse(p) {
 
     lat = asinz(cosc * this.sin_p14 + (p.y * sinc * this.cos_p14) / rh);
     lon = Math.atan2(p.x * sinc, rh * this.cos_p14 * cosc - p.y * this.sin_p14 * sinc);
-    lon = adjust_lon(this.long0 + lon);
+    lon = adjust_lon(this.long0 + lon, this.over);
   } else {
     lat = this.phic0;
     lon = 0;

package/lib/projections/krovak.js

@@ -39,7 +39,7 @@ export function forward(p) {
   var gfi, u, deltav, s, d, eps, ro;
   var lon = p.x;
   var lat = p.y;
-  var delta_lon = adjust_lon(lon - this.long0);
+  var delta_lon = adjust_lon(lon - this.long0, this.over);
   /* Transformation */
   gfi = Math.pow(((1 + this.e * Math.sin(lat)) / (1 - this.e * Math.sin(lat))), (this.alfa * this.e / 2));
   u = 2 * (Math.atan(this.k * Math.pow(Math.tan(lat / 2 + this.s45), this.alfa) / gfi) - this.s45);

package/lib/projections/laea.js

@@ -91,7 +91,7 @@ export function forward(p) {
   var lam = p.x;
   var phi = p.y;
 
-  lam = adjust_lon(lam - this.long0);
+  lam = adjust_lon(lam - this.long0, this.over);
   if (this.sphere) {
     sinphi = Math.sin(phi);
     cosphi = Math.cos(phi);
@@ -259,7 +259,7 @@ export function inverse(p) {
     phi = authlat(Math.asin(ab), this.apa);
   }
 
-  p.x = adjust_lon(this.long0 + lam);
+  p.x = adjust_lon(this.long0 + lam, this.over);
   p.y = phi;
   return p;
 }

package/lib/projections/lcc.js

@@ -95,7 +95,7 @@ export function forward(p) {
     }
     rh1 = 0;
   }
-  var theta = this.ns * adjust_lon(lon - this.long0);
+  var theta = this.ns * adjust_lon(lon - this.long0, this.over);
   p.x = this.k0 * (rh1 * Math.sin(theta)) + this.x0;
   p.y = this.k0 * (this.rh - rh1 * Math.cos(theta)) + this.y0;
 
@@ -130,7 +130,7 @@ export function inverse(p) {
   } else {
     lat = -HALF_PI;
   }
-  lon = adjust_lon(theta / this.ns + this.long0);
+  lon = adjust_lon(theta / this.ns + this.long0, this.over);
 
   p.x = lon;
   p.y = lat;

package/lib/projections/merc.js

@@ -56,12 +56,12 @@ export function forward(p) {
     return null;
   } else {
     if (this.sphere) {
-      x = this.x0 + this.a * this.k0 * adjust_lon(lon - this.long0);
+      x = this.x0 + this.a * this.k0 * adjust_lon(lon - this.long0, this.over);
       y = this.y0 + this.a * this.k0 * Math.log(Math.tan(FORTPI + 0.5 * lat));
     } else {
       var sinphi = Math.sin(lat);
       var ts = tsfnz(this.e, lat, sinphi);
-      x = this.x0 + this.a * this.k0 * adjust_lon(lon - this.long0);
+      x = this.x0 + this.a * this.k0 * adjust_lon(lon - this.long0, this.over);
       y = this.y0 - this.a * this.k0 * Math.log(ts);
     }
     p.x = x;
@@ -86,7 +86,7 @@ export function inverse(p) {
       return null;
     }
   }
-  lon = adjust_lon(this.long0 + x / (this.a * this.k0));
+  lon = adjust_lon(this.long0 + x / (this.a * this.k0), this.over);
 
   p.x = lon;
   p.y = lat;

package/lib/projections/mill.js

@@ -19,7 +19,7 @@ export function forward(p) {
   var lat = p.y;
   /* Forward equations
       ----------------- */
-  var dlon = adjust_lon(lon - this.long0);
+  var dlon = adjust_lon(lon - this.long0, this.over);
   var x = this.x0 + this.a * dlon;
   var y = this.y0 + this.a * Math.log(Math.tan((Math.PI / 4) + (lat / 2.5))) * 1.25;
 
@@ -34,7 +34,7 @@ export function inverse(p) {
   p.x -= this.x0;
   p.y -= this.y0;
 
-  var lon = adjust_lon(this.long0 + p.x / this.a);
+  var lon = adjust_lon(this.long0 + p.x / this.a, this.over);
   var lat = 2.5 * (Math.atan(Math.exp(0.8 * p.y / this.a)) - Math.PI / 4);
 
   p.x = lon;

package/lib/projections/moll.js

@@ -1,6 +1,13 @@
 import adjust_lon from '../common/adjust_lon';
-export function init() {}
 import { EPSLN } from '../constants/values';
+
+/** @this {import('../defs.js').ProjectionDefinition} */
+export function init() {
+  this.x0 = this.x0 !== undefined ? this.x0 : 0;
+  this.y0 = this.y0 !== undefined ? this.y0 : 0;
+  this.long0 = this.long0 !== undefined ? this.long0 : 0;
+}
+
 /* Mollweide forward equations--mapping lat,long to x,y
     ---------------------------------------------------- */
 export function forward(p) {
@@ -9,7 +16,7 @@ export function forward(p) {
   var lon = p.x;
   var lat = p.y;
 
-  var delta_lon = adjust_lon(lon - this.long0);
+  var delta_lon = adjust_lon(lon - this.long0, this.over);
   var theta = lat;
   var con = Math.PI * Math.sin(lat);
 
@@ -55,7 +62,7 @@ export function inverse(p) {
     arg = 0.999999999999;
   }
   theta = Math.asin(arg);
-  var lon = adjust_lon(this.long0 + (p.x / (0.900316316158 * this.a * Math.cos(theta))));
+  var lon = adjust_lon(this.long0 + (p.x / (0.900316316158 * this.a * Math.cos(theta))), this.over);
   if (lon < (-Math.PI)) {
     lon = -Math.PI;
   }