f2f challenge 30056068

chqy24 · gondzo · commit e13e2055344f · 2016-12-28T11:44:30.000+01:00
diff --git a/src/components/MapHistory/MapHistory.jsx b/src/components/MapHistory/MapHistory.jsx
@@ -191,7 +191,7 @@ class MapHistory extends React.Component {
 
       // show info window when mouse hover
       marker.addListener('mouseover', () => {
-        this.infoWindow.setContent(new moment(l.createdAt).format(DATE_FORMAT));
+        this.infoWindow.setContent(new moment(l.createdAt).format(DATE_FORMAT)); // eslint-disable-line new-cap
         this.infoWindow.setPosition(marker.getPosition());
         this.infoWindow.open(this.map);
       });
diff --git a/src/routes/DronesMap/components/DronesMapView.jsx b/src/routes/DronesMap/components/DronesMapView.jsx
@@ -1,10 +1,10 @@
 import React, {PropTypes} from 'react';
+import _ from 'lodash';
 import CSSModules from 'react-css-modules';
 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) {
@@ -77,6 +77,16 @@ class DronesMapView extends React.Component {
     });
     this.id2Marker = id2Marker;
     this.markerCluster = new MarkerClusterer(this.map, markers, {imagePath: '/img/m'});
+
+    navigator.geolocation.getCurrentPosition((pos) => {
+      this.map.setCenter({
+        lat: pos.coords.latitude,
+        lng: pos.coords.longitude,
+      });
+    },
+      null,
+      {timeout: 60000}
+    );
   }
 
   componentWillReceiveProps(nextProps) {
diff --git a/src/routes/DronesMap/modules/DronesMap.js b/src/routes/DronesMap/modules/DronesMap.js
@@ -128,6 +128,9 @@ export default handleActions({
   // it will show the whole globe
   mapSettings: {
     zoom: 3,
-    center: {lat: 0, lng: 0},
+    center: {
+      lat: 0,
+      lng: 0,
+    },
   },
 });
diff --git a/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx b/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx
@@ -81,7 +81,16 @@ export class MissionMap extends Component {
 
   handleMapLoad(map) {
     if (map) {
-      this.fitMapToBounds(map, this.props.markers);
+      // this.fitMapToBounds(map, this.props.markers);
+      navigator.geolocation.getCurrentPosition((pos) => {
+        map.panTo({
+          lat: pos.coords.latitude,
+          lng: pos.coords.longitude,
+        });
+      },
+        null,
+        {timeout: 60000}
+      );
     }
   }
 
