fix mistake where water_polygon wasn't getting populated
Potentially fix mistake with calculating area

it was mixing way & geo, which aren't the same types

see #25, #61