data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Bob DuCharme
7c0d9d8e 2 parents 5c17c718 09a42cbb

Merge branch 'bob-oct26'

Inline Side-by-side
Showing 1 changed file with 40 additions and 25 deletions
...@@ -4466,25 +4466,11 @@ dpr-tables:WeatherInformation ...@@ -4466,25 +4466,11 @@ dpr-tables:WeatherInformation
4466 sp:subject 4466 sp:subject
4467 [ sp:varName "surroundingAir"^^xsd:string 4467 [ sp:varName "surroundingAir"^^xsd:string
4468 ] 4468 ]
4469 - ] [ sp:object
4470 - [ sp:varName "windChill"^^xsd:string
4471 - ] ;
4472 - sp:predicate <http://www.reportinghub.no/ep/schema/core#celsius> ;
4473 - sp:subject
4474 - [ sp:varName "windChillObject"^^xsd:string
4475 - ]
4476 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Pressure> ; 4469 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Pressure> ;
4477 sp:predicate rdf:type ; 4470 sp:predicate rdf:type ;
4478 sp:subject 4471 sp:subject
4479 [ sp:varName "pressure"^^xsd:string 4472 [ sp:varName "pressure"^^xsd:string
4480 ] 4473 ]
4481 - ] [ sp:object
4482 - [ sp:varName "baromPressure"^^xsd:string
4483 - ] ;
4484 - sp:predicate <http://www.reportinghub.no/ep/schema/core#pascal> ;
4485 - sp:subject
4486 - [ sp:varName "pressure"^^xsd:string
4487 - ]
4488 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#CloudCover> ; 4474 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#CloudCover> ;
4489 sp:predicate rdf:type ; 4475 sp:predicate rdf:type ;
4490 sp:subject 4476 sp:subject
...@@ -4504,13 +4490,6 @@ dpr-tables:WeatherInformation ...@@ -4504,13 +4490,6 @@ dpr-tables:WeatherInformation
4504 sp:subject 4490 sp:subject
4505 [ sp:varName "cloudCover"^^xsd:string 4491 [ sp:varName "cloudCover"^^xsd:string
4506 ] 4492 ]
4507 - ] [ sp:object
4508 - [ sp:varName "cloudCeilingHeight"^^xsd:string
4509 - ] ;
4510 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ;
4511 - sp:subject
4512 - [ sp:varName "cloudCeilingHeightObject"^^xsd:string
4513 - ]
4514 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingWater> ; 4493 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingWater> ;
4515 sp:predicate rdf:type ; 4494 sp:predicate rdf:type ;
4516 sp:subject 4495 sp:subject
...@@ -4566,6 +4545,15 @@ dpr-tables:WeatherInformation ...@@ -4566,6 +4545,15 @@ dpr-tables:WeatherInformation
4566 ] [ rdf:type sp:Bind ; 4545 ] [ rdf:type sp:Bind ;
4567 sp:expression 4546 sp:expression
4568 [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ; 4547 [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4548 + sp:arg1 [ sp:varName "windChillObject"^^xsd:string
4549 + ]
4550 + ] ;
4551 + sp:variable
4552 + [ sp:varName "windChill"^^xsd:string
4553 + ]
4554 + ] [ rdf:type sp:Bind ;
4555 + sp:expression
4556 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4569 sp:arg1 [ sp:varName "maxWaveHeightObject"^^xsd:string 4557 sp:arg1 [ sp:varName "maxWaveHeightObject"^^xsd:string
4570 ] 4558 ]
4571 ] ; 4559 ] ;
...@@ -4581,13 +4569,40 @@ dpr-tables:WeatherInformation ...@@ -4581,13 +4569,40 @@ dpr-tables:WeatherInformation
4581 sp:variable 4569 sp:variable
4582 [ sp:varName "avgHighest3rdWaveHeight"^^xsd:string 4570 [ sp:varName "avgHighest3rdWaveHeight"^^xsd:string
4583 ] 4571 ]
4572 + ] [ rdf:type sp:Bind ;
4573 + sp:expression
4574 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4575 + sp:arg1 [ sp:varName "avgWaveHeightObject"^^xsd:string
4576 + ]
4577 + ] ;
4578 + sp:variable
4579 + [ sp:varName "averageWaveHeight"^^xsd:string
4580 + ]
4581 + ] [ rdf:type sp:Bind ;
4582 + sp:expression
4583 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4584 + sp:arg1 [ sp:varName "cloudCeilingHeightObject"^^xsd:string
4585 + ]
4586 + ] ;
4587 + sp:variable
4588 + [ sp:varName "cloudCeilingHeight"^^xsd:string
4589 + ]
4590 + ] [ rdf:type sp:Bind ;
4591 + sp:expression
4592 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4593 + sp:arg1 [ sp:varName "pressure"^^xsd:string
4594 + ]
4595 + ] ;
4596 + sp:variable
4597 + [ sp:varName "baromPressure"^^xsd:string
4598 + ]
4584 ]) 4599 ])
4585 ] ; 4600 ] ;
4586 rhspin:tableHeaders ("""Barometric 4601 rhspin:tableHeaders ("""Barometric
4587 -Pressure (Pa)"""^^xsd:string """Wind 4602 +Pressure"""^^xsd:string """Wind
4588 -Chill (c)"""^^xsd:string """Cloud Ceiling 4603 +Chill"""^^xsd:string """Cloud Ceiling
4589 -Height (m)"""^^xsd:string """Average Wave 4604 +Height"""^^xsd:string """Average
4590 -Height (m)"""^^xsd:string """Average Third 4605 +Wave Height"""^^xsd:string """Average Third
4591 Highest Wave 4606 Highest Wave
4592 Height"""^^xsd:string """Maximum Wave 4607 Height"""^^xsd:string """Maximum Wave
4593 Height"""^^xsd:string "Comments"^^xsd:string) . 4608 Height"""^^xsd:string "Comments"^^xsd:string) .
......