From: David Négrier <d.negrier@thecodingmachine.com>
Date: Sun, 3 May 2020 15:47:54 +0000 (+0200)
Subject: Merge
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9c32c930a0645db420fab2addf3785f1bd870be9;p=libreadventure.git

Merge
---

9c32c930a0645db420fab2addf3785f1bd870be9
diff --cc back/src/Controller/IoSocketController.ts
index 04dea73,560deed..7db6b05
--- a/back/src/Controller/IoSocketController.ts
+++ b/back/src/Controller/IoSocketController.ts
@@@ -44,11 -47,11 +47,11 @@@ export class IoSocketController 
          this.shareUsersPosition();
  
          //don't send only function because the context will be not this
-         this.World = new World((user1 : string, user2 : string) => {
-             this.connectedUser(user1, user2);
-         }, (user1 : string, user2 : string) => {
-             this.disConnectedUser(user1, user2);
+         this.World = new World((user1: string, group: Group) => {
+             this.connectedUser(user1, group);
+         }, (user1: string, group: Group) => {
+             this.disConnectedUser(user1, group);
 -        });
 +        }, MINIMUM_DISTANCE, GROUP_RADIUS);
      }
  
      ioConnection() {
diff --cc back/src/Model/World.ts
index e05879c,b04b34e..19eb8ed
--- a/back/src/Model/World.ts
+++ b/back/src/Model/World.ts
@@@ -6,20 -6,20 +6,24 @@@ import {UserInterface} from "./UserInte
  import {ExSocketInterface} from "_Model/Websocket/ExSocketInterface";
  import {PositionInterface} from "_Model/PositionInterface";
  
+ export type ConnectCallback = (user: string, group: Group) => void;
+ export type DisconnectCallback = (user: string, group: Group) => void;
+ 
  export class World {
 -    static readonly MIN_DISTANCE = 160;
 +    private minDistance: number;
 +    private groupRadius: number;
  
      // Users, sorted by ID
      private users: Map<string, UserInterface>;
      private groups: Group[];
  
-     private connectCallback: (user1: string, user2: string) => void;
-     private disconnectCallback: (user1: string, user2: string) => void;
+     private connectCallback: ConnectCallback;
+     private disconnectCallback: DisconnectCallback;
  
-     constructor(connectCallback: (user1: string, user2: string) => void, disconnectCallback: (user1: string, user2: string) => void,
 -    constructor(connectCallback: ConnectCallback, disconnectCallback: DisconnectCallback)
++    constructor(connectCallback: ConnectCallback,
++                disconnectCallback: DisconnectCallback,
 +                minDistance: number,
 +                groupRadius: number)
      {
          this.users = new Map<string, UserInterface>();
          this.groups = [];