X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ultimate.js;h=e9b0d801db0490bd13df4f3c484c553aa44f2e27;hb=9a57e555972a2acc5cbd60c17154c602c9a883c0;hp=2b483e225a68039c41023474d31a88f1122cbb06;hpb=06353f8e12183491089ec9352fd9c21ae095f890;p=pkanalytics

diff --git a/ultimate.js b/ultimate.js
index 2b483e2..e9b0d80 100644
--- a/ultimate.js
+++ b/ultimate.js
@@ -3,7 +3,8 @@
 // No frameworks, no compilers, no npm, just JavaScript. :-)
 
 let global_json;
-let global_filters = [];
+let global_filters = {};
+let next_filterset_id = 2;  // Arbitrary IDs are fine as long as they never collide.
 
 addEventListener('hashchange', () => { process_matches(global_json, global_filters); });
 addEventListener('click', possibly_close_menu);
@@ -170,11 +171,12 @@ function add_3cell_ci(tr, ci) {
 	element.appendChild(svg);
 }
 
-function process_matches(json, filters) {
+function calc_stats(json, filters) {
 	let players = {};
 	for (const player of json['players']) {
 		players[player['player_id']] = {
 			'name': player['name'],
+			'gender': player['gender'],
 			'number': player['number'],
 
 			'goals': 0,
@@ -189,6 +191,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 +242,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 +277,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 +292,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 +307,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 +507,21 @@ 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.
+				if (keep) {
+					++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 +545,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 +572,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 +591,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) {
@@ -591,23 +611,80 @@ function process_matches(json, filters) {
 			}
 		}
 	}
+	return players;
+}
 
+function process_matches(json, filtersets) {
 	let chosen_category = get_chosen_category();
 	write_main_menu(chosen_category);
 
-	let rows = [];
-	if (chosen_category === 'general') {
-		rows = make_table_general(players);
-	} else if (chosen_category === 'offense') {
-		rows = make_table_offense(players);
-	} else if (chosen_category === 'defense') {
-		rows = make_table_defense(players);
-	} else if (chosen_category === 'playing_time') {
-		rows = make_table_playing_time(players);
-	} else if (chosen_category === 'per_point') {
-		rows = make_table_per_point(players);
-	}
-	document.getElementById('stats').replaceChildren(...rows);
+	let filterset_values = Object.values(filtersets);
+	if (filterset_values.length === 0) {
+		filterset_values = [[]];
+	}
+
+	let rowsets = [];
+	for (const filter of filterset_values) {
+		let players = calc_stats(json, filter);
+		let rows = [];
+		if (chosen_category === 'general') {
+			rows = make_table_general(players);
+		} else if (chosen_category === 'offense') {
+			rows = make_table_offense(players);
+		} else if (chosen_category === 'defense') {
+			rows = make_table_defense(players);
+		} else if (chosen_category === 'playing_time') {
+			rows = make_table_playing_time(players);
+		} else if (chosen_category === 'per_point') {
+			rows = make_table_per_point(players);
+		}
+		rowsets.push(rows);
+	}
+
+	let merged_rows = [];
+	if (filterset_values.length > 1) {
+		for (let i = 0; i < rowsets.length; ++i) {
+			let marker = make_filter_marker(filterset_values[i]);
+
+			// Make filter header.
+			let tr = rowsets[i][0];
+			let th = document.createElement('th');
+			th.textContent = '';
+			tr.insertBefore(th, tr.firstChild);
+
+			for (let j = 1; j < rowsets[i].length; ++j) {
+				let tr = rowsets[i][j];
+
+				// Remove the name for cleanness.
+				if (i != 0) {
+					tr.firstChild.nextSibling.textContent = '';
+				}
+
+				if (i != 0) {
+					tr.style.borderTop = '0px';
+				}
+				if (i != rowsets.length - 1) {
+					tr.style.borderBottom = '0px';
+				}
+
+				// Make filter marker.
+				let td = document.createElement('td');
+				td.textContent = marker;
+				td.classList.add('filtermarker');
+				tr.insertBefore(td, tr.firstChild);
+			}
+		}
+
+		for (let i = 0; i < rowsets[0].length; ++i) {
+			for (let j = 0; j < rowsets.length; ++j) {
+				merged_rows.push(rowsets[j][i]);
+				if (i === 0) break;  // Don't merge the headings.
+			}
+		}
+	} else {
+		merged_rows = rowsets[0];
+	}
+	document.getElementById('stats').replaceChildren(...merged_rows);
 }
 
 function get_chosen_category() {
@@ -736,14 +813,14 @@ function make_poisson_ci(val, num, z, inverted)
 	// Fix the signs so that we don't get -0.00.
 	low = Math.max(low, 0.0);
 
-	// The display range of 0 to 0.25 is fairly arbitrary. So is the desired 0.05 per point.
+	// The display range of 0 to 0.5 is fairly arbitrary. So is the desired 0.05 per point.
 	let avg = val / num;
 	return {
 		'val': avg,
 		'lower_ci': low,
 		'upper_ci': high,
 		'min': 0.0,
-		'max': 0.25,
+		'max': 0.5,
 		'desired': 0.05,
 		'inverted': inverted,
 	};
@@ -815,6 +892,7 @@ function make_table_offense(players) {
 		rows.push(header);
 	}
 
+	let goals = 0;
 	let num_throws = 0;
 	let throwaways = 0;
 	let catches = 0;
@@ -851,6 +929,7 @@ function make_table_offense(players) {
 		row.dataset.player = q;
 		rows.push(row);
 
+		goals += p.goals;
 		num_throws += p.num_throws;
 		throwaways += p.throwaways;
 		catches += p.catches;
@@ -869,7 +948,7 @@ function make_table_offense(players) {
 
 	let row = document.createElement('tr');
 	add_3cell(row, '');
-	add_3cell(row, '');
+	add_3cell(row, goals);
 	add_3cell(row, '');
 	add_3cell(row, '');
 	add_3cell(row, num_throws);
@@ -897,9 +976,17 @@ 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);
 	}
+
+	let defenses = 0;
+	let pulls = 0;
+	let oob_pulls = 0;
+	let sum_sum_time = 0;
+	let callahans = 0;
+
 	for (const [q,p] of get_sorted_players(players)) {
 		if (q === 'globals') continue;
 		let sum_time = 0;
@@ -925,11 +1012,44 @@ 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;
 		rows.push(row);
+
+		defenses += p.defenses;
+		pulls += p.pulls;
+		oob_pulls += p.oob_pulls;
+		sum_sum_time += sum_time;
+		callahans += p.callahans;
+	}
+
+	// Globals.
+	let ci_oob = make_binomial_ci(oob_pulls, pulls, z);
+	ci_oob.format = 'percentage';
+	ci_oob.desired = 0.2;  // Arbitrary.
+	ci_oob.inverted = true;
+
+	let avg_time = 1e-3 * sum_sum_time / (pulls - oob_pulls);
+	let oob_pct = 100 * oob_pulls / pulls;
+
+	let row = document.createElement('tr');
+	add_3cell(row, '');
+	add_3cell(row, defenses);
+	add_3cell(row, pulls);
+	add_3cell(row, oob_pulls);
+	add_3cell_ci(row, ci_oob);
+	if (pulls > oob_pulls) {
+		add_3cell(row, avg_time.toFixed(1) + ' sec');
+	} else {
+		add_3cell(row, 'N/A');
 	}
+	add_3cell(row, callahans);
+	add_3cell(row, '');
+	add_3cell(row, '');
+	rows.push(row);
+
 	return rows;
 }
 
@@ -1043,12 +1163,21 @@ function make_table_per_point(players) {
 	let row = document.createElement('tr');
 	add_3cell(row, '');
 	if (globals.points_played > 0) {
-		add_3cell_with_filler_ci(row, goals == 0 ? 0 : (goals / globals.points_played).toFixed(2));
-		add_3cell_with_filler_ci(row, assists == 0 ? 0 : (assists / globals.points_played).toFixed(2));
-		add_3cell_with_filler_ci(row, hockey_assists == 0 ? 0 : (hockey_assists / globals.points_played).toFixed(2));
-		add_3cell_with_filler_ci(row, defenses == 0 ? 0 : (defenses / globals.points_played).toFixed(2));
-		add_3cell_with_filler_ci(row, throwaways == 0 ? 0 : (throwaways / globals.points_played).toFixed(2));
-		add_3cell_with_filler_ci(row, receiver_errors == 0 ? 0 : (receiver_errors / globals.points_played).toFixed(2));
+		let ci_goals = make_binomial_ci(goals, globals.points_played, z);
+		let ci_assists = make_binomial_ci(assists, globals.points_played, z);
+		let ci_hockey_assists = make_binomial_ci(hockey_assists, globals.points_played, z);
+		ci_goals.desired = 0.5;
+		ci_assists.desired = 0.5;
+		ci_hockey_assists.desired = 0.5;
+
+		add_3cell_ci(row, ci_goals);
+		add_3cell_ci(row, ci_assists);
+		add_3cell_ci(row, ci_hockey_assists);
+
+		add_3cell_ci(row, make_poisson_ci(defenses, globals.points_played, z));
+		add_3cell_ci(row, make_poisson_ci(throwaways, globals.points_played, z, true));
+		add_3cell_ci(row, make_poisson_ci(receiver_errors, globals.points_played, z, true));
+
 		add_3cell(row, touches == 0 ? 0 : (touches / globals.points_played).toFixed(2));
 	} else {
 		add_3cell_with_filler_ci(row, 'N/A');
@@ -1064,28 +1193,39 @@ function make_table_per_point(players) {
 	return rows;
 }
 
-function open_filter_menu() {
+function open_filter_menu(click_to_add_div) {
 	document.getElementById('filter-submenu').style.display = 'none';
+	let filter_div = click_to_add_div.parentElement;
+	let filter_id = filter_div.dataset.filterId;
 
 	let menu = document.getElementById('filter-add-menu');
+	menu.parentElement.removeChild(menu);
+	filter_div.appendChild(menu);
 	menu.style.display = 'block';
 	menu.replaceChildren();
 
 	// Place the menu directly under the “click to add” label;
 	// we don't anchor it since that label will move around
 	// and the menu shouldn't.
-	let rect = document.getElementById('filter-click-to-add').getBoundingClientRect();
+	let rect = click_to_add_div.getBoundingClientRect();
 	menu.style.left = rect.left + 'px';
 	menu.style.top = (rect.bottom + 10) + 'px';
 
-	add_menu_item(menu, 0, 'match', 'Match (any)');
-	add_menu_item(menu, 1, 'player_any', 'Player on field (any)');
-	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)');
+	let filterset = global_filters[filter_id];
+	if (filterset === undefined) {
+		global_filters[filter_id] = filterset = [];
+	}
+
+	add_menu_item(filter_div, filterset, menu, 0, 'match', 'Match (any)');
+	add_menu_item(filter_div, filterset, menu, 1, 'player_any', 'Player on field (any)');
+	add_menu_item(filter_div, filterset, menu, 2, 'player_all', 'Player on field (all)');
+	add_menu_item(filter_div, filterset, menu, 3, 'formation_offense', 'Offense played (any)');
+	add_menu_item(filter_div, filterset, menu, 4, 'formation_defense', 'Defense played (any)');
+	add_menu_item(filter_div, filterset, menu, 5, 'starting_on', 'Starting on');
+	add_menu_item(filter_div, filterset, menu, 6, 'gender_ratio', 'Gender ratio');
 }
 
-function add_menu_item(menu, menu_idx, filter_type, title) {
+function add_menu_item(filter_div, filterset, menu, menu_idx, filter_type, title) {
 	let item = document.createElement('div');
 	item.classList.add('option');
 	item.appendChild(document.createTextNode(title));
@@ -1097,13 +1237,54 @@ function add_menu_item(menu, menu_idx, filter_type, title) {
 
 	menu.appendChild(item);
 
-	item.addEventListener('click', (e) => { show_submenu(menu_idx, null, filter_type); });
+	item.addEventListener('click', (e) => { show_submenu(filter_div, filterset, menu_idx, null, filter_type); });
 }
 
-function show_submenu(menu_idx, pill, filter_type) {
+function find_all_ratios(json)
+{
+	let ratios = {};
+	let players = {};
+	for (const player of json['players']) {
+		players[player['player_id']] = {
+			'gender': player['gender'],
+			'last_point_seen': null,
+		};
+	}
+	for (const match of json['matches']) {
+		for (const [q,p] of Object.entries(players)) {
+			p.on_field_since = null;
+		}
+		for (const e of match['events']) {
+			let p = players[e['player']];
+			let type = e['type'];
+			if (type === 'in') {
+				p.on_field_since = 1;
+			} else if (type === 'out') {
+				p.on_field_since = null;
+			} else if (type === 'pull' || type == 'their_pull') {  // We assume no cross-gender subs for now.
+				let code = find_gender_ratio_code(players);
+				if (ratios[code] === undefined) {
+					ratios[code] = code;
+					if (code !== '4 F, 3 M' && code !== '4 M, 3 F' && code !== '3 M, 2 F' && code !== '3 F, 2 M') {
+						console.log('Unexpected gender ratio ' + code + ' first seen at: ' +
+						            match['description'] + ', ' + format_time(e['t']));
+					}
+				}
+			}
+		}
+	}
+	return ratios;
+}
+
+function show_submenu(filter_div, filterset, menu_idx, pill, filter_type) {
 	let submenu = document.getElementById('filter-submenu');
+
+	// Move to the same place as the top-level menu.
+	submenu.parentElement.removeChild(submenu);
+	document.getElementById('filter-add-menu').parentElement.appendChild(submenu);
+
 	let subitems = [];
-	const filter = find_filter(filter_type);
+	const filter = find_filter(filterset, filter_type);
 
 	let choices = [];
 	if (filter_type === 'match') {
@@ -1146,6 +1327,22 @@ 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
+		});
+	} else if (filter_type === 'gender_ratio') {
+		for (const [title, id] of Object.entries(find_all_ratios(global_json)).sort()) {
+			choices.push({
+				'title': title,
+				'id': id,
+			});
+		}
 	}
 
 	for (const choice of choices) {
@@ -1160,7 +1357,7 @@ function show_submenu(menu_idx, pill, filter_type) {
 		if (filter !== null && filter.elements.has(choice.id)) {
 			check.setAttribute('checked', 'checked');
 		}
-		check.addEventListener('change', (e) => { checkbox_changed(e, filter_type, choice.id); });
+		check.addEventListener('change', (e) => { checkbox_changed(filter_div, filterset, e, filter_type, choice.id); });
 
 		subitem.appendChild(check);
 		subitem.appendChild(document.createTextNode(choice.title));
@@ -1184,8 +1381,8 @@ function show_submenu(menu_idx, pill, filter_type) {
 }
 
 // Find the right filter, if it exists.
-function find_filter(filter_type) {
-	for (let f of global_filters) {
+function find_filter(filterset, filter_type) {
+	for (let f of filterset) {
 		if (f.type === filter_type) {
 			return f;
 		}
@@ -1193,32 +1390,114 @@ function find_filter(filter_type) {
 	return null;
 }
 
-function checkbox_changed(e, filter_type, id) {
-	let filter = find_filter(filter_type);
+// Equivalent to Array.prototype.filter, but in-place.
+function inplace_filter(arr, cond) {
+	let j = 0;
+	for (let i = 0; i < arr.length; ++i) {
+		if (cond(arr[i])) {
+			arr[j++] = arr[i];
+		}
+	}
+	arr.length = j;
+}
+
+function add_new_filterset() {
+	let template = document.querySelector('.filter');  // First one is fine.
+	let div = template.cloneNode(true);
+	let add_menu = div.querySelector('#filter-add-menu');
+	if (add_menu !== null) {
+		div.removeChild(add_menu);
+	}
+	let submenu = div.querySelector('#filter-submenu');
+	if (submenu !== null) {
+		div.removeChild(submenu);
+	}
+	div.querySelector('.filters').replaceChildren();
+	div.dataset.filterId = next_filterset_id++;
+	template.parentElement.appendChild(div);
+}
+
+function try_gc_filter_menus(cheap) {
+	let empties = [];
+	let divs = [];
+	for (const filter_div of document.querySelectorAll('.filter')) {
+		let id = filter_div.dataset.filterId;
+		divs.push(filter_div);
+		empties.push(global_filters[id] === undefined || global_filters[id].length === 0);
+	}
+	let last_div = divs[empties.length - 1];
+	if (cheap) {
+		// See if we have two empty filter lists at the bottom of the list;
+		// if so, we can remove one without it looking funny in the UI.
+		// If not, we'll have to wait until closing the menu.
+		// (The menu is positioned at the second-last one, so we can
+		// remove the last one without issue.)
+		if (empties.length >= 2 && empties[empties.length - 2] && empties[empties.length - 1]) {
+			delete global_filters[last_div.dataset.filterId];
+			last_div.parentElement.removeChild(last_div);
+		}
+	} else {
+		// This is a different situation from try_cheap_gc(), where we should
+		// remove the one _not_ last. We might need to move the menu to the last one,
+		// though, so it doesn't get lost.
+		for (let i = 0; i < empties.length - 1; ++i) {
+			if (!empties[i]) {
+				continue;
+			}
+			let div = divs[i];
+			delete global_filters[div.dataset.filterId];
+			let add_menu = div.querySelector('#filter-add-menu');
+			if (add_menu !== null) {
+				div.removeChild(add_menu);
+				last_div.appendChild(add_menu);
+			}
+			let submenu = div.querySelector('#filter-submenu');
+			if (submenu !== null) {
+				div.removeChild(submenu);
+				last_div.appendChild(submenu);
+			}
+			div.parentElement.removeChild(div);
+		}
+	}
+}
+
+function checkbox_changed(filter_div, filterset, e, filter_type, id) {
+	let filter = find_filter(filterset, filter_type);
+	let pills_div = filter_div.querySelector('.filters');
 	if (e.target.checked) {
+		// See if we must create a new empty filterset (since this went from
+		// empty to non-empty).
+		if (filterset.length === 0) {
+			add_new_filterset();
+		}
+
 		// See if we must add a new filter to the list.
 		if (filter === null) {
 			filter = {
 				'type': filter_type,
 				'elements': new Set([ id ]),
 			};
-			filter.pill = make_filter_pill(filter);
-			global_filters.push(filter);
-			document.getElementById('filters').appendChild(filter.pill);
+			filter.pill = make_filter_pill(filter_div, filterset, filter);
+			filterset.push(filter);
+			pills_div.appendChild(filter.pill);
 		} else {
 			filter.elements.add(id);
-			let new_pill = make_filter_pill(filter);
-			document.getElementById('filters').replaceChild(new_pill, filter.pill);
+			let new_pill = make_filter_pill(filter_div, filterset, filter);
+			pills_div.replaceChild(new_pill, filter.pill);
 			filter.pill = new_pill;
 		}
 	} else {
 		filter.elements.delete(id);
 		if (filter.elements.size === 0) {
-			document.getElementById('filters').removeChild(filter.pill);
-			global_filters = global_filters.filter(f => f !== filter);
+			pills_div.removeChild(filter.pill);
+			inplace_filter(filterset, f => f !== filter);
+
+			if (filterset.length == 0) {
+				try_gc_filter_menus(true);
+			}
 		} else {
-			let new_pill = make_filter_pill(filter);
-			document.getElementById('filters').replaceChild(new_pill, filter.pill);
+			let new_pill = make_filter_pill(filter_div, filterset, filter);
+			pills_div.replaceChild(new_pill, filter.pill);
 			filter.pill = new_pill;
 		}
 	}
@@ -1226,7 +1505,7 @@ function checkbox_changed(e, filter_type, id) {
 	process_matches(global_json, global_filters);
 }
 
-function make_filter_pill(filter) {
+function make_filter_pill(filter_div, filterset, filter) {
 	let pill = document.createElement('div');
 	pill.classList.add('filter-pill');
 	let text;
@@ -1303,7 +1582,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,11 +1596,32 @@ 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';
+		}
+	} else if (filter.type === 'gender_ratio') {
+		text = 'Gender: ';
+
+		let first = true;
+		for (const name of Array.from(filter.elements).sort()) {
+			if (!first) {
+				text += '; ';
+			}
+			text += name;  // FIXME
+			first = false;
+		}
 	}
 
 	let text_node = document.createElement('span');
 	text_node.innerText = text;
-	text_node.addEventListener('click', (e) => show_submenu(null, pill, filter.type));
+	text_node.addEventListener('click', (e) => show_submenu(filter_div, filterset, null, pill, filter.type));
 	pill.appendChild(text_node);
 
 	pill.appendChild(document.createTextNode(' '));
@@ -1330,8 +1630,11 @@ function make_filter_pill(filter) {
 	delete_node.innerText = '✖';
 	delete_node.addEventListener('click', (e) => {
 		// Delete this filter entirely.
-		document.getElementById('filters').removeChild(pill);
-		global_filters = global_filters.filter(f => f !== filter);
+		pill.parentElement.removeChild(pill);
+		inplace_filter(filterset, f => f !== filter);
+		if (filterset.length == 0) {
+			try_gc_filter_menus(false);
+		}
 		process_matches(global_json, global_filters);
 
 		let add_menu = document.getElementById('filter-add-menu');
@@ -1345,6 +1648,60 @@ function make_filter_pill(filter) {
 	return pill;
 }
 
+function make_filter_marker(filterset) {
+	let text = '';
+	for (const filter of filterset) {
+		if (text !== '') {
+			text += ',';
+		}
+		if (filter.type === 'match') {
+			let all_names = [];
+			for (const match of global_json['matches']) {
+				all_names.push(match['description']);
+			}
+			let common_prefix = find_common_prefix_of_all(all_names);
+
+			let sorted_match_id = Array.from(filter.elements).sort((a, b) => a - b);
+			for (const match_id of sorted_match_id) {
+				let desc = find_match(match_id)['description'];
+				if (common_prefix === null) {
+					text += desc.substr(0, 3);
+				} else {
+					text += desc.substr(common_prefix.length, 3);
+				}
+			}
+		} else if (filter.type === 'player_any' || filter.type === 'player_all') {
+			let sorted_players = Array.from(filter.elements).sort((a, b) => player_pos(a) - player_pos(b));
+			for (const player_id of sorted_players) {
+				text += find_player(player_id)['name'].substr(0, 3);
+			}
+		} else if (filter.type === 'formation_offense' || filter.type === 'formation_defense') {
+			let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
+			for (const formation_id of sorted_formation_id) {
+				text += find_formation(formation_id)['name'].substr(0, 3);
+			}
+		} else if (filter.type === 'starting_on') {
+			if (filter.elements.has(false) && filter.elements.has(true)) {
+				// Nothing.
+			} else if (filter.elements.has(false)) {
+				text += 'O';
+			} else {
+				text += 'D';
+			}
+		} else if (filter.type === 'gender_ratio') {
+			let first = true;
+			for (const name of Array.from(filter.elements).sort()) {
+				if (!first) {
+					text += '; ';
+				}
+				text += name.replaceAll(' ', '').substr(0, 2);  // 4 F, 3M -> 4 F.
+				first = false;
+			}
+		}
+	}
+	return text;
+}
+
 function find_common_prefix(a, b) {
 	let ret = '';
 	for (let i = 0; i < Math.min(a.length, b.length); ++i) {
@@ -1423,7 +1780,47 @@ function keep_match(match_id, filters) {
 	return true;
 }
 
-function filter_passes(players, formations_used_this_point, filter) {
+function find_gender_ratio_code(players) {
+	let map = {};
+	for (const [q,p] of Object.entries(players)) {
+		if (p.on_field_since === null) {
+			continue;
+		}
+		let gender = p.gender;
+		if (gender === '' || gender === undefined || gender === null) {
+			gender = '?';
+		}
+		if (map[gender] === undefined) {
+			map[gender] = 1;
+q		} else {
+			++map[gender];
+		}
+	}
+	let all_genders = Array.from(Object.keys(map)).sort(
+		(a,b) => {
+			if (map[a] !== map[b]) {
+				return map[b] - map[a];  // Reverse numeric.
+			} else if (a < b) {
+				return -1;
+			} else if (a > b) {
+				return 1;
+			} else {
+				return 0;
+			}
+		});
+	let code = '';
+	for (const g of all_genders) {
+		if (code !== '') {
+			code += ', ';
+		}
+		code += map[g];
+		code += ' ';
+		code += g;
+	}
+	return code;
+}
+
+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 +1842,17 @@ 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);
+	} else if (filter.type === 'gender_ratio') {
+		return filter.elements.has(find_gender_ratio_code(players));
 	}
 	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;
 		}
 	}
@@ -1483,7 +1884,7 @@ function should_reuse_last_formation(events, t) {
 }
 
 function possibly_close_menu(e) {
-	if (e.target.closest('#filter-click-to-add') === null &&
+	if (e.target.closest('.filter-click-to-add') === null &&
 	    e.target.closest('#filter-add-menu') === null &&
 	    e.target.closest('#filter-submenu') === null &&
 	    e.target.closest('.filter-pill') === null) {
@@ -1491,6 +1892,7 @@ function possibly_close_menu(e) {
 		let add_submenu = document.getElementById('filter-submenu');
 		add_menu.style.display = 'none';
 		add_submenu.style.display = 'none';
+		try_gc_filter_menus(false);
 	}
 }