updating the tests directory

git-svn-id: http://svn.osgeo.org/metacrs/proj4js@2078 4e78687f-474d-0410-85f9-8d5e500ac6b2
temsa · Jul 26, 2011 · 6aa73b8 · 6aa73b8
1 parent 11c0e0c
commit 6aa73b8
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 13 deletions.
diff --git a/trunk/test/index.html b/trunk/test/index.html
@@ -5,8 +5,6 @@
   <title>Proj4js Test Page</title>
   <script src="../lib/proj4js.js"></script>
   <script src="../lib/defs/EPSG42304.js"></script>
-  <script src="../lib/defs/EPSG25833.js"></script>
-  <script src="../lib/defs/EPSG27563.js"></script>
   <script src="testdata.js"></script>
   <script src="runtests.js"></script>
 </head>

diff --git a/trunk/test/runtests.js b/trunk/test/runtests.js
@@ -1,12 +1,27 @@
 /* Loop through the test points and create a Proj object for each
  */
+ var src, dest;
 function runTests() {
-
+
+  //src = new Proj4js.Proj(Proj4js.defs["WKT0"],cb2);
+  /*
+  src = new Proj4js.Proj("EPSG:900913",cb1);
+  var testPt = new Proj4js.Point([1113194.9079327357, 6800125.454397307]);
+  var testRes = Proj4js.transform(src, dest, testPt);
+  alert(testRes.toString());
+  */
+
   for (var i=0; i < Proj4js.testPoints.length; ++i) {
     var test = Proj4js.testPoints[i];
     var proj = new Proj4js.Proj(test.code, Proj4js.bind(showResults, this, test));
   }
 }
+function cb1() {
+  dest = new Proj4js.Proj("EPSG:2303X",cb2);
+}
+function cb2(arg1) {
+  //alert('all set');
+}
 
 /* a callback function to run the test for this test point since we are using
  the dynamic load capabilities in the test page

diff --git a/trunk/test/testdata.js b/trunk/test/testdata.js
@@ -4,8 +4,49 @@ Proj4js.defs["EPSG:54003"] = "+proj=mill +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +R_A +e
 Proj4js.defs["EPSG:54029"] = "+proj=vandg +lon_0=0 +x_0=0 +y_0=0 +R_A +ellps=WGS84 +datum=WGS84 +units=m +no_defs";
 Proj4js.defs["EPSG:2303X"] = "+proj=utm +zone=30 +ellps=intl +units=m +towgs84=-157.89,-17.16,-78.41,2.118,2.697,-1.434,-1.1097046576093785 +no_defs ";
 Proj4js.defs["EPSG:3035"] = "+proj=laea +lat_0=52 +lon_0=10 +x_0=4321000 +y_0=3210000 +ellps=GRS80 +units=m +no_defs";
+Proj4js.defs["EPSG:54009"] = "+proj=moll +lon_0=0 +units=m";
+Proj4js.defs["EPSG:28191"] = "+proj=cass +lat_0=31.73409694444445 +lon_0=35.21208055555556 +x_0=170251.555 +y_0=126867.909 +a=6378300.789 +b=6356566.435 +towgs84=-275.722,94.7824,340.894,-8.001,-4.42,-11.821,1 +units=m +no_defs";
+Proj4js.defs["EPSG:2958"] = "+proj=utm +zone=17 +ellps=GRS80 +units=m +no_defs";
+Proj4js.defs["EPSG:102018"] = "+proj=gnom +lat_0=90 +lon_0=0 +x_0=6300000 +y_0=6300000 +ellps=WGS84 +datum=WGS84 +units=m +no_defs";
+Proj4js.defs["ESRI:102026"] = "+proj=eqdc +lat_0=0 +lon_0=0 +lat_1=15 +lat_2=65 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs";
+Proj4js.defs["EPSG:26986"] = "+proj=lcc +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lat_0=41 +lon_0=-71.5 +x_0=200000 +y_0=750000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs";
+
+//need test points for these
+
+/*
+Proj4js.defs["WKT0"] = 'PROJCS["HARN/WI.SheboyganWI-M",GEOGCS["HARN/WI.LL",DATUM["HARN/WI",SPHEROID["GRS1980",6378137.000,298.25722210],TOWGS84[0.0000,0.0000,0.0000,0.000000,0.000000,0.000000,0.00000000]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse Mercator, Wisconsin County Variation"],PARAMETER["false_easting",79857.760],PARAMETER["false_northing",0.000],PARAMETER["scale_factor",1.000000000000],PARAMETER["central_meridian",-87.55000000000000],PARAMETER["latitude_of_origin",43.26666666670000],PARAMETER["Average Geoid Height (meters)",-34.0200],PARAMETER["Average Elevation (system unit)",182.8800],UNIT["Meter",1.00000000000000]]';
+Proj4js.defs["WKT1"] = '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]]',
+Proj4js.defs["WKT2"] = '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]]',
+Proj4js.defs["WKT3"] = '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]]',
+Proj4js.defs["WKT4"] = 'LOCAL_CS["Non-Earth (Meter)",LOCAL_DATUM["Local Datum",0],UNIT["Meter", 1],AXIS["X",EAST],AXIS["Y",NORTH]]',
+Proj4js.defs["WKT5"] = '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]]'
+*/
 
 Proj4js.testPoints = [
+  {code: 'EPSG:26986',
+    xy: [ 231394.84,902621.11],
+    ll: [-71.11881762742996,42.37346263960867]
+  }/*,
+  {code: 'ESRI:102026',
+    xy: [3257939.781874, 5459865.918947],
+    ll: [45.17578125, 41.923828125]
+  },
+  {code: 'EPSG:54029',
+    xy: [2359523.653024, 3280192.180346],
+    ll: [21.796875, 28.828125]
+  },
+  {code: 'EPSG:102018',
+    xy: [350577.5930806119, 4705857.070634324],
+    ll: [-75,46]
+  },
+  {code: 'EPSG:2958',
+    xy: [411461.807497, 4700123.744402],
+    ll: [-82.07666015625, 42.448388671875]
+  },
+  {code: 'EPSG:54009',
+    xy: [3891383.58309223, 6876758.9933288],
+    ll: [60,60]
+  },
   {code: 'EPSG:3035',
     xy: [4388138.60, 3321736.46],
     ll: [11.0, 53.0]
@@ -27,7 +68,7 @@ Proj4js.testPoints = [
     ll: [-7.84, 39.58]
   },
   {code: 'EPSG:3411',
-    xy: [1070076.44,-4635010.27,-136.63], 
+    xy: [1070076.44,-4635010.27,-136.63],       
     ll: [-32, 48, 0]
   },
   {code: 'EPSG:2403',
@@ -42,18 +83,14 @@ Proj4js.testPoints = [
     xy: [653704.865208, 176887.660037],
     ll: [3.005, 43.89]
   },
-  {code: 'EPSG:54029',
-    xy: [1094702.50,6496789.74,-6468.21],
-    ll: [11.0, 53.0,0.0]
-  },
   {code: 'EPSG:54003',
     xy: [1223145.57,6491218.13,-6468.21],
     ll: [11.0, 53.0]
   },
   {code: 'EPSG:3573',
     xy: [2923052.02009, 1054885.46559],
     ll: [9.84375, 61.875]
-  }/*,
+  },
   {code: 'EPSG:54009',
     xy: [-10617602.79013849,4108337.84708608,0.00000000 ], 
     ll: [-119,34,0]
@@ -79,10 +116,6 @@ Proj4js.testPoints = [
     xy: [4388138.60, 3321736.46],
     ll: [11.0, 53.0]
   },
-  {code: 'EPSG:102026',
-    xy: [3000242.40, 5092492.64],
-    ll: [40.0, 40.0]
-  },
   {code: 'EPSG:54032',
     xy: [-4024426.19, 6432026.98],
     ll: [-127.0, 52.11]