I am not sure of this at all. At the very least, we can bet by that timeframe the number of gas stations will be going down. Why? For the same reason I don't have a Boston Market or Pei Wei near me any more. Because capitalism.
Investors will not necessarily wait for even 50% of the cars on the road to be electric before they start pulling their money out of gas stations. And especially because most stations make very little at the pump anyway -- they make most of their money in the attached convenience store. I don't know how long pumps and underground tanks last, but I would expect that by 2030 some stations will be opting out of replacing warn out pump equipment. And I expect this to start in neighborhood stations in wealthy areas first, where EV adoption and land value are both high.