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

better selected portal handling

Browse Source 
- ensure the selected portal isn't deleted when it isn't in the map data (e.g. due to zoom level)
- always show the selected portal on the map, even if the high density clustering code would have removed it
- deselect the selected portal, and clear the details bar, in the rare instance of the portal being deleted server-side (i.e. in the deletedEntities list)
This commit is contained in:
Jon Atkins 2013-09-05 22:14:52 +01:00
parent cc32c1acf9
commit 7d3ca0972b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/map_data_render.js
View File

@ -83,6 +83,11 @@ window.Render.prototype.processDeletedGameEntityGuids = function(deleted) {
if ( !(guid in this.deletedGuid) ) { if ( !(guid in this.deletedGuid) ) {
this.deletedGuid[guid] = true; // flag this guid as having being processed this.deletedGuid[guid] = true; // flag this guid as having being processed
if (guid == selectedPortal) {
// the rare case of the selected portal being deleted. clear the details tab and deselect it
renderPortalDetails(null);
}
this.deleteEntity(guid); this.deleteEntity(guid);
} }
@ -114,7 +119,7 @@ window.Render.prototype.endRenderPass = function() {
// check to see if there's eny entities we haven't seen. if so, delete them // check to see if there's eny entities we haven't seen. if so, delete them
for (var guid in window.portals) { for (var guid in window.portals) {
if (!(guid in this.seenPortalsGuid)) { if (!(guid in this.seenPortalsGuid) && guid !== selectedPortal) {
this.deletePortalEntity(guid); this.deletePortalEntity(guid);
} }
} }
@ -501,12 +506,13 @@ window.Render.prototype.resetPortalClusters = function() {
for (var i=0; i<c.length; i++) { for (var i=0; i<c.length; i++) {
var guid = c[i]; var guid = c[i];
var p = window.portals[guid]; var p = window.portals[guid];
if (i<this.CLUSTER_PORTAL_LIMIT) { var layerGroup = portalsLayers[parseInt(p.options.level)];
if (!map.hasLayer(p) ) { if (i<this.CLUSTER_PORTAL_LIMIT || p.options.guid == selectedPortal) {
if (!layerGroup.hasLayer(p)) {
portalsLayers[parseInt(p.options.level)].addLayer(p); portalsLayers[parseInt(p.options.level)].addLayer(p);
} }
} else { } else {
if (map.hasLayer(p) ) { if (layerGroup.hasLayer(p)) {
portalsLayers[parseInt(p.options.level)].removeLayer(p); portalsLayers[parseInt(p.options.level)].removeLayer(p);
} }
} }
@ -528,7 +534,7 @@ window.Render.prototype.addPortalToMapLayer = function(portal) {
// now, at this point, we could match the above re-clustr code - sorting, and adding/removing as necessary // now, at this point, we could match the above re-clustr code - sorting, and adding/removing as necessary
// however, it won't make a lot of visible difference compared to just pushing to the end of the list, then // however, it won't make a lot of visible difference compared to just pushing to the end of the list, then
// adding to the visible layer if the list is below the limit // adding to the visible layer if the list is below the limit
if (this.portalClusters[cid].length < this.CLUSTER_PORTAL_LIMIT) { if (this.portalClusters[cid].length < this.CLUSTER_PORTAL_LIMIT || portal.options.guid == selectedPortal) {
portalsLayers[parseInt(portal.options.level)].addLayer(portal); portalsLayers[parseInt(portal.options.level)].addLayer(portal);
} }
} }