data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
4b46ad25 1 parent 0cfc15ea

Flow detail improved in DPR html

Expand all
Inline Side-by-side
Showing 6 changed files with 112 additions and 79 deletions
...@@ -1893,23 +1893,23 @@ dpr-tables:ProductFlows ...@@ -1893,23 +1893,23 @@ dpr-tables:ProductFlows
1893 [ sp:varName "productFlowWholeLife"^^xsd:string 1893 [ sp:varName "productFlowWholeLife"^^xsd:string
1894 ] 1894 ]
1895 ] [ sp:object 1895 ] [ sp:object
1896 - [ sp:varName "productMaterialType"^^xsd:string 1896 + [ sp:varName "reportingProductType"^^xsd:string
1897 ] ; 1897 ] ;
1898 sp:predicate rdf:type ; 1898 sp:predicate rdf:type ;
1899 sp:subject 1899 sp:subject
1900 [ sp:varName "productFlowWholeLife"^^xsd:string 1900 [ sp:varName "productFlowWholeLife"^^xsd:string
1901 ] 1901 ]
1902 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 1902 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#ReportingProductType> ;
1903 sp:predicate rdf:type ; 1903 sp:predicate rdf:type ;
1904 sp:subject 1904 sp:subject
1905 - [ sp:varName "productMaterialType"^^xsd:string 1905 + [ sp:varName "reportingProductType"^^xsd:string
1906 ] 1906 ]
1907 ] [ sp:object 1907 ] [ sp:object
1908 [ sp:varName "productMaterialName"^^xsd:string 1908 [ sp:varName "productMaterialName"^^xsd:string
1909 ] ; 1909 ] ;
1910 sp:predicate rdfs:label ; 1910 sp:predicate rdfs:label ;
1911 sp:subject 1911 sp:subject
1912 - [ sp:varName "productMaterialType"^^xsd:string 1912 + [ sp:varName "reportingProductType"^^xsd:string
1913 ] 1913 ]
1914 ] [ rdf:type sp:Optional ; 1914 ] [ rdf:type sp:Optional ;
1915 sp:elements ([ sp:object 1915 sp:elements ([ sp:object
...@@ -4149,13 +4149,13 @@ dpr-tables:ProductionVolumes ...@@ -4149,13 +4149,13 @@ dpr-tables:ProductionVolumes
4149 rdfs:subClassOf rhspin:DPRTableTemplates ; 4149 rdfs:subClassOf rhspin:DPRTableTemplates ;
4150 spin:body 4150 spin:body
4151 [ rdf:type sp:Select ; 4151 [ rdf:type sp:Select ;
4152 - sp:orderBy ([ sp:varName "containingWholeFacilityName"^^xsd:string 4152 + sp:orderBy ([ sp:varName "containingFacilityName"^^xsd:string
4153 ] [ sp:varName "flowInOutFacilityName"^^xsd:string 4153 ] [ sp:varName "flowInOutFacilityName"^^xsd:string
4154 ] [ sp:varName "flowPurposeName"^^xsd:string 4154 ] [ sp:varName "flowPurposeName"^^xsd:string
4155 ] [ sp:varName "flowDefinitionName"^^xsd:string 4155 ] [ sp:varName "flowDefinitionName"^^xsd:string
4156 ] [ sp:varName "densityValue"^^xsd:string 4156 ] [ sp:varName "densityValue"^^xsd:string
4157 ]) ; 4157 ]) ;
4158 - sp:resultVariables ([ sp:varName "containingWholeFacilityName"^^xsd:string 4158 + sp:resultVariables ([ sp:varName "containingFacilityName"^^xsd:string
4159 ] [ sp:varName "flowInOutFacilityName"^^xsd:string 4159 ] [ sp:varName "flowInOutFacilityName"^^xsd:string
4160 ] [ sp:varName "flowPurposeName"^^xsd:string 4160 ] [ sp:varName "flowPurposeName"^^xsd:string
4161 ] [ sp:varName "flowDefinitionName"^^xsd:string 4161 ] [ sp:varName "flowDefinitionName"^^xsd:string
...@@ -4163,32 +4163,17 @@ dpr-tables:ProductionVolumes ...@@ -4163,32 +4163,17 @@ dpr-tables:ProductionVolumes
4163 ] [ sp:varName "pressureValue"^^xsd:string 4163 ] [ sp:varName "pressureValue"^^xsd:string
4164 ] [ sp:varName "temperatureValue"^^xsd:string 4164 ] [ sp:varName "temperatureValue"^^xsd:string
4165 ]) ; 4165 ]) ;
4166 - sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 4166 + sp:where ([ sp:object
4167 - sp:predicate rdf:type ; 4167 + [ sp:varName "productionflownetwork"^^xsd:string
4168 - sp:subject
4169 - [ sp:varName "report"^^xsd:string
4170 - ]
4171 - ] [ sp:object
4172 - [ sp:varName "report"^^xsd:string
4173 ] ; 4168 ] ;
4174 - sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ; 4169 + sp:predicate <http://www.reportinghub.no/ep/schema/report#reportsOnFlowNetwork> ;
4175 - sp:subject
4176 - [ sp:varName "productvolumereport"^^xsd:string
4177 - ]
4178 - ] [ sp:object <http://www.reportinghub.no/ep/schema/report#ProductVolumeReport> ;
4179 - sp:predicate rdf:type ;
4180 sp:subject 4170 sp:subject
4181 - [ sp:varName "productvolumereport"^^xsd:string 4171 + [ sp:varName "report"^^xsd:string
4182 ] 4172 ]
4183 ] [ sp:object 4173 ] [ sp:object
4184 - [ sp:varName "productionflownetwork"^^xsd:string 4174 + [ sp:varName "containingFacilityName"^^xsd:string
4185 ] ; 4175 ] ;
4186 - sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ; 4176 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#networkInFacilityName> ;
4187 - sp:subject
4188 - [ sp:varName "productvolumereport"^^xsd:string
4189 - ]
4190 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
4191 - sp:predicate rdf:type ;
4192 sp:subject 4177 sp:subject
4193 [ sp:varName "productionflownetwork"^^xsd:string 4178 [ sp:varName "productionflownetwork"^^xsd:string
4194 ] 4179 ]
...@@ -4205,27 +4190,6 @@ dpr-tables:ProductionVolumes ...@@ -4205,27 +4190,6 @@ dpr-tables:ProductionVolumes
4205 [ sp:varName "flow"^^xsd:string 4190 [ sp:varName "flow"^^xsd:string
4206 ] 4191 ]
4207 ] [ sp:object 4192 ] [ sp:object
4208 - [ sp:varName "productionflownetwork"^^xsd:string
4209 - ] ;
4210 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#facilityContainsFlow> ;
4211 - sp:subject
4212 - [ sp:varName "productionflownetworkFacility"^^xsd:string
4213 - ]
4214 - ] [ sp:object
4215 - [ sp:varName "containingWholeFacility"^^xsd:string
4216 - ] ;
4217 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
4218 - sp:subject
4219 - [ sp:varName "productionflownetworkFacility"^^xsd:string
4220 - ]
4221 - ] [ sp:object
4222 - [ sp:varName "containingWholeFacilityName"^^xsd:string
4223 - ] ;
4224 - sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
4225 - sp:subject
4226 - [ sp:varName "containingWholeFacility"^^xsd:string
4227 - ]
4228 - ] [ sp:object
4229 [ sp:varName "flowWhole"^^xsd:string 4193 [ sp:varName "flowWhole"^^xsd:string
4230 ] ; 4194 ] ;
4231 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 4195 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
...@@ -4244,38 +4208,16 @@ dpr-tables:ProductionVolumes ...@@ -4244,38 +4208,16 @@ dpr-tables:ProductionVolumes
4244 sp:subject 4208 sp:subject
4245 [ sp:varName "flowWhole"^^xsd:string 4209 [ sp:varName "flowWhole"^^xsd:string
4246 ] 4210 ]
4247 - ] [ rdf:type sp:Optional ; 4211 + ] [ rdf:type sp:TriplePath ;
4248 - sp:elements ([ sp:object 4212 + sp:object
4249 - [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
4250 - ] ;
4251 - sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
4252 - sp:subject
4253 - [ sp:varName "flowInOutFacility"^^xsd:string
4254 - ]
4255 - ])
4256 - ] [ rdf:type sp:Optional ;
4257 - sp:elements ([ sp:object
4258 - [ sp:varName "flowInOutFacilityNameEP"^^xsd:string
4259 - ] ;
4260 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
4261 - sp:subject
4262 - [ sp:varName "flowInOutFacility"^^xsd:string
4263 - ]
4264 - ])
4265 - ] [ rdf:type sp:Bind ;
4266 - sp:expression
4267 - [ rdf:type smf:if ;
4268 - sp:arg1 [ rdf:type smf:isBound ;
4269 - sp:arg1 [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
4270 - ]
4271 - ] ;
4272 - sp:arg2 [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
4273 - ] ;
4274 - sp:arg3 [ sp:varName "flowInOutFacilityNameEP"^^xsd:string
4275 - ]
4276 - ] ;
4277 - sp:variable
4278 [ sp:varName "flowInOutFacilityName"^^xsd:string 4213 [ sp:varName "flowInOutFacilityName"^^xsd:string
4214 + ] ;
4215 + sp:path [ rdf:type sp:AltPath ;
4216 + sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
4217 + sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
4218 + ] ;
4219 + sp:subject
4220 + [ sp:varName "flowInOutFacility"^^xsd:string
4279 ] 4221 ]
4280 ] [ sp:object 4222 ] [ sp:object
4281 [ sp:varName "flowPurpose"^^xsd:string 4223 [ sp:varName "flowPurpose"^^xsd:string
......
...@@ -13,6 +13,49 @@ ...@@ -13,6 +13,49 @@
13 @prefix spl: <http://spinrdf.org/spl#> . 13 @prefix spl: <http://spinrdf.org/spl#> .
14 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 14 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
15 15
16 +<http://www.reportinghub.no/ep/schema/flow#networkInFacilityName>
17 + rdf:type spin:MagicProperty ;
18 + rdfs:domain <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
19 + rdfs:label "report end flow material"^^xsd:string ;
20 + rdfs:range xsd:string ;
21 + rdfs:subClassOf spin:MagicProperties ;
22 + spin:body
23 + [ rdf:type sp:Select ;
24 + sp:distinct "true"^^xsd:boolean ;
25 + sp:resultVariables ([ sp:varName "facilityWholeName"^^xsd:string
26 + ]) ;
27 + sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
28 + sp:predicate rdf:type ;
29 + sp:subject spin:_arg1
30 + ] [ sp:object spin:_arg1 ;
31 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#facilityContainsFlow> ;
32 + sp:subject
33 + [ sp:varName "facilityPart"^^xsd:string
34 + ]
35 + ] [ sp:object
36 + [ sp:varName "facilityWhole"^^xsd:string
37 + ] ;
38 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
39 + sp:subject
40 + [ sp:varName "facilityPart"^^xsd:string
41 + ]
42 + ] [ sp:object
43 + [ sp:varName "facilityWholeName"^^xsd:string
44 + ] ;
45 + sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
46 + sp:subject
47 + [ sp:varName "facilityWhole"^^xsd:string
48 + ]
49 + ])
50 + ] ;
51 + spin:constraint
52 + [ rdf:type spl:Argument ;
53 + rdfs:comment "the network"^^xsd:string ;
54 + spl:predicate sp:arg1 ;
55 + spl:valueType <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork>
56 + ] ;
57 + spin:returnType xsd:string .
58 +
16 <http://www.reportinghub.no/ep/schema/flow#reportedFlowMaterial> 59 <http://www.reportinghub.no/ep/schema/flow#reportedFlowMaterial>
17 rdf:type spin:MagicProperty , owl:ObjectProperty ; 60 rdf:type spin:MagicProperty , owl:ObjectProperty ;
18 rdfs:domain <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ; 61 rdfs:domain <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
...@@ -136,6 +179,54 @@ ep-report:reportsOnFlow ...@@ -136,6 +179,54 @@ ep-report:reportsOnFlow
136 ] ; 179 ] ;
137 spin:returnType <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> . 180 spin:returnType <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> .
138 181
182 +ep-report:reportsOnFlowNetwork
183 + rdf:type spin:MagicProperty , owl:ObjectProperty ;
184 + rdfs:domain ep-report:ProductionReport ;
185 + rdfs:label "reports on flow network"^^xsd:string ;
186 + rdfs:range <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
187 + rdfs:subClassOf spin:MagicProperties ;
188 + spin:body
189 + [ rdf:type sp:Select ;
190 + sp:distinct "true"^^xsd:boolean ;
191 + sp:resultVariables ([ sp:varName "productionFlowNetwork"^^xsd:string
192 + ]) ;
193 + sp:where ([ sp:object ep-report:ProductionReport ;
194 + sp:predicate rdf:type ;
195 + sp:subject spin:_arg1
196 + ] [ sp:object
197 + [ sp:varName "productionReport"^^xsd:string
198 + ] ;
199 + sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ;
200 + sp:subject
201 + [ sp:varName "productVolumeReport"^^xsd:string
202 + ]
203 + ] [ sp:object ep-report:ProductVolumeReport ;
204 + sp:predicate rdf:type ;
205 + sp:subject
206 + [ sp:varName "productVolumeReport"^^xsd:string
207 + ]
208 + ] [ sp:object
209 + [ sp:varName "productionFlowNetwork"^^xsd:string
210 + ] ;
211 + sp:predicate ep-report:reportOn ;
212 + sp:subject
213 + [ sp:varName "productVolumeReport"^^xsd:string
214 + ]
215 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
216 + sp:predicate rdf:type ;
217 + sp:subject
218 + [ sp:varName "productionFlowNetwork"^^xsd:string
219 + ]
220 + ])
221 + ] ;
222 + spin:constraint
223 + [ rdf:type spl:Argument ;
224 + rdfs:comment "the report that contains flows"^^xsd:string ;
225 + spl:predicate sp:arg1 ;
226 + spl:valueType ep-report:ProductionReport
227 + ] ;
228 + spin:returnType <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> .
229 +
139 <http://www.reportinghub.no/ep/spin/prod-property> 230 <http://www.reportinghub.no/ep/spin/prod-property>
140 rdf:type owl:Ontology ; 231 rdf:type owl:Ontology ;
141 owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/erhfacts> , <http://www.reportinghub.no/ep/schema/1.0/production> ; 232 owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/erhfacts> , <http://www.reportinghub.no/ep/schema/1.0/production> ;
......