Merge remote-tracking branch 'origin/dev' into feature-1859-update-ac…

…tion-versions

.github/pull_request_template.md

@@ -21,7 +21,7 @@ Closes #
 ### PR-Assignee
 - [ ] 🐙 Follow the [Pull Request Workflow](https://github.com/OpenEnergyPlatform/ontology/wiki/Pull-request-workflow)
 - [ ] 📝 Update the [CHANGELOG.md](https://github.com/OpenEnergyPlatform/ontology/blob/dev/CHANGELOG.md)
-- [ ] 📙 Add #'s to `term tracker item`
+- [ ] 📙 Add #'s to `term tracker annotation`
 
 ### Reviewer
 - [ ] 🐙 Follow the [Reviewer Guide](https://github.com/OpenEnergyPlatform/ontology/wiki/Pull-request-workflow#reviewer-guide-check-changes-introduced-by-a-pull-request)

.github/workflows/IssueProject.yml

@@ -1,20 +1,24 @@
 name: Add new GitHub issues and pull requests to the "Issues" project
-on: [issues, pull_request]
+on:
+  issues:
+    types:
+      - opened
+  pull_request:
+    types:
+      - opened
 jobs:
   github-actions-automate-projects:
     runs-on: ubuntu-latest
     steps:
     - name: add-new-issues-to-repository-based-project-column
-      uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-      if: github.event_name == 'issues' && github.event.action == 'opened'
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_PROJECT_URL: https://github.com/orgs/OpenEnergyPlatform/projects/45
-        GITHUB_PROJECT_COLUMN_NAME: To do
+      uses: actions/[email protected]
+      with:
+        project-url: https://github.com/orgs/OpenEnergyPlatform/projects/45
+        github-token: ${{ secrets.OEO_WORKFLOWS }}
+      if: github.event_name == 'issues'
     - name: add-new-prs-to-repository-based-project-column
-      uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-      if: github.event_name == 'pull_request' && github.event.action == 'opened'
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_PROJECT_URL: https://github.com/orgs/OpenEnergyPlatform/projects/45
-        GITHUB_PROJECT_COLUMN_NAME: Review in progress
+      uses: actions/[email protected]
+      with:
+        project-url: https://github.com/orgs/OpenEnergyPlatform/projects/45
+        github-token: ${{ secrets.OEO_WORKFLOWS }}
+      if: github.event_name == 'pull_request'

.github/workflows/automated-testing.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.7.17'
           architecture: x64
       - uses: actions/setup-java@v4
         with:
@@ -101,4 +101,4 @@ jobs:
           filename: open_energy_ontology__${{ env.BRANCH }}.json
           label: CQ Coverage
           message: ${{ env.COVERAGE }}
-          color: green
+          color: green

CHANGELOG.md

@@ -22,6 +22,8 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - product (#1912)
 - term tracker annotation (#1913)
 - licence provider, licensee, has licence provider, permits (#1925)
+- has aggregation type, has time stamp alignment (#1944)
+- study descriptor (#1950)
 
 ### Changed
 - gams -> General Algebraic Modeling System (#1889)
@@ -34,6 +36,9 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - is traded at, trades (#1912)
 - replace term tracker item with term tracker annotation (#1922, #1923)
 - replace has bearer with characteristic of (#1928)
+- energy amount value / energy value (#1941)
+- rework contributing and readme file (#1937, #1946)
+- time stamp (#1944)
 
 ### Obsoletion
 - economic value, has economic value, economic value (#1931)

README.md

@@ -48,13 +48,28 @@ We recommend to use the software [Protégé](https://protege.stanford.edu/) to o
 
 ## Collaboration
 This is an interdisciplinary open source project, help is always welcome. <br>
-Everyone is invited to develop this repository with good intentions.
+Everyone with good intentions is invited to develop this repository.
 
-The development of the ontology happens mainly on [GitHub](https://github.com/OpenEnergyPlatform/ontology) and is supplemented by regular (online) developer meetings to review the progress and discuss more complicated topics. 
-
-If you're new to GitHub or ontologies check out our ["How to participate"](https://github.com/OpenEnergyPlatform/ontology/wiki/Welcome!-How-to-participate) article for some first advice and helpful links.
+The development of the ontology happens mainly on [GitHub](https://github.com/OpenEnergyPlatform/ontology) and is supplemented by regular (online) [developer meetings](https://github.com/OpenEnergyPlatform/ontology/wiki/oeo-dev-meeting-plan) to review the progress and discuss more complicated topics. <br>
+If you would like to participate in meetings you can become a team member. Use the [OEP contact form](https://openenergyplatform.org/contact/) and [add yourself as a contributor](https://github.com/OpenEnergyPlatform/ontology/wiki/Add-yourself-as-a-contributor) after approval.
+<br><br>
+If you're new to GitHub or ontologies check out our ["How to participate"](https://github.com/OpenEnergyPlatform/ontology/wiki/Welcome!-How-to-participate) article for some first advice and helpful links. You may also use the [Open Engery Academy course](https://openenergyplatform.github.io/academy/courses/05_ontology/#how-to-become-an-oeo-developer) to get used to the necessary tools and background information.
+<br>
 The workflow is described in the [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/ontology/blob/dev/CONTRIBUTING.md) file. Please check it out before you start working on this project. Points that are not clear in the file can be discussed in a [GitHub Issue](https://github.com/OpenEnergyPlatform/ontology/issues/new/choose).
 Please read the [GitHub Wiki](https://github.com/OpenEnergyPlatform/ontology/wiki) for more information about the ontology, its standards, its best practice principles and the BFO classification.
+<br><br>
+Wiki articles that you would be most helpflul to a beginner are:
+- [How to Participate](https://github.com/OpenEnergyPlatform/ontology/wiki/Welcome!-How-to-participate)
+- [Best Practice Principles](https://github.com/OpenEnergyPlatform/ontology/wiki/Best-Practice-Principles) including subsections
+- [BFO Upper Ontology](https://github.com/OpenEnergyPlatform/ontology/wiki/BFO-Upper-Ontology-Classes) including subsections
+- [Explaination on Mass Nouns](https://github.com/OpenEnergyPlatform/ontology/wiki/Explanation-on-mass-nouns)
+- [Handeling Ambiguous Terms](https://github.com/OpenEnergyPlatform/ontology/wiki/Handling-ambiguous-terms)
+- [Use Protégé to Change the Ontology](https://github.com/OpenEnergyPlatform/ontology/wiki/How-to-use-prot%C3%A9g%C3%A9-to-change-the-ontology)
+- [Term Tracker Annotation](https://github.com/OpenEnergyPlatform/ontology/wiki/Term-Tracker-Annotation)
+<br>
+
+... as well as the [CONTRIBUTING.md](https://github.com/OpenEnergyPlatform/ontology/blob/dev/CONTRIBUTING.md)
+
 
 ## Teams
 Experts in ontology engineering, economy and energy-system modelling work together collaboratively.<br>

src/ontology/edits/catalog-v001.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-model.omn" uri="oeo-model.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical.omn" uri="oeo-physical.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-sector.omn" uri="oeo-sector.omn"/>
@@ -9,7 +10,7 @@
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="../imports/ro-extracted.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-extracted.owl" uri="../imports/uo-extracted.owl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
-        <uri id="Automatically generated entry, Timestamp=1726817551697" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
-        <uri id="Automatically generated entry, Timestamp=1726817551697" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1728550706758" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1728550706758" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
     </group>
 </catalog>

src/ontology/edits/oeo-model.omn

@@ -89,7 +89,7 @@ ObjectProperty: <http://purl.obolibrary.org/obo/BFO_0000051>
 
 ObjectProperty: <http://purl.obolibrary.org/obo/IAO_0000136>
 
-
+    
 ObjectProperty: <http://purl.obolibrary.org/obo/RO_0000052>
 
 
@@ -526,6 +526,26 @@ ObjectProperty: OEO_00140164
         OEO_00000274
 
 
+ObjectProperty: OEO_00390023
+
+    Annotations: 
+        OEO_00020426 "Added
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1901
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1944",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation between a data item or data set and an aggregation type that indicates the method of data aggregation applied to the data set.",
+        rdfs:label "has aggregation type"@en
+
+
+ObjectProperty: OEO_00390024
+
+    Annotations: 
+        OEO_00020426 "Added
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1901
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1944",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A relation between a time stamp or time series and a time stamp alignment that indicates the position of the time stamps that refer to the time step(s).",
+        rdfs:label "has time stamp alignment"@en
+
+
 ObjectProperty: owl:topObjectProperty
 
 
@@ -3142,8 +3162,12 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
 
 reclassify as data descriptor
 issue: https://github.com/OpenEnergyPlatform/ontology/issues/1536
-pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1853",
-        <http://purl.obolibrary.org/obo/IAO_0000115> "A time stamp is a data descriptor that is used to describe a zero-dimensional temporal region, or a data item that is related to a zero-dimensional temporal region, e.g. a time stamped measurement datum.",
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1853
+
+update definition
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1901
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1944",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A time stamp is a data descriptor that is used to describe either a temporal region or a data item that is related to a temporal region, e.g. a time stamped measurement datum. If the time stamp refers to a time step/one-dimensional temporal region, the indication of a time stamp alignment is required",
         <http://purl.obolibrary.org/obo/IAO_0000118> "Zeitstempel"@de,
         rdfs:label "time stamp"@en
 
@@ -3656,6 +3680,19 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1791",
         OEO_00360020
 
 
+Class: OEO_00390064
+
+    Annotations: 
+        OEO_00020426 "add:
+issue: https://github.com/OpenEnergyPlatform/ontology/issues/1943
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1950",
+        <http://purl.obolibrary.org/obo/IAO_0000115> "A study descriptor is a data descriptor that allows the annotation of study information within a scenario bundle by means of keywords from ontological terminology.",
+        rdfs:label "study descriptor"@en
+
+    SubClassOf: 
+        OEO_00000119
+
+
 Individual: OEO_00000049
 
     Annotations: