On subsequent batteries the app (iOS in my case) should have the drone return to the point of the last photo and proceed from there. It’s a major pain to burn battery unnecessarily when the subsequent battery/flight returns to the very beginning of the “interrupted” row.
This has been discussed many times and is on the board, but we have not heard an update. Your best bet is probably to bring the bird home immediately after finishing a waypoint and you know it is not going to make it to the next one. Position yourself on the sit so that you are approximately where the first battery should die and the drone is working it’s way toward you.
As Michael said, I always bring it home for battery change right after it passes a waypoint near me. That way I optimize flight time, battery life and it goes back there to restart.