fanwuyang/SENG440
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed distance ending distance to be larger due to gps inconsistencies

Browse Source
This commit is contained in:
Fan-Wu Yang
2018-10-15 16:32:48 +13:00
parent d7f2051512
commit fe892f7d20
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/api.js
+1 -1
View File
@@ -48,7 +48,7 @@ module.exports = {
let lastPoint = points[points.length - 1]; let lastPoint = points[points.length - 1];
let distance = mathFunc.gpsToMeters(firstPoint.lat, firstPoint.lng, lastPoint.lat, lastPoint.lng); let distance = mathFunc.gpsToMeters(firstPoint.lat, firstPoint.lng, lastPoint.lat, lastPoint.lng);
console.log(distance); console.log(distance);
if (distance < 10) { if (distance < 20) {
if (lastPoint.lat != firstPoint.lat && lastPoint.lng != firstPoint.lng) { if (lastPoint.lat != firstPoint.lat && lastPoint.lng != firstPoint.lng) {
// points.pop(); // points.pop();
points.push({lat: firstPoint.lat, lng: lastPoint.lng}); points.push({lat: firstPoint.lat, lng: lastPoint.lng});
api/v1/areaFunctions.js
+3 -1
View File
@@ -25,7 +25,8 @@ module.exports = {
return polygons return polygons
}, },
submitFinalCollation(res, gameID, userID, points, area, mergedPolygonIDs) { submitFinalCollation(res, gameID, userID, points, area, mergedPolygonIDs) {
query = util.format("CALL insertPolygon(\"%s\", \"%s\", %d)", gameID, userID, area); let query = util.format("CALL insertPolygon(\"%s\", \"%s\", %d)", gameID, userID, area);
console.log(query);
db.get().query(query, function(err, rows) { db.get().query(query, function(err, rows) {
if (err) { if (err) {
console.log(err); console.log(err);
@@ -85,6 +86,7 @@ module.exports = {
let polygonResult = []; let polygonResult = [];
let polygonsMerged = []; let polygonsMerged = [];
polygons.map((polygon) => { polygons.map((polygon) => {
console.log(polygon);
if (polygon[0].lat != polygon[polygon.length - 1].lat && if (polygon[0].lat != polygon[polygon.length - 1].lat &&
polygon[0].lng != polygon[polygon.length - 1].lng) { polygon[0].lng != polygon[polygon.length - 1].lng) {
polygon.push({lat: polygon[0].lat, lng: polygon[0].lng}) polygon.push({lat: polygon[0].lat, lng: polygon[0].lng})