mirror of
https://github.com/gchq/CyberChef.git
synced 2025-04-22 07:46:16 -04:00
Basically rewrote the whole thing using the new geodesy module
This commit is contained in:
j433866
parent
5e68959c03
commit
d00b0f4c0e
2 changed files with 353 additions and 273 deletions
|
|
@ -5,9 +5,7 @@
|
|||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import OperationError from "../errors/OperationError";
|
||||
import {FORMATS, STRING_FORMATS, convertCoordinates, convertSingleCoordinate, findDelim, findFormat} from "../lib/ConvertCoordinates";
|
||||
import Utils from "../Utils";
|
||||
import {FORMATS, convertCoordinates} from "../lib/ConvertCoordinates";
|
||||
|
||||
/**
|
||||
* Convert co-ordinate format operation
|
||||
|
|
@ -22,7 +20,7 @@ class ConvertCoordinateFormat extends Operation {
|
|||
|
||||
this.name = "Convert co-ordinate format";
|
||||
this.module = "Hashing";
|
||||
this.description = "Convert geographical coordinates between different formats.<br><br>Supported formats:<ul><li>Degrees Minutes Seconds (DMS)</li><li>Degrees Decimal Minutes (DDM)</li><li>Decimal Degrees (DD)</li><li>Geohash</li><li>Military Grid Reference System (MGRS)</li><li>Ordnance Survey National Grid (OSNG)</li></ul>";
|
||||
this.description = "Convert geographical coordinates between different formats.<br><br>Supported formats:<ul><li>Degrees Minutes Seconds (DMS)</li><li>Degrees Decimal Minutes (DDM)</li><li>Decimal Degrees (DD)</li><li>Geohash</li><li>Military Grid Reference System (MGRS)</li><li>Ordnance Survey National Grid (OSNG)</li><li>Universal Transverse Mercator (UTM)</li></ul><br>The operation can try to detect the input co-ordinate format and delimiter automatically, but this may not always work correctly.";
|
||||
this.infoURL = "https://wikipedia.org/wiki/Geographic_coordinate_conversion";
|
||||
this.inputType = "string";
|
||||
this.outputType = "string";
|
||||
|
|
@ -39,6 +37,7 @@ class ConvertCoordinateFormat extends Operation {
|
|||
"Auto",
|
||||
"Direction Preceding",
|
||||
"Direction Following",
|
||||
"Space",
|
||||
"\\n",
|
||||
"Comma",
|
||||
"Semi-colon",
|
||||
|
|
@ -55,14 +54,21 @@ class ConvertCoordinateFormat extends Operation {
|
|||
"type": "option",
|
||||
"value": [
|
||||
"Space",
|
||||
"Direction Preceding",
|
||||
"Direction Following",
|
||||
"\\n",
|
||||
"Comma",
|
||||
"Semi-colon",
|
||||
"Colon"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Include Compass Directions",
|
||||
"type": "option",
|
||||
"value": [
|
||||
"None",
|
||||
"Before",
|
||||
"After"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Precision",
|
||||
"type": "number",
|
||||
|
|
@ -77,148 +83,8 @@ class ConvertCoordinateFormat extends Operation {
|
|||
* @returns {string}
|
||||
*/
|
||||
run(input, args) {
|
||||
const outFormat = args[2],
|
||||
outDelim = args[3],
|
||||
precision = args[4];
|
||||
let inFormat = args[0],
|
||||
inDelim = args[1],
|
||||
inLat,
|
||||
inLong,
|
||||
outLat,
|
||||
outLong,
|
||||
latDir = "",
|
||||
longDir = "",
|
||||
outSeparator = " ";
|
||||
|
||||
// Autodetect input delimiter
|
||||
if (inDelim === "Auto") {
|
||||
inDelim = findDelim(input);
|
||||
if (inDelim === null) {
|
||||
inDelim = "";
|
||||
}
|
||||
} else if (!inDelim.includes("Direction")) {
|
||||
// Get the actual delimiter from the regex
|
||||
inDelim = String(Utils.regexRep(inDelim)).slice(1, 2);
|
||||
}
|
||||
if (inFormat === "Auto") {
|
||||
inFormat = findFormat(input, inDelim);
|
||||
if (inFormat === null) {
|
||||
throw new OperationError("Could not automatically detect the input format.");
|
||||
}
|
||||
}
|
||||
|
||||
if (inDelim === "" && (!STRING_FORMATS.includes(inFormat))) {
|
||||
throw new OperationError("Could not automatically detect the input delimiter.");
|
||||
}
|
||||
|
||||
// Prepare input data
|
||||
if (STRING_FORMATS.includes(inFormat)) {
|
||||
// Geohash only has one value, so just use the input
|
||||
// Replace anything that isn't a valid character in Geohash / MGRS / OSNG
|
||||
inLat = input.replace(/[^A-Za-z0-9]/, "");
|
||||
} else if (inDelim === "Direction Preceding") {
|
||||
// Split on the compass directions
|
||||
const splitInput = input.split(/[NnEeSsWw]/);
|
||||
const dir = input.match(/[NnEeSsWw]/g);
|
||||
if (splitInput.length > 1) {
|
||||
inLat = splitInput[1];
|
||||
if (dir !== null) {
|
||||
latDir = dir[0];
|
||||
}
|
||||
if (splitInput.length > 2) {
|
||||
inLong = splitInput[2];
|
||||
if (dir !== null && dir.length > 1) {
|
||||
longDir = dir[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (inDelim === "Direction Following") {
|
||||
// Split on the compass directions
|
||||
const splitInput = input.split(/[NnEeSsWw]/);
|
||||
if (splitInput.length >= 1) {
|
||||
inLat = splitInput[0];
|
||||
if (splitInput.length >= 2) {
|
||||
inLong = splitInput[1];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Split on the delimiter
|
||||
const splitInput = input.split(inDelim);
|
||||
if (splitInput.length > 0) {
|
||||
inLat = splitInput[0];
|
||||
if (splitInput.length >= 2) {
|
||||
inLong = splitInput[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!STRING_FORMATS.includes(inFormat) && outDelim.includes("Direction")) {
|
||||
// Match on compass directions, and store the first 2 matches for the output
|
||||
const dir = input.match(/[NnEeSsWw]/g);
|
||||
if (dir !== null) {
|
||||
latDir = dir[0];
|
||||
if (dir.length > 1) {
|
||||
longDir = dir[1];
|
||||
}
|
||||
}
|
||||
} else if (outDelim === "\\n") {
|
||||
outSeparator = "\n";
|
||||
} else if (outDelim === "Space") {
|
||||
outSeparator = " ";
|
||||
} else if (!outDelim.includes("Direction")) {
|
||||
// Cut out the regex syntax (/) from the delimiter
|
||||
outSeparator = String(Utils.regexRep(outDelim)).slice(1, 2);
|
||||
}
|
||||
|
||||
// Convert the co-ordinates
|
||||
if (inLat !== undefined) {
|
||||
if (inLong === undefined) {
|
||||
if (!STRING_FORMATS.includes(inFormat)) {
|
||||
if (STRING_FORMATS.includes(outFormat)){
|
||||
throw new OperationError(`${outFormat} needs both a latitude and a longitude to be calculated`);
|
||||
}
|
||||
}
|
||||
if (STRING_FORMATS.includes(inFormat)) {
|
||||
// Geohash conversion is in convertCoordinates despite needing
|
||||
// only one input as it needs to output two values
|
||||
inLat = inLat.replace(/[^A-Za-z0-9]/g, "");
|
||||
[outLat, outLong] = convertCoordinates(inLat, inLat, inFormat, outFormat, precision);
|
||||
} else {
|
||||
outLat = convertSingleCoordinate(inLat, inFormat, outFormat, precision);
|
||||
}
|
||||
} else {
|
||||
[outLat, outLong] = convertCoordinates(inLat, inLong, inFormat, outFormat, precision);
|
||||
}
|
||||
} else {
|
||||
throw new OperationError("No co-ordinates were detected in the input.");
|
||||
}
|
||||
|
||||
// Output conversion results if successful
|
||||
if (outLat !== undefined) {
|
||||
let output = "";
|
||||
if (outDelim === "Direction Preceding" && !STRING_FORMATS.includes(outFormat)) {
|
||||
output += latDir += " ";
|
||||
}
|
||||
output += outLat;
|
||||
if (outDelim === "Direction Following" && !STRING_FORMATS.includes(outFormat)) {
|
||||
output += " " + latDir;
|
||||
}
|
||||
output += outSeparator;
|
||||
|
||||
if (outLong !== undefined && !STRING_FORMATS.includes(outFormat)) {
|
||||
if (outDelim === "Direction Preceding") {
|
||||
output += longDir + " ";
|
||||
}
|
||||
output += outLong;
|
||||
if (outDelim === "Direction Following") {
|
||||
output += " " + longDir;
|
||||
}
|
||||
output += outSeparator;
|
||||
}
|
||||
return output;
|
||||
} else {
|
||||
throw new OperationError("Co-ordinate conversion failed.");
|
||||
}
|
||||
const [inFormat, inDelim, outFormat, outDelim, incDirection, precision] = args;
|
||||
return convertCoordinates(input, inFormat, inDelim, outFormat, outDelim, incDirection, precision);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue