Merge branch 'hide-drawtools' into 'development'

Hide drawing tools

See merge request !36

src/components/GameView.js

@@ -175,6 +175,7 @@ export default class GameView extends React.Component {
               mapUrl={this.state.mapUrl}
               currentGameId={this.state.gameInfo.id}
               socketSignal={this.state.socketSignal}
+              role={this.state.role}
             />
             {this.state.form === "edit" && (
               <EditGameForm

src/components/Socket.js

@@ -47,7 +47,6 @@ export default class ClientSocket extends React.Component {
 
     // set the socket to listen gameId-thread
     socket.on(this.props.gameId, data => {
-      console.log(data);
       this.props.getSocketSignal(data.type);
       // check socket update type
       this.setState({ update: data.type });

src/components/UserMap.js

@@ -162,12 +162,15 @@ class UserMap extends Component {
           url={this.props.mapUrl}
         />
         <ZoomControl position="topright" />
-        <DrawTools
-          position={this.props.position}
-          sendGeoJSON={this.sendGeoJSON}
-          geoJSONLayer={this.state.geoJSONLayer}
-          currentGameId={this.props.currentGameId}
-        />
+        {(this.props.role === "admin" ||
+          this.props.role === "factionleader") && (
+          <DrawTools
+            position={this.props.position}
+            sendGeoJSON={this.sendGeoJSON}
+            geoJSONLayer={this.state.geoJSONLayer}
+            currentGameId={this.props.currentGameId}
+          />
+        )}
         {this.state.ownLat !== null && (
           <Marker position={[this.state.ownLat, this.state.ownLng]}>
             <Popup>