data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Bob DuCharme
6a8974b4 2 parents 26a4e8f9 ec89453d

Merge branch 'bob-dec4'

Inline Side-by-side
Showing 1 changed file with 40 additions and 5 deletions
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 19
20 <http://www.reportinghub.no/ep/spin/dpr-tables> 20 <http://www.reportinghub.no/ep/spin/dpr-tables>
21 rdf:type owl:Ontology ; 21 rdf:type owl:Ontology ;
22 - 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> ; 22 + 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> ;
23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
24 24
25 dpr-tables:ExportVolumes 25 dpr-tables:ExportVolumes
...@@ -4442,6 +4442,7 @@ dpr-tables:SeaWeatherInformation ...@@ -4442,6 +4442,7 @@ dpr-tables:SeaWeatherInformation
4442 [ rdf:type sp:Select ; 4442 [ rdf:type sp:Select ;
4443 sp:distinct "true"^^xsd:boolean ; 4443 sp:distinct "true"^^xsd:boolean ;
4444 sp:resultVariables ([ sp:varName "waterTemperature"^^xsd:string 4444 sp:resultVariables ([ sp:varName "waterTemperature"^^xsd:string
4445 + ] [ sp:varName "currentSea"^^xsd:string
4445 ] [ sp:varName "horizontalDirectionAzimuth"^^xsd:string 4446 ] [ sp:varName "horizontalDirectionAzimuth"^^xsd:string
4446 ] [ sp:varName "avgWaveHeight"^^xsd:string 4447 ] [ sp:varName "avgWaveHeight"^^xsd:string
4447 ] [ sp:varName "avgHighest3rdWaveHeight"^^xsd:string 4448 ] [ sp:varName "avgHighest3rdWaveHeight"^^xsd:string
...@@ -4536,7 +4537,7 @@ dpr-tables:SeaWeatherInformation ...@@ -4536,7 +4537,7 @@ dpr-tables:SeaWeatherInformation
4536 [ sp:varName "surroundingWater"^^xsd:string 4537 [ sp:varName "surroundingWater"^^xsd:string
4537 ] 4538 ]
4538 ] [ sp:object 4539 ] [ sp:object
4539 - [ sp:varName "flow"^^xsd:string 4540 + [ sp:varName "flow1"^^xsd:string
4540 ] ; 4541 ] ;
4541 sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ; 4542 sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
4542 sp:subject 4543 sp:subject
...@@ -4545,14 +4546,38 @@ dpr-tables:SeaWeatherInformation ...@@ -4545,14 +4546,38 @@ dpr-tables:SeaWeatherInformation
4545 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Current> ; 4546 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Current> ;
4546 sp:predicate rdf:type ; 4547 sp:predicate rdf:type ;
4547 sp:subject 4548 sp:subject
4548 - [ sp:varName "flow"^^xsd:string 4549 + [ sp:varName "flow1"^^xsd:string
4549 ] 4550 ]
4550 ] [ sp:object 4551 ] [ sp:object
4551 [ sp:varName "planeAngleObject"^^xsd:string 4552 [ sp:varName "planeAngleObject"^^xsd:string
4552 ] ; 4553 ] ;
4553 sp:predicate <http://www.reportinghub.no/ep/schema/flow#horizontalDirectionAzimuth> ; 4554 sp:predicate <http://www.reportinghub.no/ep/schema/flow#horizontalDirectionAzimuth> ;
4554 sp:subject 4555 sp:subject
4555 - [ sp:varName "flow"^^xsd:string 4556 + [ sp:varName "flow1"^^xsd:string
4557 + ]
4558 + ] [ sp:object
4559 + [ sp:varName "flow2"^^xsd:string
4560 + ] ;
4561 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
4562 + sp:subject
4563 + [ sp:varName "surroundingWater"^^xsd:string
4564 + ]
4565 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Current> ;
4566 + sp:predicate rdf:type ;
4567 + sp:subject
4568 + [ sp:varName "flow2"^^xsd:string
4569 + ]
4570 + ] [ sp:object
4571 + [ sp:varName "velocityType"^^xsd:string
4572 + ] ;
4573 + sp:predicate rdf:type ;
4574 + sp:subject
4575 + [ sp:varName "flow2"^^xsd:string
4576 + ]
4577 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Velocity> ;
4578 + sp:predicate rdf:type ;
4579 + sp:subject
4580 + [ sp:varName "velocityType"^^xsd:string
4556 ] 4581 ]
4557 ] [ rdf:type sp:Bind ; 4582 ] [ rdf:type sp:Bind ;
4558 sp:expression 4583 sp:expression
...@@ -4577,6 +4602,15 @@ dpr-tables:SeaWeatherInformation ...@@ -4577,6 +4602,15 @@ dpr-tables:SeaWeatherInformation
4577 sp:variable 4602 sp:variable
4578 [ sp:varName "waterTemperature"^^xsd:string 4603 [ sp:varName "waterTemperature"^^xsd:string
4579 ] 4604 ]
4605 + ] [ rdf:type sp:Bind ;
4606 + sp:expression
4607 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4608 + sp:arg1 [ sp:varName "velocityType"^^xsd:string
4609 + ]
4610 + ] ;
4611 + sp:variable
4612 + [ sp:varName "currentSea"^^xsd:string
4613 + ]
4580 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ; 4614 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
4581 sp:predicate rdf:type ; 4615 sp:predicate rdf:type ;
4582 sp:subject 4616 sp:subject
...@@ -4672,7 +4706,8 @@ dpr-tables:SeaWeatherInformation ...@@ -4672,7 +4706,8 @@ dpr-tables:SeaWeatherInformation
4672 ]) 4706 ])
4673 ] ; 4707 ] ;
4674 rhspin:tableHeaders ("""Sea 4708 rhspin:tableHeaders ("""Sea
4675 -Temperature"""^^xsd:string """Wave Direction 4709 +Temperature"""^^xsd:string """Sea Current
4710 +Speed"""^^xsd:string """Wave Direction
4676 (Azimuth Wave)"""^^xsd:string """Average 4711 (Azimuth Wave)"""^^xsd:string """Average
4677 Wave Height"""^^xsd:string """Significant 4712 Wave Height"""^^xsd:string """Significant
4678 Wave Height"""^^xsd:string """Maximum 4713 Wave Height"""^^xsd:string """Maximum
......