[proj4js] 03/06: Imported Upstream version 2.3.6+ds

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat May 9 21:03:04 UTC 2015


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

sebastic pushed a commit to branch master
in repository proj4js.

commit 35c7b0ba7b6cb9132173bce7209baca22f786359
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 9 22:40:40 2015 +0200

    Imported Upstream version 2.3.6+ds
---
 bower.json        |  2 +-
 component.json    |  2 +-
 dist/proj4-src.js |  3 ++-
 lib/projString.js |  1 +
 package.json      |  2 +-
 test/amd.html     | 16 ++++++++--------
 test/test.js      |  8 +++++++-
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/bower.json b/bower.json
index 01d5fae..f87d4fe 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.3.4-alpha",
+  "version": "2.3.6-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",
diff --git a/component.json b/component.json
index b013b48..0ea2fb3 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.3.4-alpha",
+  "version": "2.3.6-alpha",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "repo": "proj4js/proj4js",
   "keywords": [
diff --git a/dist/proj4-src.js b/dist/proj4-src.js
index 6fa72df..e0557ed 100644
--- a/dist/proj4-src.js
+++ b/dist/proj4-src.js
@@ -1507,6 +1507,7 @@ module.exports = function(defData) {
       self.to_meter = parseFloat(v);
     },
     units: function(v) {
+      self.units = v;
       if (units[v]) {
         self.to_meter = units[v].to_meter;
       }
@@ -5391,7 +5392,7 @@ function getMinNorthing(zoneLetter) {
 },{}],68:[function(_dereq_,module,exports){
 module.exports={
   "name": "proj4",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
   "main": "lib/index.js",
   "directories": {
diff --git a/lib/projString.js b/lib/projString.js
index 30587b9..53326f2 100644
--- a/lib/projString.js
+++ b/lib/projString.js
@@ -84,6 +84,7 @@ module.exports = function(defData) {
       self.to_meter = parseFloat(v);
     },
     units: function(v) {
+      self.units = v;
       if (units[v]) {
         self.to_meter = units[v].to_meter;
       }
diff --git a/package.json b/package.json
index 76737cd..aa5eb6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version": "2.3.4-alpha",
+  "version": "2.3.6-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": {
diff --git a/test/amd.html b/test/amd.html
index b7cb9c3..d80f9ab 100644
--- a/test/amd.html
+++ b/test/amd.html
@@ -7,7 +7,7 @@
 <body>
   <script src="../node_modules/mocha/mocha.js"></script>
   <div id="mocha"></div>
-  <script src="../node_modules/curl/src/curl.js"></script>
+  <script src="../node_modules/curl-amd/src/curl.js"></script>
   <script src="test.js"></script>
   <script>
   curl.config({
@@ -23,7 +23,7 @@
         testPoints: {
             attach: 'testPoints'
         },
-        
+
         aWKT: {
             attach: 'aWKT'
         }
@@ -32,13 +32,13 @@
             name: 'proj4',
             location: '../lib',
             main: 'index.js',
-            config: { moduleLoader: '../node_modules/curl/src/curl/loader/cjsm11' } /* <-- hey! */
+            config: { moduleLoader: '../node_modules/curl-amd/src/curl/loader/cjsm11' } /* <-- hey! */
         },
         {
           name:'mgrs',
           location:'../node_modules/mgrs',
           main:'mgrs.js',
-          config: { moduleLoader: '../node_modules/curl/src/curl/loader/cjsm11' } /* <-- hey! */
+          config: { moduleLoader: '../node_modules/curl-amd/src/curl/loader/cjsm11' } /* <-- hey! */
         }
     ]
 });
@@ -55,9 +55,9 @@ mocha.setup({
       window.mocha.run();
     }
    });
-   
+
  </script>
-  
- 
+
+
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/test.js b/test/test.js
index ec65453..c9c8653 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,7 +5,7 @@
 
 function startTests(chai, proj4, testPoints) {
 
-  
+
   var assert = chai.assert;
   proj4.defs([
     ["EPSG:102018", "+proj=gnom +lat_0=90 +lon_0=0 +x_0=6300000 +y_0=6300000 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"],
@@ -14,6 +14,12 @@ function startTests(chai, proj4, testPoints) {
   ]);
   proj4.defs('esriOnline', 'PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]');
 
+  describe('parse', function() {
+    it('should parse units', function() {
+      assert.equal(proj4.defs('testmerc2').units, 'm');
+    });
+  });
+
   describe('proj2proj', function() {
     it('should work transforming from one projection to another', function() {
       var sweref99tm = '+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs';

-- 
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