Water moved to  WaterPolygon entity. Fixed polygon triangulation bug