Improve cleanup of area polygon

Fixes OpenTreeMap/otm2-addons#38
Fixes #1265
Fixes #1264