changes for issue #13

gondzo · gondzo · commit a21fee5a6047 · 2016-12-27T22:30:22.000+01:00
diff --git a/src/components/MapHistory/MapHistory.jsx b/src/components/MapHistory/MapHistory.jsx
@@ -8,7 +8,7 @@ import styles from './MapHistory.scss';
 
 const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 
-const tipFormatter = (v) => moment(v).format(DATE_FORMAT);
+const tipFormatter = (v) => moment(v).format(DATE_FORMAT);// eslint-disable-line new-cap
 
 class MapHistory extends React.Component {
   constructor(props) {
@@ -44,7 +44,7 @@ class MapHistory extends React.Component {
 
     // a overlay to translate from pixel to latlng and the reverse
     this.overlay = new google.maps.OverlayView();
-    this.overlay.draw = () => {};
+    this.overlay.draw = _.noop;
     this.overlay.setMap(this.map);
 
     // a info window to show location created date
@@ -58,7 +58,7 @@ class MapHistory extends React.Component {
   // get map's bounds based on locations
   getBounds() {
     const bounds = new google.maps.LatLngBounds();
-    _.each(this.props.locations, (l) => {
+    _.forEach(this.props.locations, (l) => {
       bounds.extend(_.pick(l, 'lat', 'lng'));
     });
     return bounds;
@@ -86,7 +86,7 @@ class MapHistory extends React.Component {
     });
 
     // interpolate start location if not existed
-    _.each(this.props.locations, (l, i, c) => {
+    _.forEach(this.props.locations, (l, i, c) => {
       const time1 = new Date(l.createdAt).getTime();
       if (time1 >= this.dateRange[0]) {
         if (time1 > this.dateRange[0]) {
@@ -104,7 +104,7 @@ class MapHistory extends React.Component {
     });
 
     // interpolate end location if not existed
-    _.eachRight(this.props.locations, (l, i, c) => {
+    _.forEachRight(this.props.locations, (l, i, c) => {
       const time1 = new Date(l.createdAt).getTime();
       if (time1 <= this.dateRange[1]) {
         if (time1 < this.dateRange[1]) {
@@ -128,7 +128,7 @@ class MapHistory extends React.Component {
   filterMarkers() {
     this.omitMarkers = 0;
     let lastMarker;
-    _.each(this.markers, (m) => {
+    _.forEach(this.markers, (m) => {
       if (!lastMarker) {
         lastMarker = m;
         m.setVisible(true);
@@ -166,7 +166,7 @@ class MapHistory extends React.Component {
 
     // clear exsiting markers
     if (this.markers) {
-      _.each(this.markers, (m) => {
+      _.forEach(this.markers, (m) => {
         m.setMap(null);
       });
     }
diff --git a/src/routes/DronesMap/components/DronesMapView.jsx b/src/routes/DronesMap/components/DronesMapView.jsx
@@ -4,6 +4,7 @@ import MarkerClusterer from 'node-js-marker-clusterer';
 import MapHistory from 'components/MapHistory';
 import Info from './Info';
 import styles from './DronesMapView.scss';
+const _ = require('lodash');
 
 const getIcon = (status) => {
   switch (status) {
@@ -38,7 +39,7 @@ class DronesMapView extends React.Component {
     const {drones, mapSettings, showInfo, hideInfo} = this.props;
     this.map = new google.maps.Map(this.node, mapSettings);
     const overlay = new google.maps.OverlayView();
-    overlay.draw = () => {};
+    overlay.draw = _.noop;
     overlay.setMap(this.map);
     const hideInfoWindow = () => {
       this.props.infoDrone && hideInfo();
diff --git a/src/routes/DronesMap/modules/DronesMap.js b/src/routes/DronesMap/modules/DronesMap.js
@@ -35,8 +35,10 @@ export const HIDE_HISTORY = 'DronesMap/HIDE_HISTORY';
 
 // load drones and initialize socket
 export const init = () => async(dispatch) => {
-  const {body: {items: drones}} = await APIService.searchDrones({limit: DRONE_LIMIT});
+  const {body: {items: allDrones}} = await APIService.searchDrones({limit: DRONE_LIMIT});
   lastUpdated = new Date().getTime();
+  const drones = _.filter(allDrones,
+    (d) => d.currentLocation && d.currentLocation.length > 0);
   dispatch({type: DRONES_LOADED, payload: {drones}});
   socket = io(config.socket.url);
   socket.on('dronepositionupdate', (drone) => {
diff --git a/webpack.config.js b/webpack.config.js
@@ -97,11 +97,11 @@ module.exports = {
   },
   plugins: [
     new Dotenv({
-      path: '.env', // if not simply .env 
-      safe: true // lets load the .env.example file as well 
+      path: '.env', // if not simply .env
+      safe: true, // lets load the .env.example file as well
     }),
     new webpack.DefinePlugin({
-      __COVERAGE__: !argv.watch && process.env.NODE_ENV === 'test'
+      __COVERAGE__: !argv.watch && process.env.NODE_ENV === 'test',
     }),
     new HtmlWebpackPlugin({
       GOOGLE_API_KEY: config.GOOGLE_API_KEY,
