David Price

Merge branch 'master' into drilling-rd-more

......@@ -19,7 +19,7 @@
<http://www.reportinghub.no/ep/spin/dpr-tables>
rdf:type owl:Ontology ;
owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> , <http://spinrdf.org/spin> ;
owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/spin/rh> ;
owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
dpr-tables:ExportVolumes
......@@ -4442,6 +4442,7 @@ dpr-tables:SeaWeatherInformation
[ rdf:type sp:Select ;
sp:distinct "true"^^xsd:boolean ;
sp:resultVariables ([ sp:varName "waterTemperature"^^xsd:string
] [ sp:varName "currentSea"^^xsd:string
] [ sp:varName "horizontalDirectionAzimuth"^^xsd:string
] [ sp:varName "avgWaveHeight"^^xsd:string
] [ sp:varName "avgHighest3rdWaveHeight"^^xsd:string
......@@ -4536,7 +4537,7 @@ dpr-tables:SeaWeatherInformation
[ sp:varName "surroundingWater"^^xsd:string
]
] [ sp:object
[ sp:varName "flow"^^xsd:string
[ sp:varName "flow1"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
sp:subject
......@@ -4545,14 +4546,38 @@ dpr-tables:SeaWeatherInformation
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Current> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "flow"^^xsd:string
[ sp:varName "flow1"^^xsd:string
]
] [ sp:object
[ sp:varName "planeAngleObject"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#horizontalDirectionAzimuth> ;
sp:subject
[ sp:varName "flow"^^xsd:string
[ sp:varName "flow1"^^xsd:string
]
] [ sp:object
[ sp:varName "flow2"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
sp:subject
[ sp:varName "surroundingWater"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Current> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "flow2"^^xsd:string
]
] [ sp:object
[ sp:varName "velocityType"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "flow2"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Velocity> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "velocityType"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
......@@ -4577,6 +4602,15 @@ dpr-tables:SeaWeatherInformation
sp:variable
[ sp:varName "waterTemperature"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "velocityType"^^xsd:string
]
] ;
sp:variable
[ sp:varName "currentSea"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
sp:predicate rdf:type ;
sp:subject
......@@ -4672,7 +4706,8 @@ dpr-tables:SeaWeatherInformation
])
] ;
rhspin:tableHeaders ("""Sea
Temperature"""^^xsd:string """Wave Direction
Temperature"""^^xsd:string """Sea Current
Speed"""^^xsd:string """Wave Direction
(Azimuth Wave)"""^^xsd:string """Average
Wave Height"""^^xsd:string """Significant
Wave Height"""^^xsd:string """Maximum
......