Commit 9fa07285 authored by Michael Adair's avatar Michael Adair
Browse files

re #59: clean up of grid shift tests

parent a6faf12e

lib/proj4js.js

+5 −34
Original line number Diff line number Diff line
@@ -152,29 +152,6 @@ Proj4js = { 
          return point;

      }



      // If this datum requires grid shifts, then apply it to geodetic coordinates.

      if( source.datum_type == Proj4js.common.PJD_GRIDSHIFT )

      {

        alert("ERROR: Grid shift transformations are not implemented yet.");

        /*

          pj_apply_gridshift( pj_param(source.params,"snadgrids").s, 0,

                              point_count, point_offset, x, y, z );

          CHECK_RETURN;



          src_a = SRS_WGS84_SEMIMAJOR;

          src_es = 0.006694379990;

        */

      }



      if( dest.datum_type == Proj4js.common.PJD_GRIDSHIFT )

      {

        alert("ERROR: Grid shift transformations are not implemented yet.");

        /*

          dst_a = ;

          dst_es = 0.006694379990;

        */

      }



      // Do we need to go through geocentric coordinates?

      if( source.es != dest.es || source.a != dest.a

          || source.datum_type == Proj4js.common.PJD_3PARAM
@@ -203,13 +180,6 @@ Proj4js = { 
          // CHECK_RETURN;

      }



      // Apply grid shift to destination if required

      if( dest.datum_type == Proj4js.common.PJD_GRIDSHIFT )

      {

        alert("ERROR: Grid shift transformations are not implemented yet.");

        // pj_apply_gridshift( pj_param(dest.params,"snadgrids").s, 1, point);

        // CHECK_RETURN;

      }

      return point;

    }, // cs_datum_transform
@@ -1270,7 +1240,7 @@ Proj4js.datum = Proj4js.Class({ 


  /****************************************************************/

  // cs_compare_datums()

  //   Returns 1 (TRUE) if the two datums match, otherwise 0 (FALSE).

  //   Returns TRUE if the two datums match, otherwise FALSE.

  compare_datums : function( dest ) {

    if( this.datum_type != dest.datum_type ) {

      return false; // false, datums are not equal
@@ -1290,9 +1260,10 @@ Proj4js.datum = Proj4js.Class({ 
              && this.datum_params[4] == dest.datum_params[4]

              && this.datum_params[5] == dest.datum_params[5]

              && this.datum_params[6] == dest.datum_params[6]);

    } else if( this.datum_type == Proj4js.common.PJD_GRIDSHIFT ) {

      return strcmp( pj_param(this.params,"snadgrids").s,

                     pj_param(dest.params,"snadgrids").s ) == 0;

    } else if ( this.datum_type == Proj4js.common.PJD_GRIDSHIFT ||

                dest.datum_type == Proj4js.common.PJD_GRIDSHIFT ) {

      alert("ERROR: Grid shift transformations are not implemented.");

      return false

    } else {

      return true; // datums are equal

    }