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

Merge remote-tracking branch 'origin/WKTupdate' into WKTupdate

parents dd876301 96a8ef37

Gruntfile.js

+1 −1
Original line number Diff line number Diff line
@@ -116,5 +116,5 @@ module.exports = function(grunt) { 
	});

  grunt.registerTask('amd',['defs','jshint','requirejs:amd','connect','mocha_phantomjs:amd']);

	grunt.registerTask('build',['defs','jshint','requirejs:custom']);

  grunt.registerTask('default', ['defs','jshint','test','requirejs:reg','mocha_phantomjs:after']);

  grunt.registerTask('default', ['defs','jshint','test','requirejs:reg','requirejs:amd','mocha_phantomjs:after','mocha_phantomjs:amd']);

}

buildDefs.js

+1 −1
Original line number Diff line number Diff line 
var defaultLocals = require('./src/defs/defaultLocals');

var top = "define(function(require, exports, module) {module.exports = function(defs) {defs(";

var top = "define(function() {return function(defs) {defs(";

var end = ")}});";

var pTop = "define(function(require, exports) {";

var pBottom = "});"

src/Point.js

+2 −3
Original line number Diff line number Diff line 
define(function(require, exports, module) {

  var mgrs = require('./mgrs');

define(['./mgrs'],function(mgrs) {

  function Point(x, y, z) {

    if (!(this instanceof Point)) {

      return new Point(x, y, z);
@@ -49,5 +48,5 @@ define(function(require, exports, module) { 
        lat: this.y

      }, accuracy);

    };

  module.exports = Point;

  return Point;

});

src/Proj.js

+2 −24
Original line number Diff line number Diff line 
define(function(require, exports, module) {

  /**

   * Class: proj

   *

   * Proj objects provide transformation methods for point coordinates

   * between geodetic latitude/longitude and a projected coordinate system. 

   * once they have been initialized with a projection code.

   *

   * Initialization of Proj objects is with a projection code, usually EPSG codes,

   * which is the key that will be used with the proj4.defs array.

   * 

   * The code passed in will be stripped of colons and converted to uppercase

   * to locate projection definition files.

   *

   * A projection object has properties for units and title strings.

   */

  var extend = require('./extend');

  var common = require('./common');

  var defs = require('./defs');

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

  var datum = require('./datum');

  var projections = require('./projections');

  var wkt = require('./wkt');

define(['./extend','./common','./defs','./constants','./datum','./projections','./wkt2'],function(extend, common, defs,constants,datum,projections,wkt) {

  

  var proj = function proj(srsCode) {

    if (!(this instanceof proj)) {
@@ -217,6 +195,6 @@ define(function(require, exports, module) { 
    }

  };

  proj.projections = projections;

  module.exports = proj;

  return proj;



});

src/adjust_axis.js

+2 −2
Original line number Diff line number Diff line 
define(function(require, exports, module) {

  module.exports = function(crs, denorm, point) {

define(function() {

  return function(crs, denorm, point) {

    var xin = point.x,

      yin = point.y,

      zin = point.z || 0.0;