Commit 6ccc7746 authored by Calvin Metcalf's avatar Calvin Metcalf
Browse files

minor fixes

parent eff93f3c

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ node_modules 
coverage

projs.js

.DS_STORE

dist
 
 No newline at end of file

Gruntfile.js

+2 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ module.exports = function(grunt) { 
    mocha_phantomjs: {

      all: {

        options: {

          reporter: "dot",

          urls: [ //my ide requries process.env.IP and PORT

            "http://" + (process.env.IP || "127.0.0.1") + ":" + (process.env.PORT || "8080") + "/test/amd.html",

            "http://" + (process.env.IP || "127.0.0.1") + ":" + (process.env.PORT || "8080") + "/test/opt.html"
@@ -80,9 +81,6 @@ module.exports = function(grunt) { 
  grunt.loadNpmTasks('grunt-contrib-jshint');

  grunt.loadNpmTasks('grunt-contrib-connect');

  grunt.loadNpmTasks('grunt-mocha-phantomjs');

  grunt.registerTask('version', function() {

    grunt.file.write('./lib/version.js', "module.exports = '" + grunt.file.readJSON('package.json').version + "';");

  });

  grunt.registerTask('custom',function(){

    grunt.task.run('browserify', 'uglify');

    var projections = this.args;
@@ -106,7 +104,7 @@ module.exports = function(grunt) { 
  });

  grunt.registerTask('build',function(){

    var args = this.args.length?this.args[0].split(','):['default'];

    grunt.task.run('version', 'jshint', 'custom:'+args.join(':'));

    grunt.task.run('jshint', 'custom:'+args.join(':'));

  });

  grunt.registerTask('default', ['build:all', 'connect','mocha_phantomjs']);

};

LICENSE.md

+2 −1
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ Authors: 
- Didier Richard didier.richardATign.fr

- Stephen Irons stephen.ironsATclear.net.nz

- Olivier Terral oterralATgmail.com

- Calvin Metcalf cmetcalfATappgeo.com



Copyright (c) 2012, Mike Adair, Richard Greenwood, Didier Richard, Stephen Irons and Olivier Terral

Copyright (c) 2014, Mike Adair, Richard Greenwood, Didier Richard, Stephen Irons, Olivier Terral and Calvin Metcalf



 Permission is hereby granted, free of charge, to any person obtaining a

 copy of this software and associated documentation files (the "Software"),

bower.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "proj4",

  "version": "2.0.0",

  "version": "2.1.1-prerelease",

  "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",

  "homepage": "https://github.com/proj4js/proj4js",

  "main": "dist/proj4.js",

changelog.md

+2 −0
Original line number Diff line number Diff line 
Change log

===

- 2.1.1: tweaks to how we publish it, fixes related to errors with the OSGB36 and Reseau National Belge 1972 datums, we took the first steps towards depreciating the proj4.Point class.



- 2.1.0: targeted builds for projections are now supported, and internally projection creation is more modular.



- 2.0.3: mgrs is broken out into it's own module loaded via npm.