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

# Conflicts: # api/v1/areaFunctions.js
7 years ago · e18aa1f18f
parent e23a46e2ca f286983573
commit e18aa1f18f
1 changed files with 4 additions and 0 deletions
--- a/api/v1/areaFunctions.js
+++ b/api/v1/areaFunctions.js
@ -89,7 +89,11 @@ module.exports = {
                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
                        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) {