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

Removed some debug logging

This commit is contained in:
j433866 2019-01-14 13:49:49 +00:00
parent 1a88a0164c
commit b3ac8d0835
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,6 @@ export function findFormat (input, delim) {
const filteredInput = input.replace(/[^A-Za-z0-9]/, "").toUpperCase(); const filteredInput = input.replace(/[^A-Za-z0-9]/, "").toUpperCase();
const mgrsPattern = new RegExp(/^[0-9]{2}[C-HJ-NP-X]{2}[A-Z]+/); const mgrsPattern = new RegExp(/^[0-9]{2}[C-HJ-NP-X]{2}[A-Z]+/);
const geohashPattern = new RegExp(/^[0123456789BCDEFGHJKMNPQRSTUVWXYZ]+$/); const geohashPattern = new RegExp(/^[0123456789BCDEFGHJKMNPQRSTUVWXYZ]+$/);
log.error(filteredInput);
if (mgrsPattern.test(filteredInput)) { if (mgrsPattern.test(filteredInput)) {
return "Military Grid Reference System"; return "Military Grid Reference System";
} else if (geohashPattern.test(filteredInput)) { } else if (geohashPattern.test(filteredInput)) {

8
src/core/operations/ConvertCoordinateFormat.mjs
View File

@ -22,7 +22,7 @@ class ConvertCoordinateFormat extends Operation {
this.name = "Convert co-ordinate format"; this.name = "Convert co-ordinate format";
this.module = "Hashing"; this.module = "Hashing";
this.description = "Convert geographical coordinates between different formats.<br><br>Currently 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></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></ul>";
this.infoURL = "https://wikipedia.org/wiki/Geographic_coordinate_conversion"; this.infoURL = "https://wikipedia.org/wiki/Geographic_coordinate_conversion";
this.inputType = "string"; this.inputType = "string";
this.outputType = "string"; this.outputType = "string";
@ -93,10 +93,8 @@ class ConvertCoordinateFormat extends Operation {
// Autodetect input delimiter // Autodetect input delimiter
if (inDelim === "Auto") { if (inDelim === "Auto") {
inDelim = findDelim(input); inDelim = findDelim(input);
log.error("DATA: " + input + " DELIM: " + inDelim);
if (inDelim === null) { if (inDelim === null) {
inDelim = ""; inDelim = "";
// throw new OperationError("Could not automatically detect the input delimiter.");
} }
} else if (!inDelim.includes("Direction")) { } else if (!inDelim.includes("Direction")) {
// Get the actual delimiter from the regex // Get the actual delimiter from the regex
@ -104,9 +102,8 @@ class ConvertCoordinateFormat extends Operation {
} }
if (inFormat === "Auto") { if (inFormat === "Auto") {
inFormat = findFormat(input, inDelim); inFormat = findFormat(input, inDelim);
log.error("DATA: " + input + " FORMAT: " + inFormat);
if (inFormat === null) { if (inFormat === null) {
throw new OperationError("Could not automatically detect the input"); throw new OperationError("Could not automatically detect the input format.");
} }
} }
@ -147,7 +144,6 @@ class ConvertCoordinateFormat extends Operation {
} else { } else {
// Split on the delimiter // Split on the delimiter
const splitInput = input.split(inDelim); const splitInput = input.split(inDelim);
log.error(splitInput);
if (splitInput.length > 0) { if (splitInput.length > 0) {
inLat = splitInput[0]; inLat = splitInput[0];
if (splitInput.length >= 2) { if (splitInput.length >= 2) {