geo-coordinates-parser 1.6.6 → 1.7.1

package/dist/mjs/tests/testIndividual.js

@@ -1,7 +1,10 @@
 import convert from '../converter.js';
 //const test = '26°44S 29°46E'
 //const test = '00.00, 01.00'
-const test = `26°05240'S, 27°51448'E`;
+//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'`;
 try {
     let converted = convert(test);
     console.log(converted);

package/dist/mjs/tests/testformats.js

@@ -234,8 +234,8 @@ const coordsRegexFormats = [
         decimalLongitude: 22.75
     }
 ];
+// additional formats we've encountered
 const otherFormats = [
-    // additional formats we've encountered
     {
         verbatimCoordinates: '10.432342S 10.6345345E',
         verbatimLatitude: '10.432342S',
@@ -340,6 +340,27 @@ const otherFormats = [
         verbatimLongitude: 'E 23.23.23',
         decimalLatitude: -27.759444,
         decimalLongitude: 23.38972222
+    },
+    {
+        verbatimCoordinates: '53 16.3863,4 52.8171',
+        verbatimLatitude: '53 16.3863',
+        verbatimLongitude: '4 52.8171',
+        decimalLatitude: 53.273105,
+        decimalLongitude: 4.88029
+    },
+    {
+        verbatimCoordinates: '50 8.2914,-5 2.4447',
+        verbatimLatitude: '50 8.2914',
+        verbatimLongitude: '-5 2.4447',
+        decimalLatitude: 50.13819,
+        decimalLongitude: -5.040745
+    },
+    {
+        verbatimCoordinates: `N 48° 30,6410', E 18° 57,4583'`,
+        verbatimLatitude: `N 48° 30,6410'`,
+        verbatimLongitude: `E 18° 57,4583'`,
+        decimalLatitude: 48.51068,
+        decimalLongitude: 18.95764
     }
 ];
 function getAllTestFormats() {

package/dist/mjs/toCoordinateFormat.d.ts

@@ -1,6 +1,7 @@
 export default toCoordinateFormat;
 /**
- * Converts decimalCoordinates to other formats commonly used
+ * Converts decimalCoordinates to commonly used string formats
+ * Note that this will add degree and direction symbols to decimal coordinates
  * @param {string} format Either DMS or DM
  * @returns {string}
  */

package/dist/mjs/toCoordinateFormat.js

@@ -1,6 +1,7 @@
 //borrowed from https://www.codegrepper.com/code-examples/javascript/javascript+converting+latitude+longitude+to+gps+coordinates
 /**
- * Converts decimalCoordinates to other formats commonly used
+ * Converts decimalCoordinates to commonly used string formats
+ * Note that this will add degree and direction symbols to decimal coordinates
  * @param {string} format Either DMS or DM
  * @returns {string}
  */
@@ -8,40 +9,47 @@ function toCoordinateFormat(format) {
     if (!['DMS', 'DM', 'DD'].includes(format))
         throw new Error('invalid format specified');
     if (this.decimalCoordinates && this.decimalCoordinates.trim()) {
+        const parts = this.decimalCoordinates.split(',').map(x => Number(x.trim()));
+        const decimalLatitude = Number(parts[0]);
+        const decimalLongitude = Number(parts[1]);
+        const absoluteLatitude = Math.abs(decimalLatitude);
+        const absoluteLongitude = Math.abs(decimalLongitude);
+        const latDir = decimalLatitude > 0 ? "N" : "S";
+        const longDir = decimalLongitude > 0 ? "E" : "W";
+        let result;
         if (format == 'DD') {
-            return this.decimalCoordinates;
+            result = `${absoluteLatitude}° ${latDir}, ${absoluteLongitude}° ${longDir}`;
         }
-        const parts = this.decimalCoordinates.split(',').map(x => Number(x.trim()));
-        let convertedLat = convert(parts[0], format, true);
-        let convertedLong = convert(parts[1], format, false);
-        //some custom cleaning for DMS
-        if (convertedLat.endsWith('.0"') && convertedLong.endsWith('.0"')) {
-            convertedLat = convertedLat.replace(/\.0"$/, '"');
-            convertedLong = convertedLong.replace(/\.0"$/, '"');
+        //else we need some more things
+        const degreesLatitude = Math.floor(absoluteLatitude);
+        const degreesLongitude = Math.floor(absoluteLongitude);
+        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');
+            result = `${degreesLatitude}° ${dmMinsLatitude}' ${latDir}, ${degreesLongitude}° ${dmMinsLongitude}' ${longDir}`;
+        }
+        if (format == "DMS") {
+            const latMinutes = Math.floor(minutesLatitudeNotTruncated);
+            const longMinutes = Math.floor(minutesLongitudeNotTruncated);
+            let latSeconds = ((minutesLatitudeNotTruncated - latMinutes) * 60).toFixed(1).padStart(4, '0');
+            let longSeconds = ((minutesLongitudeNotTruncated - longMinutes) * 60).toFixed(1).padStart(4, '0');
+            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"$/, '"');
+            }
+            result = `${degreesLatitude}° ${latMinutesString}' ${latSeconds}" ${latDir}, ${degreesLongitude}° ${longMinutesString}' ${longSeconds}" ${longDir}`;
         }
-        const latDirection = parts[0] >= 0 ? " N" : " S";
-        const longDirection = parts[1] >= 0 ? " E" : " W";
-        return `${convertedLat + latDirection}, ${convertedLong + longDirection}`;
+        return result;
     }
     else {
         throw new Error('no decimal coordinates to convert');
     }
 }
-//assumes everything is valid...
-function convert(coord, format) {
-    const absolute = Math.abs(coord);
-    const degrees = Math.floor(absolute);
-    const minutesNotTruncated = (absolute - degrees) * 60;
-    if (format == 'DM') {
-        let dmMins = round(minutesNotTruncated, 3).toFixed(3).padStart(6, '0');
-        return `${degrees}° ${dmMins}'`;
-    }
-    //else
-    let minutes = Math.floor(minutesNotTruncated);
-    let seconds = ((minutesNotTruncated - minutes) * 60).toFixed(1).padStart(4, '0');
-    minutes = minutes.toString().padStart(2, '0');
-    return `${degrees}° ${minutes}' ${seconds}"`;
-}
 function round(num, places) {
     const d = Math.pow(10, places);
     return Math.round((num + Number.EPSILON) * d) / d;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-coordinates-parser",
-  "version": "1.6.6",
+  "version": "1.7.1",
   "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",
@@ -12,6 +12,7 @@
     }
   },
   "scripts": {
+    "prepack": "npm run build",
     "build": "rd /s /q dist && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && fixup.bat",
     "test": "node test.js"
   },