Commit 21335367 authored by Michael Adair's avatar Michael Adair
Browse files

re #6: use this.a instead of this.R for earth radius

parent e01b7eb8

lib/projCode/moll.js

+4 −4
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ Proj4js.Proj.moll = { 
       this is done here because of precision problems with "cos(theta)"

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

    if (Proj4js.common.PI/2 - Math.abs(lat) < Proj4js.common.EPSLN) delta_lon =0;

    var x = 0.900316316158 * this.R * delta_lon * Math.cos(theta) + this.x0;

    var y = 1.4142135623731 * this.R * Math.sin(theta) + this.y0;

    var x = 0.900316316158 * this.a * delta_lon * Math.cos(theta) + this.x0;

    var y = 1.4142135623731 * this.a * Math.sin(theta) + this.y0;



    p.x=x;

    p.y=y;
@@ -77,14 +77,14 @@ Proj4js.Proj.moll = { 
      -----------------*/

    p.x-= this.x0;

    //~ p.y -= this.y0;

    var arg = p.y /  (1.4142135623731 * this.R);

    var arg = p.y /  (1.4142135623731 * this.a);



    /* Because of division by zero problems, 'arg' can not be 1.0.  Therefore

       a number very close to one is used instead.

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

    if(Math.abs(arg) > 0.999999999999) arg=0.999999999999;

    var theta =Math.asin(arg);

    var lon = Proj4js.common.adjust_lon(this.long0 + (p.x / (0.900316316158 * this.R * Math.cos(theta))));

    var lon = Proj4js.common.adjust_lon(this.long0 + (p.x / (0.900316316158 * this.a * Math.cos(theta))));

    if(lon < (-Proj4js.common.PI)) lon= -Proj4js.common.PI;

    if(lon > Proj4js.common.PI) lon= Proj4js.common.PI;

    arg = (2.0 * theta + Math.sin(2.0 * theta)) / Proj4js.common.PI;