RAW yes, they're 30 feet away.

As a home rule, I'll sometimes run total distance = long distance plus half the short distance. That also correlates nicely with making every other diagonal count as 10'