Fire page now shows also false positives

imports/api/ActiveFires/server/publications.js

@@ -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 { whichAreFalsePositives } from '/imports/api/FalsePositives/server/publications';
-import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify';
 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 falsePos = whichAreFalsePositives(fires);
-    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]);
     return [fires, falsePos];
   }
 

imports/api/FalsePositives/FalsePositives.js

@@ -34,4 +34,15 @@ FalsePositives.schema = new SimpleSchema({
 
 FalsePositives.attachSchema(FalsePositives.schema);
 
+export const falsePositivesRemap = (odoc) => {
+  const doc = odoc;
+  const geo = doc.geo;
+  doc.lat = geo.coordinates[1];
+  doc.lon = geo.coordinates[0];
+  doc._id = doc.fireId;
+  doc.id = doc.fireId;
+  delete doc.geo;
+  return doc;
+};
+
 export default FalsePositives;

imports/api/FalsePositives/server/publications.js

@@ -5,6 +5,8 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { NumberBetween } from '/imports/modules/server/other-checks';
+import L from 'leaflet-headless';
+import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify';
 import FalsePositives from '../FalsePositives';
 
 const counter = new Counter('countFalsePositives', FalsePositives.find({}));
@@ -13,6 +15,33 @@ Meteor.publish('falsePositivesTotal', function total() {
   return counter;
 });
 
+export const whichAreFalsePositives = (fires) => {
+  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.find({
+    geo: {
+      $geoWithin: {
+        $geometry: result[0].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 falsePositives = (northEastLng, northEastLat, southWestLng, southWestLat) => {
   const fires = FalsePositives.find({
     geo: {

imports/api/Fires/server/publications.js

@@ -9,6 +9,7 @@ import NodeGeocoder from 'node-geocoder';
 import { gmapServerKey } from '/imports/startup/server/IPGeocoder';
 import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires';
 import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts';
+import { whichAreFalsePositives } from '/imports/api/FalsePositives/server/publications';
 import FiresCollection from '../Fires';
 
 function findFire(unsealed) {
@@ -114,13 +115,14 @@ Meteor.publish('fireFromId', function fireFromId(_id) {
     const fire = FiresCollection.find(new Meteor.Collection.ObjectID(_id));
     if (fire.count() !== 0) {
       // console.info(`Archive fire found: ${_id}`);
-      return fire;
+      const falsePos = whichAreFalsePositives(fire);
+      return [fire, falsePos];
     }
     console.info(`Fire not found: ${_id}`);
     // Not found in active fires!
     return this.ready();
   } catch (e) {
-    console.info(`Active fire not found (with error): ${_id}`);
+    console.info(`Archive fire not found (with error): ${_id}`);
     return this.ready();
   }
 });

imports/ui/pages/Fires/Fires.js

@@ -6,7 +6,7 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { withTracker } from 'meteor/react-meteor-data';
 import { translate, Trans } from 'react-i18next';
-import { FormGroup } from 'react-bootstrap';
+import { Row, Col, Alert, FormGroup } from 'react-bootstrap';
 import { Meteor } from 'meteor/meteor';
 import { Bert } from 'meteor/themeteorchef:bert';
 import { Helmet } from 'react-helmet';
@@ -15,10 +15,12 @@ import Blaze from 'meteor/gadicc:blaze-react-component';
 import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers';
 import NotFound from '/imports/ui/pages/NotFound/NotFound';
 import FiresCollection from '/imports/api/Fires/Fires';
+import FireList from '/imports/ui/components/Maps/FireList';
 import FromNow from '/imports/ui/components/FromNow/FromNow';
 import { dateLongFormat } from '/imports/api/Common/dates';
 import '/imports/startup/client/comments';
 import FalsePositiveTypes from '/imports/api/FalsePositives/FalsePositiveTypes';
+import FalsePositivesCollection, { falsePositivesRemap } from '/imports/api/FalsePositives/FalsePositives';
 import ShareIt from '/imports/ui/components/ShareIt/ShareIt';
 import './Fires.scss';
 
@@ -67,6 +69,7 @@ class Fire extends React.Component {
     const {
       notfound, loading, fire, t
     } = this.props;
+    if (Meteor.isDevelopment) console.log(`False positives total: ${this.props.falsePositives.length}`);
     /* console.log(`loading fire: ${loading}`);
      * console.log(`Not found fire: ${notfound}`); */
     if (fire && fire.when) {
@@ -105,6 +108,15 @@ class Fire extends React.Component {
                    radius={fire.scan ? fire.scan * 1000 : 300}
                />
              </Fragment>
+             <FireList
+                 t={t}
+                 history={this.props.history}
+                 fires={this.props.falsePositives}
+                 scale
+                 useMarkers
+                 nasa={false}
+                 falsePositives
+             />
              <DefMapLayers />
            </Map>
            <p>{t('Coordenadas:')} {fire.lat}, {fire.lon}</p>
@@ -119,6 +131,11 @@ class Fire extends React.Component {
 
              {(fire.type !== 'vecinal') &&
               <Fragment>
+                <Row>
+                  <Col>
+                    <Alert bsStyle="success"><Trans>Parece que este fuego no es un fuego forestal.</Trans></Alert>
+                  </Col>
+                </Row>
                 <h5>{t('¿No es un fuego forestal?')}</h5>
                 <div>
                   <Trans>Indícanos de que tipo de fuego se trata y ayúdanos así a mejorar nuestras notificaciones:</Trans>
@@ -172,6 +189,7 @@ Fire.propTypes = {
   history: PropTypes.object.isRequired,
   loading: PropTypes.bool.isRequired,
   notfound: PropTypes.bool.isRequired,
+  falsePositives: PropTypes.arrayOf(PropTypes.object).isRequired,
   fromHash: PropTypes.bool.isRequired,
   active: PropTypes.bool.isRequired,
   alert: PropTypes.bool.isRequired,
@@ -211,11 +229,13 @@ const FireContainer = withTracker(({ match }) => {
   const notfound = !loading && FiresCollection.find().count() === 0;
   /* console.log(`loading fire: ${loading}`);
    * console.log(`Not found fire: ${notfound}`); */
+  const falsePositives = FalsePositivesCollection.find().fetch().map(falsePositivesRemap);
   return {
     loading,
     active,
     alert,
     fromHash,
+    falsePositives,
     fire: FiresCollection.findOne(),
     notfound,
     when: subscription.ready() && FiresCollection.findOne() ? FiresCollection.findOne().when : null

imports/ui/pages/FiresMap/FiresMap.js

@@ -27,7 +27,7 @@ import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers';
 import FromNow from '/imports/ui/components/FromNow/FromNow';
 import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires';
 import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts';
-import FalsePositivesCollection from '/imports/api/FalsePositives/FalsePositives';
+import FalsePositivesCollection, { falsePositivesRemap } from '/imports/api/FalsePositives/FalsePositives';
 import SiteSettings from '/imports/api/SiteSettings/SiteSettings';
 import { isNotHomeAndMobile, isChrome } from '/imports/ui/components/Utils/isMobile';
 import { isHome } from '/imports/ui/components/Utils/location';
@@ -185,9 +185,8 @@ class FiresMap extends React.Component {
     console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'}, zoom ${this.state.viewport.zoom}, map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`);
     const title = `${t('AppName')}: ${t('Fuegos activos')}`;
 
-    if (Meteor.isDevelopment) {
+    if (Meteor.isDevelopment) console.log(`False positives total: ${this.props.falsePositives.length}`);
-      console.log(`False positives total: ${this.props.falsePositives.length}`);
+
-    }
     return (
       /* Large number of markers:
          https://stackoverflow.com/questions/43015854/large-dataset-of-markers-or-dots-in-leaflet/43019740#43019740 */
@@ -375,16 +374,7 @@ export default translate([], { wait: true })(withTracker(() => {
   const userSubs = SiteSettings.findOne({ name: 'subs-public-union' });
   const userSubsBounds = SiteSettings.findOne({ name: 'subs-public-union-bounds' });
   const fireAlerts = FireAlertsCollection.find().fetch();
-  const falsePositives = FalsePositivesCollection.find().fetch().map((odoc) => {
+  const falsePositives = FalsePositivesCollection.find().fetch().map(falsePositivesRemap);
-    const doc = odoc;
-    const geo = doc.geo;
-    doc.lat = geo.coordinates[1];
-    doc.lon = geo.coordinates[0];
-    doc._id = doc.fireId;
-    doc.id = doc.fireId;
-    delete doc.geo;
-    return doc;
-  });
   return {
     loading: !subscription ? true : !(subscription.ready() && settingsSubs.ready() && alertSubscription.ready()),
     userSubs: userSubs ? userSubs.value : null,

public/locales/en/common.json

@@ -206,5 +206,7 @@
   "Reintentar ahora":
   "Retry now",
   "Feedback recibido, gracias...":
-  "Feedback received, thanks..."
+  "Feedback received, thanks...",
+  "Parece que este fuego no es un fuego forestal.":
+  "It seems that this is not a forest fire."
 }

public/locales/es/common.json

@@ -293,5 +293,7 @@
   "Reintentar ahora":
   "Reintentar ahora",
   "Feedback recibido, gracias...":
-  "Feedback recibido, gracias..."
+  "Feedback recibido, gracias...",
+  "Parece que este fuego no es un fuego forestal.":
+  "Parece que este fuego no es un fuego forestal."
 }