geo-coordinates-parser 1.5.4 → 1.5.7

package/converter.js

@@ -1,4 +1,5 @@
 //function for converting coordinates from a string to decimal and verbatim
+//this is just a comment
 
 const toCoordinateFormat = require('./toCoordinateFormat.js')
 
@@ -15,7 +16,7 @@ function converter(coordsString, decimalPlaces) {
     decimalPlaces = 5
   }
 
-  coordsString = coordsString.replace(/\s\s+/g, ' ').trim(); //just to tidy up whitespaces
+  coordsString = coordsString.replace(/\s+/g, ' ').trim(); //just to tidy up whitespaces
 
   var ddLat = null;
   var ddLng = null; 
@@ -78,7 +79,7 @@ function converter(coordsString, decimalPlaces) {
       }
         
       if (match[6]){
-        ddLat += match[6]/3600;
+        ddLat += match[6].replace(',', '.')/3600;
       }
   
       if (parseInt(match[2]) < 0) {
@@ -92,7 +93,7 @@ function converter(coordsString, decimalPlaces) {
       }
         
       if (match[13]) {
-        ddLng += match[13]/3600;
+        ddLng += match[13].replace(',', '.')/3600;
       }
         
       if (parseInt(match[9]) < 0) {
@@ -107,11 +108,10 @@ function converter(coordsString, decimalPlaces) {
       else if (match[7]) {
         latdir = match[7];
         lngdir = match[14];
-      }
-
+      }  
     }
     else {
-      throw new Error("invalid DMS coordinates format")				
+      throw new Error("invalid DMS coordinates format")
     }
   }
   else if (dms_abbr.test(coordsString)) {
@@ -122,16 +122,10 @@ function converter(coordsString, decimalPlaces) {
       ddLat = Math.abs(parseInt(match[2]));
       if (match[4]) {
         ddLat += match[4]/60;
-        if(!match[3]) {
-          match[3] = ' ';
-        }
       }
 
       if (match[6]) {
         ddLat += match[6]/3600;
-        if(!match[5]) {
-          match[5] = ' ';
-        }
       }
 
       if (parseInt(match[2]) < 0) {
@@ -142,16 +136,10 @@ function converter(coordsString, decimalPlaces) {
 
       if (match[12]) {
         ddLng += match[12]/60;
-        if(!match[11]) {
-          match[11] = ' ';
-        }
       }
 
       if (match[14]) {
         ddLng += match[14]/3600;
-        if(!match[13]) {
-          match[13] = ' ';
-        }
       }
 
       if (parseInt(match[10]) < 0) {
@@ -180,16 +168,10 @@ function converter(coordsString, decimalPlaces) {
       ddLat = Math.abs(parseInt(match[2]));
       if (match[4]){
         ddLat += match[4]/60;
-        if(!match[3]) {
-          match[3] = ' ';
-        }
       }
 
       if (match[6]) {
         ddLat += match[6]/3600;
-        if(!match[5]) {
-          match[5] = ' ';
-        }
       }
 
       if (parseInt(match[2]) < 0) {
@@ -199,16 +181,10 @@ function converter(coordsString, decimalPlaces) {
       ddLng = Math.abs(parseInt(match[10]));
       if (match[12]) {
         ddLng += match[12]/60;
-        if(!match[11]) {
-          match[11] = ' ';
-        }
       }
 
       if (match[14]) {
         ddLng += match[14]/3600;
-        if(!match[13]) {
-          match[13] = ' ';
-        }
       }
 
       if (parseInt(match[10]) < 0) {
@@ -229,18 +205,30 @@ function converter(coordsString, decimalPlaces) {
     }
   }
 
-  //check longitude value - it can be wrong!
-  if (Math.abs(ddLng) >= 180) {
-    throw new Error("invalid longitude value")				
-  }
-
-  //just to be safe check latitude also...
-  if (Math.abs(ddLat) >= 90) {
-    throw new Error("invalid latitude value")				
-  }
-  
   if (matchSuccess){
-    
+
+    //more validation....
+
+      //check longitude value - it can be wrong!
+      if (Math.abs(ddLng) >= 180) {
+        throw new Error("invalid longitude value")				
+      }
+
+      //just to be safe check latitude also...
+      if (Math.abs(ddLat) >= 90) {
+        throw new Error("invalid latitude value")				
+      }
+
+    //if we have one direction we must have the other
+    if((latdir || lngdir) && (!latdir || !lngdir)) {
+      throw new Error("invalid coordinates format")	
+    }
+
+    //the directions can't be the same
+    if(latdir && latdir == lngdir) {
+      throw new Error("invalid coordinates format")	
+    }
+
     //make sure the signs and cardinal directions match
     var patt = /S|SOUTH/i;
     if (patt.test(latdir)) {
@@ -256,7 +244,6 @@ function converter(coordsString, decimalPlaces) {
       }
     }
 
-
     //we need to get the verbatim coords from the string
     //we can't split down the middle because if there are decimals they may have different numbers on each side
     //so we need to find the separating character, or if none, use the match values to split down the middle
@@ -359,7 +346,7 @@ function checkMatch(match) { //test if the matched groups arrays are 'balanced'.
   }
 
   //regex for testing corresponding values match
-  var numerictest = /^[-+]?\d+([\.,]{1}\d+)?$/; //for testing numeric values
+  var numerictest = /^[-+]?\d+([\.,]\d+)?$/; //for testing numeric values
   var stringtest = /[eastsouthnorthwest]+/i; //for testing string values (north, south, etc)
   
   
@@ -414,13 +401,13 @@ function coordsCloseEnough(coordsToTest) {
 var dd_re = /(NORTH|SOUTH|[NS])?[\s]*([+-]?[0-8]?[0-9](?:[\.,]\d{3,}))[\s]*([•º°]?)[\s]*(NORTH|SOUTH|[NS])?[\s]*[,/;]?[\s]*(EAST|WEST|[EW])?[\s]*([+-]?[0-1]?[0-9]?[0-9](?:[\.,]\d{3,}))[\s]*([•º°]?)[\s]*(EAST|WEST|[EW])?/i;
 
 //degrees minutes seconds with '.' as separator - gives array with 15 values
-var dms_periods = /(NORTH|SOUTH|[NS])?[\ \t]*([+-]?[0-8]?[0-9])[\ \t]*(\.)[\ \t]*([0-5]?[0-9])[\ \t]*(\.)?[\ \t]*((?:[0-5]?[0-9])(?:\.\d{1,3})?)?\s*(NORTH|SOUTH|[NS])?(?:[\ \t]*[,/;][\ \t]*|[\ \t]*)(EAST|WEST|[EW])?[\ \t]*([+-]?[0-1]?[0-9]?[0-9])[\ \t]*(\.)[\ \t]*([0-5]?[0-9])[\ \t]*(\.)?[\ \t]*((?:[0-5]?[0-9])(?:\.\d{1,3})?)?\s*(EAST|WEST|[EW])?/i;
+var dms_periods = /(NORTH|SOUTH|[NS])?\s*([+-]?[0-8]?[0-9])\s*(\.)\s*([0-5]?[0-9])\s*(\.)\s*((?:[0-5]?[0-9])(?:[\.,]\d{1,3})?)?\s*(NORTH|SOUTH|[NS])?(?:\s*[,/;]\s*|\s*)(EAST|WEST|[EW])?\s*([+-]?[0-1]?[0-9]?[0-9])\s*(\.)\s*([0-5]?[0-9])\s*(\.)\s*((?:[0-5]?[0-9])(?:[\.,]\d{1,3})?)?\s*(EAST|WEST|[EW])?/i;
 
 //degrees minutes seconds with words 'degrees, minutes, seconds' as separators (needed because the s of seconds messes with the S of SOUTH) - gives array of 17 values
-var dms_abbr = /(NORTH|SOUTH|[NS])?[\ \t]*([+-]?[0-8]?[0-9])[\ \t]*(D(?:EG)?(?:REES)?)[\ \t]*([0-5]?[0-9])[\ \t]*(M(?:IN)?(?:UTES)?)[\ \t]*((?:[0-5]?[0-9])(?:\.\d{1,3})?)?(S(?:EC)?(?:ONDS)?)?[\ \t]*(NORTH|SOUTH|[NS])?(?:[\ \t]*[,/;][\ \t]*|[\ \t]*)(EAST|WEST|[EW])?[\ \t]*([+-]?[0-1]?[0-9]?[0-9])[\ \t]*(D(?:EG)?(?:REES)?)[\ \t]*([0-5]?[0-9])[\ \t]*(M(?:IN)?(?:UTES)?)[\ \t]*((?:[0-5]?[0-9])(?:\.\d{1,3})?)?(S(?:EC)?(?:ONDS)?)[\ \t]*(EAST|WEST|[EW])?/i;
+var dms_abbr = /(NORTH|SOUTH|[NS])?\s*([+-]?[0-8]?[0-9])\s*(D(?:EG)?(?:REES)?)\s*([0-5]?[0-9])\s*(M(?:IN)?(?:UTES)?)\s*((?:[0-5]?[0-9])(?:[\.,]\d{1,3})?)?\s*(S(?:EC)?(?:ONDS)?)?\s*(NORTH|SOUTH|[NS])?(?:\s*[,/;]\s*|\s*)(EAST|WEST|[EW])?\s*([+-]?[0-1]?[0-9]?[0-9])\s*(D(?:EG)?(?:REES)?)\s*([0-5]?[0-9])\s*(M(?:IN)?(?:UTES)?)\s*((?:[0-5]?[0-9])(?:[\.,]\d{1,3})?)?\s*(S(?:EC)?(?:ONDS)?)\s*(EAST|WEST|[EW])?/i;
 
 //everything else - gives array of 17 values 
-var coords_other = /(NORTH|SOUTH|[NS])?[\ \t]*([+-]?[0-8]?[0-9])[\ \t]*([•º°\.:]|D(?:EG)?(?:REES)?)?[\ \t]*,?([0-5]?[0-9](?:\.\d{1,})?)?[\ \t]*(['′´’\.:]|M(?:IN)?(?:UTES)?)?[\ \t]*,?((?:[0-5]?[0-9])(?:\.\d{1,3})?)?[\ \t]*(''|′′|’’|´´|["″”\.])?[\ \t]*(NORTH|SOUTH|[NS])?(?:\s*[,/;]\s*|\s*)(EAST|WEST|[EW])?[\ \t]*([+-]?[0-1]?[0-9]?[0-9])[\ \t]*([•º°\.:]|D(?:EG)?(?:REES)?)?[\ \t]*,?([0-5]?[0-9](?:\.\d{1,})?)?[\ \t]*(['′´’\.:]|M(?:IN)?(?:UTES)?)?[\ \t]*,?((?:[0-5]?[0-9])(?:\.\d{1,3})?)?[\ \t]*(''|′′|´´|’’|["″”\.])?[\ \t]*(EAST|WEST|[EW])?/i;
+var coords_other = /(NORTH|SOUTH|[NS])?\s*([+-]?[0-8]?[0-9])\s*([•º°\.:]|D(?:EG)?(?:REES)?)?\s*,?([0-5]?[0-9](?:[\.,]\d{1,})?)?\s*(['′´’\.:]|M(?:IN)?(?:UTES)?)?\s*,?((?:[0-5]?[0-9])(?:[\.,]\d{1,3})?)?\s*(''|′′|’’|´´|["″”\.])?\s*(NORTH|SOUTH|[NS])?(?:\s*[,/;]\s*|\s*)(EAST|WEST|[EW])?\s*([+-]?[0-1]?[0-9]?[0-9])\s*([•º°\.:]|D(?:EG)?(?:REES)?)?\s*,?([0-5]?[0-9](?:[\.,]\d{1,})?)?\s*(['′´’\.:]|M(?:IN)?(?:UTES)?)?\s*,?((?:[0-5]?[0-9])(?:[\.,]\d{1,3})?)?\s*(''|′′|´´|’’|["″”\.])?\s*(EAST|WEST|[EW])?/i;
 
 const to = Object.freeze({
   DMS: 'DMS',

package/failFormats.js

@@ -7,6 +7,11 @@ const failingFormats = [
   '50°4\'17.698"east, 23°4\'17.698"south', //directions wrong way round
   'E23.34355,S25.324234', // directions wrong way round
   '23°45\'12.2\'\'S 18.33\'56.7\'\'E', //symbols don't match
+  'S 27.45.34 23.23.23', //missing direction on right side
+  'S 27.45.34 S 23.23.23', //invalid direction on right side
+  'S 90°4\'17.698" S 23°4\'17.698"',
+  '27.45.34 S S 23.23.23', //invalid direction on right side
+  '27.45.34  23.23.23 E' //no dir on one side
 ]
 
 module.exports = failingFormats

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-coordinates-parser",
-  "version": "1.5.4",
+  "version": "1.5.7",
   "description": "A Javascript function for reading a variety of coordinate formats and converting to decimal numbers. Builds on other efforts by returning the verbatim coordinates and the decimal coordinates all in one object.",
   "main": "merge.js",
   "scripts": {

package/testFormats.json

@@ -132,6 +132,13 @@
     "decimalLatitude": 40.1230555555,
     "decimalLongitude": -74.12305555555555
   },
+  {
+    "verbatimCoordinates": "40°7’23\"S 74°7’23\"E",
+    "verbatimLatitude": "40°7’23\"S",
+    "verbatimLongitude": "74°7’23\"E",
+    "decimalLatitude": -40.1230555555,
+    "decimalLongitude": 74.12305555555555
+  },
   {
     "verbatimCoordinates": "40°7’23\" -74°7’23\"",
     "verbatimLatitude": "40°7’23\"",
@@ -293,6 +300,27 @@
     "decimalLatitude": -27.2625,
     "decimalLongitude": 18.548055
   },
+  {
+    "verbatimCoordinates": "-27.15.45 18.32.53",
+    "verbatimLatitude": "-27.15.45",
+    "verbatimLongitude": "18.32.53",
+    "decimalLatitude": -27.2625,
+    "decimalLongitude": 18.548055
+  },
+  {
+    "verbatimCoordinates": "27.15.45.2S 18.32.53.4E",
+    "verbatimLatitude": "27.15.45.2S",
+    "verbatimLongitude": "18.32.53.4E",
+    "decimalLatitude": -27.262556,
+    "decimalLongitude": 18.548167
+  },
+  {
+    "verbatimCoordinates": "27.15.45,2S 18.32.53,4E",
+    "verbatimLatitude": "27.15.45,2S",
+    "verbatimLongitude": "18.32.53,4E",
+    "decimalLatitude": -27.262556,
+    "decimalLongitude": 18.548167
+  },
   {
     "verbatimCoordinates": "S23.43563 °  E22.45634 °",
     "verbatimLatitude": "S23.43563 °",
@@ -313,5 +341,12 @@
     "verbatimLongitude": "23.23.23 E",
     "decimalLatitude": -27.759444,
     "decimalLongitude": 23.38972222
+  },
+  {
+    "verbatimCoordinates": "S 27.45.34 E 23.23.23",
+    "verbatimLatitude": "S 27.45.34",
+    "verbatimLongitude": "E 23.23.23",
+    "decimalLatitude": -27.759444,
+    "decimalLongitude": 23.38972222
   }
 ]

package/testIndividual.js

@@ -1,5 +1,5 @@
 const convert = require('./converter')
-const test = '27.45.34 S 23.23.23 E'
+const test = '27.45.34 S S 23.23.23'
 
 try{
   let converted = convert(test)

package/testformats.js

@@ -103,6 +103,13 @@ var coordsParserFormats = [
     decimalLatitude: 40.1230555555,
     decimalLongitude: -74.12305555555555
   },
+  {
+    verbatimCoordinates: '40°7’23"S 74°7’23"E',
+    verbatimLatitude: '40°7’23"S', 
+    verbatimLongitude: '74°7’23"E',
+    decimalLatitude: -40.1230555555,
+    decimalLongitude: 74.12305555555555
+  },
   {
     verbatimCoordinates: '40°7’23" -74°7’23"',
     verbatimLatitude: '40°7’23"', 
@@ -272,6 +279,27 @@ var otherFormats = [
     verbatimLongitude: '18.32.53E',
     decimalLatitude: -27.2625,
     decimalLongitude: 18.548055
+  },
+  {
+    verbatimCoordinates: '-27.15.45 18.32.53',
+    verbatimLatitude: '-27.15.45', 
+    verbatimLongitude: '18.32.53',
+    decimalLatitude: -27.2625,
+    decimalLongitude: 18.548055
+  }, 
+  {
+    verbatimCoordinates: '27.15.45.2S 18.32.53.4E',
+    verbatimLatitude: '27.15.45.2S', 
+    verbatimLongitude: '18.32.53.4E',
+    decimalLatitude: -27.262556,
+    decimalLongitude: 18.548167
+  }, 
+  {
+    verbatimCoordinates: '27.15.45,2S 18.32.53,4E',
+    verbatimLatitude: '27.15.45,2S', 
+    verbatimLongitude: '18.32.53,4E',
+    decimalLatitude: -27.262556,
+    decimalLongitude: 18.548167
   }, 
   {
     verbatimCoordinates: 'S23.43563 °  E22.45634 °', //decimals with spaces before the symbol!!