Merge branch 'camera' of https://eng-git.canterbury.ac.nz/fwy13/territory_walker into camera

api/v1/areaFunctions.js

@@ -87,13 +87,9 @@ module.exports = {
             let polygonsMerged = [];
             polygons.map((polygon) => {
                 console.log(polygon);
-                if (polygon.coords[0].lat != polygon.coords[polygon.length - 1].lat &&
-                    polygon.coords[0].lng != polygon.coords[polygon.length - 1].lng) {
-<<<<<<< HEAD
+                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})
-=======
-                        polygon.coords.push({lat: polygon[0].lat, lng: polygon[0].lng})
->>>>>>> f286983573b5980aa50e49c72893ccc0e1744e45
                 }
                 let intersect = module.exports.checkIntersects(polygonPoints, polygon.coords);
                 if (intersect != null) {