Merge pull request #45 from DanielJDufour/ImprovedDecoding

Improved decoding

mgrs.js

@@ -87,7 +87,7 @@ export function inverse(mgrs) {
 
 export function toPoint(mgrs) {
   if (mgrs === '') {
-    throw new TypeError(`toPoint received a blank string`);
+    throw new TypeError('toPoint received a blank string');
   }
   const bbox = UTMtoLL(decode(mgrs.toUpperCase()));
   if (bbox.lat && bbox.lon) {
@@ -505,6 +505,9 @@ function decode(mgrsString) {
     throw new TypeError('MGRSPoint coverting from nothing');
   }
 
+  //remove any spaces in MGRS String
+  mgrsString = mgrsString.replace(/ /g, '');
+
   const { length } = mgrsString;
 
   let hunK = null;

test/test.js

@@ -46,7 +46,7 @@ describe ('third mgrs set', () => {
 });
 
 describe ('data validation', () => {
-  describe('forward function', () => {
+  describe('toPoint function', () => {
     it('toPoint throws an error when a blank string is passed in', () => {
       try {
         mgrs.toPoint('');
@@ -56,6 +56,14 @@ describe ('data validation', () => {
         error.message.should.equal('toPoint received a blank string');
       }
     });
+    it('toPoint should return the same result whether or not spaces are included in the MGRS String', () => {
+      const [ lon1, lat1 ] = mgrs.toPoint('4QFJ 12345 67890');
+      const [ lon2, lat2]  = mgrs.toPoint('4QFJ1234567890');
+      lat1.should.equal(lat2);
+      lon1.should.equal(lon2);
+    });
+  });
+  describe('forward function', () => {
     it('forward throws an error when array of strings passed in', () => {
       try {
         mgrs.forward(['40', '40']);