phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1176 from nhamer/master

Browse Source 
Fix #1101 - don't process portal details on failure
This commit is contained in:
Dave Ingram 2017-02-12 09:07:33 -08:00 committed by GitHub
commit 86b2e383e1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/artifact.js
View File

@ -97,6 +97,11 @@ window.artifact.processResult = function (portals) {
var ent = portals[guid]; var ent = portals[guid];
var data = decodeArray.portalSummary(ent); var data = decodeArray.portalSummary(ent);
if (!data.artifactBrief) {
// 2/12/2017 - Shard removed from a portal leaves it in artifact results but has no artifactBrief
continue;
}
// we no longer know the faction for the target portals, and we don't know which fragment numbers are at the portals // we no longer know the faction for the target portals, and we don't know which fragment numbers are at the portals
// all we know, from the portal summary data, for each type of artifact, is that each artifact portal is // all we know, from the portal summary data, for each type of artifact, is that each artifact portal is
// - a target portal or not - no idea for which faction // - a target portal or not - no idea for which faction

6
code/map_data_request.js
View File

@ -65,15 +65,17 @@ window.MapDataRequest = function() {
this.REFRESH_CLOSE = 300; // refresh time to use for close views z>12 when not idle and not moving this.REFRESH_CLOSE = 300; // refresh time to use for close views z>12 when not idle and not moving
this.REFRESH_FAR = 900; // refresh time for far views z <= 12 this.REFRESH_FAR = 900; // refresh time for far views z <= 12
this.FETCH_TO_REFRESH_FACTOR = 2; //minumum refresh time is based on the time to complete a data fetch, times this value this.FETCH_TO_REFRESH_FACTOR = 2; //minimum refresh time is based on the time to complete a data fetch, times this value
// ensure we have some initial map status // ensure we have some initial map status
this.setStatus ('startup', undefined, -1); this.setStatus ('startup', undefined, -1);
// add a portalDetailLoaded hook, so we can use the exteneed details to update portals on the map // add a portalDetailLoaded hook, so we can use the extended details to update portals on the map
var _this = this; var _this = this;
addHook('portalDetailLoaded', function(data){ addHook('portalDetailLoaded', function(data){
if(data.success) {
_this.render.processGameEntities([data.ent]); _this.render.processGameEntities([data.ent]);
}
}); });
} }