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

Added fire stats in zone to API

Browse source
This commit is contained in:
vjrj 2018-05-20 17:45:25 +02:00
parent 9502ea3604
commit f144c986b7
4 changed files with 68 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
imports/api/ActiveFires/server/countFires.js
View file

@ -29,7 +29,25 @@ const findFiresInRegion = (zone) => {
return result;
};
const countFires = (regions, stringsToRemove) => {
export const countRealFires = (firesCursor) => {
const realFires = [];
firesCursor.forEach((fire) => {
const union = firesUnion([fire]);
const falsePos = whichAreFalsePositives(FalsePositives, union);
const industries = whichAreFalsePositives(Industries, union);
if (falsePos.count() === 0 && industries.count() === 0) {
realFires.push(fire);
}
});
// group fires
const realUnion = firesUnion(realFires);
const unionCount = realUnion[0] &&
realUnion[0].geometry &&
realUnion[0].geometry.coordinates ? realUnion[0].geometry.coordinates.length : 0;
return unionCount;
};
const countFiresInRegions = (regions, stringsToRemove) => {
let total = 0;
const fireStats = {};
@ -41,25 +59,9 @@ const countFires = (regions, stringsToRemove) => {
const fires = findFiresInRegion(region);
// TODO Also check neighbour fires (when better implementation of that part)
const initialCount = fires.count();
let count = initialCount;
if (count > 0) {
const realFires = [];
fires.forEach((fire) => {
const union = firesUnion([fire]);
const falsePos = whichAreFalsePositives(FalsePositives, union);
const industries = whichAreFalsePositives(Industries, union);
if (falsePos.count() === 0 && industries.count() === 0) {
realFires.push(fire);
} else {
count -= 1;
}
});
// group fires
const realUnion = firesUnion(realFires);
const unionCount = realUnion[0] &&
realUnion[0].geometry &&
realUnion[0].geometry.coordinates ? realUnion[0].geometry.coordinates.length : 0;
if (debug) console.log(`${regionName} initial: ${initialCount}, first calc: ${count} union calc: ${unionCount}`);
if (initialCount > 0) {
const unionCount = countRealFires(fires);
if (debug) console.log(`${regionName} initial: ${initialCount}, union calc: ${unionCount}`);
if (unionCount > 0) {
total += unionCount;
fireStats[regionName] = { count: unionCount, code: regionCode };
@ -72,4 +74,4 @@ const countFires = (regions, stringsToRemove) => {
return { total, fires: fireStats };
};
export default countFires;
export default countFiresInRegions;

8
imports/api/ActiveFires/server/tweetFiresInZone.js
View file

@ -4,7 +4,7 @@ import { Meteor } from 'meteor/meteor';
import tbuffer from '@turf/buffer';
import emojiFlags from 'emoji-flags';
import tweet from '/imports/modules/server/twitter';
import countFires from './countFires';
import countFiresInRegions from './countFires';
const debug = false;
@ -103,7 +103,7 @@ const correctTweetSize = (tweetText) => {
};
const tweetEuropeFires = () => {
const resultEu = countFires(europe, [[' ', '']]);
const resultEu = countFiresInRegions(europe, [[' ', '']]);
if (resultEu.total > 0) {
let tweetText = `${tweetHeaders[0].trim()} ${composeEuropeTweet(resultEu.total, resultEu.fires, false)}. More info: https://fires.comunes.org/fires`;
@ -126,8 +126,8 @@ const tweetEuropeFires = () => {
};
const tweetIberiaFires = () => {
const resultEs = countFires(autonomies, stringsToRemoveIberia);
const resultPt = countFires(portugal, stringsToRemoveIberia);
const resultEs = countFiresInRegions(autonomies, stringsToRemoveIberia);
const resultPt = countFiresInRegions(portugal, stringsToRemoveIberia);
const fires = Object.assign(resultEs.fires, resultPt.fires);
const total = resultEs.total + resultPt.total;