Add filters on O-line/D-line.

[pkanalytics] / ultimate.js

diff --git a/ultimate.js b/ultimate.js
index 2b483e225a68039c41023474d31a88f1122cbb06..c0ca1bac2ee062b47680c4961c497db4eedfe97f 100644 (file)
--- a/ultimate.js
+++ b/ultimate.js
@@ -189,6 +189,7 @@ function process_matches(json, filters) {
                        'stallouts': 0,
 
                        'defenses': 0,
+                       'callahans': 0,
                        'points_played': 0,
                        'playing_time_ms': 0,
                        'offensive_playing_time_ms': 0,
@@ -239,6 +240,7 @@ function process_matches(json, filters) {
                let our_score = 0;
                let their_score = 0;
                let handler = null;
+               let handler_got_by_interception = false;  // Only relevant if handler !== null.
                let prev_handler = null;
                let live_since = null;
                let offense = null;  // True/false/null (unknown).
@@ -273,10 +275,10 @@ function process_matches(json, filters) {
                        let p = players[e['player']];
 
                        // Sub management
-                       let keep = keep_event(players, formations_used_this_point, filters);
+                       let keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);
                        if (type === 'in' && p.on_field_since === null) {
                                p.on_field_since = t;
-                               if (!keep && keep_event(players, formations_used_this_point, filters)) {
+                               if (!keep && keep_event(players, formations_used_this_point, last_pull_was_ours, filters)) {
                                        // A player needed for the filters went onto the field,
                                        // so pretend people walked on right now (to start their
                                        // counting time).
@@ -288,7 +290,7 @@ function process_matches(json, filters) {
                                }
                        } else if (type === 'out') {
                                take_off_field(p, t, live_since, offense, keep);
-                               if (keep && !keep_event(players, formations_used_this_point, filters)) {
+                               if (keep && !keep_event(players, formations_used_this_point, last_pull_was_ours, filters)) {
                                        // A player needed for the filters went off the field,
                                        // so we need to attribute time for all the others.
                                        // Pretend they walked off and then immediately on again.
@@ -303,7 +305,7 @@ function process_matches(json, filters) {
                                }
                        }
 
-                       keep = keep_event(players, formations_used_this_point, filters);  // Recompute after in/out.
+                       keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);  // Recompute after in/out.
 
                        // Liveness management
                        if (type === 'pull' || type === 'their_pull' || type === 'restart') {
@@ -503,7 +505,19 @@ function process_matches(json, filters) {
                        }
 
                        // Event management
-                       if (type === 'catch' || type === 'goal') {
+                       if (type === 'goal' && handler === e['player'] && handler_got_by_interception) {
+                               // Self-pass to goal after an interception; this is not a real pass,
+                               // just how we represent a Callahan right now -- so don't
+                               // count the throw, any assists or similar.
+                               //
+                               // It's an open question how we should handle a self-pass that is
+                               // _not_ after an interception, or a self-pass that's not a goal.
+                               // (It must mean we tipped off someone.) We'll count it as a regular one
+                               // for the time being, although it will make hockey assists weird.
+                               ++p.goals;
+                               ++p.callahans;
+                               handler = prev_handler = null;
+                       } else if (type === 'catch' || type === 'goal') {
                                if (handler !== null) {
                                        if (keep) {
                                                ++players[handler].num_throws;
@@ -527,6 +541,7 @@ function process_matches(json, filters) {
                                        // Update hold history.
                                        prev_handler = handler;
                                        handler = e['player'];
+                                       handler_got_by_interception = false;
                                }
                        } else if (type === 'throwaway') {
                                if (keep) {
@@ -553,6 +568,7 @@ function process_matches(json, filters) {
                                }
                                prev_handler = null;
                                handler = e['player'];
+                               handler_got_by_interception = true;
                        } else if (type === 'offensive_soft_plus' || type === 'offensive_soft_minus' || type === 'defensive_soft_plus' || type === 'defensive_soft_minus') {
                                if (keep) ++p[type];
                        } else if (type !== 'in' && type !== 'out' && type !== 'pull' &&
@@ -571,7 +587,7 @@ function process_matches(json, filters) {
                }
 
                // Add field time for all players still left at match end.
-               const keep = keep_event(players, formations_used_this_point, filters);
+               const keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);
                if (keep) {
                        for (const [q,p] of Object.entries(players)) {
                                if (p.on_field_since !== null && last_goal !== null) {
@@ -897,6 +913,7 @@ function make_table_defense(players) {
                add_th(header, 'OOB pulls');
                add_th(header, 'OOB%');
                add_th(header, 'Avg. hang time (IB)');
+               add_th(header, 'Callahans');
                add_th(header, 'Soft +/-', 6);
                rows.push(header);
        }
@@ -925,6 +942,7 @@ function make_table_defense(players) {
                } else {
                        add_3cell(row, 'N/A');
                }
+               add_3cell(row, p.callahans);
                add_3cell(row, '+' + p.defensive_soft_plus);
                add_3cell(row, '-' + p.defensive_soft_minus);
                row.dataset.player = q;
@@ -1083,6 +1101,7 @@ function open_filter_menu() {
        add_menu_item(menu, 2, 'player_all', 'Player on field (all)');
        add_menu_item(menu, 3, 'formation_offense', 'Offense played (any)');
        add_menu_item(menu, 4, 'formation_defense', 'Defense played (any)');
+       add_menu_item(menu, 5, 'starting_on', 'Starting on');
 }
 
 function add_menu_item(menu, menu_idx, filter_type, title) {
@@ -1146,6 +1165,15 @@ function show_submenu(menu_idx, pill, filter_type) {
                                });
                        }
                }
+       } else if (filter_type === 'starting_on') {
+               choices.push({
+                       'title': 'Offense',
+                       'id': false,  // last_pull_was_ours
+               });
+               choices.push({
+                       'title': 'Defense',
+                       'id': true,  // last_pull_was_ours
+               });
        }
 
        for (const choice of choices) {
@@ -1303,7 +1331,7 @@ function make_filter_pill(filter) {
                let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
                for (const formation_id of sorted_formation_id) {
                        if (!first) {
-                               text += ', ';
+                               ktext += ', ';
                        }
                        let desc = find_formation(formation_id)['name'];
                        if (common_prefix === null) {
@@ -1317,6 +1345,16 @@ function make_filter_pill(filter) {
                if (common_prefix !== null) {
                        text += ')';
                }
+       } else if (filter.type === 'starting_on') {
+               text = 'Starting on: ';
+
+               if (filter.elements.has(false) && filter.elements.has(true)) {
+                       text += 'Any';
+               } else if (filter.elements.has(false)) {
+                       text += 'Offense';
+               } else {
+                       text += 'Defense';
+               }
        }
 
        let text_node = document.createElement('span');
@@ -1423,7 +1461,7 @@ function keep_match(match_id, filters) {
        return true;
 }
 
-function filter_passes(players, formations_used_this_point, filter) {
+function filter_passes(players, formations_used_this_point, last_pull_was_ours, filter) {
        if (filter.type === 'player_any') {
                for (const p of Array.from(filter.elements)) {
                        if (players[p].on_field_since !== null) {
@@ -1445,13 +1483,15 @@ function filter_passes(players, formations_used_this_point, filter) {
                        }
                }
                return false;
+       } else if (filter.type === 'starting_on') {
+               return filter.elements.has(last_pull_was_ours);
        }
        return true;
 }
 
-function keep_event(players, formations_used_this_point, filters) {
+function keep_event(players, formations_used_this_point, last_pull_was_ours, filters) {
        for (const filter of filters) {
-               if (!filter_passes(players, formations_used_this_point, filter)) {
+               if (!filter_passes(players, formations_used_this_point, last_pull_was_ours, filter)) {
                        return false;
                }
        }