proj4 2.7.0 → 2.7.4

package/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.7.0",
+  "version": "2.7.4",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "homepage": "https://github.com/proj4js/proj4js",
   "main": "dist/proj4.js",

package/component.json

@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.7.0",
+  "version": "2.7.4",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "repo": "proj4js/proj4js",
   "keywords": [

package/dist/proj4-src.js

@@ -127,6 +127,9 @@
         alpha: function(v) {
           self.alpha = parseFloat(v) * D2R;
         },
+        gamma: function(v) {
+          self.rectified_grid_angle = parseFloat(v);
+        },
         lonc: function(v) {
           self.longc = v * D2R;
         },
@@ -530,15 +533,14 @@
       if (wkt.AXIS) {
         var axisOrder = '';
         for (var i = 0, ii = wkt.AXIS.length; i < ii; ++i) {
-          var axis = wkt.AXIS[i];
-          var descriptor = axis[0].toLowerCase();
-          if (descriptor.indexOf('north') !== -1) {
+          var axis = [wkt.AXIS[i][0].toLowerCase(), wkt.AXIS[i][1].toLowerCase()];
+          if (axis[0].indexOf('north') !== -1 || ((axis[0] === 'y' || axis[0] === 'lat') && axis[1] === 'north')) {
             axisOrder += 'n';
-          } else if (descriptor.indexOf('south') !== -1) {
+          } else if (axis[0].indexOf('south') !== -1 || ((axis[0] === 'y' || axis[0] === 'lat') && axis[1] === 'south')) {
             axisOrder += 's';
-          } else if (descriptor.indexOf('east') !== -1) {
+          } else if (axis[0].indexOf('east') !== -1 || ((axis[0] === 'x' || axis[0] === 'lon') && axis[1] === 'east')) {
             axisOrder += 'e';
-          } else if (descriptor.indexOf('west') !== -1) {
+          } else if (axis[0].indexOf('west') !== -1 || ((axis[0] === 'x' || axis[0] === 'lon') && axis[1] === 'west')) {
             axisOrder += 'w';
           }
         }
@@ -641,12 +643,22 @@
       };
       var list = [
         ['standard_parallel_1', 'Standard_Parallel_1'],
+        ['standard_parallel_1', 'Latitude of 1st standard parallel'],
         ['standard_parallel_2', 'Standard_Parallel_2'],
+        ['standard_parallel_2', 'Latitude of 2nd standard parallel'],
         ['false_easting', 'False_Easting'],
+        ['false_easting', 'False easting'],
+        ['false-easting', 'Easting at false origin'],
         ['false_northing', 'False_Northing'],
+        ['false_northing', 'False northing'],
+        ['false_northing', 'Northing at false origin'],
         ['central_meridian', 'Central_Meridian'],
+        ['central_meridian', 'Longitude of natural origin'],
+        ['central_meridian', 'Longitude of false origin'],
         ['latitude_of_origin', 'Latitude_Of_Origin'],
         ['latitude_of_origin', 'Central_Parallel'],
+        ['latitude_of_origin', 'Latitude of natural origin'],
+        ['latitude_of_origin', 'Latitude of false origin'],
         ['scale_factor', 'Scale_Factor'],
         ['k0', 'scale_factor'],
         ['latitude_of_center', 'Latitude_Of_Center'],
@@ -1328,7 +1340,7 @@
     };
 
     exports$3.potsdam = {
-      towgs84: "606.0,23.0,413.0",
+      towgs84: "598.1,73.7,418.2,0.202,0.045,-2.455,6.7",
       ellipse: "bessel",
       datumName: "Potsdam Rauenberg 1950 DHDN"
     };
@@ -1340,7 +1352,7 @@
     };
 
     exports$3.hermannskogel = {
-      towgs84: "653.0,-212.0,449.0",
+      towgs84: "577.326,90.129,463.919,5.137,1.474,5.297,2.4232",
       ellipse: "bessel",
       datumName: "Hermannskogel"
     };
@@ -1600,7 +1612,7 @@
       if (json.datumCode && json.datumCode !== 'none') {
         var datumDef = match(exports$3, json.datumCode);
         if (datumDef) {
-          json.datum_params = datumDef.towgs84 ? datumDef.towgs84.split(',') : null;
+          json.datum_params = json.datum_params || (datumDef.towgs84 ? datumDef.towgs84.split(',') : null);
           json.ellps = datumDef.ellipse;
           json.datumName = datumDef.datumName ? datumDef.datumName : json.datumCode;
         }
@@ -1608,6 +1620,8 @@
       json.k0 = json.k0 || 1.0;
       json.axis = json.axis || 'enu';
       json.ellps = json.ellps || 'wgs84';
+      json.lat1 = json.lat1 || json.lat0; // Lambert_Conformal_Conic_1SP, for example, needs this
+
       var sphere_ = sphere(json.a, json.b, json.rf, json.ellps, json.sphere);
       var ecc = eccentricity(sphere_.a, sphere_.b, sphere_.rf, json.R_A);
       var nadgrids = getNadgrids(json.nadgrids);
@@ -3988,166 +4002,234 @@
       names: names$9
     };
 
+    var TOL = 1e-7;
+
+    function isTypeA(P) {
+      var typeAProjections = ['Hotine_Oblique_Mercator','Hotine_Oblique_Mercator_Azimuth_Natural_Origin'];
+      var projectionName = typeof P.PROJECTION === "object" ? Object.keys(P.PROJECTION)[0] : P.PROJECTION;
+      
+      return 'no_uoff' in P || 'no_off' in P || typeAProjections.indexOf(projectionName) !== -1;
+    }
+
+
     /* Initialize the Oblique Mercator  projection
         ------------------------------------------*/
-    function init$9() {
-      this.no_off = this.no_off || false;
-      this.no_rot = this.no_rot || false;
-
-      if (isNaN(this.k0)) {
-        this.k0 = 1;
+    function init$9() {  
+      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;
+      
+      // only Type A uses the no_off or no_uoff property
+      // https://github.com/OSGeo/proj.4/issues/104
+      this.no_off = isTypeA(this);
+      this.no_rot = 'no_rot' in this;
+      
+      var alp = false;
+      if ("alpha" in this) {
+        alp = true;
       }
-      var sinlat = Math.sin(this.lat0);
-      var coslat = Math.cos(this.lat0);
-      var con = this.e * sinlat;
 
-      this.bl = Math.sqrt(1 + this.es / (1 - this.es) * Math.pow(coslat, 4));
-      this.al = this.a * this.bl * this.k0 * Math.sqrt(1 - this.es) / (1 - con * con);
-      var t0 = tsfnz(this.e, this.lat0, sinlat);
-      var dl = this.bl / coslat * Math.sqrt((1 - this.es) / (1 - con * con));
-      if (dl * dl < 1) {
-        dl = 1;
+      var gam = false;
+      if ("rectified_grid_angle" in this) {
+        gam = true;
       }
-      var fl;
-      var gl;
-      if (!isNaN(this.longc)) {
-        //Central point and azimuth method
 
-        if (this.lat0 >= 0) {
-          fl = dl + Math.sqrt(dl * dl - 1);
+      if (alp) {
+        alpha_c = this.alpha;
+      }
+      
+      if (gam) {
+        gamma = (this.rectified_grid_angle * D2R);
+      }
+      
+      if (alp || gam) {
+        lamc = this.longc;
+      } else {
+        lam1 = this.long1;
+        phi1 = this.lat1;
+        lam2 = this.long2;
+        phi2 = this.lat2;
+        
+        if (Math.abs(phi1 - phi2) <= TOL || (con = Math.abs(phi1)) <= TOL ||
+            Math.abs(con - HALF_PI) <= TOL || Math.abs(Math.abs(this.lat0) - HALF_PI) <= TOL ||
+            Math.abs(Math.abs(phi2) - HALF_PI) <= TOL) {
+          throw new Error();
         }
-        else {
-          fl = dl - Math.sqrt(dl * dl - 1);
+      }
+      
+      var one_es = 1.0 - this.es;
+      com = Math.sqrt(one_es);
+      
+      if (Math.abs(this.lat0) > EPSLN) {
+        sinph0 = Math.sin(this.lat0);
+        cosph0 = Math.cos(this.lat0);
+        con = 1 - this.es * sinph0 * sinph0;
+        this.B = cosph0 * cosph0;
+        this.B = Math.sqrt(1 + this.es * this.B * this.B / one_es);
+        this.A = this.B * this.k0 * com / con;
+        D = this.B * com / (cosph0 * Math.sqrt(con));
+        F = D * D -1;
+        
+        if (F <= 0) {
+          F = 0;
+        } else {
+          F = Math.sqrt(F);
+          if (this.lat0 < 0) {
+            F = -F;
+          }
         }
-        this.el = fl * Math.pow(t0, this.bl);
-        gl = 0.5 * (fl - 1 / fl);
-        this.gamma0 = Math.asin(Math.sin(this.alpha) / dl);
-        this.long0 = this.longc - Math.asin(gl * Math.tan(this.gamma0)) / this.bl;
-
+        
+        this.E = F += D;
+        this.E *= Math.pow(tsfnz(this.e, this.lat0, sinph0), this.B);
+      } else {
+        this.B = 1 / com;
+        this.A = this.k0;
+        this.E = D = F = 1;
       }
-      else {
-        //2 points method
-        var t1 = tsfnz(this.e, this.lat1, Math.sin(this.lat1));
-        var t2 = tsfnz(this.e, this.lat2, Math.sin(this.lat2));
-        if (this.lat0 >= 0) {
-          this.el = (dl + Math.sqrt(dl * dl - 1)) * Math.pow(t0, this.bl);
+      
+      if (alp || gam) {
+        if (alp) {
+          gamma0 = Math.asin(Math.sin(alpha_c) / D);
+          if (!gam) {
+            gamma = alpha_c;
+          }
+        } else {
+          gamma0 = gamma;
+          alpha_c = Math.asin(D * Math.sin(gamma0));
         }
-        else {
-          this.el = (dl - Math.sqrt(dl * dl - 1)) * Math.pow(t0, this.bl);
-        }
-        var hl = Math.pow(t1, this.bl);
-        var ll = Math.pow(t2, this.bl);
-        fl = this.el / hl;
-        gl = 0.5 * (fl - 1 / fl);
-        var jl = (this.el * this.el - ll * hl) / (this.el * this.el + ll * hl);
-        var pl = (ll - hl) / (ll + hl);
-        var dlon12 = adjust_lon(this.long1 - this.long2);
-        this.long0 = 0.5 * (this.long1 + this.long2) - Math.atan(jl * Math.tan(0.5 * this.bl * (dlon12)) / pl) / this.bl;
-        this.long0 = adjust_lon(this.long0);
-        var dlon10 = adjust_lon(this.long1 - this.long0);
-        this.gamma0 = Math.atan(Math.sin(this.bl * (dlon10)) / gl);
-        this.alpha = Math.asin(dl * Math.sin(this.gamma0));
+        this.lam0 = lamc - Math.asin(0.5 * (F - 1 / F) * Math.tan(gamma0)) / this.B;
+      } else {
+        H = Math.pow(tsfnz(this.e, phi1, Math.sin(phi1)), this.B);
+        L = Math.pow(tsfnz(this.e, phi2, Math.sin(phi2)), this.B);
+        F = this.E / H;
+        p = (L - H) / (L + H);
+        J = this.E * this.E;
+        J = (J - L * H) / (J + L * H);
+        con = lam1 - lam2;
+        
+        if (con < -Math.pi) {
+          lam2 -=TWO_PI;
+        } else if (con > Math.pi) {
+          lam2 += TWO_PI;
+        }
+        
+        this.lam0 = adjust_lon(0.5 * (lam1 + lam2) - Math.atan(J * Math.tan(0.5 * this.B * (lam1 - lam2)) / p) / this.B);
+        gamma0 = Math.atan(2 * Math.sin(this.B * adjust_lon(lam1 - this.lam0)) / (F - 1 / F));
+        gamma = alpha_c = Math.asin(D * Math.sin(gamma0));
       }
-
+      
+      this.singam = Math.sin(gamma0);
+      this.cosgam = Math.cos(gamma0);
+      this.sinrot = Math.sin(gamma);
+      this.cosrot = Math.cos(gamma);
+      
+      this.rB = 1 / this.B;
+      this.ArB = this.A * this.rB;
+      this.BrA = 1 / this.ArB;
       if (this.no_off) {
-        this.uc = 0;
-      }
-      else {
-        if (this.lat0 >= 0) {
-          this.uc = this.al / this.bl * Math.atan2(Math.sqrt(dl * dl - 1), Math.cos(this.alpha));
-        }
-        else {
-          this.uc = -1 * this.al / this.bl * Math.atan2(Math.sqrt(dl * dl - 1), Math.cos(this.alpha));
-        }
+        this.u_0 = 0;
+      } else {
+        this.u_0 = Math.abs(this.ArB * Math.atan(Math.sqrt(D * D - 1) / Math.cos(alpha_c)));
+        
+        if (this.lat0 < 0) {
+          this.u_0 = - this.u_0;
+        }  
       }
-
+        
+      F = 0.5 * gamma0;
+      this.v_pole_n = this.ArB * Math.log(Math.tan(FORTPI - F));
+      this.v_pole_s = this.ArB * Math.log(Math.tan(FORTPI + F));
     }
 
+
     /* Oblique Mercator forward equations--mapping lat,long to x,y
         ----------------------------------------------------------*/
     function forward$8(p) {
-      var lon = p.x;
-      var lat = p.y;
-      var dlon = adjust_lon(lon - this.long0);
-      var us, vs;
-      var con;
-      if (Math.abs(Math.abs(lat) - HALF_PI) <= EPSLN) {
-        if (lat > 0) {
-          con = -1;
-        }
-        else {
-          con = 1;
-        }
-        vs = this.al / this.bl * Math.log(Math.tan(FORTPI + con * this.gamma0 * 0.5));
-        us = -1 * con * HALF_PI * this.al / this.bl;
-      }
-      else {
-        var t = tsfnz(this.e, lat, Math.sin(lat));
-        var ql = this.el / Math.pow(t, this.bl);
-        var sl = 0.5 * (ql - 1 / ql);
-        var tl = 0.5 * (ql + 1 / ql);
-        var vl = Math.sin(this.bl * (dlon));
-        var ul = (sl * Math.sin(this.gamma0) - vl * Math.cos(this.gamma0)) / tl;
-        if (Math.abs(Math.abs(ul) - 1) <= EPSLN) {
-          vs = Number.POSITIVE_INFINITY;
-        }
-        else {
-          vs = 0.5 * this.al * Math.log((1 - ul) / (1 + ul)) / this.bl;
-        }
-        if (Math.abs(Math.cos(this.bl * (dlon))) <= EPSLN) {
-          us = this.al * this.bl * (dlon);
-        }
-        else {
-          us = this.al * Math.atan2(sl * Math.cos(this.gamma0) + vl * Math.sin(this.gamma0), Math.cos(this.bl * dlon)) / this.bl;
-        }
+      var coords = {};
+      var S, T, U, V, W, temp, u, v;
+      p.x = p.x - this.lam0;
+      
+      if (Math.abs(Math.abs(p.y) - HALF_PI) > EPSLN) {
+        W = this.E / Math.pow(tsfnz(this.e, p.y, Math.sin(p.y)), this.B);
+        
+        temp = 1 / W;
+        S = 0.5 * (W - temp);
+        T = 0.5 * (W + temp);
+        V = Math.sin(this.B * p.x);
+        U = (S * this.singam - V * this.cosgam) / T;
+            
+        if (Math.abs(Math.abs(U) - 1.0) < EPSLN) {
+          throw new Error();
+        }
+        
+        v = 0.5 * this.ArB * Math.log((1 - U)/(1 + U));
+        temp = Math.cos(this.B * p.x);
+        
+        if (Math.abs(temp) < TOL) {
+          u = this.A * p.x;
+        } else {
+          u = this.ArB * Math.atan2((S * this.cosgam + V * this.singam), temp);
+        }    
+      } else {
+        v = p.y > 0 ? this.v_pole_n : this.v_pole_s;
+        u = this.ArB * p.y;
       }
-
+         
       if (this.no_rot) {
-        p.x = this.x0 + us;
-        p.y = this.y0 + vs;
-      }
-      else {
-
-        us -= this.uc;
-        p.x = this.x0 + vs * Math.cos(this.alpha) + us * Math.sin(this.alpha);
-        p.y = this.y0 + us * Math.cos(this.alpha) - vs * Math.sin(this.alpha);
+        coords.x = u;
+        coords.y = v;
+      } else {
+        u -= this.u_0;
+        coords.x = v * this.cosrot + u * this.sinrot;
+        coords.y = u * this.cosrot - v * this.sinrot;
       }
-      return p;
+      
+      coords.x = (this.a * coords.x + this.x0);
+      coords.y = (this.a * coords.y + this.y0);
+      
+      return coords;
     }
 
     function inverse$8(p) {
-      var us, vs;
+      var u, v, Qp, Sp, Tp, Vp, Up;
+      var coords = {};
+      
+      p.x = (p.x - this.x0) * (1.0 / this.a);
+      p.y = (p.y - this.y0) * (1.0 / this.a);
+
       if (this.no_rot) {
-        vs = p.y - this.y0;
-        us = p.x - this.x0;
-      }
-      else {
-        vs = (p.x - this.x0) * Math.cos(this.alpha) - (p.y - this.y0) * Math.sin(this.alpha);
-        us = (p.y - this.y0) * Math.cos(this.alpha) + (p.x - this.x0) * Math.sin(this.alpha);
-        us += this.uc;
-      }
-      var qp = Math.exp(-1 * this.bl * vs / this.al);
-      var sp = 0.5 * (qp - 1 / qp);
-      var tp = 0.5 * (qp + 1 / qp);
-      var vp = Math.sin(this.bl * us / this.al);
-      var up = (vp * Math.cos(this.gamma0) + sp * Math.sin(this.gamma0)) / tp;
-      var ts = Math.pow(this.el / Math.sqrt((1 + up) / (1 - up)), 1 / this.bl);
-      if (Math.abs(up - 1) < EPSLN) {
-        p.x = this.long0;
-        p.y = HALF_PI;
-      }
-      else if (Math.abs(up + 1) < EPSLN) {
-        p.x = this.long0;
-        p.y = -1 * HALF_PI;
+        v = p.y;
+        u = p.x;
+      } else {
+        v = p.x * this.cosrot - p.y * this.sinrot;
+        u = p.y * this.cosrot + p.x * this.sinrot + this.u_0;
       }
-      else {
-        p.y = phi2z(this.e, ts);
-        p.x = adjust_lon(this.long0 - Math.atan2(sp * Math.cos(this.gamma0) - vp * Math.sin(this.gamma0), Math.cos(this.bl * us / this.al)) / this.bl);
+      
+      Qp = Math.exp(-this.BrA * v);
+      Sp = 0.5 * (Qp - 1 / Qp);
+      Tp = 0.5 * (Qp + 1 / Qp);
+      Vp = Math.sin(this.BrA * u);
+      Up = (Vp * this.cosgam + Sp * this.singam) / Tp;
+      
+      if (Math.abs(Math.abs(Up) - 1) < EPSLN) {
+        coords.x = 0;
+        coords.y = Up < 0 ? -HALF_PI : HALF_PI;
+      } else {
+        coords.y = this.E / Math.sqrt((1 + Up) / (1 - Up));
+        coords.y = phi2z(this.e, Math.pow(coords.y, 1 / this.B));
+        
+        if (coords.y === Infinity) {
+          throw new Error();
+        }
+            
+        coords.x = -this.rB * Math.atan2((Sp * this.cosgam - Vp * this.singam), Math.cos(this.BrA * u));
       }
-      return p;
+      
+      coords.x += this.lam0;
+      
+      return coords;
     }
 
-    var names$10 = ["Hotine_Oblique_Mercator", "Hotine Oblique Mercator", "Hotine_Oblique_Mercator_Azimuth_Natural_Origin", "Hotine_Oblique_Mercator_Azimuth_Center", "omerc"];
+    var names$10 = ["Hotine_Oblique_Mercator", "Hotine Oblique Mercator", "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$9,
       forward: forward$8,
@@ -4156,16 +4238,18 @@
     };
 
     function init$10() {
-
-      // array of:  r_maj,r_min,lat1,lat2,c_lon,c_lat,false_east,false_north
-      //double c_lat;                   /* center latitude                      */
-      //double c_lon;                   /* center longitude                     */
+      
+      //double lat0;                    /* the reference latitude               */
+      //double long0;                   /* the reference longitude              */
       //double lat1;                    /* first standard parallel              */
       //double lat2;                    /* second standard parallel             */
       //double r_maj;                   /* major axis                           */
       //double r_min;                   /* minor axis                           */
       //double false_east;              /* x offset in meters                   */
       //double false_north;             /* y offset in meters                   */
+      
+      //the above value can be set with proj4.defs
+      //example: proj4.defs("EPSG:2154","+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs");
 
       if (!this.lat2) {
         this.lat2 = this.lat1;
@@ -4281,7 +4365,14 @@
       return p;
     }
 
-    var names$11 = ["Lambert Tangential Conformal Conic Projection", "Lambert_Conformal_Conic", "Lambert_Conformal_Conic_2SP", "lcc"];
+    var names$11 = [
+      "Lambert Tangential Conformal Conic Projection",
+      "Lambert_Conformal_Conic",
+      "Lambert_Conformal_Conic_1SP",
+      "Lambert_Conformal_Conic_2SP",
+      "lcc"
+    ];
+
     var lcc = {
       init: init$10,
       forward: forward$9,
@@ -7075,7 +7166,7 @@
     proj4$1.nadgrid = nadgrid;
     proj4$1.transform = transform;
     proj4$1.mgrs = mgrs;
-    proj4$1.version = '2.7.0';
+    proj4$1.version = '2.7.4';
     includedProjections(proj4$1);
 
     return proj4$1;