Skip to content
Snippets Groups Projects
Commit 42a939f8 authored by M3034's avatar M3034
Browse files

Merge branch 'map-position-on-load' into 'development'

Map centers to game's center on load

See merge request !44
parents 849bdd8c 13388abd
No related branches found
No related tags found
2 merge requests!46Development to testing,!44Map centers to game's center on load
...@@ -146,7 +146,10 @@ export default class GameView extends React.Component { ...@@ -146,7 +146,10 @@ export default class GameView extends React.Component {
}; };
render() { 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 ( return (
<div> <div>
<Link to="/"> <Link to="/">
...@@ -223,20 +226,22 @@ export default class GameView extends React.Component { ...@@ -223,20 +226,22 @@ export default class GameView extends React.Component {
gameId={this.state.gameInfo.id} gameId={this.state.gameInfo.id}
/> />
)} )}
<UserMap {initialPosition && (
position={initialPosition} <UserMap
zoom={this.state.zoom} position={initialPosition}
mapUrl={this.state.mapUrl} zoom={this.state.zoom}
currentGameId={this.state.gameInfo.id} mapUrl={this.state.mapUrl}
socketSignal={ currentGameId={this.state.gameInfo.id}
this.state.socketSignal === null socketSignal={
? null this.state.socketSignal === null
: this.state.socketSignal.type ? null
} : this.state.socketSignal.type
role={this.state.role} }
> role={this.state.role}
<NotificationPopup socketSignal={this.state.socketSignal} /> >
</UserMap> <NotificationPopup socketSignal={this.state.socketSignal} />
</UserMap>
)}
{this.state.form === "edit" && ( {this.state.form === "edit" && (
<EditGameForm <EditGameForm
gameId={this.state.gameInfo.id} gameId={this.state.gameInfo.id}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment