proj4 2.20.2 → 2.20.3

package/lib/parseCode.js

@@ -13,6 +13,9 @@ function testWKT(code) {
 }
 var codes = ['3857', '900913', '3785', '102113'];
 function checkMercator(item) {
+  if (item.title) {
+    return item.title.toLowerCase().indexOf('epsg:') === 0 && codes.indexOf(item.title.substr(5)) > -1;
+  }
   var auth = match(item, 'authority');
   if (!auth) {
     return;

package/lib/projections/ortho.js

@@ -14,8 +14,8 @@ export function init() {
 
   /* Place parameters in static storage for common use
       ------------------------------------------------- */
-  this.sin_p14 = Math.sin(this.lat0);
-  this.cos_p14 = Math.cos(this.lat0);
+  this.sin_p14 = Math.sin(this.lat0 || 0);
+  this.cos_p14 = Math.cos(this.lat0 || 0);
 }
 
 /* Orthographic forward equations--mapping lat,long to x,y
@@ -30,7 +30,7 @@ export function forward(p) {
   var lat = p.y;
   /* Forward equations
       ----------------- */
-  dlon = adjust_lon(lon - this.long0, this.over);
+  dlon = adjust_lon(lon - (this.long0 || 0), this.over);
 
   sinphi = Math.sin(lat);
   cosphi = Math.cos(lat);
@@ -40,7 +40,7 @@ export function forward(p) {
   ksp = 1;
   if ((g > 0) || (Math.abs(g) <= EPSLN)) {
     x = this.a * ksp * cosphi * Math.sin(dlon);
-    y = this.y0 + this.a * ksp * (this.cos_p14 * sinphi - this.sin_p14 * cosphi * coslon);
+    y = (this.y0 || 0) + this.a * ksp * (this.cos_p14 * sinphi - this.sin_p14 * cosphi * coslon);
   }
   p.x = x;
   p.y = y;
@@ -53,36 +53,39 @@ export function inverse(p) {
   var sinz, cosz; /* sin of z and cos of z      */
   var con;
   var lon, lat;
+  var long0, lat0;
   /* Inverse equations
       ----------------- */
-  p.x -= this.x0;
-  p.y -= this.y0;
+  p.x -= this.x0 || 0;
+  p.y -= this.y0 || 0;
   rh = Math.sqrt(p.x * p.x + p.y * p.y);
   z = asinz(rh / this.a);
 
   sinz = Math.sin(z);
   cosz = Math.cos(z);
 
-  lon = this.long0;
+  long0 = this.long0 || 0;
+  lat0 = this.lat0 || 0;
+  lon = long0;
   if (Math.abs(rh) <= EPSLN) {
-    lat = this.lat0;
+    lat = lat0;
     p.x = lon;
     p.y = lat;
     return p;
   }
   lat = asinz(cosz * this.sin_p14 + (p.y * sinz * this.cos_p14) / rh);
-  con = Math.abs(this.lat0) - HALF_PI;
+  con = Math.abs(lat0) - HALF_PI;
   if (Math.abs(con) <= EPSLN) {
-    if (this.lat0 >= 0) {
-      lon = adjust_lon(this.long0 + Math.atan2(p.x, -p.y), this.over);
+    if (lat0 >= 0) {
+      lon = adjust_lon(long0 + Math.atan2(p.x, -p.y), this.over);
     } else {
-      lon = adjust_lon(this.long0 - Math.atan2(-p.x, p.y), this.over);
+      lon = adjust_lon(long0 - Math.atan2(-p.x, p.y), this.over);
     }
     p.x = lon;
     p.y = lat;
     return p;
   }
-  lon = adjust_lon(this.long0 + Math.atan2((p.x * sinz), rh * this.cos_p14 * cosz - p.y * this.sin_p14 * sinz), this.over);
+  lon = adjust_lon(long0 + Math.atan2((p.x * sinz), rh * this.cos_p14 * cosz - p.y * this.sin_p14 * sinz), this.over);
   p.x = lon;
   p.y = lat;
   return p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.20.2",
+  "version": "2.20.3",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "homepage": "https://proj4js.github.io/proj4js/",
   "main": "dist/proj4-src.js",
@@ -48,6 +48,6 @@
   },
   "dependencies": {
     "mgrs": "1.0.0",
-    "wkt-parser": "^1.5.1"
+    "wkt-parser": "^1.5.3"
   }
 }