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

Merge master

Browse Source
This commit is contained in:
Jeremy Lindgren
2013-05-01 12:53:59 -05:00
parent 9720593faa 18f9ef0c2e
commit 55be1dd2af
6 changed files with 717 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/map_data.js
View File

@ -99,6 +99,7 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
if(!window.getPaddedBounds().contains(latlng)
&& selectedPortal !== ent[0]
&& urlPortal !== ent[0]
&& !(urlPortalLL && urlPortalLL[0] === latlng[0] && urlPortalLL[1] === latlng[1])
) return;
if('imageByUrl' in ent[2] && 'imageUrl' in ent[2].imageByUrl) {
@ -175,11 +176,15 @@ window.handlePortalsRender = function(portals) {
runHooks('portalDataLoaded', {portals : portals});
$.each(portals, function(ind, portal) {
//~ if(selectedPortal === portal[0]) portalUpdateAvailable = true;
if(urlPortal && portal[0] === urlPortal) portalInUrlAvailable = true;
if(urlPortalLL && urlPortalLL[0] === portal[2].locationE6.latE6/1E6 && urlPortalLL[1] === portal[2].locationE6.lngE6/1E6) {
urlPortal = portal[0];
portalInUrlAvailable = true;
urlPortalLL = null;
}
if(window.portals[portal[0]]) {
highlightPortal(window.portals[portal[0]]);
}
renderPortal(portal);
renderPortal(portal);
});
// restore selected portal if still available