diff --git a/.gitignore b/.gitignore
index efc03a320..db595a3c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
build/
*/__pycache__/*
*.properties
+tmp
.idea
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..6dfed5c72
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "oeo-tools"]
+ path = oeo-tools
+ url = git@github.com:OpenEnergyPlatform/oeo-tools.git
diff --git a/Makefile b/Makefile
index 29d449891..e9729c982 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ MKDIR_P = mkdir -p
VERSION:= $(shell cat VERSION)
VERSIONDIR := build/oeo/$(VERSION)
ONTOLOGY_SOURCE := src/ontology
-
+IMPORTS := $(ONTOLOGY_SOURCE)/imports
subst_paths = ${subst $(ONTOLOGY_SOURCE),$(VERSIONDIR),${patsubst $(ONTOLOGY_SOURCE)/edits/%,$(ONTOLOGY_SOURCE)/modules/%,$(1)}}
OWL_FILES := $(call subst_paths,$(shell find $(ONTOLOGY_SOURCE)/* -type f -name "*.owl"))
@@ -52,6 +52,8 @@ endef
all: base merge closure
+imports: directories $(IMPORTS)/ro-extracted.owl $(IMPORTS)/iao-extracted.owl $(IMPORTS)/uo-extracted.owl
+
base: | directories $(VERSIONDIR)/catalog-v001.xml build/robot.jar $(OWL_COPY) $(OMN_COPY) $(OMN_TRANSLATE)
merge: | $(VERSIONDIR)/oeo-full.omn
@@ -61,8 +63,20 @@ closure: | $(VERSIONDIR)/oeo-closure.owl
clean:
- $(RM) -r $(VERSIONDIR) $(ROBOT_PATH)
+clean-imports:
+ - $(RM) -r $(IMPORTS)/*.owl
+
directories: ${VERSIONDIR}/imports ${VERSIONDIR}/modules
+$(IMPORTS)/iao-extracted.owl: $(ROBOT_PATH)
+ bash oeo-tools/oeo-imports/iao/extract-iao-module.sh
+
+$(IMPORTS)/ro-extracted.owl: $(ROBOT_PATH)
+ bash oeo-tools/oeo-imports/ro/extract-from-relations-ontology.sh
+
+$(IMPORTS)/uo-extracted.owl: $(ROBOT_PATH)
+ bash oeo-tools/oeo-imports/uo/extract-uo-module.sh
+
${VERSIONDIR}/imports:
${MKDIR_P} ${VERSIONDIR}/imports
@@ -75,7 +89,7 @@ $(VERSIONDIR)/catalog-v001.xml: src/ontology/catalog-v001.xml
sed -i -E "s/edits\//modules\//m" $@
build/robot.jar: | build
- curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.9.2/robot.jar
+ curl -L -o $@ https://github.com/ontodev/robot/releases/download/v1.9.6/robot.jar
$(VERSIONDIR)/%.owl: $(VERSIONDIR)/%.omn
diff --git a/oeo-tools b/oeo-tools
new file mode 160000
index 000000000..6fe8575b3
--- /dev/null
+++ b/oeo-tools
@@ -0,0 +1 @@
+Subproject commit 6fe8575b3cfec4ba927519a05d36db4ceec3263e
diff --git a/src/ontology/imports/iao-extracted.owl b/src/ontology/imports/iao-extracted.owl
index 3cc830af2..ea3e129d7 100644
--- a/src/ontology/imports/iao-extracted.owl
+++ b/src/ontology/imports/iao-extracted.owl
@@ -3727,5 +3727,5 @@ Request that IAO either clarify these or change definitions not to use them
+
diff --git a/src/ontology/imports/uo-extracted.owl b/src/ontology/imports/uo-extracted.owl
index 6f06b772a..d37f22737 100644
--- a/src/ontology/imports/uo-extracted.owl
+++ b/src/ontology/imports/uo-extracted.owl
@@ -30,7 +30,7 @@
-
+ definition
@@ -148,6 +148,18 @@
+
+
+
+
+
+
+
+
+
+ "A unit of measurement is a standardized quantity of a physical quality." [Wikipedia:Wikipedia]
+
+
@@ -167,26 +179,26 @@
-
- "A unit which is a standard measure of the distance between two points." [Wikipedia:Wikipedia]
+
+
-
- length unit
+
+
-
-
+
+ "A unit which is a standard measure of the distance between two points." [Wikipedia:Wikipedia]
-
-
+
+ length unit
@@ -909,26 +921,26 @@
-
- day
+
+
-
-
+
+ "A time unit which is equal to 24 hours." [Wikipedia:Wikipedia]
-
-
+
+ day
-
- "A time unit which is equal to 24 hours." [Wikipedia:Wikipedia]
+
+
@@ -1077,6 +1089,7 @@
+
prefix
@@ -1086,6 +1099,12 @@
+
+
+
+
+
+
@@ -2852,48 +2871,6 @@
-
-
-
-
- "A dimensionless unit which denotes a simple count of things." [MGED:MGED]
- count
-
- count unit
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- "A dimensionless unit which denotes a simple count of things." [MGED:MGED]
-
-
-
-
-
- count
-
-
-
-
-
- count unit
-
-
-
-
-
@@ -6055,9 +6032,17 @@
gram per square meter based unit
+
+
+
+
+
+
+
+
-
+