From 87b77215e429610bf1ac0c23811bc3c81fac4820 Mon Sep 17 00:00:00 2001
From: Luke Lanchester <luke@lukelanchester.com>
Date: Fri, 3 Aug 2018 18:20:38 +0100
Subject: [PATCH 1/2] Added Haversine distance operation

This operation calculates the great circle distance between two GPS co-ordinates, returning the value
---
 src/core/config/Categories.json             |  1 +
 src/core/operations/HaversineDistance.mjs   | 58 +++++++++++++++++++++
 test/index.mjs                              |  1 +
 test/tests/operations/HaversineDistance.mjs | 22 ++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 src/core/operations/HaversineDistance.mjs
 create mode 100644 test/tests/operations/HaversineDistance.mjs

diff --git a/src/core/config/Categories.json b/src/core/config/Categories.json
index 9078e250..abb25146 100755
--- a/src/core/config/Categories.json
+++ b/src/core/config/Categories.json
@@ -321,6 +321,7 @@
             "Entropy",
             "Frequency distribution",
             "Chi Square",
+            "Haversine distance",
             "Detect File Type",
             "Scan for Embedded Files",
             "Disassemble x86",
diff --git a/src/core/operations/HaversineDistance.mjs b/src/core/operations/HaversineDistance.mjs
new file mode 100644
index 00000000..3e7bc506
--- /dev/null
+++ b/src/core/operations/HaversineDistance.mjs
@@ -0,0 +1,58 @@
+/**
+ * @author Dachande663 [dachande663@gmail.com]
+ * @copyright Crown Copyright 2018
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation";
+import OperationError from "../errors/OperationError";
+
+/**
+ * HaversineDistance operation
+ */
+class HaversineDistance extends Operation {
+
+    /**
+     * HaversineDistance constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Haversine distance";
+        this.module = "Default";
+        this.description = "Returns the distance between two pairs of GPS latitude and longitude co-ordinates in metres.<br><br>e.g. <code>51.487263,-0.124323, 38.9517,-77.1467</code>";
+        this.inputType = "string";
+        this.outputType = "number";
+        this.args = [];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    run(input, args) {
+
+        const values = input.match(/^(-?\d+(\.\d+)?), ?(-?\d+(\.\d+)?), ?(-?\d+(\.\d+)?), ?(-?\d+(\.\d+)?)$/);
+        if (!values) {
+            throw new OperationError("Input must in the format lat1, lng1, lat2, lng2");
+        }
+
+        const lat1 = parseFloat(values[1]);
+        const lng1 = parseFloat(values[3]);
+        const lat2 = parseFloat(values[6]);
+        const lng2 = parseFloat(values[8]);
+
+        const TO_RAD = Math.PI / 180;
+        const dLat = (lat2-lat1) * TO_RAD;
+        const dLng = (lng2-lng1) * TO_RAD;
+        const a = Math.sin(dLat/2) * Math.sin(dLat/2) + Math.cos(lat1 * TO_RAD) * Math.cos(lat2 * TO_RAD) * Math.sin(dLng/2) * Math.sin(dLng/2);
+        const metres = 6371000 * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+
+        return metres;
+
+    }
+
+}
+
+export default HaversineDistance;
diff --git a/test/index.mjs b/test/index.mjs
index f9cbac7e..e06a1470 100644
--- a/test/index.mjs
+++ b/test/index.mjs
@@ -44,6 +44,7 @@ import "./tests/operations/ConditionalJump";
 import "./tests/operations/Register";
 import "./tests/operations/Comment";
 import "./tests/operations/Hash";
+import "./tests/operations/HaversineDistance";
 import "./tests/operations/Hexdump";
 import "./tests/operations/Image";
 import "./tests/operations/MorseCode";
diff --git a/test/tests/operations/HaversineDistance.mjs b/test/tests/operations/HaversineDistance.mjs
new file mode 100644
index 00000000..dc10492b
--- /dev/null
+++ b/test/tests/operations/HaversineDistance.mjs
@@ -0,0 +1,22 @@
+/**
+ * Haversine distance tests.
+ *
+ * @author Dachande663 [dachande663@gmail.com]
+ * @copyright Crown Copyright 2018
+ * @license Apache-2.0
+ */
+import TestRegister from "../../TestRegister";
+
+TestRegister.addTests([
+    {
+        name: "Haversine distance",
+        input: "51.487263,-0.124323, 38.9517,-77.1467",
+        expectedOutput: "5619355.701829259",
+        recipeConfig: [
+            {
+                "op": "Haversine distance",
+                "args": []
+            }
+        ],
+    }
+]);

From ff59a9d13014b300a2d10091845bbdba5f90da8d Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 3 Aug 2018 21:18:53 +0100
Subject: [PATCH 2/2] Moved Haversine Distance operation in categories

---
 src/core/config/Categories.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/config/Categories.json b/src/core/config/Categories.json
index abb25146..7c234d0e 100755
--- a/src/core/config/Categories.json
+++ b/src/core/config/Categories.json
@@ -321,7 +321,6 @@
             "Entropy",
             "Frequency distribution",
             "Chi Square",
-            "Haversine distance",
             "Detect File Type",
             "Scan for Embedded Files",
             "Disassemble x86",
@@ -329,6 +328,7 @@
             "Generate UUID",
             "Generate TOTP",
             "Generate HOTP",
+            "Haversine distance",
             "Render Image",
             "Remove EXIF",
             "Extract EXIF",