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

ignore portals returned in the map data that are below the portal level requested

Browse Source 
this shouldn't be needed - the stock intel map completely ignores these so they shouldn't be returned - but since niantic added mission portals to the map they bypass all portal level filtering code, for some reason
This commit is contained in:
Jon Atkins 2015-03-12 21:33:22 +00:00
parent 522ef34f77
commit c5b068eda1
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/map_data_render.js
View File

@ -8,7 +8,6 @@ window.Render = function() {
this.portalMarkerScale = undefined; this.portalMarkerScale = undefined;
} }
// start a render pass. called as we start to make the batch of data requests to the servers // start a render pass. called as we start to make the batch of data requests to the servers
window.Render.prototype.startRenderPass = function(level,bounds) { window.Render.prototype.startRenderPass = function(level,bounds) {
this.isRendering = true; this.isRendering = true;
@ -20,6 +19,7 @@ window.Render.prototype.startRenderPass = function(level,bounds) {
this.seenFieldsGuid = {}; this.seenFieldsGuid = {};
this.bounds = bounds; this.bounds = bounds;
this.level = level;
// we pad the bounds used for clearing a litle bit, as entities are sometimes returned outside of their specified tile boundaries // we pad the bounds used for clearing a litle bit, as entities are sometimes returned outside of their specified tile boundaries
// this will just avoid a few entity removals at start of render when they'll just be added again // this will just avoid a few entity removals at start of render when they'll just be added again
@ -110,7 +110,7 @@ window.Render.prototype.processDeletedGameEntityGuids = function(deleted) {
} }
window.Render.prototype.processGameEntities = function(entities) { window.Render.prototype.processGameEntities = function(entities,ignoreLevel) {
// we loop through the entities three times - for fields, links and portals separately // 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 // this is a reasonably efficient work-around for leafletjs limitations on svg render order
@ -131,16 +131,27 @@ window.Render.prototype.processGameEntities = function(entities) {
} }
} }
// 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) { for (var i in entities) {
var ent = entities[i]; var ent = entities[i];
if (ent[2][0] == 'p' && !(ent[0] in this.deletedGuid)) { 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); this.createPortalEntity(ent);
} else {
ignoredCount++;
}
} }
} }
if (ignoredCount) console.log('Render: ignored '+ignoredCount+' portals below the level requested from the server');
} }

2
code/map_data_request.js
View File

@ -230,7 +230,7 @@ window.MapDataRequest.prototype.refresh = function() {
this.render.startRenderPass(tileParams.level, dataBounds); this.render.startRenderPass(tileParams.level, dataBounds);
this.render.processGameEntities(artifact.getArtifactEntities()); this.render.processGameEntities(artifact.getArtifactEntities(),true);
var logMessage = 'requesting data tiles at zoom '+dataZoom; var logMessage = 'requesting data tiles at zoom '+dataZoom;
if (tileParams.level != tileParams.maxLevel) { if (tileParams.level != tileParams.maxLevel) {