Shopfronts, etc: on building outer edge, or inside polygon?

Hi all

Quick question about where to put POIs that are accessed from the side of a building.

I can see two possible approaches:

On (and connected to?) the building outer polygon:
Set back inside the building outer polygon:

The first gives a better sense of where to access the ‘shop’; the second may be viewed as more accurate as the main area where business is done is often set into the building a little way (though not, as it happens, in the case of Adams Taxis here).

And what about these public toilets?
Is this a good representation given the only access is from Market Way?

Thanks as ever!