Fix area plotting

[Billy Janitsch]

I think I broke areas at some point during the refactor. Looking at the sandbox, the first point in each area is missing.

We probably need to cherry-pick the sandbox onto an old version, rebase everything else on top of that, then bisect.