From df47bef794cde7c566fe43591d2fdb8fe065e932 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Sat, 15 Sep 2018 10:27:03 +0200
Subject: [PATCH] Fix API now using track

---
 imports/api/ActiveFires/server/countFires.js      | 2 ++
 imports/api/ActiveFires/server/publications.js    | 3 ++-
 imports/api/FalsePositives/server/publications.js | 4 +++-
 imports/api/FireAlerts/server/publications.js     | 3 ++-
 imports/api/Rest/Rest.js                          | 5 ++++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/imports/api/ActiveFires/server/countFires.js b/imports/api/ActiveFires/server/countFires.js
index 39008da..b3b8511 100644
--- a/imports/api/ActiveFires/server/countFires.js
+++ b/imports/api/ActiveFires/server/countFires.js
@@ -32,7 +32,9 @@ const findFiresInRegion = (zone) => {
 export const countRealFires = (firesCursor) => {
   const realFires = [];
   firesCursor.forEach((fire) => {
+    if (debug) console.log(`${JSON.stringify(fire)} -----`);
     const union = firesUnion([fire]);
+    if (debug) console.log(`${JSON.stringify(union)} -----`);
     const falsePos = whichAreFalsePositives(FalsePositives, union);
     const industries = whichAreFalsePositives(Industries, union);
     if (falsePos.count() === 0 && industries.count() === 0) {
diff --git a/imports/api/ActiveFires/server/publications.js b/imports/api/ActiveFires/server/publications.js
index 21e4e5a..03878b3 100644
--- a/imports/api/ActiveFires/server/publications.js
+++ b/imports/api/ActiveFires/server/publications.js
@@ -31,7 +31,8 @@ const activefires = (northEastLng, northEastLat, southWestLng, southWestLat, wit
       lat: 1,
       lon: 1,
       when: 1,
-      scan: 1
+      scan: 1,
+      track: 1
     }
   });
 
diff --git a/imports/api/FalsePositives/server/publications.js b/imports/api/FalsePositives/server/publications.js
index 299cf12..66e26f3 100644
--- a/imports/api/FalsePositives/server/publications.js
+++ b/imports/api/FalsePositives/server/publications.js
@@ -22,11 +22,13 @@ export const firesUnion = (fires) => {
     const isNASA = doc.type === 'modis' || doc.type === 'viirs';
     const pixelSize = doc.type === 'viirs' ? 0.375 : 1; // viirs has 375m pixel size, modis 1000m
     // default 1 km for neightbor alerts
-    return {
+    const map = {
       location: { lat: doc.lat, lon: doc.lon },
       distance: isNASA ? doc.scan * pixelSize : 1,
       distanceY: isNASA ? doc.track * pixelSize : 1
     };
+    // console.log(map);
+    return map;
   });
   const union = calcUnion(L, remap, sub => sub, false);
   return union;
diff --git a/imports/api/FireAlerts/server/publications.js b/imports/api/FireAlerts/server/publications.js
index b0e9412..6642f35 100644
--- a/imports/api/FireAlerts/server/publications.js
+++ b/imports/api/FireAlerts/server/publications.js
@@ -33,7 +33,8 @@ Meteor.publish('fireAlerts', function fireAlerts(northEastLng, northEastLat, sou
     fields: {
       lat: 1,
       lon: 1,
-      scan: 1
+      scan: 1,
+      track: 1
     }
   });
   if (Meteor.isDevelopment) console.log(`Neighbour alerts total: ${fires.count()}`);
diff --git a/imports/api/Rest/Rest.js b/imports/api/Rest/Rest.js
index eda3a1f..ae5e383 100644
--- a/imports/api/Rest/Rest.js
+++ b/imports/api/Rest/Rest.js
@@ -18,6 +18,7 @@ import { Random } from 'meteor/random';
 import { subscriptionsInsert } from '/imports/api/Subscriptions/methods.js';
 import { Mongo } from 'meteor/mongo';
 import { upsertFalsePositive } from '/imports/api/FalsePositives/methods.js';
+
 const debug = false;
 
 const uptime = new Date();
@@ -157,11 +158,13 @@ if (!Meteor.settings.private.internalApiToken) {
         lon: 1,
         when: 1,
         type: 1, // modis, viirs, vecinal
-        scan: 1
+        scan: 1,
+        track: 1
       }
     });
 
     const result = { total: fires.count(), real: countRealFires(fires) };
+    if (debug) console.log(`Query for fires in ${lat}, ${lng} in ${km} km radius ${result}`);
 
     if (!full) {
       return result;