X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/c7ea69c641705f93aad1f35f14cc0425691aa0a5..f73ec42018bd7c627db8742c92636074033f19e4:/browser.plp

diff --git a/browser.plp b/browser.plp
index de245b8..a101d74 100644
--- a/browser.plp
+++ b/browser.plp
@@ -80,10 +80,11 @@ my %CSTATUS = (
 	other => 'l0', # non-w3
 );
 my %versions;
-if (my ($somerow) = values %{ $caniuse->{data} }) {
-	while (my ($browser, $row) = each %{ $somerow->{stats} }) {
-		$versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
-	}
+while (my ($browser, $row) = each %{ $caniuse->{agents} }) {
+	$versions{$browser} = [
+		sort { paddedver($a) cmp paddedver($b) } grep { defined }
+		@{ $row->{versions} }
+	];
 }
 
 print <<'';
@@ -195,13 +196,14 @@ $canihas ||= {
 		}
 	} @browsers
 }; # fallback hash based on release semantics
-my $usagemax = (max(map { ref $_ eq 'HASH' && sum(values %$_) } values %$canihas) // 1) / 100;
 
 my $usagepct = 1;  # score multiplier for 0..100 result
 # normalise usage percentage to only include shown browsers
 $usagepct = 100.01 / featurescore({  # yes for every possible version
 	map { $_ => { map {$_ => 'y'} map { @{$_} } @{$versions{$_}} } } keys %versions
 });
+$_->{usage} = featurescore($_->{stats}) * $usagepct
+	for values %{ $caniuse->{data} };
 
 print '<table class="mapped">';
 print '<col span="3">';  # should match first thead row
@@ -414,7 +416,6 @@ sub saybrowsercols {
 						sprintf('p%01d', $usage * ($usagepct - .0001) / 10),
 						sprintf('p%02d', $usage * ($usagepct - .0001)),
 					),
-					sprintf('pp%02d', $usage / $usagemax),
 				),
 				scalar @span,
 				$title,
@@ -430,13 +431,12 @@ sub saybrowsercols {
 
 sub sayusagecol {
 	my ($id) = @_;
-	print '<td>', int featurescore($caniuse->{data}->{$id}->{stats}) * $usagepct;
+	print '<td>', int $caniuse->{data}->{$id}->{usage};
 }
 
 say '<tbody>';
 for my $id (sort {
-	    featurescore($caniuse->{data}->{$b}->{stats})
-	<=> featurescore($caniuse->{data}->{$a}->{stats})
+	$caniuse->{data}->{$b}->{usage} <=> $caniuse->{data}->{$a}->{usage}
 } keys %{ $caniuse->{data} }) {
 	$caniuse->{data}->{$id}->{stats} or next;  # skip metadata [summary]
 	printf '<tr id="%s">', $id;