Replace city references with area in move calculator

5 jobs for br-comp-calc-iteration in 10 minutes and 32 seconds (queued for 3 seconds)