proj4 2.20.2 → 2.20.4

package/lib/constants/Datum.js

@@ -129,7 +129,7 @@ var datums = {
     towgs84: '-178.3,-316.7,-131.5,5.278,6.077,10.979,19.166'
   },
   EPSG_4231: {
-    towgs84: '-83.11,-97.38,-117.22,0.0276,-0.2167,0.2147,0.1218'
+    towgs84: '-83.11,-97.38,-117.22,0.005693,-0.044698,0.044285,0.1218'
   },
   EPSG_4274: {
     towgs84: '-230.994,102.591,25.199,0.633,-0.239,0.9,1.95'
@@ -159,7 +159,7 @@ var datums = {
     towgs84: '8.846,-4.394,-1.122,-0.00237,-0.146528,0.130428,0.783926'
   },
   EPSG_4289: {
-    towgs84: '565.7381,50.4018,465.2904,-1.91514,1.60363,-9.09546,4.07244'
+    towgs84: '565.7381,50.4018,465.2904,-0.395026,0.330772,-1.876073,4.07244'
   },
   EPSG_4230: {
     towgs84: '-68.863,-134.888,-111.49,-0.53,-0.14,0.57,-3.4'
@@ -189,7 +189,7 @@ var datums = {
     towgs84: '-45,417,-3.5'
   },
   EPSG_4611: {
-    towgs84: '-162.619,-276.959,-161.764,0.067753,-2.243649,-1.158827,-1.094246'
+    towgs84: '-162.619,-276.959,-161.764,0.067753,-2.243648,-1.158828,-1.094246'
   },
   EPSG_4633: {
     towgs84: '137.092,131.66,91.475,-1.9436,-11.5993,-4.3321,-7.4824'
@@ -207,7 +207,7 @@ var datums = {
     towgs84: '482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15'
   },
   EPSG_4660: {
-    towgs84: '982.6087,552.753,-540.873,32.39344,-153.25684,-96.2266,16.805'
+    towgs84: '982.6087,552.753,-540.873,6.681627,-31.611492,-19.848161,16.805'
   },
   EPSG_4662: {
     towgs84: '97.295,-263.247,310.882,-1.5999,0.8386,3.1409,13.3259'
@@ -237,7 +237,7 @@ var datums = {
     towgs84: '217.109,86.452,23.711,0.0183,-0.0003,0.007,-0.0093'
   },
   EPSG_9333: {
-    towgs84: '0,0,0,-8.393,0.749,-10.276,0'
+    towgs84: '0,0,0,-0.008393,0.000749,-0.010276,0'
   },
   EPSG_9059: {
     towgs84: '0,0,0'
@@ -393,7 +393,7 @@ var datums = {
     towgs84: '674.374,15.056,405.346'
   },
   EPSG_4617: {
-    towgs84: '-0.991,1.9072,0.5129,1.25033e-7,4.6785e-8,5.6529e-8,0'
+    towgs84: '-0.991,1.9072,0.5129,0.02579,0.00965,0.01166,0'
   },
   EPSG_4663: {
     towgs84: '-210.502,-66.902,-48.476,2.094,-15.067,-5.817,0.485'
@@ -456,10 +456,10 @@ var datums = {
     towgs84: '275.57,676.78,229.6'
   },
   EPSG_4283: {
-    towgs84: '61.55,-10.87,-40.19,39.4924,32.7221,32.8979,-9.994'
+    towgs84: '0.06155,-0.01087,-0.04019,0.039492,0.032722,0.032898,-0.009994'
   },
   EPSG_4317: {
-    towgs84: '2.3287,-147.0425,-92.0802,-0.3092483,0.32482185,0.49729934,5.68906266'
+    towgs84: '2.3287,-147.0425,-92.0802,-0.309248,0.324822,0.497299,5.689063'
   },
   EPSG_4272: {
     towgs84: '59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993'
@@ -582,7 +582,7 @@ var datums = {
     towgs84: '-208.4058,-109.8777,-2.5764'
   },
   ESRI_104101: {
-    towgs84: '374,150,588'
+    towgs84: '372.87,149.23,585.29'
   },
   EPSG_4693: {
     towgs84: '0,-0.15,0.68'
@@ -1267,6 +1267,87 @@ var datums = {
   },
   EPSG_4818: {
     towgs84: '589,76,480'
+  },
+  EPSG_10328: {
+    towgs84: '0,0,0'
+  },
+  EPSG_9782: {
+    towgs84: '0,0,0'
+  },
+  EPSG_9777: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10690: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10639: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10739: {
+    towgs84: '0,0,0'
+  },
+  EPSG_7686: {
+    towgs84: '0,0,0'
+  },
+  EPSG_8900: {
+    towgs84: '0,0,0'
+  },
+  EPSG_5886: {
+    towgs84: '0,0,0'
+  },
+  EPSG_7683: {
+    towgs84: '0,0,0'
+  },
+  EPSG_6668: {
+    towgs84: '0,0,0'
+  },
+  EPSG_20046: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10299: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10310: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10475: {
+    towgs84: '0,0,0'
+  },
+  EPSG_4742: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10671: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10762: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10725: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10791: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10800: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10305: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10941: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10968: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10875: {
+    towgs84: '0,0,0'
+  },
+  EPSG_6318: {
+    towgs84: '0,0,0'
+  },
+  EPSG_10910: {
+    towgs84: '0,0,0'
   }
 };
 

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;
@@ -35,31 +38,27 @@ function testProj(code) {
  * @returns {import('./defs').ProjectionDefinition}
  */
 function parse(code) {
+  let out;
   if (testObj(code)) {
     // check to see if this is a WKT string
     if (testDef(code)) {
-      return defs[code];
-    }
-    if (testWKT(code)) {
-      var out = wkt(code);
-      // test of spetial case, due to this being a very common and often malformed
-      if (checkMercator(out)) {
-        return defs['EPSG:3857'];
-      }
+      out = defs[code];
+    } else if (testWKT(code)) {
+      out = wkt(code);
       var maybeProjStr = checkProjStr(out);
       if (maybeProjStr) {
-        return projStr(maybeProjStr);
+        out = projStr(maybeProjStr);
       }
-      return out;
-    }
-    if (testProj(code)) {
-      return projStr(code);
+    } else if (testProj(code)) {
+      out = projStr(code);
     }
   } else if (!('projName' in code)) {
-    return wkt(code);
+    out = wkt(code);
   } else {
-    return code;
+    out = code;
   }
+  // test for special Web Mercator case, due to this being a very common and often malformed
+  return out && checkMercator(out) ? defs['EPSG:3857'] : out;
 }
 
 export default parse;

package/lib/projections/krovak.js

@@ -97,7 +97,7 @@ export function inverse(p) {
   return (p);
 }
 
-export var names = ['Krovak', 'krovak'];
+export var names = ['Krovak', 'Krovak Modified', 'Krovak (North Orientated)', 'Krovak Modified (North Orientated)', 'krovak'];
 export default {
   init: init,
   forward: forward,

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.4",
   "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"
   }
 }