Commit 5c64b033 authored by Andreas Hocevar's avatar Andreas Hocevar
Browse files

Merge pull request #139 from proj4js/projstring-units 

Add handling for +units in projString
parents f6f3c00d 85ee69f7

lib/constants/units.js

0 → 100644
+2 −0
Original line number Diff line number Diff line 
exports.ft = {to_meter: 0.3048};

exports['us-ft'] = {to_meter: 1200 / 3937};

lib/projString.js

+6 −0
Original line number Diff line number Diff line 
var D2R = 0.01745329251994329577;

var PrimeMeridian = require('./constants/PrimeMeridian');

var units = require('./constants/units');



module.exports = function(defData) {

  var self = {};
@@ -82,6 +83,11 @@ module.exports = function(defData) { 
    to_meter: function(v) {

      self.to_meter = parseFloat(v);

    },

    units: function(v) {

      if (units[v]) {

        self.to_meter = units[v].to_meter;

      }

    },

    from_greenwich: function(v) {

      self.from_greenwich = v * D2R;

    },

test/testData.js

+5 −0
Original line number Diff line number Diff line
@@ -285,6 +285,11 @@ var testPoints = [ 
    ll: [12.806988, 49.452262],

    xy: [-868208.61, -1095793.64]

  },

  {

    code:"+proj=tmerc +lat_0=40.5 +lon_0=-110.0833333333333 +k=0.9999375 +x_0=800000.0000101599 +y_0=99999.99998983997 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=us-ft +no_defs",

    ll: [-110.8, 43.5],

    xy: [2434515.870, 1422072.711]

  },

  // check that coordinates at 180 and -180 deg. longitude don't wrap around

  {

    code: 'EPSG:3857',