From ad886a9f79d49ddf148e9e5a5e3d11157aa8a1a0 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Mon, 15 Oct 2018 22:58:51 +1300
Subject: [PATCH] Fixed first point not being pushed to the end of the array
 properly

---
 api/v1/api.js           | 2 +-
 api/v1/areaFunctions.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/v1/api.js b/api/v1/api.js
index 72645a9..d7752f0 100644
--- a/api/v1/api.js
+++ b/api/v1/api.js
@@ -50,7 +50,7 @@ module.exports = {
                 if (distance < 20) {
                     if (lastPoint.lat != firstPoint.lat || lastPoint.lng != firstPoint.lng) {
                         // points.pop();
-                        points.push({lat: firstPoint.lat, lng: lastPoint.lng});
+                        points.push({lat: firstPoint.lat, lng: firstPoint.lng});
                     }
                     areaFunctions.collatePolygons(res, gameID, userID, points);
                 } else {
diff --git a/api/v1/areaFunctions.js b/api/v1/areaFunctions.js
index 5a6f5f5..c2926ae 100644
--- a/api/v1/areaFunctions.js
+++ b/api/v1/areaFunctions.js
@@ -85,7 +85,7 @@ module.exports = {
             let polygonResult = [];
             let polygonsMerged = [];
             polygons.map((polygon) => {
-                if (polygon.coords[0].lat != polygon.coords[polygon.coords.length - 1].lat &&
+                if (polygon.coords[0].lat != polygon.coords[polygon.coords.length - 1].lat ||
                     polygon.coords[0].lng != polygon.coords[polygon.coords.length - 1].lng) {
                         polygon.coords.push({lat: polygon.coords[0].lat, lng: polygon.coords[0].lng})
                 }