Map both features of the station independently. Here's an example of a [QuikTrip that has a convenience store and fuel][1]. fuel][1]. This also has the advantage of providing rich detail and more accurate door-to-door navigation. [1]: http://www.openstreetmap.org/?lat=36.07486&lon=-95.890667&zoom=18&layers=M

Map both features of the station independently. Here's an example of a [QuikTrip that has a convenience store and fuel][1]. [1]: http://www.openstreetmap.org/?lat=36.07486&lon=-95.890667&zoom=18&layers=M