Commit 3e47f7bc authored by Calvin Metcalf's avatar Calvin Metcalf
Browse files

worker for 2

parent bdb14ec5

src/wkt2.js

+10 −2
Original line number Diff line number Diff line
@@ -102,13 +102,21 @@ define(['./extend','./constants','./common'],function(extend,constants,common) { 
      wkt.units=wkt.UNIT.name;

      wkt.unitsPerMeter=wkt.UNIT.convert;

    }

    if(wkt.GEOGCS){

      wkt.datumName=wkt.GEOGCS.name;

      if(wkt.GEOGCS.DATUM && wkt.GEOGCS.DATUM.SPHEROID){

        wkt.ellps=wkt.GEOGCS.DATUM.SPHEROID.name.replace('_19','');

        wkt.a = wkt.GEOGCS.DATUM.SPHEROID.a;

        wkt.rf = wkt.GEOGCS.DATUM.SPHEROID.rf;

      }

    }

    wkt.false_easting=wkt.False_Easting;

    wkt.false_northing=wkt.False_Northing;

    wkt.central_meridian=wkt.Central_Meridian;

    wkt.latitude_of_origin = wkt.Latitude_Of_Origin;

    wkt.scale_factor=wkt.Scale_Factor;

    wkt.x0 = wkt.false_easting;

    wkt.y0 = wkt.false_northing;

    wkt.x0 = parseFloat(wkt.false_easting,10);

    wkt.y0 = parseFloat(wkt.false_northing,10);

    wkt.lat1=wkt.Standard_Parallel_1 * common.D2R;

    wkt.lat2=wkt.Standard_Parallel_2 * common.D2R;

    wkt.k0=wkt.scale_factor;

test/test.amd.js

+2 −2
Original line number Diff line number Diff line
@@ -219,8 +219,8 @@ describe('proj4', function () { 
				assert.equal(testProj.units,wkt.units,'correct units');

				assert.equal(testProj.projName,wkt.proj,'correct type');

				if(wkt.testPoint){

				   assert.closeTo(proj4(wkt.wkt).forward(wkt.testPoint[0])[0],proj4(wkt.code).forward(wkt.testPoint[0])[0],1000000)

				  assert.closeTo(proj4(wkt.wkt).inverse(wkt.testPoint[1])[0],proj4(wkt.code).inverse(wkt.testPoint[1])[0],2)

				   assert.closeTo(proj4(wkt.wkt).forward(wkt.testPoint[0])[0],proj4(wkt.code).forward(wkt.testPoint[0])[0],1)

				  assert.closeTo(proj4(wkt.wkt).inverse(wkt.testPoint[1])[0],proj4(wkt.code).inverse(wkt.testPoint[1])[0],1)

				}

			});

		});

test/test.js

+2 −2
Original line number Diff line number Diff line
@@ -197,8 +197,8 @@ describe('proj4', function () { 
				assert.equal(testProj.units,wkt.units,'correct units');

				assert.equal(testProj.projName,wkt.proj,'correct type')

				if(wkt.testPoint){

				   assert.closeTo(proj4(wkt.wkt).forward(wkt.testPoint[0])[0],proj4(wkt.code).forward(wkt.testPoint[0])[0],1000000)

				  assert.closeTo(proj4(wkt.wkt).inverse(wkt.testPoint[1])[0],proj4(wkt.code).inverse(wkt.testPoint[1])[0],2)

				   assert.closeTo(proj4(wkt.wkt).forward(wkt.testPoint[0])[0],proj4(wkt.code).forward(wkt.testPoint[0])[0],1)

				  assert.closeTo(proj4(wkt.wkt).inverse(wkt.testPoint[1])[0],proj4(wkt.code).inverse(wkt.testPoint[1])[0],1)

				}

			});

		});

test/test.opt.js

+2 −2
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ describe('proj4', function () { 
				assert.equal(testProj.units,wkt.units,'correct units');

				assert.equal(testProj.projName,wkt.proj,'correct type');

				if(wkt.testPoint){

				   assert.closeTo(proj4(wkt.wkt).forward(wkt.testPoint[0])[0],proj4(wkt.code).forward(wkt.testPoint[0])[0],1000000)

				  assert.closeTo(proj4(wkt.wkt).inverse(wkt.testPoint[1])[0],proj4(wkt.code).inverse(wkt.testPoint[1])[0],2)

				   assert.closeTo(proj4(wkt.wkt).forward(wkt.testPoint[0])[0],proj4(wkt.code).forward(wkt.testPoint[0])[0],1)

				  assert.closeTo(proj4(wkt.wkt).inverse(wkt.testPoint[1])[0],proj4(wkt.code).inverse(wkt.testPoint[1])[0],1)

				}

			});

		});

test/testData.js

+10 −8
Original line number Diff line number Diff line
@@ -143,17 +143,19 @@ var aWKT = [ 
	wkt:'LOCAL_CS["Non-Earth (Meter)",LOCAL_DATUM["Local Datum",0],UNIT["Meter", 1],AXIS["X",EAST],AXIS["Y",NORTH]]'

},

{

	name:'SVY21',

	name:'NAD_1983_HARN_StatePlane_New_Jersey_FIPS_2900',

	units:'Meter',

	proj:'tmerc',

	wkt:'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]]'

	code:'ESRI:102311',

	testPoint:[[-75,40],[107307.24586574888, 129634.14970674049]],

	wkt:'PROJCS["NAD_1983_HARN_StatePlane_New_Jersey_FIPS_2900",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",150000],PARAMETER["False_Northing",0],PARAMETER["Central_Meridian",-74.5],PARAMETER["Scale_Factor",0.9999],PARAMETER["Latitude_Of_Origin",38.83333333333334],UNIT["Meter",1]]'

},

{

	name:'NAD_1983_StatePlane_Massachusetts_Mainland_FIPS_2001_Feet',

	units:"Foot_US",

	name:"NAD_1983_HARN_StatePlane_Massachusetts_Mainland_FIPS_2001",

	units:"Meter",

	proj:'lcc',

	code:'ESRI:102686',

	testPoint:[[-70, 41],[782385.8996039435, 2461734.8626785204]],

	wkt:'PROJCS["NAD_1983_StatePlane_Massachusetts_Mainland_FIPS_2001_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",656166.6666666665],PARAMETER["False_Northing",2460625.0],PARAMETER["Central_Meridian",-71.5],PARAMETER["Standard_Parallel_1",41.71666666666667],PARAMETER["Standard_Parallel_2",42.68333333333333],PARAMETER["Latitude_Of_Origin",41.0],UNIT["Foot_US",0.3048006096012192]]'

	code:'ESRI:102286',

	testPoint:[[-70, 41],[326219.2329381689, 751109.8626785288]],

	wkt:'PROJCS["NAD_1983_HARN_StatePlane_Massachusetts_Mainland_FIPS_2001",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",200000],PARAMETER["False_Northing",750000],PARAMETER["Central_Meridian",-71.5],PARAMETER["Standard_Parallel_1",41.71666666666667],PARAMETER["Standard_Parallel_2",42.68333333333333],PARAMETER["Latitude_Of_Origin",41],UNIT["Meter",1]]'

	}

];