From 2477c985d6cf95cdefd086cfabbecd6fe1608b78 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 15 Feb 2018 18:10:38 +0100 Subject: [PATCH] Added popup to alerts --- imports/api/Fires/server/publications.js | 19 +++++++++++++++++++ imports/ui/components/Maps/FireList.js | 2 +- imports/ui/components/Maps/FirePixel.js | 18 ++++++++++++++---- imports/ui/components/Maps/FirePopup.js | 2 +- imports/ui/layouts/App/App.js | 2 +- imports/ui/pages/Fires/Fires.js | 7 ++++++- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/imports/api/Fires/server/publications.js b/imports/api/Fires/server/publications.js index 575c7af..0f0b80c 100644 --- a/imports/api/Fires/server/publications.js +++ b/imports/api/Fires/server/publications.js @@ -8,6 +8,7 @@ import { Promise } from 'meteor/promise'; 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 FiresCollection from '../Fires'; function findFire(unsealed) { @@ -70,6 +71,24 @@ const findOrCreateFire = (obj) => { return findFire(obj); }; +Meteor.publish('fireFromAlertId', function fireFromAlertId(_id) { + try { + check(_id, String); + // console.log(`Looking for alert fire ${_id}`); + const fire = FireAlertsCollection.findOne(new Meteor.Collection.ObjectID(_id)); + if (fire) { + // console.info(`Active fire found: ${_id}`); + return findOrCreateFire(fixConfidence(fire)); + } + console.info(`Alert fire not found: ${_id}`); + // Not found in active fires! + return this.ready(); + } catch (e) { + console.info(`Alert fire not found (with error): ${_id}`); + return this.ready(); + } +}); + Meteor.publish('fireFromActiveId', function fireFromActiveId(_id) { try { check(_id, String); diff --git a/imports/ui/components/Maps/FireList.js b/imports/ui/components/Maps/FireList.js index f4a851c..ecf22f1 100644 --- a/imports/ui/components/Maps/FireList.js +++ b/imports/ui/components/Maps/FireList.js @@ -18,7 +18,7 @@ export default function FireList(props) { if (useMarks) { items = fires.map(({ _id, ...otherProps }) => ()); } else if (usePixel && !falsePositives) { - items = fires.map(({ _id, ...otherProps }) => ()); + items = fires.map(({ _id, ...otherProps }) => ()); } else if (!falsePositives) { items = fires.map(({ _id, ...otherProps }) => ()); } diff --git a/imports/ui/components/Maps/FirePixel.js b/imports/ui/components/Maps/FirePixel.js index 57f2092..c81b547 100644 --- a/imports/ui/components/Maps/FirePixel.js +++ b/imports/ui/components/Maps/FirePixel.js @@ -3,9 +3,13 @@ import React from 'react'; import { CircleMarker } from 'react-leaflet'; import PropTypes from 'prop-types'; +import FirePopup from './FirePopup'; +import { translate } from 'react-i18next'; /* Less acurate (1 pixel per fire) but faster */ -const FirePixel = ({ lat, lon, nasa }) => ( +const FirePixel = ({ + lat, lon, nasa, id, when, t, history +}) => ( ( fillOpacity="1" fill radius={nasa ? 1 : 2} - /> + > + + ); FirePixel.propTypes = { lat: PropTypes.number.isRequired, lon: PropTypes.number.isRequired, - nasa: PropTypes.bool.isRequired + id: PropTypes.object.isRequired, + history: PropTypes.object.isRequired, + when: PropTypes.instanceOf(Date), + nasa: PropTypes.bool.isRequired, + t: PropTypes.func.isRequired }; -export default FirePixel; +export default translate([], { wait: true })(FirePixel); diff --git a/imports/ui/components/Maps/FirePopup.js b/imports/ui/components/Maps/FirePopup.js index 8e7d2a8..c917a6b 100644 --- a/imports/ui/components/Maps/FirePopup.js +++ b/imports/ui/components/Maps/FirePopup.js @@ -22,7 +22,7 @@ const FirePopup = ({ {when && {t('Detectado')}: {moment(when).fromNow()}
 } { /* if nasa === null means that the is a false positive fire */ } - history.push(`/fire/${nasa ? 'active' : 'archive'}/${id}`)}>{t('Más información sobre este fuego')} + history.push(`/fire/${nasa ? 'active' : 'alert'}/${id}`)}>{t('Más información sobre este fuego')} diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js index 7e14c91..e80d8cc 100644 --- a/imports/ui/layouts/App/App.js +++ b/imports/ui/layouts/App/App.js @@ -116,7 +116,7 @@ const App = props => ( - + diff --git a/imports/ui/pages/Fires/Fires.js b/imports/ui/pages/Fires/Fires.js index fe423a5..a892181 100644 --- a/imports/ui/pages/Fires/Fires.js +++ b/imports/ui/pages/Fires/Fires.js @@ -35,7 +35,7 @@ class Fire extends React.Component { componentWillReceiveProps(nextProps) { if (this.props.when !== nextProps.when || this.props.loading !== nextProps.loading || this.props.notfound !== nextProps.notfound) { // console.log(`Next when ${nextProps.when}`); - if (nextProps.fire && (nextProps.active || nextProps.fromHash)) { + if (nextProps.fire && (nextProps.alert || nextProps.active || nextProps.fromHash)) { // change url to archive with new _id nextProps.history.replace(`/fire/archive/${nextProps.fire._id}`); } @@ -173,6 +173,7 @@ Fire.propTypes = { notfound: PropTypes.bool.isRequired, fromHash: PropTypes.bool.isRequired, active: PropTypes.bool.isRequired, + alert: PropTypes.bool.isRequired, when: PropTypes.instanceOf(Date), fire: PropTypes.object }; @@ -188,10 +189,13 @@ const FireContainer = withTracker(({ match }) => { let subscription; const active = fireType === 'active'; const archive = fireType === 'archive'; + const alert = fireType === 'alert'; let fromHash = false; if (active) { subscription = Meteor.subscribe('fireFromActiveId', id); + } else if (alert) { + subscription = Meteor.subscribe('fireFromAlertId', id); } else if (archive) { subscription = Meteor.subscribe('fireFromId', id); } else { @@ -209,6 +213,7 @@ const FireContainer = withTracker(({ match }) => { return { loading, active, + alert, fromHash, fire: FiresCollection.findOne(), notfound,