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

Removed loading in FireMap. Improve data retrieving

Browse source
This commit is contained in:
vjrj 2018-02-17 09:30:44 +01:00
parent f5d105fbc0
commit 79222eb978
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import FireList from '/imports/ui/components/Maps/FireList';
import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion'; import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion';
import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers'; import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers';
import FromNow from '/imports/ui/components/FromNow/FromNow'; import FromNow from '/imports/ui/components/FromNow/FromNow';
import Loading from '/imports/ui/components/Loading/Loading';
import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires'; import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires';
import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts'; import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts';
import FalsePositivesCollection from '/imports/api/FalsePositives/FalsePositives'; import FalsePositivesCollection from '/imports/api/FalsePositives/FalsePositives';
@ -127,13 +126,13 @@ class FiresMap extends React.Component {
mapSize.set([bounds.getNorthEast(), bounds.getSouthWest()]); mapSize.set([bounds.getNorthEast(), bounds.getSouthWest()]);
store.set('firesmap_center', viewport.center); store.set('firesmap_center', viewport.center);
store.set('firesmap_zoom', viewport.zoom); store.set('firesmap_zoom', viewport.zoom);
if (viewport.zoom >= this.state.viewport.zoom) { if (viewport.zoom > this.state.viewport.zoom) {
this.state.viewport = viewport;
if (Meteor.isDevelopment) console.log('Don\'t query we are in the same point'); if (Meteor.isDevelopment) console.log('Don\'t query we are in the same point');
return; return;
} }
zoom.set(viewport.zoom); zoom.set(viewport.zoom);
center.set(viewport.center); center.set(viewport.center);
// this.setState({ viewport });
this.state.viewport = viewport; this.state.viewport = viewport;
} }
} }
@ -185,6 +184,7 @@ class FiresMap extends React.Component {
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}`);
const title = `${t('AppName')}: ${t('Fuegos activos')}`; 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}`);
} }
@ -199,11 +199,6 @@ class FiresMap extends React.Component {
<title>{title}</title> <title>{title}</title>
<meta name="description" content={t('Fuegos activos en el mundo actualizados en tiempo real')} /> <meta name="description" content={t('Fuegos activos en el mundo actualizados en tiempo real')} />
</Helmet> } </Helmet> }
{this.props.loading || !this.props.subsready ?
<Row className="align-items-center justify-content-center">
<Loading />
</Row>
: ''}
<h4 className="page-header"><Trans parent="span">Fuegos activos</Trans></h4> <h4 className="page-header"><Trans parent="span">Fuegos activos</Trans></h4>
<Row> <Row>
<Col xs={12} sm={6} md={6} lg={6} > <Col xs={12} sm={6} md={6} lg={6} >