From 2d229fc7bcb68f5049f0d3df1648fbbded36aab5 Mon Sep 17 00:00:00 2001
From: Sylvain Gay <sgay@clipper.ens.fr>
Date: Wed, 14 Sep 2022 14:14:52 +0200
Subject: [PATCH] solved #8

---
 static/admin.html    |  2 +-
 static/conscrit.html |  2 +-
 static/utils.js      | 22 +++++++++-------------
 traque.js            |  4 +---
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/static/admin.html b/static/admin.html
index a5e904b..7e62780 100644
--- a/static/admin.html
+++ b/static/admin.html
@@ -57,7 +57,7 @@
                 	markers[data.id].setOpacity(0);
 				else
                     if(data.color == -1)
-                        markers[data.id].setIcon(icon_invisible);
+                        markers[data.id].setIcon(self_invisible);
                     else
 					    markers[data.id].setIcon(icons[data.color]);
 			}
diff --git a/static/conscrit.html b/static/conscrit.html
index 90e4563..ae810db 100644
--- a/static/conscrit.html
+++ b/static/conscrit.html
@@ -26,7 +26,7 @@
 	<div id="map"></div><br/>
 
 	<input id="name"/><button id="setName">Set team name</button><br/>
-	<input id="message"/><button id="sendMessage">Send message to base</button><br/>
+	<input id="message"/><button id="sendMessage">Enter code</button><br/>
 
 	<script type="text/javascript">
 		//////////////////////////////////////////////////////////////////////////////
diff --git a/static/utils.js b/static/utils.js
index 45a305a..a03e9cd 100644
--- a/static/utils.js
+++ b/static/utils.js
@@ -13,19 +13,13 @@ var icons = [
         iconUrl: 'def.png',
         iconSize: [10, 10],
         iconAnchor: [5, 5],
-        popupAnchor: [5, 5],
-        //shadowUrl: 'my-icon-shadow.png',
-        //shadowSize: [68, 95],
-        //shadowAnchor: [22, 94]
+        popupAnchor: [5, 5]
     }),
     L.icon({
         iconUrl: 'track.png',
         iconSize: [10, 10],
         iconAnchor: [5, 5],
-        popupAnchor: [5, 5],
-        //shadowUrl: 'my-icon-shadow.png',
-        //shadowSize: [68, 95],
-        //shadowAnchor: [22, 94]
+        popupAnchor: [5, 5]
     })
 ];
 var self_icons = icons;
@@ -34,10 +28,7 @@ var self_invisible =
         iconUrl: 'invi.png',
         iconSize: [10, 10],
         iconAnchor: [5, 5],
-        popupAnchor: [5, 5],
-        //shadowUrl: 'my-icon-shadow.png',
-        //shadowSize: [68, 95],
-        //shadowAnchor: [22, 94]
+        popupAnchor: [5, 5]
     });
 
 //////////////////////////////////////////////////////////////////////////////
@@ -48,7 +39,7 @@ var map;
 function setup_map(){
 	map = L.map('map').setView([48.8448, 2.3550], 13);
 
-	L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+	L.tileLayer('https://stamen-tiles.a.ssl.fastly.net/toner/{z}/{x}/{y}.png', {
 	    maxZoom: 19,
 	    attribution: '© OpenStreetMap'
 	}).addTo(map);
@@ -88,6 +79,11 @@ function setup_socket_common(){
 		if(data.id in markers)
 			markers[data.id].bindPopup(data.name);
 	});
+
+	socket.on("remove", function(data){
+		if(data.id in markers)
+			markers[data.id].remove();
+	});
 }
 
 function setup_socket_not_admin(){
diff --git a/traque.js b/traque.js
index 26bbd3a..31bd09f 100644
--- a/traque.js
+++ b/traque.js
@@ -143,10 +143,8 @@ io.sockets.on('connection', function(socket){
             equipes[i].emit('setName', {"id": socket.id, "name": d.name});
     });
     socket.on("disconnect", function(_){
-        socket.shown = false;
-        socket.color = -1;
         for(i in equipes)
-            equipes[i].emit('changeColor', {"id": socket.id, "color": -1});
+            equipes[i].emit('remove', {"id": socket.id});
     });
 
     socket.emit('yourId', {"id": socket.id});