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

replace generated link data with no creator with the more complete data when available. often occurs when zooming in on a region.

Browse Source 
also, some comments to clarify things
This commit is contained in:
Jon Atkins 2013-06-06 23:19:14 +01:00
parent 3b46f5d54e
commit cb64b4dbfc
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
code/map_data.js
View File

@ -150,10 +150,15 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
}); });
$.each(ppp, function(ind, portal) { $.each(ppp, function(ind, portal) {
// when both source and destination portal are in the same response, no explicit 'edge' is returned
// instead, we need to reconstruct them from the data within the portal details
if ('portalV2' in portal[2] && 'linkedEdges' in portal[2].portalV2) { if ('portalV2' in portal[2] && 'linkedEdges' in portal[2].portalV2) {
$.each(portal[2].portalV2.linkedEdges, function (ind, edge) { $.each(portal[2].portalV2.linkedEdges, function (ind, edge) {
if (!ppp[edge.otherPortalGuid]) if (!ppp[edge.otherPortalGuid])
return; return;
renderLink([ renderLink([
edge.edgeGuid, edge.edgeGuid,
portal[1], portal[1],
@ -164,11 +169,12 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
"destinationPortalLocation": edge.isOrigin ? ppp[edge.otherPortalGuid][2].locationE6 : portal[2].locationE6, "destinationPortalLocation": edge.isOrigin ? ppp[edge.otherPortalGuid][2].locationE6 : portal[2].locationE6,
"originPortalGuid": !edge.isOrigin ? ppp[edge.otherPortalGuid][0] : portal[0], "originPortalGuid": !edge.isOrigin ? ppp[edge.otherPortalGuid][0] : portal[0],
"originPortalLocation": !edge.isOrigin ? ppp[edge.otherPortalGuid][2].locationE6 : portal[2].locationE6 "originPortalLocation": !edge.isOrigin ? ppp[edge.otherPortalGuid][2].locationE6 : portal[2].locationE6
} },
} }
]); ]);
}); });
} }
if(portal[2].portalV2['linkedFields'] === undefined) { if(portal[2].portalV2['linkedFields'] === undefined) {
portal[2].portalV2['linkedFields'] = []; portal[2].portalV2['linkedFields'] = [];
} }
@ -522,9 +528,17 @@ window.renderLink = function(ent) {
if(Object.keys(links).length >= MAX_DRAWN_LINKS) if(Object.keys(links).length >= MAX_DRAWN_LINKS)
return removeByGuid(ent[0]); return removeByGuid(ent[0]);
// assume that links never change. If they do, they will have a // some links are constructed from portal linkedEdges data. These have no valid 'creator' data.
// different ID. // replace with the more detailed data
if(findEntityInLeaflet(linksLayer, links, ent[0])) return; // (we assume the other values - coordinates, etc - remain unchanged)
var found=findEntityInLeaflet(linksLayer, links, ent[0]);
if (found) {
if (!found.options.data.creator && ent[2].creator) {
//our existing data has no creator, but the new data does - update
found.options.data = ent[2];
}
return;
}
var team = getTeam(ent[2]); var team = getTeam(ent[2]);
var edge = ent[2].edge; var edge = ent[2].edge;