Merge branch '3-client-invisibility-is-not-implemented' into 'master'
added invisiblity support Closes #3 See merge request sgay/traque!4
This commit is contained in:
commit
2c51ab0f9e
2 changed files with 24 additions and 14 deletions
BIN
invi.png
Normal file
BIN
invi.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.1 KiB |
28
map.html
28
map.html
|
@ -59,7 +59,16 @@
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
var self_icons = icons;
|
var self_icons = icons;
|
||||||
var self_invisible_icon = icons[1];
|
var self_invisible =
|
||||||
|
L.icon({
|
||||||
|
iconUrl: 'invi.png',
|
||||||
|
iconSize: [10, 10],
|
||||||
|
iconAnchor: [5, 5],
|
||||||
|
popupAnchor: [5, 5],
|
||||||
|
//shadowUrl: 'my-icon-shadow.png',
|
||||||
|
//shadowSize: [68, 95],
|
||||||
|
//shadowAnchor: [22, 94]
|
||||||
|
});
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// INIT MAP
|
// INIT MAP
|
||||||
|
@ -95,19 +104,20 @@
|
||||||
if(data.id in colors && colors[data.id] == -1 && data.id in markers)
|
if(data.id in colors && colors[data.id] == -1 && data.id in markers)
|
||||||
markers[data.id].addTo(map);
|
markers[data.id].addTo(map);
|
||||||
colors[data.id] = data.color;
|
colors[data.id] = data.color;
|
||||||
if(data.color == -1){
|
|
||||||
if(data.id in markers){
|
if(data.id in markers){
|
||||||
if(data.id == id)
|
if(data.id == id)
|
||||||
markers[data.id].setIcon(self_invisible_icon);
|
if(data.color == -1)
|
||||||
|
markers[data.id].setIcon(self_invisible);
|
||||||
else
|
else
|
||||||
markers[data.id].remove();
|
|
||||||
}
|
|
||||||
} else if(data.id in markers){
|
|
||||||
if(data.id == id)
|
|
||||||
markers[data.id].setIcon(self_icons[data.color]);
|
markers[data.id].setIcon(self_icons[data.color]);
|
||||||
else
|
else
|
||||||
|
if(data.color == -1)
|
||||||
|
markers[data.id].setOpacity(0);
|
||||||
|
else{
|
||||||
|
markers[data.id].setOpacity(1);
|
||||||
markers[data.id].setIcon(icons[data.color]);
|
markers[data.id].setIcon(icons[data.color]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on("moving", function(data){
|
socket.on("moving", function(data){
|
||||||
|
@ -121,8 +131,8 @@
|
||||||
else
|
else
|
||||||
icon = icons[colors[data.id]];
|
icon = icons[colors[data.id]];
|
||||||
markers[data.id] = L.marker(data.position, {"icon": icon}).addTo(map);
|
markers[data.id] = L.marker(data.position, {"icon": icon}).addTo(map);
|
||||||
if(colors[data.id] == -1)
|
if(data.id == id)
|
||||||
markers[data.id].remove();
|
markers[data.id].setZIndexOffset(10000);
|
||||||
if(data.id in names)
|
if(data.id in names)
|
||||||
markers[data.id].bindPopup(names[data.id]);
|
markers[data.id].bindPopup(names[data.id]);
|
||||||
} else{
|
} else{
|
||||||
|
|
Loading…
Reference in a new issue