Commit 60a7982c authored by Michael Adair's avatar Michael Adair
Browse files

closes #49: add case label for spherical oblique in laea.js

parent 882296fd

lib/proj4js-combined.js

+14 −115
Original line number Diff line number Diff line
@@ -463,6 +463,12 @@ Proj4js.Proj = Proj4js.Class({ 
   * The y coordinate origin

   */

  y0: 0,

  /**

   * Property: localCS

   * Flag to indicate if the projection is a local one in which no transforms

   * are required.

   */

  localCS: false,



  /**

   * Constructor: initialize
@@ -481,6 +487,7 @@ Proj4js.Proj = Proj4js.Class({ 
          (srsCode.indexOf('PROJCS') >= 0) ||

          (srsCode.indexOf('LOCAL_CS') >= 0)) {

            this.parseWKT(srsCode);

            this.datum = new Proj4js.datum(this);

            this.loadProjCode(this.projName);

            return;

      }
@@ -717,6 +724,7 @@ Proj4js.Proj = Proj4js.Class({ 
    switch (wktObject) {

      case 'LOCAL_CS':

        this.projName = 'identity'

        this.localCS = true;

        this.srsCode = wktName;

        break;

      case 'GEOGCS':
@@ -735,6 +743,9 @@ Proj4js.Proj = Proj4js.Class({ 
      case 'DATUM':

        this.datumName = wktName;

        break;

      case 'LOCAL_DATUM':

        this.datumCode = 'none';

        break;

      case 'SPHEROID':

        this.ellps = wktName;

        this.a = parseFloat(wktArray.shift());
@@ -3076,6 +3087,8 @@ Proj4js.Proj.stere = { 
    		lon = (x == 0. && y == 0.) ? 0. : Math.atan2(x, y);

    		break;

    	}

        p.x = Proj4js.common.adjust_lon(lon + this.long0);

        p.y = lat;

    } else {

    	rho = Math.sqrt(x*x + y*y);

    	switch (this.mode) {
@@ -3601,121 +3614,6 @@ Proj4js.Proj.gnom = { 
};





/* ======================================================================

    projCode/Copy of laea.js

   ====================================================================== */



/*******************************************************************************

NAME                  LAMBERT AZIMUTHAL EQUAL-AREA

 

PURPOSE:	Transforms input longitude and latitude to Easting and

		Northing for the Lambert Azimuthal Equal-Area projection.  The

		longitude and latitude must be in radians.  The Easting

		and Northing values will be returned in meters.



PROGRAMMER              DATE            

----------              ----           

D. Steinwand, EROS      March, 1991   



This function was adapted from the Lambert Azimuthal Equal Area projection

code (FORTRAN) in the General Cartographic Transformation Package software

which is available from the U.S. Geological Survey National Mapping Division.

 

ALGORITHM REFERENCES



1.  "New Equal-Area Map Projections for Noncircular Regions", John P. Snyder,

    The American Cartographer, Vol 15, No. 4, October 1988, pp. 341-355.



2.  Snyder, John P., "Map Projections--A Working Manual", U.S. Geological

    Survey Professional Paper 1395 (Supersedes USGS Bulletin 1532), United

    State Government Printing Office, Washington D.C., 1987.



3.  "Software Documentation for GCTP General Cartographic Transformation

    Package", U.S. Geological Survey National Mapping Division, May 1982.

*******************************************************************************/



Proj4js.Proj.laea = {





/* Initialize the Lambert Azimuthal Equal Area projection

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

  init: function() {

    this.sin_lat_o=Math.sin(this.lat0);

    this.cos_lat_o=Math.cos(this.lat0);

  },



/* Lambert Azimuthal Equal Area forward equations--mapping lat,long to x,y

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

  forward: function(p) {



    /* Forward equations

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

    var lon=p.x;

    var lat=p.y;

    var delta_lon = Proj4js.common.adjust_lon(lon - this.long0);



    //v 1.0

    var sin_lat=Math.sin(lat);

    var cos_lat=Math.cos(lat);



    var sin_delta_lon=Math.sin(delta_lon);

    var cos_delta_lon=Math.cos(delta_lon);



    var g =this.sin_lat_o * sin_lat +this.cos_lat_o * cos_lat * cos_delta_lon;

    if (g == -1.0) {

      Proj4js.reportError("laea:fwd:Point projects to a circle of radius "+ 2.0 * R);

      return null;

    }

    var ksp = this.a * Math.sqrt(2.0 / (1.0 + g));

    var x = ksp * cos_lat * sin_delta_lon + this.x0;

    var y = ksp * (this.cos_lat_o * sin_lat - this.sin_lat_o * cos_lat * cos_delta_lon) + this.y0;

    p.x = x;

    p.y = y;

    return p;

  },//lamazFwd()



/* Inverse equations

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

  inverse: function(p) {

    p.x -= this.x0;

    p.y -= this.y0;



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

    var temp = Rh / (2.0 * this.a);



    if (temp > 1) {

      Proj4js.reportError("laea:Inv:DataError");

      return null;

    }



    var z = 2.0 * Proj4js.common.asinz(temp);

    var sin_z=Math.sin(z);

    var cos_z=Math.cos(z);



    var lon =this.long0;

    if (Math.abs(Rh) > Proj4js.common.EPSLN) {

       var lat = Proj4js.common.asinz(this.sin_lat_o * cos_z +this. cos_lat_o * sin_z *p.y / Rh);

       var temp =Math.abs(this.lat0) - Proj4js.common.HALF_PI;

       if (Math.abs(temp) > Proj4js.common.EPSLN) {

          temp = cos_z -this.sin_lat_o * Math.sin(lat);

          if(temp!=0.0) lon=Proj4js.common.adjust_lon(this.long0+Math.atan2(p.x*sin_z*this.cos_lat_o,temp*Rh));

       } else if (this.lat0 < 0.0) {

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

       } else {

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

       }

    } else {

      lat = this.lat0;

    }

    //return(OK);

    p.x = lon;

    p.y = lat;

    return p;

  }//lamazInv()

};







/* ======================================================================

    projCode/sinu.js

   ====================================================================== */
@@ -4805,6 +4703,7 @@ Proj4js.Proj.laea = { 
        cosphi = Math.cos(phi);

        coslam = Math.cos(lam);

        switch (this.mode) {

          case this.OBLIQ:

          case this.EQUIT:

            y = (this.mode == this.EQUIT) ? 1. + cosphi * coslam : 1. + this.sinph0 * sinphi + this.cosph0 * cosphi * coslam;

            if (y <= Proj4js.common.EPSLN) {

lib/proj4js-compressed.js

+6 −8

File changed.

Preview size limit exceeded, changes collapsed.

lib/proj4js.js

+11 −0
Original line number Diff line number Diff line
@@ -448,6 +448,12 @@ Proj4js.Proj = Proj4js.Class({ 
   * The y coordinate origin

   */

  y0: 0,

  /**

   * Property: localCS

   * Flag to indicate if the projection is a local one in which no transforms

   * are required.

   */

  localCS: false,



  /**

   * Constructor: initialize
@@ -466,6 +472,7 @@ Proj4js.Proj = Proj4js.Class({ 
          (srsCode.indexOf('PROJCS') >= 0) ||

          (srsCode.indexOf('LOCAL_CS') >= 0)) {

            this.parseWKT(srsCode);

            this.datum = new Proj4js.datum(this);

            this.loadProjCode(this.projName);

            return;

      }
@@ -702,6 +709,7 @@ Proj4js.Proj = Proj4js.Class({ 
    switch (wktObject) {

      case 'LOCAL_CS':

        this.projName = 'identity'

        this.localCS = true;

        this.srsCode = wktName;

        break;

      case 'GEOGCS':
@@ -720,6 +728,9 @@ Proj4js.Proj = Proj4js.Class({ 
      case 'DATUM':

        this.datumName = wktName;

        break;

      case 'LOCAL_DATUM':

        this.datumCode = 'none';

        break;

      case 'SPHEROID':

        this.ellps = wktName;

        this.a = parseFloat(wktArray.shift());

lib/projCode/laea.js

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ Proj4js.Proj.laea = { 
        cosphi = Math.cos(phi);

        coslam = Math.cos(lam);

        switch (this.mode) {

          case this.OBLIQ:

          case this.EQUIT:

            y = (this.mode == this.EQUIT) ? 1. + cosphi * coslam : 1. + this.sinph0 * sinphi + this.cosph0 * cosphi * coslam;

            if (y <= Proj4js.common.EPSLN) {