David Price

Merge branch 'master' into add-more-magic

...@@ -15,24 +15,28 @@ ...@@ -15,24 +15,28 @@
15 15
16 <http://www.reportinghub.no/ep/schema/1.0/property-maps-to-mpr-enumeration> 16 <http://www.reportinghub.no/ep/schema/1.0/property-maps-to-mpr-enumeration>
17 rdf:type owl:Ontology ; 17 rdf:type owl:Ontology ;
18 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://www.epim.no/schemas/mprml/1> ; 18 + owl:imports <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://spinrdf.org/spin> ;
19 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 19 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
20 20
21 <http://www.reportinghub.no/ep/schema/core#Density> 21 <http://www.reportinghub.no/ep/schema/core#Density>
22 transhelp:rangeOfPropertyMapsToMPREnumeration 22 transhelp:rangeOfPropertyMapsToMPREnumeration
23 - <http://www.epim.no/schemas/mprml/1#FP_linedensity> , <http://www.epim.no/schemas/mprml/1#FP_density> . 23 + <http://www.epim.no/schemas/mprml/1#FP_density> , <http://www.epim.no/schemas/mprml/1#FP_linedensity> .
24 +
25 +<http://www.reportinghub.no/ep/schema/core#Frequency>
26 + transhelp:rangeOfPropertyMapsToMPREnumeration
27 + <http://www.epim.no/schemas/mprml/1#FP_reciprocatingspeed> .
24 28
25 <http://www.reportinghub.no/ep/schema/core#Pressure> 29 <http://www.reportinghub.no/ep/schema/core#Pressure>
26 transhelp:rangeOfPropertyMapsToMPREnumeration 30 transhelp:rangeOfPropertyMapsToMPREnumeration
27 - <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_annuluspressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> . 31 + <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_annuluspressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> .
28 32
29 <http://www.reportinghub.no/ep/schema/core#Temperature> 33 <http://www.reportinghub.no/ep/schema/core#Temperature>
30 transhelp:rangeOfPropertyMapsToMPREnumeration 34 transhelp:rangeOfPropertyMapsToMPREnumeration
31 - <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_temperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> . 35 + <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> , <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_temperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> .
32 36
33 <http://www.reportinghub.no/ep/schema/equipment#Casing> 37 <http://www.reportinghub.no/ep/schema/equipment#Casing>
34 transhelp:domainOfPropertyMapsToMPREnumeration 38 transhelp:domainOfPropertyMapsToMPREnumeration
35 - <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> . 39 + <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> .
36 40
37 <http://www.reportinghub.no/ep/schema/equipment#Compressor> 41 <http://www.reportinghub.no/ep/schema/equipment#Compressor>
38 transhelp:domainOfPropertyMapsToMPREnumeration 42 transhelp:domainOfPropertyMapsToMPREnumeration
...@@ -40,11 +44,11 @@ ...@@ -40,11 +44,11 @@
40 44
41 <http://www.reportinghub.no/ep/schema/equipment#Tubing> 45 <http://www.reportinghub.no/ep/schema/equipment#Tubing>
42 transhelp:domainOfPropertyMapsToMPREnumeration 46 transhelp:domainOfPropertyMapsToMPREnumeration
43 - <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> . 47 + <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> .
44 48
45 <http://www.reportinghub.no/ep/schema/flow#Flow> 49 <http://www.reportinghub.no/ep/schema/flow#Flow>
46 transhelp:domainOfPropertyMapsToMPREnumeration 50 transhelp:domainOfPropertyMapsToMPREnumeration
47 - <http://www.epim.no/schemas/mprml/1#FP_temperature> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_linedensity> , <http://www.epim.no/schemas/mprml/1#FP_density> . 51 + <http://www.epim.no/schemas/mprml/1#FP_density> , <http://www.epim.no/schemas/mprml/1#FP_linedensity> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_temperature> .
48 52
49 <http://www.reportinghub.no/ep/schema/production-well#Annulus> 53 <http://www.reportinghub.no/ep/schema/production-well#Annulus>
50 transhelp:domainOfPropertyMapsToMPREnumeration 54 transhelp:domainOfPropertyMapsToMPREnumeration
...@@ -52,24 +56,24 @@ ...@@ -52,24 +56,24 @@
52 56
53 <http://www.reportinghub.no/ep/schema/production-well#WellHead-flowingConditions> 57 <http://www.reportinghub.no/ep/schema/production-well#WellHead-flowingConditions>
54 transhelp:flowingStateMapsToMPREnumeration 58 transhelp:flowingStateMapsToMPREnumeration
55 - <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> . 59 + <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> .
56 60
57 <http://www.reportinghub.no/ep/schema/production-well#WellHead-nonflowingConditions> 61 <http://www.reportinghub.no/ep/schema/production-well#WellHead-nonflowingConditions>
58 transhelp:flowingStateMapsToMPREnumeration 62 transhelp:flowingStateMapsToMPREnumeration
59 - <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> . 63 + <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> .
60 64
61 <http://www.reportinghub.no/ep/schema/production-well#WellHeadDownStreamChokeValve> 65 <http://www.reportinghub.no/ep/schema/production-well#WellHeadDownStreamChokeValve>
62 transhelp:domainOfPropertyMapsToMPREnumeration 66 transhelp:domainOfPropertyMapsToMPREnumeration
63 - <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> . 67 + <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> .
64 68
65 <http://www.reportinghub.no/ep/schema/well#WellBoreBottom> 69 <http://www.reportinghub.no/ep/schema/well#WellBoreBottom>
66 transhelp:domainOfPropertyMapsToMPREnumeration 70 transhelp:domainOfPropertyMapsToMPREnumeration
67 - <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> . 71 + <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> .
68 72
69 <http://www.reportinghub.no/ep/schema/well#WellHead> 73 <http://www.reportinghub.no/ep/schema/well#WellHead>
70 transhelp:domainOfPropertyMapsToMPREnumeration 74 transhelp:domainOfPropertyMapsToMPREnumeration
71 - <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> . 75 + <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> .
72 76
73 rdf:type 77 rdf:type
74 transhelp:propertyMapsToMPREnumeration 78 transhelp:propertyMapsToMPREnumeration
75 - <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> , <http://www.epim.no/schemas/mprml/1#FP_annuluspressure> , <http://www.epim.no/schemas/mprml/1#FP_temperature> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_reciprocatingspeed> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_linedensity> , <http://www.epim.no/schemas/mprml/1#FP_density> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> . 79 + <http://www.epim.no/schemas/mprml/1#FP_wellheadpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_tubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_bottomholetemperature> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperatureDSCT> , <http://www.epim.no/schemas/mprml/1#FP_annuluspressure> , <http://www.epim.no/schemas/mprml/1#FP_temperature> , <http://www.epim.no/schemas/mprml/1#FP_pressure> , <http://www.epim.no/schemas/mprml/1#FP_tubingtemperature> , <http://www.epim.no/schemas/mprml/1#FP_bottomholepressure> , <http://www.epim.no/schemas/mprml/1#FP_reciprocatingspeed> , <http://www.epim.no/schemas/mprml/1#FP_flowingtubingpressure> , <http://www.epim.no/schemas/mprml/1#FP_casingpressure> , <http://www.epim.no/schemas/mprml/1#FP_density> , <http://www.epim.no/schemas/mprml/1#FP_linedensity> , <http://www.epim.no/schemas/mprml/1#FP_wellheadpressureDSCP> , <http://www.epim.no/schemas/mprml/1#FP_wellheadtemperature> .
......
...@@ -2039,7 +2039,7 @@ mpr-tables:ProductionInventory ...@@ -2039,7 +2039,7 @@ mpr-tables:ProductionInventory
2039 [ sp:varName "productionInventoryInPeriod"^^xsd:string 2039 [ sp:varName "productionInventoryInPeriod"^^xsd:string
2040 ] 2040 ]
2041 ] [ sp:object 2041 ] [ sp:object
2042 - [ sp:varName "productInventoryInPeriod"^^xsd:string 2042 + [ sp:varName "productInventory"^^xsd:string
2043 ] ; 2043 ] ;
2044 sp:predicate <http://www.reportinghub.no/ep/schema/material#hasComponent> ; 2044 sp:predicate <http://www.reportinghub.no/ep/schema/material#hasComponent> ;
2045 sp:subject 2045 sp:subject
...@@ -2048,6 +2048,13 @@ mpr-tables:ProductionInventory ...@@ -2048,6 +2048,13 @@ mpr-tables:ProductionInventory
2048 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductInventory> ; 2048 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductInventory> ;
2049 sp:predicate rdf:type ; 2049 sp:predicate rdf:type ;
2050 sp:subject 2050 sp:subject
2051 + [ sp:varName "productInventory"^^xsd:string
2052 + ]
2053 + ] [ sp:object
2054 + [ sp:varName "productInventory"^^xsd:string
2055 + ] ;
2056 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2057 + sp:subject
2051 [ sp:varName "productInventoryInPeriod"^^xsd:string 2058 [ sp:varName "productInventoryInPeriod"^^xsd:string
2052 ] 2059 ]
2053 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ; 2060 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ;
...@@ -2080,7 +2087,7 @@ mpr-tables:ProductionInventory ...@@ -2080,7 +2087,7 @@ mpr-tables:ProductionInventory
2080 ]) 2087 ])
2081 ] [ rdf:type sp:Optional ; 2088 ] [ rdf:type sp:Optional ;
2082 sp:elements ([ sp:object 2089 sp:elements ([ sp:object
2083 - [ sp:varName "productInventoryInPeriod"^^xsd:string 2090 + [ sp:varName "productInventory"^^xsd:string
2084 ] ; 2091 ] ;
2085 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 2092 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2086 sp:subject 2093 sp:subject
...@@ -2161,7 +2168,7 @@ mpr-tables:ProductionInventory ...@@ -2161,7 +2168,7 @@ mpr-tables:ProductionInventory
2161 ] ; 2168 ] ;
2162 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 2169 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
2163 sp:subject 2170 sp:subject
2164 - [ sp:varName "productInventoryInPeriod"^^xsd:string 2171 + [ sp:varName "productInventory"^^xsd:string
2165 ] 2172 ]
2166 ] [ sp:object 2173 ] [ sp:object
2167 [ sp:varName "productInventoryWholeType"^^xsd:string 2174 [ sp:varName "productInventoryWholeType"^^xsd:string
...@@ -2237,10 +2244,10 @@ mpr-tables:ProductionInventoryOwnership ...@@ -2237,10 +2244,10 @@ mpr-tables:ProductionInventoryOwnership
2237 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 2244 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
2238 sp:predicate rdf:type ; 2245 sp:predicate rdf:type ;
2239 sp:subject 2246 sp:subject
2240 - [ sp:varName "productionReport"^^xsd:string 2247 + [ sp:varName "report"^^xsd:string
2241 ] 2248 ]
2242 ] [ sp:object 2249 ] [ sp:object
2243 - [ sp:varName "productionReport"^^xsd:string 2250 + [ sp:varName "report"^^xsd:string
2244 ] ; 2251 ] ;
2245 sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ; 2252 sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ;
2246 sp:subject 2253 sp:subject
...@@ -2330,24 +2337,17 @@ mpr-tables:ProductionInventoryOwnership ...@@ -2330,24 +2337,17 @@ mpr-tables:ProductionInventoryOwnership
2330 sp:subject 2337 sp:subject
2331 [ sp:varName "partOfOrg"^^xsd:string 2338 [ sp:varName "partOfOrg"^^xsd:string
2332 ] 2339 ]
2333 - ] [ rdf:type sp:Optional ; 2340 + ] [ rdf:type sp:TriplePath ;
2334 - sp:elements ([ sp:object 2341 + sp:object
2335 [ sp:varName "owningOrgName"^^xsd:string 2342 [ sp:varName "owningOrgName"^^xsd:string
2336 ] ; 2343 ] ;
2337 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ; 2344 + sp:path [ rdf:type sp:AltPath ;
2338 - sp:subject 2345 + sp:path1 <http://www.reportinghub.no/ep/schema/core#name> ;
2339 - [ sp:varName "owningOrg"^^xsd:string 2346 + sp:path2 <http://www.reportinghub.no/np/schema/npd#name>
2340 - ]
2341 - ])
2342 - ] [ rdf:type sp:Optional ;
2343 - sp:elements ([ sp:object
2344 - [ sp:varName "owningOrgName"^^xsd:string
2345 ] ; 2347 ] ;
2346 - sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
2347 sp:subject 2348 sp:subject
2348 [ sp:varName "owningOrg"^^xsd:string 2349 [ sp:varName "owningOrg"^^xsd:string
2349 ] 2350 ]
2350 - ])
2351 ] [ sp:object 2351 ] [ sp:object
2352 [ sp:varName "quantityofmaterial"^^xsd:string 2352 [ sp:varName "quantityofmaterial"^^xsd:string
2353 ] ; 2353 ] ;
......