[proj4js] 01/07: Imported Upstream version 2.3.15+ds

Bas Couwenberg sebastic at debian.org
Mon Aug 22 06:02:13 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository proj4js.

commit 5b9428ca0ac71c5a3db1ee141e4f6f6a9180e346
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 22 07:46:39 2016 +0200

    Imported Upstream version 2.3.15+ds
---
 Gruntfile.js           |   7 +-
 REFERENCES.md          |  10 +-
 bower.json             |   4 +-
 component.json         |   4 +-
 dist/proj4-src.js      | 546 ++++++++++++++++++++++++++++---------------------
 dist/test.html         |  11 +
 lib/constants/grids.js |   4 +-
 package.json           |   4 +-
 8 files changed, 347 insertions(+), 243 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 00e7466..ebd05c0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,7 +20,8 @@ var projs = [
   'moll',
   'eqdc',
   'vandg',
-  'aeqd'
+  'aeqd',
+  'ortho'
 ];
 module.exports = function(grunt) {
   grunt.initConfig({
@@ -56,7 +57,9 @@ module.exports = function(grunt) {
           'dist/proj4-src.js': ['lib/index.js'],
         },
         options: {
-          standalone: 'proj4',
+          browserifyOptions: {
+            standalone: 'proj4'
+          },
           alias: [
             './projs:./includedProjections'
             ]
diff --git a/REFERENCES.md b/REFERENCES.md
index a620fd0..114fda4 100644
--- a/REFERENCES.md
+++ b/REFERENCES.md
@@ -1,12 +1,15 @@
 1. Snyder, John P., "Map Projections--A Working Manual", U.S. Geological Survey
     Professional Paper 1395 (Supersedes USGS Bulletin 1532),
-    United State Government Printing Office, Washington D.C., 1987.
+    United States Government Printing Office, Washington D.C., 1987.
+    Accessed: 2016-05-09.  https://pubs.er.usgs.gov/publication/pp1395
 2. Snyder, John P. and Voxland, Philip M., "An Album of Map Projections",
     U.S. Geological Survey Professional Paper 1453 ,
     United State Government Printing Office, Washington D.C., 1989.
+    Accessed: 2016-05-09.  https://pubs.er.usgs.gov/publication/pp1453
 3. "Cartographic Projection Procedures for the UNIX Environment-
     A User's Manual" by Gerald I. Evenden,
-    USGS Open File Report 90-284and Release 4 Interim Reports (2003)
+    USGS Open File Report 90-284 and Release 4 Interim Reports (2003).
+    Accessed: 2016-06-09.  http://www2.bren.ucsb.edu/~frew/ESM264/private/proj_manual.pdf
 4. Snyder, John P., "Flattening the Earth -
     Two Thousand Years of Map Projections", Univ. Chicago Press, 1993
 5. Wolfram Mathworld "Gnomonic Projection"
@@ -17,6 +20,7 @@
 7. Snyder, John P., "Map Projections--A Working Manual", U.S. Geological
     Survey Professional Paper 1395 (Supersedes USGS Bulletin 1532), United
     State Government Printing Office, Washington D.C., 1987.
+    Access date 2016-05-09.  https://pubs.er.usgs.gov/publication/pp1395
 8. "Software Documentation for GCTP General Cartographic Transformation
     Package", U.S. Geological Survey National Mapping Division, May 1982.
 9. Department of Land and Survey Technical Circular 1973/32
@@ -26,4 +30,4 @@
 11. Formules et constantes pour le Calcul pour la
     projection cylindrique conforme à axe oblique et pour la transformation entre
     des systèmes de référence.
-    http://www.swisstopo.admin.ch/internet/swisstopo/fr/home/topics/survey/sys/refsys/switzerland.parsysrelated1.31216.downloadList.77004.DownloadFile.tmp/swissprojectionfr.pdf
\ No newline at end of file
+    http://www.swisstopo.admin.ch/internet/swisstopo/fr/home/topics/survey/sys/refsys/switzerland.parsysrelated1.31216.downloadList.77004.DownloadFile.tmp/swissprojectionfr.pdf
diff --git a/bower.json b/bower.json
index f38b327..814d89c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.3.13-alpha",
+  "version": "2.3.15-alpha",
   "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",
@@ -21,4 +21,4 @@
     "almond",
     "src"
   ]
-}
+}
\ No newline at end of file
diff --git a/component.json b/component.json
index bd5415f..e600be3 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.3.13-alpha",
+  "version": "2.3.15-alpha",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "repo": "proj4js/proj4js",
   "keywords": [
@@ -14,4 +14,4 @@
   "scripts": [
     "dist/proj4.js"
   ]
-}
+}
\ No newline at end of file
diff --git a/dist/proj4-src.js b/dist/proj4-src.js
index 0fdb880..24da1e7 100644
--- a/dist/proj4-src.js
+++ b/dist/proj4-src.js
@@ -1,5 +1,36 @@
-!function(e){if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.proj4=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={e [...]
-var mgrs = _dereq_('mgrs');
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.proj4 = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)r [...]
+var projs = [
+ require('./lib/projections/tmerc'),
+	require('./lib/projections/utm'),
+	require('./lib/projections/sterea'),
+	require('./lib/projections/stere'),
+	require('./lib/projections/somerc'),
+	require('./lib/projections/omerc'),
+	require('./lib/projections/lcc'),
+	require('./lib/projections/krovak'),
+	require('./lib/projections/cass'),
+	require('./lib/projections/laea'),
+	require('./lib/projections/aea'),
+	require('./lib/projections/gnom'),
+	require('./lib/projections/cea'),
+	require('./lib/projections/eqc'),
+	require('./lib/projections/poly'),
+	require('./lib/projections/nzmg'),
+	require('./lib/projections/mill'),
+	require('./lib/projections/sinu'),
+	require('./lib/projections/moll'),
+	require('./lib/projections/eqdc'),
+	require('./lib/projections/vandg'),
+	require('./lib/projections/aeqd'),
+	require('./lib/projections/ortho')
+];
+module.exports = function(proj4){
+ projs.forEach(function(proj){
+   proj4.Proj.projections.add(proj);
+ });
+}
+},{"./lib/projections/aea":40,"./lib/projections/aeqd":41,"./lib/projections/cass":42,"./lib/projections/cea":43,"./lib/projections/eqc":44,"./lib/projections/eqdc":45,"./lib/projections/gnom":47,"./lib/projections/krovak":48,"./lib/projections/laea":49,"./lib/projections/lcc":50,"./lib/projections/mill":53,"./lib/projections/moll":54,"./lib/projections/nzmg":55,"./lib/projections/omerc":56,"./lib/projections/ortho":57,"./lib/projections/poly":58,"./lib/projections/sinu":59,"./lib/projec [...]
+var mgrs = require('mgrs');
 
 function Point(x, y, z) {
   if (!(this instanceof Point)) {
@@ -34,11 +65,11 @@ Point.prototype.toMGRS = function(accuracy) {
 };
 module.exports = Point;
 
-},{"mgrs":67}],2:[function(_dereq_,module,exports){
-var parseCode = _dereq_("./parseCode");
-var extend = _dereq_('./extend');
-var projections = _dereq_('./projections');
-var deriveConstants = _dereq_('./deriveConstants');
+},{"mgrs":68}],2:[function(require,module,exports){
+var parseCode = require("./parseCode");
+var extend = require('./extend');
+var projections = require('./projections');
+var deriveConstants = require('./deriveConstants');
 
 function Projection(srsCode,callback) {
   if (!(this instanceof Projection)) {
@@ -69,7 +100,7 @@ Projection.projections = projections;
 Projection.projections.start();
 module.exports = Projection;
 
-},{"./deriveConstants":33,"./extend":34,"./parseCode":37,"./projections":39}],3:[function(_dereq_,module,exports){
+},{"./deriveConstants":33,"./extend":34,"./parseCode":37,"./projections":39}],3:[function(require,module,exports){
 module.exports = function(crs, denorm, point) {
   var xin = point.x,
     yin = point.y,
@@ -122,54 +153,54 @@ module.exports = function(crs, denorm, point) {
   return point;
 };
 
-},{}],4:[function(_dereq_,module,exports){
+},{}],4:[function(require,module,exports){
 var HALF_PI = Math.PI/2;
-var sign = _dereq_('./sign');
+var sign = require('./sign');
 
 module.exports = function(x) {
   return (Math.abs(x) < HALF_PI) ? x : (x - (sign(x) * Math.PI));
 };
-},{"./sign":21}],5:[function(_dereq_,module,exports){
+},{"./sign":21}],5:[function(require,module,exports){
 var TWO_PI = Math.PI * 2;
 // SPI is slightly greater than Math.PI, so values that exceed the -180..180
 // degree range by a tiny amount don't get wrapped. This prevents points that
 // have drifted from their original location along the 180th meridian (due to
 // floating point error) from changing their sign.
 var SPI = 3.14159265359;
-var sign = _dereq_('./sign');
+var sign = require('./sign');
 
 module.exports = function(x) {
   return (Math.abs(x) <= SPI) ? x : (x - (sign(x) * TWO_PI));
 };
-},{"./sign":21}],6:[function(_dereq_,module,exports){
+},{"./sign":21}],6:[function(require,module,exports){
 module.exports = function(x) {
   if (Math.abs(x) > 1) {
     x = (x > 1) ? 1 : -1;
   }
   return Math.asin(x);
 };
-},{}],7:[function(_dereq_,module,exports){
+},{}],7:[function(require,module,exports){
 module.exports = function(x) {
   return (1 - 0.25 * x * (1 + x / 16 * (3 + 1.25 * x)));
 };
-},{}],8:[function(_dereq_,module,exports){
+},{}],8:[function(require,module,exports){
 module.exports = function(x) {
   return (0.375 * x * (1 + 0.25 * x * (1 + 0.46875 * x)));
 };
-},{}],9:[function(_dereq_,module,exports){
+},{}],9:[function(require,module,exports){
 module.exports = function(x) {
   return (0.05859375 * x * x * (1 + 0.75 * x));
 };
-},{}],10:[function(_dereq_,module,exports){
+},{}],10:[function(require,module,exports){
 module.exports = function(x) {
   return (x * x * x * (35 / 3072));
 };
-},{}],11:[function(_dereq_,module,exports){
+},{}],11:[function(require,module,exports){
 module.exports = function(a, e, sinphi) {
   var temp = e * sinphi;
   return a / Math.sqrt(1 - temp * temp);
 };
-},{}],12:[function(_dereq_,module,exports){
+},{}],12:[function(require,module,exports){
 module.exports = function(ml, e0, e1, e2, e3) {
   var phi;
   var dphi;
@@ -186,7 +217,7 @@ module.exports = function(ml, e0, e1, e2, e3) {
   //..reportError("IMLFN-CONV:Latitude failed to converge after 15 iterations");
   return NaN;
 };
-},{}],13:[function(_dereq_,module,exports){
+},{}],13:[function(require,module,exports){
 var HALF_PI = Math.PI/2;
 
 module.exports = function(eccent, q) {
@@ -219,16 +250,16 @@ module.exports = function(eccent, q) {
   //console.log("IQSFN-CONV:Latitude failed to converge after 30 iterations");
   return NaN;
 };
-},{}],14:[function(_dereq_,module,exports){
+},{}],14:[function(require,module,exports){
 module.exports = function(e0, e1, e2, e3, phi) {
   return (e0 * phi - e1 * Math.sin(2 * phi) + e2 * Math.sin(4 * phi) - e3 * Math.sin(6 * phi));
 };
-},{}],15:[function(_dereq_,module,exports){
+},{}],15:[function(require,module,exports){
 module.exports = function(eccent, sinphi, cosphi) {
   var con = eccent * sinphi;
   return cosphi / (Math.sqrt(1 - con * con));
 };
-},{}],16:[function(_dereq_,module,exports){
+},{}],16:[function(require,module,exports){
 var HALF_PI = Math.PI/2;
 module.exports = function(eccent, ts) {
   var eccnth = 0.5 * eccent;
@@ -245,7 +276,7 @@ module.exports = function(eccent, ts) {
   //console.log("phi2z has NoConvergence");
   return -9999;
 };
-},{}],17:[function(_dereq_,module,exports){
+},{}],17:[function(require,module,exports){
 var C00 = 1;
 var C02 = 0.25;
 var C04 = 0.046875;
@@ -270,8 +301,8 @@ module.exports = function(es) {
   en[4] = t * es * C88;
   return en;
 };
-},{}],18:[function(_dereq_,module,exports){
-var pj_mlfn = _dereq_("./pj_mlfn");
+},{}],18:[function(require,module,exports){
+var pj_mlfn = require("./pj_mlfn");
 var EPSLN = 1.0e-10;
 var MAX_ITER = 20;
 module.exports = function(arg, es, en) {
@@ -291,13 +322,13 @@ module.exports = function(arg, es, en) {
   //..reportError("cass:pj_inv_mlfn: Convergence error");
   return phi;
 };
-},{"./pj_mlfn":19}],19:[function(_dereq_,module,exports){
+},{"./pj_mlfn":19}],19:[function(require,module,exports){
 module.exports = function(phi, sphi, cphi, en) {
   cphi *= sphi;
   sphi *= sphi;
   return (en[0] * phi - cphi * (en[1] + sphi * (en[2] + sphi * (en[3] + sphi * en[4]))));
 };
-},{}],20:[function(_dereq_,module,exports){
+},{}],20:[function(require,module,exports){
 module.exports = function(eccent, sinphi) {
   var con;
   if (eccent > 1.0e-7) {
@@ -308,15 +339,15 @@ module.exports = function(eccent, sinphi) {
     return (2 * sinphi);
   }
 };
-},{}],21:[function(_dereq_,module,exports){
+},{}],21:[function(require,module,exports){
 module.exports = function(x) {
   return x<0 ? -1 : 1;
 };
-},{}],22:[function(_dereq_,module,exports){
+},{}],22:[function(require,module,exports){
 module.exports = function(esinp, exp) {
   return (Math.pow((1 - esinp) / (1 + esinp), exp));
 };
-},{}],23:[function(_dereq_,module,exports){
+},{}],23:[function(require,module,exports){
 module.exports = function (array){
   var out = {
     x: array[0],
@@ -330,7 +361,7 @@ module.exports = function (array){
   }
   return out;
 };
-},{}],24:[function(_dereq_,module,exports){
+},{}],24:[function(require,module,exports){
 var HALF_PI = Math.PI/2;
 
 module.exports = function(eccent, phi, sinphi) {
@@ -339,7 +370,7 @@ module.exports = function(eccent, phi, sinphi) {
   con = Math.pow(((1 - con) / (1 + con)), com);
   return (Math.tan(0.5 * (HALF_PI - phi)) / con);
 };
-},{}],25:[function(_dereq_,module,exports){
+},{}],25:[function(require,module,exports){
 exports.wgs84 = {
   towgs84: "0,0,0",
   ellipse: "WGS84",
@@ -420,7 +451,7 @@ exports.rnb72 = {
   ellipse: "intl",
   datumName: "Reseau National Belge 1972"
 };
-},{}],26:[function(_dereq_,module,exports){
+},{}],26:[function(require,module,exports){
 exports.MERIT = {
   a: 6378137.0,
   rf: 298.257,
@@ -636,7 +667,7 @@ exports.sphere = {
   b: 6370997.0,
   ellipseName: "Normal Sphere (r=6370997)"
 };
-},{}],27:[function(_dereq_,module,exports){
+},{}],27:[function(require,module,exports){
 exports.greenwich = 0.0; //"0dE",
 exports.lisbon = -9.131906111111; //"9d07'54.862\"W",
 exports.paris = 2.337229166667; //"2d20'14.025\"E",
@@ -650,13 +681,13 @@ exports.brussels = 4.367975; //"4d22'4.71\"E",
 exports.stockholm = 18.058277777778; //"18d3'29.8\"E",
 exports.athens = 23.7163375; //"23d42'58.815\"E",
 exports.oslo = 10.722916666667; //"10d43'22.5\"E"
-},{}],28:[function(_dereq_,module,exports){
+},{}],28:[function(require,module,exports){
 exports.ft = {to_meter: 0.3048};
 exports['us-ft'] = {to_meter: 1200 / 3937};
 
-},{}],29:[function(_dereq_,module,exports){
-var proj = _dereq_('./Proj');
-var transform = _dereq_('./transform');
+},{}],29:[function(require,module,exports){
+var proj = require('./Proj');
+var transform = require('./transform');
 var wgs84 = proj('WGS84');
 
 function transformer(from, to, coords) {
@@ -719,7 +750,7 @@ function proj4(fromProj, toProj, coord) {
   }
 }
 module.exports = proj4;
-},{"./Proj":2,"./transform":65}],30:[function(_dereq_,module,exports){
+},{"./Proj":2,"./transform":66}],30:[function(require,module,exports){
 var HALF_PI = Math.PI/2;
 var PJD_3PARAM = 1;
 var PJD_7PARAM = 2;
@@ -1124,7 +1155,7 @@ datum.prototype = {
 */
 module.exports = datum;
 
-},{}],31:[function(_dereq_,module,exports){
+},{}],31:[function(require,module,exports){
 var PJD_3PARAM = 1;
 var PJD_7PARAM = 2;
 var PJD_GRIDSHIFT = 3;
@@ -1225,10 +1256,10 @@ module.exports = function(source, dest, point) {
 };
 
 
-},{}],32:[function(_dereq_,module,exports){
-var globals = _dereq_('./global');
-var parseProj = _dereq_('./projString');
-var wkt = _dereq_('./wkt');
+},{}],32:[function(require,module,exports){
+var globals = require('./global');
+var parseProj = require('./projString');
+var wkt = require('./wkt');
 
 function defs(name) {
   /*global console*/
@@ -1282,11 +1313,11 @@ function defs(name) {
 globals(defs);
 module.exports = defs;
 
-},{"./global":35,"./projString":38,"./wkt":66}],33:[function(_dereq_,module,exports){
-var Datum = _dereq_('./constants/Datum');
-var Ellipsoid = _dereq_('./constants/Ellipsoid');
-var extend = _dereq_('./extend');
-var datum = _dereq_('./datum');
+},{"./global":35,"./projString":38,"./wkt":67}],33:[function(require,module,exports){
+var Datum = require('./constants/Datum');
+var Ellipsoid = require('./constants/Ellipsoid');
+var extend = require('./extend');
+var datum = require('./datum');
 var EPSLN = 1.0e-10;
 // ellipoid pj_set_ell.c
 var SIXTH = 0.1666666666666666667;
@@ -1340,7 +1371,7 @@ module.exports = function(json) {
   return json;
 };
 
-},{"./constants/Datum":25,"./constants/Ellipsoid":26,"./datum":30,"./extend":34}],34:[function(_dereq_,module,exports){
+},{"./constants/Datum":25,"./constants/Ellipsoid":26,"./datum":30,"./extend":34}],34:[function(require,module,exports){
 module.exports = function(destination, source) {
   destination = destination || {};
   var value, property;
@@ -1356,7 +1387,7 @@ module.exports = function(destination, source) {
   return destination;
 };
 
-},{}],35:[function(_dereq_,module,exports){
+},{}],35:[function(require,module,exports){
 module.exports = function(defs) {
   defs('EPSG:4326', "+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees");
   defs('EPSG:4269', "+title=NAD83 (long/lat) +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees");
@@ -1369,23 +1400,23 @@ module.exports = function(defs) {
   defs['EPSG:102113'] = defs['EPSG:3857'];
 };
 
-},{}],36:[function(_dereq_,module,exports){
-var proj4 = _dereq_('./core');
+},{}],36:[function(require,module,exports){
+var proj4 = require('./core');
 proj4.defaultDatum = 'WGS84'; //default datum
-proj4.Proj = _dereq_('./Proj');
+proj4.Proj = require('./Proj');
 proj4.WGS84 = new proj4.Proj('WGS84');
-proj4.Point = _dereq_('./Point');
-proj4.toPoint = _dereq_("./common/toPoint");
-proj4.defs = _dereq_('./defs');
-proj4.transform = _dereq_('./transform');
-proj4.mgrs = _dereq_('mgrs');
-proj4.version = _dereq_('../package.json').version;
-_dereq_('./includedProjections')(proj4);
+proj4.Point = require('./Point');
+proj4.toPoint = require("./common/toPoint");
+proj4.defs = require('./defs');
+proj4.transform = require('./transform');
+proj4.mgrs = require('mgrs');
+proj4.version = require('../package.json').version;
+require('./includedProjections')(proj4);
 module.exports = proj4;
-},{"../package.json":68,"./Point":1,"./Proj":2,"./common/toPoint":23,"./core":29,"./defs":32,"./includedProjections":"hTEDpn","./transform":65,"mgrs":67}],37:[function(_dereq_,module,exports){
-var defs = _dereq_('./defs');
-var wkt = _dereq_('./wkt');
-var projStr = _dereq_('./projString');
+},{"../package.json":69,"./Point":1,"./Proj":2,"./common/toPoint":23,"./core":29,"./defs":32,"./includedProjections":"./includedProjections","./transform":66,"mgrs":68}],37:[function(require,module,exports){
+var defs = require('./defs');
+var wkt = require('./wkt');
+var projStr = require('./projString');
 function testObj(code){
   return typeof code === 'string';
 }
@@ -1419,10 +1450,10 @@ function parse(code){
 }
 
 module.exports = parse;
-},{"./defs":32,"./projString":38,"./wkt":66}],38:[function(_dereq_,module,exports){
+},{"./defs":32,"./projString":38,"./wkt":67}],38:[function(require,module,exports){
 var D2R = 0.01745329251994329577;
-var PrimeMeridian = _dereq_('./constants/PrimeMeridian');
-var units = _dereq_('./constants/units');
+var PrimeMeridian = require('./constants/PrimeMeridian');
+var units = require('./constants/units');
 
 module.exports = function(defData) {
   var self = {};
@@ -1553,10 +1584,10 @@ module.exports = function(defData) {
   return self;
 };
 
-},{"./constants/PrimeMeridian":27,"./constants/units":28}],39:[function(_dereq_,module,exports){
+},{"./constants/PrimeMeridian":27,"./constants/units":28}],39:[function(require,module,exports){
 var projs = [
-  _dereq_('./projections/merc'),
-  _dereq_('./projections/longlat')
+  require('./projections/merc'),
+  require('./projections/longlat')
 ];
 var names = {};
 var projStore = [];
@@ -1589,12 +1620,12 @@ exports.start = function() {
   projs.forEach(add);
 };
 
-},{"./projections/longlat":51,"./projections/merc":52}],40:[function(_dereq_,module,exports){
+},{"./projections/longlat":51,"./projections/merc":52}],40:[function(require,module,exports){
 var EPSLN = 1.0e-10;
-var msfnz = _dereq_('../common/msfnz');
-var qsfnz = _dereq_('../common/qsfnz');
-var adjust_lon = _dereq_('../common/adjust_lon');
-var asinz = _dereq_('../common/asinz');
+var msfnz = require('../common/msfnz');
+var qsfnz = require('../common/qsfnz');
+var adjust_lon = require('../common/adjust_lon');
+var asinz = require('../common/asinz');
 exports.init = function() {
 
   if (Math.abs(this.lat1 + this.lat2) < EPSLN) {
@@ -1712,18 +1743,18 @@ exports.phi1z = function(eccent, qs) {
 };
 exports.names = ["Albers_Conic_Equal_Area", "Albers", "aea"];
 
-},{"../common/adjust_lon":5,"../common/asinz":6,"../common/msfnz":15,"../common/qsfnz":20}],41:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"../common/adjust_lon":5,"../common/asinz":6,"../common/msfnz":15,"../common/qsfnz":20}],41:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
 var HALF_PI = Math.PI/2;
 var EPSLN = 1.0e-10;
-var mlfn = _dereq_('../common/mlfn');
-var e0fn = _dereq_('../common/e0fn');
-var e1fn = _dereq_('../common/e1fn');
-var e2fn = _dereq_('../common/e2fn');
-var e3fn = _dereq_('../common/e3fn');
-var gN = _dereq_('../common/gN');
-var asinz = _dereq_('../common/asinz');
-var imlfn = _dereq_('../common/imlfn');
+var mlfn = require('../common/mlfn');
+var e0fn = require('../common/e0fn');
+var e1fn = require('../common/e1fn');
+var e2fn = require('../common/e2fn');
+var e3fn = require('../common/e3fn');
+var gN = require('../common/gN');
+var asinz = require('../common/asinz');
+var imlfn = require('../common/imlfn');
 exports.init = function() {
   this.sin_p12 = Math.sin(this.lat0);
   this.cos_p12 = Math.cos(this.lat0);
@@ -1911,16 +1942,16 @@ exports.inverse = function(p) {
 };
 exports.names = ["Azimuthal_Equidistant", "aeqd"];
 
-},{"../common/adjust_lon":5,"../common/asinz":6,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/gN":11,"../common/imlfn":12,"../common/mlfn":14}],42:[function(_dereq_,module,exports){
-var mlfn = _dereq_('../common/mlfn');
-var e0fn = _dereq_('../common/e0fn');
-var e1fn = _dereq_('../common/e1fn');
-var e2fn = _dereq_('../common/e2fn');
-var e3fn = _dereq_('../common/e3fn');
-var gN = _dereq_('../common/gN');
-var adjust_lon = _dereq_('../common/adjust_lon');
-var adjust_lat = _dereq_('../common/adjust_lat');
-var imlfn = _dereq_('../common/imlfn');
+},{"../common/adjust_lon":5,"../common/asinz":6,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/gN":11,"../common/imlfn":12,"../common/mlfn":14}],42:[function(require,module,exports){
+var mlfn = require('../common/mlfn');
+var e0fn = require('../common/e0fn');
+var e1fn = require('../common/e1fn');
+var e2fn = require('../common/e2fn');
+var e3fn = require('../common/e3fn');
+var gN = require('../common/gN');
+var adjust_lon = require('../common/adjust_lon');
+var adjust_lat = require('../common/adjust_lat');
+var imlfn = require('../common/imlfn');
 var HALF_PI = Math.PI/2;
 var EPSLN = 1.0e-10;
 exports.init = function() {
@@ -2015,11 +2046,11 @@ exports.inverse = function(p) {
 
 };
 exports.names = ["Cassini", "Cassini_Soldner", "cass"];
-},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/gN":11,"../common/imlfn":12,"../common/mlfn":14}],43:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
-var qsfnz = _dereq_('../common/qsfnz');
-var msfnz = _dereq_('../common/msfnz');
-var iqsfnz = _dereq_('../common/iqsfnz');
+},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/gN":11,"../common/imlfn":12,"../common/mlfn":14}],43:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
+var qsfnz = require('../common/qsfnz');
+var msfnz = require('../common/msfnz');
+var iqsfnz = require('../common/iqsfnz');
 /*
   reference:  
     "Cartographic Projection Procedures for the UNIX Environment-
@@ -2080,9 +2111,9 @@ exports.inverse = function(p) {
 };
 exports.names = ["cea"];
 
-},{"../common/adjust_lon":5,"../common/iqsfnz":13,"../common/msfnz":15,"../common/qsfnz":20}],44:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
-var adjust_lat = _dereq_('../common/adjust_lat');
+},{"../common/adjust_lon":5,"../common/iqsfnz":13,"../common/msfnz":15,"../common/qsfnz":20}],44:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
+var adjust_lat = require('../common/adjust_lat');
 exports.init = function() {
 
   this.x0 = this.x0 || 0;
@@ -2123,16 +2154,16 @@ exports.inverse = function(p) {
 };
 exports.names = ["Equirectangular", "Equidistant_Cylindrical", "eqc"];
 
-},{"../common/adjust_lat":4,"../common/adjust_lon":5}],45:[function(_dereq_,module,exports){
-var e0fn = _dereq_('../common/e0fn');
-var e1fn = _dereq_('../common/e1fn');
-var e2fn = _dereq_('../common/e2fn');
-var e3fn = _dereq_('../common/e3fn');
-var msfnz = _dereq_('../common/msfnz');
-var mlfn = _dereq_('../common/mlfn');
-var adjust_lon = _dereq_('../common/adjust_lon');
-var adjust_lat = _dereq_('../common/adjust_lat');
-var imlfn = _dereq_('../common/imlfn');
+},{"../common/adjust_lat":4,"../common/adjust_lon":5}],45:[function(require,module,exports){
+var e0fn = require('../common/e0fn');
+var e1fn = require('../common/e1fn');
+var e2fn = require('../common/e2fn');
+var e3fn = require('../common/e3fn');
+var msfnz = require('../common/msfnz');
+var mlfn = require('../common/mlfn');
+var adjust_lon = require('../common/adjust_lon');
+var adjust_lat = require('../common/adjust_lat');
+var imlfn = require('../common/imlfn');
 var EPSLN = 1.0e-10;
 exports.init = function() {
 
@@ -2235,9 +2266,9 @@ exports.inverse = function(p) {
 };
 exports.names = ["Equidistant_Conic", "eqdc"];
 
-},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/imlfn":12,"../common/mlfn":14,"../common/msfnz":15}],46:[function(_dereq_,module,exports){
+},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/imlfn":12,"../common/mlfn":14,"../common/msfnz":15}],46:[function(require,module,exports){
 var FORTPI = Math.PI/4;
-var srat = _dereq_('../common/srat');
+var srat = require('../common/srat');
 var HALF_PI = Math.PI/2;
 var MAX_ITER = 20;
 exports.init = function() {
@@ -2282,10 +2313,10 @@ exports.inverse = function(p) {
 };
 exports.names = ["gauss"];
 
-},{"../common/srat":22}],47:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"../common/srat":22}],47:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
 var EPSLN = 1.0e-10;
-var asinz = _dereq_('../common/asinz');
+var asinz = require('../common/asinz');
 
 /*
   reference:
@@ -2383,8 +2414,8 @@ exports.inverse = function(p) {
 };
 exports.names = ["gnom"];
 
-},{"../common/adjust_lon":5,"../common/asinz":6}],48:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"../common/adjust_lon":5,"../common/asinz":6}],48:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
 exports.init = function() {
   this.a = 6377397.155;
   this.es = 0.006674372230614;
@@ -2483,12 +2514,12 @@ exports.inverse = function(p) {
 };
 exports.names = ["Krovak", "krovak"];
 
-},{"../common/adjust_lon":5}],49:[function(_dereq_,module,exports){
+},{"../common/adjust_lon":5}],49:[function(require,module,exports){
 var HALF_PI = Math.PI/2;
 var FORTPI = Math.PI/4;
 var EPSLN = 1.0e-10;
-var qsfnz = _dereq_('../common/qsfnz');
-var adjust_lon = _dereq_('../common/adjust_lon');
+var qsfnz = require('../common/qsfnz');
+var adjust_lon = require('../common/adjust_lon');
 /*
   reference
     "New Equal-Area Map Projections for Noncircular Regions", John P. Snyder,
@@ -2773,14 +2804,14 @@ exports.authlat = function(beta, APA) {
 };
 exports.names = ["Lambert Azimuthal Equal Area", "Lambert_Azimuthal_Equal_Area", "laea"];
 
-},{"../common/adjust_lon":5,"../common/qsfnz":20}],50:[function(_dereq_,module,exports){
+},{"../common/adjust_lon":5,"../common/qsfnz":20}],50:[function(require,module,exports){
 var EPSLN = 1.0e-10;
-var msfnz = _dereq_('../common/msfnz');
-var tsfnz = _dereq_('../common/tsfnz');
+var msfnz = require('../common/msfnz');
+var tsfnz = require('../common/tsfnz');
 var HALF_PI = Math.PI/2;
-var sign = _dereq_('../common/sign');
-var adjust_lon = _dereq_('../common/adjust_lon');
-var phi2z = _dereq_('../common/phi2z');
+var sign = require('../common/sign');
+var adjust_lon = require('../common/adjust_lon');
+var phi2z = require('../common/phi2z');
 exports.init = function() {
 
   // array of:  r_maj,r_min,lat1,lat2,c_lon,c_lat,false_east,false_north
@@ -2910,7 +2941,7 @@ exports.inverse = function(p) {
 
 exports.names = ["Lambert Tangential Conformal Conic Projection", "Lambert_Conformal_Conic", "Lambert_Conformal_Conic_2SP", "lcc"];
 
-},{"../common/adjust_lon":5,"../common/msfnz":15,"../common/phi2z":16,"../common/sign":21,"../common/tsfnz":24}],51:[function(_dereq_,module,exports){
+},{"../common/adjust_lon":5,"../common/msfnz":15,"../common/phi2z":16,"../common/sign":21,"../common/tsfnz":24}],51:[function(require,module,exports){
 exports.init = function() {
   //no-op for longlat
 };
@@ -2922,15 +2953,15 @@ exports.forward = identity;
 exports.inverse = identity;
 exports.names = ["longlat", "identity"];
 
-},{}],52:[function(_dereq_,module,exports){
-var msfnz = _dereq_('../common/msfnz');
+},{}],52:[function(require,module,exports){
+var msfnz = require('../common/msfnz');
 var HALF_PI = Math.PI/2;
 var EPSLN = 1.0e-10;
 var R2D = 57.29577951308232088;
-var adjust_lon = _dereq_('../common/adjust_lon');
+var adjust_lon = require('../common/adjust_lon');
 var FORTPI = Math.PI/4;
-var tsfnz = _dereq_('../common/tsfnz');
-var phi2z = _dereq_('../common/phi2z');
+var tsfnz = require('../common/tsfnz');
+var phi2z = require('../common/phi2z');
 exports.init = function() {
   var con = this.b / this.a;
   this.es = 1 - con * con;
@@ -3021,8 +3052,8 @@ exports.inverse = function(p) {
 
 exports.names = ["Mercator", "Popular Visualisation Pseudo Mercator", "Mercator_1SP", "Mercator_Auxiliary_Sphere", "merc"];
 
-},{"../common/adjust_lon":5,"../common/msfnz":15,"../common/phi2z":16,"../common/tsfnz":24}],53:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"../common/adjust_lon":5,"../common/msfnz":15,"../common/phi2z":16,"../common/tsfnz":24}],53:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
 /*
   reference
     "New Equal-Area Map Projections for Noncircular Regions", John P. Snyder,
@@ -3068,8 +3099,8 @@ exports.inverse = function(p) {
 };
 exports.names = ["Miller_Cylindrical", "mill"];
 
-},{"../common/adjust_lon":5}],54:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"../common/adjust_lon":5}],54:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
 var EPSLN = 1.0e-10;
 exports.init = function() {};
 
@@ -3147,7 +3178,7 @@ exports.inverse = function(p) {
 };
 exports.names = ["Mollweide", "moll"];
 
-},{"../common/adjust_lon":5}],55:[function(_dereq_,module,exports){
+},{"../common/adjust_lon":5}],55:[function(require,module,exports){
 var SEC_TO_RAD = 4.84813681109535993589914102357e-6;
 /*
   reference
@@ -3367,10 +3398,10 @@ exports.inverse = function(p) {
   return p;
 };
 exports.names = ["New_Zealand_Map_Grid", "nzmg"];
-},{}],56:[function(_dereq_,module,exports){
-var tsfnz = _dereq_('../common/tsfnz');
-var adjust_lon = _dereq_('../common/adjust_lon');
-var phi2z = _dereq_('../common/phi2z');
+},{}],56:[function(require,module,exports){
+var tsfnz = require('../common/tsfnz');
+var adjust_lon = require('../common/adjust_lon');
+var phi2z = require('../common/phi2z');
 var HALF_PI = Math.PI/2;
 var FORTPI = Math.PI/4;
 var EPSLN = 1.0e-10;
@@ -3536,16 +3567,104 @@ exports.inverse = function(p) {
 };
 
 exports.names = ["Hotine_Oblique_Mercator", "Hotine Oblique Mercator", "Hotine_Oblique_Mercator_Azimuth_Natural_Origin", "Hotine_Oblique_Mercator_Azimuth_Center", "omerc"];
-},{"../common/adjust_lon":5,"../common/phi2z":16,"../common/tsfnz":24}],57:[function(_dereq_,module,exports){
-var e0fn = _dereq_('../common/e0fn');
-var e1fn = _dereq_('../common/e1fn');
-var e2fn = _dereq_('../common/e2fn');
-var e3fn = _dereq_('../common/e3fn');
-var adjust_lon = _dereq_('../common/adjust_lon');
-var adjust_lat = _dereq_('../common/adjust_lat');
-var mlfn = _dereq_('../common/mlfn');
+},{"../common/adjust_lon":5,"../common/phi2z":16,"../common/tsfnz":24}],57:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
+var EPSLN = 1.0e-10;
+var asinz = require('../common/asinz');
+var HALF_PI = Math.PI/2;
+exports.init = function() {
+  //double temp;      /* temporary variable    */
+
+  /* Place parameters in static storage for common use
+      -------------------------------------------------*/
+  this.sin_p14 = Math.sin(this.lat0);
+  this.cos_p14 = Math.cos(this.lat0);
+};
+
+
+/* Orthographic forward equations--mapping lat,long to x,y
+    ---------------------------------------------------*/
+exports.forward = function(p) {
+  var sinphi, cosphi; /* sin and cos value        */
+  var dlon; /* delta longitude value      */
+  var coslon; /* cos of longitude        */
+  var ksp; /* scale factor          */
+  var g, x, y;
+  var lon = p.x;
+  var lat = p.y;
+  /* Forward equations
+      -----------------*/
+  dlon = adjust_lon(lon - this.long0);
+
+  sinphi = Math.sin(lat);
+  cosphi = Math.cos(lat);
+
+  coslon = Math.cos(dlon);
+  g = this.sin_p14 * sinphi + this.cos_p14 * cosphi * coslon;
+  ksp = 1;
+  if ((g > 0) || (Math.abs(g) <= EPSLN)) {
+    x = this.a * ksp * cosphi * Math.sin(dlon);
+    y = this.y0 + this.a * ksp * (this.cos_p14 * sinphi - this.sin_p14 * cosphi * coslon);
+  }
+  p.x = x;
+  p.y = y;
+  return p;
+};
+
+
+exports.inverse = function(p) {
+  var rh; /* height above ellipsoid      */
+  var z; /* angle          */
+  var sinz, cosz; /* sin of z and cos of z      */
+  var con;
+  var lon, lat;
+  /* Inverse equations
+      -----------------*/
+  p.x -= this.x0;
+  p.y -= this.y0;
+  rh = Math.sqrt(p.x * p.x + p.y * p.y);
+  z = asinz(rh / this.a);
+
+  sinz = Math.sin(z);
+  cosz = Math.cos(z);
+
+  lon = this.long0;
+  if (Math.abs(rh) <= EPSLN) {
+    lat = this.lat0;
+    p.x = lon;
+    p.y = lat;
+    return p;
+  }
+  lat = asinz(cosz * this.sin_p14 + (p.y * sinz * this.cos_p14) / rh);
+  con = Math.abs(this.lat0) - HALF_PI;
+  if (Math.abs(con) <= EPSLN) {
+    if (this.lat0 >= 0) {
+      lon = adjust_lon(this.long0 + Math.atan2(p.x, - p.y));
+    }
+    else {
+      lon = adjust_lon(this.long0 - Math.atan2(-p.x, p.y));
+    }
+    p.x = lon;
+    p.y = lat;
+    return p;
+  }
+  lon = adjust_lon(this.long0 + Math.atan2((p.x * sinz), rh * this.cos_p14 * cosz - p.y * this.sin_p14 * sinz));
+  p.x = lon;
+  p.y = lat;
+  return p;
+};
+exports.names = ["ortho"];
+
+},{"../common/adjust_lon":5,"../common/asinz":6}],58:[function(require,module,exports){
+var e0fn = require('../common/e0fn');
+var e1fn = require('../common/e1fn');
+var e2fn = require('../common/e2fn');
+var e3fn = require('../common/e3fn');
+var adjust_lon = require('../common/adjust_lon');
+var adjust_lat = require('../common/adjust_lat');
+var mlfn = require('../common/mlfn');
 var EPSLN = 1.0e-10;
-var gN = _dereq_('../common/gN');
+var gN = require('../common/gN');
 var MAX_ITER = 20;
 exports.init = function() {
   /* Place parameters in static storage for common use
@@ -3665,16 +3784,16 @@ exports.inverse = function(p) {
   return p;
 };
 exports.names = ["Polyconic", "poly"];
-},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/gN":11,"../common/mlfn":14}],58:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
-var adjust_lat = _dereq_('../common/adjust_lat');
-var pj_enfn = _dereq_('../common/pj_enfn');
+},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/gN":11,"../common/mlfn":14}],59:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
+var adjust_lat = require('../common/adjust_lat');
+var pj_enfn = require('../common/pj_enfn');
 var MAX_ITER = 20;
-var pj_mlfn = _dereq_('../common/pj_mlfn');
-var pj_inv_mlfn = _dereq_('../common/pj_inv_mlfn');
+var pj_mlfn = require('../common/pj_mlfn');
+var pj_inv_mlfn = require('../common/pj_inv_mlfn');
 var HALF_PI = Math.PI/2;
 var EPSLN = 1.0e-10;
-var asinz = _dereq_('../common/asinz');
+var asinz = require('../common/asinz');
 exports.init = function() {
   /* Place parameters in static storage for common use
     -------------------------------------------------*/
@@ -3772,7 +3891,7 @@ exports.inverse = function(p) {
   return p;
 };
 exports.names = ["Sinusoidal", "sinu"];
-},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/asinz":6,"../common/pj_enfn":17,"../common/pj_inv_mlfn":18,"../common/pj_mlfn":19}],59:[function(_dereq_,module,exports){
+},{"../common/adjust_lat":4,"../common/adjust_lon":5,"../common/asinz":6,"../common/pj_enfn":17,"../common/pj_inv_mlfn":18,"../common/pj_mlfn":19}],60:[function(require,module,exports){
 /*
   references:
     Formules et constantes pour le Calcul pour la
@@ -3854,14 +3973,14 @@ exports.inverse = function(p) {
 
 exports.names = ["somerc"];
 
-},{}],60:[function(_dereq_,module,exports){
+},{}],61:[function(require,module,exports){
 var HALF_PI = Math.PI/2;
 var EPSLN = 1.0e-10;
-var sign = _dereq_('../common/sign');
-var msfnz = _dereq_('../common/msfnz');
-var tsfnz = _dereq_('../common/tsfnz');
-var phi2z = _dereq_('../common/phi2z');
-var adjust_lon = _dereq_('../common/adjust_lon');
+var sign = require('../common/sign');
+var msfnz = require('../common/msfnz');
+var tsfnz = require('../common/tsfnz');
+var phi2z = require('../common/phi2z');
+var adjust_lon = require('../common/adjust_lon');
 exports.ssfn_ = function(phit, sinphi, eccen) {
   sinphi *= eccen;
   return (Math.tan(0.5 * (HALF_PI + phit)) * Math.pow((1 - sinphi) / (1 + sinphi), 0.5 * eccen));
@@ -4022,9 +4141,9 @@ exports.inverse = function(p) {
 };
 exports.names = ["stere", "Stereographic_South_Pole", "Polar Stereographic (variant B)"];
 
-},{"../common/adjust_lon":5,"../common/msfnz":15,"../common/phi2z":16,"../common/sign":21,"../common/tsfnz":24}],61:[function(_dereq_,module,exports){
-var gauss = _dereq_('./gauss');
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"../common/adjust_lon":5,"../common/msfnz":15,"../common/phi2z":16,"../common/sign":21,"../common/tsfnz":24}],62:[function(require,module,exports){
+var gauss = require('./gauss');
+var adjust_lon = require('../common/adjust_lon');
 exports.init = function() {
   gauss.init.apply(this);
   if (!this.rc) {
@@ -4081,17 +4200,17 @@ exports.inverse = function(p) {
 
 exports.names = ["Stereographic_North_Pole", "Oblique_Stereographic", "Polar_Stereographic", "sterea","Oblique Stereographic Alternative"];
 
-},{"../common/adjust_lon":5,"./gauss":46}],62:[function(_dereq_,module,exports){
-var e0fn = _dereq_('../common/e0fn');
-var e1fn = _dereq_('../common/e1fn');
-var e2fn = _dereq_('../common/e2fn');
-var e3fn = _dereq_('../common/e3fn');
-var mlfn = _dereq_('../common/mlfn');
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"../common/adjust_lon":5,"./gauss":46}],63:[function(require,module,exports){
+var e0fn = require('../common/e0fn');
+var e1fn = require('../common/e1fn');
+var e2fn = require('../common/e2fn');
+var e3fn = require('../common/e3fn');
+var mlfn = require('../common/mlfn');
+var adjust_lon = require('../common/adjust_lon');
 var HALF_PI = Math.PI/2;
 var EPSLN = 1.0e-10;
-var sign = _dereq_('../common/sign');
-var asinz = _dereq_('../common/asinz');
+var sign = require('../common/sign');
+var asinz = require('../common/asinz');
 
 exports.init = function() {
   this.e0 = e0fn(this.es);
@@ -4218,9 +4337,9 @@ exports.inverse = function(p) {
 };
 exports.names = ["Transverse_Mercator", "Transverse Mercator", "tmerc"];
 
-},{"../common/adjust_lon":5,"../common/asinz":6,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/mlfn":14,"../common/sign":21}],63:[function(_dereq_,module,exports){
+},{"../common/adjust_lon":5,"../common/asinz":6,"../common/e0fn":7,"../common/e1fn":8,"../common/e2fn":9,"../common/e3fn":10,"../common/mlfn":14,"../common/sign":21}],64:[function(require,module,exports){
 var D2R = 0.01745329251994329577;
-var tmerc = _dereq_('./tmerc');
+var tmerc = require('./tmerc');
 exports.dependsOn = 'tmerc';
 exports.init = function() {
   if (!this.zone) {
@@ -4238,11 +4357,11 @@ exports.init = function() {
 };
 exports.names = ["Universal Transverse Mercator System", "utm"];
 
-},{"./tmerc":62}],64:[function(_dereq_,module,exports){
-var adjust_lon = _dereq_('../common/adjust_lon');
+},{"./tmerc":63}],65:[function(require,module,exports){
+var adjust_lon = require('../common/adjust_lon');
 var HALF_PI = Math.PI/2;
 var EPSLN = 1.0e-10;
-var asinz = _dereq_('../common/asinz');
+var asinz = require('../common/asinz');
 /* Initialize the Van Der Grinten projection
   ----------------------------------------*/
 exports.init = function() {
@@ -4359,15 +4478,15 @@ exports.inverse = function(p) {
   return p;
 };
 exports.names = ["Van_der_Grinten_I", "VanDerGrinten", "vandg"];
-},{"../common/adjust_lon":5,"../common/asinz":6}],65:[function(_dereq_,module,exports){
+},{"../common/adjust_lon":5,"../common/asinz":6}],66:[function(require,module,exports){
 var D2R = 0.01745329251994329577;
 var R2D = 57.29577951308232088;
 var PJD_3PARAM = 1;
 var PJD_7PARAM = 2;
-var datum_transform = _dereq_('./datum_transform');
-var adjust_axis = _dereq_('./adjust_axis');
-var proj = _dereq_('./Proj');
-var toPoint = _dereq_('./common/toPoint');
+var datum_transform = require('./datum_transform');
+var adjust_axis = require('./adjust_axis');
+var proj = require('./Proj');
+var toPoint = require('./common/toPoint');
 module.exports = function transform(source, dest, point) {
   var wgs84;
   if (Array.isArray(point)) {
@@ -4432,9 +4551,9 @@ module.exports = function transform(source, dest, point) {
 
   return point;
 };
-},{"./Proj":2,"./adjust_axis":3,"./common/toPoint":23,"./datum_transform":31}],66:[function(_dereq_,module,exports){
+},{"./Proj":2,"./adjust_axis":3,"./common/toPoint":23,"./datum_transform":31}],67:[function(require,module,exports){
 var D2R = 0.01745329251994329577;
-var extend = _dereq_('./extend');
+var extend = require('./extend');
 
 function mapit(obj, key, v) {
   obj[key] = v.map(function(aa) {
@@ -4657,7 +4776,7 @@ module.exports = function(wkt, self) {
   return extend(self, obj.output);
 };
 
-},{"./extend":34}],67:[function(_dereq_,module,exports){
+},{"./extend":34}],68:[function(require,module,exports){
 
 
 
@@ -5401,10 +5520,10 @@ function getMinNorthing(zoneLetter) {
 
 }
 
-},{}],68:[function(_dereq_,module,exports){
+},{}],69:[function(require,module,exports){
 module.exports={
   "name": "proj4",
-  "version": "2.3.14",
+  "version": "2.3.15",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "main": "lib/index.js",
   "directories": {
@@ -5448,38 +5567,5 @@ module.exports={
     "mgrs": "~0.0.2"
   }
 }
-},{}],"./includedProjections":[function(_dereq_,module,exports){
-module.exports=_dereq_('hTEDpn');
-},{}],"hTEDpn":[function(_dereq_,module,exports){
-var projs = [
- _dereq_('./lib/projections/tmerc'),
-	_dereq_('./lib/projections/utm'),
-	_dereq_('./lib/projections/sterea'),
-	_dereq_('./lib/projections/stere'),
-	_dereq_('./lib/projections/somerc'),
-	_dereq_('./lib/projections/omerc'),
-	_dereq_('./lib/projections/lcc'),
-	_dereq_('./lib/projections/krovak'),
-	_dereq_('./lib/projections/cass'),
-	_dereq_('./lib/projections/laea'),
-	_dereq_('./lib/projections/aea'),
-	_dereq_('./lib/projections/gnom'),
-	_dereq_('./lib/projections/cea'),
-	_dereq_('./lib/projections/eqc'),
-	_dereq_('./lib/projections/poly'),
-	_dereq_('./lib/projections/nzmg'),
-	_dereq_('./lib/projections/mill'),
-	_dereq_('./lib/projections/sinu'),
-	_dereq_('./lib/projections/moll'),
-	_dereq_('./lib/projections/eqdc'),
-	_dereq_('./lib/projections/vandg'),
-	_dereq_('./lib/projections/aeqd')
-];
-module.exports = function(proj4){
- projs.forEach(function(proj){
-   proj4.Proj.projections.add(proj);
- });
-}
-},{"./lib/projections/aea":40,"./lib/projections/aeqd":41,"./lib/projections/cass":42,"./lib/projections/cea":43,"./lib/projections/eqc":44,"./lib/projections/eqdc":45,"./lib/projections/gnom":47,"./lib/projections/krovak":48,"./lib/projections/laea":49,"./lib/projections/lcc":50,"./lib/projections/mill":53,"./lib/projections/moll":54,"./lib/projections/nzmg":55,"./lib/projections/omerc":56,"./lib/projections/poly":57,"./lib/projections/sinu":58,"./lib/projections/somerc":59,"./lib/proje [...]
-(36)
+},{}]},{},[36])(36)
 });
\ No newline at end of file
diff --git a/dist/test.html b/dist/test.html
new file mode 100644
index 0000000..89f04d8
--- /dev/null
+++ b/dist/test.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+  <div id="result"></div>
+  <script src="proj4-src.js"></script>
+  <script>
+  document.getElementById('result').innerHTML =
+      proj4('EPSG:4326', 'EPSG:3857', [16, 48]);
+  </script>
+</body>
+</html>
+
diff --git a/lib/constants/grids.js b/lib/constants/grids.js
index 2a1c46c..5394bf9 100644
--- a/lib/constants/grids.js
+++ b/lib/constants/grids.js
@@ -4,7 +4,7 @@
   //        1 is latitude ...
   //        In the later case, grid object gets bigger !!!!
   //        Solution 1 is chosen based on pj_gridinfo.c
-exports.null = { // name of grid's file
+exports['null'] = { // name of grid's file
   "ll": [-3.14159265, - 1.57079633], // lower-left coordinates in radians (longitude, latitude):
   "del": [3.14159265, 1.57079633], // cell's size in radians (longitude, latitude):
   "lim": [3, 3], // number of nodes in longitude, latitude (including edges):
@@ -20,4 +20,4 @@ exports.null = { // name of grid's file
     [0.0, 0.0],
     [0.0, 0.0] // }
   ]
-};
\ No newline at end of file
+};
diff --git a/package.json b/package.json
index c2526d4..b0605f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.3.13-alpha",
+  "version": "2.3.15-alpha",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "main": "lib/index.js",
   "directories": {
@@ -43,4 +43,4 @@
   "dependencies": {
     "mgrs": "~0.0.2"
   }
-}
+}
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj4js.git



More information about the Pkg-grass-devel mailing list