Simplify inclusion of units for values relating to observatories (htt…

…ps://github.com/emo-bon/emobon-ontology/issues/13)
emo-bon · Oct 22, 2024 · bdac9e0 · bdac9e0
1 parent aae9cd7
commit bdac9e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/templates/sediment_observatory.ldt.ttl.j2 b/templates/sediment_observatory.ldt.ttl.j2
@@ -112,12 +112,10 @@ Sets:
     {#- emobon ontology extension predicates #}
     {%- if _.tot_depth_water_col != "NA" %}
     emobon-sampling:waterColumnDepth [
-        a sosa:Observation ; 
-        sosa:hasResult [
-            rdf:type qudt:QuantityValue ;
+        a qudt:QuantityValue ;
             qudt:numericValue {{_.tot_depth_water_col | xsd("integer") | safe }} ; {#- usefull to also connect to sampling_event/sample #}
             {%- for row in sets['schema']%}
-                {%- if row['LogsheetTab'] == 'Measured' and not row['LogsheetColumnTitle'].endswith('_method') and _[row['LogsheetColumnTitle']] and _[row['LogsheetColumnTitle']] != "NA" %}
+                {%- if row['LogsheetColumnTitle'] == 'tot_depth_water_col' %}
                     {%- if row['Unit_URL'] and row['Unit_URL'] != "NA" %}
             qudt:unit <{{row['Unit_URL'].strip() | safe }}> ;
                     {%- elif row['Unit'] and row['Unit'] != "NA" %}
@@ -126,7 +124,6 @@ Sets:
                 {%- endif %}
             {%- endfor %}
         ] ; 
-    ] ; 
     {%- endif %}
     {%- if _.geo_loc_name != "NA" %}
     emobon-sampling:originCountry {{_.geo_loc_name | xsd("string") | safe }} ; {#- usefull to also connect to sampling_event/sample #}          

diff --git a/templates/water_observatory.ldt.ttl.j2 b/templates/water_observatory.ldt.ttl.j2
@@ -112,21 +112,18 @@ Sets:
     {#- emobon ontology extension predicates #}
     {%- if _.tot_depth_water_col != "NA" %}
     emobon-sampling:waterColumnDepth [
-        a sosa:Observation ; 
-        sosa:hasResult [
-            rdf:type qudt:QuantityValue ;
+        a qudt:QuantityValue ;
             qudt:numericValue {{_.tot_depth_water_col | xsd("integer") | safe }} ; {#- usefull to also connect to sampling_event/sample #}
             {%- for row in sets['schema']%}
-                {%- if row['LogsheetTab'] == 'Measured' and not row['LogsheetColumnTitle'].endswith('_method') and _[row['LogsheetColumnTitle']] and _[row['LogsheetColumnTitle']] != "NA" %}
+                {%- if row['LogsheetColumnTitle'] == 'tot_depth_water_col' %}
                     {%- if row['Unit_URL'] and row['Unit_URL'] != "NA" %}
             qudt:unit <{{row['Unit_URL'].strip() | safe }}> ;
                     {%- elif row['Unit'] and row['Unit'] != "NA" %}
             qudt:unit {{row['Unit'].strip() | xsd('string') | safe }} ;
                     {%- endif %} 
                 {%- endif %}
             {%- endfor %}
-        ] ; 
-    ] ; 
+        ] ;
     {%- endif %}
     {%- if _.geo_loc_name != "NA" %}
     emobon-sampling:originCountry {{_.geo_loc_name | xsd("string") | safe }} ; {#- usefull to also connect to sampling_event/sample #}