geo-coordinates-parser 1.5.3 → 1.5.4

package/converter.js

@@ -409,11 +409,16 @@ function coordsCloseEnough(coordsToTest) {
 }
 
 //Coordinates pattern matching regex
+
+//decimal degrees
 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})?)?(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})?)?(EAST|WEST|[EW])?/i;
+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;
+
 //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;
+
 //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;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-coordinates-parser",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "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

@@ -251,6 +251,13 @@
     "decimalLatitude": 40.123256,
     "decimalLongitude": -74.123256
   },
+  {
+    "verbatimCoordinates": "18°24S 22°45E",
+    "verbatimLatitude": "18°24S",
+    "verbatimLongitude": "22°45E",
+    "decimalLatitude": -18.4,
+    "decimalLongitude": 22.75
+  },
   {
     "verbatimCoordinates": "18.24S 22.45E",
     "verbatimLatitude": "18.24S",
@@ -299,5 +306,12 @@
     "verbatimLongitude": "23,07771° E",
     "decimalLatitude": -27.71372,
     "decimalLongitude": 23.07771
+  },
+  {
+    "verbatimCoordinates": "27.45.34 S 23.23.23 E",
+    "verbatimLatitude": "27.45.34 S",
+    "verbatimLongitude": "23.23.23 E",
+    "decimalLatitude": -27.759444,
+    "decimalLongitude": 23.38972222
   }
 ]

package/testIndividual.js

@@ -1,5 +1,5 @@
 const convert = require('./converter')
-const test = '23°45\'12.2\'\'S 18.33\'56.7\'\'E'
+const test = '27.45.34 S 23.23.23 E'
 
 try{
   let converted = convert(test)

package/testformats.js

@@ -286,6 +286,20 @@ var otherFormats = [
     verbatimLongitude: '23,07771° E',
     decimalLatitude: -27.71372,
     decimalLongitude: 23.07771
+  }, 
+  {
+    verbatimCoordinates: '27.45.34 S 23.23.23 E',
+    verbatimLatitude: '27.45.34 S', 
+    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
   }
 ]