Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update portal counts plugin to integrate with draw tools and uniques #371

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Update portal counts plugin to integrate with draw tools and uniques #371

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e5fbf8a
Count unvisited and uncaptured portals
erikchristiansson Jun 30, 2020
0ea3c09
Count only portals in drawn polygons
erikchristiansson Jun 30, 2020
953777f
Update portal-counts.js
erikchristiansson Jun 30, 2020
01fc440
Update portal-counts.js
erikchristiansson Jun 30, 2020
2be8082
Update portal-counts.js
erikchristiansson Jun 30, 2020
e25f595
Update portal-counts.js
erikchristiansson Jun 30, 2020
559b76e
Update plugins/portal-counts.js
erikchristiansson Jul 12, 2020
600876d
Update plugins/portal-counts.js
erikchristiansson Jul 12, 2020
6e85ecf
Update plugins/portal-counts.js
erikchristiansson Jul 12, 2020
b78bb17
Update plugins/portal-counts.js
erikchristiansson Jul 12, 2020
78514be
Update plugins/portal-counts.js
erikchristiansson Jul 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 75 additions & 2 deletions plugins/portal-counts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,26 @@ window.plugin.portalcounts = {
CENTER_Y: 100,
};

/*********** HELPER FUNCTION ****************************************************/
erikchristiansson marked this conversation as resolved.
Show resolved Hide resolved
window.plugin.portalcounts.portalinpolygon = function(portal,LatLngsObjectsArray) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@modos189

  1. Shouldn't we include some pip algorithm in IITC api? It is used in many plugins already.
  2. I'm going to open separate issue to discuss another opportunity: what if we provide general portal-filtering API?
    For example, it'd be possible to use more convenient region selection tools, like these: Idea: region selection utility #27

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be great if common functions were included in API. We can replace this code when corresponding API appears

var portalCoords = portal.split(',');
erikchristiansson marked this conversation as resolved.
Show resolved Hide resolved

var x = portalCoords[0], y = portalCoords[1];
erikchristiansson marked this conversation as resolved.
Show resolved Hide resolved

var inside = false;
for (var i = 0, j = LatLngsObjectsArray.length - 1; i < LatLngsObjectsArray.length; j = i++) {
var xi = LatLngsObjectsArray[i]['lat'], yi = LatLngsObjectsArray[i]['lng'];
var xj = LatLngsObjectsArray[j]['lat'], yj = LatLngsObjectsArray[j]['lng'];

var intersect = ((yi > y) != (yj > y)) && (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
if (intersect) {
inside = !inside;
}
}

return inside;
};

//count portals for each level available on the map
window.plugin.portalcounts.getPortals = function (){
//console.log('** getPortals');
Expand All @@ -46,7 +66,28 @@ window.plugin.portalcounts.getPortals = function (){
self.PortalsRes[level] = 0;
}

self.upcP = 0;
self.upvP = 0;

if(localStorage['plugin-draw-tools-layer']) {
var drawLayer = JSON.parse(localStorage['plugin-draw-tools-layer']);
}
$.each(window.portals, function(i, portal) {
if (drawLayer && drawLayer.length) {
var portalInPolygon = false;
var latlng = portal._latlng.lat + ',' + portal._latlng.lng;
erikchristiansson marked this conversation as resolved.
Show resolved Hide resolved
for(var dl in drawLayer){
if(drawLayer[dl].type === 'polygon') {
if(window.plugin.portalcounts.portalinpolygon(latlng,drawLayer[dl].latLngs)) {
erikchristiansson marked this conversation as resolved.
Show resolved Hide resolved
portalInPolygon = true;
break;
}
}
}
if (!portalInPolygon) {
return;
}
}
var level = portal.options.level;
var team = portal.options.team;
// just count portals in viewport
Expand All @@ -64,14 +105,31 @@ window.plugin.portalcounts.getPortals = function (){
self.neuP++;
break;
}

if (window.plugin.uniques) {
var guid = portal.options.ent[0];
var uniqueInfo = window.plugin.uniques.uniques[guid];

if (uniqueInfo) {
if (!uniqueInfo.captured) {
self.upcP++;
}
if (!uniqueInfo.visited) {
self.upvP++;
}
} else {
self.upvP++;
self.upcP++;
}
}
});

//get portals informations from IITC
var total = self.neuP + self.enlP + self.resP;

var counts = '';
if(total > 0) {
counts += '<table><tr><th></th><th class="enl">Enlightened</th><th class="res">Resistance</th></tr>'; //'+self.enlP+' Portal(s)</th></tr>';
counts += '<table><tr><th></th><th class="enl">Enlightened</th><th class="res">Resistance</th></tr>';
for(var level = window.MAX_PORTAL_LEVEL; level > 0; level--){
counts += '<tr><td class="L'+level+'">Level '+level+'</td>';
counts += '<td class="enl">'+self.PortalsEnl[level]+'</td><td class="res">'+self.PortalsRes[level]+'</td>';
Expand All @@ -82,7 +140,19 @@ window.plugin.portalcounts.getPortals = function (){

counts += '<tr><td>Neutral:</td><td colspan="2">';
counts += self.neuP;
counts += '</td></tr></table>';
counts += '</td></tr>';

if (window.plugin.uniques) {
counts += '<tr><td>Unvisited:</td><td colspan="2">';
counts += self.upvP;
counts += '</td></tr>';

counts += '<tr><td>Uncaptured:</td><td colspan="2">';
counts += self.upcP;
counts += '</td></tr>';
}

counts += '</table>';

var svg = $('<svg width="300" height="200">').css('margin-top', 10);

Expand Down Expand Up @@ -168,6 +238,9 @@ window.plugin.portalcounts.getPortals = function (){

var total = self.enlP + self.resP + self.neuP;
var title = total + ' ' + (total == 1 ? 'portal' : 'portals');
if (drawLayer && drawLayer.length) {
title = title + ' in polygons';
}

if(window.useAndroidPanes()) {
$('<div id="portalcounts" class="mobile">'
Expand Down