Merge

diff --cc back/src/Controller/IoSocketController.ts
index 04dea735e53e604ab0599292728d5ee0f8421d6f,560deed7be7520719cd7bab7d43154a2ce74085f..7db6b0597da2daf2260a2fac15fa313178a38b5c
--- 1/back/src/Controller/IoSocketController.ts
--- 2/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/Group.ts
Simple merge

diff --cc back/src/Model/World.ts
index e05879c10b5575eed00e6e6d40e8aa49b0707e65,b04b34ee8a6a5d6217c203825fceafa664073d64..19eb8ed890e30458ef5b9917dae3526023ba1dea
--- 1/back/src/Model/World.ts
--- 2/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 = [];

diff --cc back/tests/WorldTest.ts
Simple merge