diff --git a/src/components/GameView.js b/src/components/GameView.js index 73f61c60cfb6160af96c32850113f711bb2f2eb7..2215bf242a3920b0c208e8ee0bdf770cdc202c0e 100644 --- a/src/components/GameView.js +++ b/src/components/GameView.js @@ -146,7 +146,10 @@ export default class GameView extends React.Component { }; render() { - const initialPosition = [this.state.lat, this.state.lng]; + console.log(this.state.gameInfo); + const initialPosition = this.state.gameInfo + ? [this.state.gameInfo.center.lat, this.state.gameInfo.center.lng] + : null; return ( <div> <Link to="/"> @@ -223,20 +226,22 @@ export default class GameView extends React.Component { gameId={this.state.gameInfo.id} /> )} - <UserMap - position={initialPosition} - zoom={this.state.zoom} - mapUrl={this.state.mapUrl} - currentGameId={this.state.gameInfo.id} - socketSignal={ - this.state.socketSignal === null - ? null - : this.state.socketSignal.type - } - role={this.state.role} - > - <NotificationPopup socketSignal={this.state.socketSignal} /> - </UserMap> + {initialPosition && ( + <UserMap + position={initialPosition} + zoom={this.state.zoom} + mapUrl={this.state.mapUrl} + currentGameId={this.state.gameInfo.id} + socketSignal={ + this.state.socketSignal === null + ? null + : this.state.socketSignal.type + } + role={this.state.role} + > + <NotificationPopup socketSignal={this.state.socketSignal} /> + </UserMap> + )} {this.state.form === "edit" && ( <EditGameForm gameId={this.state.gameInfo.id}