Commit 56a9a6a7 authored by ahocevar's avatar ahocevar
Browse files

Merge pull request #16 from calvinmetcalf/more-jshint 

More jshint
parents 07809065 8b8eb11c

Gruntfile.js

+4 −1
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ module.exports = function(grunt) { 
				undef: true,

				unused: true,

				trailing:true,

				indent:2

				indent:2,

        globals: {

          proj4: true

        }

			},

			all: [ './src/Proj4.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js','./src/util/MGRS.js']

		}

src/common.js

+111 −70
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ proj4.common = { 
  PJD_GRIDSHIFT: 3,

  PJD_WGS84    : 4,   // WGS84 or equivalent

  PJD_NODATUM  : 5,   // WGS84 or equivalent

  SRS_WGS84_SEMIMAJOR : 6378137.0,  // only used in grid shift transforms

  SRS_WGS84_SEMIMAJOR : 6378137,  // only used in grid shift transforms

  SRS_WGS84_ESQUARED : 0.006694379990141316, //DGR: 2012-07-29



  // ellipoid pj_set_ell.c
@@ -34,7 +34,7 @@ proj4.common = { 
// -----------------------------------------------------------------

  msfnz : function(eccent, sinphi, cosphi) {

    var con = eccent * sinphi;

      return cosphi/(Math.sqrt(1.0 - con * con));

    return cosphi/(Math.sqrt(1 - con * con));

  },



// Function to compute the constant small t for use in the forward
@@ -44,7 +44,7 @@ proj4.common = { 
  tsfnz : function(eccent, phi, sinphi) {

    var con = eccent * sinphi;

    var com = 0.5 * eccent;

    con = Math.pow(((1.0 - con) / (1.0 + con)), com);

    con = Math.pow(((1 - con) / (1 + con)), com);

    return (Math.tan(0.5 * (this.HALF_PI - phi))/con);

  },
@@ -57,12 +57,14 @@ proj4.common = { 
    var phi = this.HALF_PI - 2 * Math.atan(ts);

    for (var i = 0; i <= 15; i++) {

      con = eccent * Math.sin(phi);

      dphi = this.HALF_PI - 2 * Math.atan(ts *(Math.pow(((1.0 - con)/(1.0 + con)),eccnth))) - phi;

      dphi = this.HALF_PI - 2 * Math.atan(ts *(Math.pow(((1 - con)/(1 + con)),eccnth))) - phi;

      phi += dphi;

      if (Math.abs(dphi) <= 0.0000000001) return phi;

      if (Math.abs(dphi) <= 0.0000000001){

        return phi;

      }

    }

    alert("phi2z has NoConvergence");

    return (-9999);

    //console.log("phi2z has NoConvergence");

    return -9999;

  },



/* Function to compute constant small q which is the radius of a
@@ -72,19 +74,19 @@ proj4.common = { 
    var con;

    if (eccent > 1.0e-7) {

      con = eccent * sinphi;

      return (( 1.0- eccent * eccent) * (sinphi /(1.0 - con * con) - (0.5/eccent)*Math.log((1.0 - con)/(1.0 + con))));

      return (( 1- eccent * eccent) * (sinphi /(1 - con * con) - (0.5/eccent)*Math.log((1 - con)/(1 + con))));

    } else {

      return(2.0 * sinphi);

      return(2 * sinphi);

    }

  },



/* Function to compute the inverse of qsfnz

------------------------------------------------------------*/

  iqsfnz : function (eccent, q) {

    var temp = 1.0-(1.0-eccent*eccent)/(2.0*eccent)*Math.log((1-eccent)/(1+eccent));

    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.0) {

        return (-1.0*proj4.common.HALF_PI);

      if (q<0) {

        return (-1*proj4.common.HALF_PI);

      } else {

        return proj4.common.HALF_PI;

      }
@@ -99,39 +101,39 @@ proj4.common = { 
      sin_phi = Math.sin(phi);

      cos_phi = Math.cos(phi);

      con = eccent*sin_phi;

      dphi=Math.pow(1.0-con*con,2.0)/(2.0*cos_phi)*(q/(1-eccent*eccent)-sin_phi/(1.0-con*con)+0.5/eccent*Math.log((1.0-con)/(1.0+con)));

      dphi=Math.pow(1-con*con,2)/(2*cos_phi)*(q/(1-eccent*eccent)-sin_phi/(1-con*con)+0.5/eccent*Math.log((1-con)/(1+con)));

      phi+=dphi;

      if (Math.abs(dphi) <= 0.0000000001) {

        return phi;

      }

    }



    alert("IQSFN-CONV:Latitude failed to converge after 30 iterations");

    return (NaN);

    //console.log("IQSFN-CONV:Latitude failed to converge after 30 iterations");

    return NaN;

  },



/* Function to eliminate roundoff errors in asin

----------------------------------------------*/

  asinz : function(x) {

    if (Math.abs(x)>1.0) {

      x=(x>1.0)?1.0:-1.0;

    if (Math.abs(x)>1) {

      x=(x>1)?1:-1;

    }

    return Math.asin(x);

  },



// following functions from gctpc cproj.c for transverse mercator projections

  e0fn : function(x) {return(1.0-0.25*x*(1.0+x/16.0*(3.0+1.25*x)));},

  e1fn : function(x) {return(0.375*x*(1.0+0.25*x*(1.0+0.46875*x)));},

  e2fn : function(x) {return(0.05859375*x*x*(1.0+0.75*x));},

  e3fn : function(x) {return(x*x*x*(35.0/3072.0));},

  mlfn : function(e0,e1,e2,e3,phi) {return(e0*phi-e1*Math.sin(2.0*phi)+e2*Math.sin(4.0*phi)-e3*Math.sin(6.0*phi));},

  e0fn : function(x) {return(1-0.25*x*(1+x/16*(3+1.25*x)));},

  e1fn : function(x) {return(0.375*x*(1+0.25*x*(1+0.46875*x)));},

  e2fn : function(x) {return(0.05859375*x*x*(1+0.75*x));},

  e3fn : function(x) {return(x*x*x*(35/3072));},

  mlfn : function(e0,e1,e2,e3,phi) {return(e0*phi-e1*Math.sin(2*phi)+e2*Math.sin(4*phi)-e3*Math.sin(6*phi));},

  imlfn : function(ml, e0, e1, e2, e3) {

    var phi;

    var dphi;



    phi=ml/e0;

    for (var i=0;i<15;i++){

      dphi=(ml-(e0*phi-e1*Math.sin(2.0*phi)+e2*Math.sin(4.0*phi)-e3*Math.sin(6.0*phi)))/(e0-2.0*e1*Math.cos(2.0*phi)+4.0*e2*Math.cos(4.0*phi)-6.0*e3*Math.cos(6.0*phi));

      dphi=(ml-(e0*phi-e1*Math.sin(2*phi)+e2*Math.sin(4*phi)-e3*Math.sin(6*phi)))/(e0-2*e1*Math.cos(2*phi)+4*e2*Math.cos(4*phi)-6*e3*Math.cos(6*phi));

      phi+=dphi;

      if (Math.abs(dphi) <= 0.0000000001) {

        return phi;
@@ -143,11 +145,17 @@ proj4.common = { 
  },



  srat : function(esinp, exp) {

    return(Math.pow((1.0-esinp)/(1.0+esinp), exp));

    return(Math.pow((1-esinp)/(1+esinp), exp));

  },



// Function to return the sign of an argument

  sign : function(x) { if (x < 0.0) return(-1); else return(1);},

  sign : function(x) {

    if (x < 0){

      return(-1);

    } else {

      return(1);

    }

  },



// Function to adjust longitude to -180 to 180; input in radians

  adjust_lon : function(x) {
@@ -165,27 +173,33 @@ proj4.common = { 


// Latitude Isometrique - close to tsfnz ...

  latiso : function(eccent, phi, sinphi) {

    if (Math.abs(phi) > this.HALF_PI) return +Number.NaN;

    if (phi==this.HALF_PI) return Number.POSITIVE_INFINITY;

    if (phi==-1.0*this.HALF_PI) return -1.0*Number.POSITIVE_INFINITY;

    if (Math.abs(phi) > this.HALF_PI){

      return Number.NaN;

    }

    if (phi===this.HALF_PI) {

      return Number.POSITIVE_INFINITY;

    }

    if (phi===-1*this.HALF_PI) {

      return Number.NEGATIVE_INFINITY;

    }



    var con = eccent*sinphi;

    return Math.log(Math.tan((this.HALF_PI+phi)/2.0))+eccent*Math.log((1.0-con)/(1.0+con))/2.0;

    return Math.log(Math.tan((this.HALF_PI+phi)/2))+eccent*Math.log((1-con)/(1+con))/2;

  },



  fL : function(x,L) {

    return 2.0*Math.atan(x*Math.exp(L)) - this.HALF_PI;

    return 2*Math.atan(x*Math.exp(L)) - this.HALF_PI;

  },



// Inverse Latitude Isometrique - close to ph2z

  invlatiso : function(eccent, ts) {

    var phi= this.fL(1.0,ts);

    var Iphi= 0.0;

    var con= 0.0;

    var phi= this.fL(1,ts);

    var Iphi= 0;

    var con= 0;

    do {

      Iphi= phi;

      con= eccent*Math.sin(Iphi);

      phi= this.fL(Math.exp(eccent*Math.log((1.0+con)/(1.0-con))/2.0),ts);

      phi= this.fL(Math.exp(eccent*Math.log((1+con)/(1-con))/2),ts);

    } while (Math.abs(phi-Iphi)>1.0e-12);

    return phi;

  },
@@ -196,45 +210,45 @@ proj4.common = { 
  sinh : function(x)

  {

    var r= Math.exp(x);

    r= (r-1.0/r)/2.0;

    r= (r-1/r)/2;

    return r;

  },



  cosh : function(x)

  {

    var r= Math.exp(x);

    r= (r+1.0/r)/2.0;

    r= (r+1/r)/2;

    return r;

  },



  tanh : function(x)

  {

    var r= Math.exp(x);

    r= (r-1.0/r)/(r+1.0/r);

    r= (r-1/r)/(r+1/r);

    return r;

  },



  asinh : function(x)

  {

    var s= (x>= 0? 1.0:-1.0);

    return s*(Math.log( Math.abs(x) + Math.sqrt(x*x+1.0) ));

    var s= (x>= 0? 1:-1);

    return s*(Math.log( Math.abs(x) + Math.sqrt(x*x+1) ));

  },



  acosh : function(x)

  {

    return 2.0*Math.log(Math.sqrt((x+1.0)/2.0) + Math.sqrt((x-1.0)/2.0));

    return 2*Math.log(Math.sqrt((x+1)/2) + Math.sqrt((x-1)/2));

  },



  atanh : function(x)

  {

    return Math.log((x-1.0)/(x+1.0))/2.0;

    return Math.log((x-1)/(x+1))/2;

  },



// Grande Normale

  gN : function(a,e,sinphi)

  {

    var temp= e*sinphi;

    return a/Math.sqrt(1.0 - temp*temp);

    return a/Math.sqrt(1 - temp*temp);

  },

  

  //code from the PROJ.4 pj_mlfn.c file;  this may be useful for other projections
@@ -257,18 +271,19 @@ proj4.common = { 
  },

  

  pj_inv_mlfn: function(arg, es, en) {

    var k = 1.0/(1.0-es);

    var k = 1/(1-es);

    var phi = arg;

    for (var i = proj4.common.MAX_ITER; i ; --i) { /* rarely goes over 2 iterations */

      var s = Math.sin(phi);

      var t = 1.0 - es * s * s;

      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) * (t * Math.sqrt(t)) * k;

      phi -= t;

      if (Math.abs(t) < proj4.common.EPSLN)

      if (Math.abs(t) < proj4.common.EPSLN) {

        return phi;

      }

    }

    proj4.reportError("cass:pj_inv_mlfn: Convergence error");

    return phi;

  },
@@ -280,53 +295,79 @@ proj4.common = { 
  nad_intr: function(pin,ct) {

    // force computation by decreasing by 1e-7 to be as closed as possible

    // from computation under C:C++ by leveraging rounding problems ...

    var t= {"x":(pin.x-1.e-7)/ct.del[0],"y":(pin.y-1e-7)/ct.del[1]};

    var indx= {"x":Math.floor(t.x),"y":Math.floor(t.y)};

    var frct= {"x":t.x-1.0*indx.x,"y":t.y-1.0*indx.y};

    var val= {"x":Number.NaN,"y":Number.NaN};

    var t= {

      x:(pin.x-1.e-7)/ct.del[0],

      y:(pin.y-1e-7)/ct.del[1]

    };

    var indx= {

      x:Math.floor(t.x),

      y:Math.floor(t.y)

    };

    var frct= {

      x:t.x-1*indx.x,

      y:t.y-1*indx.y

    };

    var val= {

      x:Number.NaN,

      y:Number.NaN

    };

    var inx;

    if (indx.x<0) {

      if (!(indx.x==-1 && frct.x>0.99999999999)) {

      if (!(indx.x===-1 && frct.x>0.99999999999)) {

        return val;

      }

      ++indx.x;

      frct.x= 0.0;

      frct.x= 0;

    } else {

      inx= indx.x+1;

      if (inx>=ct.lim[0]) {

        if (!(inx==ct.lim[0] && frct.x<1e-11)) {

        if (!(inx===ct.lim[0] && frct.x<1e-11)) {

          return val;

        }

        --indx.x;

        frct.x= 1.0;

        frct.x= 1;

      }

    }

    if (indx.y<0) {

      if (!(indx.y==-1 && frct.y>0.99999999999)) {

      if (!(indx.y===-1 && frct.y>0.99999999999)) {

        return val;

      }

      ++indx.y;

      frct.y= 0.0;

      frct.y= 0;

    } else {

      inx = indx.y+1;

      if (inx>=ct.lim[1]) {

        if (!(inx==ct.lim[1] && frct.y<1e-11)) {

        if (!(inx === ct.lim[1] && frct.y<1e-11)) {

          return val;

        }

        --indx.y;

        frct.y= 1.0;

        frct.y= 1;

      }

    }

    inx= (indx.y*ct.lim[0])+indx.x;

    var f00= {"x":ct.cvs[inx][0], "y":ct.cvs[inx][1]};

    var f00= {

      x:ct.cvs[inx][0],

      y:ct.cvs[inx][1]

    };

    inx++;

    var f10= {"x":ct.cvs[inx][0], "y":ct.cvs[inx][1]};

    var f10= {

      x:ct.cvs[inx][0],

      y:ct.cvs[inx][1]

    };

    inx+= ct.lim[0];

    var f11= {"x":ct.cvs[inx][0], "y":ct.cvs[inx][1]};

    var f11= {

      x:ct.cvs[inx][0],

      y:ct.cvs[inx][1]

    };

    inx--;

    var f01= {"x":ct.cvs[inx][0], "y":ct.cvs[inx][1]};

    var m11= frct.x*frct.y,             m10= frct.x*(1.0-frct.y),

        m00= (1.0-frct.x)*(1.0-frct.y), m01= (1.0-frct.x)*frct.y;

    var f01= {

      x:ct.cvs[inx][0],

      y:ct.cvs[inx][1]

    };

    var m11= frct.x*frct.y,

      m10= frct.x*(1-frct.y),

      m00= (1-frct.x)*(1-frct.y),

      m01= (1-frct.x)*frct.y;

    val.x= (m00*f00.x + m10*f10.x + m01*f01.x + m11*f11.x);

    val.y= (m00*f00.y + m10*f10.y + m01*f01.y + m11*f11.y);

    return val;
@@ -382,7 +423,7 @@ proj4.common = { 
**		with typical major axis values.

**	Inverse determines phi to EPS (1e-11) radians, about 1e-6 seconds.

*/

  C00: 1.0,

  C00: 1,

  C02: 0.25,

  C04: 0.046875,

  C06: 0.01953125,

src/projCode/aea.js

+144 −140
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ proj4.Proj.aea = { 
      return;

    }

    this.temp = this.b / this.a;

    this.es = 1.0 - Math.pow(this.temp,2);

    this.es = 1 - Math.pow(this.temp, 2);

    this.e3 = Math.sqrt(this.es);



    this.sin_po = Math.sin(this.lat1);
@@ -53,7 +53,8 @@ proj4.Proj.aea = { 


    if (Math.abs(this.lat1 - this.lat2) > proj4.common.EPSLN) {

      this.ns0 = (this.ms1 * this.ms1 - this.ms2 * this.ms2) / (this.qs2 - this.qs1);

    } else {

    }

    else {

      this.ns0 = this.con;

    }

    this.c = this.ms1 * this.ms1 + this.ns0 * this.qs1;
@@ -89,19 +90,21 @@ proj4.Proj.aea = { 
    p.y = this.rh - p.y + this.y0;

    if (this.ns0 >= 0) {

      rh1 = Math.sqrt(p.x * p.x + p.y * p.y);

      con = 1.0;

    } else {

      con = 1;

    }

    else {

      rh1 = -Math.sqrt(p.x * p.x + p.y * p.y);

      con = -1.0;

      con = -1;

    }

    theta = 0.0;

    if (rh1 != 0.0) {

    theta = 0;

    if (rh1 !== 0) {

      theta = Math.atan2(con * p.x, con * p.y);

    }

    con = rh1 * this.ns0 / this.a;

    if (this.sphere) {

      lat = Math.asin((this.c-con*con)/(2.0*this.ns0));

    } else {

      lat = Math.asin((this.c - con * con) / (2 * this.ns0));

    }

    else {

      qs = (this.c - con * con) / this.ns0;

      lat = this.phi1z(this.e3, qs);

    }
@@ -117,24 +120,25 @@ proj4.Proj.aea = { 
-------------------------------------------*/

  phi1z: function(eccent, qs) {

    var sinphi, cosphi, con, com, dphi;

    var phi = proj4.common.asinz(.5 * qs);

    if (eccent < proj4.common.EPSLN) return phi;

    var phi = proj4.common.asinz(0.5 * qs);

    if (eccent < proj4.common.EPSLN){

      return phi;

    }



    var eccnts = eccent * eccent;

    for (var i = 1; i <= 25; i++) {

      sinphi = Math.sin(phi);

      cosphi = Math.cos(phi);

      con = eccent * sinphi;

        com = 1.0 - con * con;

        dphi = .5 * com * com / cosphi * (qs / (1.0 - eccnts) - sinphi / com + .5 / eccent * Math.log((1.0 - con) / (1.0 + con)));

      com = 1 - con * con;

      dphi = 0.5 * com * com / cosphi * (qs / (1 - eccnts) - sinphi / com + 0.5 / eccent * Math.log((1 - con) / (1 + con)));

      phi = phi + dphi;

        if (Math.abs(dphi) <= 1e-7) return phi;

      if (Math.abs(dphi) <= 1e-7){

        return phi;

      }

    }

    proj4.reportError("aea:phi1z:Convergence error");

    return null;

  }



};

src/projCode/aeqd.js

+189 −173
Original line number Diff line number Diff line
@@ -11,65 +11,76 @@ proj4.Proj.aeqd = { 
    var sinphi = Math.sin(p.y);

    var cosphi = Math.cos(p.y);

    var dlon = proj4.common.adjust_lon(lon - this.long0);

    

    var e0,e1,e2,e3,Mlp,Ml,tanphi,Nl1,Nl,psi,Az,G,H,GH,Hs,c,kp,cos_c,s,s2,s3,s4,s5;

    if (this.sphere) {

	if (Math.abs(this.sin_p12-1.0)<=proj4.common.EPSLN){

      if (Math.abs(this.sin_p12 - 1) <= proj4.common.EPSLN) {

        //North Pole case

        p.x = this.x0 + this.a * (proj4.common.HALF_PI - lat) * Math.sin(dlon);

        p.y = this.y0 - this.a * (proj4.common.HALF_PI - lat) * Math.cos(dlon);

        return p;

	} else if (Math.abs(this.sin_p12+1.0)<=proj4.common.EPSLN){

      }

      else if (Math.abs(this.sin_p12 + 1) <= proj4.common.EPSLN) {

        //South Pole case

        p.x = this.x0 + this.a * (proj4.common.HALF_PI + lat) * Math.sin(dlon);

        p.y = this.y0 + this.a * (proj4.common.HALF_PI + lat) * Math.cos(dlon);

        return p;

	} else {

      }

      else {

        //default case

		var cos_c=this.sin_p12*sinphi+this.cos_p12*cosphi*Math.cos(dlon);

		var c = Math.acos(cos_c);

		var kp = c/Math.sin(c);

        cos_c = this.sin_p12 * sinphi + this.cos_p12 * cosphi * Math.cos(dlon);

        c = Math.acos(cos_c);

        kp = c / Math.sin(c);

        p.x = this.x0 + this.a * kp * cosphi * Math.sin(dlon);

        p.y = this.y0 + this.a * kp * (this.cos_p12 * sinphi - this.sin_p12 * cosphi * Math.cos(dlon));

        return p;

      }

    } else {

	var e0 = proj4.common.e0fn(this.es);

	var e1 = proj4.common.e1fn(this.es);

	var e2 = proj4.common.e2fn(this.es);

	var e3 = proj4.common.e3fn(this.es);

	if (Math.abs(this.sin_p12-1.0)<=proj4.common.EPSLN){

    }

    else {

      e0 = proj4.common.e0fn(this.es);

      e1 = proj4.common.e1fn(this.es);

      e2 = proj4.common.e2fn(this.es);

      e3 = proj4.common.e3fn(this.es);

      if (Math.abs(this.sin_p12 - 1) <= proj4.common.EPSLN) {

        //North Pole case

		var Mlp = this.a*proj4.common.mlfn(e0,e1,e2,e3,proj4.common.HALF_PI);

		var Ml = this.a*proj4.common.mlfn(e0,e1,e2,e3,lat);

        Mlp = this.a * proj4.common.mlfn(e0, e1, e2, e3, proj4.common.HALF_PI);

        Ml = this.a * proj4.common.mlfn(e0, e1, e2, e3, lat);

        p.x = this.x0 + (Mlp - Ml) * Math.sin(dlon);

        p.y = this.y0 - (Mlp - Ml) * Math.cos(dlon);

        return p;

	} else if (Math.abs(this.sin_p12+1.0)<=proj4.common.EPSLN){

      }

      else if (Math.abs(this.sin_p12 + 1) <= proj4.common.EPSLN) {

        //South Pole case

		var Mlp = this.a*proj4.common.mlfn(e0,e1,e2,e3,proj4.common.HALF_PI);

		var Ml = this.a*proj4.common.mlfn(e0,e1,e2,e3,lat);

        Mlp = this.a * proj4.common.mlfn(e0, e1, e2, e3, proj4.common.HALF_PI);

        Ml = this.a * proj4.common.mlfn(e0, e1, e2, e3, lat);

        p.x = this.x0 + (Mlp + Ml) * Math.sin(dlon);

        p.y = this.y0 + (Mlp + Ml) * Math.cos(dlon);

        return p;

	} else {

      }

      else {

        //Default case

		var tanphi=sinphi/cosphi;

		var Nl1 = proj4.common.gN(this.a,this.e, this.sin_p12);

		var Nl = proj4.common.gN(this.a, this.e, sinphi);

		var psi = Math.atan((1.0-this.es)*tanphi+this.es*Nl1*this.sin_p12/(Nl*cosphi));

		var Az = Math.atan2(Math.sin(dlon),this.cos_p12*Math.tan(psi)-this.sin_p12*Math.cos(dlon));

		var s;

		if (Az==0) {

        tanphi = sinphi / cosphi;

        Nl1 = proj4.common.gN(this.a, this.e, this.sin_p12);

        Nl = proj4.common.gN(this.a, this.e, sinphi);

        psi = Math.atan((1 - this.es) * tanphi + this.es * Nl1 * this.sin_p12 / (Nl * cosphi));

        Az = Math.atan2(Math.sin(dlon), this.cos_p12 * Math.tan(psi) - this.sin_p12 * Math.cos(dlon));

        if (Az === 0) {

          s = Math.asin(this.cos_p12 * Math.sin(psi) - this.sin_p12 * Math.cos(psi));

		} else if (Math.abs(Math.abs(Az)-proj4.common.PI)<=proj4.common.EPSLN){

        }

        else if (Math.abs(Math.abs(Az) - proj4.common.PI) <= proj4.common.EPSLN) {

          s = -Math.asin(this.cos_p12 * Math.sin(psi) - this.sin_p12 * Math.cos(psi));

		} else {

        }

        else {

          s = Math.asin(Math.sin(dlon) * Math.cos(psi) / Math.sin(Az));

        }

		var G = this.e*this.sin_p12/Math.sqrt(1.0-this.es);

		var H = this.e*this.cos_p12*Math.cos(Az)/Math.sqrt(1.0-this.es);

		var Hs = H*H;

		var c = Nl1*s*(1.0-s*s*Hs*(1.0-Hs)/6.0+s*s*s/8.0*G*H*(1.0-2.0*Hs)+s*s*s*s/120.0*(Hs*(4.0-7.0*Hs)-3.0*G*G*(1.0-7.0*Hs))-s*s*s*s*s/48.0*G*H);

        G = this.e * this.sin_p12 / Math.sqrt(1 - this.es);

        H = this.e * this.cos_p12 * Math.cos(Az) / Math.sqrt(1 - this.es);

        GH = G * H;

        Hs = H * H;

        s2 = s * s;

        s3 = s2 * s;

        s4 = s3 * s;

        s5 = s4 * s;

        c = Nl1 * s * (1 - s2 * Hs * (1 - Hs) / 6 + s3 / 8 * GH * (1 - 2 * Hs) + s4 / 120 * (Hs * (4 - 7 * Hs) - 3 * G * G * (1 - 7 * Hs)) - s5 / 48 * GH);

        p.x = this.x0 + c * Math.sin(Az);

        p.y = this.y0 + c * Math.cos(Az);

        return p;
@@ -82,31 +93,34 @@ proj4.Proj.aeqd = { 
  inverse: function(p) {

    p.x -= this.x0;

    p.y -= this.y0;

    var rh,z,sinz,cosz,lon,lat,con,e0,e1,e2,e3,Mlp,M,N1,psi,Az,cosAz,tmp,A,B,D,Ee,F;

    if (this.sphere) {

		var rh = Math.sqrt(p.x * p.x + p.y *p.y);

		if (rh > (2.0 * proj4.common.HALF_PI * this.a)) {

      rh = Math.sqrt(p.x * p.x + p.y * p.y);

      if (rh > (2 * proj4.common.HALF_PI * this.a)) {

        proj4.reportError("aeqdInvDataError");

        return;

      }

		var z = rh / this.a;

      z = rh / this.a;



		var sinz=Math.sin(z);

		var cosz=Math.cos(z);

      sinz = Math.sin(z);

      cosz = Math.cos(z);



		var lon = this.long0;

		var lat;

      lon = this.long0;

      if (Math.abs(rh) <= proj4.common.EPSLN) {

        lat = this.lat0;

		} else {

      }

      else {

        lat = proj4.common.asinz(cosz * this.sin_p12 + (p.y * sinz * this.cos_p12) / rh);

			var con = Math.abs(this.lat0) - proj4.common.HALF_PI;

        con = Math.abs(this.lat0) - proj4.common.HALF_PI;

        if (Math.abs(con) <= proj4.common.EPSLN) {

				if (this.lat0 >= 0.0) {

          if (this.lat0 >= 0) {

            lon = proj4.common.adjust_lon(this.long0 + Math.atan2(p.x, - p.y));

				} else {

          }

          else {

            lon = proj4.common.adjust_lon(this.long0 - Math.atan2(-p.x, p.y));

          }

			} else {

        }

        else {

          /*con = cosz - this.sin_p12 * Math.sin(lat);

        if ((Math.abs(con) < proj4.common.EPSLN) && (Math.abs(p.x) < proj4.common.EPSLN)) {

          //no-op, just keep the lon value as is
@@ -123,46 +137,48 @@ proj4.Proj.aeqd = { 
      return p;

    }

    else {

		var e0 = proj4.common.e0fn(this.es);

		var e1 = proj4.common.e1fn(this.es);

		var e2 = proj4.common.e2fn(this.es);

		var e3 = proj4.common.e3fn(this.es);

		if (Math.abs(this.sin_p12-1.0)<=proj4.common.EPSLN){

      e0 = proj4.common.e0fn(this.es);

      e1 = proj4.common.e1fn(this.es);

      e2 = proj4.common.e2fn(this.es);

      e3 = proj4.common.e3fn(this.es);

      if (Math.abs(this.sin_p12 - 1) <= proj4.common.EPSLN) {

        //North pole case

			var Mlp = this.a*proj4.common.mlfn(e0,e1,e2,e3,proj4.common.HALF_PI);

			var rh = Math.sqrt(p.x*p.x+p.y*p.y);

			var M = Mlp-rh;

			var lat = proj4.common.imlfn(M/this.a,e0, e1,e2,e3);

			var lon = proj4.common.adjust_lon(this.long0+Math.atan2(p.x,-1.0*p.y));

			p.x=lon,

        Mlp = this.a * proj4.common.mlfn(e0, e1, e2, e3, proj4.common.HALF_PI);

        rh = Math.sqrt(p.x * p.x + p.y * p.y);

        M = Mlp - rh;

        lat = proj4.common.imlfn(M / this.a, e0, e1, e2, e3);

        lon = proj4.common.adjust_lon(this.long0 + Math.atan2(p.x, - 1 * p.y));

        p.x = lon;

        p.y = lat;

        return p;

		} else if (Math.abs(this.sin_p12+1.0)<=proj4.common.EPSLN){

      }

      else if (Math.abs(this.sin_p12 + 1) <= proj4.common.EPSLN) {

        //South pole case

			var Mlp = this.a*proj4.common.mlfn(e0,e1,e2,e3,proj4.common.HALF_PI);

			var rh = Math.sqrt(p.x*p.x+p.y*p.y);

			var M = rh-Mlp;

        Mlp = this.a * proj4.common.mlfn(e0, e1, e2, e3, proj4.common.HALF_PI);

        rh = Math.sqrt(p.x * p.x + p.y * p.y);

        M = rh - Mlp;



			var lat = proj4.common.imlfn(M/this.a,e0, e1,e2,e3);

			var lon = proj4.common.adjust_lon(this.long0+Math.atan2(p.x,p.y));

			p.x=lon,

        lat = proj4.common.imlfn(M / this.a, e0, e1, e2, e3);

        lon = proj4.common.adjust_lon(this.long0 + Math.atan2(p.x, p.y));

        p.x = lon;

        p.y = lat;

        return p;

		} else {

      }

      else {

        //default case

			var rh = Math.sqrt(p.x*p.x+p.y*p.y);

			var Az = Math.atan2(p.x,p.y);

			var N1 = proj4.common.gN(this.a, this.e, this.sin_p12);

			var cosAz = Math.cos(Az);

			var tmp = this.e*this.cos_p12*cosAz;

			var A = -tmp*tmp/(1.0 - this.es);

			var B=3.0*this.es*(1.0-A) * this.sin_p12*this.cos_p12*cosAz/(1.0-this.es);

			var D = rh/N1;

			var Ee = D-A*(1.0+A)*Math.pow(D,3.0)/6.0-B*(1+3.0*A)*Math.pow(D,4.0)/24.0;

			var F = 1.0-A*Ee*Ee/2.0-D*Ee*Ee*Ee/6.0;

			var psi = Math.asin(this.sin_p12*Math.cos(Ee)+this.cos_p12*Math.sin(Ee)*cosAz);

			var lon = proj4.common.adjust_lon(this.long0+Math.asin(Math.sin(Az)*Math.sin(Ee)/Math.cos(psi)));

			var lat = Math.atan((1.0-this.es*F*this.sin_p12/Math.sin(psi))*Math.tan(psi)/(1.0-this.es));

        rh = Math.sqrt(p.x * p.x + p.y * p.y);

        Az = Math.atan2(p.x, p.y);

        N1 = proj4.common.gN(this.a, this.e, this.sin_p12);

        cosAz = Math.cos(Az);

        tmp = this.e * this.cos_p12 * cosAz;

        A = -tmp * tmp / (1 - this.es);

        B = 3 * this.es * (1 - A) * this.sin_p12 * this.cos_p12 * cosAz / (1 - this.es);

        D = rh / N1;

        Ee = D - A * (1 + A) * Math.pow(D, 3) / 6 - B * (1 + 3 * A) * Math.pow(D, 4) / 24;

        F = 1 - A * Ee * Ee / 2 - D * Ee * Ee * Ee / 6;

        psi = Math.asin(this.sin_p12 * Math.cos(Ee) + this.cos_p12 * Math.sin(Ee) * cosAz);

        lon = proj4.common.adjust_lon(this.long0 + Math.asin(Math.sin(Az) * Math.sin(Ee) / Math.cos(psi)));

        lat = Math.atan((1 - this.es * F * this.sin_p12 / Math.sin(psi)) * Math.tan(psi) / (1 - this.es));

        p.x = lon;

        p.y = lat;

        return p;

src/projCode/cass.js

+58 −54

File changed.

Preview size limit exceeded, changes collapsed.