Merge branch 'dev' into feature-1815-relations-for-composed-units

OpenEnergyPlatform · Feb 29, 2024 · ba2a581 · ba2a581
2 parents 9276812 + ade3626
commit ba2a581
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - economic instrument, voluntary agreement, voluntary agreement instrument, regulatory instrument, information instrument, education instrument (#1786)
 - priority region role, priority region, conditionally reserved region role, conditionally reserved region, suitable region role, suitable region, priority region with effect of suitable region, spatial planning policy (#1791)
 - missing value reason, notation key (#1795)
+- non-energy use technology (#1803)
+- BSI-KritisV sector division, BSI-KritisV energy sector, BSI-KritisV transport sector, critical infrastructure role, critical infrastructure (#1809)
 - has unit numerator, has unit denominator and subproperties (#1816)
 
 ### Changed
@@ -19,6 +21,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - region of relevance (#1791)
 - MMR sector division, EU emission sector division (#1797)
 - German energy balance sector division (#1798)
+- non-energy use (#1803)
 - API -> application programming interface; GUI -> graphical user interface (#1810)
 - forecasting model calculation (#1799)
 

diff --git a/src/ontology/edits/oeo-physical.omn b/src/ontology/edits/oeo-physical.omn
@@ -6106,6 +6106,7 @@ Class: OEO_00010211
 
     Annotations: 
         <http://purl.obolibrary.org/obo/IAO_0000115> "Non-energy use is the consumption of an energy carrier without making use the energy it carries.",
+        <http://purl.obolibrary.org/obo/IAO_0000118> "non-energy consumption"@en,
         <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/718
 pull request: https://github.com/OpenEnergyPlatform/ontology/pull/950
 
@@ -6118,7 +6119,11 @@ https://github.com/OpenEnergyPlatform/ontology/pull/1463
 
 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
+
+Add alternative label:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1773
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1803",
         rdfs:label "non-energy use"@en
 
     SubClassOf: 
@@ -8577,6 +8582,23 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1768",
              and (<http://purl.obolibrary.org/obo/RO_0000056> some OEO_00010141))
 
 
+Class: OEO_00010471
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A non-energy use technology is a technology that describes among other things how to combine the consumption of energy carriers for non-energy use with other processes and artificial objects or other material entities in a specific way."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000118> "non-energy consumption technology"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1773
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1803",
+        rdfs:label "non-energy use technology"@en
+
+    EquivalentTo: 
+        OEO_00000407
+         and (<http://purl.obolibrary.org/obo/IAO_0000136> some (<http://purl.obolibrary.org/obo/RO_0000056> some OEO_00010211))
+
+    SubClassOf: 
+        OEO_00000407
+
+
 Class: OEO_00020001
 
     Annotations: 
@@ -14502,6 +14524,42 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1744",
         OEO_00030024
 
 
+Class: OEO_00360040
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A critical infrastructure role is a role of artificial objects, such as plants and systems, that are assessed to be crucial for the preservation of societal functions, health, safety and economical or social welfare."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000119> "The definition is based on information obtained from https://eur-lex.europa.eu/legal-content/DE/TXT/?uri=CELEX:32008L0114 and https://de.wikipedia.org/w/index.php?title=Kritische_Infrastrukturen&oldid=240000353 in January 2024."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1792
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1809",
+        rdfs:label "critical infrastructure role"@en
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000023>,
+        OEO_00010121 some OEO_00000061
+
+
+Class: OEO_00360041
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A critical infrastructure is an object aggregate of artificial objects and systems which have the critical infrastructure role."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000119> "The definition is based on information obtained from https://eur-lex.europa.eu/legal-content/DE/TXT/?uri=CELEX:32008L0114 and https://de.wikipedia.org/w/index.php?title=Kritische_Infrastrukturen&oldid=240000353 in January 2024."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1792
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1809",
+        rdfs:label "critical infrastructure"@en
+
+    EquivalentTo: 
+        <http://purl.obolibrary.org/obo/BFO_0000027>
+         and (<http://purl.obolibrary.org/obo/BFO_0000051> some 
+            (OEO_00000061
+             and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00360040)))
+         and (<http://purl.obolibrary.org/obo/BFO_0000051> some 
+            (<http://purl.obolibrary.org/obo/RO_0002577>
+             and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00360040)))
+
+    SubClassOf: 
+        <http://purl.obolibrary.org/obo/BFO_0000027>
+
+
 Individual: OEO_00000182
 
     Annotations: 

diff --git a/src/ontology/edits/oeo-sector.omn b/src/ontology/edits/oeo-sector.omn
@@ -4246,6 +4246,51 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724",
      OEO_00000504  OEO_00000355
 
 
+Individual: OEO_00360042
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "The BSI-KritisV energy sector is an energy transformation sector defined by the BSI-KritisV sector division (§ 2 BSI-KritisV)."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000119> "This class is defined by the German BSI-Kritisverordnung § 2, for reference see for example: https://www.gesetze-im-internet.de/bsi-kritisv/BJNR095800016.html"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1792
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/180",
+        rdfs:label "BSI-KritisV energy sector"@en
+
+    Types: 
+        OEO_00000158
+
+    Facts:  
+     OEO_00000504  OEO_00360044
+
+
+Individual: OEO_00360043
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "The BSI-KritisV transport sector is a transport sector defined by the BSI-KritisV sector division (§ 8 BSI-KritisV)."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000119> "This class is defined by the German BSI-Kritisverordnung § 8, for reference see for example: https://www.gesetze-im-internet.de/bsi-kritisv/BJNR095800016.html"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1792
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1809",
+        rdfs:label "BSI-KritisV transport sector"@en
+
+    Types: 
+        OEO_00000422
+
+    Facts:  
+     OEO_00000504  OEO_00360044
+
+
+Individual: OEO_00360044
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "The BSI-KritisV sector division is a sector division by the German regulation BSI-Kritisverordnung (BSI-KritisV) defining eight sectors that contain critical infrastructures."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000119> "This class is defined by the German BSI-Kritisverordnung, for reference see for example: https://www.gesetze-im-internet.de/bsi-kritisv/BJNR095800016.html"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1792
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1809",
+        rdfs:label "BSI-KritisV sector division"@en
+
+    Types: 
+        OEO_00000368
+
+
 DisjointClasses: 
     OEO_00000145,OEO_00000213,OEO_00000422