Merge branch 'IanThu1'

@@ -22,61 +22,66 @@ ep-core:Area
       rdfs:label "Compressibility"^^xsd:string ;
       rdfs:subClassOf owl:Class .
 
-ep-core:km2
-      rdfs:domain ep-core:Area .
-
-ep-core:npdPolygonPartOfAreaCoveredByBusinessArrangement
+ep-core:areaCoveredByBusinessArrangementHasNpdPolygonPart
       rdf:type owl:TransitiveProperty ;
       rdfs:domain ep-geo:AreaCoveredByBusinessArrangement ;
-      rdfs:range ep-geo:NpdPolygon ;
+      rdfs:range ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon ;
       rdfs:subPropertyOf ep-core:hasPart .
 
-ep-core:npdPolygonPartOfLicenceBlock
+ep-core:km2
+      rdfs:domain ep-core:Area .
+
+ep-core:licenceBlockHasNpdPolygonPart
       rdf:type owl:TransitiveProperty ;
       rdfs:domain ep-geo:LicenceBlock ;
-      rdfs:range ep-geo:NpdPolygon ;
+      rdfs:range ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon ;
       rdfs:subPropertyOf ep-core:hasPart .
 
 ep-geo:AreaCoveredByBusinessArrangement
       rdf:type ep-fac:ProductionFacilityType , owl:Class ;
-      rdfs:label "NPD Block"^^xsd:string ;
+      rdfs:label "A part of the earth recognised in a Business Arrangement"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:LicenceBlock , ep-geo:State , ep-geo:NpdPolygon , ep-geo:County , ep-geo:Country .
+      owl:disjointWith ep-geo:LicenceBlock , ep-geo:State , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:Country .
 
 ep-geo:Country
       rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "country"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:NpdPolygon , ep-geo:State .
+      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:State .
 
 ep-geo:County
       rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "county"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:State , ep-geo:NpdPolygon , ep-geo:Country .
+      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:State , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:Country .
 
 ep-geo:LicenceBlock
       rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:comment "See RDL RDS13025226"^^xsd:string ;
       rdfs:label "Licence Block"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:Country , ep-geo:State , ep-geo:County , ep-geo:AreaCoveredByBusinessArrangement , ep-geo:NpdPolygon .
+      owl:disjointWith ep-geo:Country , ep-geo:State , ep-geo:County , ep-geo:AreaCoveredByBusinessArrangement , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon .
 
-ep-geo:NpdPolygon
+ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon
       rdf:type owl:Class ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
       owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:Country , ep-geo:State .
 
 ep-geo:PartOfTheSurfaceOfTheEarth
       rdf:type owl:Class ;
-      rdfs:label "part of the surface of the earth"^^xsd:string ;
+      rdfs:label "part of the surface of the earth, including airspace above and earth/sea below"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 
 ep-geo:State
       rdf:type owl:Class , ep-fac:ProductionFacilityType ;
       rdfs:label "state"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:NpdPolygon , ep-geo:Country .
+      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:Country .
+
+ep-geo:areaOnSurfaceOfEarth
+      rdf:type owl:ObjectProperty ;
+      rdfs:domain ep-geo:PartOfTheSurfaceOfTheEarth ;
+      rdfs:range ep-core:Area .
 
 ep-geo:businessArrangementGoverningArea
       rdf:type owl:ObjectProperty ;