diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00f14c0c..3c02aca9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add `mappingRelation` to `isAbout` [(#307)](https://github.com/OpenEnergyPlatform/oemetadata/pull/307)
- Add `mappingRelation` to `valueReference` [(#307)](https://github.com/OpenEnergyPlatform/oemetadata/pull/307)
- Tests for example and template to be valid frictionless datapackage [(#305)](https://github.com/OpenEnergyPlatform/oemetadata/pull/305)
+- Add spatial information to dataset [(#310)](https://github.com/OpenEnergyPlatform/oemetadata/pull/310)
+- Add temporal information to dataset [(#310)](https://github.com/OpenEnergyPlatform/oemetadata/pull/310)
### Changed
- Update TLDR URL in example sourceLicenses [(#275)](https://github.com/OpenEnergyPlatform/oemetadata/pull/275)
diff --git a/oemetadata/v2/v21/build_source/schemas/README.md b/oemetadata/v2/v21/build_source/schemas/README.md
new file mode 100644
index 00000000..75d3a8f6
--- /dev/null
+++ b/oemetadata/v2/v21/build_source/schemas/README.md
@@ -0,0 +1,10 @@
+
+
+# OEMetadata Core Files
+
+The schemas are the core of the OEMetadata specification.
+They are separated by category and follow the logic of OEMetadata structure.
diff --git a/oemetadata/v2/v21/build_source/schemas/dataset.json b/oemetadata/v2/v21/build_source/schemas/dataset.json
index 5ffa26c8..91fb14e3 100644
--- a/oemetadata/v2/v21/build_source/schemas/dataset.json
+++ b/oemetadata/v2/v21/build_source/schemas/dataset.json
@@ -66,23 +66,49 @@
"badge": "Bronze",
"title": "Dataset Description"
},
- "topics": {
- "description": "An array of predefined topics that correspond to the database schemas of the OEP.",
- "type": "array",
- "items": {
- "description": "The topics are used to group the data in the database.",
- "type": [
- "string",
- "null"
- ],
- "examples": [
- "model_draft"
- ],
- "badge": "Bronze",
- "title": "Topic"
- },
- "badge": "Bronze",
- "title": "Topics"
+ "extent": {
+ "description": "An object that describes a covered area or region of the dataset.",
+ "type": "object",
+ "properties": {
+ "name": {
+ "description": "The name of the spatial region of the dataset.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "Europe"
+ ],
+ "badge": "Silver",
+ "title": "Dataset Extent Name"
+ },
+ "@id": {
+ "description": "A URI reference for the region of the dataset.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "https://www.wikidata.org/wiki/Q458"
+ ],
+ "format": "uri",
+ "badge": "Platinum",
+ "title": "Dataset Extent Identifier"
+ }
+ }
+ },
+ "referenceDate": {
+ "description": "A base year, month or day. The time for which the dataset should be accurate. Date Format is ISO 8601.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "2020-01-01"
+ ],
+ "badge": "Silver",
+ "title": "Dataset Reference Date",
+ "format": "date"
},
"languages": {
"description": "An array of languages used within the described data structures (e.g. titles, descriptions) or metadata.",
diff --git a/oemetadata/v2/v21/build_source/schemas/general.json b/oemetadata/v2/v21/build_source/schemas/general.json
index 8b28ebf3..0ffc751b 100644
--- a/oemetadata/v2/v21/build_source/schemas/general.json
+++ b/oemetadata/v2/v21/build_source/schemas/general.json
@@ -53,6 +53,24 @@
"badge": "Silver",
"title": "Title"
},
+ "topics": {
+ "description": "An array of predefined topics that correspond to the database schemas of the OEP.",
+ "type": "array",
+ "items": {
+ "description": "The topics are used to group the data in the database.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "model_draft"
+ ],
+ "badge": "Bronze",
+ "title": "Topic"
+ },
+ "badge": "Bronze",
+ "title": "Topics"
+ },
"description": {
"description": "A description of the table. It should be usable as summary information for the table that is described by the metadata.",
"type": [
diff --git a/oemetadata/v2/v21/build_source/schemas/review.json b/oemetadata/v2/v21/build_source/schemas/review.json
index 9c87e1ef..fc089009 100644
--- a/oemetadata/v2/v21/build_source/schemas/review.json
+++ b/oemetadata/v2/v21/build_source/schemas/review.json
@@ -14,7 +14,7 @@
"null"
],
"examples": [
- "https://openenergyplatform.org/dataedit/view/model_draft/oep_table_example/open_peer_review/"
+ "https://openenergyplatform.org/database/"
],
"badge": null,
"title": "Path",
diff --git a/oemetadata/v2/v21/example.json b/oemetadata/v2/v21/example.json
index 5c80deb9..2f693135 100644
--- a/oemetadata/v2/v21/example.json
+++ b/oemetadata/v2/v21/example.json
@@ -4,9 +4,11 @@
"name": "oep_oemetadata",
"title": "OEP OEMetadata Dataset",
"description": "A dataset for the OEMetadata examples.",
- "topics": [
- "model_draft"
- ],
+ "extent": {
+ "name": "Europe",
+ "@id": "https://www.wikidata.org/wiki/Q458"
+ },
+ "referenceDate": "2020-01-01",
"languages": [
"en-GB",
"de-DE"
@@ -82,7 +84,7 @@
}
],
"review": {
- "path": "https://openenergyplatform.org/dataedit/view/model_draft/oep_table_example/open_peer_review/",
+ "path": "https://openenergyplatform.org/database/",
"badge": "Platinum"
},
"resources": [
@@ -91,6 +93,9 @@
"path": "example.csv",
"name": "example.csv",
"title": "OEMetadata Table Example",
+ "topics": [
+ "model_draft"
+ ],
"description": "Example metadata and table used to illustrate the OEMetadata structure and features.",
"publicationDate": "2024-10-15",
"subject": [
@@ -386,7 +391,7 @@
"decimalSeparator": "."
},
"review": {
- "path": "https://openenergyplatform.org/dataedit/view/model_draft/oep_table_example/open_peer_review/",
+ "path": "https://openenergyplatform.org/database/",
"badge": "Platinum"
}
}
diff --git a/oemetadata/v2/v21/metadata_key_description.md b/oemetadata/v2/v21/metadata_key_description.md
index 0df4d1b7..aeecb16a 100644
--- a/oemetadata/v2/v21/metadata_key_description.md
+++ b/oemetadata/v2/v21/metadata_key_description.md
@@ -39,13 +39,17 @@ If a value is not yet available, use: `ToDo`.
| 3 | name | A filename or database conform dataset name. | oep_oemetadata | [rdfs:label](https://www.w3.org/2000/01/rdf-schema#/label) | Iron | [1] |
| 4 | title | A human readable dataset name. | OEP OEMetadata | [dct:title](http://purl.org/dc/terms/title) | Bronze | [0..1] |
| 5 | description | A free text description of the dataset. | A collection of tables for the OEMetadata examples. | [dct:description](http://purl.org/dc/terms/description) | Bronze | [0..1] |
-| 6 | languages | An array of languages used within the described data structures (e.g. titles, descriptions). The language key can be repeated if more languages are used. Standard: IETF (BCP47) | en-GB, de-DE | [dct:language](http://purl.org/dc/terms/language) | Gold | [*] |
-| 7 | version | A version string identifying the version of the package. | 0.1.0 | [dcat:version](https://www.w3.org/ns/dcat#version) | Silver | [0..1] |
-| 8 | image | An image to use for this data package. | https://openenergyplatform.org/static/img/about/OpenEnergyFamily_GroupPhoto2.png | [schema.org:image](https://schema.org/image) | Gold | [0..1] |
-| 9 | **subject** | An array of objects that references to the subjects of the resource in ontology terms. | | | - | [*] |
-| 9.1 | name | A class label of the ontology term. | energy | [rdfs:label](https://www.w3.org/2000/01/rdf-schema#/label) | Platinum | [0..1] |
-| 9.2 | @id | A unique identifier (URI/IRI) of the ontology class. | [openenergyplatform.org/ontology/oeo/OEO_00000150](https://openenergyplatform.org/ontology/oeo/OEO_00000150) | [dct:subject](http://purl.org/dc/terms/subject) | Platinum | [0..1] |
-| 10 | keywords | An array of freely selectable keywords that help with searching and structuring. | example, ODbL-1.0, NFDI4Energy | [dcat:keyword](http://www.w3.org/ns/dcat#keyword) | Silver | [*] |
+| 6 | **spatial** | An object that describes a covered area or region of the dataset. | | [oeo:spatial region](http://purl.obolibrary.org/obo/BFO_0000006) | | [0..1] |
+| 6.1 | region | The name of the spatial region of the dataset. | Berlin | [rdfs:label](https://www.w3.org/2000/01/rdf-schema#/label) | Silver | [0..1] |
+| 6.2 | @id | A URI reference for the region of the dataset. | [www.wikidata.org/wiki/Q64](https://www.wikidata.org/wiki/Q64) | [dct:identifier](http://purl.org/dc/terms/identifier) | Platinum | [0..1] |
+| 7 | referenceDate | A base year, month or day. The time for which the dataset should be accurate. Date Format is ISO 8601. | 2020-01-01 | [dct:date](http://purl.org/dc/terms/date) | Silver | [0..1] |
+| 8 | languages | An array of languages used within the described data structures (e.g. titles, descriptions). The language key can be repeated if more languages are used. Standard: IETF (BCP47) | en-GB, de-DE | [dct:language](http://purl.org/dc/terms/language) | Gold | [*] |
+| 9 | version | A version string identifying the version of the package. | 0.1.0 | [dcat:version](https://www.w3.org/ns/dcat#version) | Silver | [0..1] |
+| 10 | image | An image to use for this data package. | https://openenergyplatform.org/static/img/about/OpenEnergyFamily_GroupPhoto2.png | [schema.org:image](https://schema.org/image) | Gold | [0..1] |
+| 11 | **subject** | An array of objects that references to the subjects of the resource in ontology terms. | | | - | [*] |
+| 11.1 | name | A class label of the ontology term. | energy | [rdfs:label](https://www.w3.org/2000/01/rdf-schema#/label) | Platinum | [0..1] |
+| 11.2 | @id | A unique identifier (URI/IRI) of the ontology class. | [openenergyplatform.org/ontology/oeo/OEO_00000150](https://openenergyplatform.org/ontology/oeo/OEO_00000150) | [dct:subject](http://purl.org/dc/terms/subject) | Platinum | [0..1] |
+| 12 | keywords | An array of freely selectable keywords that help with searching and structuring. | example, ODbL-1.0, NFDI4Energy | [dcat:keyword](http://www.w3.org/ns/dcat#keyword) | Silver | [*] |
### Dataset - Project Context Keys
| #
| Key
| Description
| Example
| Ontology Class
| Badge
| Card.
|
@@ -104,16 +108,17 @@ If a value is not yet available, use: `ToDo`.
| 2 | path | A unique identifier (URI/UUID/DOI) for the table or file. | [oemetadata_table_template](https://openenergyplatform.org/database/tables/oemetadata_table_template) | [dcat:accessURL](https://www.w3.org/ns/dcat#accessURL) | Bronze | [0..1] |
| 3 | name | A filename or database conform table name. | oemetadata_table_template | [rdfs:label](https://www.w3.org/2000/01/rdf-schema#/label) | Iron | [1] |
| 4 | title | A human readable resource or table name. | OEMetadata Table | [dct:title](http://purl.org/dc/terms/title) | Silver | [0..1] |
-| 5 | description | A description of the table. It should be usable as summary information for the table that is described by the metadata. | Example table used to illustrate the OEMetadata structure and features. | [dct:description](http://purl.org/dc/terms/description) | Silver | [0..1] |
-| 6 | publicationDate | A date of publication of the data or metadata. The date format is ISO 8601 (YYYY-MM-DD). | 2024-10-15 | [dct:issued](http://purl.org/dc/terms/issued) | Bronze | [0..1] |
-| 7 | **subject** | An array of objects that references to the subjects of the resource in ontology terms. | | | | [*] |
-| 7.1 | name | A class label of the ontology term. | energy | [rdfs:label](https://www.w3.org/2000/01/rdf-schema#/label) | Platinum | [0..1] |
-| 7.2 | @id | A unique identifier (URI/IRI) of the ontology class. | [openenergyplatform.org/ontology/oeo/OEO_00000150](https://openenergyplatform.org/ontology/oeo/OEO_00000150) | [dct:subject](http://purl.org/dc/terms/subject) | Platinum | [0..1] |
-| 8 | keywords | An array of freely selectable keywords that help with searching and structuring. The keyword are used and managed in the OEP as table tags. | example, ODbL-1.0, NFDI4Energy | [dcat:keyword](http://www.w3.org/ns/dcat#keyword) | Silver | [*] |
-| 9 | **embargoPeriod** | An object that describes the embargo period during which public access to the data is not allowed. | | | | [0..1] |
-| 9.1 | start | The start date of the embargo period. The date of the data (metadata) upload. | 2024-10-11 | [dbo:startDateTime](https://dbpedia.org/ontology/startDateTime) | Bronze | [0..1] |
-| 9.2 | end | The end date of the embargo period. This is the envisioned publication date. | 2025-01-01 | [dbo:endDateTime](https://dbpedia.org/ontology/endDateTime) | Bronze | [0..1] |
-| 9.3 | isActive | A boolean key that indicates if the embargo period is currently active. Must be changed to False on the embargo period end date. | True | [adms:status](http://www.w3.org/ns/adms#status) | Bronze | [0..1] |
+| 5 | topics | An array of predefined topics that correspond to the database schemas of the OEP. | model_draft | [foaf:topic](http://xmlns.com/foaf/spec/#term_topic) | Bronze | [*] |
+| 6 | description | A description of the table. It should be usable as summary information for the table that is described by the metadata. | Example table used to illustrate the OEMetadata structure and features. | [dct:description](http://purl.org/dc/terms/description) | Silver | [0..1] |
+| 7 | publicationDate | A date of publication of the data or metadata. The date format is ISO 8601 (YYYY-MM-DD). | 2024-10-15 | [dct:issued](http://purl.org/dc/terms/issued) | Bronze | [0..1] |
+| 8 | **subject** | An array of objects that references to the subjects of the resource in ontology terms. | | | | [*] |
+| 8.1 | name | A class label of the ontology term. | energy | [rdfs:label](https://www.w3.org/2000/01/rdf-schema#/label) | Platinum | [0..1] |
+| 8.2 | @id | A unique identifier (URI/IRI) of the ontology class. | [openenergyplatform.org/ontology/oeo/OEO_00000150](https://openenergyplatform.org/ontology/oeo/OEO_00000150) | [dct:subject](http://purl.org/dc/terms/subject) | Platinum | [0..1] |
+| 9 | keywords | An array of freely selectable keywords that help with searching and structuring. The keyword are used and managed in the OEP as table tags. | example, ODbL-1.0, NFDI4Energy | [dcat:keyword](http://www.w3.org/ns/dcat#keyword) | Silver | [*] |
+| 10 | **embargoPeriod** | An object that describes the embargo period during which public access to the data is not allowed. | | | | [0..1] |
+| 10.1 | start | The start date of the embargo period. The date of the data (metadata) upload. | 2024-10-11 | [dbo:startDateTime](https://dbpedia.org/ontology/startDateTime) | Bronze | [0..1] |
+| 10.2 | end | The end date of the embargo period. This is the envisioned publication date. | 2025-01-01 | [dbo:endDateTime](https://dbpedia.org/ontology/endDateTime) | Bronze | [0..1] |
+| 10.3 | isActive | A boolean key that indicates if the embargo period is currently active. Must be changed to False on the embargo period end date. | True | [adms:status](http://www.w3.org/ns/adms#status) | Bronze | [0..1] |
### Resources - Spatial Keys
| #
| Key
| Description
| Example
| Ontology Class
| Badge
| Card.
|
diff --git a/oemetadata/v2/v21/metadata_key_details.md b/oemetadata/v2/v21/metadata_key_details.md
index 5ccd905b..bb2ef8a9 100644
--- a/oemetadata/v2/v21/metadata_key_details.md
+++ b/oemetadata/v2/v21/metadata_key_details.md
@@ -484,7 +484,7 @@ If a value is not yet available, use: `ToDo`.
| **Badge** | |
| **Card.** | [*] |
-### Resources - @id
+### Resources - General - @id
| | |
|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Key | @id |
@@ -494,7 +494,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Platinum |
| Card. | [0..1] |
-### Resources - path
+### Resources - General - path
| | |
|----------------|----------------------------------------------------------------------------------------------------------------------------|
| Key | path |
@@ -504,7 +504,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - name
+### Resources - General - name
| | |
|----------------|------------------------------------------------------------|
| Key | name |
@@ -514,7 +514,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Iron |
| Card. | [1] |
-### Resources - title
+### Resources - General - title
| | |
|----------------|---------------------------------------------|
| Key | title |
@@ -524,7 +524,17 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - description
+### Resource - General - topics
+| | |
+|----------------|-----------------------------------------------------------------------------------|
+| Key | topics |
+| Description | An array of predefined topics that correspond to the database schemas of the OEP. |
+| Example | model_draft |
+| Ontology Class | [foaf:topic](http://xmlns.com/foaf/spec/#term_topic) |
+| Badge | Bronze |
+| Card. | [*] |
+
+### Resources - General - description
| | |
|----------------|-------------------------------------------------------------------------------------------------------------------------|
| Key | description |
@@ -534,7 +544,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - publicationDate
+### Resources - General - publicationDate
| | |
|----------------|------------------------------------------------------------------------------------------|
| Key | publicationDate |
@@ -544,7 +554,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - subject
+### Resources - General - subject
| | |
|----------------|-------------------------------------------------------------------------------------|
| Key | subject |
@@ -554,7 +564,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [*] |
-### Resources - subject (name)
+### Resources - General - subject (name)
| | |
|----------------|------------------------------------------------------------|
| Key | name |
@@ -564,7 +574,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Platinum |
| Card. | [0..1] |
-### Resources - subject (@id)
+### Resources - General - subject (@id)
| | |
|----------------|--------------------------------------------------------------------------------------------------------------|
| Key | @id |
@@ -574,7 +584,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Platinum |
| Card. | [0..1] |
-### Resources - keywords
+### Resources - General - keywords
| | |
|----------------|----------------------------------------------------------------------------------|
| Key | keywords |
@@ -584,7 +594,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [*] |
-### Resources - embargoPeriod
+### Resources - General - embargoPeriod
| | |
|----------------|----------------------------------------------------------------------------------------------------|
| Key | embargoPeriod |
@@ -594,7 +604,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [0..1] |
-### Resources - embargoPeriod (start)
+### Resources - General - embargoPeriod (start)
| | |
|----------------|-------------------------------------------------------------------------------|
| Key | start |
@@ -604,7 +614,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - embargoPeriod (end)
+### Resources - General - embargoPeriod (end)
| | |
|----------------|------------------------------------------------------------------------------|
| Key | end |
@@ -614,7 +624,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - embargoPeriod (isActive)
+### Resources - General - embargoPeriod (isActive)
| | |
|----------------|----------------------------------------------------------------------------------------------------------------------------------|
| Key | isActive |
@@ -624,7 +634,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - spatial
+### Resources - Spatial
| | |
|----------------|-----------------------------------------------------------|
| Key | spatial |
@@ -634,7 +644,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [0..1] |
-### Resources - spatial (location)
+### Resources - Spatial - location
| | |
|----------------|---------------------------------------------------|
| Key | location |
@@ -644,7 +654,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [0..1] |
-### Resources - spatial (location - address)
+### Resources - Spatial - location (address)
| | |
|----------------|-------------------------------------------------------------------------------------------------------------------|
| Key | address |
@@ -654,7 +664,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - spatial (location - @id)
+### Resources - Spatial - location (@id)
| | |
|----------------|-----------------------------------------------------------------------------|
| Key | @id |
@@ -664,7 +674,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Platinum |
| Card. | [0..1] |
-### Resources - spatial (location - latitude)
+### Resources - Spatial - location (latitude)
| | |
|----------------|-------------------------------------------------|
| Key | latitude |
@@ -674,7 +684,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Gold |
| Card. | [0..1] |
-### Resources - spatial (location - longitude)
+### Resources - Spatial - location (longitude)
| | |
|----------------|--------------------------------------------------|
| Key | longitude |
@@ -684,7 +694,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Gold |
| Card. | [0..1] |
-### Resources - spatial (extent)
+### Resources - Spatial - extent
| | |
|----------------|------------------------------------------------------------------|
| Key | extent |
@@ -694,7 +704,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [0..1] |
-### Resources - spatial (extent - name)
+### Resources - Spatial - extent (name)
| | |
|----------------|------------------------------------------------------------|
| Key | name |
@@ -704,7 +714,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - spatial (extent - @id)
+### Resources - Spatial - extent (@id)
| | |
|----------------|----------------------------------------------------------------|
| Key | @id |
@@ -714,7 +724,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Platinum |
| Card. | [0..1] |
-### Resources - spatial (extent - resolutionValue)
+### Resources - Spatial - extent (resolutionValue)
| | |
|----------------|---------------------------------------------------------------------------------------|
| Key | resolutionValue |
@@ -724,7 +734,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - spatial (extent - resolutionUnit)
+### Resources - Spatial - extent (resolutionUnit)
| | |
|----------------|---------------------------------------------------------------------|
| Key | resolutionUnit |
@@ -734,7 +744,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - spatial (extent - boundingBox)
+### Resources - Spatial - extent (boundingBox)
| | |
|----------------|-------------------------------------------------------------------------------------------------------------------------------|
| Key | boundingBox |
@@ -744,7 +754,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Gold |
| Card. | [*] |
-### Resources - spatial (extent - crs)
+### Resources - Spatial - extent (crs)
| | |
|----------------|------------------------------------------------------------------------------------------------------------------------------------------|
| Key | crs |
@@ -754,7 +764,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Gold |
| Card. | [0..1] |
-### Resources - temporal
+### Resources - Temporal
| | |
|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Key | temporal |
@@ -764,7 +774,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [0..1] |
-### Resources - temporal (referenceDate)
+### Resources - Temporal - referenceDate
| | |
|----------------|-----------------------------------------------------------------------------------------------------|
| Key | referenceDate |
@@ -774,7 +784,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - temporal (timeseries)
+### Resources - Temporal - timeseries
| | |
|----------------|-----------------------------------------------------------|
| Key | timeseries |
@@ -784,7 +794,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [*] |
-### Resources - temporal (timeseries - start)
+### Resources - Temporal - timeseries (start)
| | |
|----------------|-----------------------------------------------------------------|
| Key | start |
@@ -794,7 +804,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - temporal (timeseries - end)
+### Resources - Temporal - timeseries (end)
| | |
|----------------|-------------------------------------------------------------|
| Key | end |
@@ -804,7 +814,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - temporal (timeseries - resolutionValue)
+### Resources - Temporal - timeseries (resolutionValue)
| | |
|----------------|----------------------------------------------------------------------------------------------------|
| Key | resolutionValue |
@@ -814,7 +824,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - temporal (timeseries - resolutionUnit)
+### Resources - Temporal - timeseries (resolutionUnit)
| | |
|----------------|---------------------------------------------------------------------|
| Key | resolutionUnit |
@@ -824,7 +834,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - temporal (timeseries - alignment)
+### Resources - Temporal - timeseries (alignment)
| | |
|----------------|----------------------------------------------------------------------------------------------|
| Key | alignment |
@@ -834,7 +844,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Silver |
| Card. | [0..1] |
-### Resources - temporal (timeseries - aggregationType)
+### Resources - Temporal - timeseries (aggregationType)
| | |
|----------------|-----------------------------------------------------------------------------------|
| Key | aggregationType |
@@ -856,7 +866,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [*] |
-### Resources - sources (title)
+### Resources - sources - title
| | |
|----------------|------------------------------------------------------------------------------|
| Key | title |
@@ -866,7 +876,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - sources (authors)
+### Resources - sources - authors
| | |
|----------------|-------------------------------------------------------------------------|
| Key | authors |
@@ -876,7 +886,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [*] |
-### Resources - sources (description)
+### Resources - sources - description
| | |
|----------------|-----------------------------------------------------------|
| Key | description |
@@ -886,7 +896,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - sources (publicationYear)
+### Resources - sources - publicationYear
| | |
|----------------|-------------------------------------------------|
| Key | publicationYear |
@@ -896,7 +906,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - sources (path)
+### Resources - sources - path
| | |
|----------------|----------------------------------------------------------------------------------------------------------------|
| Key | path |
@@ -986,7 +996,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | |
| Card. | [*] |
-### Resources - resourceLicenses (name)
+### Resources - resourceLicenses - name
| | |
|----------------|------------------------------------------------------------|
| Key | name |
@@ -996,7 +1006,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - resourceLicenses (title)
+### Resources - resourceLicenses - title
| | |
|----------------|-----------------------------------------------------|
| Key | title |
@@ -1006,7 +1016,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - resourceLicenses (path)
+### Resources - resourceLicenses - path
| | |
|----------------|--------------------------------------------------------------------------------------------------------------|
| Key | path |
@@ -1016,7 +1026,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - resourceLicenses (instruction)
+### Resources - resourceLicenses - instruction
| | |
|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Key | instruction |
@@ -1026,7 +1036,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - resourceLicenses (attribution)
+### Resources - resourceLicenses - attribution
| | |
|----------------|---------------------------------------------------------------------------------------|
| Key | attribution |
@@ -1036,7 +1046,7 @@ If a value is not yet available, use: `ToDo`.
| Badge | Bronze |
| Card. | [0..1] |
-### Resources - resourceLicenses (copyrightStatement)
+### Resources - resourceLicenses - copyrightStatement
| | |
|----------------|---------------------------------------------------------------------------------------------------------------------|
| Key | copyrightStatement |
diff --git a/oemetadata/v2/v21/schema.json b/oemetadata/v2/v21/schema.json
index 239b1a9a..41f45a2f 100644
--- a/oemetadata/v2/v21/schema.json
+++ b/oemetadata/v2/v21/schema.json
@@ -70,23 +70,49 @@
"badge": "Bronze",
"title": "Dataset Description"
},
- "topics": {
- "description": "An array of predefined topics that correspond to the database schemas of the OEP.",
- "type": "array",
- "items": {
- "description": "The topics are used to group the data in the database.",
- "type": [
- "string",
- "null"
- ],
- "examples": [
- "model_draft"
- ],
- "badge": "Bronze",
- "title": "Topic"
- },
- "badge": "Bronze",
- "title": "Topics"
+ "extent": {
+ "description": "An object that describes a covered area or region of the dataset.",
+ "type": "object",
+ "properties": {
+ "name": {
+ "description": "The name of the spatial region of the dataset.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "Europe"
+ ],
+ "badge": "Silver",
+ "title": "Dataset Extent Name"
+ },
+ "@id": {
+ "description": "A URI reference for the region of the dataset.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "https://www.wikidata.org/wiki/Q458"
+ ],
+ "format": "uri",
+ "badge": "Platinum",
+ "title": "Dataset Extent Identifier"
+ }
+ }
+ },
+ "referenceDate": {
+ "description": "A base year, month or day. The time for which the dataset should be accurate. Date Format is ISO 8601.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "2020-01-01"
+ ],
+ "badge": "Silver",
+ "title": "Dataset Reference Date",
+ "format": "date"
},
"languages": {
"description": "An array of languages used within the described data structures (e.g. titles, descriptions) or metadata.",
@@ -524,7 +550,7 @@
"null"
],
"examples": [
- "https://openenergyplatform.org/dataedit/view/model_draft/oep_table_example/open_peer_review/"
+ "https://openenergyplatform.org/database/"
],
"badge": null,
"title": "Path",
@@ -604,6 +630,24 @@
"badge": "Silver",
"title": "Title"
},
+ "topics": {
+ "description": "An array of predefined topics that correspond to the database schemas of the OEP.",
+ "type": "array",
+ "items": {
+ "description": "The topics are used to group the data in the database.",
+ "type": [
+ "string",
+ "null"
+ ],
+ "examples": [
+ "model_draft"
+ ],
+ "badge": "Bronze",
+ "title": "Topic"
+ },
+ "badge": "Bronze",
+ "title": "Topics"
+ },
"description": {
"description": "A description of the table. It should be usable as summary information for the table that is described by the metadata.",
"type": [
@@ -1631,7 +1675,7 @@
"null"
],
"examples": [
- "https://openenergyplatform.org/dataedit/view/model_draft/oep_table_example/open_peer_review/"
+ "https://openenergyplatform.org/database/"
],
"badge": null,
"title": "Path",
diff --git a/oemetadata/v2/v21/template.json b/oemetadata/v2/v21/template.json
index 1bb82c22..99677cdd 100644
--- a/oemetadata/v2/v21/template.json
+++ b/oemetadata/v2/v21/template.json
@@ -4,9 +4,11 @@
"name": "",
"title": "",
"description": "",
- "topics": [
- ""
- ],
+ "extent": {
+ "name": "",
+ "@id": ""
+ },
+ "referenceDate": "",
"languages": [
""
],
@@ -66,6 +68,9 @@
"path": "",
"name": "",
"title": "",
+ "topics": [
+ ""
+ ],
"description": "",
"publicationDate": "",
"subject": [