geo-coordinates-parser 1.6.2 → 1.6.3

package/dist/cjs/converter.d.ts

@@ -12,4 +12,5 @@ declare namespace converter {
 declare const to: Readonly<{
     DMS: "DMS";
     DM: "DM";
+    DD: "DD";
 }>;

package/dist/cjs/converter.js

@@ -357,7 +357,8 @@ function coordsCloseEnough(coordsToTest) {
 }
 const to = Object.freeze({
     DMS: 'DMS',
-    DM: 'DM'
+    DM: 'DM',
+    DD: 'DD'
 });
 converter.to = to;
 exports.default = converter;

package/dist/cjs/tests/testFormatConverter.js

@@ -3,9 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_js_1 = __importDefault(require("../src/toCoordinateFormat.js/index.js"));
+const toCoordinateFormat_js_1 = __importDefault(require("../toCoordinateFormat.js"));
 let test = {
-    decimalCoordinates: '-234.3456, 28.92435',
-    toCoordinateFormat: index_js_1.default
+    decimalCoordinates: '-24.3456, 28.92435',
+    toCoordinateFormat: toCoordinateFormat_js_1.default
 };
 console.log(test.toCoordinateFormat('DMS'));
+test.decimalCoordinates = '-25.76887,28.26939';
+console.log(test.toCoordinateFormat('DMS'));
+console.log(test.toCoordinateFormat('DM'));
+console.log(test.toCoordinateFormat('DD'));
+test.decimalCoordinates = '-25.815928, 28.070318';
+console.log(test.toCoordinateFormat('DM'));
+test.decimalCoordinates = '-25.000, 28.000';
+console.log(test.toCoordinateFormat('DMS'));
+console.log(test.toCoordinateFormat('DM'));

package/dist/cjs/toCoordinateFormat.d.ts

@@ -3,4 +3,4 @@ export default toCoordinateFormat;
  * Converts decimalCoordinates to other formats commonly used
  * @param {*} format Either DMS or DM
  */
-declare function toCoordinateFormat(format: any): string;
+declare function toCoordinateFormat(format: any): any;

package/dist/cjs/toCoordinateFormat.js

@@ -6,37 +6,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @param {*} format Either DMS or DM
  */
 function toCoordinateFormat(format) {
-    if (!['DMS', 'DM'].includes(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 => x.trim());
-        const convertedLat = convert(parts[0], format, true);
-        const convertedLong = convert(parts[1], format, false);
-        return `${convertedLat}, ${convertedLong}`;
+        if (format == 'DD') {
+            return this.decimalCoordinates;
+        }
+        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"$/, '"');
+        }
+        const latDirection = parts[0] >= 0 ? " N" : " S";
+        const longDirection = parts[1] >= 0 ? " E" : " W";
+        return `${convertedLat + latDirection}, ${convertedLong + longDirection}`;
     }
     else {
         throw new Error('no decimal coordinates to convert');
     }
 }
 //assumes everything is valid...
-function convert(coordString, format, isLatitude) {
-    const coord = Number(coordString);
-    let direction;
-    if (isLatitude) {
-        direction = coord >= 0 ? "N" : "S";
-    }
-    else {
-        direction = coord >= 0 ? "E" : "W";
-    }
+function convert(coord, format) {
     const absolute = Math.abs(coord);
     const degrees = Math.floor(absolute);
     const minutesNotTruncated = (absolute - degrees) * 60;
     if (format == 'DM') {
-        return `${degrees}° ${minutesNotTruncated.toFixed(3).replace(/\.0+$/, '')}' ${direction}`;
+        let dmMins = round(minutesNotTruncated, 3).toFixed(3).padStart(6, '0');
+        return `${degrees}° ${dmMins}'`;
     }
     //else
-    const minutes = Math.floor(minutesNotTruncated);
-    const seconds = ((minutesNotTruncated - minutes) * 60).toFixed(1).replace(/\.0$/, '');
-    return `${degrees}° ${minutes}' ${seconds}" ${direction}`;
+    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;
 }
 exports.default = toCoordinateFormat;

package/dist/mjs/converter.d.ts

@@ -12,4 +12,5 @@ declare namespace converter {
 declare const to: Readonly<{
     DMS: "DMS";
     DM: "DM";
+    DD: "DD";
 }>;

package/dist/mjs/converter.js

@@ -352,7 +352,8 @@ function coordsCloseEnough(coordsToTest) {
 }
 const to = Object.freeze({
     DMS: 'DMS',
-    DM: 'DM'
+    DM: 'DM',
+    DD: 'DD'
 });
 converter.to = to;
 export default converter;

package/dist/mjs/tests/testFormatConverter.js

@@ -1,6 +1,15 @@
-import toCoordinateFormat from '../src/toCoordinateFormat.js/index.js';
+import toCoordinateFormat from '../toCoordinateFormat.js';
 let test = {
-    decimalCoordinates: '-234.3456, 28.92435',
+    decimalCoordinates: '-24.3456, 28.92435',
     toCoordinateFormat
 };
 console.log(test.toCoordinateFormat('DMS'));
+test.decimalCoordinates = '-25.76887,28.26939';
+console.log(test.toCoordinateFormat('DMS'));
+console.log(test.toCoordinateFormat('DM'));
+console.log(test.toCoordinateFormat('DD'));
+test.decimalCoordinates = '-25.815928, 28.070318';
+console.log(test.toCoordinateFormat('DM'));
+test.decimalCoordinates = '-25.000, 28.000';
+console.log(test.toCoordinateFormat('DMS'));
+console.log(test.toCoordinateFormat('DM'));

package/dist/mjs/toCoordinateFormat.d.ts

@@ -3,4 +3,4 @@ export default toCoordinateFormat;
  * Converts decimalCoordinates to other formats commonly used
  * @param {*} format Either DMS or DM
  */
-declare function toCoordinateFormat(format: any): string;
+declare function toCoordinateFormat(format: any): any;

package/dist/mjs/toCoordinateFormat.js

@@ -4,37 +4,45 @@
  * @param {*} format Either DMS or DM
  */
 function toCoordinateFormat(format) {
-    if (!['DMS', 'DM'].includes(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 => x.trim());
-        const convertedLat = convert(parts[0], format, true);
-        const convertedLong = convert(parts[1], format, false);
-        return `${convertedLat}, ${convertedLong}`;
+        if (format == 'DD') {
+            return this.decimalCoordinates;
+        }
+        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"$/, '"');
+        }
+        const latDirection = parts[0] >= 0 ? " N" : " S";
+        const longDirection = parts[1] >= 0 ? " E" : " W";
+        return `${convertedLat + latDirection}, ${convertedLong + longDirection}`;
     }
     else {
         throw new Error('no decimal coordinates to convert');
     }
 }
 //assumes everything is valid...
-function convert(coordString, format, isLatitude) {
-    const coord = Number(coordString);
-    let direction;
-    if (isLatitude) {
-        direction = coord >= 0 ? "N" : "S";
-    }
-    else {
-        direction = coord >= 0 ? "E" : "W";
-    }
+function convert(coord, format) {
     const absolute = Math.abs(coord);
     const degrees = Math.floor(absolute);
     const minutesNotTruncated = (absolute - degrees) * 60;
     if (format == 'DM') {
-        return `${degrees}° ${minutesNotTruncated.toFixed(3).replace(/\.0+$/, '')}' ${direction}`;
+        let dmMins = round(minutesNotTruncated, 3).toFixed(3).padStart(6, '0');
+        return `${degrees}° ${dmMins}'`;
     }
     //else
-    const minutes = Math.floor(minutesNotTruncated);
-    const seconds = ((minutesNotTruncated - minutes) * 60).toFixed(1).replace(/\.0$/, '');
-    return `${degrees}° ${minutes}' ${seconds}" ${direction}`;
+    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;
 }
 export default toCoordinateFormat;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geo-coordinates-parser",
-  "version": "1.6.2",
+  "version": "1.6.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": "merge.js",