IITC failed to extract the required parameters from the intel site
' diff --git a/code/hooks.js b/code/hooks.js index 2fd82477..9629647e 100644 --- a/code/hooks.js +++ b/code/hooks.js @@ -18,6 +18,7 @@ // portalSelected: called when portal on map is selected/unselected. // Provide guid of selected and unselected portal. // mapDataRefreshStart: called when we start refreshing map data +// mapDataEntityInject: called just as we start to render data. has callback to inject cached entities into the map render // mapDataRefreshEnd: called when we complete the map data load // portalAdded: called when a portal has been received and is about to // be added to its layer group. Note that this does NOT @@ -51,11 +52,13 @@ // this only selects the current chat pane; on mobile, it // also switches between map, info and other panes defined // by plugins +// artifactsUpdated: called when the set of artifacts (including targets) +// has changed. Parameters names are old, new. window._hooks = {} window.VALID_HOOKS = [ - 'portalSelected', 'portalDetailsUpdated', - 'mapDataRefreshStart', 'mapDataRefreshEnd', + 'portalSelected', 'portalDetailsUpdated', 'artifactsUpdated', + 'mapDataRefreshStart', 'mapDataEntityInject', 'mapDataRefreshEnd', 'portalAdded', 'linkAdded', 'fieldAdded', 'publicChatDataAvailable', 'factionChatDataAvailable', 'requestFinished', 'nicknameClicked', @@ -103,3 +106,16 @@ window.addHook = function(event, callback) { else _hooks[event].push(callback); } + +// callback must the SAME function to be unregistered. +window.removeHook = function(event, callback) { + if (typeof callback !== 'function') throw('Callback must be a function.'); + + if (_hooks[event]) { + var index = _hooks[event].indexOf(callback); + if(index == -1) + console.warn('Callback wasn\'t registered for this event.'); + else + _hooks[event].splice(index, 1); + } +} diff --git a/code/map_data_calc_tools.js b/code/map_data_calc_tools.js index 34636500..54736bb2 100755 --- a/code/map_data_calc_tools.js +++ b/code/map_data_calc_tools.js @@ -12,12 +12,18 @@ window.setupDataTileParams = function() { // default values - used to fall back to if we can't detect those used in stock intel - var DEFAULT_ZOOM_TO_TILES_PER_EDGE = [256, 256, 256, 256, 512, 512, 512, 2048, 2048, 2048, 4096, 4096, 6500, 6500, 6500, 18e3, 18e3, 36e3]; - var DEFAULT_ZOOM_TO_LEVEL = [ 8, 8, 8, 8, 7, 7, 7, 6, 6, 5, 4, 4, 3, 2, 2, 1, 1 ]; + var DEFAULT_ZOOM_TO_TILES_PER_EDGE = [1,1,1,40,40,80,80,320,1000,2000,2000,4000,8000,16000,16000,32000]; + var DEFAULT_ZOOM_TO_LEVEL = [8,8,8,8,7,7,7,6,6,5,4,4,3,2,2,1,1]; + // stock intel doesn't have this array (they use a switch statement instead), but this is far neater + var DEFAULT_ZOOM_TO_LINK_LENGTH = [200000,200000,200000,200000,200000,60000,60000,10000,5000,2500,2500,800,300,0,0]; window.TILE_PARAMS = {}; + // not in stock to detect - we'll have to assume the above values... + window.TILE_PARAMS.ZOOM_TO_LINK_LENGTH = DEFAULT_ZOOM_TO_LINK_LENGTH; + + if (niantic_params.ZOOM_TO_LEVEL && niantic_params.TILES_PER_EDGE) { window.TILE_PARAMS.ZOOM_TO_LEVEL = niantic_params.ZOOM_TO_LEVEL; window.TILE_PARAMS.TILES_PER_EDGE = niantic_params.TILES_PER_EDGE; @@ -25,22 +31,56 @@ window.setupDataTileParams = function() { // lazy numerical array comparison if ( JSON.stringify(niantic_params.ZOOM_TO_LEVEL) != JSON.stringify(DEFAULT_ZOOM_TO_LEVEL)) { - console.warn('Tile parameter ZOOM_TO_LEVEL have changed in stock intel. Detectec correct values, but code should be updated'); + console.warn('Tile parameter ZOOM_TO_LEVEL have changed in stock intel. Detected correct values, but code should be updated'); debugger; } if ( JSON.stringify(niantic_params.TILES_PER_EDGE) != JSON.stringify(DEFAULT_ZOOM_TO_TILES_PER_EDGE)) { - console.warn('Tile parameter ZOOM_TO_LEVEL have changed in stock intel. Detectec correct values, but code should be updated'); + console.warn('Tile parameter TILES_PER_EDGE have changed in stock intel. Detected correct values, but code should be updated'); debugger; } } else { - console.warn('Failed to detect both ZOOM_TO_LEVEL and TILES_PER_EDGE in the stock intel site - using internal defaults'); - debugger; + dialog({ + title: 'IITC Warning', + html: "IITC failed to detect the ZOOM_TO_LEVEL and/or TILES_PER_EDGE settings from the stock intel site.
" + +"IITC is now using fallback default values. However, if detection has failed it's likely the values have changed." + +" IITC may not load the map if these default values are wrong.
", + }); window.TILE_PARAMS.ZOOM_TO_LEVEL = DEFAULT_ZOOM_TO_LEVEL; window.TILE_PARAMS.TILES_PER_EDGE = DEFAULT_ZOOM_TO_TILES_PER_EDGE; } + // 2015-07-01: niantic added code to the stock site that overrides the min zoom level for unclaimed portals to 15 and above + // instead of updating the zoom-to-level array. makes no sense really.... + // we'll just chop off the array at that point, so the code defaults to level 0 (unclaimed) everywhere... + window.TILE_PARAMS.ZOOM_TO_LEVEL = window.TILE_PARAMS.ZOOM_TO_LEVEL.slice(0,15); + +} + + +window.debugMapZoomParameters = function() { + + //for debug purposes, log the tile params used for each zoom level + console.log('DEBUG: Map Zoom Parameters'); + var doneZooms = {}; + for (var z=MIN_ZOOM; z<=21; z++) { + var ourZoom = getDataZoomForMapZoom(z); + console.log('DEBUG: map zoom '+z+': IITC requests '+ourZoom+(ourZoom!=z?' instead':'')); + if (!doneZooms[ourZoom]) { + var params = getMapZoomTileParameters(ourZoom); + var msg = 'DEBUG: data zoom '+ourZoom; + if (params.hasPortals) { + msg += ' has portals, L'+params.level+'+'; + } else { + msg += ' NO portals (was L'+params.level+'+)'; + } + msg += ', minLinkLength='+params.minLinkLength; + msg += ', tiles per edge='+params.tilesPerEdge; + console.log(msg); + doneZooms[ourZoom] = true; + } + } } @@ -54,12 +94,12 @@ window.getMapZoomTileParameters = function(zoom) { var level = window.TILE_PARAMS.ZOOM_TO_LEVEL[zoom] || 0; // default to level 0 (all portals) if not in array - if (window.CONFIG_ZOOM_SHOW_LESS_PORTALS_ZOOMED_OUT) { - if (level <= 7 && level >= 4) { - // reduce portal detail level by one - helps reduce clutter - level = level+1; - } - } +// if (window.CONFIG_ZOOM_SHOW_LESS_PORTALS_ZOOMED_OUT) { +// if (level <= 7 && level >= 4) { +// // reduce portal detail level by one - helps reduce clutter +// level = level+1; +// } +// } var maxTilesPerEdge = window.TILE_PARAMS.TILES_PER_EDGE[window.TILE_PARAMS.TILES_PER_EDGE.length-1]; @@ -67,6 +107,8 @@ window.getMapZoomTileParameters = function(zoom) { level: level, maxLevel: window.TILE_PARAMS.ZOOM_TO_LEVEL[zoom] || 0, // for reference, for log purposes, etc tilesPerEdge: window.TILE_PARAMS.TILES_PER_EDGE[zoom] || maxTilesPerEdge, + minLinkLength: window.TILE_PARAMS.ZOOM_TO_LINK_LENGTH[zoom] || 0, + hasPortals: zoom >= window.TILE_PARAMS.ZOOM_TO_LINK_LENGTH.length, // no portals returned at all when link length limits things zoom: zoom // include the zoom level, for reference }; } @@ -83,16 +125,6 @@ window.getDataZoomForMapZoom = function(zoom) { zoom = 21; } - if (window.CONFIG_ZOOM_SHOW_MORE_PORTALS) { - // slightly unfriendly to the servers, requesting more, but smaller, tiles, for the 'unclaimed' level of detail - // however, server load issues are all related to the map area in view, with no real issues related to detail level - // therefore, I believel we can get away with these smaller tiles for one or two further zoom levels without issues - - if (zoom == 16) { - zoom = 17; - } - } - if (!window.CONFIG_ZOOM_DEFAULT_DETAIL_LEVEL) { @@ -104,7 +136,11 @@ window.getDataZoomForMapZoom = function(zoom) { while (zoom > MIN_ZOOM) { var newTileParams = getMapZoomTileParameters(zoom-1); - if (newTileParams.tilesPerEdge != origTileParams.tilesPerEdge || newTileParams.level != origTileParams.level) { + + if ( newTileParams.tilesPerEdge != origTileParams.tilesPerEdge + || newTileParams.hasPortals != origTileParams.hasPortals + || newTileParams.level*newTileParams.hasPortals != origTileParams.level*origTileParams.hasPortals // multiply by 'hasPortals' bool - so comparison does not matter when no portals available + ) { // switching to zoom-1 would result in a different detail level - so we abort changing things break; } else { diff --git a/code/map_data_render.js b/code/map_data_render.js index a113620b..d3811a15 100644 --- a/code/map_data_render.js +++ b/code/map_data_render.js @@ -4,7 +4,6 @@ window.Render = function() { - this.portalMarkerScale = undefined; } @@ -25,7 +24,7 @@ window.Render.prototype.startRenderPass = function(level,bounds) { // this will just avoid a few entity removals at start of render when they'll just be added again var paddedBounds = bounds.pad(0.1); - this.clearPortalsBelowLevelOrOutsideBounds(level,paddedBounds); + this.clearPortalsOutsideBounds(paddedBounds); this.clearLinksOutsideBounds(paddedBounds); this.clearFieldsOutsideBounds(paddedBounds); @@ -34,12 +33,12 @@ window.Render.prototype.startRenderPass = function(level,bounds) { this.rescalePortalMarkers(); } -window.Render.prototype.clearPortalsBelowLevelOrOutsideBounds = function(level,bounds) { +window.Render.prototype.clearPortalsOutsideBounds = function(bounds) { var count = 0; for (var guid in window.portals) { var p = portals[guid]; - // clear portals below specified level - unless it's the selected portal, or it's relevant to artifacts - if ((parseInt(p.options.level) < level || !bounds.contains(p.getLatLng())) && guid !== selectedPortal && !artifact.isInterestingPortal(guid)) { + // clear portals outside visible bounds - unless it's the selected portal, or it's relevant to artifacts + if (!bounds.contains(p.getLatLng()) && guid !== selectedPortal && !artifact.isInterestingPortal(guid)) { this.deletePortalEntity(guid); count++; } @@ -110,7 +109,7 @@ window.Render.prototype.processDeletedGameEntityGuids = function(deleted) { } -window.Render.prototype.processGameEntities = function(entities,ignoreLevel) { +window.Render.prototype.processGameEntities = function(entities) { // we loop through the entities three times - for fields, links and portals separately // this is a reasonably efficient work-around for leafletjs limitations on svg render order @@ -131,27 +130,13 @@ window.Render.prototype.processGameEntities = function(entities,ignoreLevel) { } } - // 2015-03-12 - Niantic have been returning all mission portals to the client, ignoring portal level - // and density filtering usually in use. this makes things unusable when viewing the global view, so we - // filter these out - var minLevel = ignoreLevel ? 0 : this.level; - var ignoredCount = 0; - for (var i in entities) { var ent = entities[i]; if (ent[2][0] == 'p' && !(ent[0] in this.deletedGuid)) { - var portalLevel = ent[2][1] == 'N' ? 0 : parseInt(ent[2][4]); - if (portalLevel >= minLevel) { - this.createPortalEntity(ent); - } else { - ignoredCount++; - } - + this.createPortalEntity(ent); } } - - if (ignoredCount) console.log('Render: ignored '+ignoredCount+' portals below the level requested from the server'); } @@ -263,6 +248,39 @@ window.Render.prototype.deleteFieldEntity = function(guid) { } +window.Render.prototype.createPlaceholderPortalEntity = function(guid,latE6,lngE6,team) { + // intel no longer returns portals at anything but the closest zoom + // stock intel creates 'placeholder' portals from the data in links/fields - IITC needs to do the same + // we only have the portal guid, lat/lng coords, and the faction - no other data + // having the guid, at least, allows the portal details to be loaded once it's selected. however, + // no highlighters, portal level numbers, portal names, useful counts of portals, etc are possible + + + var ent = [ + guid, //ent[0] = guid + 0, //ent[1] = timestamp - zero will mean any other source of portal data will have a higher timestamp + //ent[2] = an array with the entity data + [ 'p', //0 - a portal + team, //1 - team + latE6, //2 - lat + lngE6 //3 - lng + ] + ]; + + // placeholder portals don't have a useful timestamp value - so the standard code that checks for updated + // portal details doesn't apply + // so, check that the basic details are valid and delete the existing portal if out of date + if (guid in window.portals) { + var p = window.portals[guid]; + if (team != p.options.data.team || latE6 != p.options.data.latE6 || lngE6 != p.options.data.lngE6) { + // team or location have changed - delete existing portal + this.deletePortalEntity(guid); + } + } + + this.createPortalEntity(ent); + +} window.Render.prototype.createPortalEntity = function(ent) { @@ -288,7 +306,7 @@ window.Render.prototype.createPortalEntity = function(ent) { this.deletePortalEntity(ent[0]); } - var portalLevel = parseInt(ent[2][4]); + var portalLevel = parseInt(ent[2][4])||0; var team = teamStringToId(ent[2][1]); // the data returns unclaimed portals as level 1 - but IITC wants them treated as level 0 if (team == TEAM_NONE) portalLevel = 0; @@ -350,6 +368,18 @@ window.Render.prototype.createPortalEntity = function(ent) { window.Render.prototype.createFieldEntity = function(ent) { this.seenFieldsGuid[ent[0]] = true; // flag we've seen it + var data = { +// type: ent[2][0], + team: ent[2][1], + points: ent[2][2].map(function(arr) { return {guid: arr[0], latE6: arr[1], lngE6: arr[2] }; }) + }; + + //create placeholder portals for field corners. we already do links, but there are the odd case where this is useful + for (var i=0; i<3; i++) { + var p=data.points[i]; + this.createPlaceholderPortalEntity(p.guid, p.latE6, p.lngE6, data.team); + } + // check if entity already exists if(ent[0] in window.fields) { // yes. in theory, we should never get updated data for an existing field. they're created, and they're destroyed - never changed @@ -364,12 +394,6 @@ window.Render.prototype.createFieldEntity = function(ent) { this.deleteFieldEntity(ent[0]); // option 2, for now } - var data = { -// type: ent[2][0], - team: ent[2][1], - points: ent[2][2].map(function(arr) { return {guid: arr[0], latE6: arr[1], lngE6: arr[2] }; }) - }; - var team = teamStringToId(ent[2][1]); var latlngs = [ L.latLng(data.points[0].latE6/1E6, data.points[0].lngE6/1E6), @@ -399,8 +423,31 @@ window.Render.prototype.createFieldEntity = function(ent) { } window.Render.prototype.createLinkEntity = function(ent,faked) { + // Niantic have been faking link entities, based on data from fields + // these faked links are sent along with the real portal links, causing duplicates + // the faked ones all have longer GUIDs, based on the field GUID (with _ab, _ac, _bc appended) + var fakedLink = new RegExp("^[0-9a-f]{32}\.b_[ab][bc]$"); //field GUIDs always end with ".b" - faked links append the edge identifier + if (fakedLink.test(ent[0])) return; + + this.seenLinksGuid[ent[0]] = true; // flag we've seen it + var data = { // TODO add other properties and check correction direction +// type: ent[2][0], + team: ent[2][1], + oGuid: ent[2][2], + oLatE6: ent[2][3], + oLngE6: ent[2][4], + dGuid: ent[2][5], + dLatE6: ent[2][6], + dLngE6: ent[2][7] + }; + + // create placeholder entities for link start and end points (before checking if the link itself already exists + this.createPlaceholderPortalEntity(data.oGuid, data.oLatE6, data.oLngE6, data.team); + this.createPlaceholderPortalEntity(data.dGuid, data.dLatE6, data.dLngE6, data.team); + + // check if entity already exists if (ent[0] in window.links) { // yes. now, as sometimes links are 'faked', they have incomplete data. if the data we have is better, replace the data @@ -415,17 +462,6 @@ window.Render.prototype.createLinkEntity = function(ent,faked) { this.deleteLinkEntity(ent[0]); // option 2 - for now } - var data = { // TODO add other properties and check correction direction -// type: ent[2][0], - team: ent[2][1], - oGuid: ent[2][2], - oLatE6: ent[2][3], - oLngE6: ent[2][4], - dGuid: ent[2][5], - dLatE6: ent[2][6], - dLngE6: ent[2][7] - }; - var team = teamStringToId(ent[2][1]); var latlngs = [ L.latLng(data.oLatE6/1E6, data.oLngE6/1E6), @@ -469,12 +505,12 @@ window.Render.prototype.rescalePortalMarkers = function() { // add the portal to the visible map layer window.Render.prototype.addPortalToMapLayer = function(portal) { - portalsFactionLayers[parseInt(portal.options.level)][portal.options.team].addLayer(portal); + portalsFactionLayers[parseInt(portal.options.level)||0][portal.options.team].addLayer(portal); } window.Render.prototype.removePortalFromMapLayer = function(portal) { //remove it from the portalsLevels layer - portalsFactionLayers[parseInt(portal.options.level)][portal.options.team].removeLayer(portal); + portalsFactionLayers[parseInt(portal.options.level)||0][portal.options.team].removeLayer(portal); } diff --git a/code/map_data_request.js b/code/map_data_request.js index 12ad93c8..514eabd8 100644 --- a/code/map_data_request.js +++ b/code/map_data_request.js @@ -57,7 +57,7 @@ window.MapDataRequest = function() { // render queue // number of items to process in each render pass. there are pros and cons to smaller and larger values // (however, if using leaflet canvas rendering, it makes sense to push as much as possible through every time) - this.RENDER_BATCH_SIZE = L.Path.CANVAS ? 1E9 : 500; + this.RENDER_BATCH_SIZE = L.Path.CANVAS ? 1E9 : 1500; // delay before repeating the render loop. this gives a better chance for user interaction this.RENDER_PAUSE = (typeof android === 'undefined') ? 0.1 : 0.2; //100ms desktop, 200ms mobile @@ -69,6 +69,13 @@ window.MapDataRequest = function() { // ensure we have some initial map status this.setStatus ('startup', undefined, -1); + + // add a portalDetailLoaded hook, so we can use the exteneed details to update portals on the map + var _this = this; + addHook('portalDetailLoaded',function(data){ + _this.render.processGameEntities([data.ent]); + }); + } @@ -232,8 +239,11 @@ window.MapDataRequest.prototype.refresh = function() { this.render.startRenderPass(tileParams.level, dataBounds); + var _render = this.render; + window.runHooks ('mapDataEntityInject', {callback: function(ents) { _render.processGameEntities(ents);}}); - this.render.processGameEntities(artifact.getArtifactEntities(),true); + + this.render.processGameEntities(artifact.getArtifactEntities()); var logMessage = 'requesting data tiles at zoom '+dataZoom; if (tileParams.level != tileParams.maxLevel) { diff --git a/code/ornaments.js b/code/ornaments.js index efcbdad0..e5b35633 100644 --- a/code/ornaments.js +++ b/code/ornaments.js @@ -33,16 +33,18 @@ window.ornaments.addPortal = function(portal) { var size = window.ornaments.OVERLAY_SIZE; var latlng = portal.getLatLng(); - window.ornaments._portals[guid] = portal.options.data.ornaments.map(function(ornament) { - var icon = L.icon({ - iconUrl: "//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/"+ornament+".png", - iconSize: [size, size], - iconAnchor: [size/2,size/2], - className: 'no-pointer-events' // the clickable: false below still blocks events going through to the svg underneath - }); + if (portal.options.data.ornaments) { + window.ornaments._portals[guid] = portal.options.data.ornaments.map(function(ornament) { + var icon = L.icon({ + iconUrl: "//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/"+ornament+".png", + iconSize: [size, size], + iconAnchor: [size/2,size/2], + className: 'no-pointer-events' // the clickable: false below still blocks events going through to the svg underneath + }); - return L.marker(latlng, {icon: icon, clickable: false, keyboard: false, opacity: window.ornaments.OVERLAY_OPACITY }).addTo(window.ornaments._layer); - }); + return L.marker(latlng, {icon: icon, clickable: false, keyboard: false, opacity: window.ornaments.OVERLAY_OPACITY }).addTo(window.ornaments._layer); + }); + } } window.ornaments.removePortal = function(portal) { diff --git a/code/portal_detail.js b/code/portal_detail.js index 8e8f80a7..55400098 100644 --- a/code/portal_detail.js +++ b/code/portal_detail.js @@ -37,8 +37,12 @@ var handleResponse = function(guid, data, success) { } if (success) { + var dict = decodeArray.portalDetail(data.result); + // entity format, as used in map data + var ent = [guid,dict.timestamp,data.result]; + cache.store(guid,dict); //FIXME..? better way of handling sidebar refreshing... @@ -47,7 +51,7 @@ var handleResponse = function(guid, data, success) { renderPortalDetails(guid); } - window.runHooks ('portalDetailLoaded', {guid:guid, success:success, details:dict}); + window.runHooks ('portalDetailLoaded', {guid:guid, success:success, details:dict, ent:ent}); } else { if (data && data.error == "RETRY") { diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js index 3c51cb80..dc4793df 100644 --- a/code/portal_detail_display.js +++ b/code/portal_detail_display.js @@ -41,46 +41,13 @@ window.renderPortalDetails = function(guid) { var img = fixPortalImageUrl(details ? details.image : data.image); - var title = data.title; + var title = (details && details.title) || (data && data.title) || '(untitled)'; var lat = data.latE6/1E6; var lng = data.lngE6/1E6; - var imgTitle = details ? getPortalDescriptionFromDetails(details) : data.title; - imgTitle += '\n\nClick to show full image.'; - var portalDetailObj = details ? window.getPortalDescriptionFromDetailsExtended(details) : undefined; + var imgTitle = title+'\n\nClick to show full image.'; - var portalDetailedDescription = ''; - - if(portalDetailObj) { - portalDetailedDescription = '| Photo by: | ' + submitterSpan - + escapeHtmlSpecialChars(portalDetailObj.submitter.name) + ''+(portalDetailObj.submitter.voteCount !== undefined ? ' (' + portalDetailObj.submitter.voteCount + ' votes)' : '')+' |
|---|---|
| Photo from: | ' + escapeHtmlSpecialChars(portalDetailObj.submitter.link) + ' |
| Description: | ' + escapeHtmlSpecialChars(portalDetailObj.description) + ' |
| Address: | ' + escapeHtmlSpecialChars(d.descriptiveText.map.ADDRESS) + ' |
').attr({class:'title'}).text(data.title),
+ $('').attr({class:'title'}).text(title),
$('').attr({
class: 'close',
@@ -141,7 +108,6 @@ window.renderPortalDetails = function(guid) {
.attr({class:'imgpreview', title:imgTitle, style:"background-image: url('"+img+"')"})
.append(
$('').attr({id:'level', title: levelDetails}).text(levelInt),
- $('').attr({class:'portalDetails'}).html(portalDetailedDescription),
$('![]()
').attr({class:'hide', src:img})
),
@@ -169,11 +135,15 @@ window.getPortalMiscDetails = function(guid,d) {
// collect some random data that’s not worth to put in an own method
var linkInfo = getPortalLinks(guid);
+ var maxOutgoing = getMaxOutgoingLinks(d);
var linkCount = linkInfo.in.length + linkInfo.out.length;
var links = {incoming: linkInfo.in.length, outgoing: linkInfo.out.length};
- function linkExpl(t) { return ''+t+''; }
- var linksText = [linkExpl('links'), linkExpl(links.outgoing+' out / '+links.incoming+' in')];
+ var title = 'at most ' + maxOutgoing + ' outgoing links\n' +
+ links.outgoing + ' links out\n' +
+ links.incoming + ' links in\n' +
+ '(' + (links.outgoing+links.incoming) + ' total)'
+ var linksText = ['links', links.outgoing+' out / '+links.incoming+' in', title];
var player = d.owner
? '' + d.owner + ''
@@ -214,32 +184,23 @@ window.getPortalMiscDetails = function(guid,d) {
'force amplifier',
'×'+attackValues.force_amplifier]);
- // artifact details
-
- // 2014-02-06: stock site changed from supporting 'jarvis shards' to 'amar artifacts'(?) - so let's see what we can do to be generic...
- $.each(artifact.getArtifactTypes(),function(index,type) {
- var artdata = artifact.getPortalData (guid, type);
- if (artdata) {
- var details = artifact.getArtifactDescriptions(type);
- if (details) {
- // the genFourColumnTable function below doesn't handle cases where one column is null and the other isn't - so default to *something* in both columns
- var target = ['',''], shards = [details.fragmentName,'(none)'];
- if (artdata.target) {
- target = ['target', ''+(artdata.target==TEAM_RES?'Resistance':'Enlightened')+''];
- }
- if (artdata.fragments) {
- shards = [details.fragmentName, '#'+artdata.fragments.join(', #')];
- }
-
- randDetailsData.push (target, shards);
- } else {
- console.warn('Unknown artifact type '+type+': no names, so cannot display');
- }
- }
- });
-
randDetails = '' + genFourColumnTable(randDetailsData) + '
';
+
+ // artifacts - tacked on after (but not as part of) the 'randdetails' table
+ // instead of using the existing columns....
+
+ if (d.artifactBrief && d.artifactBrief.target && Object.keys(d.artifactBrief.target).length > 0) {
+ var targets = Object.keys(d.artifactBrief.target);
+//currently (2015-07-10) we no longer know the team each target portal is for - so we'll just show the artifact type(s)
+ randDetails += 'Target portal: '+targets.map(function(x) { return x.capitalize(); }).join(', ')+'';
+ }
+
+ // shards - taken directly from the portal details
+ if (d.artifactDetail) {
+ randDetails += 'Shards: '+d.artifactDetail.displayName+' #'+d.artifactDetail.fragments.join(', ')+'';
+ }
+
}
return randDetails;
diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index abd54a50..3df146c8 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -12,67 +12,15 @@ window.getRangeText = function(d) {
if(!range.isLinkable) title += '\nPortal is missing resonators,\nno new links can be made';
- return ['range',
+ return ['range',
''
+ + '>'
+ (range.range > 1000
? Math.floor(range.range/1000) + ' km'
: Math.floor(range.range) + ' m')
- + ''];
-}
-
-// generates description text from details for portal
-window.getPortalDescriptionFromDetails = function(details) {
- return details.title || '(untitled)';
-
-// var descObj = details.descriptiveText.map;
-// // FIXME: also get real description?
-// var desc = descObj.TITLE;
-// if(descObj.ADDRESS)
-// desc += '\n' + descObj.ADDRESS;
-//// if(descObj.ATTRIBUTION)
-//// desc += '\nby '+descObj.ATTRIBUTION+' ('+descObj.ATTRIBUTION_LINK+')';
-// return desc;
-}
-
-// Grabs more info, including the submitter name for the current main
-// portal image
-window.getPortalDescriptionFromDetailsExtended = function(details) {
- var descObj = details.title;
- var photoStreamObj = details.photoStreamInfo;
-
- var submitterObj = new Object();
- submitterObj.type = "";
- submitterObj.name = "";
- submitterObj.team = "";
- submitterObj.link = "";
- submitterObj.voteCount = undefined;
-
- if(photoStreamObj && photoStreamObj.hasOwnProperty("coverPhoto") && photoStreamObj.coverPhoto.hasOwnProperty("attributionMarkup")) {
- submitterObj.name = "Unknown";
-
- var attribution = photoStreamObj.coverPhoto.attributionMarkup;
- submitterObj.type = attribution[0];
- if(attribution[1].hasOwnProperty("plain"))
- submitterObj.name = attribution[1].plain;
- if(attribution[1].hasOwnProperty("team"))
- submitterObj.team = attribution[1].team;
- if(attribution[1].hasOwnProperty("attributionLink"))
- submitterObj.link = attribution[1].attributionLink;
- if(photoStreamObj.coverPhoto.hasOwnProperty("voteCount"))
- submitterObj.voteCount = photoStreamObj.coverPhoto.voteCount;
- }
-
-
- var portalDetails = {
- title: descObj.TITLE,
- description: descObj.DESCRIPTION,
- address: descObj.ADDRESS,
- submitter: submitterObj
- };
-
- return portalDetails;
+ + '',
+ title];
}
@@ -115,6 +63,7 @@ window.getModDetails = function(d) {
else if (key === 'ATTACK_FREQUENCY') val = (val/1000) +'x'; // 2000 = 2x
else if (key === 'FORCE_AMPLIFIER') val = (val/1000) +'x'; // 2000 = 2x
else if (key === 'LINK_RANGE_MULTIPLIER') val = (val/1000) +'x'; // 2000 = 2x
+ else if (key === 'LINK_DEFENSE_BOOST') val = (val/1000) +'x'; // 1500 = 1.5x
else if (key === 'REMOVAL_STICKINESS' && val > 100) val = (val/10000)+'%'; // an educated guess
// else display unmodified. correct for shield mitigation and multihack - unknown for future/other mods
@@ -150,9 +99,9 @@ window.getModDetails = function(d) {
window.getEnergyText = function(d) {
var currentNrg = getCurrentPortalEnergy(d);
var totalNrg = getTotalPortalEnergy(d);
- var inf = currentNrg + ' / ' + totalNrg;
+ var title = currentNrg + ' / ' + totalNrg;
var fill = prettyEnergy(currentNrg) + ' / ' + prettyEnergy(totalNrg)
- return ['energy', '' + fill + ''];
+ return ['energy', fill, title];
}
@@ -236,22 +185,19 @@ window.getAttackApGainText = function(d,fieldCount,linkCount) {
var breakdown = getAttackApGain(d,fieldCount,linkCount);
var totalGain = breakdown.enemyAp;
- function tt(text) {
- var t = '';
- if (teamStringToId(PLAYER.team) == teamStringToId(d.team)) {
- totalGain = breakdown.friendlyAp;
- t += 'Friendly AP:\t' + breakdown.friendlyAp + '\n';
- t += ' Deploy ' + breakdown.deployCount + ', ';
- t += 'Upgrade ' + breakdown.upgradeCount + '\n';
- t += '\n';
- }
- t += 'Enemy AP:\t' + breakdown.enemyAp + '\n';
- t += ' Destroy AP:\t' + breakdown.destroyAp + '\n';
- t += ' Capture AP:\t' + breakdown.captureAp + '\n';
- return '' + text + '';
+ var t = '';
+ if (teamStringToId(PLAYER.team) == teamStringToId(d.team)) {
+ totalGain = breakdown.friendlyAp;
+ t += 'Friendly AP:\t' + breakdown.friendlyAp + '\n';
+ t += ' Deploy ' + breakdown.deployCount + ', ';
+ t += 'Upgrade ' + breakdown.upgradeCount + '\n';
+ t += '\n';
}
+ t += 'Enemy AP:\t' + breakdown.enemyAp + '\n';
+ t += ' Destroy AP:\t' + breakdown.destroyAp + '\n';
+ t += ' Capture AP:\t' + breakdown.captureAp + '\n';
- return [tt('AP Gain'), tt(digits(totalGain))];
+ return ['AP Gain', digits(totalGain), t];
}
@@ -260,16 +206,12 @@ window.getHackDetailsText = function(d) {
var shortHackInfo = hackDetails.hacks+' @ '+formatInterval(hackDetails.cooldown);
- function tt(text) {
- var t = 'Hacks available every 4 hours\n';
- t += 'Hack count:\t'+hackDetails.hacks+'\n';
- t += 'Cooldown time:\t'+formatInterval(hackDetails.cooldown)+'\n';
- t += 'Burnout time:\t'+formatInterval(hackDetails.burnout)+'\n';
+ var title = 'Hacks available every 4 hours\n'
+ + 'Hack count:\t'+hackDetails.hacks+'\n'
+ + 'Cooldown time:\t'+formatInterval(hackDetails.cooldown)+'\n'
+ + 'Burnout time:\t'+formatInterval(hackDetails.burnout);
- return ''+text+'';
- }
-
- return [tt('hacks'), tt(shortHackInfo)];
+ return ['hacks', shortHackInfo, title];
}
@@ -279,16 +221,12 @@ window.getMitigationText = function(d,linkCount) {
var mitigationShort = mitigationDetails.total;
if (mitigationDetails.excess) mitigationShort += ' (+'+mitigationDetails.excess+')';
- function tt(text) {
- var t = 'Total shielding:\t'+(mitigationDetails.shields+mitigationDetails.links)+'\n'
- + '- active:\t'+mitigationDetails.total+'\n'
- + '- excess:\t'+mitigationDetails.excess+'\n'
- + 'From\n'
- + '- shields:\t'+mitigationDetails.shields+'\n'
- + '- links:\t'+mitigationDetails.links;
+ var title = 'Total shielding:\t'+(mitigationDetails.shields+mitigationDetails.links)+'\n'
+ + '- active:\t'+mitigationDetails.total+'\n'
+ + '- excess:\t'+mitigationDetails.excess+'\n'
+ + 'From\n'
+ + '- shields:\t'+mitigationDetails.shields+'\n'
+ + '- links:\t'+mitigationDetails.links;
- return ''+text+'';
- }
-
- return [tt('shielding'), tt(mitigationShort)];
+ return ['shielding', mitigationShort, title];
}
diff --git a/code/portal_info.js b/code/portal_info.js
index 663dab51..29d607c6 100644
--- a/code/portal_info.js
+++ b/code/portal_info.js
@@ -207,7 +207,8 @@ window.getPortalModsByType = function(d, type) {
TURRET: 'HIT_BONUS', // and/or ATTACK_FREQUENCY??
HEATSINK: 'HACK_SPEED',
MULTIHACK: 'BURNOUT_INSULATION',
- LINK_AMPLIFIER: 'LINK_RANGE_MULTIPLIER'
+ LINK_AMPLIFIER: 'LINK_RANGE_MULTIPLIER',
+ ULTRA_LINK_AMP: 'OUTGOING_LINKS_BONUS', // and/or LINK_DEFENSE_BOOST??
};
var stat = typeToStat[type];
@@ -257,6 +258,17 @@ window.getPortalMitigationDetails = function(d,linkCount) {
return mitigation;
}
+window.getMaxOutgoingLinks = function(d) {
+ var linkAmps = getPortalModsByType(d, 'ULTRA_LINK_AMP');
+
+ var links = 8;
+
+ linkAmps.forEach(function(mod, i) {
+ links += parseInt(mod.stats.OUTGOING_LINKS_BONUS);
+ });
+
+ return links;
+};
window.getPortalHackDetails = function(d) {
diff --git a/code/portal_marker.js b/code/portal_marker.js
index 749d5d30..b9bfb764 100644
--- a/code/portal_marker.js
+++ b/code/portal_marker.js
@@ -47,11 +47,18 @@ window.getMarkerStyleOptions = function(details) {
var LEVEL_TO_WEIGHT = [2, 2, 2, 2, 2, 3, 3, 4, 4];
var LEVEL_TO_RADIUS = [7, 7, 7, 7, 8, 8, 9,10,11];
- var level = Math.floor(details.level);
+ var level = Math.floor(details.level||0);
var lvlWeight = LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
var lvlRadius = LEVEL_TO_RADIUS[level] * scale;
+ var dashArray = null;
+ // thinner and dashed outline for placeholder portals
+ if (details.team != TEAM_NONE && level==0) {
+ lvlWeight = 1;
+ dashArray = [1,2];
+ }
+
var options = {
radius: lvlRadius,
stroke: true,
@@ -61,7 +68,7 @@ window.getMarkerStyleOptions = function(details) {
fill: true,
fillColor: COLORS[details.team],
fillOpacity: 0.5,
- dashArray: null
+ dashArray: dashArray
};
return options;
diff --git a/code/search.js b/code/search.js
index ca446fb6..120ce055 100644
--- a/code/search.js
+++ b/code/search.js
@@ -225,6 +225,8 @@ addHook('search', function(query) {
$.each(portals, function(guid, portal) {
var data = portal.options.data;
+ if(!data.title) return;
+
if(data.title.toLowerCase().indexOf(term) !== -1) {
var team = portal.options.team;
var color = team==TEAM_NONE ? '#CCC' : COLORS[team];
diff --git a/code/send_request.js b/code/send_request.js
index f0da8098..be6d5712 100644
--- a/code/send_request.js
+++ b/code/send_request.js
@@ -34,7 +34,6 @@ window.postAjax = function(action, data, successCallback, errorCallback) {
var onSuccess = function(data, textStatus, jqXHR) {
window.requests.remove(jqXHR);
- iitc_bg.process_response_params(action,data);
// the Niantic server can return a HTTP success, but the JSON response contains an error. handle that sensibly
if (data && data.error && data.error == 'out of date') {
@@ -65,7 +64,7 @@ window.postAjax = function(action, data, successCallback, errorCallback) {
}
var versionStr = niantic_params.CURRENT_VERSION;
- var post_data = JSON.stringify($.extend({}, data, {v: versionStr}, iitc_bg.extra_request_params(action)));
+ var post_data = JSON.stringify($.extend({}, data, {v: versionStr}));
var result = $.ajax({
url: '/r/'+action,
@@ -96,7 +95,7 @@ window.outOfDateUserPrompt = function()
dialog({
title: 'Reload IITC',
- html: 'IITC is using an outdated version code. This will happen when Niantic update the standard intel site.
'
+ html: 'IITC is using an outdated version code. This will happen when Niantic updates the standard intel site.
'
+'You need to reload the page to get the updated changes.
'
+'If you have just reloaded the page, then an old version of the standard site script is cached somewhere.'
+'In this case, try clearing your cache, or waiting 15-30 minutes for the stale data to expire.
',
diff --git a/code/status_bar.js b/code/status_bar.js
index 8aef2bb3..97703792 100644
--- a/code/status_bar.js
+++ b/code/status_bar.js
@@ -7,15 +7,32 @@ window.renderUpdateStatusTimer_ = undefined;
window.renderUpdateStatus = function() {
var progress = 1;
- // portal level display
- var t = '';
- if(!window.isSmartphone()) // space is valuable
- t += 'portals: ';
- var minlvl = getMinPortalLevel();
- if(minlvl === 0)
- t+= 'all';
- else
- t+= 'L'+minlvl+(minlvl<8?'+':'') + '';
+ // portal/limk level display
+
+ var zoom = map.getZoom();
+ zoom = getDataZoomForMapZoom(zoom);
+ var tileParams = getMapZoomTileParameters(zoom);
+
+ var t = '';
+
+ if (tileParams.hasPortals) {
+ // zoom level includes portals (and also all links/fields)
+ if(!window.isSmartphone()) // space is valuable
+ t += 'portals: ';
+ if(tileParams.level === 0)
+ t += 'all';
+ else
+ t += 'L'+tileParams.level+(tileParams.level<8?'+':'') + '';
+ } else {
+ if(!window.isSmartphone()) // space is valuable
+ t += 'links: ';
+
+ if (tileParams.minLinkLength > 0)
+ t += '>'+(tileParams.minLinkLength>1000?tileParams.minLinkLength/1000+'km':tileParams.minLinkLength+'m')+'';
+ else
+ t += 'all links';
+ }
+
t +='';
diff --git a/code/utils_misc.js b/code/utils_misc.js
index f2f09ccb..b3009a58 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -335,10 +335,11 @@ window.uniqueArray = function(arr) {
window.genFourColumnTable = function(blocks) {
var t = $.map(blocks, function(detail, index) {
if(!detail) return '';
+ var title = detail[2] ? ' title="'+escapeHtmlSpecialChars(detail[2]) + '"' : '';
if(index % 2 === 0)
- return ''+detail[1]+' '+detail[0]+' ';
+ return ''+detail[1]+''+detail[0]+'';
else
- return ' '+detail[0]+' '+detail[1]+' '+detail[0]+''+detail[1]+'';
}).join('');
if(t.length % 2 === 1) t + '
').attr({class:'portalDetails'}).html(portalDetailedDescription),
$('![]()
').attr({class:'hide', src:img})
),
@@ -169,11 +135,15 @@ window.getPortalMiscDetails = function(guid,d) {
// collect some random data that’s not worth to put in an own method
var linkInfo = getPortalLinks(guid);
+ var maxOutgoing = getMaxOutgoingLinks(d);
var linkCount = linkInfo.in.length + linkInfo.out.length;
var links = {incoming: linkInfo.in.length, outgoing: linkInfo.out.length};
- function linkExpl(t) { return ''+t+''; }
- var linksText = [linkExpl('links'), linkExpl(links.outgoing+' out / '+links.incoming+' in')];
+ var title = 'at most ' + maxOutgoing + ' outgoing links\n' +
+ links.outgoing + ' links out\n' +
+ links.incoming + ' links in\n' +
+ '(' + (links.outgoing+links.incoming) + ' total)'
+ var linksText = ['links', links.outgoing+' out / '+links.incoming+' in', title];
var player = d.owner
? '' + d.owner + ''
@@ -214,32 +184,23 @@ window.getPortalMiscDetails = function(guid,d) {
'force amplifier',
'×'+attackValues.force_amplifier]);
- // artifact details
-
- // 2014-02-06: stock site changed from supporting 'jarvis shards' to 'amar artifacts'(?) - so let's see what we can do to be generic...
- $.each(artifact.getArtifactTypes(),function(index,type) {
- var artdata = artifact.getPortalData (guid, type);
- if (artdata) {
- var details = artifact.getArtifactDescriptions(type);
- if (details) {
- // the genFourColumnTable function below doesn't handle cases where one column is null and the other isn't - so default to *something* in both columns
- var target = ['',''], shards = [details.fragmentName,'(none)'];
- if (artdata.target) {
- target = ['target', ''+(artdata.target==TEAM_RES?'Resistance':'Enlightened')+''];
- }
- if (artdata.fragments) {
- shards = [details.fragmentName, '#'+artdata.fragments.join(', #')];
- }
-
- randDetailsData.push (target, shards);
- } else {
- console.warn('Unknown artifact type '+type+': no names, so cannot display');
- }
- }
- });
-
randDetails = '' + genFourColumnTable(randDetailsData) + '
';
+
+ // artifacts - tacked on after (but not as part of) the 'randdetails' table
+ // instead of using the existing columns....
+
+ if (d.artifactBrief && d.artifactBrief.target && Object.keys(d.artifactBrief.target).length > 0) {
+ var targets = Object.keys(d.artifactBrief.target);
+//currently (2015-07-10) we no longer know the team each target portal is for - so we'll just show the artifact type(s)
+ randDetails += ''+detail[1]+' '+detail[0]+' ';
+ return ''+detail[1]+''+detail[0]+'';
else
- return ' '+detail[0]+' '+detail[1]+' '+detail[0]+''+detail[1]+'';
}).join('');
if(t.length % 2 === 1) t + '
Target portal: '+targets.map(function(x) { return x.capitalize(); }).join(', ')+'
';
+ }
+
+ // shards - taken directly from the portal details
+ if (d.artifactDetail) {
+ randDetails += 'Shards: '+d.artifactDetail.displayName+' #'+d.artifactDetail.fragments.join(', ')+'
';
+ }
+
}
return randDetails;
diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index abd54a50..3df146c8 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -12,67 +12,15 @@ window.getRangeText = function(d) {
if(!range.isLinkable) title += '\nPortal is missing resonators,\nno new links can be made';
- return ['range',
+ return ['range',
''
+ + '>'
+ (range.range > 1000
? Math.floor(range.range/1000) + ' km'
: Math.floor(range.range) + ' m')
- + ''];
-}
-
-// generates description text from details for portal
-window.getPortalDescriptionFromDetails = function(details) {
- return details.title || '(untitled)';
-
-// var descObj = details.descriptiveText.map;
-// // FIXME: also get real description?
-// var desc = descObj.TITLE;
-// if(descObj.ADDRESS)
-// desc += '\n' + descObj.ADDRESS;
-//// if(descObj.ATTRIBUTION)
-//// desc += '\nby '+descObj.ATTRIBUTION+' ('+descObj.ATTRIBUTION_LINK+')';
-// return desc;
-}
-
-// Grabs more info, including the submitter name for the current main
-// portal image
-window.getPortalDescriptionFromDetailsExtended = function(details) {
- var descObj = details.title;
- var photoStreamObj = details.photoStreamInfo;
-
- var submitterObj = new Object();
- submitterObj.type = "";
- submitterObj.name = "";
- submitterObj.team = "";
- submitterObj.link = "";
- submitterObj.voteCount = undefined;
-
- if(photoStreamObj && photoStreamObj.hasOwnProperty("coverPhoto") && photoStreamObj.coverPhoto.hasOwnProperty("attributionMarkup")) {
- submitterObj.name = "Unknown";
-
- var attribution = photoStreamObj.coverPhoto.attributionMarkup;
- submitterObj.type = attribution[0];
- if(attribution[1].hasOwnProperty("plain"))
- submitterObj.name = attribution[1].plain;
- if(attribution[1].hasOwnProperty("team"))
- submitterObj.team = attribution[1].team;
- if(attribution[1].hasOwnProperty("attributionLink"))
- submitterObj.link = attribution[1].attributionLink;
- if(photoStreamObj.coverPhoto.hasOwnProperty("voteCount"))
- submitterObj.voteCount = photoStreamObj.coverPhoto.voteCount;
- }
-
-
- var portalDetails = {
- title: descObj.TITLE,
- description: descObj.DESCRIPTION,
- address: descObj.ADDRESS,
- submitter: submitterObj
- };
-
- return portalDetails;
+ + '',
+ title];
}
@@ -115,6 +63,7 @@ window.getModDetails = function(d) {
else if (key === 'ATTACK_FREQUENCY') val = (val/1000) +'x'; // 2000 = 2x
else if (key === 'FORCE_AMPLIFIER') val = (val/1000) +'x'; // 2000 = 2x
else if (key === 'LINK_RANGE_MULTIPLIER') val = (val/1000) +'x'; // 2000 = 2x
+ else if (key === 'LINK_DEFENSE_BOOST') val = (val/1000) +'x'; // 1500 = 1.5x
else if (key === 'REMOVAL_STICKINESS' && val > 100) val = (val/10000)+'%'; // an educated guess
// else display unmodified. correct for shield mitigation and multihack - unknown for future/other mods
@@ -150,9 +99,9 @@ window.getModDetails = function(d) {
window.getEnergyText = function(d) {
var currentNrg = getCurrentPortalEnergy(d);
var totalNrg = getTotalPortalEnergy(d);
- var inf = currentNrg + ' / ' + totalNrg;
+ var title = currentNrg + ' / ' + totalNrg;
var fill = prettyEnergy(currentNrg) + ' / ' + prettyEnergy(totalNrg)
- return ['energy', '' + fill + ''];
+ return ['energy', fill, title];
}
@@ -236,22 +185,19 @@ window.getAttackApGainText = function(d,fieldCount,linkCount) {
var breakdown = getAttackApGain(d,fieldCount,linkCount);
var totalGain = breakdown.enemyAp;
- function tt(text) {
- var t = '';
- if (teamStringToId(PLAYER.team) == teamStringToId(d.team)) {
- totalGain = breakdown.friendlyAp;
- t += 'Friendly AP:\t' + breakdown.friendlyAp + '\n';
- t += ' Deploy ' + breakdown.deployCount + ', ';
- t += 'Upgrade ' + breakdown.upgradeCount + '\n';
- t += '\n';
- }
- t += 'Enemy AP:\t' + breakdown.enemyAp + '\n';
- t += ' Destroy AP:\t' + breakdown.destroyAp + '\n';
- t += ' Capture AP:\t' + breakdown.captureAp + '\n';
- return '' + text + '';
+ var t = '';
+ if (teamStringToId(PLAYER.team) == teamStringToId(d.team)) {
+ totalGain = breakdown.friendlyAp;
+ t += 'Friendly AP:\t' + breakdown.friendlyAp + '\n';
+ t += ' Deploy ' + breakdown.deployCount + ', ';
+ t += 'Upgrade ' + breakdown.upgradeCount + '\n';
+ t += '\n';
}
+ t += 'Enemy AP:\t' + breakdown.enemyAp + '\n';
+ t += ' Destroy AP:\t' + breakdown.destroyAp + '\n';
+ t += ' Capture AP:\t' + breakdown.captureAp + '\n';
- return [tt('AP Gain'), tt(digits(totalGain))];
+ return ['AP Gain', digits(totalGain), t];
}
@@ -260,16 +206,12 @@ window.getHackDetailsText = function(d) {
var shortHackInfo = hackDetails.hacks+' @ '+formatInterval(hackDetails.cooldown);
- function tt(text) {
- var t = 'Hacks available every 4 hours\n';
- t += 'Hack count:\t'+hackDetails.hacks+'\n';
- t += 'Cooldown time:\t'+formatInterval(hackDetails.cooldown)+'\n';
- t += 'Burnout time:\t'+formatInterval(hackDetails.burnout)+'\n';
+ var title = 'Hacks available every 4 hours\n'
+ + 'Hack count:\t'+hackDetails.hacks+'\n'
+ + 'Cooldown time:\t'+formatInterval(hackDetails.cooldown)+'\n'
+ + 'Burnout time:\t'+formatInterval(hackDetails.burnout);
- return ''+text+'';
- }
-
- return [tt('hacks'), tt(shortHackInfo)];
+ return ['hacks', shortHackInfo, title];
}
@@ -279,16 +221,12 @@ window.getMitigationText = function(d,linkCount) {
var mitigationShort = mitigationDetails.total;
if (mitigationDetails.excess) mitigationShort += ' (+'+mitigationDetails.excess+')';
- function tt(text) {
- var t = 'Total shielding:\t'+(mitigationDetails.shields+mitigationDetails.links)+'\n'
- + '- active:\t'+mitigationDetails.total+'\n'
- + '- excess:\t'+mitigationDetails.excess+'\n'
- + 'From\n'
- + '- shields:\t'+mitigationDetails.shields+'\n'
- + '- links:\t'+mitigationDetails.links;
+ var title = 'Total shielding:\t'+(mitigationDetails.shields+mitigationDetails.links)+'\n'
+ + '- active:\t'+mitigationDetails.total+'\n'
+ + '- excess:\t'+mitigationDetails.excess+'\n'
+ + 'From\n'
+ + '- shields:\t'+mitigationDetails.shields+'\n'
+ + '- links:\t'+mitigationDetails.links;
- return ''+text+'';
- }
-
- return [tt('shielding'), tt(mitigationShort)];
+ return ['shielding', mitigationShort, title];
}
diff --git a/code/portal_info.js b/code/portal_info.js
index 663dab51..29d607c6 100644
--- a/code/portal_info.js
+++ b/code/portal_info.js
@@ -207,7 +207,8 @@ window.getPortalModsByType = function(d, type) {
TURRET: 'HIT_BONUS', // and/or ATTACK_FREQUENCY??
HEATSINK: 'HACK_SPEED',
MULTIHACK: 'BURNOUT_INSULATION',
- LINK_AMPLIFIER: 'LINK_RANGE_MULTIPLIER'
+ LINK_AMPLIFIER: 'LINK_RANGE_MULTIPLIER',
+ ULTRA_LINK_AMP: 'OUTGOING_LINKS_BONUS', // and/or LINK_DEFENSE_BOOST??
};
var stat = typeToStat[type];
@@ -257,6 +258,17 @@ window.getPortalMitigationDetails = function(d,linkCount) {
return mitigation;
}
+window.getMaxOutgoingLinks = function(d) {
+ var linkAmps = getPortalModsByType(d, 'ULTRA_LINK_AMP');
+
+ var links = 8;
+
+ linkAmps.forEach(function(mod, i) {
+ links += parseInt(mod.stats.OUTGOING_LINKS_BONUS);
+ });
+
+ return links;
+};
window.getPortalHackDetails = function(d) {
diff --git a/code/portal_marker.js b/code/portal_marker.js
index 749d5d30..b9bfb764 100644
--- a/code/portal_marker.js
+++ b/code/portal_marker.js
@@ -47,11 +47,18 @@ window.getMarkerStyleOptions = function(details) {
var LEVEL_TO_WEIGHT = [2, 2, 2, 2, 2, 3, 3, 4, 4];
var LEVEL_TO_RADIUS = [7, 7, 7, 7, 8, 8, 9,10,11];
- var level = Math.floor(details.level);
+ var level = Math.floor(details.level||0);
var lvlWeight = LEVEL_TO_WEIGHT[level] * Math.sqrt(scale);
var lvlRadius = LEVEL_TO_RADIUS[level] * scale;
+ var dashArray = null;
+ // thinner and dashed outline for placeholder portals
+ if (details.team != TEAM_NONE && level==0) {
+ lvlWeight = 1;
+ dashArray = [1,2];
+ }
+
var options = {
radius: lvlRadius,
stroke: true,
@@ -61,7 +68,7 @@ window.getMarkerStyleOptions = function(details) {
fill: true,
fillColor: COLORS[details.team],
fillOpacity: 0.5,
- dashArray: null
+ dashArray: dashArray
};
return options;
diff --git a/code/search.js b/code/search.js
index ca446fb6..120ce055 100644
--- a/code/search.js
+++ b/code/search.js
@@ -225,6 +225,8 @@ addHook('search', function(query) {
$.each(portals, function(guid, portal) {
var data = portal.options.data;
+ if(!data.title) return;
+
if(data.title.toLowerCase().indexOf(term) !== -1) {
var team = portal.options.team;
var color = team==TEAM_NONE ? '#CCC' : COLORS[team];
diff --git a/code/send_request.js b/code/send_request.js
index f0da8098..be6d5712 100644
--- a/code/send_request.js
+++ b/code/send_request.js
@@ -34,7 +34,6 @@ window.postAjax = function(action, data, successCallback, errorCallback) {
var onSuccess = function(data, textStatus, jqXHR) {
window.requests.remove(jqXHR);
- iitc_bg.process_response_params(action,data);
// the Niantic server can return a HTTP success, but the JSON response contains an error. handle that sensibly
if (data && data.error && data.error == 'out of date') {
@@ -65,7 +64,7 @@ window.postAjax = function(action, data, successCallback, errorCallback) {
}
var versionStr = niantic_params.CURRENT_VERSION;
- var post_data = JSON.stringify($.extend({}, data, {v: versionStr}, iitc_bg.extra_request_params(action)));
+ var post_data = JSON.stringify($.extend({}, data, {v: versionStr}));
var result = $.ajax({
url: '/r/'+action,
@@ -96,7 +95,7 @@ window.outOfDateUserPrompt = function()
dialog({
title: 'Reload IITC',
- html: 'IITC is using an outdated version code. This will happen when Niantic update the standard intel site.
' + html: 'IITC is using an outdated version code. This will happen when Niantic updates the standard intel site.
' +'You need to reload the page to get the updated changes.
' +'If you have just reloaded the page, then an old version of the standard site script is cached somewhere.' +'In this case, try clearing your cache, or waiting 15-30 minutes for the stale data to expire.
', diff --git a/code/status_bar.js b/code/status_bar.js index 8aef2bb3..97703792 100644 --- a/code/status_bar.js +++ b/code/status_bar.js @@ -7,15 +7,32 @@ window.renderUpdateStatusTimer_ = undefined; window.renderUpdateStatus = function() { var progress = 1; - // portal level display - var t = ''; - if(!window.isSmartphone()) // space is valuable - t += 'portals: '; - var minlvl = getMinPortalLevel(); - if(minlvl === 0) - t+= 'all'; - else - t+= 'L'+minlvl+(minlvl<8?'+':'') + ''; + // portal/limk level display + + var zoom = map.getZoom(); + zoom = getDataZoomForMapZoom(zoom); + var tileParams = getMapZoomTileParameters(zoom); + + var t = ''; + + if (tileParams.hasPortals) { + // zoom level includes portals (and also all links/fields) + if(!window.isSmartphone()) // space is valuable + t += 'portals: '; + if(tileParams.level === 0) + t += 'all'; + else + t += 'L'+tileParams.level+(tileParams.level<8?'+':'') + ''; + } else { + if(!window.isSmartphone()) // space is valuable + t += 'links: '; + + if (tileParams.minLinkLength > 0) + t += '>'+(tileParams.minLinkLength>1000?tileParams.minLinkLength/1000+'km':tileParams.minLinkLength+'m')+''; + else + t += 'all links'; + } + t +=''; diff --git a/code/utils_misc.js b/code/utils_misc.js index f2f09ccb..b3009a58 100644 --- a/code/utils_misc.js +++ b/code/utils_misc.js @@ -335,10 +335,11 @@ window.uniqueArray = function(arr) { window.genFourColumnTable = function(blocks) { var t = $.map(blocks, function(detail, index) { if(!detail) return ''; + var title = detail[2] ? ' title="'+escapeHtmlSpecialChars(detail[2]) + '"' : ''; if(index % 2 === 0) - return '