refactor : all buoys and beacons on one signle layer