Bob DuCharme

Merge branch 'bob-nov30'

...@@ -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
...@@ -4441,9 +4441,13 @@ dpr-tables:SeaWeatherInformation ...@@ -4441,9 +4441,13 @@ dpr-tables:SeaWeatherInformation
4441 spin:body 4441 spin:body
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 "avgWaveHeight"^^xsd:string 4444 + sp:resultVariables ([ sp:varName "waterTemperature"^^xsd:string
4445 + ] [ sp:varName "horizontalDirectionAzimuth"^^xsd:string
4446 + ] [ sp:varName "avgWaveHeight"^^xsd:string
4445 ] [ sp:varName "avgHighest3rdWaveHeight"^^xsd:string 4447 ] [ sp:varName "avgHighest3rdWaveHeight"^^xsd:string
4446 ] [ sp:varName "maxWaveHeight"^^xsd:string 4448 ] [ sp:varName "maxWaveHeight"^^xsd:string
4449 + ] [ sp:varName "period"^^xsd:string
4450 + ] [ sp:varName "aziCurrentSea"^^xsd:string
4447 ]) ; 4451 ]) ;
4448 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 4452 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
4449 sp:predicate rdf:type ; 4453 sp:predicate rdf:type ;
...@@ -4524,6 +4528,55 @@ dpr-tables:SeaWeatherInformation ...@@ -4524,6 +4528,55 @@ dpr-tables:SeaWeatherInformation
4524 sp:subject 4528 sp:subject
4525 [ sp:varName "surroundingWater"^^xsd:string 4529 [ sp:varName "surroundingWater"^^xsd:string
4526 ] 4530 ]
4531 + ] [ sp:object
4532 + [ sp:varName "temperatureType"^^xsd:string
4533 + ] ;
4534 + sp:predicate rdf:type ;
4535 + sp:subject
4536 + [ sp:varName "surroundingWater"^^xsd:string
4537 + ]
4538 + ] [ sp:object
4539 + [ sp:varName "flow"^^xsd:string
4540 + ] ;
4541 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
4542 + sp:subject
4543 + [ sp:varName "surroundingWater"^^xsd:string
4544 + ]
4545 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Current> ;
4546 + sp:predicate rdf:type ;
4547 + sp:subject
4548 + [ sp:varName "flow"^^xsd:string
4549 + ]
4550 + ] [ sp:object
4551 + [ sp:varName "planeAngleObject"^^xsd:string
4552 + ] ;
4553 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#horizontalDirectionAzimuth> ;
4554 + sp:subject
4555 + [ sp:varName "flow"^^xsd:string
4556 + ]
4557 + ] [ rdf:type sp:Bind ;
4558 + sp:expression
4559 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4560 + sp:arg1 [ sp:varName "planeAngleObject"^^xsd:string
4561 + ]
4562 + ] ;
4563 + sp:variable
4564 + [ sp:varName "aziCurrentSea"^^xsd:string
4565 + ]
4566 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ;
4567 + sp:predicate rdf:type ;
4568 + sp:subject
4569 + [ sp:varName "temperatureType"^^xsd:string
4570 + ]
4571 + ] [ rdf:type sp:Bind ;
4572 + sp:expression
4573 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4574 + sp:arg1 [ sp:varName "temperatureType"^^xsd:string
4575 + ]
4576 + ] ;
4577 + sp:variable
4578 + [ sp:varName "waterTemperature"^^xsd:string
4579 + ]
4527 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ; 4580 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurfaceWaves> ;
4528 sp:predicate rdf:type ; 4581 sp:predicate rdf:type ;
4529 sp:subject 4582 sp:subject
...@@ -4551,6 +4604,20 @@ dpr-tables:SeaWeatherInformation ...@@ -4551,6 +4604,20 @@ dpr-tables:SeaWeatherInformation
4551 [ sp:varName "surfaceWaves"^^xsd:string 4604 [ sp:varName "surfaceWaves"^^xsd:string
4552 ] 4605 ]
4553 ] [ sp:object 4606 ] [ sp:object
4607 + [ sp:varName "horizontalDirectionAzimuthObject"^^xsd:string
4608 + ] ;
4609 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#horizontalDirectionAzimuth> ;
4610 + sp:subject
4611 + [ sp:varName "surfaceWaves"^^xsd:string
4612 + ]
4613 + ] [ sp:object
4614 + [ sp:varName "periodObject"^^xsd:string
4615 + ] ;
4616 + sp:predicate <http://www.reportinghub.no/ep/schema/facility#period> ;
4617 + sp:subject
4618 + [ sp:varName "surfaceWaves"^^xsd:string
4619 + ]
4620 + ] [ sp:object
4554 [ sp:varName "avgWaveHeight"^^xsd:string 4621 [ sp:varName "avgWaveHeight"^^xsd:string
4555 ] ; 4622 ] ;
4556 sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ; 4623 sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ;
...@@ -4584,13 +4651,34 @@ dpr-tables:SeaWeatherInformation ...@@ -4584,13 +4651,34 @@ dpr-tables:SeaWeatherInformation
4584 sp:variable 4651 sp:variable
4585 [ sp:varName "averageWaveHeight"^^xsd:string 4652 [ sp:varName "averageWaveHeight"^^xsd:string
4586 ] 4653 ]
4654 + ] [ rdf:type sp:Bind ;
4655 + sp:expression
4656 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4657 + sp:arg1 [ sp:varName "horizontalDirectionAzimuthObject"^^xsd:string
4658 + ]
4659 + ] ;
4660 + sp:variable
4661 + [ sp:varName "horizontalDirectionAzimuth"^^xsd:string
4662 + ]
4663 + ] [ rdf:type sp:Bind ;
4664 + sp:expression
4665 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4666 + sp:arg1 [ sp:varName "periodObject"^^xsd:string
4667 + ]
4668 + ] ;
4669 + sp:variable
4670 + [ sp:varName "period"^^xsd:string
4671 + ]
4587 ]) 4672 ])
4588 ] ; 4673 ] ;
4589 - rhspin:tableHeaders ("""Average 4674 + rhspin:tableHeaders ("""Sea
4590 -Wave Height"""^^xsd:string """Average Third 4675 +Temperature"""^^xsd:string """Wave Direction
4591 -Highest Wave 4676 +(Azimuth Wave)"""^^xsd:string """Average
4592 -Height"""^^xsd:string """Maximum Wave 4677 +Wave Height"""^^xsd:string """Significant
4593 -Height"""^^xsd:string) . 4678 +Wave Height"""^^xsd:string """Maximum
4679 +Wave Height"""^^xsd:string """Wave
4680 +Period"""^^xsd:string """Azimuth
4681 +Sea Current"""^^xsd:string) .
4594 4682
4595 dpr-tables:WeatherInformation 4683 dpr-tables:WeatherInformation
4596 rdf:type rhspin:TableTemplate ; 4684 rdf:type rhspin:TableTemplate ;
...@@ -4603,6 +4691,7 @@ dpr-tables:WeatherInformation ...@@ -4603,6 +4691,7 @@ dpr-tables:WeatherInformation
4603 ] [ sp:varName "windChill"^^xsd:string 4691 ] [ sp:varName "windChill"^^xsd:string
4604 ] [ sp:varName "cloudCeilingHeight"^^xsd:string 4692 ] [ sp:varName "cloudCeilingHeight"^^xsd:string
4605 ] [ sp:varName "coverCloud"^^xsd:string 4693 ] [ sp:varName "coverCloud"^^xsd:string
4694 + ] [ sp:varName "visibility"^^xsd:string
4606 ] [ sp:varName "beaufortNumber"^^xsd:string 4695 ] [ sp:varName "beaufortNumber"^^xsd:string
4607 ] [ sp:varName "windSpeed"^^xsd:string 4696 ] [ sp:varName "windSpeed"^^xsd:string
4608 ] [ sp:varName "aziWind"^^xsd:string 4697 ] [ sp:varName "aziWind"^^xsd:string
...@@ -4798,6 +4887,22 @@ dpr-tables:WeatherInformation ...@@ -4798,6 +4887,22 @@ dpr-tables:WeatherInformation
4798 sp:subject 4887 sp:subject
4799 [ sp:varName "surroundingAir"^^xsd:string 4888 [ sp:varName "surroundingAir"^^xsd:string
4800 ] 4889 ]
4890 + ] [ sp:object
4891 + [ sp:varName "visibilityObject"^^xsd:string
4892 + ] ;
4893 + sp:predicate <http://www.reportinghub.no/ep/schema/facility#visibility> ;
4894 + sp:subject
4895 + [ sp:varName "surroundingAir"^^xsd:string
4896 + ]
4897 + ] [ rdf:type sp:Bind ;
4898 + sp:expression
4899 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4900 + sp:arg1 [ sp:varName "visibilityObject"^^xsd:string
4901 + ]
4902 + ] ;
4903 + sp:variable
4904 + [ sp:varName "visibility"^^xsd:string
4905 + ]
4801 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ; 4906 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ;
4802 sp:predicate rdf:type ; 4907 sp:predicate rdf:type ;
4803 sp:subject 4908 sp:subject
...@@ -4876,7 +4981,7 @@ dpr-tables:WeatherInformation ...@@ -4876,7 +4981,7 @@ dpr-tables:WeatherInformation
4876 ] ; 4981 ] ;
4877 rhspin:tableHeaders ("""Barometric 4982 rhspin:tableHeaders ("""Barometric
4878 Pressure"""^^xsd:string """Wind Chill 4983 Pressure"""^^xsd:string """Wind Chill
4879 -Factor"""^^xsd:string "Cloud Ceiling"^^xsd:string "Cloud Description"^^xsd:string """Beaufort 4984 +Factor"""^^xsd:string "Cloud Ceiling"^^xsd:string "Cloud Description"^^xsd:string "Visibility"^^xsd:string """Beaufort
4880 Wind Scale"""^^xsd:string "Wind Speed"^^xsd:string "Azimuth Wind"^^xsd:string """Precipitation 4985 Wind Scale"""^^xsd:string "Wind Speed"^^xsd:string "Azimuth Wind"^^xsd:string """Precipitation
4881 Type"""^^xsd:string """Amount 4986 Type"""^^xsd:string """Amount
4882 Precipitation"""^^xsd:string "Comments"^^xsd:string) . 4987 Precipitation"""^^xsd:string "Comments"^^xsd:string) .
......