Commit 291494df authored by Calvin Metcalf's avatar Calvin Metcalf
Browse files

tests and formating issues for wkt

parent 16adeb44

proj4/constants.js

+2 −1
Original line number Diff line number Diff line
@@ -353,7 +353,8 @@ define(function() { 
    'Lambert_Azimuthal_Equal_Area':'laea',

    'Sinusoidal':"sinu",

    "Equidistant_Conic":'eqdc',

    'Mercator_Auxiliary_Sphere':'merc'

    'Mercator_Auxiliary_Sphere':'merc',

    :"Lambert_Conformal_Conic_2SP":"lcc"

  };



  // Based on proj4 CTABLE  structure :

proj4/wkt.js

+5 −1
Original line number Diff line number Diff line
@@ -93,9 +93,13 @@ define(function(require) { 
    }else if(wkt.type === 'LOCAL_CS'){

      wkt.projName = 'identity';

      wkt.local=true;

    }else{

      if(typeof wkt.PROJECTION === "object"){

        wkt.projName = constants.wktProjections[Object.keys(wkt.PROJECTION)[0]];

      }else{

        wkt.projName = constants.wktProjections[wkt.PROJECTION];

      }

    }

    if(wkt.UNIT){

      wkt.units=wkt.UNIT.name.toLowerCase();

      if(wkt.units === 'metre'){

test/testData.js

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ var testPoints = [ 
    xy: [ 231394.84,902621.11],

    ll: [-71.11881762742996,42.37346263960867]

  },

  {code:'["PROJCS","NAD83 / Massachusetts Mainland", GEOGCS["NAD83", DATUM["North American Datum 1983", SPHEROID["GRS 1980", 6378137.0, 298.257222101, AUTHORITY["EPSG","7019"]], TOWGS84[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], AUTHORITY["EPSG","6269"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AXIS["Geodetic longitude", EAST], AXIS["Geodetic latitude", NORTH], AUTHORITY["EPSG","4269"]], PROJECTION["Lambert_Conformal_Conic_2SP", AUTHORITY["EPSG","9802"]], PARAMETER["central_meridian", -71.5], PARAMETER["latitude_of_origin", 41.0], PARAMETER["standard_parallel_1", 42.68333333333334], PARAMETER["false_easting", 200000.0], PARAMETER["false_northing", 750000.0], PARAMETER["scale_factor", 1.0], PARAMETER["standard_parallel_2", 41.71666666666667], UNIT["m", 1.0], AXIS["Easting", EAST], AXIS["Northing", NORTH], AUTHORITY["EPSG","26986"]]',

   xy: [ 231394.84,902621.11],

    ll: [-71.11881762742996,42.37346263960867]

  },

  {code: 'PROJCS["Asia_North_Equidistant_Conic",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Equidistant_Conic"],PARAMETER["False_Easting",0],PARAMETER["False_Northing",0],PARAMETER["Central_Meridian",95],PARAMETER["Standard_Parallel_1",15],PARAMETER["Standard_Parallel_2",65],PARAMETER["Latitude_Of_Origin",30],UNIT["Meter",1]]',

    xy: [88280.59904432714, 111340.90165417176],

    ll: [96,31]