Commit 2538eadf authored by Michael Adair's avatar Michael Adair
Browse files

re #47: adding initial support for WKT parsing

parent 129fa22d

build/build.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ $Id: build.xml 2955 2007-07-09 12:12:27Z steven $ 
  <property environment="env"/>

  <property name="app.name" value="proj4js"/>

  <property name="app.path" value="/${app.name}"/>

  <property name="app.version" value="1.0.0"/>

  <property name="app.version" value="1.0.2"/>

  <property name="build.home" value="${basedir}/tempBuild"/>

  <property name="dist.home" value="${basedir}/dist"/>

  <property name="docs.home" value="${build.home}/docs"/>

lib/proj4js-combined.js

+271 −12
Original line number Diff line number Diff line
@@ -80,8 +80,12 @@ Proj4js = { 
    *     projected Cartesian (x,y), but should always have x,y properties.

    */

    transform: function(source, dest, point) {

        if (!source.readyToUse || !dest.readyToUse) {

            this.reportError("Proj4js initialization for "+source.srsCode+" not yet complete");

        if (!source.readyToUse) {

            this.reportError("Proj4js initialization for:"+source.srsCode+" not yet complete");

            return point;

        }

        if (!dest.readyToUse) {

            this.reportError("Proj4js initialization for:"+dest.srsCode+" not yet complete");

            return point;

        }
@@ -470,6 +474,17 @@ Proj4js.Proj = Proj4js.Class({ 
  */

  initialize: function(srsCode) {

      this.srsCodeInput = srsCode;

      

      //check to see if this is a WKT string

      if ((srsCode.indexOf('GEOGCS') >= 0) ||

          (srsCode.indexOf('GEOCCS') >= 0) ||

          (srsCode.indexOf('PROJCS') >= 0) ||

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

            this.parseWKT(srsCode);

            this.loadProjCode(this.projName);

            return;

      }

      

      // DGR 2008-08-03 : support urn and url

      if (srsCode.indexOf('urn:') == 0) {

          //urn:ORIGINATOR:def:crs:CODESPACE:VERSION:ID
@@ -655,6 +670,123 @@ Proj4js.Proj = Proj4js.Class({ 
      this.readyToUse = true;

  },



/**

 * Function: parseWKT

 * Parses a WKT string to get initialization parameters

 *

 */

 wktRE: /^(\w+)\[(.*)\]$/,

 parseWKT: function(wkt) {

    var wktMatch = wkt.match(this.wktRE);

    if (!wktMatch) return;

    var wktObject = wktMatch[1];

    var wktContent = wktMatch[2];

    var wktTemp = wktContent.split(",");

    var wktName = wktTemp.shift();

    wktName = wktName.replace(/^\"/,"");

    wktName = wktName.replace(/\"$/,"");

    

    /*

    wktContent = wktTemp.join(",");

    var wktArray = wktContent.split("],");

    for (var i=0; i<wktArray.length-1; ++i) {

      wktArray[i] += "]";

    }

    */

    

    var wktArray = new Array();

    var bkCount = 0;

    var obj = "";

    for (var i=0; i<wktTemp.length; ++i) {

      var token = wktTemp[i];

      for (var j=0; j<token.length; ++j) {

        if (token.charAt(j) == "[") ++bkCount;

        if (token.charAt(j) == "]") --bkCount;

      }

      obj += token;

      if (bkCount === 0) {

        wktArray.push(obj);

        obj = "";

      } else {

        obj += ",";

      }

    }

    

    //do something based on the type of the wktObject being parsed

    //add in variations in the spelling as required

    switch (wktObject) {

      case 'LOCAL_CS':

        this.projName = 'identity'

        this.srsCode = wktName;

        break;

      case 'GEOGCS':

        this.projName = 'longlat'

        this.geocsCode = wktName;

        if (!this.srsCode) this.srsCode = wktName;

        break;

      case 'PROJCS':

        this.srsCode = wktName;

        break;

      case 'GEOCCS':

        break;

      case 'PROJECTION':

        this.projName = Proj4js.wktProjections[wktName]

        break;

      case 'DATUM':

        this.datumName = wktName;

        break;

      case 'SPHEROID':

        this.ellps = wktName;

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

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

        break;

      case 'PRIMEM':

        this.from_greenwich = parseFloat(wktArray.shift()); //to radians?

        break;

      case 'UNIT':

        this.units = wktName;

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

        break;

      case 'PARAMETER':

        var name = wktName;

        var value = parseFloat(parseFloat(wktArray.shift()));

        //there amy be many variations on the wktName values, add in case

        //statements as required

        switch (name) {

          case 'false_easting':

            this.x0 = value;

            break;

          case 'false_northing':

            this.y0 = value;

            break;

          case 'scale_factor':

            this.k0 = value;

            break;

          case 'central_meridian':

            this.long0 = value;

            break;

          case 'latitude_of_origin':

            this.lat0 = value;

            break;

          case 'more_here':

            break;

          default:

            break;

        }

        break;

      case 'TOWGS84':

        this.datum_params = wktArray;

        break;

      case 'MORE_HERE':

        break;

      default:

        break;

    }

    for (var i=0; i<wktArray.length; ++i) {

      this.parseWKT(wktArray[i]);

    }

 },



/**

 * Function: parseDefs

 * Parses the PROJ.4 initialization string and sets the associated properties.
@@ -771,6 +903,7 @@ Proj4js.Proj.longlat = { 
    return pt;

  }

};

Proj4js.Proj.identity = Proj4js.Proj.longlat;



/**

  Proj4js.defs is a collection of coordinate system definition objects in the
@@ -854,7 +987,7 @@ Proj4js.common = { 
    var eccnth = .5 * eccent;

    var con, dphi;

    var phi = this.HALF_PI - 2 * Math.atan(ts);

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

    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;

      phi += dphi;
@@ -1530,6 +1663,19 @@ Proj4js.Datum = { 


Proj4js.WGS84 = new Proj4js.Proj('WGS84');

Proj4js.Datum['OSB36'] = Proj4js.Datum['OSGB36']; //as returned from spatialreference.org



//lookup table to go from the projection name in WKT to the Proj4js projection name

//build this out as required

Proj4js.wktProjections = {

  "Lambert Tangential Conformal Conic Projection": "lcc",

  "Mercator": "merc",

  "Transverse_Mercator": "tmerc",

  "Transverse Mercator": "tmerc",

  "Lambert Azimuthal Equal Area": "laea",

  "Universal Transverse Mercator System": "utm"

};





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

    projCode/aea.js

   ====================================================================== */
@@ -2261,7 +2407,7 @@ Proj4js.Proj.eqdc = { 
    var theta = 0.0;

    if (rh1 != 0.0) theta = Math.atan2(con *p.x, con *p.y);

    var ml = this.g - rh1 /this.a;

    var lat = this.phi3z(this.ml,this.e0,this.e1,this.e2,this.e3);

    var lat = this.phi3z(ml,this.e0,this.e1,this.e2,this.e3);

    var lon = Proj4js.common.adjust_lon(this.long0 + theta / this.ns);



     p.x=lon;
@@ -2595,7 +2741,7 @@ Proj4js.Proj.ortho = { 
      lat = this.lat0; 

    }

    lat = Proj4js.common.asinz(cosz * this.sin_p14 + (p.y * sinz * this.cos_p14)/rh);

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

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

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

       if (this.lat0 >= 0) {

          lon = Proj4js.common.adjust_lon(this.long0 + Math.atan2(p.x, -p.y));
@@ -2604,9 +2750,6 @@ Proj4js.Proj.ortho = { 
       }

    }

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

    if ((Math.abs(con) >= Proj4js.common.EPSLN) || (Math.abs(x) >= Proj4js.common.EPSLN)) {

       lon = Proj4js.common.adjust_lon(this.long0 + Math.atan2((p.x * sinz * this.cos_p14), (con * rh)));

    }

    p.x=lon;

    p.y=lat;

    return p;
@@ -2644,7 +2787,7 @@ Proj4js.Proj.somerc = { 
    var flattening = 1 / invF;

    var e2 = 2 * flattening - Math.pow(flattening, 2);

    var e = this.e = Math.sqrt(e2);

    this.R = semiMajorAxis * Math.sqrt(1 - e2) / (1 - e2 * Math.pow(sinPhy0, 2.0));

    this.R = this.k0 * semiMajorAxis * Math.sqrt(1 - e2) / (1 - e2 * Math.pow(sinPhy0, 2.0));

    this.alpha = Math.sqrt(1 + e2 / (1 - e2) * Math.pow(Math.cos(phy0), 4.0));

    this.b0 = Math.asin(sinPhy0 / this.alpha);

    this.K = Math.log(Math.tan(Math.PI / 4.0 + this.b0 / 2.0))
@@ -3376,6 +3519,7 @@ Proj4js.Proj.gnom = { 
    this.cos_p14=Math.cos(this.lat0);

    // Approximation for projecting points to the horizon (infinity)

    this.infinity_dist = 1000 * this.a;

    this.rc = 1;

  },
@@ -3457,6 +3601,121 @@ 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

   ====================================================================== */
@@ -3668,7 +3927,7 @@ Proj4js.Proj.vandg = { 
		if (p.y >= 0) {

			lat = (-m1 *Math.cos(th1 + Proj4js.common.PI / 3.0) - c2 / 3.0 / c3) * Proj4js.common.PI;

		} else {

			lat = -(-m1 * Math.cos(th1 + PI / 3.0) - c2 / 3.0 / c3) * Proj4js.common.PI;

			lat = -(-m1 * Math.cos(th1 + Proj4js.common.PI / 3.0) - c2 / 3.0 / c3) * Proj4js.common.PI;

		}



		if (Math.abs(xx) < Proj4js.common.EPSLN) {
@@ -4410,8 +4669,8 @@ Proj4js.Proj.lcc = { 


    var rh1, con, ts;

    var lat, lon;

    x = (p.x - this.x0)/this.k0;

    y = (this.rh - (p.y - this.y0)/this.k0);

    var x = (p.x - this.x0)/this.k0;

    var y = (this.rh - (p.y - this.y0)/this.k0);

    if (this.ns > 0) {

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

      con = 1.0;

lib/proj4js-compressed.js

+23 −12

File changed.

Preview size limit exceeded, changes collapsed.

lib/proj4js.js

+142 −0
Original line number Diff line number Diff line
@@ -459,6 +459,17 @@ Proj4js.Proj = Proj4js.Class({ 
  */

  initialize: function(srsCode) {

      this.srsCodeInput = srsCode;

      

      //check to see if this is a WKT string

      if ((srsCode.indexOf('GEOGCS') >= 0) ||

          (srsCode.indexOf('GEOCCS') >= 0) ||

          (srsCode.indexOf('PROJCS') >= 0) ||

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

            this.parseWKT(srsCode);

            this.loadProjCode(this.projName);

            return;

      }

      

      // DGR 2008-08-03 : support urn and url

      if (srsCode.indexOf('urn:') == 0) {

          //urn:ORIGINATOR:def:crs:CODESPACE:VERSION:ID
@@ -644,6 +655,123 @@ Proj4js.Proj = Proj4js.Class({ 
      this.readyToUse = true;

  },



/**

 * Function: parseWKT

 * Parses a WKT string to get initialization parameters

 *

 */

 wktRE: /^(\w+)\[(.*)\]$/,

 parseWKT: function(wkt) {

    var wktMatch = wkt.match(this.wktRE);

    if (!wktMatch) return;

    var wktObject = wktMatch[1];

    var wktContent = wktMatch[2];

    var wktTemp = wktContent.split(",");

    var wktName = wktTemp.shift();

    wktName = wktName.replace(/^\"/,"");

    wktName = wktName.replace(/\"$/,"");

    

    /*

    wktContent = wktTemp.join(",");

    var wktArray = wktContent.split("],");

    for (var i=0; i<wktArray.length-1; ++i) {

      wktArray[i] += "]";

    }

    */

    

    var wktArray = new Array();

    var bkCount = 0;

    var obj = "";

    for (var i=0; i<wktTemp.length; ++i) {

      var token = wktTemp[i];

      for (var j=0; j<token.length; ++j) {

        if (token.charAt(j) == "[") ++bkCount;

        if (token.charAt(j) == "]") --bkCount;

      }

      obj += token;

      if (bkCount === 0) {

        wktArray.push(obj);

        obj = "";

      } else {

        obj += ",";

      }

    }

    

    //do something based on the type of the wktObject being parsed

    //add in variations in the spelling as required

    switch (wktObject) {

      case 'LOCAL_CS':

        this.projName = 'identity'

        this.srsCode = wktName;

        break;

      case 'GEOGCS':

        this.projName = 'longlat'

        this.geocsCode = wktName;

        if (!this.srsCode) this.srsCode = wktName;

        break;

      case 'PROJCS':

        this.srsCode = wktName;

        break;

      case 'GEOCCS':

        break;

      case 'PROJECTION':

        this.projName = Proj4js.wktProjections[wktName]

        break;

      case 'DATUM':

        this.datumName = wktName;

        break;

      case 'SPHEROID':

        this.ellps = wktName;

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

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

        break;

      case 'PRIMEM':

        this.from_greenwich = parseFloat(wktArray.shift()); //to radians?

        break;

      case 'UNIT':

        this.units = wktName;

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

        break;

      case 'PARAMETER':

        var name = wktName;

        var value = parseFloat(parseFloat(wktArray.shift()));

        //there amy be many variations on the wktName values, add in case

        //statements as required

        switch (name) {

          case 'false_easting':

            this.x0 = value;

            break;

          case 'false_northing':

            this.y0 = value;

            break;

          case 'scale_factor':

            this.k0 = value;

            break;

          case 'central_meridian':

            this.long0 = value;

            break;

          case 'latitude_of_origin':

            this.lat0 = value;

            break;

          case 'more_here':

            break;

          default:

            break;

        }

        break;

      case 'TOWGS84':

        this.datum_params = wktArray;

        break;

      case 'MORE_HERE':

        break;

      default:

        break;

    }

    for (var i=0; i<wktArray.length; ++i) {

      this.parseWKT(wktArray[i]);

    }

 },



/**

 * Function: parseDefs

 * Parses the PROJ.4 initialization string and sets the associated properties.
@@ -760,6 +888,7 @@ Proj4js.Proj.longlat = { 
    return pt;

  }

};

Proj4js.Proj.identity = Proj4js.Proj.longlat;



/**

  Proj4js.defs is a collection of coordinate system definition objects in the
@@ -1519,3 +1648,16 @@ Proj4js.Datum = { 


Proj4js.WGS84 = new Proj4js.Proj('WGS84');

Proj4js.Datum['OSB36'] = Proj4js.Datum['OSGB36']; //as returned from spatialreference.org



//lookup table to go from the projection name in WKT to the Proj4js projection name

//build this out as required

Proj4js.wktProjections = {

  "Lambert Tangential Conformal Conic Projection": "lcc",

  "Mercator": "merc",

  "Transverse_Mercator": "tmerc",

  "Transverse Mercator": "tmerc",

  "Lambert Azimuthal Equal Area": "laea",

  "Universal Transverse Mercator System": "utm"

};

test/testWKT.html

0 → 100644
+50 −0
Original line number Diff line number Diff line 
<html>

<head>

<script type="text/javascript" src="../lib/proj4js.js"></script>

<script type="text/javascript">



var aWKT = [

'GEOGCS["WGS84 Lat/Long Degrees -180 ==> +180",DATUM["D_WGS_1984",SPHEROID["World_Geodetic_System_of_1984",6378137,298.257222932867]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]',

'PROJCS["ALG-S-AN",GEOGCS["VOIR1875",DATUM["VOIR1875",SPHEROID["CLRK-IGN",6378249.200,293.46602129],TOWGS84[-73.0000,-247.0000,227.0000,0.000000,0.000000,0.000000,0.00000000]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert Tangential Conformal Conic Projection"],PARAMETER["false_easting",500000.000],PARAMETER["false_northing",300000.000],PARAMETER["scale_factor",0.999625800000],PARAMETER["central_meridian",2.70000000000000],PARAMETER["latitude_of_origin",33.30000000000000],UNIT["Meter",1.00000000000000]]',

'PROJCS["CANQ27-M15M",GEOGCS["LL27",DATUM["NAD27",SPHEROID["CLRK66",6378206.400,294.97869821]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["false_easting",304800.000],PARAMETER["false_northing",0.000],PARAMETER["scale_factor",0.999900000000],PARAMETER["central_meridian",-90.00000000000000],PARAMETER["latitude_of_origin",0.00000000000000],UNIT["Meter",1.00000000000000]]',

'LOCAL_CS["Non-Earth (Meter)",LOCAL_DATUM["Local Datum",0],UNIT["Meter", 1],AXIS["X",EAST],AXIS["Y",NORTH]]'

];



var wktRE = /^\,(\w+)\[(.*)\]/;



window.onload = function() {

  var table = document.getElementById('resultsTable');

  for (var i=0; i<aWKT.length; ++i) {

    var tr = document.createElement('tr');

    var wkt = aWKT[i];

    //wkt = ','+wkt;

    var testProj = new Proj4js.Proj(wkt);

    

    var td = document.createElement('td');

    td.innerHTML = testProj.srsCode;

    tr.appendChild(td);

    

    td = document.createElement('td');

    td.innerHTML = testProj.units;

    tr.appendChild(td);

    

    td = document.createElement('td');

    td.innerHTML = testProj.projName;

    tr.appendChild(td);

    

    td = document.createElement('td');

    td.innerHTML = wkt;

    tr.appendChild(td);

    table.appendChild(tr);

  }

}



</script>

</head>

<body>

<h2>testing WKT parser</h2>

<table id='resultsTable'>

  <tr><th>name</th><th>units</th><th>proj</th><th align="left">wkt</th></tr>

</table>

</body>

</html>