'+mods[3]+''
return t;
}
@@ -2043,7 +2045,7 @@ window.getEnergyText = function(d) {
window.getAvgResoDistText = function(d) {
var avgDist = Math.round(10*getAvgResoDist(d))/10;
- return ['⌀ res dist', avgDist + ' m'];
+ return ['reso dist', avgDist + ' m'];
}
window.getResonatorDetails = function(d) {
@@ -2086,10 +2088,10 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick, isLeft) {
var max = RESO_NRG[level];
var fillGrade = nrg/max*100;
- var inf = 'energy:\t\t' + nrg + ' / ' + max + ' (' + Math.round(fillGrade) + '%)\n'
- + 'level:\t\t' + level + '\n'
+ var inf = 'energy:\t' + nrg + ' / ' + max + ' (' + Math.round(fillGrade) + '%)\n'
+ + 'level:\t' + level + '\n'
+ 'distance:\t' + dist + 'm\n'
- + 'owner:\t\t' + nick + '\n'
+ + 'owner:\t' + nick + '\n'
+ 'octant:\t' + OCTANTS[slot];
var style = 'width:'+fillGrade+'%; background:'+COLORS_LVL[level]+';';
@@ -2123,13 +2125,16 @@ window.getDestroyAP = function(d) {
var resoAp = resoCount * DESTROY_RESONATOR;
var linkAp = linkCount * DESTROY_LINK;
var fieldAp = fieldCount * DESTROY_FIELD;
- var sum = resoAp + linkAp + fieldAp;
+ var sum = resoAp + linkAp + fieldAp + CAPTURE_PORTAL + 8*DEPLOY_RESONATOR + COMPLETION_BONUS;
function tt(text) {
- var t = 'Destroy:\n';
+ var t = 'Destroy & Capture:\n';
t += resoCount + '×\tResonators\t= ' + digits(resoAp) + '\n';
- t += linkCount + '×\tLinks\t\t= ' + digits(linkAp) + '\n';
- t += fieldCount + '×\tFields\t\t= ' + digits(fieldAp) + '\n';
+ t += linkCount + '×\tLinks\t= ' + digits(linkAp) + '\n';
+ t += fieldCount + '×\tFields\t= ' + digits(fieldAp) + '\n';
+ t += '1×\tCapture\t= ' + CAPTURE_PORTAL + '\n';
+ t += '8×\tDeploy\t= ' + DEPLOY_RESONATOR + '\n';
+ t += '1×\tBonus\t= ' + COMPLETION_BONUS + '\n';
t += 'Sum: ' + digits(sum) + ' AP';
return '' + digits(text) + '';
}
@@ -2155,7 +2160,7 @@ window.updateGameScore = function(data) {
var es = ' '+Math.round(ep)+'%';
$('#gamestat').html(rs+es).one('click', function() { window.updateGameScore() });
// help cursor via “#gamestat span”
- $('#gamestat').attr('title', 'Resistance:\t\t'+r+' MindUnits\nEnlightenment:\t'+e+' MindUnits');
+ $('#gamestat').attr('title', 'Resistance:\t'+r+' MindUnits\nEnlightenment:\t'+e+' MindUnits');
window.setTimeout('window.updateGameScore', REFRESH_GAME_SCORE*1000);
}
@@ -2296,11 +2301,17 @@ window.addResumeFunction = function(f) {
// retrieves current position from map and stores it cookies
window.storeMapPosition = function() {
var m = window.map.getCenter();
- writeCookie('ingress.intelmap.lat', m['lat']);
- writeCookie('ingress.intelmap.lng', m['lng']);
+
+ if(m['lat'] >= -90 && m['lat'] <= 90)
+ writeCookie('ingress.intelmap.lat', m['lat']);
+
+ if(m['lng'] >= -180 && m['lng'] <= 180)
+ writeCookie('ingress.intelmap.lng', m['lng']);
+
writeCookie('ingress.intelmap.zoom', window.map.getZoom());
}
+
// either retrieves the last shown position from a cookie, from the
// URL or if neither is present, via Geolocation. If that fails, it
// returns a map that shows the whole world.
@@ -2319,6 +2330,10 @@ window.getPosition = function() {
var lat = parseFloat(readCookie('ingress.intelmap.lat')) || 0.0;
var lng = parseFloat(readCookie('ingress.intelmap.lng')) || 0.0;
var z = parseInt(readCookie('ingress.intelmap.zoom')) || 17;
+
+ if(lat < -90 || lat > 90) lat = 0.0;
+ if(lng < -180 || lng > 180) lng = 0.0;
+
return {center: new L.LatLng(lat, lng), zoom: z > 18 ? 18 : z};
}
@@ -2334,13 +2349,14 @@ window.getPosition = function() {
// methods that highlight the portal in the map view.
window.renderPortalDetails = function(guid) {
- var d = window.portals[guid].options.details;
- if(!d) {
+ if(!window.portals[guid]) {
unselectOldPortal();
urlPortal = guid;
return;
}
+ var d = window.portals[guid].options.details;
+
var update = selectPortal(guid);
// collect some random data that’s not worth to put in an own method
@@ -2386,13 +2402,16 @@ window.renderPortalDetails = function(guid) {
var lat = d.locationE6.latE6;
var lng = d.locationE6.lngE6;
var perma = 'http://ingress.com/intel?latE6='+lat+'&lngE6='+lng+'&z=17&pguid='+guid;
+ var imgTitle = 'title="'+getPortalDescriptionFromDetails(d)+'\n\nClick to show full image."';
$('#portaldetails')
.attr('class', TEAM_TO_CSS[getTeam(d)])
.html(''
+ ''+d.portalV2.descriptiveText.TITLE+'
'
// help cursor via “.imgpreview img”
- + ''
+ + ''
+ + '
'
+ + '
'+getModDetails(d)+'
'
+ ''+randDetails+'
'
@@ -2621,6 +2640,71 @@ window.debug.forceSync = function() {
requestData();
}
+window.debug.console = function() {
+ $('#debugconsole').text();
+}
+
+window.debug.console.create = function() {
+ if($('#debugconsole').length) return;
+ $('#chatcontrols').append('debug');
+ $('#chatcontrols a:last').click(function() {
+ $('#chatinput span').css('cssText', 'color: #bbb !important').text('debug:');
+ $('#chat > div').hide();
+ $('#debugconsole').show();
+ $('#chatcontrols .active').removeClass('active');
+ $(this).addClass('active');
+ });
+ $('#chat').append('');
+}
+
+window.debug.console.renderLine = function(text, errorType) {
+ debug.console.create();
+ switch(errorType) {
+ case 'error': var color = '#FF424D'; break;
+ case 'warning': var color = '#FFDE42'; break;
+ case 'alert': var color = '#42FF90'; break;
+ default: var color = '#eee';
+ }
+ if(typeof text !== 'string' && typeof text !== 'number') text = JSON.stringify(text);
+ var d = new Date();
+ var ta = d.toLocaleTimeString(); // print line instead maybe?
+ var tb = d.toLocaleString();
+ var t = '';
+ var s = 'style="color:'+color+'"';
+ var l = ''+t+''+errorType+''+text+'
';
+ $('#debugconsole').prepend(l);
+}
+
+window.debug.console.log = function(text) {
+ debug.console.renderLine(text, 'notice');
+}
+
+window.debug.console.warn = function(text) {
+ debug.console.renderLine(text, 'warning');
+}
+
+window.debug.console.error = function(text) {
+ debug.console.renderLine(text, 'error');
+}
+
+window.debug.console.alert = function(text) {
+ debug.console.renderLine(text, 'alert');
+}
+
+window.debug.console.overwriteNative = function() {
+ window.debug.console.create();
+ window.console = function() {}
+ window.console.log = window.debug.console.log;
+ window.console.warn = window.debug.console.warn;
+ window.console.error = window.debug.console.error;
+ window.alert = window.debug.console.alert;
+}
+
+window.debug.console.overwriteNativeIfRequired = function() {
+ if(!window.console || L.Browser.mobile)
+ window.debug.console.overwriteNative();
+}
+
// GEOSEARCH /////////////////////////////////////////////////////////