Merge pull request #1724 from OpenEnergyPlatform/feature-1399-introdu…

…ce-sector-module Introduce sector module
OpenEnergyPlatform · Oct 23, 2023 · 855b979 · 855b979
2 parents 2390b46 + 14dd64a
commit 855b979
Show file tree

Hide file tree

Showing 9 changed files with 4,485 additions and 3,472 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - energy balance -> energy balance data set (#1717) 
 - person, organisational role, organisation (#1716)
 - state of matter (#1720)
+- new module oeo-sectors (#1649)
 - potential energy stroage function (#1728)
 
 ### Changed

diff --git a/Makefile b/Makefile
@@ -37,13 +37,13 @@ define replace_owls
 endef
 
 define translate_to_owl
-	$(ROBOT) convert --input $2 --output $1 --format owl
+	$(ROBOT) convert --catalog $(VERSIONDIR)/catalog-v001.xml --input $2 --output $1 --format owl
 	$(call replace_omns,$1)
 	$(call replace_devs,$1)
 endef
 
 define translate_to_omn
-	$(ROBOT) convert --input $2 --output $1 --format omn
+	$(ROBOT) convert --catalog $(VERSIONDIR)/catalog-v001.xml --input $2 --output $1 --format omn
 	$(call replace_owls,$1)
 	$(call replace_devs,$1)
 endef
@@ -52,7 +52,7 @@ endef
 
 all: base merge
 
-base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OMN_TRANSLATE) $(OWL_COPY) $(OMN_COPY)
+base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OWL_COPY) $(OMN_COPY) $(OMN_TRANSLATE)
 
 merge: | $(VERSIONDIR)/oeo-full.omn
 
@@ -76,10 +76,10 @@ build/robot.jar: | build
 	curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.4.1/robot.jar
 
 
-$(VERSIONDIR)/%.owl: $(ONTOLOGY_SOURCE)/%.omn
+$(VERSIONDIR)/%.owl: $(VERSIONDIR)/%.omn
 	$(call translate_to_owl,$@,$<)
 
-$(VERSIONDIR)/modules/%.owl: $(ONTOLOGY_SOURCE)/edits/%.omn
+$(VERSIONDIR)/modules/%.owl: $(VERSIONDIR)/edits/%.omn
 	$(call translate_to_owl,$@,$<)
 
 $(VERSIONDIR)/%.owl: $(ONTOLOGY_SOURCE)/%.owl

diff --git a/src/ontology/catalog-v001.xml b/src/ontology/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-sector.omn" uri="edits/oeo-sector.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-shared-axioms.omn" uri="edits/oeo-shared-axioms.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-import-edits.owl" uri="edits/oeo-import-edits.owl"/>
     <uri id="User Entered Import Resolution" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-physical-axioms.omn" uri="edits/oeo-physical-axioms.owl"/>

diff --git a/src/ontology/edits/catalog-v001.xml b/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-sector.omn" uri="oeo-sector.omn"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/oeo-social.omn" uri="oeo-social.omn"/>
     <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"/>

diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn
@@ -1217,9 +1217,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/584",
         <http://purl.obolibrary.org/obo/IAO_0000136> some OEO_00000364
 
 
-Class: OEO_00000367
-
-
 Class: OEO_00000370
 
     Annotations: