Bob DuCharme

Merge branch 'bob-oct26'

......@@ -4466,25 +4466,11 @@ dpr-tables:WeatherInformation
sp:subject
[ sp:varName "surroundingAir"^^xsd:string
]
] [ sp:object
[ sp:varName "windChill"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#celsius> ;
sp:subject
[ sp:varName "windChillObject"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Pressure> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "pressure"^^xsd:string
]
] [ sp:object
[ sp:varName "baromPressure"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#pascal> ;
sp:subject
[ sp:varName "pressure"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/facility#CloudCover> ;
sp:predicate rdf:type ;
sp:subject
......@@ -4504,13 +4490,6 @@ dpr-tables:WeatherInformation
sp:subject
[ sp:varName "cloudCover"^^xsd:string
]
] [ sp:object
[ sp:varName "cloudCeilingHeight"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ;
sp:subject
[ sp:varName "cloudCeilingHeightObject"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingWater> ;
sp:predicate rdf:type ;
sp:subject
......@@ -4566,6 +4545,15 @@ dpr-tables:WeatherInformation
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "windChillObject"^^xsd:string
]
] ;
sp:variable
[ sp:varName "windChill"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "maxWaveHeightObject"^^xsd:string
]
] ;
......@@ -4581,13 +4569,40 @@ dpr-tables:WeatherInformation
sp:variable
[ sp:varName "avgHighest3rdWaveHeight"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "avgWaveHeightObject"^^xsd:string
]
] ;
sp:variable
[ sp:varName "averageWaveHeight"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "cloudCeilingHeightObject"^^xsd:string
]
] ;
sp:variable
[ sp:varName "cloudCeilingHeight"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "pressure"^^xsd:string
]
] ;
sp:variable
[ sp:varName "baromPressure"^^xsd:string
]
])
] ;
rhspin:tableHeaders ("""Barometric
Pressure (Pa)"""^^xsd:string """Wind
Chill (c)"""^^xsd:string """Cloud Ceiling
Height (m)"""^^xsd:string """Average Wave
Height (m)"""^^xsd:string """Average Third
Pressure"""^^xsd:string """Wind
Chill"""^^xsd:string """Cloud Ceiling
Height"""^^xsd:string """Average
Wave Height"""^^xsd:string """Average Third
Highest Wave
Height"""^^xsd:string """Maximum Wave
Height"""^^xsd:string "Comments"^^xsd:string) .
......