Merge remote-tracking branch 'origin/dev' into feature-1962-landscape…

…-classifications
OpenEnergyPlatform · Mar 2, 2025 · 26dc6c9 · 26dc6c9
2 parents 903993c + e06e765
commit 26dc6c9
Show file tree

Hide file tree

Showing 19 changed files with 4,410 additions and 94 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: Open Energy Ontology (OEO) <https://github.com/OpenEnergyPlatform/ontology/>
+# SPDX-License-Identifier: CC0-1.0 OR MIT
+
 build/
 */__pycache__/*
 *.properties
+.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
+<!--
+SPDX-FileCopyrightText: Open Energy Ontology (OEO) <https://github.com/OpenEnergyPlatform/ontology/>
+SPDX-License-Identifier: CC0-1.0 OR MIT
+-->
+
 # Changelog
-All notable changes to this project will be documented in this file.
+All notable changes to this project will be documented in this file. <br>
+For each version, important additions, changes and removals are listed here.
 
-The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/),
+and the versioning adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [2.X.X] - 20XX-XX-XX
 
@@ -13,6 +19,9 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - conceptual model (#1976)
 - imports from stato: cutoff, lower confdence limit, upper confdence limit, statistic, measure of dispersion, confidence interval (#2002)
 - model uncertainty location (#1990)
+- add dual licensing CC0-1.0 OR MIT (#2021)
+- add REUSE license check and copyright info (#2021)
+- import from CCO event ontology: Change, Effect, Stasis and subclasses, has occurent part, occurrent part of and subproperties (#2016)
 
 ### Changed
 - technical model implementation, conceptual model, model system boundary, input data/exogenous data, output data (#1990)
@@ -22,6 +31,9 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - has model(#2001)
 - model (#2007)
 - models (#2007)
+- cost, delivery cost, fixed cost, investment cost, levelised cost of electricity, social cost of emission, system cost, variable cost  (#1999)
+- uncertainty of a model, model, model system boundary (#2012)
+- solid (#2019)
 - cost, delivery cost, fixed cost, investment cost, levelised cost of electricity, social cost of emission, system cost, variable cost (#1999)
 - protected area (#1991)
 - conditionally reserved region, priority region, priority region with effect of suitable region, suitable region (#1991)
@@ -30,6 +42,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 ### Removed
 
 ## [2.6.0] - 2024-12-06
+
 ### Added
 - has aggregation type, has time stamp alignment (#1944)
 - study descriptor (#1950)
@@ -55,8 +68,8 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - areal solar energy density (#1983)
 
 
-
 ## [2.5.0] - 2024-09-24
+
 ### Added
 - German alternative labels (#1883, #1895)
 - English language tags to existing alternative labels (#1883, #1895)
@@ -83,13 +96,13 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - replace term tracker item with term tracker annotation (#1922, #1923)
 - replace has bearer with characteristic of (#1928)
 
-### Obsoletion
+### Removed
 - economic value, has economic value, economic value (#1931)
 - has bearer (#1928)
 
-### Removed
 
 ## [2.4.0] - 2024-07-01
+
 ### Added
 - subsector, has subsector, subsector of (#1788)
 - manufacturing technology, manufacturing plant, manufactured commodity (#1840)
@@ -108,6 +121,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 ### Removed
 - emission value (#1880)
 
+
 ## [2.3.0] - 2024-05-21
 
 ### Added
@@ -131,7 +145,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - has bearer, has characteristic, characteristic of, role of, model role (#1852)
 - time stamp (#1853)
 
-### Removed
 
 ## [2.2.0] - 2024-03-04
 
@@ -157,7 +170,6 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - forecasting model calculation (#1799)
 - uo-extracted.owl (#1820)
 
-### Removed
 
 ## [2.1.0] - 2023-12-05
 
@@ -182,11 +194,13 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - data descriptor (#1775)
 - target description, policy instrument, policy (#1778)
 
+
 ## [2.0.1] - 2023-10-26
 
 ### Changed
 - unit, prefix, generically dependent continuant (#1741/#1742)
 
+
 ## [2.0.0] - 2023-10-25
 
 ### Major stuctural changes
@@ -222,7 +236,6 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - mobility technology, electric mobility technology (#1727)
 - energy storage object hierarchy, energy storage technology hierarchy (#1728)
 
-
 ### Changed
 - energy transformation (#1625)
 - waste role (#1638)
@@ -242,13 +255,13 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 ### Deprecated
 - belongs to module (#1732)
 
-## [1.16.1] - 2023-08-01
 
-### Added
+## [1.16.1] - 2023-08-01
 
 ### Changed
 - Update module files after saving with Protégé 5.6.1(#1628)
 
+
 ## [1.16.0] - 2023-08-01
 
 ### Added
@@ -278,6 +291,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 ### Removed
 - old competency question bash script (#1420)
 
+
 ## [1.15.0] - 2023-05-31
 
 ### Added
@@ -307,6 +321,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 ### Removed
 -  files and scripts from outdated import process: extract-iao-module.bat, imports/iao-module.owl, ro-module.owl (#1555)
 
+
 ## [1.14.0] - 2023-03-30
 
 ### Added
@@ -330,6 +345,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - uses, is used by (#1508)
 - update oeo.omn description (#1509)
 
+
 ## [1.13.0] - 2023-02-01
 
 ### Added
@@ -458,6 +474,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - battery storage (#1348)
 - csv and txt (#1371)
 
+
 ## [1.11.0] - 2022-07-04
 
 ### Added
@@ -485,7 +502,6 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - charcoal, synthetic fuel, gas diesel oil, manufactured coal based gas, syngas, gasoline, kerosene, steam, compressed air, pumped water (#1243)
 
 
-
 ## [1.10.1] - 2022-06-14
 
 ### Added
@@ -516,7 +532,6 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - has institution (#1200)
 - waste fuel, liquid biofuel, solid biofuel, fossil combustion fuel, renewable fuel, synthetic fuel, volatile organic compound (#1201)
 
-### Removed
 
 ## [1.10.0] - 2022-05-09
 
@@ -556,7 +571,6 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - trades / is traded at, good, good role (#1127)
 - traction motor -> electric traction motor (#1135)
 
-### Removed
 
 ## [1.9.0] - 2022-03-01
 
@@ -608,6 +622,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - organisation in oeo-social (#992)
 - oil and petroleum products (#1024)
 
+
 ## [1.8.0] - 2021-12-01
 
 ### Added
@@ -660,7 +675,6 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - ammonia (#959)
 - industrial waste fuel, municipal waste fuel, renewable municipal waste fuel, fossil municipal waste fuel (previously: non renewable municipal waste fuel) (#961)
 
-### Removed
 
 ## [1.7.0] - 2021-10-04
 
@@ -721,11 +735,13 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - molten state battery (#801)
 - duplicate model factsheet OEO:00020031 (#854)
 
+
 ## [1.6.1] - 2021-07-07
 
 ### Changed
 - commodity (#789)
 
+
 ## [1.6.0] - 2021-07-01
 
 ### Added
@@ -759,6 +775,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 ### Removed
 - hydroelectric dam energy transformation and run-off-river energy transformation (#758)
 
+
 ## [1.5.0] - 2021-05-03
 
 ### Added
@@ -775,7 +792,6 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - energy market exchange (#748)
 - public and private funders (#246)
 
-
 ### Changed
 - has physical output, has constraint (#716)
 - gross inland energy consumption, primary energy consumption (#719)
@@ -790,6 +806,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - has numerical input / output (#716)
 - computation time (#723)
 
+
 ## [1.4.0] - 2021-03-02
 
 ### Added
@@ -832,6 +849,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 ### Removed
 - delete hydroelectricity class (#682)
 
+
 ## [1.3.0] - 2020-12-18
 
 ### Added
@@ -859,6 +877,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - comment on waste fuel (#631)
 - energy transformation has input/output energy (#690)
 
+
 ## [1.2.0] - 2020-10-30
 
 ### Added
@@ -888,6 +907,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 ### Removed
 - software maintenance (#566)
 
+
 ## [1.1.0] - 2020-09-01
 
 ### Added
@@ -922,6 +942,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 ### Removed
 - unused object properties (#452)
 
+
 ## [1.0.0] - 2020-06-11
 
 ### Added

diff --git a/CITATION.cff b/CITATION.cff
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Open Energy Ontology (OEO) <https://github.com/OpenEnergyPlatform/ontology/>
+# SPDX-License-Identifier: CC0-1.0 OR MIT
+
 cff-version: 1.2.0
 message: "If you use this software, please cite it using these metadata."
 authors:
@@ -165,7 +168,7 @@ authors:
     affiliation: "Otto-von-Guericke-Universität Magdeburg"
 title: "Open Energy Ontology (OEO)"
 type: software
-license: CC0-1.0
+license: CC0-1.0 OR MIT
 version: 2.6.0
 date-released: 2024-12-06
 url: "https://github.com/OpenEnergyPlatform/ontology"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,3 +1,7 @@
+<!--
+SPDX-FileCopyrightText: © 2014 Coraline Ada Ehmke <https://where.coraline.codes/>
+SPDX-License-Identifier: CC-BY-4.0
+-->
 
 # Contributor Covenant Code of Conduct
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,3 +1,8 @@
+<!--
+SPDX-FileCopyrightText: Open Energy Ontology (OEO) <https://github.com/OpenEnergyPlatform/ontology/>
+SPDX-License-Identifier: CC0-1.0 OR MIT
+-->
+
 ## Table of Contents
 
 - [Welcome](#Welcome)<br>

diff --git a/LICENSE → LICENSE-CC0.txt b/LICENSE → LICENSE-CC0.txt
diff --git a/LICENSE-MIT.txt b/LICENSE-MIT.txt
@@ -0,0 +1,20 @@
+MIT License
+
+Copyright 2018 Open Energy Ontology (OEO)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.