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

create missing link data from portal link info - so short links not sent are shown in the map

Browse Source 
note: need to add code to hide short links from the map - and update the shown/hidden links after a zoom
(similar to the portal cluster showing/hiding portals after a zoom)
This commit is contained in:
Jon Atkins 2013-09-13 23:14:19 +01:00
parent f646f481fc
commit 4838de6788
1 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
code/map_data_render.js
View File

@ -94,7 +94,7 @@ window.Render.prototype.processDeletedGameEntityGuids = function(deleted) {
}
window.Render.prototype.processGameEntities = function(entities) {
// var portalGuids = [];
var portalGuids = [];
for (var i in entities) {
var ent = entities[i];
@ -102,12 +102,14 @@ window.Render.prototype.processGameEntities = function(entities) {
// don't create entities in the 'deleted' list
if (!(ent[0] in this.deletedGuid)) {
this.createEntity(ent);
// if ('portalV2' in ent[2]) portalGuids.push(ent[0]);
if ('portalV2' in ent[2]) portalGuids.push(ent[0]);
}
}
// // now reconstruct links 'optimised' out of the data from the portal link data
// this.createLinksFromPortalData(portalGuids);
// now reconstruct links 'optimised' out of the data from the portal link data
for (var i in portalGuids) {
this.createLinksFromPortalData(portalGuids[i]);
}
}
@ -392,7 +394,7 @@ window.Render.prototype.createFieldEntity = function(ent) {
fieldsFactionLayers[poly.options.team].addLayer(poly);
}
window.Render.prototype.createLinkEntity = function(ent) {
window.Render.prototype.createLinkEntity = function(ent,faked) {
this.seenLinksGuid[ent[0]] = true; // flag we've seen it
// check if entity already exists
@ -418,7 +420,7 @@ window.Render.prototype.createLinkEntity = function(ent) {
var poly = L.geodesicPolyline(latlngs, {
color: COLORS[team],
opacity: 1,
weight: 2,
weight: faked ? 1 : 2,
clickable: false,
team: team,
@ -431,27 +433,25 @@ window.Render.prototype.createLinkEntity = function(ent) {
window.links[ent[0]] = poly;
// TODO? postpone adding to the layer??
// only add the link to the layer if it's long enough to be seen
linksFactionLayers[poly.options.team].addLayer(poly);
}
window.Render.prototype.createLinksFromPortalData = function(portalGuids) {
window.Render.prototype.createLinksFromPortalData = function(portalGuid) {
for (var portalGuidIndex in portalGuids) {
var portalGuid = portalGuids[portalGuidIndex];
var sourcePortal = portals[portalGuid];
for (var sourceLinkIndex in sourcePortal.options.details.portalV2.linkedEdges||[]) {
var sourcePortalLinkInfo = sourcePortal.options.details.portalV2.linkedEdges[sourceLinkIndex];
// portals often contain details for edges that don't exist. so only consider faking an edge if this
// is the origin portal, the link doesn't already exist...
if (sourcePortalLinkInfo.isOrigin && !(sourcePortalLinkInfo.edgeGuid in links)) {
// is the origin portal
if (sourcePortalLinkInfo.isOrigin) {
// ... and the other porta has matching link information.
if (portalGuids.indexOf(sourcePortalLinkInfo.otherPortalGuid) != -1 &&
sourcePortalLinkInfo.otherPortalGuid in portals) {
if (sourcePortalLinkInfo.otherPortalGuid in portals) {
var targetPortal = portals[sourcePortalLinkInfo.otherPortalGuid];
@ -475,7 +475,7 @@ window.Render.prototype.createLinksFromPortalData = function(portalGuids) {
}
];
this.createLinkEntity(fakeEnt);
this.createLinkEntity(fakeEnt,true);
}
@ -487,7 +487,6 @@ window.Render.prototype.createLinksFromPortalData = function(portalGuids) {
}
}
}
}