refactor clean up
proper waterpolygon table creation