Bob DuCharme

Merge branch 'bob-nov30a'

...@@ -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://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> ; 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> ;
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
...@@ -4687,7 +4687,9 @@ dpr-tables:WeatherInformation ...@@ -4687,7 +4687,9 @@ dpr-tables:WeatherInformation
4687 spin:body 4687 spin:body
4688 [ rdf:type sp:Select ; 4688 [ rdf:type sp:Select ;
4689 sp:distinct "true"^^xsd:boolean ; 4689 sp:distinct "true"^^xsd:boolean ;
4690 - sp:resultVariables ([ sp:varName "baromPressure"^^xsd:string 4690 + sp:resultVariables ([ sp:varName "minTemperature"^^xsd:string
4691 + ] [ sp:varName "maxTemperature"^^xsd:string
4692 + ] [ sp:varName "baromPressure"^^xsd:string
4691 ] [ sp:varName "windChill"^^xsd:string 4693 ] [ sp:varName "windChill"^^xsd:string
4692 ] [ sp:varName "cloudCeilingHeight"^^xsd:string 4694 ] [ sp:varName "cloudCeilingHeight"^^xsd:string
4693 ] [ sp:varName "coverCloud"^^xsd:string 4695 ] [ sp:varName "coverCloud"^^xsd:string
...@@ -4769,35 +4771,35 @@ dpr-tables:WeatherInformation ...@@ -4769,35 +4771,35 @@ dpr-tables:WeatherInformation
4769 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ; 4771 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingAir> ;
4770 sp:predicate rdf:type ; 4772 sp:predicate rdf:type ;
4771 sp:subject 4773 sp:subject
4772 - [ sp:varName "surroundingAir"^^xsd:string 4774 + [ sp:varName "surroundingAir1"^^xsd:string
4773 ] 4775 ]
4774 ] [ sp:object 4776 ] [ sp:object
4775 [ sp:varName "pressure"^^xsd:string 4777 [ sp:varName "pressure"^^xsd:string
4776 ] ; 4778 ] ;
4777 sp:predicate rdf:type ; 4779 sp:predicate rdf:type ;
4778 sp:subject 4780 sp:subject
4779 - [ sp:varName "surroundingAir"^^xsd:string 4781 + [ sp:varName "surroundingAir1"^^xsd:string
4780 ] 4782 ]
4781 ] [ sp:object 4783 ] [ sp:object
4782 [ sp:varName "surroundingEnvironment1"^^xsd:string 4784 [ sp:varName "surroundingEnvironment1"^^xsd:string
4783 ] ; 4785 ] ;
4784 sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ; 4786 sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
4785 sp:subject 4787 sp:subject
4786 - [ sp:varName "surroundingAir"^^xsd:string 4788 + [ sp:varName "surroundingAir1"^^xsd:string
4787 ] 4789 ]
4788 ] [ sp:object 4790 ] [ sp:object
4789 [ sp:varName "windChillObject"^^xsd:string 4791 [ sp:varName "windChillObject"^^xsd:string
4790 ] ; 4792 ] ;
4791 sp:predicate <http://www.reportinghub.no/ep/schema/facility#windChillTemperature> ; 4793 sp:predicate <http://www.reportinghub.no/ep/schema/facility#windChillTemperature> ;
4792 sp:subject 4794 sp:subject
4793 - [ sp:varName "surroundingAir"^^xsd:string 4795 + [ sp:varName "surroundingAir1"^^xsd:string
4794 ] 4796 ]
4795 ] [ sp:object 4797 ] [ sp:object
4796 [ sp:varName "wind"^^xsd:string 4798 [ sp:varName "wind"^^xsd:string
4797 ] ; 4799 ] ;
4798 sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ; 4800 sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
4799 sp:subject 4801 sp:subject
4800 - [ sp:varName "surroundingAir"^^xsd:string 4802 + [ sp:varName "surroundingAir1"^^xsd:string
4801 ] 4803 ]
4802 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Wind> ; 4804 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#Wind> ;
4803 sp:predicate rdf:type ; 4805 sp:predicate rdf:type ;
...@@ -4867,7 +4869,7 @@ dpr-tables:WeatherInformation ...@@ -4867,7 +4869,7 @@ dpr-tables:WeatherInformation
4867 [ sp:varName "cloudCover"^^xsd:string 4869 [ sp:varName "cloudCover"^^xsd:string
4868 ] 4870 ]
4869 ] [ sp:object 4871 ] [ sp:object
4870 - [ sp:varName "surroundingAir"^^xsd:string 4872 + [ sp:varName "surroundingAir1"^^xsd:string
4871 ] ; 4873 ] ;
4872 sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ; 4874 sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
4873 sp:subject 4875 sp:subject
...@@ -4885,14 +4887,14 @@ dpr-tables:WeatherInformation ...@@ -4885,14 +4887,14 @@ dpr-tables:WeatherInformation
4885 ] ; 4887 ] ;
4886 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 4888 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
4887 sp:subject 4889 sp:subject
4888 - [ sp:varName "surroundingAir"^^xsd:string 4890 + [ sp:varName "surroundingAir1"^^xsd:string
4889 ] 4891 ]
4890 ] [ sp:object 4892 ] [ sp:object
4891 [ sp:varName "visibilityObject"^^xsd:string 4893 [ sp:varName "visibilityObject"^^xsd:string
4892 ] ; 4894 ] ;
4893 sp:predicate <http://www.reportinghub.no/ep/schema/facility#visibility> ; 4895 sp:predicate <http://www.reportinghub.no/ep/schema/facility#visibility> ;
4894 sp:subject 4896 sp:subject
4895 - [ sp:varName "surroundingAir"^^xsd:string 4897 + [ sp:varName "surroundingAir1"^^xsd:string
4896 ] 4898 ]
4897 ] [ rdf:type sp:Bind ; 4899 ] [ rdf:type sp:Bind ;
4898 sp:expression 4900 sp:expression
...@@ -4909,6 +4911,74 @@ dpr-tables:WeatherInformation ...@@ -4909,6 +4911,74 @@ dpr-tables:WeatherInformation
4909 [ sp:varName "surroundingAir2"^^xsd:string 4911 [ sp:varName "surroundingAir2"^^xsd:string
4910 ] 4912 ]
4911 ] [ sp:object 4913 ] [ sp:object
4914 + [ sp:varName "surroundingEnvironment2"^^xsd:string
4915 + ] ;
4916 + sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
4917 + sp:subject
4918 + [ sp:varName "surroundingAir2"^^xsd:string
4919 + ]
4920 + ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#SurroundingEnvironment> ;
4921 + sp:predicate rdf:type ;
4922 + sp:subject
4923 + [ sp:varName "surroundingEnvironment2"^^xsd:string
4924 + ]
4925 + ] [ sp:object
4926 + [ sp:varName "setOfTemporalInstants"^^xsd:string
4927 + ] ;
4928 + sp:predicate <http://www.reportinghub.no/ep/schema/core#hasSetOfTemporalInstants> ;
4929 + sp:subject
4930 + [ sp:varName "surroundingAir2"^^xsd:string
4931 + ]
4932 + ] [ sp:object
4933 + [ sp:varName "setOfTemporalInstants"^^xsd:string
4934 + ] ;
4935 + sp:predicate <http://www.reportinghub.no/ep/schema/core#domain> ;
4936 + sp:subject
4937 + [ sp:varName "classificationFunctionOverTime"^^xsd:string
4938 + ]
4939 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#SetOfTemporalInstants> ;
4940 + sp:predicate rdf:type ;
4941 + sp:subject
4942 + [ sp:varName "setOfTemporalInstants"^^xsd:string
4943 + ]
4944 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#ClassificationFunctionOverTime> ;
4945 + sp:predicate rdf:type ;
4946 + sp:subject
4947 + [ sp:varName "classificationFunctionOverTime"^^xsd:string
4948 + ]
4949 + ] [ sp:object
4950 + [ sp:varName "minimum"^^xsd:string
4951 + ] ;
4952 + sp:predicate <http://www.reportinghub.no/ep/schema/core#minimum> ;
4953 + sp:subject
4954 + [ sp:varName "classificationFunctionOverTime"^^xsd:string
4955 + ]
4956 + ] [ sp:object
4957 + [ sp:varName "maximum"^^xsd:string
4958 + ] ;
4959 + sp:predicate <http://www.reportinghub.no/ep/schema/core#maximum> ;
4960 + sp:subject
4961 + [ sp:varName "classificationFunctionOverTime"^^xsd:string
4962 + ]
4963 + ] [ rdf:type sp:Bind ;
4964 + sp:expression
4965 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4966 + sp:arg1 [ sp:varName "minimum"^^xsd:string
4967 + ]
4968 + ] ;
4969 + sp:variable
4970 + [ sp:varName "minTemperature"^^xsd:string
4971 + ]
4972 + ] [ rdf:type sp:Bind ;
4973 + sp:expression
4974 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4975 + sp:arg1 [ sp:varName "maximum"^^xsd:string
4976 + ]
4977 + ] ;
4978 + sp:variable
4979 + [ sp:varName "maxTemperature"^^xsd:string
4980 + ]
4981 + ] [ sp:object
4912 [ sp:varName "flow"^^xsd:string 4982 [ sp:varName "flow"^^xsd:string
4913 ] ; 4983 ] ;
4914 sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ; 4984 sp:predicate <http://www.reportinghub.no/ep/schema/activity#hasFlow> ;
...@@ -4979,7 +5049,9 @@ dpr-tables:WeatherInformation ...@@ -4979,7 +5049,9 @@ dpr-tables:WeatherInformation
4979 ] 5049 ]
4980 ]) 5050 ])
4981 ] ; 5051 ] ;
4982 - rhspin:tableHeaders ("""Barometric 5052 + rhspin:tableHeaders ("""Minimum
5053 +Temperature"""^^xsd:string """Maximum
5054 +Temperature"""^^xsd:string """Barometric
4983 Pressure"""^^xsd:string """Wind Chill 5055 Pressure"""^^xsd:string """Wind Chill
4984 Factor"""^^xsd:string "Cloud Ceiling"^^xsd:string "Cloud Description"^^xsd:string "Visibility"^^xsd:string """Beaufort 5056 Factor"""^^xsd:string "Cloud Ceiling"^^xsd:string "Cloud Description"^^xsd:string "Visibility"^^xsd:string """Beaufort
4985 Wind Scale"""^^xsd:string "Wind Speed"^^xsd:string "Azimuth Wind"^^xsd:string """Precipitation 5057 Wind Scale"""^^xsd:string "Wind Speed"^^xsd:string "Azimuth Wind"^^xsd:string """Precipitation
......