mirror of
https://github.com/webbukkit/dynmap.git
synced 2024-11-30 22:24:06 +01:00
Abstracted clock and tile-updating a bit.
This commit is contained in:
FrozenCow
parent
8263918b8d
commit
27fb8a20f1
@ -21,6 +21,7 @@
|
||||
</head>
|
||||
<body>
|
||||
<div id="mcmap"></div>
|
||||
<div id="alert">Updating...</div>
|
||||
<div id="plist">
|
||||
<img id="plistbtn" alt="on" src="list_on.png" onclick="plistopen()" title="Toggle Player List" />
|
||||
<div id="maplist"></div>
|
||||
|
||||
@ -26,8 +26,10 @@ KzedProjection.prototype = {
|
||||
}
|
||||
};
|
||||
|
||||
KzedMapType.prototype = new DynMapType();
|
||||
function KzedMapType() {}
|
||||
KzedMapType.prototype = {
|
||||
constructor: KzedMapType,
|
||||
projection: new KzedProjection(),
|
||||
tileSize: new google.maps.Size(128, 128),
|
||||
minZoom: 0,
|
||||
@ -96,7 +98,7 @@ KzedMapType.prototype = {
|
||||
}
|
||||
if (tileName) {
|
||||
img = $('<img/>')
|
||||
.attr('src', tileUrl(tileName))
|
||||
.attr('src', getTileUrl(tileName))
|
||||
.error(function() { img.hide(); })
|
||||
.css({
|
||||
width: imgSize + 'px',
|
||||
@ -106,9 +108,9 @@ KzedMapType.prototype = {
|
||||
marginTop: offset.y + 'px'
|
||||
})
|
||||
.appendTo(tile);
|
||||
tileDict[tileName] = img;
|
||||
registerTile(this, tileName, img);
|
||||
} else {
|
||||
delete tileDict[tileName];
|
||||
unregisterTile(this, tileName);
|
||||
}
|
||||
return tile.get(0);
|
||||
},
|
||||
|
||||
189
web/map.js
189
web/map.js
@ -1,63 +1,59 @@
|
||||
if (!console) console = { log: function() {} };
|
||||
|
||||
/* generic function for making an XMLHttpRequest
|
||||
* url: request URL
|
||||
* func: callback function for success
|
||||
* type: 'text' by default (callback is called with response text)
|
||||
* otherwise, callback is called with a parsed XML dom
|
||||
* fail: callback function for failure
|
||||
* post: if given, make a POST request instead of GET; post data given
|
||||
*
|
||||
* contenttype: if given for a POST, set request content-type header
|
||||
*/
|
||||
function makeRequest(url, func, type, fail, post, contenttype)
|
||||
{
|
||||
var http_request = false;
|
||||
function DynMapType() { }
|
||||
DynMapType.prototype = {
|
||||
onTileUpdated: function(tile, tileName) {
|
||||
var src = getTileUrl(tileName);
|
||||
tile.attr('src', src);
|
||||
tile.show();
|
||||
}
|
||||
};
|
||||
|
||||
type = typeof(type) != 'undefined' ? type : 'text';
|
||||
fail = typeof(fail) != 'undefined' ? fail : function() { };
|
||||
function MinecraftClock(element) { this.element = element; }
|
||||
MinecraftClock.prototype = {
|
||||
element: null,
|
||||
timeout: null,
|
||||
time: null,
|
||||
create: function(element) {
|
||||
if (!element) element = $('<div/>');
|
||||
this.element = element;
|
||||
return element;
|
||||
},
|
||||
setTime: function(time) {
|
||||
if (this.timeout != null) {
|
||||
window.clearTimeout(this.timeout);
|
||||
this.timeout = null;
|
||||
}
|
||||
this.time = time;
|
||||
this.element
|
||||
.addClass(time.day ? 'day' : 'night')
|
||||
.removeClass(time.night ? 'day' : 'night')
|
||||
.text(this.formatTime(time));
|
||||
|
||||
if(window.XMLHttpRequest) {
|
||||
http_request = new XMLHttpRequest();
|
||||
} else if(window.ActiveXObject) {
|
||||
http_request = new ActiveXObject("Microsoft.XMLHTTP");
|
||||
if (this.timeout == null) {
|
||||
var me = this;
|
||||
this.timeout = window.setTimeout(function() {
|
||||
me.timeout = null;
|
||||
me.setTime(getMinecraftTime(me.time.servertime+(1000/60)));
|
||||
}, 700 /* should be 600, but since server-resyncing it looks better with 700 */);
|
||||
}
|
||||
},
|
||||
formatTime: function(time) {
|
||||
var formatDigits = function(n, digits) {
|
||||
var s = n.toString();
|
||||
while (s.length < digits) {
|
||||
s = '0' + s;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
return formatDigits(time.hours, 2) + ':' + formatDigits(time.minutes, 2);
|
||||
}
|
||||
};
|
||||
|
||||
if(type == 'text') {
|
||||
http_request.onreadystatechange = function() {
|
||||
if(http_request.readyState == 4) {
|
||||
if(http_request.status == 200) {
|
||||
func(http_request.responseText);
|
||||
} else {
|
||||
fail(http_request);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
http_request.onreadystatechange = function() {
|
||||
if(http_request.readyState == 4) {
|
||||
if(http_request.status == 200) { func(http_request.responseXML); } else {
|
||||
fail(http_request);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
var tileDict = new Array();
|
||||
var lastSeen = new Array();
|
||||
|
||||
if(typeof(post) != 'undefined') {
|
||||
http_request.open('POST', url, true);
|
||||
if(typeof(contenttype) != 'undefined')
|
||||
http_request.setRequestHeader("Content-Type", contenttype);
|
||||
http_request.send(post);
|
||||
} else {
|
||||
http_request.open('GET', url, true);
|
||||
http_request.send(null);
|
||||
}
|
||||
}
|
||||
|
||||
var tileDict = new Array();
|
||||
var lastSeen = new Array();
|
||||
|
||||
function tileUrl(tile, always) {
|
||||
function getTileUrl(tile, always) {
|
||||
if(always) {
|
||||
var now = new Date();
|
||||
return config.tileUrl + tile + '.png?' + now.getTime();
|
||||
@ -66,23 +62,29 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
} else {
|
||||
return config.tileUrl + tile + '.png?0';
|
||||
}
|
||||
}
|
||||
|
||||
function registerTile(mapType, tileName, tile) {
|
||||
tileDict[tileName] = {
|
||||
tileElement: tile,
|
||||
mapType: mapType
|
||||
};
|
||||
}
|
||||
|
||||
function unregisterTile(mapType, tileName) {
|
||||
delete tileDict[tileName];
|
||||
}
|
||||
|
||||
function onTileUpdated(tileName) {
|
||||
lastSeen[tileName] = lasttimestamp;
|
||||
|
||||
var tile = tileDict[tileName];
|
||||
if (tile) {
|
||||
tile.mapType.onTileUpdated(tile.tileElement, tileName);
|
||||
}
|
||||
}
|
||||
|
||||
function onTileUpdated(tileName, f) {
|
||||
|
||||
}
|
||||
|
||||
function imgSubst(tileName) {
|
||||
if(!(tileName in tileDict))
|
||||
return;
|
||||
|
||||
var src = tileUrl(tileName);
|
||||
var t = tileDict[tileName];
|
||||
t.attr('src', src);
|
||||
t.show();
|
||||
}
|
||||
|
||||
|
||||
var clock = null;
|
||||
var markers = new Array();
|
||||
var lasttimestamp = '0';
|
||||
var followPlayer = '';
|
||||
@ -90,8 +92,6 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
var lst;
|
||||
var plistbtn;
|
||||
var lstopen = true;
|
||||
var oldplayerlst = '[Connecting]';
|
||||
var servertime = 0;
|
||||
|
||||
function updateMarker(mi) {
|
||||
if(mi.id in markers) {
|
||||
@ -173,7 +173,11 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
|
||||
function mapUpdate()
|
||||
{
|
||||
makeRequest(config.updateUrl + lasttimestamp, function(res) {
|
||||
$.ajax({
|
||||
url: config.updateUrl + lasttimestamp,
|
||||
success: function(res) {
|
||||
$('#alert')
|
||||
.hide();
|
||||
var typeVisibleMap = {
|
||||
'warp': document.getElementById('showWarps').checked,
|
||||
'sign': document.getElementById('showSigns').checked,
|
||||
@ -187,18 +191,18 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
var loggedin = new Array();
|
||||
var firstRow = rows[0].split(' ');
|
||||
lasttimestamp = firstRow[0];
|
||||
servertime = firstRow[1];
|
||||
delete rows[0];
|
||||
|
||||
var servertime = firstRow[1];
|
||||
clock.setTime(getMinecraftTime(servertime));
|
||||
|
||||
for(var line in rows) {
|
||||
var p = rows[line].split(' ');
|
||||
|
||||
if (p[0] == '') continue;
|
||||
|
||||
({ tile: function() {
|
||||
var tileName = p[1];
|
||||
lastSeen[tileName] = lasttimestamp;
|
||||
imgSubst(tileName);
|
||||
onTileUpdated(p[1]);
|
||||
}
|
||||
}[p[0]] || function() {
|
||||
var mi = {
|
||||
@ -216,19 +220,6 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
})();
|
||||
}
|
||||
|
||||
var time = {
|
||||
// Assuming it is day at 8:00
|
||||
hours: (parseInt(servertime / 1000)+8) % 24,
|
||||
minutes: parseInt(((servertime / 1000) % 1) * 60),
|
||||
seconds: parseInt(((((servertime / 1000) % 1) * 60) % 1) * 60)
|
||||
};
|
||||
|
||||
|
||||
$('#clock')
|
||||
.addClass(servertime > 12000 ? 'night' : 'day')
|
||||
.removeClass(servertime > 12000 ? 'day' : 'night')
|
||||
.text(formatTime(time));
|
||||
|
||||
for(var m in markers) {
|
||||
if(!(m in loggedin)) {
|
||||
markers[m].remove(null);
|
||||
@ -243,20 +234,14 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
document.getElementById('signsDiv').style.display = (typeCount['signs'] == 0)?'none':'';
|
||||
document.getElementById('homesDiv').style.display = (typeCount['homes'] == 0)?'none':'';
|
||||
document.getElementById('spawnsDiv').style.display = (typeCount['spawns'] == 0)?'none':'';
|
||||
}, 'text', function() { alert('failed to get update data'); } );
|
||||
},
|
||||
error: function(request, statusText, ex) {
|
||||
$('#alert')
|
||||
.text('Could not update map')
|
||||
.show();
|
||||
setTimeout(mapUpdate, config.updateRate);
|
||||
}
|
||||
|
||||
function formatTime(time) {
|
||||
//return formatDigits(time.hours, 2) + ':' + formatDigits(time.minutes, 2) + ':' + formatDigits(time.seconds, 2);
|
||||
return formatDigits(time.hours, 2) + ':' + formatDigits(time.minutes, 2);
|
||||
}
|
||||
|
||||
function formatDigits(n, digits) {
|
||||
var s = n.toString();
|
||||
while (s.length < digits) {
|
||||
s = '0' + s;
|
||||
}
|
||||
return s;
|
||||
});
|
||||
}
|
||||
|
||||
window.onload = function initialize() {
|
||||
@ -317,6 +302,8 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
|
||||
map.setMapTypeId(config.defaultMap);
|
||||
|
||||
clock = new MinecraftClock($('#clock'));
|
||||
|
||||
setTimeout(mapUpdate, config.updateRate);
|
||||
}
|
||||
|
||||
|
||||
@ -68,3 +68,19 @@ function getMinecraftHead(player,size,completed) {
|
||||
completed(resizeImage(head,size));
|
||||
}
|
||||
}
|
||||
|
||||
function getMinecraftTime(servertime) {
|
||||
servertime = parseInt(servertime);
|
||||
return {
|
||||
servertime: servertime,
|
||||
days: parseInt((servertime+8000) / 24000),
|
||||
|
||||
// Assuming it is day at 8:00
|
||||
hours: (parseInt(servertime / 1000)+8) % 24,
|
||||
minutes: parseInt(((servertime / 1000) % 1) * 60),
|
||||
seconds: parseInt(((((servertime / 1000) % 1) * 60) % 1) * 60),
|
||||
|
||||
day: servertime > 12000,
|
||||
night: servertime <= 12000
|
||||
};
|
||||
}
|
||||
|
||||
@ -87,6 +87,21 @@ a, a:visited, label {
|
||||
#clock.night { background-image: url(clock_night.png); }
|
||||
#clock.day { background-image: url(clock_day.png); }
|
||||
|
||||
#alert {
|
||||
padding: 5px;
|
||||
position: fixed;
|
||||
margin: auto;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
width: 25em;
|
||||
text-align: center;
|
||||
font: 14px/16px sans-serif;
|
||||
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.3);
|
||||
background-color: InfoBackground;
|
||||
border-radius: 0 0 3px 3px;
|
||||
}
|
||||
|
||||
.playerIcon {
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user