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

FireStats class

Browse source
This commit is contained in:
vjrj 2018-05-01 17:42:13 +02:00
parent 395ee855dd
commit 1d0ad9c41b
2 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
imports/ui/pages/FiresMap/FireStats.js Normal file
View file

@ -0,0 +1,29 @@
/* eslint-disable react/jsx-indent-props */
/* eslint-disable import/no-absolute-path */
/* eslint-disable import/no-absolute-path */
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { translate, Trans } from 'react-i18next';
import FromNow from '/imports/ui/components/FromNow/FromNow';
class FireStats extends Component {
render() {
return (
<Fragment>
{ this.props.lastCheck && this.props.lastFireDetected &&
<Trans>Actualizado <FromNow when={this.props.lastCheck} />, último fuego detectado <FromNow when={this.props.lastFireDetected.when} />.</Trans>}
</Fragment>
);
}
}
FireStats.propTypes = {
lastFireDetected: PropTypes.object,
lastCheck: PropTypes.instanceOf(Date)
};
FireStats.defaultProps = {
};
export default translate([], { wait: true })(FireStats);

16
imports/ui/pages/FiresMap/FiresMap.js
View file

@ -37,7 +37,7 @@ import ShareIt from '/imports/ui/components/ShareIt/ShareIt';
import FullScreenMap from '/imports/ui/components/Maps/FullScreenMap'; import FullScreenMap from '/imports/ui/components/Maps/FullScreenMap';
import LocationAutocomplete from '/imports/ui/components/LocationAutocomplete/LocationAutocomplete'; import LocationAutocomplete from '/imports/ui/components/LocationAutocomplete/LocationAutocomplete';
import Gkeys from '/imports/startup/client/Gkeys'; import Gkeys from '/imports/startup/client/Gkeys';
import FireStats from './FireStats';
import './FiresMap.scss'; import './FiresMap.scss';
const MAXZOOM = 6; const MAXZOOM = 6;
@ -74,7 +74,6 @@ class FiresMap extends React.Component {
this.onViewportChanged = this.onViewportChanged.bind(this); this.onViewportChanged = this.onViewportChanged.bind(this);
this.onMoveEnd = this.onMoveEnd.bind(this); this.onMoveEnd = this.onMoveEnd.bind(this);
this.onMoveStart = this.onMoveStart.bind(this); this.onMoveStart = this.onMoveStart.bind(this);
this.fireStats = this.fireStats.bind(this);
} }
componentDidMount() { componentDidMount() {
@ -196,15 +195,6 @@ class FiresMap extends React.Component {
} }
} }
fireStats() {
return (
<Fragment>
{ this.props.lastCheck && this.props.lastFireDetected &&
<Trans>Actualizado <FromNow when={this.props.lastCheck} />, último fuego detectado <FromNow when={this.props.lastFireDetected.when} />.</Trans>}
</Fragment>
);
}
render() { render() {
const { t } = this.props; const { t } = this.props;
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}`); 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}`);
@ -253,8 +243,8 @@ class FiresMap extends React.Component {
<Col xs={12} sm={6} md={6} lg={6} > <Col xs={12} sm={6} md={6} lg={6} >
<p className="firesmap-legend"> <p className="firesmap-legend">
{ (this.props.activefires.length + this.props.firealerts.length) === 0 ? { (this.props.activefires.length + this.props.firealerts.length) === 0 ?
<Fragment><Trans parent="span" i18nKey="noActiveFireInMapCount">No hay fuegos activos en esta zona del mapa. <strong>{{ countTotal: this.props.activefirestotal }}</strong> fuegos activos en el mundo.</Trans> {this.fireStats()}</Fragment> : <Fragment><Trans parent="span" i18nKey="noActiveFireInMapCount">No hay fuegos activos en esta zona del mapa. <strong>{{ countTotal: this.props.activefirestotal }}</strong> fuegos activos en el mundo.</Trans> <FireStats {... this.props} /></Fragment> :
<Fragment><Trans parent="span" i18nKey="activeFireInMapCount">En rojo, <strong>{{ count: this.props.activefires.length + this.props.firealerts.length }}</strong> fuegos activos. <strong>{{ countTotal: this.props.activefirestotal }}</strong> fuegos activos en el mundo.</Trans> {this.fireStats()}</Fragment> <Fragment><Trans parent="span" i18nKey="activeFireInMapCount">En rojo, <strong>{{ count: this.props.activefires.length + this.props.firealerts.length }}</strong> fuegos activos. <strong>{{ countTotal: this.props.activefirestotal }}</strong> fuegos activos en el mundo.</Trans> <FireStats {... this.props} /></Fragment>
} }
</p> </p>
{isNotHomeAndMobile() && this.props.firealerts.length > 0 && {isNotHomeAndMobile() && this.props.firealerts.length > 0 &&