Merge branch 'master' into add-flow-facts

David Price
Commit 159fb4a5f31c43c3c31444187dfd9e4587942324 159fb4a5 2 parents 33cab656 a99a297e
Showing 12 changed files with 844 additions and 950 deletions
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-FLOW-v1.0.ttl
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-MPR-xsd-proxy-v1.0.ttl
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-ACTIVITY-V1.0.ttl
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-FACILITY-v1.0.ttl
www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-REPORT-v1.0.ttl
www.reportinghub.no/ep/spin/SPIN_EPIM-MPR-lib-v1.1.spin.ttl
www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector-v1.0.ttl
www.reportinghub.no/ep/transform/TRANSFORM_mpr-facilityIdentifierStructure-v1.1.1.ttl
www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0.ttl
www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumeReport-v1.0.ttl
www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionActivity-v1.1.1.ttl
www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0.ttl
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-FLOW-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-FLOW-v1.0.ttl
View file @159fb4a
@@ -15,180 +15,168 @@
 <http://www.reportinghub.no/ep/schema/1.0/flow>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/core> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 ep-core:PhysicalThingAtInstant
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing at instant"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringGasYearToDate
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during gas year to date"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringMonthToDate
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during month to date"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringOneDay
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during one day"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringOneGasDay
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during one gas day"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringOneGasMonth
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during one gas month"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringOneGasYear
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during one gas year"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringOneMonth
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during one month"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringOneWeek
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during one week"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringOneYear
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during one year"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-core:PhysicalThingDuringYearToDate
-      rdf:type owl:Class , ep-flow:TemporalPartDurationType ;
+      rdf:type ep-flow:TemporalPartDurationType , owl:Class ;
       rdfs:label "physical thing during year to date"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalThing .
 ep-flow:AllocatedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is allocated back to a well as opposed to being measured at a well (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "allocated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:AllocatedInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
+      rdf:type ep-flow:ProductionInventoryDefinitionType , owl:Class ;
-      rdfs:comment "is \"allocated\" valid for an inventory"^^xsd:string ;
+      rdfs:comment "inventory that is allocated (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "allocated inventory"^^xsd:string ;
       rdfs:subClassOf ep-flow:Inventory .
 ep-flow:BudgetFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is a performance requirement as determined by a budget (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "budget flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:BudgetInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is a performance requirement determined by a budget (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "budget inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:ClassOfMaterialWithMassCriterion
       rdf:type rdfs:Class ;
-      rdfs:comment "class that has amounts of material with a particular mass as members"^^xsd:string , "NOTE: This class is used for the average daily mass of material in a particular flow. In this case the criteria for being a member of the class is that it is material taken from a particular flow during a reporting period, and that the material has the average mass of a daily flow during the reporting period."^^xsd:string ;
+      rdfs:comment "NOTE: This class is used for the average daily mass of material in a particular flow. In this case the criteria for being a member of the class is that it is material taken from a particular flow during a reporting period, and that the material has the average mass of a daily flow during the reporting period."^^xsd:string , "class that has amounts of material with a particular mass as members"^^xsd:string ;
       rdfs:label "class of material with mass criterion"^^xsd:string ;
       rdfs:subClassOf owl:Class .
 ep-flow:ConstraintFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is determined by an allowable or other performance limit. This includes allowables which are usually established by a regulatory agency for a product. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "constraint flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:ConstraintFlow-fixed
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "constraint flow that is the only permitted flow (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "constraint flow - fixed"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConstraintFlow .
 ep-flow:ConstraintFlow-maximum
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "constraint flow that is the maximum permitted flow (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "constraint flow - maximum"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConstraintFlow .
 ep-flow:ConstraintFlow-minimum
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "constraint flow that is the minimum permitted flow (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "constraint flow - minimum"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConstraintFlow .
-ep-flow:ConstraintInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "is \"constraint\" valid for an inventory"^^xsd:string ;
-      rdfs:label "constraint inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:ConsumptionFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "flow that is consumed by a facility (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:ConsumptionFlow-HPflare
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow - flare that is burned in a high pressure flare (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - HP flare"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow-flare .
 ep-flow:ConsumptionFlow-LPflare
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow - flare that is burned in a low pressure flare (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - LP flare"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow-flare .
 ep-flow:ConsumptionFlow-blackstart
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow that is to restart power facilities as a result of an overall power outage (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - blackstart"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow .
 ep-flow:ConsumptionFlow-compressor
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow that is by a compressor (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - compressor"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow .
 ep-flow:ConsumptionFlow-emitted
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow that is released into the atmosphere as a by-product of consumption (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - emitted"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow .
 ep-flow:ConsumptionFlow-flare
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow that is burned in a flare.  A fluid stream that has one or more flares as the ultimate target. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - flare"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow .
 ep-flow:ConsumptionFlow-fuel
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow that is by processing equipment (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - fuel"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow .
 ep-flow:ConsumptionFlow-noncompressor
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow that is by a device other than a compressor (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - non-compressor"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow .
 ep-flow:ConsumptionFlow-venting
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "consumption flow that is released into the atmosphere (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "consumption flow - venting"^^xsd:string ;
       rdfs:subClassOf ep-flow:ConsumptionFlow .
@@ -206,35 +194,23 @@ ep-flow:DailyProductionFlow
       rdfs:subClassOf ep-flow:ProductionFlow .
 ep-flow:DerivedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is derived directly from one or more other flows (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "derived flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:DerivedFlow-difference
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "derived flow that is the difference between two other flows (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "derived flow - difference"^^xsd:string ;
       rdfs:subClassOf ep-flow:DerivedFlow .
-ep-flow:DerivedInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "is \"derived\" valid for an inventory"^^xsd:string ;
-      rdfs:label "derived inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:DifferenceFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is the difference between two flows, e.g. a target flow and a metered flow (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "difference flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:DifferenceInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "is \"difference\" valid for an inventory"^^xsd:string ;
-      rdfs:label "difference inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:ElectricPowerFlow
       rdf:type owl:Class ;
       rdfs:comment "flow that is of electric power along a circuit"^^xsd:string ;
@@ -242,37 +218,31 @@ ep-flow:ElectricPowerFlow
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:EstimatedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is estimated or calculated, possibly based on comparable product flow units, but not based on reservoir simulations for the particular product flow unit (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "estimated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:EstimatedInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "is \"estimated\" valid for an inventory"^^xsd:string ;
-      rdfs:label "estimated inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:ExportFlow
-      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
       rdfs:comment "flow that leaves a facility for commercial purposes (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "export"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:ExportFlow-nominated
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "export flow that is planned (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "export flow nominated"^^xsd:string ;
       rdfs:subClassOf ep-flow:ExportFlow .
 ep-flow:ExportFlow-requested
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "export flow that is requested (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "export flow requested"^^xsd:string ;
       rdfs:subClassOf ep-flow:ExportFlow .
 ep-flow:ExportFlow-shortfall
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "export flow that is the difference between what was requested and what was delivered (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "export flow shortfall"^^xsd:string ;
       rdfs:subClassOf ep-flow:ExportFlow .
@@ -344,67 +314,61 @@ ep-flow:FlowOfLiquid
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:FlowToSale
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "flow that is sold and transported to a buyer by pipeline (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "flow to sale"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:FlowToStorage
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "flow that is directed to one or more storage locations (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "flow to storage"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:ForecastFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is a forecast (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "forecast flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:ForecastFlow-declineCurve
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "forecast flow that is calculated using a pseudo decline-curve of flow rate over time. This presumes that the flow will not be interrupted over the time period. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "forecast flow - decline curve"^^xsd:string ;
       rdfs:subClassOf ep-flow:ForecastFlow .
 ep-flow:ForecastFlow-standard
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "forecast flow that is a standard forecast as opposed to calculated using a decline curve (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "forecast flow - standard"^^xsd:string ;
       rdfs:subClassOf ep-flow:ForecastFlow .
-ep-flow:ForecastInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is a forecast (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "forecast inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:GasLiftFlow
-      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
       rdfs:comment "injection flow into a producing well to reduce the hydrostataic pressure of the fluid column. The resulting reduction in bottom hole pressure allows the reservoir liquids to flow. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "gas lift flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:InjectionFlow .
 ep-flow:GrossProductFlow
-      rdf:type owl:Class , ep-flow:ProductFlowGrossOrNetType ;
+      rdf:type ep-flow:ProductFlowGrossOrNetType , owl:Class ;
       rdfs:comment "probably a mistake - should be rolled up as condensate-gross or oil-gross"^^xsd:string ;
       rdfs:label "gross product flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductFlow .
 ep-flow:HydrocarbonAccountingFlow
-      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
       rdfs:comment "flow that is an accounting of all of the fluids into and out of Stock (i.e., Inventory) which includes all storage facilities at a site including fluid within a pipeline (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "hydrocarbon accounting"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:ImportFlow
-      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
       rdfs:comment "flow that enters a facility for commercial purposes (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "import"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:InjectionFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
+      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
       rdfs:comment "flow that is injected into a well (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "injection flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
@@ -416,83 +380,71 @@ ep-flow:Inventory
       rdfs:subClassOf ep-core:PhysicalObject .
 ep-flow:MassAdjustedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that <not documented in XSD>"^^xsd:string ;
       rdfs:label "mass adjusted flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:MeasuredFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is actually measured at the port (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "measured flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:MeasuredFlow-fiscal
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "measured flow that was measured for fiscal purposes"^^xsd:string ;
       rdfs:label "measured flow - fiscal"^^xsd:string ;
       rdfs:subClassOf ep-flow:MeasuredFlow .
 ep-flow:MeasuredFlow-raw
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "measured flow that is a raw measurement (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "measured flow - raw"^^xsd:string ;
       rdfs:subClassOf ep-flow:MeasuredFlow .
 ep-flow:MeasuredFlow-recalibrated
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionSubType ;
+      rdf:type ep-flow:ProductionFlowDefinitionSubType , owl:Class ;
       rdfs:comment "measured flow that has been changed because of a recalibration of a sensor (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "measured flow - recalibrated"^^xsd:string ;
       rdfs:subClassOf ep-flow:MeasuredFlow .
 ep-flow:MeasuredInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
+      rdf:type ep-flow:ProductionInventoryDefinitionType , owl:Class ;
-      rdfs:comment "inventory that is actually measured (source: MPR-XSD)"^^xsd:string ;
+      rdfs:comment "inventory that is of actually measured product volumes (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "measured inventory"^^xsd:string ;
       rdfs:subClassOf ep-flow:Inventory .
 ep-flow:MeteredFlowFiscal
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is generated by measurement and calculation and has an impact on company revenue and government taxation"^^xsd:string ;
       rdfs:label "metered flow fiscal"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:NetProductFlow
-      rdf:type owl:Class , ep-flow:ProductFlowGrossOrNetType ;
+      rdf:type ep-flow:ProductFlowGrossOrNetType , owl:Class ;
       rdfs:comment "probably a mistake - should be rolled up as condensate-net"^^xsd:string ;
       rdfs:label "net product flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductFlow .
 ep-flow:NominatedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is a promise to a buyer. Normally a 1 day forcast. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "nominated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:NominatedInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "is \"nominated\" valid for an inventory"^^xsd:string ;
-      rdfs:label "nominated inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:OverboardFlow
-      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
       rdfs:comment "flow that is overboard into the sea (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "overboard"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:PotentialFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is the estimated maximum possible (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "potential flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:PotentialInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is the estimated maximum possible (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "potential inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:Precipitation
       rdf:type owl:Class ;
       rdfs:comment "flow that is of rain, hail or snow from the atmoshere to the earths surface"^^xsd:string ;
@@ -506,17 +458,11 @@ ep-flow:PrecipitationType
       rdfs:subClassOf owl:Class .
 ep-flow:ProcessedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that has been processed. This is different from derived flow because it is fundamentally a variation of the original flow. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "processed flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:ProcessedInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is defined by processing measured values. This is different from a derived inventory because it is fundamentally a variation of the original. (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "processed inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:ProductFlow
       rdf:type owl:Class ;
       rdfs:comment "flow that is of product"^^xsd:string ;
@@ -542,31 +488,31 @@ ep-flow:ProductInventory
       rdfs:subClassOf ep-flow:Inventory .
 ep-flow:ProductInventoryAdjustedClosingBalance
-      rdf:type owl:Class , ep-flow:ProductInventoryType ;
+      rdf:type ep-flow:ProductInventoryType , owl:Class ;
       rdfs:comment "product inventory that <not documented in XSD>"^^xsd:string ;
       rdfs:label "product inventory adjusted closing balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryClosingBalance
-      rdf:type owl:Class , ep-flow:ProductInventoryType ;
+      rdf:type ep-flow:ProductInventoryType , owl:Class ;
       rdfs:comment "product inventory that is at the end of a time period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product inventory closing balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryClosingStorageBalance
-      rdf:type owl:Class , ep-flow:ProductInventoryType ;
+      rdf:type ep-flow:ProductInventoryType , owl:Class ;
       rdfs:comment "product inventory closing balance that has been adjusted"^^xsd:string ;
       rdfs:label "product inventory closing storage balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryOpFlex
-      rdf:type owl:Class , ep-flow:ProductInventoryType ;
+      rdf:type ep-flow:ProductInventoryType , owl:Class ;
       rdfs:comment "product inventory that is the unused and availiable quantity of gas within a gas transportation system and/or at one or many gas producing fields that is accessible by the operator responsible for gas transportation for the purposes of alleviating field curtailment (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product inventory opFlex"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
 ep-flow:ProductInventoryOpeningBalance
-      rdf:type owl:Class , ep-flow:ProductInventoryType ;
+      rdf:type ep-flow:ProductInventoryType , owl:Class ;
       rdfs:comment "product inventory that is at the beginning of a time period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product inventory opening balance"^^xsd:string ;
       rdfs:subClassOf ep-flow:ProductInventory .
@@ -584,7 +530,7 @@ ep-flow:ProductMaterialType
       rdfs:subClassOf owl:Class .
 ep-flow:ProductionExploitation
-      rdf:type ep-flow:ProductionFlowPurposeType , owl:Class ;
+      rdf:type owl:Class , ep-flow:ProductionFlowPurposeType ;
       rdfs:comment "flow that is exploited from a reservoir. This is independent of any disposition. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "production exploitation"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
@@ -684,67 +630,37 @@ ep-flow:ProductionTestWellHeadFlow
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:QuotaFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is set by some authority, and that may or may not be based on technical criteria (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "quota flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:QuotaInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory set by some authority, which may or may not be based on technical criteria (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "quota inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:RecommendedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is believed to be very desirable if it can be achieved. This a recommendation that something be changed in order to achieve this flow. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "recommended flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:RecommendedInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is believed to be very desirable if it can be achieved. This a recommendation that something be changed in order to achieve this. (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "recommended inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:SaleableFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is of a product marked as being saleable. Hence the final destination would be sale.  (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "saleable flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:SaleableInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is of marked as being saleable. Hence the final destination of the material would be a sale. (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "saleable inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:SimulatedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is estimated based on a simulation that includes the particular product flow unit (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "simulated flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:SimulatedInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is an estimate based upon a simulation (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "simulated inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:TargetFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that is desired (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "target flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
-ep-flow:TargetInventory
-      rdf:type owl:Class , ep-flow:ProductionInventoryDefinitionType ;
-      rdfs:comment "inventory that is desired (source: MPR-XSD)"^^xsd:string ;
-      rdfs:label "target inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:Inventory .
-
 ep-flow:TariffBasisFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that <not documented in XSD>"^^xsd:string ;
       rdfs:label "tariff basis flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
@@ -756,7 +672,7 @@ ep-flow:TemporalPartDurationType
       rdfs:subClassOf owl:Class .
 ep-flow:ValueAdjustedFlow
-      rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
+      rdf:type ep-flow:ProductionFlowDefinitionType , owl:Class ;
       rdfs:comment "flow that <not documented in XSD>"^^xsd:string ;
       rdfs:label "value adjusted flow"^^xsd:string ;
       rdfs:subClassOf ep-flow:Flow .
@@ -777,19 +693,19 @@ ep-flow:WholeLifeProductFlow
       rdf:type owl:Class ;
       rdfs:comment "product flow that is the whole life of a flow of product"^^xsd:string ;
       rdfs:label "whole life product flow"^^xsd:string ;
-      rdfs:subClassOf ep-flow:WholeLifeFlow , ep-flow:ProductFlow .
+      rdfs:subClassOf ep-flow:ProductFlow , ep-flow:WholeLifeFlow .
 ep-flow:WholeLifeProductInventory
       rdf:type owl:Class ;
       rdfs:comment "product inventory that is the whole life of the managed store of product"^^xsd:string ;
       rdfs:label "whole life product inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:WholeLifeInventory , ep-flow:ProductInventory .
+      rdfs:subClassOf ep-flow:ProductInventory , ep-flow:WholeLifeInventory .
 ep-flow:WholeLifeProductionFlow
       rdf:type owl:Class ;
       rdfs:comment "production flow that is the whole life of a flow of produced material"^^xsd:string ;
       rdfs:label "whole life production flow"^^xsd:string ;
-      rdfs:subClassOf ep-flow:WholeLifeFlow , ep-flow:ProductionFlow .
+      rdfs:subClassOf ep-flow:ProductionFlow , ep-flow:WholeLifeFlow .
 ep-flow:WholeLifeProductionFlowNetwork
       rdf:type owl:Class ;
@@ -801,7 +717,7 @@ ep-flow:WholeLifeProductionInventory
       rdf:type owl:Class ;
       rdfs:comment "production inventory that is the whole life of a store of produced material"^^xsd:string ;
       rdfs:label "whole life production inventory"^^xsd:string ;
-      rdfs:subClassOf ep-flow:WholeLifeInventory , ep-flow:ProductionInventory .
+      rdfs:subClassOf ep-flow:ProductionInventory , ep-flow:WholeLifeInventory .
 ep-flow:WholeLifeProductionInventoryCollection
       rdf:type owl:Class ;
@@ -816,28 +732,28 @@ ep-flow:Wind
       rdfs:subClassOf ep-flow:Flow .
 ep-flow:allocatedTo
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "facility that a split of a flow or inventory is allocated to"^^xsd:string ;
       rdfs:domain ep-core:PhysicalObject ;
       rdfs:label "allocatedTo"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
 ep-flow:amountOfPrecipitation
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "volume per unit area of material that falls in a precipitation"^^xsd:string ;
       rdfs:domain ep-flow:Precipitation ;
       rdfs:label "amount of precipitation"^^xsd:string ;
       rdfs:range ep-core:Length .
 ep-flow:dailyAverageAmountOfMaterial
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "mass that is the average of the masses of the materials that flows in different days"^^xsd:string ;
       rdfs:domain ep-flow:Flow ;
       rdfs:label "daily average amount of material"^^xsd:string ;
       rdfs:range ep-flow:ClassOfMaterialWithMassCriterion .
 ep-flow:energyContent
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "energy of combustion in a quantity of material"^^xsd:string ;
       rdfs:domain ep-material:QuantityOfMaterial ;
       rdfs:label "energy content"^^xsd:string ;
@@ -888,7 +804,7 @@ ep-flow:flowOutOf
       rdfs:subPropertyOf ep-flow:flowIntoOrOutOf .
 ep-flow:grossCalorificValue
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "energy per volume that is the gross calorific value for a quantity of material"^^xsd:string ;
       rdfs:domain ep-material:QuantityOfMaterial ;
       rdfs:label "gross calorific value"^^xsd:string ;
@@ -911,28 +827,28 @@ ep-flow:hasNetworkPart
       rdfs:subPropertyOf ep-core:hasPart .
 ep-flow:horizontalDirectionAzimuth
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "plane angle that is the horizontal direction azimuth of a flow"^^xsd:string ;
       rdfs:domain ep-flow:Flow ;
       rdfs:label "horizontal direction azimuth"^^xsd:string ;
       rdfs:range ep-core:PlaneAngle .
 ep-flow:massAtAccountingInstant
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:comment "mass that is at the accounting instant for an inventory during a period"^^xsd:string ;
       rdfs:domain ep-flow:Inventory ;
       rdfs:label "mass at accounting instant"^^xsd:string ;
       rdfs:range ep-core:Mass .
 ep-flow:materialThatFlows
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "quantity of material that moves during a flow"^^xsd:string ;
       rdfs:domain ep-flow:Flow ;
       rdfs:label "material that flows"^^xsd:string ;
       rdfs:range ep-material:QuantityOfMaterial .
 ep-flow:yearlyAverageAmountOfMaterial
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "mass that is the average of the masses of the materials that flows in different years"^^xsd:string ;
       rdfs:domain ep-flow:Flow ;
       rdfs:label "yearly average amount of material"^^xsd:string ;
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-MPR-xsd-proxy-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-MPR-xsd-proxy-v1.0.ttl
View file @159fb4a
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-ACTIVITY-V1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-ACTIVITY-V1.0.ttl
View file @159fb4a
@@ -48,7 +48,7 @@
 <http://www.reportinghub.no/ep/schema/activity#ProductionWellTest>
       rdf:type owl:Class ;
       rdfs:label "production well test"^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> , <http://www.reportinghub.no/ep/schema/activity#WellTest> .
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> , <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 <http://www.reportinghub.no/ep/schema/activity#WellOperation>
       rdf:type ep-prodact:ProductionActivityType ;
@@ -97,13 +97,13 @@ ep-prodact:AccidentPreventionExercise
       rdfs:subClassOf ep-prodact:DrillOrExcercise .
 ep-prodact:AdministerFirstAid
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "medical treatment that is first aid"^^xsd:string ;
       rdfs:label "administer first aid"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MedicalTreatment .
 ep-prodact:AirTrafficOperation
-      rdf:type ep-prodact:ProductionActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionActivityType ;
       rdfs:comment "activity that is an air traffic operation"^^xsd:string ;
       rdfs:label "air traffic operation"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
@@ -130,22 +130,22 @@ ep-prodact:AlertType
       rdfs:subClassOf owl:Class .
 ep-prodact:AllocateSplitFactors
-      rdf:type ep-prodact:SplitFactorDeterminationType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SplitFactorDeterminationType ;
       rdfs:comment "activity that is allocating the fraction of a source flow that is assumed to go into different product streams"^^xsd:string ;
       rdfs:label "allocate split factors"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:AnnualProductionActivityToDate
-      rdf:type ep-prodact:ProductionOperationClassByDuration , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionOperationClassByDuration ;
       rdfs:comment "not used in the MPR"^^xsd:string ;
       rdfs:label "annual production activity to date"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:AnnualProductionOperationToDate
-      rdf:type ep-prodact:ProductionOperationClassByDuration , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionOperationClassByDuration ;
       rdfs:comment "production operation from the beginning of an annual reporting period to a date within, or at the end of, the reporting period"^^xsd:string ;
       rdfs:label "annual production operation to date"^^xsd:string ;
-      rdfs:subClassOf ep-prodact:AnnualProductionActivityToDate , ep-prodact:ProductionOperation .
+      rdfs:subClassOf ep-prodact:ProductionOperation , ep-prodact:AnnualProductionActivityToDate .
 ep-prodact:BasketMovement
       rdf:type owl:Class ;
@@ -158,7 +158,7 @@ ep-prodact:CargoShipOperation
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:ConstructionOperation
-      rdf:type ep-prodact:ProductionActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionActivityType ;
       rdfs:comment "activity that is construction"^^xsd:string ;
       rdfs:label "construction operation"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> ;
@@ -166,7 +166,7 @@ ep-prodact:ConstructionOperation
               "http://posccaesar.org/rdl/RDS9685637"^^xsd:string .
 ep-prodact:DailyProductionOperationProcessingLoss
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is all that happens to cause production operation processing loss in one day"^^xsd:string ;
       rdfs:label "daily production operation processing loss"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
@@ -183,7 +183,7 @@ ep-prodact:DefinedHazardAndAccidentSituation
       rdfs:subClassOf ep-prodact:Incident .
 ep-prodact:Deviation
-      rdf:type ep-prodact:ProductionActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionActivityType ;
       rdfs:comment "activity that is a deviation from existing procedures and guidelines"^^xsd:string ;
       rdfs:label "deviation"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
@@ -194,25 +194,25 @@ ep-prodact:DischargeWater
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:DrillOrExcercise
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "activity that is a drill or exercise intended to prevent harm to health, safety or the environment"^^xsd:string ;
       rdfs:label "drill or exercise"^^xsd:string ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:ExtendedMaintenanceTurnaround
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is an extended maintenance turnaround"^^xsd:string ;
       rdfs:label "extended maintenance turnaround"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:ExtendedMaintenanceTurnaroundExportTerminal
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "extended maintenance turnaround that is for an export terminal"^^xsd:string ;
       rdfs:label "extended maintenance turnaround export terminal"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ExtendedMaintenanceTurnaround .
 ep-prodact:Fire
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "incident that is an unintentional fire"^^xsd:string ;
       rdfs:label "fire"^^xsd:string ;
       rdfs:subClassOf ep-prodact:Incident .
@@ -220,58 +220,58 @@ ep-prodact:Fire
 ep-prodact:FluidLevelTest
       rdf:type owl:Class ;
       rdfs:label "fluid level test"^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> , <http://www.reportinghub.no/ep/schema/activity#WellTest> .
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> , <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:FluidSampling-DST
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:comment "fluid sampling and analysis that has a sample taken as part of a drill stem test"^^xsd:string ;
       rdfs:label "fluid sampling - DST"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-RFTorMDT
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:label "fluid sampling - RFT or MDT"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-bottomhole
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:comment "fluid sampling and analysis that has a sample taken from the bottom of a wellbore"^^xsd:string ;
       rdfs:label "fluid sampling - bottomhole"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-formationTester
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:comment "fluid sampling and analysis that has the sample taken by a formation tester"^^xsd:string ;
       rdfs:label "fluid sampling - formation tester"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-recombined
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:label "fluid sampling - recombined"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-separatorGas
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:label "fluid sampling - separator gas"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-separatorOil
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:label "fluid sampling - separator oil"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-separatorWater
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:label "fluid sampling - separator water"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-synthetic
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:label "fluid sampling - synthetic"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
 ep-prodact:FluidSampling-wellhead
-      rdf:type ep-prodact:FluidSamplingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:FluidSamplingType ;
       rdfs:comment "fluid sampling and analysis that has the sample taken at the well head"^^xsd:string ;
       rdfs:label "fluid sampling - wellhead"^^xsd:string ;
       rdfs:subClassOf ep-prodact:FluidSamplingAndAnalysis .
@@ -300,7 +300,7 @@ ep-prodact:FusionOfPartsOfProductionActivityOverPeriod
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:HSEProblem
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is an HSE problem"^^xsd:string ;
       rdfs:label "HSE problem"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
@@ -318,7 +318,7 @@ ep-prodact:Incident
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:InitialWellTest
-      rdf:type ep-prodact:WellTestReasonType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:WellTestReasonType ;
       rdfs:comment "well test that is the first on a well"^^xsd:string ;
       rdfs:label "initial well test"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> .
@@ -326,7 +326,7 @@ ep-prodact:InitialWellTest
 ep-prodact:InjectionWellTest
       rdf:type owl:Class ;
       rdfs:label "injection well test"^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> , <http://www.reportinghub.no/ep/schema/activity#WellTest> .
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> , <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:Injury
       rdf:type owl:Class ;
@@ -335,25 +335,25 @@ ep-prodact:Injury
       rdfs:subClassOf ep-prodact:AccidentOrInjury .
 ep-prodact:IssueBillOfLading
-      rdf:type ep-prodact:SalesActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SalesActivityType ;
       rdfs:comment "sales activity that is issuing a bill of lading"^^xsd:string ;
       rdfs:label "issue bill of lading"^^xsd:string ;
       rdfs:subClassOf ep-prodact:SalesActivity .
 ep-prodact:IssueWorkPermit
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "activity that is issuing a work permit"^^xsd:string ;
       rdfs:label "issue work permit"^^xsd:string ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:IssueWorkPermitWithSJA
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "issue a work permit with Safe Job Analysis"^^xsd:string ;
       rdfs:label "issue work permit with SJA"^^xsd:string ;
       rdfs:subClassOf ep-prodact:IssueWorkPermit .
 ep-prodact:JobObservation
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "<not defined in MPR-XSD>"^^xsd:string ;
       rdfs:label "job observation"^^xsd:string ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
@@ -370,13 +370,13 @@ ep-prodact:LostTimeAccident
       rdfs:subClassOf ep-prodact:Injury .
 ep-prodact:LostTimeIncident
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "incident that results in an injured employee who requires medical treatment and cannot return to work the next day (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "lost time incident"^^xsd:string ;
       rdfs:subClassOf ep-prodact:Injury .
 ep-prodact:MaintenanceActivity
-      rdf:type ep-prodact:ProductionActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionActivityType ;
       rdfs:comment "activity that is maintenance"^^xsd:string ;
       rdfs:label "maintenance activity"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
@@ -389,7 +389,7 @@ ep-prodact:MakeAComment
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:MakeATransaction
-      rdf:type ep-prodact:SalesActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SalesActivityType ;
       rdfs:comment "sales activity that is making a transaction"^^xsd:string ;
       rdfs:label "make a transaction"^^xsd:string ;
       rdfs:subClassOf ep-prodact:SalesActivity .
@@ -400,12 +400,12 @@ ep-prodact:MarineOperation
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:MarkedGasLossOfExport
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:label "marked gas loss of export"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:MarkedOilLossOfExport
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:label "marked oil loss of export"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
@@ -415,7 +415,7 @@ ep-prodact:MeasurePropertiesOfAFlow
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:MeasureSplitFactors
-      rdf:type ep-prodact:SplitFactorDeterminationType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SplitFactorDeterminationType ;
       rdfs:comment "activity that is measuring the fraction of a source flow that goes into different product streams"^^xsd:string ;
       rdfs:label "measure split factors"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> .
@@ -427,19 +427,19 @@ ep-prodact:MedicalTreatment
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:MedicalTreatmentInjury
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "injury that requires medical treatment"^^xsd:string ;
       rdfs:label "medical treatment injury"^^xsd:string ;
       rdfs:subClassOf ep-prodact:Injury .
 ep-prodact:ModificationProject
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a modification project"^^xsd:string ;
       rdfs:label "modification project"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:MonthlyProductionOperationToDate
-      rdf:type ep-prodact:ProductionOperationClassByDuration , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionOperationClassByDuration ;
       rdfs:comment "production operation from the beginning of a monthly reporting period to a date within, or at the end of, the reporting period"^^xsd:string ;
       rdfs:label "monthly production operation to date"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperation .
@@ -457,25 +457,25 @@ ep-prodact:MovementOfProductType
       rdfs:subClassOf owl:Class .
 ep-prodact:NearMiss
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "incident that under different circumstances could have caused injury, illness and/or major damage to/loss of assets, or harm to the environment or to a third party (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "near miss"^^xsd:string ;
       rdfs:subClassOf ep-prodact:Incident .
 ep-prodact:OperationMistakes
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is an operation mistake"^^xsd:string ;
       rdfs:label "operation mistakes"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:OtherReasonWellTest
-      rdf:type ep-prodact:WellTestReasonType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:WellTestReasonType ;
       rdfs:comment "well test that is not initial, periodic, or a revision"^^xsd:string ;
       rdfs:label "other reason well text"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> .
 ep-prodact:PeriodicWellTest
-      rdf:type ep-prodact:WellTestReasonType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:WellTestReasonType ;
       rdfs:comment "well test that is carried out as part of a periodic testing regime"^^xsd:string ;
       rdfs:label "periodic well test"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> .
@@ -487,31 +487,31 @@ ep-prodact:PersonnelSafetyIntroduction
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:PlannedMaintenanceTurnaround
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a planned maintenance turnaround"^^xsd:string ;
       rdfs:label "planned maintenace turnaround"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:PowerStationFailure
-      rdf:type ep-prodact:ProductionActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionActivityType ;
       rdfs:comment "activity that is the failure of a power station"^^xsd:string ;
       rdfs:label "power station failure"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:PreventiveMaintenanceTopside
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is preventive maintenance topside"^^xsd:string ;
       rdfs:label "preventive maintenace topside"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:ProcessAndOperationProblem
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a process and operation problem"^^xsd:string ;
       rdfs:label "process and operation problem"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:ProductCompletedLifting
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is exported from a stock within a given time period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product completed lifting"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
@@ -522,85 +522,85 @@ ep-prodact:ProductDespatch
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:ProductGain-Loss
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is the lack of proper proportion or relation between the corresponding input and liftings transactions (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product gain/loss"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductInputToStorage
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is addition to a stock within a given time period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product input to storage"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductLifted
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is from storage"^^xsd:string ;
       rdfs:label "product lifted"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductLiftingEntitlement
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that <not documented in XSD>"^^xsd:string ;
       rdfs:label "product lifting entitlement"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductLiftingEntitlementRemaining
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that <not documented in XSD>"^^xsd:string ;
       rdfs:label "product lifting entitlement remaining"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductLinePack
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that provides the quantity of gas which the operator responsible for gas transportation decides must be provided by the gas producing fields in order to make deliveries as requested by gas shippers and provide operating tolerances (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product line pack"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductMassAdjustment
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that <not documented in XSD>"^^xsd:string ;
       rdfs:label "product mass adjustment"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductPartialLifting
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is a lifting up to a (not completed) determined point in time (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product partial lifting"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductPipelineLifting
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is exported from a stock by a pipeline"^^xsd:string ;
       rdfs:label "product pipeline lifting"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductProductionImbalance
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is the difference between the amount of gas entering and exiting a shipper's nomination portfolio. This will take into account all differences whatever the time or reason it occurs. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "product production imbalance"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductSwap
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that <not documented in XSD>"^^xsd:string ;
       rdfs:label "product swap"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductTankerLifting
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that is exported from a stock by a tanker"^^xsd:string ;
       rdfs:label "product tanker lifting"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductTransaction
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that <not documented in XSD>"^^xsd:string ;
       rdfs:label "product transaction"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
 ep-prodact:ProductTransfer
-      rdf:type ep-prodact:MovementOfProductType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:MovementOfProductType ;
       rdfs:comment "movement of product that <not documented in XSD>"^^xsd:string ;
       rdfs:label "product transfer"^^xsd:string ;
       rdfs:subClassOf ep-prodact:MovementOfProduct .
@@ -612,7 +612,7 @@ ep-prodact:ProductionActivityType
       rdfs:subClassOf owl:Class .
 ep-prodact:ProductionOperation
-      rdf:type ep-prodact:ProductionActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ProductionActivityType ;
       rdfs:comment "production activity that is all of what is done in the operation of a facility during a period"^^xsd:string ;
       rdfs:label "production operation"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
@@ -641,13 +641,13 @@ ep-prodact:ProductionOperationProcessingLoss
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:ProductionOperationProcessingLossForUnspecifiedReason
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a production operation processing loss without a specified reason"^^xsd:string ;
       rdfs:label "production operation processing loss for unspecified reason"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:ProductionOperationProcessingRegulatoryReference
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a production operation processing regulatory reference"^^xsd:string ;
       rdfs:label "production operation processing regulatory reference"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
@@ -676,25 +676,25 @@ ep-prodact:ReasonForLossOfProcessingType
       rdfs:subClassOf owl:Class .
 ep-prodact:ReleaseToAir
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "spill or leak that is to air"^^xsd:string ;
       rdfs:label "release to air"^^xsd:string ;
       rdfs:subClassOf ep-prodact:SpillOrLeak .
 ep-prodact:ReleaseToWater
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "spill or leak that is to water"^^xsd:string ;
       rdfs:label "release to water"^^xsd:string ;
       rdfs:subClassOf ep-prodact:SpillOrLeak .
 ep-prodact:ReportHazard
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "activity that is making a formal report of a hazard"^^xsd:string ;
       rdfs:label "report hazard"^^xsd:string ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:ReservoirLoss
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a reservoir loss"^^xsd:string ;
       rdfs:label "reservoir loss"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
@@ -706,13 +706,13 @@ ep-prodact:RestrictedWork
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:RestrictedWorkInjury
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "injury that results in a reduction in ability to work"^^xsd:string ;
       rdfs:label "restricted work injury"^^xsd:string ;
       rdfs:subClassOf ep-prodact:Injury .
 ep-prodact:RevisionWellTest
-      rdf:type ep-prodact:WellTestReasonType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:WellTestReasonType ;
       rdfs:comment "well test that is <not defined in MPR-XSD>"^^xsd:string ;
       rdfs:label "revision well test"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> .
@@ -730,7 +730,7 @@ ep-prodact:SafetyConsideration
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:SafetyMeeting
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "activity that is a safety meeting"^^xsd:string ;
       rdfs:label "safety meeting"^^xsd:string ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
@@ -748,13 +748,13 @@ ep-prodact:SalesActivityType
       rdfs:subClassOf owl:Class .
 ep-prodact:SentAshore
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "activity that is sending a person ashore"^^xsd:string ;
       rdfs:label "sent ashore"^^xsd:string ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:SevereAccident
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "accident that challenges safety systems at a level much higher than expected (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "severe accident"^^xsd:string ;
       rdfs:subClassOf ep-prodact:AccidentOrInjury .
@@ -765,13 +765,13 @@ ep-prodact:ShutdownProduction
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> .
 ep-prodact:SickOnBoard
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "activity that is a person being ill on board"^^xsd:string ;
       rdfs:label "sick on board"^^xsd:string ;
       rdfs:subClassOf ep-prodact:HealthSafetyAndEnvironmentActivity .
 ep-prodact:SpillOrLeak
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "incident that is a spill or leak"^^xsd:string ;
       rdfs:label "spill or leak"^^xsd:string ;
       rdfs:subClassOf ep-prodact:Incident .
@@ -788,7 +788,7 @@ ep-prodact:StandbyVesselOperation
       rdfs:subClassOf ep-prodact:MarineOperation .
 ep-prodact:StrikeOrLockout
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a strike or lock-out"^^xsd:string ;
       rdfs:label "strike or lock-out"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
@@ -799,25 +799,25 @@ ep-prodact:SupplyShipOperation
       rdfs:subClassOf ep-prodact:MarineOperation .
 ep-prodact:TestingAndLogging
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is testing and logging"^^xsd:string ;
       rdfs:label "testing and logging"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:ThirdPartyProcessingLoss
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a third party processing loss"^^xsd:string ;
       rdfs:label "third party processing loss"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:TopsideEquipmentFailureMaintenance
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is an topside equipment failure and maintenance"^^xsd:string ;
       rdfs:label "topside equipment failure maintenance"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:TrafficAccident
-      rdf:type ep-prodact:SafetyActivityType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:SafetyActivityType ;
       rdfs:comment "accident that involves one or more moving vehicles"^^xsd:string ;
       rdfs:label "traffic accident"^^xsd:string ;
       rdfs:subClassOf ep-prodact:AccidentOrInjury .
@@ -828,13 +828,13 @@ ep-prodact:TransportationActivity
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:UnavailableTankerStorage
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is unavailable tanker storage"^^xsd:string ;
       rdfs:label "unavailable tanker storage"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:UnknownReasonWellTest
-      rdf:type ep-prodact:WellTestReasonType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:WellTestReasonType ;
       rdfs:comment "well test that is carried out for a reason that is not recorded"^^xsd:string ;
       rdfs:label "unknown reason well test"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#WellTest> .
@@ -845,31 +845,31 @@ ep-prodact:WaterCleaningOperation
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:WeatherProblem
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is a weather problem"^^xsd:string ;
       rdfs:label "weather problem"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:WellEquipmentFailureMaintenance
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is well equipment failure and maintenance"^^xsd:string ;
       rdfs:label "well equipment failure maintenance"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:WellPlannedOperations
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is well planned operations"^^xsd:string ;
       rdfs:label "well planned operations"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:WellPreventiveMaintenance
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is well preventive maintenance"^^xsd:string ;
       rdfs:label "well preventive maintenance"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
 ep-prodact:WellProblems
-      rdf:type ep-prodact:ReasonForLossOfProcessingType , owl:Class ;
+      rdf:type owl:Class , ep-prodact:ReasonForLossOfProcessingType ;
       rdfs:comment "activity that is well problems"^^xsd:string ;
       rdfs:label "well problems"^^xsd:string ;
       rdfs:subClassOf ep-prodact:ProductionOperationProcessingLoss .
@@ -882,6 +882,7 @@ ep-prodact:WellTestReasonType
 ep-prodact:accountNumber
       rdf:type owl:DatatypeProperty ;
+      rdfs:comment "identifier of the account for a sales activity"^^xsd:string ;
       rdfs:domain ep-prodact:SalesActivity ;
       rdfs:label "account number"^^xsd:string .
@@ -906,7 +907,9 @@ ep-prodact:buyer
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#PersonOrOrganization> .
 ep-prodact:cargoBatchNumber
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:comment "identifier for a batch of cargo"^^xsd:string ;
+      rdfs:domain ep-material:BatchOfCargo ;
       rdfs:label "cargo batch number"^^xsd:string .
 ep-prodact:cargoLoaded
@@ -916,7 +919,9 @@ ep-prodact:cargoLoaded
       rdfs:range ep-core:PhysicalObject .
 ep-prodact:cargoNumber
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdfs:comment "identifier of a cargo"^^xsd:string ;
+      rdfs:domain ep-material:QuantityOfMaterial ;
       rdfs:label "cargo number"^^xsd:string .
 ep-prodact:causedBy
@@ -974,7 +979,7 @@ ep-prodact:facilityShutdown
       rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
 ep-prodact:glycolDensity
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:range ep-core:Density .
 ep-prodact:hasDischargeFlow
@@ -984,7 +989,7 @@ ep-prodact:hasDischargeFlow
       rdfs:range <http://www.reportinghub.no/ep/schema/flow#Flow> .
 ep-prodact:hasGasLiftChoke
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/activity#WellTest> ;
       rdfs:label "has gas lift choke"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/production-equipment#GasLiftChoke> .
@@ -1002,7 +1007,7 @@ ep-prodact:hasPredecessor
       rdfs:range <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:hasShutInPressure
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionWellTest> ;
       rdfs:label "has shut-in pressure"^^xsd:string ;
       rdfs:range ep-core:Pressure .
@@ -1014,25 +1019,25 @@ ep-prodact:hasValidPredecessor
       rdfs:range <http://www.reportinghub.no/ep/schema/activity#Activity> .
 ep-prodact:injectionWellTestMaximumAnnularPressure
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-prodact:InjectionWellTest ;
       rdfs:label "injection well test maximum annular pressure"^^xsd:string ;
       rdfs:range ep-core:Pressure .
 ep-prodact:injectionWellTestMinimumAnnularPressure
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-prodact:InjectionWellTest ;
       rdfs:label "injection well test minimum annular pressure"^^xsd:string ;
       rdfs:range ep-core:Pressure .
 ep-prodact:injectionWellTestWellheadFlowingPressure
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-prodact:InjectionWellTest ;
       rdfs:label "injection well test wellhead flowing pressure"^^xsd:string ;
       rdfs:range ep-core:Pressure .
 ep-prodact:injectionWellTestWellheadMaximumPressure
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-prodact:InjectionWellTest ;
       rdfs:label "injection well test wellhead maximum pressure"^^xsd:string ;
       rdfs:range ep-core:Pressure .
@@ -1044,62 +1049,16 @@ ep-prodact:measuredFlow
       rdfs:range <http://www.reportinghub.no/ep/schema/flow#Flow> .
 ep-prodact:movedProduct
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain ep-prodact:MovementOfProduct ;
       rdfs:label "moved product"^^xsd:string .
-ep-prodact:noOfDrillsOrExcercises
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfFirstAidEvents
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfHazardReportCards
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfMiscellaneousHseEvents
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfPermitsWithSjaIssued
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfRestrictedWorkAndMedicalTreatmentInjuries
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfSafetyMeetings
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfSpillsOrLeaks
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
-ep-prodact:noOfSystemAlarms
-      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:label "number of system alarms"^^xsd:string ;
-      rdfs:range xsd:integer .
-
 ep-prodact:oilInWater
       rdf:type owl:ObjectProperty ;
       rdfs:range ep-core:MassPerMass .
 ep-prodact:onProductionFacility
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
       rdfs:label "on facility"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> .
@@ -1124,7 +1083,7 @@ ep-prodact:phenolDensity
       rdfs:range ep-core:Density .
 ep-prodact:processingLost
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain ep-prodact:ProductionOperationProcessingLoss ;
       rdfs:range ep-material:QuantityOfMaterial .
@@ -1135,13 +1094,13 @@ ep-prodact:productionActivityPeriodClassification
       rdfs:range ep-prodact:ProductionOperationClassByDuration .
 ep-prodact:productionOperator
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
       rdfs:label "production operator"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#Organization> .
 ep-prodact:remainingActivity
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain ep-prodact:LastPartOfTypeRemainingActivityPair ;
       rdfs:label "remaining activity"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/activity#Activity> .
@@ -1156,14 +1115,6 @@ ep-prodact:salesAdministrator
       rdfs:label "sales administrator"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#PersonOrOrganization> .
-ep-prodact:samplePhValue
-      rdf:type owl:DatatypeProperty ;
-      rdfs:range xsd:double .
-
-ep-prodact:sampleTurbidity
-      rdf:type owl:DatatypeProperty ;
-      rdfs:range xsd:double .
-
 ep-prodact:sampledMaterial
       rdf:type owl:ObjectProperty ;
       rdfs:domain ep-prodact:FluidSamplingAndAnalysis ;
@@ -1176,7 +1127,7 @@ ep-prodact:samplingPerformedAt
       rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
 ep-prodact:samplingPerformedAtPointInSpace
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain ep-prodact:FluidSamplingAndAnalysis ;
       rdfs:label "sampling performed at point in space"^^xsd:string ;
       rdfs:range ep-core:TemporalPartOfAPointInSpace .
@@ -1200,22 +1151,17 @@ ep-prodact:sourceOrganization
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#Organization> .
 ep-prodact:testedWellBoreInterval
-      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/activity#WellTest> ;
       rdfs:label "tested wellbore interval"^^xsd:string ;
       rdfs:range ep-core:PhysicalObject .
 ep-prodact:timeWorked
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-prodact:ProductionOperation ;
       rdfs:label "time worked"^^xsd:string ;
       rdfs:range ep-core:TimeDuration .
-ep-prodact:totalNoOfPermitsIssued
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/activity#ProductionActivity> ;
-      rdfs:range xsd:integer .
-
 ep-prodact:totalOrganicCarbonInWater
       rdf:type owl:ObjectProperty ;
       rdfs:range ep-core:MassPerMass .
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-FACILITY-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-PRODUCTION-FACILITY-v1.0.ttl
View file @159fb4a
@@ -12,7 +12,7 @@
 <http://www.reportinghub.no/ep/schema/1.0/production-facility>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/production-well> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/production-well> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/facility> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 <http://www.reportinghub.no/ep/schema/equipment#Compressor>
@@ -73,56 +73,56 @@
       rdf:type ep-prodfac:ReportingFacilityType .
 <http://www.reportinghub.no/ep/schema/facility#averageHighestThirdWaveHeight>
-      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
       rdfs:comment "length that is the average of the higher 1/3 of the wave heights passing during a sample period (typically 20 to 30 minutes) (source: MPR-XSD)"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "average highest third wave height"^^xsd:string ;
       rdfs:range ep-core:Length .
 <http://www.reportinghub.no/ep/schema/facility#averageWaveHeight>
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:comment "length that is the average height of surface waves"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "average wave height"^^xsd:string ;
       rdfs:range ep-core:Length .
 <http://www.reportinghub.no/ep/schema/facility#cloudCeilingHeight>
-      rdf:type owl:ObjectProperty , ep-core:Class_of_indirect_property , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , ep-core:Class_of_indirect_property , owl:ObjectProperty ;
       rdfs:comment "length that is the height of the cloud ceiling"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#CloudCover> ;
       rdfs:label "cloud ceiling height"^^xsd:string ;
       rdfs:range ep-core:Length .
 <http://www.reportinghub.no/ep/schema/facility#facilityOperator>
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "organization that operates a facility"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "facility operator"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#Organization> .
 <http://www.reportinghub.no/ep/schema/facility#maximumWaveHeight>
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:comment "length that is the maximum height of surface waves"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "maximum wave height"^^xsd:string ;
       rdfs:range ep-core:Length .
 <http://www.reportinghub.no/ep/schema/facility#surfaceWavePeriod>
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "time duration that is the period of surface waves"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
       rdfs:label "period"^^xsd:string ;
       rdfs:range ep-core:TimeDuration .
 <http://www.reportinghub.no/ep/schema/facility#visibility>
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:comment "length that is the maximum distance at which things can be seen through surrounding air"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ;
       rdfs:label "visibility"^^xsd:string ;
       rdfs:range ep-core:Length .
 <http://www.reportinghub.no/ep/schema/facility#windChillTemperature>
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:comment "temperature that is the wind chill temperature of surrounding air"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ;
       rdfs:label "wind chill temperature"^^xsd:string ;
@@ -137,6 +137,9 @@
 <http://www.reportinghub.no/ep/schema/geography#State>
       rdf:type ep-prodfac:ReportingFacilityType .
+<http://www.reportinghub.no/ep/schema/production-activity#xpathToDataInSourceXmlFile>
+      rdfs:comment "reference to the data about which an alert is raised"^^xsd:string .
+
 <http://www.reportinghub.no/ep/schema/production-equipment#FlowMeter>
       rdfs:label "flow meter"^^xsd:string .
@@ -235,21 +238,7 @@ ep-prodfac:TrunkLine
 ep-prodfac:numberOfBedsAvailable
       rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
+      rdfs:comment "number of beds available on a facility"^^xsd:string ;
-      rdfs:range xsd:integer .
-
-ep-prodfac:numberOfContractorCrew
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
-      rdfs:range xsd:integer .
-
-ep-prodfac:numberOfDayVisitors
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
-      rdfs:range xsd:integer .
-
-ep-prodfac:numberOfDrillingContractCrew
-      rdf:type owl:DatatypeProperty ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:range xsd:integer .
@@ -258,23 +247,8 @@ ep-prodfac:numberOfOtherCrew
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:range xsd:integer .
-ep-prodfac:numberOfOwnCrew
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
-      rdfs:range xsd:integer .
-
-ep-prodfac:numberOfOwnOtherCrew
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
-      rdfs:range xsd:integer .
-
-ep-prodfac:numberOfPersonnelOnBoard
-      rdf:type owl:DatatypeProperty ;
-      rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
-      rdfs:range xsd:integer .
-
 ep-prodfac:operatingTime
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:comment "time duration that is the operating time of a temporal part of a facility"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/facility#Facility> ;
       rdfs:label "operating time"^^xsd:string ;
--- a/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-REPORT-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/schema/1.0/SCHEMA_EP-REPORT-v1.0.ttl
View file @159fb4a
@@ -14,7 +14,7 @@
 <http://www.reportinghub.no/ep/schema/1.0/report>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/np/schema/1.0/npd> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType>
@@ -48,13 +48,13 @@ ep-report:DrillingReport
       rdfs:subClassOf ep-report:Report .
 ep-report:FinalDailyDrillingReport
-      rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
+      rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ;
       rdfs:comment "daily drilling report that contains the final definitive status for the well. This report is normally issued some period of time (e.g., 6 months) after the completion of drilling. (source: DDR-XSD)"^^xsd:string ;
       rdfs:label "final daily drilling report"^^xsd:string ;
       rdfs:subClassOf ep-report:DailyDrillingReport .
 ep-report:FinalVersionOfAReport
-      rdf:type owl:Class , ep-report:ReportVersionStatus ;
+      rdf:type ep-report:ReportVersionStatus , owl:Class ;
       rdfs:comment "report that is a final version"^^xsd:string ;
       rdfs:label "final version of a report"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -90,13 +90,8 @@ ep-report:NonProductivetimeReport
       rdfs:subClassOf ep-report:Report ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ep-report:DailyDrillingReport ;
-                owl:onProperty ep-report:reportOn
-              ] ;
-      rdfs:subClassOf
-              [ rdf:type owl:Restriction ;
                 owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty ep-report:reportOn
+                owl:onProperty ep-report:createdAt
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
@@ -106,23 +101,28 @@ ep-report:NonProductivetimeReport
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
                 owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty ep-report:createdAt
+                owl:onProperty ep-report:reportOn
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-report:DailyDrillingReport ;
+                owl:onProperty ep-report:reportOn
               ] .
 ep-report:NormalDailyDrillingReport
-      rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
+      rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ;
       rdfs:comment "daily drilling report that has been approved by the drilling operator (source: DDR-XSD)"^^xsd:string ;
       rdfs:label "normal daily drilling report"^^xsd:string ;
-      rdfs:subClassOf ep-report:FinalVersionOfAReport , ep-report:DailyDrillingReport .
+      rdfs:subClassOf ep-report:DailyDrillingReport , ep-report:FinalVersionOfAReport .
 ep-report:PreliminaryDailyDrillingReport
-      rdf:type owl:Class , ep-report:DailyDrillingReportFinalisationType ;
+      rdf:type ep-report:DailyDrillingReportFinalisationType , owl:Class ;
       rdfs:comment "daily drilling report that is a preliminary report that has not yet been approved by the drilling operator. This report is normally issued at the beginning of the work day (e.g., 6:00 am) before. (source: DDR-XSD)"^^xsd:string ;
       rdfs:label "preliminary daily drilling report"^^xsd:string ;
-      rdfs:subClassOf ep-report:PreliminaryVersionOfAReport , ep-report:DailyDrillingReport .
+      rdfs:subClassOf ep-report:DailyDrillingReport , ep-report:PreliminaryVersionOfAReport .
 ep-report:PreliminaryVersionOfAReport
-      rdf:type owl:Class , ep-report:ReportVersionStatus ;
+      rdf:type ep-report:ReportVersionStatus , owl:Class ;
       rdfs:comment "report that is a preliminary version"^^xsd:string ;
       rdfs:label "preliminary version of a report"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -157,6 +157,12 @@ ep-report:ProductionReport
       rdfs:label "production report"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
+ep-report:ProductionReportType
+      rdf:type rdfs:Class ;
+      rdfs:comment "class that consists of subclasses of production report corresponding to the type specified the MPR-XSD"^^xsd:string ;
+      rdfs:label "report version status"^^xsd:string ;
+      rdfs:subClassOf owl:Class .
+
 ep-report:Report
       rdf:type owl:Class ;
       rdfs:comment "document content that is about a physical thing"^^xsd:string ;
@@ -164,55 +170,55 @@ ep-report:Report
       rdfs:subClassOf owl:Thing .
 ep-report:ReportAt06-00
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report for instant that is for 6 am during the report period. This can be ambiguous if the report period begins and ends at 6 am, so use report start/end instead. This cannot be used for a reporting period that is greater than 24 hours. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report at 06:00"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtBeginningOfReportingPeriod
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report for instant that is a part of another report, and that is for the beginning of the period of the report it is part of (source: MPR-XSD)."^^xsd:string ;
       rdfs:label "report at beginning of reporting period"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtEndOfReportingPeriod
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report for instant that is a part of another report, and that is for the end of the period of the report it is part of (source: MPR-XSD)."^^xsd:string ;
       rdfs:label "report at end of reporting period"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtMidnight
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report for instant that is for midnight during the report period. This can be ambiguous if the report period begins and ends at midnight, so use report start/end instead. This cannot be used for a reporting period that is greater than 24 hours. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report at midnight"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportAtNoon
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report for instant that is for noon during the report period. This can be ambiguous if the report period begins and ends at noon, so use report start/end instead. This cannot be used for a reporting period that is greater than 24 hours. (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report at  noon"^^xsd:string ;
       rdfs:subClassOf ep-report:ReportForInstant .
 ep-report:ReportForAllToDate
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within all time up to the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for all to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForDailyMonthToDate
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about the average for each day within the period from the beginning of a month to the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for daily month to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForDailyYearToDate
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about the average for each day within the period from the beginning of a year to the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for daily year to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForGasYearToDate
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM October 1st ending at 06:00 AM on a given date (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for gas year to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -224,67 +230,67 @@ ep-report:ReportForInstant
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForMonthToDate
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report on activities within a period from the beginning of a calendar month up to the end of a reporting period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for month to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneDay
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within one day, or within the 24 hour period ending at the end of a report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one day"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneGasDay
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM and ending 06:00 AM next day (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one gas day"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneGasMonth
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM on the the first day of a month and ending at 06:00 AM on the first day of next month (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one gas month"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneGasYear
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within a period starting at 06:00 AM October 1st and ending at same date and time the following year (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one gas year"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneMonth
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within one calendar month (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one month"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneWeek
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within one calendar week, or 7 consequtive 24 hour periods ending at the end of the report period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one week"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForOneYear
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within one Gregorian year (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for one year"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForPreviousPeriod
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is a part of another report and that is about activities within the period immediately prior to that of the report it is a part of. For example, if the report period represents a day then the previous period represents the previous day (source: MPR-XSD)."^^xsd:string ;
       rdfs:label "report for previous period"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForReportingPeriod
-      rdf:type owl:Class , ep-report:ReportPeriodType ;
+      rdf:type ep-report:ReportPeriodType , owl:Class ;
       rdfs:comment "report that is about activities within the whole of a reporting period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for reporting period"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
 ep-report:ReportForYearToDate
-      rdf:type ep-report:ReportPeriodType , owl:Class ;
+      rdf:type owl:Class , ep-report:ReportPeriodType ;
       rdfs:comment "report that is about activities within the period from the beginning of a year up to the end of a reporting period (source: MPR-XSD)"^^xsd:string ;
       rdfs:label "report for year to date"^^xsd:string ;
       rdfs:subClassOf ep-report:Report .
@@ -308,22 +314,22 @@ ep-report:WeeklyDrillingReport
       rdfs:subClassOf ep-report:DrillingReport ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:cardinality "7"^^xsd:nonNegativeInteger ;
+                owl:allValuesFrom ep-report:DailyDrillingReport ;
                 owl:onProperty ep-report:reportOn
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom xsd:dateTime ;
+                owl:cardinality "1"^^xsd:nonNegativeInteger ;
                 owl:onProperty ep-report:createdAt
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:cardinality "1"^^xsd:nonNegativeInteger ;
+                owl:allValuesFrom xsd:dateTime ;
                 owl:onProperty ep-report:createdAt
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ep-report:DailyDrillingReport ;
+                owl:cardinality "7"^^xsd:nonNegativeInteger ;
                 owl:onProperty ep-report:reportOn
               ] .
@@ -341,13 +347,13 @@ ep-report:approvedReport
       rdfs:range ep-report:Report .
 ep-report:createdAt
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "point in time that a report was created at"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "created at"^^xsd:string .
 ep-report:dailyDrillingReportNumber
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "identifier of a daily drilling report"^^xsd:string ;
       rdfs:domain ep-report:DailyDrillingReport ;
       rdfs:label "daily drilling report number"^^xsd:string .
@@ -380,13 +386,13 @@ ep-report:existsUpToTheEndOfThePeriodReportedOnBy
       rdfs:range ep-report:Report .
 ep-report:hasContent
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "text that is the content of a report"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "has content"^^xsd:string .
 ep-report:issuedAt
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "point in time that a report was issued at"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "issued at"^^xsd:string .
@@ -399,7 +405,7 @@ ep-report:issuedReport
       rdfs:range ep-report:Report .
 ep-report:nameAsDatumObject
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "name by which a physical object is refered to as a datum object"^^xsd:string ;
       rdfs:domain <http://www.reportinghub.no/ep/schema/core#PhysicalObject> ;
       rdfs:label "name as datum object"^^xsd:string .
@@ -412,7 +418,7 @@ ep-report:reportOn
       rdfs:range <http://www.reportinghub.no/ep/schema/core#PhysicalThing> .
 ep-report:reportVersion
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "version identifier for a report"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "report version"^^xsd:string .
@@ -425,13 +431,13 @@ ep-report:title
       rdfs:range xsd:string .
 ep-report:validFrom
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "point in time that a report is valid from"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "valid from"^^xsd:string .
 ep-report:validTo
-      rdf:type owl:FunctionalProperty , owl:DatatypeProperty ;
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
       rdfs:comment "point in time that a report if valid until"^^xsd:string ;
       rdfs:domain ep-report:Report ;
       rdfs:label "valid to"^^xsd:string .
--- a/www.reportinghub.no/ep/spin/SPIN_EPIM-MPR-lib-v1.1.spin.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/spin/SPIN_EPIM-MPR-lib-v1.1.spin.ttl
View file @159fb4a
@@ -41,17 +41,10 @@ arg2 is the report end date"""^^xsd:string ;
                           ]) ;
                 sp:where ([ rdf:type sp:Bind ;
                             sp:expression
-                                    [ rdf:type sp:if ;
+                                    [ rdf:type fn:concat ;
-                                      sp:arg1 [ rdf:type sp:eq ;
+                                      sp:arg1 spin:_arg1 ;
-                                                sp:arg1 spin:_arg1 ;
+                                      sp:arg2 "$" ;
-                                                sp:arg2 spin:_arg2
+                                      sp:arg3 spin:_arg2
-                                              ] ;
-                                      sp:arg2 spin:_arg1 ;
-                                      sp:arg3 [ rdf:type fn:concat ;
-                                                sp:arg1 spin:_arg1 ;
-                                                sp:arg2 "$" ;
-                                                sp:arg3 spin:_arg2
-                                              ]
                                     ] ;
                             sp:variable
                                     [ sp:varName "intervalIdentifier"^^xsd:string
@@ -4485,37 +4478,37 @@ ep-mpr-spin-lib:selectProductionInventoryMaterialType
                                                           sp:arg1 spin:_arg1 ;
                                                           sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_budget>
                                                         ] ;
-                                                sp:arg2 <http://www.reportinghub.no/ep/schema/flow#BudgetInventory> ;
+                                                sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                 sp:arg3 [ rdf:type sp:if ;
                                                           sp:arg1 [ rdf:type sp:eq ;
                                                                     sp:arg1 spin:_arg1 ;
                                                                     sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_constraint>
                                                                   ] ;
-                                                          sp:arg2 <http://www.reportinghub.no/ep/schema/flow#ConstraintInventory> ;
+                                                          sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                           sp:arg3 [ rdf:type sp:if ;
                                                                     sp:arg1 [ rdf:type sp:eq ;
                                                                               sp:arg1 spin:_arg1 ;
                                                                               sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_derived>
                                                                             ] ;
-                                                                    sp:arg2 <http://www.reportinghub.no/ep/schema/flow#DerivedInventory> ;
+                                                                    sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                     sp:arg3 [ rdf:type sp:if ;
                                                                               sp:arg1 [ rdf:type sp:eq ;
                                                                                         sp:arg1 spin:_arg1 ;
                                                                                         sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_difference>
                                                                                       ] ;
-                                                                              sp:arg2 <http://www.reportinghub.no/ep/schema/flow#DifferenceInventory> ;
+                                                                              sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                               sp:arg3 [ rdf:type sp:if ;
                                                                                         sp:arg1 [ rdf:type sp:eq ;
                                                                                                   sp:arg1 spin:_arg1 ;
                                                                                                   sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_estimate>
                                                                                                 ] ;
-                                                                                        sp:arg2 <http://www.reportinghub.no/ep/schema/flow#EstimatedInventory> ;
+                                                                                        sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                         sp:arg3 [ rdf:type sp:if ;
                                                                                                   sp:arg1 [ rdf:type sp:eq ;
                                                                                                             sp:arg1 spin:_arg1 ;
                                                                                                             sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_forecast>
                                                                                                           ] ;
-                                                                                                  sp:arg2 <http://www.reportinghub.no/ep/schema/flow#ForecastInventory> ;
+                                                                                                  sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                   sp:arg3 [ rdf:type sp:if ;
                                                                                                             sp:arg1 [ rdf:type sp:eq ;
                                                                                                                       sp:arg1 spin:_arg1 ;
@@ -4527,49 +4520,49 @@ ep-mpr-spin-lib:selectProductionInventoryMaterialType
                                                                                                                                 sp:arg1 spin:_arg1 ;
                                                                                                                                 sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_nominated>
                                                                                                                               ] ;
-                                                                                                                      sp:arg2 <http://www.reportinghub.no/ep/schema/flow#NominatedInventory> ;
+                                                                                                                      sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                       sp:arg3 [ rdf:type sp:if ;
                                                                                                                                 sp:arg1 [ rdf:type sp:eq ;
                                                                                                                                           sp:arg1 spin:_arg1 ;
                                                                                                                                           sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_potential>
                                                                                                                                         ] ;
-                                                                                                                                sp:arg2 <http://www.reportinghub.no/ep/schema/flow#PotentialInventory> ;
+                                                                                                                                sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                                 sp:arg3 [ rdf:type sp:if ;
                                                                                                                                           sp:arg1 [ rdf:type sp:eq ;
                                                                                                                                                     sp:arg1 spin:_arg1 ;
                                                                                                                                                     sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_processed>
                                                                                                                                                   ] ;
-                                                                                                                                          sp:arg2 <http://www.reportinghub.no/ep/schema/flow#ProcessedInventory> ;
+                                                                                                                                          sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                                           sp:arg3 [ rdf:type sp:if ;
                                                                                                                                                     sp:arg1 [ rdf:type sp:eq ;
                                                                                                                                                               sp:arg1 spin:_arg1 ;
                                                                                                                                                               sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_quota>
                                                                                                                                                             ] ;
-                                                                                                                                                    sp:arg2 <http://www.reportinghub.no/ep/schema/flow#QuotaInventory> ;
+                                                                                                                                                    sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                                                     sp:arg3 [ rdf:type sp:if ;
                                                                                                                                                               sp:arg1 [ rdf:type sp:eq ;
                                                                                                                                                                         sp:arg1 spin:_arg1 ;
                                                                                                                                                                         sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_recommended>
                                                                                                                                                                       ] ;
-                                                                                                                                                              sp:arg2 <http://www.reportinghub.no/ep/schema/flow#RecommendedInventory> ;
+                                                                                                                                                              sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                                                               sp:arg3 [ rdf:type sp:if ;
                                                                                                                                                                         sp:arg1 [ rdf:type sp:eq ;
                                                                                                                                                                                   sp:arg1 spin:_arg1 ;
                                                                                                                                                                                   sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_saleable>
                                                                                                                                                                                 ] ;
-                                                                                                                                                                        sp:arg2 <http://www.reportinghub.no/ep/schema/flow#SaleableInventory> ;
+                                                                                                                                                                        sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                                                                         sp:arg3 [ rdf:type sp:if ;
                                                                                                                                                                                   sp:arg1 [ rdf:type sp:eq ;
                                                                                                                                                                                             sp:arg1 spin:_arg1 ;
                                                                                                                                                                                             sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_simulated>
                                                                                                                                                                                           ] ;
-                                                                                                                                                                                  sp:arg2 <http://www.reportinghub.no/ep/schema/flow#SimulatedInventory> ;
+                                                                                                                                                                                  sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                                                                                   sp:arg3 [ rdf:type sp:if ;
                                                                                                                                                                                             sp:arg1 [ rdf:type sp:eq ;
                                                                                                                                                                                                       sp:arg1 spin:_arg1 ;
                                                                                                                                                                                                       sp:arg2 <http://www.epim.no/schemas/mprml/1#FQ_target>
                                                                                                                                                                                                     ] ;
-                                                                                                                                                                                            sp:arg2 <http://www.reportinghub.no/ep/schema/flow#TargetInventory> ;
+                                                                                                                                                                                            sp:arg2 <http://www.reportinghub.no/ep/schema/flow#Inventory> ;
                                                                                                                                                                                             sp:arg3 <http://www.reportinghub.no/ep/schema/flow#ProductionInventory>
                                                                                                                                                                                           ]
                                                                                                                                                                                 ]
@@ -7691,3 +7684,57 @@ ep-mpr-spin-lib:selectWorkScale
                                     ]
                           ])
               ] .
+
+[]    rdf:type sp:Select ;
+      rdfs:comment """arg1 is the report start date
+arg2 is the report end date
+BIND (IF((?arg1 = ?arg2), ?arg1, fn:concat(?arg1, \"$\", ?arg2)) AS ?intervalIdentifier) ."""^^xsd:string ;
+      sp:resultVariables ([ sp:varName "intervalIdentifier"^^xsd:string
+                ]) ;
+      sp:where ([ rdf:type sp:Bind ;
+                  sp:expression
+                          [ rdf:type fn:concat ;
+                            sp:arg1 spin:_arg1 ;
+                            sp:arg2 "$" ;
+                            sp:arg3 spin:_arg2
+                          ] ;
+                  sp:variable
+                          [ sp:varName "intervalIdentifier"^^xsd:string
+                          ]
+                ]) .
+
+[]    rdf:type sp:Select ;
+      rdfs:comment """arg1 is the report start date
+arg2 is the report end date
+BIND (IF((?arg1 = ?arg2), ?arg1, fn:concat(?arg1, \"$\", ?arg2)) AS ?intervalIdentifier) ."""^^xsd:string ;
+      sp:resultVariables ([ sp:varName "intervalIdentifier"^^xsd:string
+                ]) ;
+      sp:where ([ rdf:type sp:Bind ;
+                  sp:expression
+                          [ rdf:type fn:concat ;
+                            sp:arg1 spin:_arg1 ;
+                            sp:arg2 "$" ;
+                            sp:arg3 spin:_arg2
+                          ] ;
+                  sp:variable
+                          [ sp:varName "intervalIdentifier"^^xsd:string
+                          ]
+                ]) .
+
+[]    rdf:type sp:Select ;
+      rdfs:comment """arg1 is the report start date
+arg2 is the report end date
+BIND (IF((?arg1 = ?arg2), ?arg1, fn:concat(?arg1, \"$\", ?arg2)) AS ?intervalIdentifier) ."""^^xsd:string ;
+      sp:resultVariables ([ sp:varName "intervalIdentifier"^^xsd:string
+                ]) ;
+      sp:where ([ rdf:type sp:Bind ;
+                  sp:expression
+                          [ rdf:type fn:concat ;
+                            sp:arg1 spin:_arg1 ;
+                            sp:arg2 "$" ;
+                            sp:arg3 spin:_arg2
+                          ] ;
+                  sp:variable
+                          [ sp:varName "intervalIdentifier"^^xsd:string
+                          ]
+                ]) .
--- a/www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector-v1.0.ttl
View file @159fb4a
@@ -50,7 +50,10 @@
 @prefix wellTest:  <http://www.reportinghub.no/ep/transform/1.0/mpr/wellTest#> .
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+<http://www.reportinghub.no/ep/schema/production-facility#numberOfBedsAvailable>
+      rdfs:comment "number of beds available on a facility"^^xsd:string .
+
 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionOperationReport-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facilityIdentifierStructure-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionActivity-v1.1.1> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/1.0/mpr/wellTest> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-comment-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-geographicContext-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-approval-v1.1.1> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/injectionTestResults> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-organization-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-weather-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumeReport-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumePeriod-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-fluidSample-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/productionTestResults> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-operationalHSEReport-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-commonPropertiesProductVolume-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-installationReport-v1.1.1> ;
+      owl:imports <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionOperationReport-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facilityIdentifierStructure-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionActivity-v1.1.1> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/1.0/mpr/wellTest> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-comment-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-geographicContext-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-approval-v1.1.1> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/injectionTestResults> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-organization-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumeReport-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-weather-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumePeriod-v1.0> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-fluidSample-v1.0> , <http://www.reportinghub.no/ep/transform/1.0/mpr/productionTestResults> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-commonPropertiesProductVolume-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-operationalHSEReport-v1.1.1> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-installationReport-v1.1.1> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
--- a/www.reportinghub.no/ep/transform/TRANSFORM_mpr-facilityIdentifierStructure-v1.1.1.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_mpr-facilityIdentifierStructure-v1.1.1.ttl
View file @159fb4a
@@ -6,6 +6,7 @@
 # imports: http://www.reportinghub.no/ep/transform/transform-helper-schema
 @prefix :        <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facilityIdentifierStructure-v1.1.1#> .
+@prefix arg:     <http://spinrdf.org/arg#> .
 @prefix ep-dpr-spin-lib:  <http://www.reportinghub.no/ep/dpr/spin/1.1/lib#> .
 @prefix ep-mpr-spin-lib:  <http://www.reportinghub.no/ep/mpr/spin/1.1/lib#> .
 @prefix ep-spin-lib:  <http://www.reportinghub.no/ep/spin/lib#> .
@@ -13,6 +14,7 @@
 @prefix owl:     <http://www.w3.org/2002/07/owl#> .
 @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix smf:     <http://topbraid.org/sparqlmotionfunctions#> .
 @prefix sp:      <http://spinrdf.org/sp#> .
 @prefix spin:    <http://spinrdf.org/spin#> .
 @prefix spl:     <http://spinrdf.org/spl#> .
@@ -21,291 +23,213 @@
 <http://www.epim.no/schemas/mprml/1#FacilityIdentifierStruct>
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00007 Record the Facility that has the flows - kind is \"terminal\" - assumed to be a SurfaceFixedFacility
+                rdfs:comment """STEP 00012c Record the Facility that has the flows - not in the NPD Fact Pages - not already in the file
-Nothing is done with the namingSystem!"""^^xsd:string ;
+Naming system supplied
-                sp:templates ([ sp:object spin:_this ;
+now anonymous - BIND (ep-dpr-spin-lib:buildSmallFacilityURI(?namingSystem, ?facilityName) AS ?facility) .
+now context not in name"""^^xsd:string ;
+                sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/facility#Facility> ;
+                            sp:predicate rdf:type ;
+                            sp:subject _:b1
+                          ] [ sp:object
+                                    [ sp:varName "reportingFacilityType"^^xsd:string
+                                    ] ;
+                            sp:predicate rdf:type ;
+                            sp:subject _:b1
+                          ] [ sp:object
+                                    [ sp:varName "facilityNameWithContext"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
+                            sp:subject _:b1
+                          ] [ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                            sp:subject
+                            sp:subject _:b1
-                                    [ sp:varName "terminal"^^xsd:string
-                                    ]
                           ] [ sp:object
-                                    [ sp:varName "terminalLabel"^^xsd:string
+                                    [ sp:varName "facilityLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
-                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_terminal> ;
+                sp:where ([ rdf:type sp:Optional ;
-                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:elements ([ sp:object
-                            sp:subject spin:_this
+                                                [ sp:varName "facilityKind"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                        sp:subject spin:_this
+                                      ])
                           ] [ sp:object
-                                    [ sp:varName "terminalName"^^xsd:string
+                                    [ sp:varName "facilityName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
-                          ] [ rdf:type sp:NamedGraph ;
+                          ] [ sp:object
-                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceFixedFacility> ;
+                                    [ sp:varName "namingSystem"^^xsd:string
-                                        sp:predicate rdf:type ;
+                                    ] ;
-                                        sp:subject
+                            sp:predicate <http://www.epim.no/schemas/mprml/1#namingSystem> ;
-                                                [ sp:varName "terminal"^^xsd:string
+                            sp:subject spin:_this
-                                                ]
+                          ] [ rdf:type sp:NotExists ;
-                                      ] [ sp:object
+                            sp:elements ([ sp:object spin:_this ;
-                                                [ sp:varName "terminalName"^^xsd:string
+                                        sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
-                                        sp:subject
-                                                [ sp:varName "terminal"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "terminalId"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
                                         sp:subject
-                                                [ sp:varName "terminal"^^xsd:string
+                                                [ sp:varName "something"^^xsd:string
                                                 ]
-                                      ]) ;
+                                      ])
-                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
-                                    [ rdf:type fn:concat ;
+                                    [ rdf:type ep-mpr-spin-lib:selectReportingFacilityType ;
-                                      sp:arg1 "terminal-" ;
+                                      sp:arg1 [ sp:varName "facilityKind"^^xsd:string
-                                      sp:arg2 [ sp:varName "terminalId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "terminalLabel"^^xsd:string
+                                    [ sp:varName "reportingFacilityType"^^xsd:string
-                                    ]
-                          ])
-              ] ;
-      spin:rule
-              [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00005 Record the Facility that has the flows - kind is \"well\"
-Nothing is done with the namingSystem!"""^^xsd:string ;
-                sp:templates ([ sp:object spin:_this ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                            sp:subject
-                                    [ sp:varName "well"^^xsd:string
                                     ]
-                          ] [ sp:object
-                                    [ sp:varName "wellLabel"^^xsd:string
-                                    ] ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
-                            sp:subject spin:_this
-                          ]) ;
-                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_well> ;
-                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                            sp:subject spin:_this
-                          ] [ sp:object
-                                    [ sp:varName "wellName"^^xsd:string
-                                    ] ;
-                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
-                            sp:subject spin:_this
-                          ] [ rdf:type sp:NamedGraph ;
-                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/well#Well> ;
-                                        sp:predicate rdf:type ;
-                                        sp:subject
-                                                [ sp:varName "well"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "wellName"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
-                                        sp:subject
-                                                [ sp:varName "well"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "wellId"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
-                                        sp:subject
-                                                [ sp:varName "well"^^xsd:string
-                                                ]
-                                      ]) ;
-                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "well-" ;
+                                      sp:arg1 [ sp:varName "namingSystem"^^xsd:string
-                                      sp:arg2 [ sp:varName "wellId"^^xsd:string
+                                              ] ;
+                                      sp:arg2 "$" ;
+                                      sp:arg3 [ sp:varName "facilityName"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "wellLabel"^^xsd:string
+                                    [ sp:varName "facilityNameWithContext"^^xsd:string
-                                    ]
-                          ])
-              ] ;
-      spin:rule
-              [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00010 Record the Facility that has the flows - kind is \"licence\"
-Nothing is done with the namingSystem!"""^^xsd:string ;
-                sp:templates ([ sp:object spin:_this ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                            sp:subject
-                                    [ sp:varName "licence"^^xsd:string
                                     ]
-                          ] [ sp:object
+                          ] [ rdf:type sp:Bind ;
-                                    [ sp:varName "licenceLabel"^^xsd:string
+                            sp:expression
+                                    [ rdf:type fn:concat ;
+                                      sp:arg1 [ rdf:type ep-spin-lib:normalizeString ;
+                                                sp:arg1 [ sp:varName "namingSystem"^^xsd:string
+                                                        ]
+                                              ] ;
+                                      sp:arg2 "-" ;
+                                      sp:arg3 [ rdf:type ep-spin-lib:normalizeString ;
+                                                sp:arg1 [ sp:varName "facilityName"^^xsd:string
+                                                        ]
+                                              ]
                                     ] ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
+                            sp:variable
-                            sp:subject spin:_this
+                                    [ sp:varName "normalizedFacilityNameWithContext"^^xsd:string
-                          ]) ;
+                                    ]
-                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_licence> ;
+                          ] [ rdf:type sp:Bind ;
-                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:expression
-                            sp:subject spin:_this
+                                    [ rdf:type ep-spin-lib:normalizeString ;
-                          ] [ sp:object
+                                      sp:arg1 [ rdf:type spl:object ;
-                                    [ sp:varName "licenceName"^^xsd:string
+                                                sp:arg1 [ sp:varName "reportingFacilityType"^^xsd:string
+                                                        ] ;
+                                                sp:arg2 rdfs:label
+                                              ]
                                     ] ;
-                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
+                            sp:variable
-                            sp:subject spin:_this
+                                    [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
-                          ] [ rdf:type sp:NamedGraph ;
+                                    ]
-                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#Licence> ;
-                                        sp:predicate rdf:type ;
-                                        sp:subject
-                                                [ sp:varName "licence"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "licenceName"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
-                                        sp:subject
-                                                [ sp:varName "licence"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "licenceId"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
-                                        sp:subject
-                                                [ sp:varName "livence"^^xsd:string
-                                                ]
-                                      ]) ;
-                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "licence-" ;
+                                      sp:arg1 [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
-                                      sp:arg2 [ sp:varName "licenceId"^^xsd:string
+                                              ] ;
+                                      sp:arg2 "-" ;
+                                      sp:arg3 [ sp:varName "normalizedFacilityNameWithContext"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "licenceLabel"^^xsd:string
+                                    [ sp:varName "facilityLabel"^^xsd:string
                                     ]
                           ])
               ] ;
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00008 Record the Facility that has the flows - kind is \"company\" or \"commercial entity\" - assumed to be an OperatingCompany
+                rdfs:comment """STEP 00012d Record the Facility that has the flows - not in the NPD Fact Pages - not already in the file
-Nothing is done with the namingSystem!"""^^xsd:string ;
+Naming system not supplied
-                sp:templates ([ sp:object spin:_this ;
+now anonymous - BIND (ep-dpr-spin-lib:buildSmallFacilityURI(\"\", ?facilityName) AS ?facility) ."""^^xsd:string ;
+                sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/facility#Facility> ;
+                            sp:predicate rdf:type ;
+                            sp:subject _:b2
+                          ] [ sp:object
+                                    [ sp:varName "reportingFacilityType"^^xsd:string
+                                    ] ;
+                            sp:predicate rdf:type ;
+                            sp:subject _:b2
+                          ] [ sp:object
+                                    [ sp:varName "facilityName"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
+                            sp:subject _:b2
+                          ] [ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                            sp:subject
+                            sp:subject _:b2
-                                    [ sp:varName "company"^^xsd:string
-                                    ]
                           ] [ sp:object
-                                    [ sp:varName "companyLabel"^^xsd:string
+                                    [ sp:varName "facilityLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
-                sp:where ([ rdf:type sp:Union ;
+                sp:where ([ rdf:type sp:Optional ;
-                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_company> ;
+                            sp:elements ([ sp:object
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                                [ sp:varName "facilityKind"^^xsd:string
-                                          sp:subject spin:_this
+                                                ] ;
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_commercialentity> ;
+                                        sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                        sp:subject spin:_this
-                                          sp:subject spin:_this
+                                      ])
-                                        ]))
                           ] [ sp:object
-                                    [ sp:varName "companyName"^^xsd:string
+                                    [ sp:varName "facilityName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
-                          ] [ rdf:type sp:NamedGraph ;
+                          ] [ rdf:type sp:NotExists ;
-                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#OperatingCompany> ;
+                            sp:elements ([ sp:object
-                                        sp:predicate rdf:type ;
+                                                [ sp:varName "namingSystem"^^xsd:string
-                                        sp:subject
-                                                [ sp:varName "company"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "companyName"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
-                                        sp:subject
-                                                [ sp:varName "company"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "companyId"^^xsd:string
                                                 ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
+                                        sp:predicate <http://www.epim.no/schemas/mprml/1#namingSystem> ;
+                                        sp:subject spin:_this
+                                      ])
+                          ] [ rdf:type sp:NotExists ;
+                            sp:elements ([ sp:object spin:_this ;
+                                        sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
                                         sp:subject
-                                                [ sp:varName "company"^^xsd:string
+                                                [ sp:varName "something"^^xsd:string
                                                 ]
-                                      ]) ;
+                                      ])
-                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
-                                    [ rdf:type fn:concat ;
+                                    [ rdf:type ep-mpr-spin-lib:selectReportingFacilityType ;
-                                      sp:arg1 "company-" ;
+                                      sp:arg1 [ sp:varName "facilityKind"^^xsd:string
-                                      sp:arg2 [ sp:varName "companyId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "companyLabel"^^xsd:string
+                                    [ sp:varName "reportingFacilityType"^^xsd:string
-                                    ]
-                          ])
-              ] ;
-      spin:rule
-              [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00004 Record the Facility that has the flows - kind is \"platform\" - assumed to be a MoveableFacility
-Nothing is done with the namingSystem!"""^^xsd:string ;
-                sp:templates ([ sp:object spin:_this ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                            sp:subject
-                                    [ sp:varName "platform"^^xsd:string
                                     ]
-                          ] [ sp:object
+                          ] [ rdf:type sp:Bind ;
-                                    [ sp:varName "platformLabel"^^xsd:string
+                            sp:expression
+                                    [ rdf:type ep-spin-lib:normalizeString ;
+                                      sp:arg1 [ sp:varName "facilityName"^^xsd:string
+                                              ]
                                     ] ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
+                            sp:variable
-                            sp:subject spin:_this
+                                    [ sp:varName "normalizedfacilityName"^^xsd:string
-                          ]) ;
+                                    ]
-                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_platform> ;
+                          ] [ rdf:type sp:Bind ;
-                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:expression
-                            sp:subject spin:_this
+                                    [ rdf:type ep-spin-lib:normalizeString ;
-                          ] [ sp:object
+                                      sp:arg1 [ rdf:type spl:object ;
-                                    [ sp:varName "platformName"^^xsd:string
+                                                sp:arg1 [ sp:varName "reportingFacilityType"^^xsd:string
+                                                        ] ;
+                                                sp:arg2 rdfs:label
+                                              ]
                                     ] ;
-                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
+                            sp:variable
-                            sp:subject spin:_this
+                                    [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
-                          ] [ rdf:type sp:NamedGraph ;
+                                    ]
-                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/facility#MoveableFacility> ;
-                                        sp:predicate rdf:type ;
-                                        sp:subject
-                                                [ sp:varName "platform"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "platformName"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
-                                        sp:subject
-                                                [ sp:varName "platform"^^xsd:string
-                                                ]
-                                      ] [ sp:object
-                                                [ sp:varName "platformId"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
-                                        sp:subject
-                                                [ sp:varName "platform"^^xsd:string
-                                                ]
-                                      ]) ;
-                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "platform-" ;
+                                      sp:arg1 [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
-                                      sp:arg2 [ sp:varName "platformId"^^xsd:string
+                                              ] ;
+                                      sp:arg2 "-" ;
+                                      sp:arg3 [ sp:varName "normalizedFacilityName"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "platformLabel"^^xsd:string
+                                    [ sp:varName "facilityLabel"^^xsd:string
                                     ]
                           ])
               ] ;
@@ -412,160 +336,172 @@ Naming system  supplied"""^^xsd:string ;
               ] ;
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00012d Record the Facility that has the flows - not in the NPD Fact Pages - not already in the file
+                rdfs:comment """STEP 00010 Record the Facility that has the flows - kind is \"licence\"
-Naming system not supplied
+Nothing is done with the namingSystem!"""^^xsd:string ;
-now anonymous - BIND (ep-dpr-spin-lib:buildSmallFacilityURI(\"\", ?facilityName) AS ?facility) ."""^^xsd:string ;
+                sp:templates ([ sp:object spin:_this ;
-                sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/facility#Facility> ;
-                            sp:predicate rdf:type ;
-                            sp:subject _:b1
-                          ] [ sp:object
-                                    [ sp:varName "reportingFacilityType"^^xsd:string
-                                    ] ;
-                            sp:predicate rdf:type ;
-                            sp:subject _:b1
-                          ] [ sp:object
-                                    [ sp:varName "facilityName"^^xsd:string
-                                    ] ;
-                            sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
-                            sp:subject _:b1
-                          ] [ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                            sp:subject _:b1
+                            sp:subject
+                                    [ sp:varName "licence"^^xsd:string
+                                    ]
                           ] [ sp:object
-                                    [ sp:varName "facilityLabel"^^xsd:string
+                                    [ sp:varName "licenceLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
-                sp:where ([ rdf:type sp:Optional ;
+                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_licence> ;
-                            sp:elements ([ sp:object
+                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                                [ sp:varName "facilityKind"^^xsd:string
+                            sp:subject spin:_this
-                                                ] ;
-                                        sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                        sp:subject spin:_this
-                                      ])
                           ] [ sp:object
-                                    [ sp:varName "facilityName"^^xsd:string
+                                    [ sp:varName "licenceName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
-                          ] [ rdf:type sp:NotExists ;
+                          ] [ rdf:type sp:NamedGraph ;
-                            sp:elements ([ sp:object
+                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#Licence> ;
-                                                [ sp:varName "namingSystem"^^xsd:string
+                                        sp:predicate rdf:type ;
+                                        sp:subject
+                                                [ sp:varName "licence"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "licenceName"^^xsd:string
                                                 ] ;
-                                        sp:predicate <http://www.epim.no/schemas/mprml/1#namingSystem> ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
-                                        sp:subject spin:_this
-                                      ])
-                          ] [ rdf:type sp:NotExists ;
-                            sp:elements ([ sp:object spin:_this ;
-                                        sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
                                         sp:subject
-                                                [ sp:varName "something"^^xsd:string
+                                                [ sp:varName "licence"^^xsd:string
                                                 ]
-                                      ])
+                                      ] [ sp:object
+                                                [ sp:varName "licenceId"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
+                                        sp:subject
+                                                [ sp:varName "livence"^^xsd:string
+                                                ]
+                                      ]) ;
+                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
-                                    [ rdf:type ep-mpr-spin-lib:selectReportingFacilityType ;
+                                    [ rdf:type fn:concat ;
-                                      sp:arg1 [ sp:varName "facilityKind"^^xsd:string
+                                      sp:arg1 "licence-" ;
+                                      sp:arg2 [ sp:varName "licenceId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "reportingFacilityType"^^xsd:string
+                                    [ sp:varName "licenceLabel"^^xsd:string
                                     ]
-                          ] [ rdf:type sp:Bind ;
+                          ])
-                            sp:expression
+              ] ;
-                                    [ rdf:type ep-spin-lib:normalizeString ;
+      spin:rule
-                                      sp:arg1 [ sp:varName "facilityName"^^xsd:string
+              [ rdf:type sp:Construct ;
-                                              ]
+                rdfs:comment """STEP 00005 Record the Facility that has the flows - kind is \"well\"
-                                    ] ;
+Nothing is done with the namingSystem!"""^^xsd:string ;
-                            sp:variable
+                sp:templates ([ sp:object spin:_this ;
-                                    [ sp:varName "normalizedfacilityName"^^xsd:string
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
+                            sp:subject
+                                    [ sp:varName "well"^^xsd:string
                                     ]
-                          ] [ rdf:type sp:Bind ;
+                          ] [ sp:object
-                            sp:expression
+                                    [ sp:varName "wellLabel"^^xsd:string
-                                    [ rdf:type ep-spin-lib:normalizeString ;
-                                      sp:arg1 [ rdf:type spl:object ;
-                                                sp:arg1 [ sp:varName "reportingFacilityType"^^xsd:string
-                                                        ] ;
-                                                sp:arg2 rdfs:label
-                                              ]
                                     ] ;
-                            sp:variable
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
-                                    [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
+                            sp:subject spin:_this
-                                    ]
+                          ]) ;
+                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_well> ;
+                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:subject spin:_this
+                          ] [ sp:object
+                                    [ sp:varName "wellName"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
+                            sp:subject spin:_this
+                          ] [ rdf:type sp:NamedGraph ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/well#Well> ;
+                                        sp:predicate rdf:type ;
+                                        sp:subject
+                                                [ sp:varName "well"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "wellName"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
+                                        sp:subject
+                                                [ sp:varName "well"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "wellId"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
+                                        sp:subject
+                                                [ sp:varName "well"^^xsd:string
+                                                ]
+                                      ]) ;
+                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
+                                      sp:arg1 "well-" ;
-                                              ] ;
+                                      sp:arg2 [ sp:varName "wellId"^^xsd:string
-                                      sp:arg2 "-" ;
-                                      sp:arg3 [ sp:varName "normalizedFacilityName"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "facilityLabel"^^xsd:string
+                                    [ sp:varName "wellLabel"^^xsd:string
                                     ]
                           ])
               ] ;
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00009 Record the Facility that has the flows - kind is \"company\" or \"commercial entity\" - assumed to be an ParentCompany
+                rdfs:comment """STEP 00002 Record the Facility that has the flows - kind is \"wellbore\"
 Nothing is done with the namingSystem!"""^^xsd:string ;
                 sp:templates ([ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
                             sp:subject
-                                    [ sp:varName "company"^^xsd:string
+                                    [ sp:varName "wellBore"^^xsd:string
                                     ]
                           ] [ sp:object
-                                    [ sp:varName "companyLabel"^^xsd:string
+                                    [ sp:varName "wellBoreLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
-                sp:where ([ rdf:type sp:Union ;
+                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_wellbore> ;
-                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_company> ;
+                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:subject spin:_this
-                                          sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_commercialentity> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:subject spin:_this
-                                        ]))
                           ] [ sp:object
-                                    [ sp:varName "companyName"^^xsd:string
+                                    [ sp:varName "wellBoreName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
                           ] [ rdf:type sp:NamedGraph ;
-                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#ParentCompany> ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ;
                                         sp:predicate rdf:type ;
                                         sp:subject
-                                                [ sp:varName "company"^^xsd:string
+                                                [ sp:varName "wellBore"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "companyName"^^xsd:string
+                                                [ sp:varName "wellBoreName"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
                                         sp:subject
-                                                [ sp:varName "company"^^xsd:string
+                                                [ sp:varName "wellBore"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "companyId"^^xsd:string
+                                                [ sp:varName "wellBoreId"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
                                         sp:subject
-                                                [ sp:varName "company"^^xsd:string
+                                                [ sp:varName "wellBore"^^xsd:string
                                                 ]
                                       ]) ;
                             sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "company-" ;
+                                      sp:arg1 "wellbore-" ;
-                                      sp:arg2 [ sp:varName "companyId"^^xsd:string
+                                      sp:arg2 [ sp:varName "wellBoreId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "companyLabel"^^xsd:string
+                                    [ sp:varName "wellBoreLabel"^^xsd:string
                                     ]
                           ])
               ] ;
@@ -692,209 +628,390 @@ Naming system supplied"""^^xsd:string ;
               ] ;
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00001 Record the Facility that has the flows - kind is \"field\", etc.
+                rdfs:comment """STEP 00003 Record the Facility that has the flows - kind is \"platform\" - assumed to be a SurfaceFixedFacility
 Nothing is done with the namingSystem!"""^^xsd:string ;
                 sp:templates ([ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
                             sp:subject
-                                    [ sp:varName "field"^^xsd:string
+                                    [ sp:varName "platform"^^xsd:string
                                     ]
                           ] [ sp:object
-                                    [ sp:varName "fieldLabel"^^xsd:string
+                                    [ sp:varName "platformLabel"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
+                            sp:subject spin:_this
+                          ]) ;
+                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_platform> ;
+                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:subject spin:_this
+                          ] [ sp:object
+                                    [ sp:varName "platformName"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
+                            sp:subject spin:_this
+                          ] [ rdf:type sp:NamedGraph ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceFixedFacility> ;
+                                        sp:predicate rdf:type ;
+                                        sp:subject
+                                                [ sp:varName "platform"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "platformName"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
+                                        sp:subject
+                                                [ sp:varName "platform"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "platformId"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
+                                        sp:subject
+                                                [ sp:varName "platform"^^xsd:string
+                                                ]
+                                      ]) ;
+                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
+                          ] [ rdf:type sp:Bind ;
+                            sp:expression
+                                    [ rdf:type fn:concat ;
+                                      sp:arg1 "platform-" ;
+                                      sp:arg2 [ sp:varName "platformId"^^xsd:string
+                                              ]
+                                    ] ;
+                            sp:variable
+                                    [ sp:varName "platformLabel"^^xsd:string
+                                    ]
+                          ])
+              ] ;
+      spin:rule
+              [ rdf:type sp:Construct ;
+                rdfs:comment """STEP 00008 Record the Facility that has the flows - kind is \"company\" or \"commercial entity\" - assumed to be an OperatingCompany
+Nothing is done with the namingSystem!"""^^xsd:string ;
+                sp:templates ([ sp:object spin:_this ;
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
+                            sp:subject
+                                    [ sp:varName "company"^^xsd:string
+                                    ]
+                          ] [ sp:object
+                                    [ sp:varName "companyLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
                 sp:where ([ rdf:type sp:Union ;
-                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field> ;
+                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_company> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_commercialentity> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]))
+                          ] [ sp:object
+                                    [ sp:varName "companyName"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
+                            sp:subject spin:_this
+                          ] [ rdf:type sp:NamedGraph ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#OperatingCompany> ;
+                                        sp:predicate rdf:type ;
+                                        sp:subject
+                                                [ sp:varName "company"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "companyName"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
+                                        sp:subject
+                                                [ sp:varName "company"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "companyId"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
+                                        sp:subject
+                                                [ sp:varName "company"^^xsd:string
+                                                ]
+                                      ]) ;
+                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
+                          ] [ rdf:type sp:Bind ;
+                            sp:expression
+                                    [ rdf:type fn:concat ;
+                                      sp:arg1 "company-" ;
+                                      sp:arg2 [ sp:varName "companyId"^^xsd:string
+                                              ]
+                                    ] ;
+                            sp:variable
+                                    [ sp:varName "companyLabel"^^xsd:string
+                                    ]
+                          ])
+              ] ;
+      spin:rule
+              [ rdf:type sp:Construct ;
+                rdfs:comment """STEP 00004 Record the Facility that has the flows - kind is \"platform\" - assumed to be a MoveableFacility
+Nothing is done with the namingSystem!"""^^xsd:string ;
+                sp:templates ([ sp:object spin:_this ;
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
+                            sp:subject
+                                    [ sp:varName "platform"^^xsd:string
+                                    ]
+                          ] [ sp:object
+                                    [ sp:varName "platformLabel"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
+                            sp:subject spin:_this
+                          ]) ;
+                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_platform> ;
+                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:subject spin:_this
+                          ] [ sp:object
+                                    [ sp:varName "platformName"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
+                            sp:subject spin:_this
+                          ] [ rdf:type sp:NamedGraph ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/facility#MoveableFacility> ;
+                                        sp:predicate rdf:type ;
+                                        sp:subject
+                                                [ sp:varName "platform"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "platformName"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
+                                        sp:subject
+                                                [ sp:varName "platform"^^xsd:string
+                                                ]
+                                      ] [ sp:object
+                                                [ sp:varName "platformId"^^xsd:string
+                                                ] ;
+                                        sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
+                                        sp:subject
+                                                [ sp:varName "platform"^^xsd:string
+                                                ]
+                                      ]) ;
+                            sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
+                          ] [ rdf:type sp:Bind ;
+                            sp:expression
+                                    [ rdf:type fn:concat ;
+                                      sp:arg1 "platform-" ;
+                                      sp:arg2 [ sp:varName "platformId"^^xsd:string
+                                              ]
+                                    ] ;
+                            sp:variable
+                                    [ sp:varName "platformLabel"^^xsd:string
+                                    ]
+                          ])
+              ] ;
+      spin:rule
+              [ rdf:type sp:Construct ;
+                rdfs:comment """STEP 00006 Record the Facility that has the flows - kind is \"terminal\", \"pipeline\", \"flowline\", \"installation\", etc.
+Nothing is done with the namingSystem!"""^^xsd:string ;
+                sp:templates ([ sp:object spin:_this ;
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
+                            sp:subject
+                                    [ sp:varName "tuf"^^xsd:string
+                                    ]
+                          ] [ sp:object
+                                    [ sp:varName "tufLabel"^^xsd:string
+                                    ] ;
+                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
+                            sp:subject spin:_this
+                          ]) ;
+                sp:where ([ rdf:type sp:Union ;
+                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_terminal> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_pipeline> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_flowline> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_installation> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_plant> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field-part> ;
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_processingfacility> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field-group> ;
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_trunkline> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field-area> ;
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_storage> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_plant-processing> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
                                         ]))
                           ] [ sp:object
-                                    [ sp:varName "fieldName"^^xsd:string
+                                    [ sp:varName "tufName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
                           ] [ rdf:type sp:NamedGraph ;
-                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/facility#Field> ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#TUF> ;
                                         sp:predicate rdf:type ;
                                         sp:subject
-                                                [ sp:varName "field"^^xsd:string
+                                                [ sp:varName "tuf"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "fieldName"^^xsd:string
+                                                [ sp:varName "tufName"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
                                         sp:subject
-                                                [ sp:varName "field"^^xsd:string
+                                                [ sp:varName "tuf"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "fieldId"^^xsd:string
+                                                [ sp:varName "tufId"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
                                         sp:subject
-                                                [ sp:varName "field"^^xsd:string
+                                                [ sp:varName "tuf"^^xsd:string
                                                 ]
                                       ]) ;
                             sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "field-" ;
+                                      sp:arg1 "tuf-" ;
-                                      sp:arg2 [ sp:varName "fieldId"^^xsd:string
+                                      sp:arg2 [ sp:varName "tufId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "fieldLabel"^^xsd:string
+                                    [ sp:varName "tufLabel"^^xsd:string
                                     ]
                           ])
               ] ;
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00002 Record the Facility that has the flows - kind is \"wellbore\"
+                rdfs:comment """STEP 00009 Record the Facility that has the flows - kind is \"company\" or \"commercial entity\" - assumed to be an ParentCompany
 Nothing is done with the namingSystem!"""^^xsd:string ;
                 sp:templates ([ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
                             sp:subject
-                                    [ sp:varName "wellBore"^^xsd:string
+                                    [ sp:varName "company"^^xsd:string
                                     ]
                           ] [ sp:object
-                                    [ sp:varName "wellBoreLabel"^^xsd:string
+                                    [ sp:varName "companyLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
-                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_wellbore> ;
+                sp:where ([ rdf:type sp:Union ;
-                            sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_company> ;
-                            sp:subject spin:_this
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_commercialentity> ;
+                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
+                                          sp:subject spin:_this
+                                        ]))
                           ] [ sp:object
-                                    [ sp:varName "wellBoreName"^^xsd:string
+                                    [ sp:varName "companyName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
                           ] [ rdf:type sp:NamedGraph ;
-                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#ParentCompany> ;
                                         sp:predicate rdf:type ;
                                         sp:subject
-                                                [ sp:varName "wellBore"^^xsd:string
+                                                [ sp:varName "company"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "wellBoreName"^^xsd:string
+                                                [ sp:varName "companyName"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
                                         sp:subject
-                                                [ sp:varName "wellBore"^^xsd:string
+                                                [ sp:varName "company"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "wellBoreId"^^xsd:string
+                                                [ sp:varName "companyId"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
                                         sp:subject
-                                                [ sp:varName "wellBore"^^xsd:string
+                                                [ sp:varName "company"^^xsd:string
                                                 ]
                                       ]) ;
                             sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "wellbore-" ;
+                                      sp:arg1 "company-" ;
-                                      sp:arg2 [ sp:varName "wellBoreId"^^xsd:string
+                                      sp:arg2 [ sp:varName "companyId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "wellBoreLabel"^^xsd:string
+                                    [ sp:varName "companyLabel"^^xsd:string
                                     ]
                           ])
               ] ;
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00006 Record the Facility that has the flows - kind is \"terminal\", \"pipeline\", \"flowline\", \"installation\", etc.
+                rdfs:comment """STEP 00001 Record the Facility that has the flows - kind is \"field\", etc.
 Nothing is done with the namingSystem!"""^^xsd:string ;
                 sp:templates ([ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
                             sp:subject
-                                    [ sp:varName "tuf"^^xsd:string
+                                    [ sp:varName "field"^^xsd:string
                                     ]
                           ] [ sp:object
-                                    [ sp:varName "tufLabel"^^xsd:string
+                                    [ sp:varName "fieldLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
                 sp:where ([ rdf:type sp:Union ;
-                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_terminal> ;
+                            sp:elements (([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_pipeline> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_flowline> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_installation> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_plant> ;
-                                          sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                          sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_processingfacility> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_trunkline> ;
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field-part> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_storage> ;
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field-group> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
-                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_plant-processing> ;
+                                        ]) ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_field-area> ;
                                           sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                                           sp:subject spin:_this
                                         ]))
                           ] [ sp:object
-                                    [ sp:varName "tufName"^^xsd:string
+                                    [ sp:varName "fieldName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
                           ] [ rdf:type sp:NamedGraph ;
-                            sp:elements ([ sp:object <http://www.reportinghub.no/np/schema/npd#TUF> ;
+                            sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/facility#Field> ;
                                         sp:predicate rdf:type ;
                                         sp:subject
-                                                [ sp:varName "tuf"^^xsd:string
+                                                [ sp:varName "field"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "tufName"^^xsd:string
+                                                [ sp:varName "fieldName"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
                                         sp:subject
-                                                [ sp:varName "tuf"^^xsd:string
+                                                [ sp:varName "field"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "tufId"^^xsd:string
+                                                [ sp:varName "fieldId"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
                                         sp:subject
-                                                [ sp:varName "tuf"^^xsd:string
+                                                [ sp:varName "field"^^xsd:string
                                                 ]
                                       ]) ;
                             sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "tuf-" ;
+                                      sp:arg1 "field-" ;
-                                      sp:arg2 [ sp:varName "tufId"^^xsd:string
+                                      sp:arg2 [ sp:varName "fieldId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "tufLabel"^^xsd:string
+                                    [ sp:varName "fieldLabel"^^xsd:string
                                     ]
                           ])
               ] ;
@@ -1004,24 +1121,24 @@ Naming system not supplied"""^^xsd:string ;
               ] ;
       spin:rule
               [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00003 Record the Facility that has the flows - kind is \"platform\" - assumed to be a SurfaceFixedFacility
+                rdfs:comment """STEP 00007 Record the Facility that has the flows - kind is \"terminal\" - assumed to be a SurfaceFixedFacility
 Nothing is done with the namingSystem!"""^^xsd:string ;
                 sp:templates ([ sp:object spin:_this ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
                             sp:subject
-                                    [ sp:varName "platform"^^xsd:string
+                                    [ sp:varName "terminal"^^xsd:string
                                     ]
                           ] [ sp:object
-                                    [ sp:varName "platformLabel"^^xsd:string
+                                    [ sp:varName "terminalLabel"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
                             sp:subject spin:_this
                           ]) ;
-                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_platform> ;
+                sp:where ([ sp:object <http://www.epim.no/schemas/mprml/1#RF_terminal> ;
                             sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
                             sp:subject spin:_this
                           ] [ sp:object
-                                    [ sp:varName "platformName"^^xsd:string
+                                    [ sp:varName "terminalName"^^xsd:string
                                     ] ;
                             sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
                             sp:subject spin:_this
@@ -1029,33 +1146,33 @@ Nothing is done with the namingSystem!"""^^xsd:string ;
                             sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceFixedFacility> ;
                                         sp:predicate rdf:type ;
                                         sp:subject
-                                                [ sp:varName "platform"^^xsd:string
+                                                [ sp:varName "terminal"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "platformName"^^xsd:string
+                                                [ sp:varName "terminalName"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
                                         sp:subject
-                                                [ sp:varName "platform"^^xsd:string
+                                                [ sp:varName "terminal"^^xsd:string
                                                 ]
                                       ] [ sp:object
-                                                [ sp:varName "platformId"^^xsd:string
+                                                [ sp:varName "terminalId"^^xsd:string
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/np/schema/npd#id> ;
                                         sp:subject
-                                                [ sp:varName "platform"^^xsd:string
+                                                [ sp:varName "terminal"^^xsd:string
                                                 ]
                                       ]) ;
                             sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
                           ] [ rdf:type sp:Bind ;
                             sp:expression
                                     [ rdf:type fn:concat ;
-                                      sp:arg1 "platform-" ;
+                                      sp:arg1 "terminal-" ;
-                                      sp:arg2 [ sp:varName "platformId"^^xsd:string
+                                      sp:arg2 [ sp:varName "terminalId"^^xsd:string
                                               ]
                                     ] ;
                             sp:variable
-                                    [ sp:varName "platformLabel"^^xsd:string
+                                    [ sp:varName "terminalLabel"^^xsd:string
                                     ]
                           ])
               ] ;
@@ -1142,121 +1259,6 @@ Naming system not supplied"""^^xsd:string ;
                                     [ sp:varName "facilityLabel"^^xsd:string
                                     ]
                           ])
-              ] ;
-      spin:rule
-              [ rdf:type sp:Construct ;
-                rdfs:comment """STEP 00012c Record the Facility that has the flows - not in the NPD Fact Pages - not already in the file
-Naming system supplied
-now anonymous - BIND (ep-dpr-spin-lib:buildSmallFacilityURI(?namingSystem, ?facilityName) AS ?facility) .
-now context not in name"""^^xsd:string ;
-                sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/facility#Facility> ;
-                            sp:predicate rdf:type ;
-                            sp:subject _:b2
-                          ] [ sp:object
-                                    [ sp:varName "reportingFacilityType"^^xsd:string
-                                    ] ;
-                            sp:predicate rdf:type ;
-                            sp:subject _:b2
-                          ] [ sp:object
-                                    [ sp:varName "facilityNameWithContext"^^xsd:string
-                                    ] ;
-                            sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
-                            sp:subject _:b2
-                          ] [ sp:object spin:_this ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                            sp:subject _:b2
-                          ] [ sp:object
-                                    [ sp:varName "facilityLabel"^^xsd:string
-                                    ] ;
-                            sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#hasDerivedText> ;
-                            sp:subject spin:_this
-                          ]) ;
-                sp:where ([ rdf:type sp:Optional ;
-                            sp:elements ([ sp:object
-                                                [ sp:varName "facilityKind"^^xsd:string
-                                                ] ;
-                                        sp:predicate <http://www.epim.no/schemas/mprml/1#kindRef> ;
-                                        sp:subject spin:_this
-                                      ])
-                          ] [ sp:object
-                                    [ sp:varName "facilityName"^^xsd:string
-                                    ] ;
-                            sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
-                            sp:subject spin:_this
-                          ] [ sp:object
-                                    [ sp:varName "namingSystem"^^xsd:string
-                                    ] ;
-                            sp:predicate <http://www.epim.no/schemas/mprml/1#namingSystem> ;
-                            sp:subject spin:_this
-                          ] [ rdf:type sp:NotExists ;
-                            sp:elements ([ sp:object spin:_this ;
-                                        sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
-                                        sp:subject
-                                                [ sp:varName "something"^^xsd:string
-                                                ]
-                                      ])
-                          ] [ rdf:type sp:Bind ;
-                            sp:expression
-                                    [ rdf:type ep-mpr-spin-lib:selectReportingFacilityType ;
-                                      sp:arg1 [ sp:varName "facilityKind"^^xsd:string
-                                              ]
-                                    ] ;
-                            sp:variable
-                                    [ sp:varName "reportingFacilityType"^^xsd:string
-                                    ]
-                          ] [ rdf:type sp:Bind ;
-                            sp:expression
-                                    [ rdf:type fn:concat ;
-                                      sp:arg1 [ sp:varName "namingSystem"^^xsd:string
-                                              ] ;
-                                      sp:arg2 "$" ;
-                                      sp:arg3 [ sp:varName "facilityName"^^xsd:string
-                                              ]
-                                    ] ;
-                            sp:variable
-                                    [ sp:varName "facilityNameWithContext"^^xsd:string
-                                    ]
-                          ] [ rdf:type sp:Bind ;
-                            sp:expression
-                                    [ rdf:type fn:concat ;
-                                      sp:arg1 [ rdf:type ep-spin-lib:normalizeString ;
-                                                sp:arg1 [ sp:varName "namingSystem"^^xsd:string
-                                                        ]
-                                              ] ;
-                                      sp:arg2 "-" ;
-                                      sp:arg3 [ rdf:type ep-spin-lib:normalizeString ;
-                                                sp:arg1 [ sp:varName "facilityName"^^xsd:string
-                                                        ]
-                                              ]
-                                    ] ;
-                            sp:variable
-                                    [ sp:varName "normalizedFacilityNameWithContext"^^xsd:string
-                                    ]
-                          ] [ rdf:type sp:Bind ;
-                            sp:expression
-                                    [ rdf:type ep-spin-lib:normalizeString ;
-                                      sp:arg1 [ rdf:type spl:object ;
-                                                sp:arg1 [ sp:varName "reportingFacilityType"^^xsd:string
-                                                        ] ;
-                                                sp:arg2 rdfs:label
-                                              ]
-                                    ] ;
-                            sp:variable
-                                    [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
-                                    ]
-                          ] [ rdf:type sp:Bind ;
-                            sp:expression
-                                    [ rdf:type fn:concat ;
-                                      sp:arg1 [ sp:varName "normalizedReportingFacilityTypeLabel"^^xsd:string
-                                              ] ;
-                                      sp:arg2 "-" ;
-                                      sp:arg3 [ sp:varName "normalizedFacilityNameWithContext"^^xsd:string
-                                              ]
-                                    ] ;
-                            sp:variable
-                                    [ sp:varName "facilityLabel"^^xsd:string
-                                    ]
-                          ])
               ] .
 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facilityIdentifierStructure-v1.1.1>
--- a/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolume-v1.0.ttl
View file @159fb4a
--- a/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumeReport-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productVolumeReport-v1.0.ttl
View file @159fb4a
--- a/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionActivity-v1.1.1.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionActivity-v1.1.1.ttl
View file @159fb4a
--- a/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0.ttl
View file @159fb4a
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0.ttl
View file @159fb4a