From 0804868a565ad5f885daf84fcdc6bc12a323fcc5 Mon Sep 17 00:00:00 2001 From: Kyle Bowerman Date: Mon, 9 Jan 2017 08:54:10 -0600 Subject: [PATCH 1/2] update env --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 21685c1..d0ae28c 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ GOOGLE_API_KEY=AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI -REACT_APP_API_BASE_PATH=http://localhost:3500 +REACT_APP_API_BASE_PATH=https://kb-dsp-server-dev.herokuapp.com REACT_APP_AUTH0_CLIENT_ID=3CGKzjS2nVSqHxHHE64RhvvKY6e0TYpK REACT_APP_AUTH0_CLIENT_DOMAIN=dronetest.auth0.com -REACT_APP_SOCKET_URL=http://localhost:3500 +REACT_APP_SOCKET_URL=https://kb-dsp-server-dev.herokuapp.com From ec9dec12c888e7e161d6ab7736cf4754e0ac4b5b Mon Sep 17 00:00:00 2001 From: Kyle Bowerman Date: Tue, 10 Jan 2017 11:33:14 -0600 Subject: [PATCH 2/2] fix for #44 recenter on currentlocation when mission editor is loaded --- .../components/MissionMap/MissionMap.jsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx b/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx index b6bdb71..9b5243d 100644 --- a/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx +++ b/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx @@ -6,11 +6,12 @@ import NoFlyZone from 'components/NoFlyZone'; import {GOOGLE_MAPS_BOUNDS_TIMEOUT} from 'Const'; import styles from './MissionMap.scss'; +// default center location for mission Planner const mapConfig = { defaultZoom: 13, defaultCenter: { - lat: -6.202180076671433, - lng: 106.83877944946289, + lat: 40.01, + lng: -105.27, }, options: { clickableIcons: false, @@ -85,8 +86,10 @@ export class MissionMap extends Component { handleMapLoad(map) { this.map = map; - if (map) { - // this.fitMapToBounds(map, this.props.markers); + if (map ) { + if ( this.props.markers.length > 0 ) { + this.fitMapToBounds(map, this.props.markers); + } else { navigator.geolocation.getCurrentPosition((pos) => { map.panTo({ lat: pos.coords.latitude, @@ -98,6 +101,7 @@ export class MissionMap extends Component { ); } } + } render() { return (