comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fire page now shows also false positives

Browse source
This commit is contained in:
vjrj 2018-02-20 07:55:26 +01:00
parent c962d12374
commit f0bf995584
8 changed files with 77 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

32
imports/api/ActiveFires/server/publications.js
View file

@ -4,10 +4,8 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import L from 'leaflet-headless';
import { NumberBetween } from '/imports/modules/server/other-checks';
import FalsePositives from '/imports/api/FalsePositives/FalsePositives';
import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify';
import { whichAreFalsePositives } from '/imports/api/FalsePositives/server/publications';
import ActiveFires from '../ActiveFires';
const counter = new Counter('countActiveFires', ActiveFires.find({}));
@ -16,27 +14,6 @@ Meteor.publish('activefirestotal', function total() {
return counter;
});
const falsePositives = (fires) => {
const falsePos = FalsePositives.find({
geo: {
$geoWithin: {
$geometry: fires.geometry
}
}
}, {
fields: {
geo: 1,
// type: 1,
// when: 1,
fireId: 1
}
});
/* console.log(`False positive total: ${falsePos.count()}`);
console.log(`False positives: ${JSON.stringify(falsePos.fetch())}`); */
return falsePos;
};
const activefires = (northEastLng, northEastLat, southWestLng, southWestLat, withMarks) => {
const fires = ActiveFires.find({
ourid: {
@ -60,12 +37,7 @@ const activefires = (northEastLng, northEastLat, southWestLng, southWestLat, wit
// console.log(`Fires total: ${fires.count()}`);
if (withMarks && fires.fetch().length > 0) {
const group = new L.FeatureGroup();
const remap = fires.fetch().map(function remap(doc) {
return { location: { lat: doc.lat, lon: doc.lon }, distance: doc.scan };
});
const result = calcUnion(remap, group, sub => sub);
const falsePos = falsePositives(result[0]);
const falsePos = whichAreFalsePositives(fires);
return [fires, falsePos];
}