geo-coordinates-parser 1.5.4 → 1.5.5

package/converter.js

@@ -108,6 +108,14 @@ function converter(coordsString, decimalPlaces) {
         latdir = match[7];
         lngdir = match[14];
       }
+      else { //we have to catch an edge case where we have no direction indicators
+        throw new Error("invalid DMS coordinates format")	
+      }
+
+      //we have to catch another edge case here, same or missing direction indicators
+      if(!latdir || !lngdir) {
+        throw new Error("invalid DMS coordinates format")	
+      }
 
     }
     else {
@@ -414,7 +422,7 @@ 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;

package/failFormats.js

@@ -7,6 +7,10 @@ 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
 ]
 
 module.exports = failingFormats

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-coordinates-parser",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "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/testIndividual.js

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