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

closes #63

parent f5ee626a

lib/proj4js.js

+10 −8
Original line number Diff line number Diff line
@@ -839,9 +839,9 @@ Proj4js.Proj = Proj4js.Class({ 
        }

        if (!this.axis) { this.axis= "enu"; }

        switch(name) {

          case 'X': this.axis=                         value + this.axis.substr(1,2); break;

          case 'Y': this.axis= this.axis.substr(0,1) + value + this.axis.substr(2,1); break;

          case 'Z': this.axis= this.axis.substr(0,2) + value                        ; break;

          case 'x': this.axis=                         value + this.axis.substr(1,2); break;

          case 'y': this.axis= this.axis.substr(0,1) + value + this.axis.substr(2,1); break;

          case 'z': this.axis= this.axis.substr(0,2) + value                        ; break;

          default : break;

        }

      case 'MORE_HERE':
@@ -946,7 +946,7 @@ Proj4js.Proj = Proj4js.Class({ 
          Proj4js.extend(this, ellipse);

      }

      if (this.rf && !this.b) this.b = (1.0 - 1.0/this.rf) * this.a;

      if (Math.abs(this.a - this.b)<Proj4js.common.EPSLN) {

      if (this.rf === 0 || Math.abs(this.a - this.b)<Proj4js.common.EPSLN) {

        this.sphere = true;

        this.b= this.a;

      }
@@ -1004,11 +1004,12 @@ Proj4js.defs = { 
  'WGS84': "+title=long/lat:WGS84 +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees",

  'EPSG:4326': "+title=long/lat:WGS84 +proj=longlat +a=6378137.0 +b=6356752.31424518 +ellps=WGS84 +datum=WGS84 +units=degrees",

  'EPSG:4269': "+title=long/lat:NAD83 +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees",

  'EPSG:3785': "+title= Google Mercator +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs"

  'EPSG:3875': "+title= Google Mercator +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs"

};

Proj4js.defs['GOOGLE'] = Proj4js.defs['EPSG:3785'];

Proj4js.defs['EPSG:900913'] = Proj4js.defs['EPSG:3785'];

Proj4js.defs['EPSG:102113'] = Proj4js.defs['EPSG:3785'];

Proj4js.defs['EPSG:3785'] = Proj4js.defs['EPSG:3875'];  //maintain backward compat, official code is 3875

Proj4js.defs['GOOGLE'] = Proj4js.defs['EPSG:3875'];

Proj4js.defs['EPSG:900913'] = Proj4js.defs['EPSG:3875'];

Proj4js.defs['EPSG:102113'] = Proj4js.defs['EPSG:3875'];



Proj4js.common = {

  PI : 3.141592653589793238, //Math.PI,
@@ -1750,6 +1751,7 @@ Proj4js.wktProjections = { 
  "Lambert Tangential Conformal Conic Projection": "lcc",

  "Mercator": "merc",

  "Popular Visualisation Pseudo Mercator": "merc",

  "Mercator_1SP": "merc",

  "Transverse_Mercator": "tmerc",

  "Transverse Mercator": "tmerc",

  "Lambert Azimuthal Equal Area": "laea",