proj4 2.14.0 → 2.16.0

package/eslint.config.mjs

@@ -0,0 +1,41 @@
+import stylistic from '@stylistic/eslint-plugin';
+import globals from 'globals';
+
+export default [
+  stylistic.configs.customize({
+    indent: 2,
+    quotes: 'single',
+    quoteProps: 'as-needed',
+    semi: true,
+    braceStyle: '1tbs',
+    commaDangle: 'never'
+  }),
+  {
+    files: ['**/*.js', '**/*.mjs'],
+    languageOptions: {
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      globals: {
+        ...globals.browser,
+        ...globals.node
+      }
+    },
+    rules: {
+      curly: 'error',
+      eqeqeq: 'error',
+      'no-use-before-define': ['error', { functions: false }],
+      'no-undef': 'error',
+      'no-unused-vars': 'error'
+    }
+  },
+  { files: ['test/**/*.js', 'test/**/*.mjs'],
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.mocha,
+        ...globals.amd
+      }
+    }
+  }
+];

package/lib/Point.js

@@ -1,4 +1,4 @@
-import {toPoint, forward} from 'mgrs';
+import { toPoint, forward } from 'mgrs';
 
 function Point(x, y, z) {
   if (!(this instanceof Point)) {
@@ -8,7 +8,7 @@ function Point(x, y, z) {
     this.x = x[0];
     this.y = x[1];
     this.z = x[2] || 0.0;
-  } else if(typeof x === 'object') {
+  } else if (typeof x === 'object') {
     this.x = x.x;
     this.y = x.y;
     this.z = x.z || 0.0;
@@ -25,10 +25,10 @@ function Point(x, y, z) {
   console.warn('proj4.Point will be removed in version 3, use proj4.toPoint');
 }
 
-Point.fromMGRS = function(mgrsStr) {
+Point.fromMGRS = function (mgrsStr) {
   return new Point(toPoint(mgrsStr));
 };
-Point.prototype.toMGRS = function(accuracy) {
+Point.prototype.toMGRS = function (accuracy) {
   return forward([this.x, this.y], accuracy);
 };
 export default Point;

package/lib/Proj.js

@@ -1,28 +1,28 @@
 import parseCode from './parseCode';
 import extend from './extend';
 import projections from './projections';
-import {sphere as dc_sphere, eccentricity as dc_eccentricity} from './deriveConstants';
+import { sphere as dc_sphere, eccentricity as dc_eccentricity } from './deriveConstants';
 import Datum from './constants/Datum';
 import datum from './datum';
 import match from './match';
-import {getNadgrids} from "./nadgrid";
+import { getNadgrids } from './nadgrid';
 
-function Projection(srsCode,callback) {
+function Projection(srsCode, callback) {
   if (!(this instanceof Projection)) {
     return new Projection(srsCode);
   }
-  callback = callback || function(error){
-    if(error){
+  callback = callback || function (error) {
+    if (error) {
       throw error;
     }
   };
   var json = parseCode(srsCode);
-  if(typeof json !== 'object'){
+  if (typeof json !== 'object') {
     callback('Could not parse to valid json: ' + srsCode);
     return;
   }
   var ourProj = Projection.projections.get(json.projName);
-  if(!ourProj){
+  if (!ourProj) {
     callback('Could not get projection name from: ' + srsCode);
     return;
   }
@@ -67,7 +67,6 @@ function Projection(srsCode,callback) {
 
   // legecy callback from back in the day when it went to spatialreference.org
   callback(null, this);
-
 }
 Projection.projections = projections;
 Projection.projections.start();

package/lib/adjust_axis.js

@@ -1,4 +1,4 @@
-export default function(crs, denorm, point) {
+export default function (crs, denorm, point) {
   var xin = point.x,
     yin = point.y,
     zin = point.z || 0.0;
@@ -10,51 +10,48 @@ export default function(crs, denorm, point) {
     }
     if (i === 0) {
       v = xin;
-      if ("ew".indexOf(crs.axis[i]) !== -1) {
+      if ('ew'.indexOf(crs.axis[i]) !== -1) {
         t = 'x';
       } else {
         t = 'y';
       }
-
-    }
-    else if (i === 1) {
+    } else if (i === 1) {
       v = yin;
-      if ("ns".indexOf(crs.axis[i]) !== -1) {
+      if ('ns'.indexOf(crs.axis[i]) !== -1) {
         t = 'y';
       } else {
         t = 'x';
       }
-    }
-    else {
+    } else {
       v = zin;
       t = 'z';
     }
     switch (crs.axis[i]) {
-    case 'e':
-      out[t] = v;
-      break;
-    case 'w':
-      out[t] = -v;
-      break;
-    case 'n':
-      out[t] = v;
-      break;
-    case 's':
-      out[t] = -v;
-      break;
-    case 'u':
-      if (point[t] !== undefined) {
-        out.z = v;
-      }
-      break;
-    case 'd':
-      if (point[t] !== undefined) {
-        out.z = -v;
-      }
-      break;
-    default:
-      //console.log("ERROR: unknow axis ("+crs.axis[i]+") - check definition of "+crs.projName);
-      return null;
+      case 'e':
+        out[t] = v;
+        break;
+      case 'w':
+        out[t] = -v;
+        break;
+      case 'n':
+        out[t] = v;
+        break;
+      case 's':
+        out[t] = -v;
+        break;
+      case 'u':
+        if (point[t] !== undefined) {
+          out.z = v;
+        }
+        break;
+      case 'd':
+        if (point[t] !== undefined) {
+          out.z = -v;
+        }
+        break;
+      default:
+      // console.log("ERROR: unknow axis ("+crs.axis[i]+") - check definition of "+crs.projName);
+        return null;
     }
   }
   return out;

package/lib/common/acosh.js

@@ -1,3 +1,3 @@
-export default function(x) {
+export default function (x) {
   return 2 * Math.log(Math.sqrt((x + 1) / 2) + Math.sqrt((x - 1) / 2));
-}
+}

package/lib/common/adjust_lat.js

@@ -1,6 +1,6 @@
-import {HALF_PI} from '../constants/values';
+import { HALF_PI } from '../constants/values';
 import sign from './sign';
 
-export default function(x) {
+export default function (x) {
   return (Math.abs(x) < HALF_PI) ? x : (x - (sign(x) * Math.PI));
 }

package/lib/common/adjust_lon.js

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

package/lib/common/adjust_zone.js

@@ -1,6 +1,6 @@
 import adjust_lon from './adjust_lon';
 
-export default function(zone, lon) {
+export default function (zone, lon) {
   if (zone === undefined) {
     zone = Math.floor((adjust_lon(lon) + Math.PI) * 30 / Math.PI) + 1;
 

package/lib/common/asinh.js

@@ -1,4 +1,4 @@
-export default function(x) {
+export default function (x) {
   var s = (x >= 0 ? 1 : -1);
   return s * (Math.log(Math.abs(x) + Math.sqrt(x * x + 1)));
-}
+}

package/lib/common/asinhy.js

@@ -1,7 +1,7 @@
 import hypot from './hypot';
 import log1py from './log1py';
 
-export default function(x) {
+export default function (x) {
   var y = Math.abs(x);
   y = log1py(y * (1 + y / (hypot(1, y) + 1)));
 

package/lib/common/asinz.js

@@ -1,6 +1,6 @@
-export default function(x) {
+export default function (x) {
   if (Math.abs(x) > 1) {
     x = (x > 1) ? 1 : -1;
   }
   return Math.asin(x);
-}
+}

package/lib/common/atanh.js

@@ -1,3 +1,3 @@
-export default function(x) {
+export default function (x) {
   return Math.log((x - 1) / (x + 1)) / 2;
-}
+}

package/lib/common/clens.js

@@ -1,4 +1,4 @@
-export default function(pp, arg_r) {
+export default function (pp, arg_r) {
   var r = 2 * Math.cos(arg_r);
   var i = pp.length - 1;
   var hr1 = pp[i];

package/lib/common/clens_cmplx.js

@@ -1,7 +1,7 @@
 import sinh from './sinh';
 import cosh from './cosh';
 
-export default function(pp, arg_r, arg_i) {
+export default function (pp, arg_r, arg_i) {
   var sin_arg_r = Math.sin(arg_r);
   var cos_arg_r = Math.cos(arg_r);
   var sinh_arg_i = sinh(arg_i);

package/lib/common/cosh.js

@@ -1,5 +1,5 @@
-export default function(x) {
+export default function (x) {
   var r = Math.exp(x);
   r = (r + 1 / r) / 2;
   return r;
-}
+}

package/lib/common/e0fn.js

@@ -1,3 +1,3 @@
-export default function(x) {
+export default function (x) {
   return (1 - 0.25 * x * (1 + x / 16 * (3 + 1.25 * x)));
-}
+}

package/lib/common/e1fn.js

@@ -1,3 +1,3 @@
-export default function(x) {
+export default function (x) {
   return (0.375 * x * (1 + 0.25 * x * (1 + 0.46875 * x)));
-}
+}

package/lib/common/e2fn.js

@@ -1,3 +1,3 @@
-export default function(x) {
+export default function (x) {
   return (0.05859375 * x * x * (1 + 0.75 * x));
-}
+}

package/lib/common/e3fn.js

@@ -1,3 +1,3 @@
-export default function(x) {
+export default function (x) {
   return (x * x * x * (35 / 3072));
-}
+}

package/lib/common/fL.js

@@ -1,5 +1,5 @@
-import {HALF_PI} from '../constants/values';
+import { HALF_PI } from '../constants/values';
 
-export default function(x, L) {
+export default function (x, L) {
   return 2 * Math.atan(x * Math.exp(L)) - HALF_PI;
 }

package/lib/common/gN.js

@@ -1,4 +1,4 @@
-export default function(a, e, sinphi) {
+export default function (a, e, sinphi) {
   var temp = e * sinphi;
   return a / Math.sqrt(1 - temp * temp);
-}
+}

package/lib/common/gatg.js

@@ -1,4 +1,4 @@
-export default function(pp, B) {
+export default function (pp, B) {
   var cos_2B = 2 * Math.cos(2 * B);
   var i = pp.length - 1;
   var h1 = pp[i];

package/lib/common/hypot.js

@@ -1,4 +1,4 @@
-export default function(x, y) {
+export default function (x, y) {
   x = Math.abs(x);
   y = Math.abs(y);
   var a = Math.max(x, y);

package/lib/common/imlfn.js

@@ -1,4 +1,4 @@
-export default function(ml, e0, e1, e2, e3) {
+export default function (ml, e0, e1, e2, e3) {
   var phi;
   var dphi;
 
@@ -11,6 +11,6 @@ export default function(ml, e0, e1, e2, e3) {
     }
   }
 
-  //..reportError("IMLFN-CONV:Latitude failed to converge after 15 iterations");
+  // ..reportError("IMLFN-CONV:Latitude failed to converge after 15 iterations");
   return NaN;
-}
+}

package/lib/common/invlatiso.js

@@ -1,6 +1,6 @@
 import fL from './fL';
 
-export default function(eccent, ts) {
+export default function (eccent, ts) {
   var phi = fL(1, ts);
   var Iphi = 0;
   var con = 0;
@@ -10,4 +10,4 @@ export default function(eccent, ts) {
     phi = fL(Math.exp(eccent * Math.log((1 + con) / (1 - con)) / 2), ts);
   } while (Math.abs(phi - Iphi) > 1.0e-12);
   return phi;
-}
+}

package/lib/common/iqsfnz.js

@@ -1,16 +1,15 @@
-import {HALF_PI} from '../constants/values';
+import { HALF_PI } from '../constants/values';
 
-export default function(eccent, q) {
+export default function (eccent, q) {
   var temp = 1 - (1 - eccent * eccent) / (2 * eccent) * Math.log((1 - eccent) / (1 + eccent));
   if (Math.abs(Math.abs(q) - temp) < 1.0E-6) {
     if (q < 0) {
       return (-1 * HALF_PI);
-    }
-    else {
+    } else {
       return HALF_PI;
     }
   }
-  //var phi = 0.5* q/(1-eccent*eccent);
+  // var phi = 0.5* q/(1-eccent*eccent);
   var phi = Math.asin(0.5 * q);
   var dphi;
   var sin_phi;
@@ -27,6 +26,6 @@ export default function(eccent, q) {
     }
   }
 
-  //console.log("IQSFN-CONV:Latitude failed to converge after 30 iterations");
+  // console.log("IQSFN-CONV:Latitude failed to converge after 30 iterations");
   return NaN;
 }

package/lib/common/latiso.js

@@ -1,6 +1,6 @@
-import {HALF_PI} from '../constants/values';
+import { HALF_PI } from '../constants/values';
 
-export default function(eccent, phi, sinphi) {
+export default function (eccent, phi, sinphi) {
   if (Math.abs(phi) > HALF_PI) {
     return Number.NaN;
   }

package/lib/common/log1py.js

@@ -1,4 +1,4 @@
-export default function(x) {
+export default function (x) {
   var y = 1 + x;
   var z = y - 1;
 

package/lib/common/mlfn.js

@@ -1,3 +1,3 @@
-export default function(e0, e1, e2, e3, phi) {
+export default function (e0, e1, e2, e3, phi) {
   return (e0 * phi - e1 * Math.sin(2 * phi) + e2 * Math.sin(4 * phi) - e3 * Math.sin(6 * phi));
-}
+}

package/lib/common/msfnz.js

@@ -1,4 +1,4 @@
-export default function(eccent, sinphi, cosphi) {
+export default function (eccent, sinphi, cosphi) {
   var con = eccent * sinphi;
   return cosphi / (Math.sqrt(1 - con * con));
-}
+}

package/lib/common/phi2z.js

@@ -1,6 +1,6 @@
-import {HALF_PI} from '../constants/values';
+import { HALF_PI } from '../constants/values';
 
-export default function(eccent, ts) {
+export default function (eccent, ts) {
   var eccnth = 0.5 * eccent;
   var con, dphi;
   var phi = HALF_PI - 2 * Math.atan(ts);
@@ -12,6 +12,6 @@ export default function(eccent, ts) {
       return phi;
     }
   }
-  //console.log("phi2z has NoConvergence");
+  // console.log("phi2z has NoConvergence");
   return -9999;
 }

package/lib/common/pj_enfn.js

@@ -11,7 +11,7 @@ var C66 = 0.36458333333333333333;
 var C68 = 0.00569661458333333333;
 var C88 = 0.3076171875;
 
-export default function(es) {
+export default function (es) {
   var en = [];
   en[0] = C00 - es * (C02 + es * (C04 + es * (C06 + es * C08)));
   en[1] = es * (C22 - es * (C04 + es * (C06 + es * C08)));
@@ -21,4 +21,4 @@ export default function(es) {
   en[3] = t * (C66 - es * C68);
   en[4] = t * es * C88;
   return en;
-}
+}

package/lib/common/pj_inv_mlfn.js

@@ -1,22 +1,22 @@
-import pj_mlfn from "./pj_mlfn";
-import {EPSLN} from '../constants/values';
+import pj_mlfn from './pj_mlfn';
+import { EPSLN } from '../constants/values';
 
 var MAX_ITER = 20;
 
-export default function(arg, es, en) {
+export default function (arg, es, en) {
   var k = 1 / (1 - es);
   var phi = arg;
   for (var i = MAX_ITER; i; --i) { /* rarely goes over 2 iterations */
     var s = Math.sin(phi);
     var t = 1 - es * s * s;
-    //t = this.pj_mlfn(phi, s, Math.cos(phi), en) - arg;
-    //phi -= t * (t * Math.sqrt(t)) * k;
+    // t = this.pj_mlfn(phi, s, Math.cos(phi), en) - arg;
+    // phi -= t * (t * Math.sqrt(t)) * k;
     t = (pj_mlfn(phi, s, Math.cos(phi), en) - arg) * (t * Math.sqrt(t)) * k;
     phi -= t;
     if (Math.abs(t) < EPSLN) {
       return phi;
     }
   }
-  //..reportError("cass:pj_inv_mlfn: Convergence error");
+  // ..reportError("cass:pj_inv_mlfn: Convergence error");
   return phi;
 }

package/lib/common/pj_mlfn.js

@@ -1,5 +1,5 @@
-export default function(phi, sphi, cphi, en) {
+export default function (phi, sphi, cphi, en) {
   cphi *= sphi;
   sphi *= sphi;
   return (en[0] * phi - cphi * (en[1] + sphi * (en[2] + sphi * (en[3] + sphi * en[4]))));
-}
+}

package/lib/common/qsfnz.js

@@ -1,10 +1,9 @@
-export default function(eccent, sinphi) {
+export default function (eccent, sinphi) {
   var con;
   if (eccent > 1.0e-7) {
     con = eccent * sinphi;
     return ((1 - eccent * eccent) * (sinphi / (1 - con * con) - (0.5 / eccent) * Math.log((1 - con) / (1 + con))));
-  }
-  else {
+  } else {
     return (2 * sinphi);
   }
-}
+}

package/lib/common/sign.js

@@ -1,3 +1,3 @@
-export default function(x) {
-  return x<0 ? -1 : 1;
-}
+export default function (x) {
+  return x < 0 ? -1 : 1;
+}

package/lib/common/sinh.js

@@ -1,5 +1,5 @@
-export default function(x) {
+export default function (x) {
   var r = Math.exp(x);
   r = (r - 1 / r) / 2;
   return r;
-}
+}

package/lib/common/srat.js

@@ -1,3 +1,3 @@
-export default function(esinp, exp) {
+export default function (esinp, exp) {
   return (Math.pow((1 - esinp) / (1 + esinp), exp));
-}
+}

package/lib/common/tanh.js

@@ -1,5 +1,5 @@
-export default function(x) {
+export default function (x) {
   var r = Math.exp(x);
   r = (r - 1 / r) / (r + 1 / r);
   return r;
-}
+}

package/lib/common/toPoint.js

@@ -1,13 +1,13 @@
-export default function (array){
+export default function (array) {
   var out = {
     x: array[0],
     y: array[1]
   };
-  if (array.length>2) {
+  if (array.length > 2) {
     out.z = array[2];
   }
-  if (array.length>3) {
+  if (array.length > 3) {
     out.m = array[3];
   }
   return out;
-}
+}

package/lib/common/tsfnz.js

@@ -1,6 +1,6 @@
-import {HALF_PI} from '../constants/values';
+import { HALF_PI } from '../constants/values';
 
-export default function(eccent, phi, sinphi) {
+export default function (eccent, phi, sinphi) {
   var con = eccent * sinphi;
   var com = 0.5 * eccent;
   con = Math.pow(((1 - con) / (1 + con)), com);