infosecn1nja
/
CyberChef
mirror of https://github.com/infosecn1nja/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'j433866-coords-fix'

master
n1474335 2019-02-08 15:52:40 +00:00
parent 6f8a5ea1be 3209c94622
commit 4dc5a1499a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/lib/ConvertCoordinates.mjs
View File

@ -72,7 +72,7 @@ export function convertCoordinates (input, inFormat, inDelim, outFormat, outDeli
if (inDelim === null) { if (inDelim === null) {
throw new OperationError("Unable to detect the input delimiter automatically."); throw new OperationError("Unable to detect the input delimiter automatically.");
} }
} else { } else if (!inDelim.includes("Direction")) {
// Convert the delimiter argument value to the actual character // Convert the delimiter argument value to the actual character
inDelim = realDelim(inDelim); inDelim = realDelim(inDelim);
} }
@ -89,7 +89,16 @@ export function convertCoordinates (input, inFormat, inDelim, outFormat, outDeli
outDelim = realDelim(outDelim); outDelim = realDelim(outDelim);
if (!NO_CHANGE.includes(inFormat)) { if (!NO_CHANGE.includes(inFormat)) {
if (inDelim.includes("Direction")) {
// Split on directions
split = input.split(/[NnEeSsWw]/g);
if (split[0] === "") {
// Remove first element if direction preceding
split = split.slice(1);
}
} else {
split = input.split(inDelim); split = input.split(inDelim);
}
// Replace any co-ordinate symbols with spaces so we can split on them later // Replace any co-ordinate symbols with spaces so we can split on them later
for (let i = 0; i < split.length; i++) { for (let i = 0; i < split.length; i++) {
split[i] = split[i].replace(/[°˝´'"]/g, " "); split[i] = split[i].replace(/[°˝´'"]/g, " ");
@ -196,7 +205,7 @@ export function convertCoordinates (input, inFormat, inDelim, outFormat, outDeli
if (inFormat.includes("Degrees")) { if (inFormat.includes("Degrees")) {
// If the input string contains directions, we need to check if they're S or W. // If the input string contains directions, we need to check if they're S or W.
// If either of the directions are, we should make the decimal value negative // If either of the directions are, we should make the decimal value negative
const dirs = input.match(/[NnEeSsWw]/g); const dirs = input.toUpperCase().match(/[NESW]/g);
if (dirs && dirs.length >= 1) { if (dirs && dirs.length >= 1) {
// Make positive lat/lon values with S/W directions into negative values // Make positive lat/lon values with S/W directions into negative values
if (dirs[0] === "S" || dirs[0] === "W" && latlon.lat > 0) { if (dirs[0] === "S" || dirs[0] === "W" && latlon.lat > 0) {