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

add selected portal marker colour *after* running the portal highlighter

Browse Source 
for #547
This commit is contained in:
Jon Atkins 2013-09-12 06:57:50 +01:00
parent 74cc365e9a
commit 63467df342
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/portal_marker.js
View File

@ -6,10 +6,7 @@
// create a new marker. 'data' contain the IITC-specific entity data to be stored in the object options // create a new marker. 'data' contain the IITC-specific entity data to be stored in the object options
window.createMarker = function(latlng, data) { window.createMarker = function(latlng, data) {
var styleOptions = window.getMarkerStyleOptions(data);
// we assume non-selected - a selected portal will have an additional call to setMarkerStyle.
// inefficient - but it's only for a single portal
var styleOptions = window.getMarkerStyleOptions(data, false);
var options = L.extend({}, data, styleOptions, { clickable: true }); var options = L.extend({}, data, styleOptions, { clickable: true });
@ -23,24 +20,28 @@ window.createMarker = function(latlng, data) {
window.setMarkerStyle = function(marker, selected) { window.setMarkerStyle = function(marker, selected) {
var styleOptions = window.getMarkerStyleOptions(marker.options, selected); var styleOptions = window.getMarkerStyleOptions(marker.options);
marker.setStyle(styleOptions); marker.setStyle(styleOptions);
// FIXME? it's inefficient to set the marker style (above), then do it again inside the highlighter // FIXME? it's inefficient to set the marker style (above), then do it again inside the highlighter
// the highlighter API would need to be changed for this to be improved though. will it be too slow? // the highlighter API would need to be changed for this to be improved though. will it be too slow?
highlightPortal(marker); highlightPortal(marker);
if (selected) {
marker.setStyle ({color: COLOR_SELECTED_PORTAL});
}
} }
window.getMarkerStyleOptions = function(details, selected) { window.getMarkerStyleOptions = function(details) {
var lvlWeight = Math.max(2, Math.floor(details.level) / 1.5); var lvlWeight = Math.max(2, Math.floor(details.level) / 1.5);
var lvlRadius = details.team === window.TEAM_NONE ? 7 : Math.floor(details.level) + 4; var lvlRadius = details.team === window.TEAM_NONE ? 7 : Math.floor(details.level) + 4;
var options = { var options = {
radius: lvlRadius + (L.Browser.mobile ? PORTAL_RADIUS_ENLARGE_MOBILE : 0), radius: lvlRadius + (L.Browser.mobile ? PORTAL_RADIUS_ENLARGE_MOBILE : 0),
stroke: true, stroke: true,
color: selected ? COLOR_SELECTED_PORTAL : COLORS[details.team], color: COLORS[details.team],
weight: lvlWeight, weight: lvlWeight,
opacity: 1, opacity: 1,
fill: true, fill: true,