How to link address and geometry to the object located there

Hi all,
I need to say that an organization (a pharmacy in particular) is located 
at an address and at the specified lat/lon coordinates, but I'm a bit 
confused. In the w3c ISA Programme Location Core Vocabulary description 
(http://www.w3.org/ns/locn) there is a diagram in Section Vocabulary 
Terms at a Glance showing a resource (the pharmacy in my case?) is 
directly linked with the Location, the Address and the Geometry. But, in 
the joinup web site I found another diagram showing that the Location 
instance is linked with Geometry and Address

http://joinup.ec.europa.eu/site/core_vocabularies/Core_Vocabularies_v1.1/Core_Vocabularies_v1.1.htm 
.

Currently, I'm using the latter modelling. Thus I  have a Pharmacy 
instance linked with a Location one via the location property, and the 
Location instance linked with an Address and a Geomerty one. Do I am right?

Thank you in advance,
Cristiano Longo