Merge branch 'master' into actionbar

This commit is contained in:
Jon Benson 2013-05-07 16:43:49 +10:00
commit 541d4c8899

View File

@ -95,9 +95,16 @@ window.setPortalIndicators = function(d) {
).addTo(map);
else
portalAccessIndicator.setLatLng(coord);
}
window.clearPortalIndicators = function() {
if(portalRangeIndicator) map.removeLayer(portalRangeIndicator);
portalRangeIndicator = null;
if(portalAccessIndicator) map.removeLayer(portalAccessIndicator);
portalAccessIndicator = null;
}
// highlights portal with given GUID. Automatically clears highlights
// on old selection. Returns false if the selected portal changed.
// Returns true if its still the same portal that just needs an
@ -123,4 +130,5 @@ window.unselectOldPortal = function() {
if(oldPortal) portalResetColor(oldPortal);
selectedPortal = null;
$('#portaldetails').html('');
clearPortalIndicators();
}