Skip to content

Commit

Permalink
Revert "Update entity URIs"
Browse files Browse the repository at this point in the history 
This reverts commit 0657990.
  • Loading branch information
@laurianvm
laurianvm committed Feb 10, 2025
1 parent 0657990 commit 1fe75ad
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 18 deletions.
Binary file added templates/docs/emobon_data-model-sediment.drawio.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added templates/docs/emobon_data-model-water.drawio.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed templates/docs/emobon_datamodel-data-model-sediment.drawio.png
View file
Binary file not shown.
Binary file removed templates/docs/emobon_datamodel-data-model-water.drawio.png
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions templates/sediment_measured.ldt.ttl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Output:

{#Observations made from the Sample#}
{%- for observatory in sets['observatory'] %}
@base <http://data.emobon.embrc.eu/sample/{{_.source_mat_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}
@base <http://data.emobon.embrc.eu/observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/measured/{{_.source_mat_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}

{%- for row in sets['schema']%}
{%- if row['LogsheetTab'] == 'Measured' and not row['LogsheetColumnTitle'].endswith('_method') and _[row['LogsheetColumnTitle']] and _[row['LogsheetColumnTitle']] != "NA" %}

</observation/{{_.source_mat_id}}#{{row['LogsheetColumnTitle'].strip()}}>
<#{{row['LogsheetColumnTitle'].strip()}}>
a sosa:Observation, schema:Observation ;
{%- if row['Observable_property_url'] and row['Observable_property_url'] != "NA" %}
sosa:observedProperty [
Expand Down
2 changes: 1 addition & 1 deletion templates/sediment_observatory.ldt.ttl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Sets:

{% include './includes/prefixes.ttl' %}

@base <http://data.emobon.embrc.eu/observatory/{{_.obs_id}}/{{_.env_package}}> . {# baseref ~ http://data.emobon.embrc.eu #}
@base <http://data.emobon.embrc.eu/observatory-{{_.obs_id|lower}}-crate/{{_.env_package}}/observatory/{{_.obs_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}

<>
a emobon-core:Observatory ;
Expand Down
12 changes: 6 additions & 6 deletions templates/sediment_sampling.ldt.ttl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ Sets:
{% include './includes/prefixes.ttl' %}

{% for observatory in sets['observatory'] %}
{#note: row in csv corresponds to SAMPLE REPLICATE --> baseurl should also refer to this #}
@base <http://data.emobon.embrc.eu/sample/{{_.source_mat_id}}/{{_.replicate}}> . {# baseref ~ http://data.emobon.embrc.eu #}
{#note: row in csv corresponds to sample replicate --> baseurl should also refer to this #}
@base <http://data.emobon.embrc.eu/observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/sampling/{{_.source_mat_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}

{#- SAMPLING EVENT #}
</sampling/{{_.sampling_event.split(' ') |join("_")}}>
</observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/sampling/{{_.sampling_event.split(' ') |join("_")}}>
a sosa:Sampling, prov:Activity ;
{# provenance part #}
dct:type "sampling"^^xsd:string ;
Expand Down Expand Up @@ -132,13 +132,13 @@ Sets:
emobon-sampling:bioCommunity {{ _.comm_samp | xsd("string") | safe }} ;
{%- endif %}
{# result sample ~ sample from which observations are made #}
sosa:hasResult </sample/{{_.source_mat_id}}> ;
sosa:hasResult </observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/measured/{{_.source_mat_id}}> ;
{#linked to observatory#}
emobon-sampling:linkedToObservatory </observatory/{{observatory.obs_id}}/{{observatory.env_package}}> ;
emobon-sampling:linkedToObservatory </observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/observatory/{{observatory.obs_id}}> ;
.

{#- SAMPLE from which observations are made #}
</sample/{{_.source_mat_id}}>
</observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/measured/{{_.source_mat_id}}>
a sosa:Sample, prov:Entity ;
{# features of interest #}
{%- if _.env_material != "NA" %}
Expand Down
4 changes: 2 additions & 2 deletions templates/water_measured.ldt.ttl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Output:

{#Observations made from the Sample#}
{%- for observatory in sets['observatory'] %}
@base <http://data.emobon.embrc.eu/sample/{{_.source_mat_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}
@base <http://data.emobon.embrc.eu/observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/measured/{{_.source_mat_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}

{%- for row in sets['schema']%}
{%- if row['LogsheetTab'] == 'Measured' and not row['LogsheetColumnTitle'].endswith('_method') and _[row['LogsheetColumnTitle']] and _[row['LogsheetColumnTitle']] != "NA" %}

</observation/{{_.source_mat_id}}#{{row['LogsheetColumnTitle'].strip()}}>
<#{{row['LogsheetColumnTitle'].strip()}}>
a sosa:Observation, schema:Observation ;
{%- if row['Observable_property_url'] and row['Observable_property_url'] != "NA" %}
sosa:observedProperty [
Expand Down
2 changes: 1 addition & 1 deletion templates/water_observatory.ldt.ttl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Sets:

{% include './includes/prefixes.ttl' %}

@base <http://data.emobon.embrc.eu/observatory/{{_.obs_id}}/{{_.env_package}}> . {# baseref ~ http://data.emobon.embrc.eu #}
@base <http://data.emobon.embrc.eu/observatory-{{_.obs_id|lower}}-crate/{{_.env_package}}/observatory/{{_.obs_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}

<>
a emobon-core:Observatory ;
Expand Down
11 changes: 5 additions & 6 deletions templates/water_sampling.ldt.ttl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ Sets:
{% include './includes/prefixes.ttl' %}

{%- for observatory in sets['observatory'] %}
{#note: row in csv corresponds to SAMPLE REPLICATE --> baseurl should also refer to this #}
@base <http://data.emobon.embrc.eu/sample/{{_.source_mat_id}}/{{_.replicate}}> . {# baseref ~ http://data.emobon.embrc.eu #}
@base <http://data.emobon.embrc.eu/observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/sampling/{{_.source_mat_id}}> . {# baseref ~ http://data.emobon.embrc.eu #}

{#- SAMPLING EVENT -#}
</sampling/{{_.sampling_event.split(' ') |join("_")}}>
</observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/sampling/{{_.sampling_event.split(' ') |join("_")}}>
a sosa:Sampling, prov:Activity ;
{# provenance part #}
dct:type "sampling"^^xsd:string ;
Expand Down Expand Up @@ -131,13 +130,13 @@ Sets:
emobon-sampling:bioCommunity {{ _.comm_samp | xsd("string") | safe }} ;
{%- endif %}
{# result sample ~ sample from which observations are made #}
sosa:hasResult </sample/{{_.source_mat_id}}> ;
sosa:hasResult </observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/measured/{{_.source_mat_id}}> ;
{#linked to observatory#}
emobon-sampling:linkedToObservatory </observatory/{{observatory.obs_id}}/{{observatory.env_package}}> ;
emobon-sampling:linkedToObservatory </observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/observatory/{{observatory.obs_id}}> ;
.

{#- SAMPLE from which observations are made #}
</sample/{{_.source_mat_id}}>
</observatory-{{observatory.obs_id|lower}}-crate/{{observatory.env_package}}/measured/{{_.source_mat_id}}>
a sosa:Sample, prov:Entity ;
{# features of interest #}
{%- if _.env_material %}
Expand Down

0 comments on commit 1fe75ad

Please sign in to comment.