Commit bdb14ec5 authored by Calvin Metcalf's avatar Calvin Metcalf
Browse files

updates

parent 0085e551

src/wkt2.js

+17 −1
Original line number Diff line number Diff line 
define(['./extend','./constants'],function(extend,constants) {

define(['./extend','./constants','./common'],function(extend,constants,common) {

  /*function flatten(a) {

    var out = [];

    a.forEach(function(v) {
@@ -102,6 +102,22 @@ define(['./extend','./constants'],function(extend,constants) { 
      wkt.units=wkt.UNIT.name;

      wkt.unitsPerMeter=wkt.UNIT.convert;

    }

    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.lat1=wkt.Standard_Parallel_1 * common.D2R;

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

    wkt.k0=wkt.scale_factor;

    if(wkt.central_meridian){

      wkt.long0 = wkt.central_meridian * common.D2R;

    }

    if(wkt.latitude_of_origin){

      wkt.lat0 = wkt.latitude_of_origin * common.D2R;

    }

    wkt.srsCode = wkt.name;

  }

  return function(wkt, self) {

test/test.amd.js

+6 −2
Original line number Diff line number Diff line
@@ -217,7 +217,11 @@ describe('proj4', function () { 
				var testProj = new proj4.Proj(wkt.wkt);

				assert.equal(testProj.srsCode,wkt.name,'correct name');

				assert.equal(testProj.units,wkt.units,'correct units');

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

				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)

				}

			});

		});

	});

test/test.js

+4 −0
Original line number Diff line number Diff line
@@ -196,6 +196,10 @@ describe('proj4', function () { 
				assert.equal(testProj.srsCode,wkt.name,'correct name');

				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)

				}

			});

		});

	});

test/test.opt.js

+5 −1
Original line number Diff line number Diff line
@@ -188,7 +188,11 @@ describe('proj4', function () { 
				var testProj = new proj4.Proj(wkt.wkt);

				assert.equal(testProj.srsCode,wkt.name,'correct name');

				assert.equal(testProj.units,wkt.units,'correct units');

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

				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)

				}

			});

		});

	});

test/testData.js

+3 −1
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ var aWKT = [ 
	name:'NAD_1983_StatePlane_Massachusetts_Mainland_FIPS_2001_Feet',

	units:"Foot_US",

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

}

];