From 17b4df5c4bf5531caad728bc521b3393b01f2d99 Mon Sep 17 00:00:00 2001
From: catvayor <lubin.bailly@gmail.com>
Date: Fri, 9 Sep 2022 14:43:41 +0200
Subject: [PATCH] added image and made it work with 1 client

---
 def.png   | Bin 0 -> 6059 bytes
 map.html  |  35 +++++++++++++++++++++++++++--------
 track.png | Bin 0 -> 590 bytes
 traque.js |   9 +--------
 4 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 def.png
 create mode 100644 track.png

diff --git a/def.png b/def.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1a2a138e16f7d3c3f22472a1e564198d77fcc94
GIT binary patch
literal 6059
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
aM<5od^`4ZJTQFe*1k=^qrNVh*;{O02V{#Y(

literal 0
HcmV?d00001

diff --git a/map.html b/map.html
index e7ca931..442fc8b 100644
--- a/map.html
+++ b/map.html
@@ -35,11 +35,30 @@
             protocol+"://"+server+":"+port);
 
 		var id = -1;
-		var names = {};
-		var colors = {};
-		var markers = {};
-		var icons = { /* TODO */ };
-		var self_icons = { /* TODO */ };
+		var names = [];
+		var colors = [];
+        var markers = [];
+		var icons = [ 
+            L.icon({
+		        iconUrl: 'def.png',
+		        iconSize: [10, 10],
+		        iconAnchor: [5, 5],
+		        popupAnchor: [5, 5],
+		        //shadowUrl: 'my-icon-shadow.png',
+		        //shadowSize: [68, 95],
+		        //shadowAnchor: [22, 94]
+	        }),
+            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]
+	        })
+        ];
+		var self_icons = icons;
 
 		//////////////////////////////////////////////////////////////////////////////
 		// INIT MAP
@@ -92,8 +111,9 @@
 				else
 					icon = icons[colors[data.id]];
 				markers[data.id] = L.marker(data.position, {"icon": icon}).addTo(map);
-			} else
-				markers[data.id].setLatLng(position);
+            } else{
+                markers[data.id].setLatLng(data.position);
+            }
 		});
 
 		//////////////////////////////////////////////////////////////////////////////
@@ -115,7 +135,6 @@
 		// GEOLOCALISATION
 
 		function geoLoc_success(pos) {
-			console.log(pos);
             socket.emit("geoLoc", {"position": [pos.coords.latitude, pos.coords.longitude]});
 		}
 
diff --git a/track.png b/track.png
new file mode 100644
index 0000000000000000000000000000000000000000..5acc717965c1cbdb9261a2a2d7af55191dde6628
GIT binary patch
literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKg6mP2Rn#31guULL`5963Pq?8YK2xEOfLO`CJjl7
zi=*ILaPVWX>fqw6tAnc`2!4P#Iyou2NQwVT3N2zhIPS;0dyl(!fWKa5su>&yRLwF{
ziMWu-t_q#6=t2lR7)DTHramW%NqCO0d-(Wz7vovp=l&eMO3q|}PavLUx?vG-5KnJf
zI_G`j2rEho@j3CBK^G)`<htzg8|Q+<ex4aI(y4jk2(eITW4Vo4(NKw}h@*<CQNBOp
zvch?bvs$jQ<~{if!#Qnbnd>x%kia6AAVPqQDoQBBLX1|86cZ`hk9+tB9luB}nOr3>
zax9<%6_Voz|AXJ%n)%5IHz^zkI$mu1V+82j1sXNm{yw(t#t9I32ClT0zfuQgK1r{&
zwCEAgw+&oew={VVxZD8-o^;8O94SE4pU(sDXY@^3p#K)=UUPeE?&I_UNK;qI8{ps&
z7%foty2rai?Y;ebrrF;Q7S3{ljcz0100006VoOIv0RI600RN!9r;`8x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru<_QQ3COXaPt=0el02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{001UQL_t&-(_>&j1OFKq{{LrS_>V5m#6TpVzCuQ9?xDy;
ch9Tf<06!rL21nCly8r+H07*qoM6N<$g0fZd8UO$Q

literal 0
HcmV?d00001

diff --git a/traque.js b/traque.js
index d24fa13..ee692c6 100644
--- a/traque.js
+++ b/traque.js
@@ -60,32 +60,25 @@ io.sockets.on('connection', function(socket){
     socket.shown = true;
     socket.color = 0;
 	socket.on('geoLoc', function(d){
-        console.log("new loc :", d);
 	    socket.position = d.position;
         if(socket.shown)
             for(i in equipes)
                 equipes[i].emit('moving', {"id": socket.id, "position": d.position});
 	});
     socket.on('changeColor', function(d){
-        console.log(d);
         socket.color = d.color - 0;
-        console.log("new color2");
         if(d.color == -1)
             socket.shown = false;
         else{
-        console.log("new color3");
             if(!socket.shown)
                 for(i in equipes) 
                     equipes[i].emit('moving', {"id": socket.id, "position": socket.position});
             socket.shown = true;
-        console.log("new color4");
         }
         for(i in equipes) 
             equipes[i].emit('changeColor', {"id": socket.id, "color": d.color});
-        console.log("new color5");
     });
     socket.on('setName', function(d){
-        console.log("new name");
         socket.name = d.name;
         for(i in equipes)
             equipes[i].emit('setName', {"id": socket.id, "name": d.name});
@@ -95,4 +88,4 @@ io.sockets.on('connection', function(socket){
 
 console.log("Launch server");
 server.listen(9000);
-console.log("Running!");
+console.log("Running !");