geo-coordinates-parser 1.7.1 → 1.7.3

package/README.md

@@ -46,6 +46,8 @@ converted.decimalLatitude; // 40.446195 ✓
 converted.decimalLongitude; // -79.948862 ✓
 converted.verbatimLatitude; // '40° 26.7717' ✓
 converted.verbatimLongitude; // '-79° 56.93172' ✓
+converted.decimalCoordinates; // for convenience
+convert.originalFormat; // 'DM' to indicate degrees and minutes
 ```
 The returned object includes properties verbatimCoordinates, verbatimLatitude, verbatimLongitude, decimalLatitude, decimalLatitude, and decimalCoordinates.
 

package/dist/cjs/converter.js

@@ -23,8 +23,12 @@ function converter(coordsString, decimalPlaces) {
     let ddLng = null;
     let latdir = "";
     let lngdir = "";
+    let originalFormat = null;
     let match = [];
     let matchSuccess = false;
+    if (regex_js_1.dm_invalid.test(coordsString)) {
+        throw new Error("invalid coordinate value");
+    }
     if (regex_js_1.dm_numbers.test(coordsString)) {
         match = regex_js_1.dm_numbers.exec(coordsString);
         matchSuccess = checkMatch(match);
@@ -37,6 +41,7 @@ function converter(coordsString, decimalPlaces) {
             if (Number(match[3]) < 0) {
                 ddLng *= -1;
             }
+            originalFormat = "DM";
         }
         else {
             throw new Error("invalid coordinate format");
@@ -55,6 +60,7 @@ function converter(coordsString, decimalPlaces) {
             if (ddLng.includes(',')) {
                 ddLng = ddLng.replace(',', '.');
             }
+            originalFormat = "DD";
             //validation, we don't want things like 23.00000
             //some more validation: no zero coords or degrees only
             if (Number(Math.round(ddLat)) == Number(ddLat)) {
@@ -84,9 +90,11 @@ function converter(coordsString, decimalPlaces) {
             ddLat = Math.abs(parseInt(match[2]));
             if (match[4]) {
                 ddLat += match[4] / 60;
+                originalFormat = "DM";
             }
             if (match[6]) {
                 ddLat += match[6].replace(',', '.') / 3600;
+                originalFormat = "DMS";
             }
             if (parseInt(match[2]) < 0) {
                 ddLat = -1 * ddLat;
@@ -122,9 +130,11 @@ function converter(coordsString, decimalPlaces) {
             ddLat = Math.abs(parseInt(match[2]));
             if (match[4]) {
                 ddLat += match[4] / 60;
+                originalFormat = "DM";
             }
             if (match[6]) {
                 ddLat += match[6] / 3600;
+                originalFormat = "DMS";
             }
             if (parseInt(match[2]) < 0) {
                 ddLat = -1 * ddLat;
@@ -156,13 +166,19 @@ function converter(coordsString, decimalPlaces) {
     else if (regex_js_1.coords_other.test(coordsString)) {
         match = regex_js_1.coords_other.exec(coordsString);
         matchSuccess = checkMatch(match);
+        // we need an extra check here for things that matched that shouldn't have
+        if (match.filter(x => x).length <= 5) {
+            throw new Error("invalid coordinates format");
+        }
         if (matchSuccess) {
             ddLat = Math.abs(parseInt(match[2]));
             if (match[4]) {
                 ddLat += match[4].replace(',', '.') / 60;
+                originalFormat = "DM";
             }
             if (match[6]) {
                 ddLat += match[6].replace(',', '.') / 3600;
+                originalFormat = "DMS";
             }
             if (parseInt(match[2]) < 0) {
                 ddLat = -1 * ddLat;
@@ -209,6 +225,13 @@ function converter(coordsString, decimalPlaces) {
         if (latdir && latdir == lngdir) {
             throw new Error("invalid coordinates format");
         }
+        // a bit of tidying up...
+        if (ddLat.toString().includes(',')) {
+            ddLat = ddLat.replace(',', '.');
+        }
+        if (ddLng.toString().includes(',')) {
+            ddLng = ddLng.replace(',', '.');
+        }
         //make sure the signs and cardinal directions match
         let patt = /S|SOUTH/i;
         if (patt.test(latdir)) {
@@ -284,13 +307,6 @@ function converter(coordsString, decimalPlaces) {
         if (/^\d+$/.test(verbatimLat) || /^\d+$/.test(verbatimLng)) {
             throw new Error('degree only coordinate/s provided');
         }
-        // last bit of tidying up...
-        if (isNaN(ddLat) && ddLat.includes(',')) {
-            ddLat = ddLat.replace(',', '.');
-        }
-        if (isNaN(ddLng) && ddLng.includes(',')) {
-            ddLng = ddLng.replace(',', '.');
-        }
         //all done!!
         //just truncate the decimals appropriately
         ddLat = Number(Number(ddLat).toFixed(decimalPlaces));
@@ -302,6 +318,7 @@ function converter(coordsString, decimalPlaces) {
             decimalLatitude: ddLat,
             decimalLongitude: ddLng,
             decimalCoordinates: `${ddLat},${ddLng}`,
+            originalFormat,
             closeEnough: coordsCloseEnough,
             toCoordinateFormat: toCoordinateFormat_js_1.default
         });
@@ -360,6 +377,9 @@ function decimalsCloseEnough(dec1, dec2) {
     }
 }
 function coordsCloseEnough(coordsToTest) {
+    if (!coordsToTest) {
+        throw new Error('coords must be provided');
+    }
     if (coordsToTest.includes(',')) {
         const coords = coordsToTest.split(',');
         if (Number(coords[0]) == NaN || Number(coords[1]) == NaN) {

package/dist/cjs/regex.d.ts

@@ -1,3 +1,4 @@
+export const dm_invalid: RegExp;
 export const dm_numbers: RegExp;
 export const dd_re: RegExp;
 export const dms_periods: RegExp;

package/dist/cjs/regex.js

@@ -1,19 +1,22 @@
 "use strict";
 //Coordinates pattern matching regex
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.coords_other = exports.dms_abbr = exports.dms_periods = exports.dd_re = exports.dm_numbers = void 0;
+exports.coords_other = exports.dms_abbr = exports.dms_periods = exports.dd_re = exports.dm_numbers = exports.dm_invalid = void 0;
+//DM with invalid minutes (goes to coords_other); this is just a shortened version of that to create a guard condition
+const dm_invalid = /^(NORTH|SOUTH|[NS])?\s*([+-]?[0-8]?[0-9])\s*([•º°\.:]|D(?:EG)?(?:REES)?)?\s*,?([6-9][0-9])\s*(['′´’\.:]|M(?:IN)?(?:UTES)?)?\s*(NORTH|SOUTH|[NS])?(?:\s*[,/;]\s*|\s*)(EAST|WEST|[EW])?\s*([+-]?[0-1]?[0-9]?[0-9])\s*([•º°\.:]|D(?:EG)?(?:REES)?)?\s*,?([6-9][0-9])\s*(['′´’\.:]|M(?:IN)?(?:UTES)?)?\s*(EAST|WEST|[EW])?$/i;
+exports.dm_invalid = dm_invalid;
 //DM as numbers only - see issue #15
-const dm_numbers = /([+-]?[0-8]?[0-9])\s+([0-5]?[0-9]\.\d{3,})[\s,]{1,}([+-]?[0-1]?[0-9]?[0-9])\s+([0-5]?[0-9]\.\d{3,})/;
+const dm_numbers = /^([+-]?[0-8]?[0-9])\s+([0-5]?[0-9]\.\d{3,})[\s,]{1,}([+-]?[0-1]?[0-9]?[0-9])\s+([0-5]?[0-9]\.\d{3,})$/;
 exports.dm_numbers = dm_numbers;
 //decimal degrees
-const 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;
+const 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;
 exports.dd_re = dd_re;
 //degrees minutes seconds with '.' as separator - gives array with 15 values
-const 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;
+const 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;
 exports.dms_periods = dms_periods;
 //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
-const 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;
+const 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;
 exports.dms_abbr = dms_abbr;
 //everything else - gives array of 17 values 
-const 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 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;
 exports.coords_other = coords_other;

package/dist/cjs/tests/failFormats.js

@@ -21,6 +21,9 @@ const failingFormats = [
     'S 90°4\'17.698" S 23°4\'17.698"',
     '27.45.34 S S 23.23.23',
     '27.45.34  23.23.23 E',
-    '8°83S 35°67E '
+    '8°83S 35°67E ',
+    '25.62S, 27.77E',
+    '-254.4602, 31.53681',
+    '1234.524234234, 1241.1541241234',
 ];
 exports.default = failingFormats;

package/dist/cjs/tests/testIndividual.js

@@ -9,21 +9,20 @@ const converter_js_1 = __importDefault(require("../converter.js"));
 //const test = `45°5'46.8134"N, 18°30'36.7124"E`
 //const test = `50 8.2914,-5 2.4447`
 //const test = `8°83S 35°67E`
-const test = `N 48° 30,6410', E 18° 57,4583'`;
+//const test = `N 48° 30,6410', E 18° 57,4583'`
+//const test = '-254.4602, 31.53681'
+const test = '25.62S, 27.77E';
+//const correctDecimals = '-25.533333, 27.283333'
+let converted;
 try {
-    let converted = (0, converter_js_1.default)(test);
-    console.log(converted);
-    console.log(converted.toCoordinateFormat(converter_js_1.default.to.DM));
-    //and just to make sure it's frozen
-    let previous = converted.decimalLatitude;
-    converted.decimalLatitude = 24;
-    if (converted.decimalLatitude === previous) {
-        console.log('the result is frozen');
-    }
-    else {
-        console.error('!!!The result is not frozen!!!!');
-    }
+    converted = (0, converter_js_1.default)(test);
 }
 catch (err) {
     console.log(err.message);
+    process.exit();
+}
+console.log(converted);
+console.log('DM:', converted.toCoordinateFormat(converter_js_1.default.to.DM).replace(/\s/g, '')); // shortened format
+if (!converted.closeEnough(correctDecimals)) {
+    console.error('!!! conversion is incorrect !!!');
 }

package/dist/cjs/tests/testformats.js

@@ -363,6 +363,13 @@ const otherFormats = [
         verbatimLongitude: `E 18° 57,4583'`,
         decimalLatitude: 48.51068,
         decimalLongitude: 18.95764
+    },
+    {
+        verbatimCoordinates: `1.23456, 18.33453`,
+        verbatimLatitude: `1.23456`,
+        verbatimLongitude: `18.33453`,
+        decimalLatitude: 1.23456,
+        decimalLongitude: 18.33453
     }
 ];
 function getAllTestFormats() {

package/dist/cjs/toCoordinateFormat.js

@@ -28,8 +28,12 @@ function toCoordinateFormat(format) {
         const minutesLatitudeNotTruncated = (absoluteLatitude - degreesLatitude) * 60;
         const minutesLongitudeNotTruncated = (absoluteLongitude - degreesLongitude) * 60;
         if (format == 'DM') {
-            const dmMinsLatitude = round(minutesLatitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
-            const dmMinsLongitude = round(minutesLongitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
+            let dmMinsLatitude = round(minutesLatitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
+            let dmMinsLongitude = round(minutesLongitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
+            if (dmMinsLatitude.endsWith('.000') && dmMinsLongitude.endsWith('.000')) {
+                dmMinsLatitude = dmMinsLatitude.replace(/\.000$/, '');
+                dmMinsLongitude = dmMinsLongitude.replace(/\.000$/, '');
+            }
             result = `${degreesLatitude}° ${dmMinsLatitude}' ${latDir}, ${degreesLongitude}° ${dmMinsLongitude}' ${longDir}`;
         }
         if (format == "DMS") {
@@ -40,9 +44,9 @@ function toCoordinateFormat(format) {
             const latMinutesString = latMinutes.toString().padStart(2, '0');
             const longMinutesString = longMinutes.toString().padStart(2, '0');
             // if they both end in .0 we drop the .0
-            if (latSeconds.endsWith('.0"') && longSeconds.endsWith('.0"')) {
-                latSeconds = latSeconds.replace(/\.0"$/, '"');
-                longSeconds = longSeconds.replace(/\.0"$/, '"');
+            if (latSeconds.endsWith('.0') && longSeconds.endsWith('.0')) {
+                latSeconds = latSeconds.replace(/\.0$/, '');
+                longSeconds = longSeconds.replace(/\.0$/, '');
             }
             result = `${degreesLatitude}° ${latMinutesString}' ${latSeconds}" ${latDir}, ${degreesLongitude}° ${longMinutesString}' ${longSeconds}" ${longDir}`;
         }

package/dist/mjs/converter.js

@@ -1,6 +1,6 @@
 //function for converting coordinates from a string to decimal and verbatim
 //this is just a comment
-import { dm_numbers, dd_re, dms_periods, dms_abbr, coords_other } from './regex.js';
+import { dm_invalid, dm_numbers, dd_re, dms_periods, dms_abbr, coords_other } from './regex.js';
 import toCoordinateFormat from './toCoordinateFormat.js';
 /**
  * Function for converting coordinates in a variety of formats to decimal coordinates
@@ -18,8 +18,12 @@ function converter(coordsString, decimalPlaces) {
     let ddLng = null;
     let latdir = "";
     let lngdir = "";
+    let originalFormat = null;
     let match = [];
     let matchSuccess = false;
+    if (dm_invalid.test(coordsString)) {
+        throw new Error("invalid coordinate value");
+    }
     if (dm_numbers.test(coordsString)) {
         match = dm_numbers.exec(coordsString);
         matchSuccess = checkMatch(match);
@@ -32,6 +36,7 @@ function converter(coordsString, decimalPlaces) {
             if (Number(match[3]) < 0) {
                 ddLng *= -1;
             }
+            originalFormat = "DM";
         }
         else {
             throw new Error("invalid coordinate format");
@@ -50,6 +55,7 @@ function converter(coordsString, decimalPlaces) {
             if (ddLng.includes(',')) {
                 ddLng = ddLng.replace(',', '.');
             }
+            originalFormat = "DD";
             //validation, we don't want things like 23.00000
             //some more validation: no zero coords or degrees only
             if (Number(Math.round(ddLat)) == Number(ddLat)) {
@@ -79,9 +85,11 @@ function converter(coordsString, decimalPlaces) {
             ddLat = Math.abs(parseInt(match[2]));
             if (match[4]) {
                 ddLat += match[4] / 60;
+                originalFormat = "DM";
             }
             if (match[6]) {
                 ddLat += match[6].replace(',', '.') / 3600;
+                originalFormat = "DMS";
             }
             if (parseInt(match[2]) < 0) {
                 ddLat = -1 * ddLat;
@@ -117,9 +125,11 @@ function converter(coordsString, decimalPlaces) {
             ddLat = Math.abs(parseInt(match[2]));
             if (match[4]) {
                 ddLat += match[4] / 60;
+                originalFormat = "DM";
             }
             if (match[6]) {
                 ddLat += match[6] / 3600;
+                originalFormat = "DMS";
             }
             if (parseInt(match[2]) < 0) {
                 ddLat = -1 * ddLat;
@@ -151,13 +161,19 @@ function converter(coordsString, decimalPlaces) {
     else if (coords_other.test(coordsString)) {
         match = coords_other.exec(coordsString);
         matchSuccess = checkMatch(match);
+        // we need an extra check here for things that matched that shouldn't have
+        if (match.filter(x => x).length <= 5) {
+            throw new Error("invalid coordinates format");
+        }
         if (matchSuccess) {
             ddLat = Math.abs(parseInt(match[2]));
             if (match[4]) {
                 ddLat += match[4].replace(',', '.') / 60;
+                originalFormat = "DM";
             }
             if (match[6]) {
                 ddLat += match[6].replace(',', '.') / 3600;
+                originalFormat = "DMS";
             }
             if (parseInt(match[2]) < 0) {
                 ddLat = -1 * ddLat;
@@ -204,6 +220,13 @@ function converter(coordsString, decimalPlaces) {
         if (latdir && latdir == lngdir) {
             throw new Error("invalid coordinates format");
         }
+        // a bit of tidying up...
+        if (ddLat.toString().includes(',')) {
+            ddLat = ddLat.replace(',', '.');
+        }
+        if (ddLng.toString().includes(',')) {
+            ddLng = ddLng.replace(',', '.');
+        }
         //make sure the signs and cardinal directions match
         let patt = /S|SOUTH/i;
         if (patt.test(latdir)) {
@@ -279,13 +302,6 @@ function converter(coordsString, decimalPlaces) {
         if (/^\d+$/.test(verbatimLat) || /^\d+$/.test(verbatimLng)) {
             throw new Error('degree only coordinate/s provided');
         }
-        // last bit of tidying up...
-        if (isNaN(ddLat) && ddLat.includes(',')) {
-            ddLat = ddLat.replace(',', '.');
-        }
-        if (isNaN(ddLng) && ddLng.includes(',')) {
-            ddLng = ddLng.replace(',', '.');
-        }
         //all done!!
         //just truncate the decimals appropriately
         ddLat = Number(Number(ddLat).toFixed(decimalPlaces));
@@ -297,6 +313,7 @@ function converter(coordsString, decimalPlaces) {
             decimalLatitude: ddLat,
             decimalLongitude: ddLng,
             decimalCoordinates: `${ddLat},${ddLng}`,
+            originalFormat,
             closeEnough: coordsCloseEnough,
             toCoordinateFormat
         });
@@ -355,6 +372,9 @@ function decimalsCloseEnough(dec1, dec2) {
     }
 }
 function coordsCloseEnough(coordsToTest) {
+    if (!coordsToTest) {
+        throw new Error('coords must be provided');
+    }
     if (coordsToTest.includes(',')) {
         const coords = coordsToTest.split(',');
         if (Number(coords[0]) == NaN || Number(coords[1]) == NaN) {

package/dist/mjs/regex.d.ts

@@ -1,3 +1,4 @@
+export const dm_invalid: RegExp;
 export const dm_numbers: RegExp;
 export const dd_re: RegExp;
 export const dms_periods: RegExp;

package/dist/mjs/regex.js

@@ -1,12 +1,14 @@
 //Coordinates pattern matching regex
+//DM with invalid minutes (goes to coords_other); this is just a shortened version of that to create a guard condition
+const dm_invalid = /^(NORTH|SOUTH|[NS])?\s*([+-]?[0-8]?[0-9])\s*([•º°\.:]|D(?:EG)?(?:REES)?)?\s*,?([6-9][0-9])\s*(['′´’\.:]|M(?:IN)?(?:UTES)?)?\s*(NORTH|SOUTH|[NS])?(?:\s*[,/;]\s*|\s*)(EAST|WEST|[EW])?\s*([+-]?[0-1]?[0-9]?[0-9])\s*([•º°\.:]|D(?:EG)?(?:REES)?)?\s*,?([6-9][0-9])\s*(['′´’\.:]|M(?:IN)?(?:UTES)?)?\s*(EAST|WEST|[EW])?$/i;
 //DM as numbers only - see issue #15
-const dm_numbers = /([+-]?[0-8]?[0-9])\s+([0-5]?[0-9]\.\d{3,})[\s,]{1,}([+-]?[0-1]?[0-9]?[0-9])\s+([0-5]?[0-9]\.\d{3,})/;
+const dm_numbers = /^([+-]?[0-8]?[0-9])\s+([0-5]?[0-9]\.\d{3,})[\s,]{1,}([+-]?[0-1]?[0-9]?[0-9])\s+([0-5]?[0-9]\.\d{3,})$/;
 //decimal degrees
-const 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;
+const 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
-const 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;
+const 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
-const 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;
+const 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 
-const 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;
-export { dm_numbers, dd_re, dms_periods, dms_abbr, coords_other };
+const 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;
+export { dm_invalid, dm_numbers, dd_re, dms_periods, dms_abbr, coords_other };

package/dist/mjs/tests/failFormats.js

@@ -19,6 +19,9 @@ const failingFormats = [
     'S 90°4\'17.698" S 23°4\'17.698"',
     '27.45.34 S S 23.23.23',
     '27.45.34  23.23.23 E',
-    '8°83S 35°67E '
+    '8°83S 35°67E ',
+    '25.62S, 27.77E',
+    '-254.4602, 31.53681',
+    '1234.524234234, 1241.1541241234',
 ];
 export default failingFormats;

package/dist/mjs/tests/testIndividual.js

@@ -4,21 +4,20 @@ import convert from '../converter.js';
 //const test = `45°5'46.8134"N, 18°30'36.7124"E`
 //const test = `50 8.2914,-5 2.4447`
 //const test = `8°83S 35°67E`
-const test = `N 48° 30,6410', E 18° 57,4583'`;
+//const test = `N 48° 30,6410', E 18° 57,4583'`
+//const test = '-254.4602, 31.53681'
+const test = '25.62S, 27.77E';
+//const correctDecimals = '-25.533333, 27.283333'
+let converted;
 try {
-    let converted = convert(test);
-    console.log(converted);
-    console.log(converted.toCoordinateFormat(convert.to.DM));
-    //and just to make sure it's frozen
-    let previous = converted.decimalLatitude;
-    converted.decimalLatitude = 24;
-    if (converted.decimalLatitude === previous) {
-        console.log('the result is frozen');
-    }
-    else {
-        console.error('!!!The result is not frozen!!!!');
-    }
+    converted = convert(test);
 }
 catch (err) {
     console.log(err.message);
+    process.exit();
+}
+console.log(converted);
+console.log('DM:', converted.toCoordinateFormat(convert.to.DM).replace(/\s/g, '')); // shortened format
+if (!converted.closeEnough(correctDecimals)) {
+    console.error('!!! conversion is incorrect !!!');
 }

package/dist/mjs/tests/testformats.js

@@ -361,6 +361,13 @@ const otherFormats = [
         verbatimLongitude: `E 18° 57,4583'`,
         decimalLatitude: 48.51068,
         decimalLongitude: 18.95764
+    },
+    {
+        verbatimCoordinates: `1.23456, 18.33453`,
+        verbatimLatitude: `1.23456`,
+        verbatimLongitude: `18.33453`,
+        decimalLatitude: 1.23456,
+        decimalLongitude: 18.33453
     }
 ];
 function getAllTestFormats() {

package/dist/mjs/toCoordinateFormat.js

@@ -26,8 +26,12 @@ function toCoordinateFormat(format) {
         const minutesLatitudeNotTruncated = (absoluteLatitude - degreesLatitude) * 60;
         const minutesLongitudeNotTruncated = (absoluteLongitude - degreesLongitude) * 60;
         if (format == 'DM') {
-            const dmMinsLatitude = round(minutesLatitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
-            const dmMinsLongitude = round(minutesLongitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
+            let dmMinsLatitude = round(minutesLatitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
+            let dmMinsLongitude = round(minutesLongitudeNotTruncated, 3).toFixed(3).padStart(6, '0');
+            if (dmMinsLatitude.endsWith('.000') && dmMinsLongitude.endsWith('.000')) {
+                dmMinsLatitude = dmMinsLatitude.replace(/\.000$/, '');
+                dmMinsLongitude = dmMinsLongitude.replace(/\.000$/, '');
+            }
             result = `${degreesLatitude}° ${dmMinsLatitude}' ${latDir}, ${degreesLongitude}° ${dmMinsLongitude}' ${longDir}`;
         }
         if (format == "DMS") {
@@ -38,9 +42,9 @@ function toCoordinateFormat(format) {
             const latMinutesString = latMinutes.toString().padStart(2, '0');
             const longMinutesString = longMinutes.toString().padStart(2, '0');
             // if they both end in .0 we drop the .0
-            if (latSeconds.endsWith('.0"') && longSeconds.endsWith('.0"')) {
-                latSeconds = latSeconds.replace(/\.0"$/, '"');
-                longSeconds = longSeconds.replace(/\.0"$/, '"');
+            if (latSeconds.endsWith('.0') && longSeconds.endsWith('.0')) {
+                latSeconds = latSeconds.replace(/\.0$/, '');
+                longSeconds = longSeconds.replace(/\.0$/, '');
             }
             result = `${degreesLatitude}° ${latMinutesString}' ${latSeconds}" ${latDir}, ${degreesLongitude}° ${longMinutesString}' ${longSeconds}" ${longDir}`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-coordinates-parser",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "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.",
   "type": "module",
   "main": "./dist/cjs/merge.js",