some cleanup
areas on map main fix
reorganize database: moved landfill position to another table