Commit 4753ea81 authored by Michael Adair's avatar Michael Adair
Browse files

re #47: further updates and bug fix to support WKT parsing

parent 60a7982c

lib/proj4js-combined.js

+7 −7
Original line number Diff line number Diff line
@@ -487,7 +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.deriveConstants();

            this.loadProjCode(this.projName);

            return;

      }
@@ -759,9 +759,9 @@ Proj4js.Proj = Proj4js.Class({ 
        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

        var name = wktName.toLowerCase();

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

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

        //statements as required

        switch (name) {

          case 'false_easting':
@@ -774,10 +774,10 @@ Proj4js.Proj = Proj4js.Class({ 
            this.k0 = value;

            break;

          case 'central_meridian':

            this.long0 = value;

            this.long0 = value*Proj4js.common.D2R;

            break;

          case 'latitude_of_origin':

            this.lat0 = value;

            this.lat0 = value*Proj4js.common.D2R;

            break;

          case 'more_here':

            break;
@@ -1313,7 +1313,7 @@ var maxiter = 30; 


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

 * Following iterative algorithm was developped by

 * "Institut fr Erdmessung", University of Hannover, July 1988.

 * "Institut f�r Erdmessung", University of Hannover, July 1988.

 * Internet: www.ife.uni-hannover.de

 * Iterative computation of CPHI,SPHI and Height.

 * Iteration of CPHI and SPHI to 10**-12 radian resp.

lib/proj4js-compressed.js

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ return destination;},Class:function(){var Class=function(){this.initialize.apply 
Proj4js.extend(extended,parent);}

Class.prototype=extended;return Class;},bind:function(func,object){var args=Array.prototype.slice.apply(arguments,[2]);return function(){var newArgs=args.concat(Array.prototype.slice.apply(arguments,[0]));return func.apply(object,newArgs);};},scriptName:"proj4js-compressed.js",defsLookupService:'http://spatialreference.org/ref',libPath:null,getScriptLocation:function(){if(this.libPath)return this.libPath;var scriptName=this.scriptName;var scriptNameLen=scriptName.length;var scripts=document.getElementsByTagName('script');for(var i=0;i<scripts.length;i++){var src=scripts[i].getAttribute('src');if(src){var index=src.lastIndexOf(scriptName);if((index>-1)&&(index+scriptNameLen==src.length)){this.libPath=src.slice(0,-scriptNameLen);break;}}}

return this.libPath||"";},loadScript:function(url,onload,onfail,loadCheck){var script=document.createElement('script');script.defer=false;script.type="text/javascript";script.id=url;script.src=url;script.onload=onload;script.onerror=onfail;script.loadCheck=loadCheck;if(/MSIE/.test(navigator.userAgent)){script.onreadystatechange=this.checkReadyState;}

document.getElementsByTagName('head')[0].appendChild(script);},checkReadyState:function(){if(this.readyState=='loaded'){if(!this.loadCheck()){this.onerror();}else{this.onload();}}}};Proj4js.Proj=Proj4js.Class({readyToUse:false,title:null,projName:null,units:null,datum:null,x0:0,y0:0,localCS:false,initialize:function(srsCode){this.srsCodeInput=srsCode;if((srsCode.indexOf('GEOGCS')>=0)||(srsCode.indexOf('GEOCCS')>=0)||(srsCode.indexOf('PROJCS')>=0)||(srsCode.indexOf('LOCAL_CS')>=0)){this.parseWKT(srsCode);this.datum=new Proj4js.datum(this);this.loadProjCode(this.projName);return;}

document.getElementsByTagName('head')[0].appendChild(script);},checkReadyState:function(){if(this.readyState=='loaded'){if(!this.loadCheck()){this.onerror();}else{this.onload();}}}};Proj4js.Proj=Proj4js.Class({readyToUse:false,title:null,projName:null,units:null,datum:null,x0:0,y0:0,localCS:false,initialize:function(srsCode){this.srsCodeInput=srsCode;if((srsCode.indexOf('GEOGCS')>=0)||(srsCode.indexOf('GEOCCS')>=0)||(srsCode.indexOf('PROJCS')>=0)||(srsCode.indexOf('LOCAL_CS')>=0)){this.parseWKT(srsCode);this.deriveConstants();this.loadProjCode(this.projName);return;}

if(srsCode.indexOf('urn:')==0){var urn=srsCode.split(':');if((urn[1]=='ogc'||urn[1]=='x-ogc')&&(urn[2]=='def')&&(urn[3]=='crs')){srsCode=urn[4]+':'+urn[urn.length-1];}}else if(srsCode.indexOf('http://')==0){var url=srsCode.split('#');if(url[0].match(/epsg.org/)){srsCode='EPSG:'+url[1];}else if(url[0].match(/RIG.xml/)){srsCode='IGNF:'+url[1];}}

this.srsCode=srsCode.toUpperCase();if(this.srsCode.indexOf("EPSG")==0){this.srsCode=this.srsCode;this.srsAuth='epsg';this.srsProjNumber=this.srsCode.substring(5);}else if(this.srsCode.indexOf("IGNF")==0){this.srsCode=this.srsCode;this.srsAuth='IGNF';this.srsProjNumber=this.srsCode.substring(5);}else if(this.srsCode.indexOf("CRS")==0){this.srsCode=this.srsCode;this.srsAuth='CRS';this.srsProjNumber=this.srsCode.substring(4);}else{this.srsAuth='';this.srsProjNumber=this.srsCode;}

this.loadProjDefinition();},loadProjDefinition:function(){if(Proj4js.defs[this.srsCode]){this.defsLoaded();return;}
@@ -44,7 +44,7 @@ obj+=token;if(bkCount===0){wktArray.push(obj);obj="";}else{obj+=",";}} 
switch(wktObject){case'LOCAL_CS':this.projName='identity'

this.localCS=true;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'LOCAL_DATUM':this.datumCode='none';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());break;case'UNIT':this.units=wktName;this.unitsPerMeter=parseFloat(wktArray.shift());break;case'PARAMETER':var name=wktName;var value=parseFloat(parseFloat(wktArray.shift()));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'DATUM':this.datumName=wktName;break;case'LOCAL_DATUM':this.datumCode='none';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());break;case'UNIT':this.units=wktName;this.unitsPerMeter=parseFloat(wktArray.shift());break;case'PARAMETER':var name=wktName.toLowerCase();var value=parseFloat(wktArray.shift());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*Proj4js.common.D2R;break;case'latitude_of_origin':this.lat0=value*Proj4js.common.D2R;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]);}},parseDefs:function(){this.defData=Proj4js.defs[this.srsCode];var paramName,paramVal;if(!this.defData){return;}

var paramArray=this.defData.split("+");for(var prop=0;prop<paramArray.length;prop++){var property=paramArray[prop].split("=");paramName=property[0].toLowerCase();paramVal=property[1];switch(paramName.replace(/\s/gi,"")){case"":break;case"title":this.title=paramVal;break;case"proj":this.projName=paramVal.replace(/\s/gi,"");break;case"units":this.units=paramVal.replace(/\s/gi,"");break;case"datum":this.datumCode=paramVal.replace(/\s/gi,"");break;case"nadgrids":this.nagrids=paramVal.replace(/\s/gi,"");break;case"ellps":this.ellps=paramVal.replace(/\s/gi,"");break;case"a":this.a=parseFloat(paramVal);break;case"b":this.b=parseFloat(paramVal);break;case"rf":this.rf=parseFloat(paramVal);break;case"lat_0":this.lat0=paramVal*Proj4js.common.D2R;break;case"lat_1":this.lat1=paramVal*Proj4js.common.D2R;break;case"lat_2":this.lat2=paramVal*Proj4js.common.D2R;break;case"lat_ts":this.lat_ts=paramVal*Proj4js.common.D2R;break;case"lon_0":this.long0=paramVal*Proj4js.common.D2R;break;case"alpha":this.alpha=parseFloat(paramVal)*Proj4js.common.D2R;break;case"lonc":this.longc=paramVal*Proj4js.common.D2R;break;case"x_0":this.x0=parseFloat(paramVal);break;case"y_0":this.y0=parseFloat(paramVal);break;case"k_0":this.k0=parseFloat(paramVal);break;case"k":this.k0=parseFloat(paramVal);break;case"r_a":this.R_A=true;break;case"zone":this.zone=parseInt(paramVal);break;case"south":this.utmSouth=true;break;case"towgs84":this.datum_params=paramVal.split(",");break;case"to_meter":this.to_meter=parseFloat(paramVal);break;case"from_greenwich":this.from_greenwich=paramVal*Proj4js.common.D2R;break;case"pm":paramVal=paramVal.replace(/\s/gi,"");this.from_greenwich=Proj4js.PrimeMeridian[paramVal]?Proj4js.PrimeMeridian[paramVal]:parseFloat(paramVal);this.from_greenwich*=Proj4js.common.D2R;break;case"no_defs":break;default:}}

lib/proj4js.js

+7 −7
Original line number Diff line number Diff line
@@ -472,7 +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.deriveConstants();

            this.loadProjCode(this.projName);

            return;

      }
@@ -744,9 +744,9 @@ Proj4js.Proj = Proj4js.Class({ 
        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

        var name = wktName.toLowerCase();

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

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

        //statements as required

        switch (name) {

          case 'false_easting':
@@ -759,10 +759,10 @@ Proj4js.Proj = Proj4js.Class({ 
            this.k0 = value;

            break;

          case 'central_meridian':

            this.long0 = value;

            this.long0 = value*Proj4js.common.D2R;

            break;

          case 'latitude_of_origin':

            this.lat0 = value;

            this.lat0 = value*Proj4js.common.D2R;

            break;

          case 'more_here':

            break;
@@ -1298,7 +1298,7 @@ var maxiter = 30; 


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

 * Following iterative algorithm was developped by

 * "Institut für Erdmessung", University of Hannover, July 1988.

 * "Institut f�r Erdmessung", University of Hannover, July 1988.

 * Internet: www.ife.uni-hannover.de

 * Iterative computation of CPHI,SPHI and Height.

 * Iteration of CPHI and SPHI to 10**-12 radian resp.

test/testWKT.html

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 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]]'

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

'PROJCS["SVY21",GEOGCS["SVY21[WGS84]",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",28001.642],PARAMETER["False_Northing",38744.572],PARAMETER["Central_Meridian",103.8333333333333],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",1.366666666666667],UNIT["Meter",1.0]]'

];



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