Restructured TS map computation