Merge branch 'dev' into feature-1700-iao-update

OpenEnergyPlatform · Nov 29, 2023 · d193519 · d193519
2 parents 1c3314d + 734bb21
commit d193519
Show file tree

Hide file tree

Showing 5 changed files with 269 additions and 29 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,16 +4,15 @@ Describe the findings of the discussion in the issue or meeting.
 
 ## Type of change (CHANGELOG.md)
 
-### Added
+### Add
 - Added a new class [#](https://github.com/OpenEnergyPlatform/ontology/issues/)
 
-### Updated
+### Update
 - Updated a definition [#](https://github.com/OpenEnergyPlatform/ontology/issues/)
 
-### Removed
+### Remove
 - Removed a broken link [#](https://github.com/OpenEnergyPlatform/ontology/issues/)
 
-
 ## Workflow checklist
 
 ### Automation

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,16 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 ### Added
 - resilience, power system resilience, power system (#1744)
 - import from IAO: time stamped measurement datum, action specification, data format specification, objective specification, study design, software application, software library, software method, software module, software script, document part, journal article, version number, cartesian spatial coordinate datum, one dimensional cartesian spatial coordinate datum, two dimensional cartesian spatial coordinate datum, three dimensional cartesian spatial coordinate datum, has time stamp (#1754)
+- service product role, service product (#1748)
+- region of relevance, study subregion role, study region role, interacting region role, considered region role (#1749)
+- fuel blending quota, fuel quota blending value (#1763)
 
 ### Changed
+- subregion, study region, study subregion, interacting region, considered region (#1749)
 - model factsheet (#1751)
+- is connected to, has sink, has source (#1762)
+- carbon capture and storage technology (#1768)
+- temperature, pressure (#1767)
 
 ### Removed
 

diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn
@@ -1803,30 +1803,42 @@ Class: OEO_00020032
         <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
 The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
 In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
-The union of the study region and the interacting/ external region ist the considered region.",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A study region is a spatial region that is under investigation and consists entirely of one or more subregions.",
+The union of the study region and the interacting/ external region ist the considered region."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A study region is a region of relevance that has the study region role and consists entirely of one or more subregions."@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/475
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585
 
 rework module structure 
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+relocated, made equivalent
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
         rdfs:label "study region"@en
 
+    EquivalentTo: 
+        OEO_00360020
+         and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00360021)
+
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000006>
+        OEO_00360020
 
 
 Class: OEO_00020033
 
     Annotations: 
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A subregion is a spatial region that is a part of spatial region.",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A subregion is a region of relevance that is in every respect a component of a region of relevance, but never encompasses the entire extent of a region of relevance."@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/475
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585
+
+changed definition, relocated 
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
         rdfs:label "subregion"@en
 
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000006>
+        OEO_00360020
 
 
 Class: OEO_00020034
@@ -1835,12 +1847,20 @@ Class: OEO_00020034
         <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
 The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
 In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
-The union of the study region and the interacting/ external region ist the considered region.",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A study subregion is a subregion of a study region.",
+The union of the study region and the interacting/ external region ist the considered region."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A study subregion is a subregion that has the study subregion role."@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/475
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585
+
+relocated, made equivalent
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
         rdfs:label "study subregion"@en
 
+    EquivalentTo: 
+        OEO_00020033
+         and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00360024)
+
     SubClassOf: 
         OEO_00020033
 
@@ -1851,18 +1871,26 @@ Class: OEO_00020035
         <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
 The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
 In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
-The union of the study region and the interacting/ external region ist the considered region.",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A considered region is a spatial region that is used in an analysis.",
+The union of the study region and the interacting/ external region ist the considered region."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A considered region is a region of relevance that has the considered region role."@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/475
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585
 
 rework module structure 
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
+
+relocated, made equivalent
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
         rdfs:label "considered region"@en
 
+    EquivalentTo: 
+        OEO_00360020
+         and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00360022)
+
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000006>
+        OEO_00360020
 
 
 Class: OEO_00020036
@@ -1871,15 +1899,23 @@ Class: OEO_00020036
         <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
 The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
 In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
-The union of the study region and the interacting/ external region ist the considered region.",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "An interacting region is a spatial region that interacts with a study region. It is part of a considered region, but not a study region.",
+The union of the study region and the interacting/ external region ist the considered region."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An interacting region is a region of relevance that has the interacting region role."@en,
         <http://purl.obolibrary.org/obo/IAO_0000118> "external region",
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/475
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/585
+
+relocated, made equivalent
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
         rdfs:label "interacting region"@en
 
+    EquivalentTo: 
+        OEO_00360020
+         and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00360023)
+
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000006>
+        OEO_00360020
 
 
 Class: OEO_00020072
@@ -2337,7 +2373,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
         rdfs:label "reference role"@en
 
     SubClassOf: 
-        <http://purl.obolibrary.org/obo/BFO_0000023>
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some OEO_00360020
 
 
 Class: OEO_00020314
@@ -3013,6 +3050,82 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1711",
         OEO_00010252
 
 
+Class: OEO_00360020
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A region of relevance is a spatial region that is used in a study or analysis."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
+        rdfs:label "region of relevance"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000006>
+
+
+Class: OEO_00360021
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
+The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
+In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
+The union of the study region and the interacting/ external region ist the considered region."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A study region role is a role of a region of relevance that is under investigation and consists entirely of one or more subregions."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
+        rdfs:label "study region role"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some OEO_00360020
+
+
+Class: OEO_00360022
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
+The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
+In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
+The union of the study region and the interacting/ external region ist the considered region."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A considered region role is the role of a region of relevance that is used in an analysis."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
+        rdfs:label "considered region role"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some OEO_00360020
+
+
+Class: OEO_00360023
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000112> "In a study, the spatial focus of the investigation lies on one European country, e.g. Germany. This is the study region.
+The study region is not modelled as a whole, but several subregions are modelled, e.g. German Federal States. These are study subregions.
+In the study, a spatial region outside the study region plays a role. E.g. for modelling the electricity transfer between Germany and its neighbouring countries. In this example, the neighbouring countries represent the interacting / external region.
+The union of the study region and the interacting/ external region ist the considered region."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000115> "An interacting region role is a role of a region of relevance that interacts with a region of relevance that has the study region role. It is part of a region of relevance that has the considered region role, but not a study region role."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
+        rdfs:label "interacting region role"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some OEO_00360020
+
+
+Class: OEO_00360024
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A study subregion role is a study region role that refers to a subregion."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1745
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1749",
+        rdfs:label "study subregion role"@en
+
+    SubClassOf: 
+        OEO_00360021,
+        OEO_00010121 some OEO_00020033
+
+
 Individual: OEO_00000049
 
     Annotations: