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

draw lines between portals and resonators (fixes #88 #151)

Browse Source 
The lines look great against a dark background but are barely visible against
OSM CloudMade Minimal. Not sure what could be done about that though, other
than drawing differently for each.
This commit is contained in:
Stefan Breunig 2013-02-13 19:40:00 +01:00
parent 6cca87a1d9
commit b3ec8ccd48
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
code/map_data.js
View File

@ -299,6 +299,7 @@ window.renderResonators = function(ent, portalLayer) {
var portalLevel = getPortalLevel(ent[2]);
if(portalLevel < getMinPortalLevel() && ent[0] != selectedPortal) return;
var portalLatLng = [ent[2].locationE6.latE6/1E6, ent[2].locationE6.lngE6/1E6];
var layerGroup = portalsLayers[parseInt(portalLevel)];
var reRendered = false;
@ -329,7 +330,11 @@ window.renderResonators = function(ent, portalLayer) {
var lat0 = ent[2].locationE6.latE6/1E6 + dLat * 180/Math.PI;
var lon0 = ent[2].locationE6.lngE6/1E6 + dLon * 180/Math.PI;
var Rlatlng = [lat0, lon0];
var r = L.circleMarker(Rlatlng, {
var resoGuid = portalResonatorGuid(ent[0], i);
// the resonator
var reso = L.circleMarker(Rlatlng, {
radius: 3,
// #AAAAAA outline seems easier to see the fill opacity
color: '#AAAAAA',
@ -337,14 +342,34 @@ window.renderResonators = function(ent, portalLayer) {
weight: 1,
fillColor: COLORS_LVL[rdata.level],
fillOpacity: rdata.energyTotal/RESO_NRG[rdata.level],
clickable: false,
level: rdata.level,
details: rdata,
pDetails: ent[2],
guid: portalResonatorGuid(ent[0], i) });
guid: resoGuid // need this here as well for add/remove events
});
r.on('remove', function() { delete window.resonators[this.options.guid]; });
r.on('add', function() { window.resonators[this.options.guid] = this; });
// line connecting reso to portal
var conn = L.polyline([Rlatlng, portalLatLng], {
weight: 2,
color: '#FFFFFF',
opacity: 0.2,
dashArray: '10,4',
fill: false,
clickable: false});
// put both in one group, so they can be handled by the same logic.
var r = L.layerGroup([reso, conn]);
r.options = {
level: rdata.level,
details: rdata,
pDetails: ent[2],
guid: resoGuid
};
// However, LayerGroups (and FeatureGroups) don’t fire add/remove
// events, thus this listener will be attached to the resonator. It
// doesn’t matter to which element these are bound since Leaflet
// will add/remove all elements of the LayerGroup at once.
reso.on('remove', function() { delete window.resonators[this.options.guid]; });
reso.on('add', function() { window.resonators[this.options.guid] = r; });
r.addTo(portalsLayers[parseInt(portalLevel)]);
reRendered = true;