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

[missions] draw trace to portals, even if they aren't currently loaded

Browse Source
This commit is contained in:
fkloft 2015-04-12 00:19:10 +02:00
parent 8ac1305110
commit 9b951fbc7c
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/missions.css
View File

@ -31,7 +31,7 @@
cursor: pointer; cursor: pointer;
width: 50px; width: 50px;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 5px;
} }
.plugin-mission-summary > a, .plugin-mission-summary > h4 { .plugin-mission-summary > a, .plugin-mission-summary > h4 {
@ -76,7 +76,7 @@
.plugin-mission-details ol { .plugin-mission-details ol {
clear: left; clear: left;
list-style: none; list-style: none;
margin: 0; margin: 10px 0 0;
padding: 0; padding: 0;
} }

41
plugins/missions.user.js
View File

@ -538,18 +538,19 @@ window.plugin.missions = {
highlightMissionPortals: function(mission) { highlightMissionPortals: function(mission) {
var markers = []; var markers = [];
var prevPortal = null; var latlngs = [];
mission.waypoints.forEach(function(waypoint) { mission.waypoints.forEach(function(waypoint) {
if (!waypoint.portal) { if (!waypoint.portal) {
return; return;
} }
var portal = window.portals[waypoint.portal.guid];
if (!portal) { // not in view? var radius = window.portals[waypoint.portal.guid] ? window.portals[waypoint.portal.guid].options.radius * 1.5 : 5;
return; var ll = [waypoint.portal.latE6 / 1E6, waypoint.portal.lngE6 / 1E6];
} latlngs.push(ll);
var marker = L.circleMarker(
L.latLng(portal.options.data.latE6 / 1E6, portal.options.data.lngE6 / 1E6), { var marker = L.circleMarker(ll, {
radius: portal.options.radius + Math.ceil(portal.options.radius / 2), radius: radius,
weight: 3, weight: 3,
opacity: 1, opacity: 1,
color: '#222', color: '#222',
@ -560,22 +561,16 @@ window.plugin.missions = {
); );
this.missionLayer.addLayer(marker); this.missionLayer.addLayer(marker);
markers.push(marker); markers.push(marker);
if (prevPortal) {
var line = L.geodesicPolyline([
L.latLng(prevPortal.options.data.latE6 / 1E6, prevPortal.options.data.lngE6 / 1E6),
L.latLng(portal.options.data.latE6 / 1E6, portal.options.data.lngE6 / 1E6)
], {
color: '#222',
opacity: 1,
weight: 2,
clickable: false
});
this.missionLayer.addLayer(line);
markers.push(line);
}
prevPortal = portal;
}, this); }, this);
var line = L.geodesicPolyline(latlngs, {
color: '#222',
opacity: 1,
weight: 2,
clickable: false
});
this.missionLayer.addLayer(line);
markers.push(line);
return markers; return markers;
}, },