diff --git a/conventions/cf-1.12.json b/conventions/cf-1.12.json new file mode 100644 index 0000000..2493fbf --- /dev/null +++ b/conventions/cf-1.12.json @@ -0,0 +1,5 @@ +{ + "@context": "000_context.jsonld", + "id": "cf-1.12", + "type": "conventions" +} diff --git a/conventions/cf-1.13.json b/conventions/cf-1.13.json new file mode 100644 index 0000000..222a4da --- /dev/null +++ b/conventions/cf-1.13.json @@ -0,0 +1,5 @@ +{ + "@context": "000_context.jsonld", + "id": "cf-1.13", + "type": "conventions" +} diff --git a/esgvoc_manifest.yaml b/esgvoc_manifest.yaml index 3d256eb..d22f1dd 100644 --- a/esgvoc_manifest.yaml +++ b/esgvoc_manifest.yaml @@ -2,9 +2,28 @@ schema_version: '1' project: id: obs4ref name: Obs4REF Controlled Vocabulary -cv_version: 1.0.0 -universe_version: 1.0.23 +cv_version: 3.0.0 +universe_version: 3.0.0 esgvoc: min_version: 4.1.0 release_notes: | - Initial manifest. + - aux_uncertainty_id: new collection model + - has_aux_unc: new collection model + - nominal_resolution: updated collection model + - site_id: new collection model + - site_location: new collection model + - source_id: updated collection model + - _CVs: 12 removed + - activity_id: 1 modified + - aux_uncertainty_id: 9 added + - conventions: 1 added + - frequency: 4 modified + - grid_label: 2 added + - has_aux_unc: 2 added + - institution_id: 19 added, 32 modified + - nominal_resolution: 19 added, 1 modified, 14 removed + - realm: 4 modified + - site_id: 267 added + - site_location: 1 added + - source_id: 136 added, 22 modified + - source_type: 1 added diff --git a/license/000_context.jsonld b/license/000_context.jsonld index f86f9d4..74c99c3 100644 --- a/license/000_context.jsonld +++ b/license/000_context.jsonld @@ -1,17 +1,9 @@ { "@context": { - "@base": "https://esgvoc.ipsl.fr/resource/universe/license/", + "@base": "https://esgvoc.ipsl.fr/resource/universe/regex/", "@vocab": "http://schema.org/", "id": "@id", "type": "@type", - "conditions": { - "@id": "https://schema.org/description" - }, - "long_name": { - "@id": "https://schema.org/name" - }, - "license_url": { - "@id": "https://schema.org/url" - } + "description":{"@id":"https://schema.org/description"} } } \ No newline at end of file diff --git a/license/cc_by_4.0.json b/license/cc_by_4.0.json index 504d03d..ca801bc 100644 --- a/license/cc_by_4.0.json +++ b/license/cc_by_4.0.json @@ -1,6 +1,7 @@ { "@context": "000_context.jsonld", "id": "cc_by_4.0", - "type": "license", + "type": "regex", + "regex": ".*[cC][cC][ ][bB][yY][ ]4\\.0.*$", "conditions": "The obs4REF data linked to this entry is licensed under a Creative Commons Attribution 4.0 International (https://creativecommons.org/licenses/by/4.0/). Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing CMIP6Plus output, including citation requirements and proper acknowledgment. The data producers and data providers make no warranty, either express or implied, including, but not limited to, warranties of merchantability and fitness for a particular purpose. All liabilities arising from the supply of the information (including any liability arising in negligence) are excluded to the fullest extent permitted by law." } diff --git a/nominal_resolution/0.5-km.json b/nominal_resolution/0.5-km.json index bd8b4b8..e5cdd3d 100644 --- a/nominal_resolution/0.5-km.json +++ b/nominal_resolution/0.5-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "0.5-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "0.5-km", "type": "nominal_resolution", "drs_name": "0.5 km"} \ No newline at end of file diff --git a/nominal_resolution/1-km.json b/nominal_resolution/1-km.json index 4dc591c..f1c0469 100644 --- a/nominal_resolution/1-km.json +++ b/nominal_resolution/1-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "1-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "1-km", "type": "nominal_resolution", "drs_name": "1 km"} \ No newline at end of file diff --git a/nominal_resolution/10-km.json b/nominal_resolution/10-km.json index 9b2a33b..fc71ab7 100644 --- a/nominal_resolution/10-km.json +++ b/nominal_resolution/10-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "10-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "10-km", "type": "nominal_resolution", "drs_name": "10 km"} \ No newline at end of file diff --git a/nominal_resolution/100-km.json b/nominal_resolution/100-km.json index 6f4dce3..963e24b 100644 --- a/nominal_resolution/100-km.json +++ b/nominal_resolution/100-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "100-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "100-km", "type": "nominal_resolution", "drs_name": "100 km"} \ No newline at end of file diff --git a/nominal_resolution/1000-km.json b/nominal_resolution/1000-km.json index b03ffae..0c71e21 100644 --- a/nominal_resolution/1000-km.json +++ b/nominal_resolution/1000-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "1000-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "1000-km", "type": "nominal_resolution", "drs_name": "1000 km"} \ No newline at end of file diff --git a/nominal_resolution/1000-m.json b/nominal_resolution/1000-m.json index 80bba9a..3c9c91a 100644 --- a/nominal_resolution/1000-m.json +++ b/nominal_resolution/1000-m.json @@ -1,5 +1,13 @@ { "@context": "000_context.jsonld", "id": "1000-m", - "type": "nominal_resolution" + "type": "nominal_resolution", + "description": "Should drs name include whitespace? Having whitespace in drs name isn't ideal, but if this will only ever be used in global attributes, it won't technically break things. 1.0km nominal resolution. This value isn't uniform, but provides an esimate of the resolution of the dataset on average.", + "drs_name": "1000-m", + "magnitude": 1.0, + "range": [ + 0.72, + 1.6 + ], + "units": "km" } diff --git a/nominal_resolution/10000-km.json b/nominal_resolution/10000-km.json index 3c4bfed..851180e 100644 --- a/nominal_resolution/10000-km.json +++ b/nominal_resolution/10000-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "10000-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "10000-km", "type": "nominal_resolution", "drs_name": "10000 km"} \ No newline at end of file diff --git a/nominal_resolution/1x1degree.json b/nominal_resolution/1x1degree.json index f1bc4a3..d18867b 100644 --- a/nominal_resolution/1x1degree.json +++ b/nominal_resolution/1x1degree.json @@ -2,4 +2,4 @@ "@context": "000_context.jsonld", "id": "1x1degree", "type": "nominal_resolution" -} +} \ No newline at end of file diff --git a/nominal_resolution/2.5-km.json b/nominal_resolution/2.5-km.json index 9455527..2579f8e 100644 --- a/nominal_resolution/2.5-km.json +++ b/nominal_resolution/2.5-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "2.5-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "2.5-km", "type": "nominal_resolution", "drs_name": "2.5 km"} \ No newline at end of file diff --git a/nominal_resolution/25-km.json b/nominal_resolution/25-km.json index 2077052..0abf7e3 100644 --- a/nominal_resolution/25-km.json +++ b/nominal_resolution/25-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "25-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "25-km", "type": "nominal_resolution", "drs_name": "25 km"} \ No newline at end of file diff --git a/nominal_resolution/250-km.json b/nominal_resolution/250-km.json index 36f2342..9439297 100644 --- a/nominal_resolution/250-km.json +++ b/nominal_resolution/250-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "250-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "250-km", "type": "nominal_resolution", "drs_name": "250 km"} \ No newline at end of file diff --git a/nominal_resolution/2500-km.json b/nominal_resolution/2500-km.json index 9674a50..2822b51 100644 --- a/nominal_resolution/2500-km.json +++ b/nominal_resolution/2500-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "2500-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "2500-km", "type": "nominal_resolution", "drs_name": "2500 km"} \ No newline at end of file diff --git a/nominal_resolution/2500-m.json b/nominal_resolution/2500-m.json index 42f27ab..b3fea5d 100644 --- a/nominal_resolution/2500-m.json +++ b/nominal_resolution/2500-m.json @@ -1,5 +1,13 @@ { "@context": "000_context.jsonld", "id": "2500-m", - "type": "nominal_resolution" + "type": "nominal_resolution", + "description": "Should drs name include whitespace? Having whitespace in drs name isn't ideal, but if this will only ever be used in global attributes, it won't technically break things. 2.5km nominal resolution. This value isn't uniform, but provides an esimate of the resolution of the dataset on average.", + "drs_name": "2500-m", + "magnitude": 2.5, + "range": [ + 1.6, + 3.6 + ], + "units": "km" } diff --git a/nominal_resolution/5-km.json b/nominal_resolution/5-km.json index ba43975..3da38b8 100644 --- a/nominal_resolution/5-km.json +++ b/nominal_resolution/5-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "5-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "5-km", "type": "nominal_resolution", "drs_name": "5 km"} \ No newline at end of file diff --git a/nominal_resolution/50-km.json b/nominal_resolution/50-km.json index 7c8c4a3..8747b0c 100644 --- a/nominal_resolution/50-km.json +++ b/nominal_resolution/50-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "50-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "50-km", "type": "nominal_resolution", "drs_name": "50 km"} \ No newline at end of file diff --git a/nominal_resolution/500-km.json b/nominal_resolution/500-km.json index 9780baa..55b6b34 100644 --- a/nominal_resolution/500-km.json +++ b/nominal_resolution/500-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "500-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "500-km", "type": "nominal_resolution", "drs_name": "500 km"} \ No newline at end of file diff --git a/nominal_resolution/500-m.json b/nominal_resolution/500-m.json index 1d5bea8..01f82e0 100644 --- a/nominal_resolution/500-m.json +++ b/nominal_resolution/500-m.json @@ -1,5 +1,13 @@ { "@context": "000_context.jsonld", "id": "500-m", - "type": "nominal_resolution" + "type": "nominal_resolution", + "description": "Should drs name include whitespace? Having whitespace in drs name isn't ideal, but if this will only ever be used in global attributes, it won't technically break things. 0.5km nominal resolution. This value isn't uniform, but provides an esimate of the resolution of the dataset on average.", + "drs_name": "500-m", + "magnitude": 0.5, + "range": [ + 0.0, + 0.72 + ], + "units": "km" } diff --git a/nominal_resolution/5000-km.json b/nominal_resolution/5000-km.json index 860d60e..0204080 100644 --- a/nominal_resolution/5000-km.json +++ b/nominal_resolution/5000-km.json @@ -1,5 +1 @@ -{ - "@context": "000_context.jsonld", - "id": "5000-km", - "type": "nominal_resolution" -} +{"@context": "000_context.jsonld", "id": "5000-km", "type": "nominal_resolution", "drs_name": "5000 km"} \ No newline at end of file diff --git a/nominal_resolution/5000-m.json b/nominal_resolution/5000-m.json index 322e736..314beab 100644 --- a/nominal_resolution/5000-m.json +++ b/nominal_resolution/5000-m.json @@ -1,5 +1,13 @@ { "@context": "000_context.jsonld", "id": "5000-m", - "type": "nominal_resolution" + "type": "nominal_resolution", + "description": "Should drs name include whitespace? Having whitespace in drs name isn't ideal, but if this will only ever be used in global attributes, it won't technically break things. 5.0km nominal resolution. This value isn't uniform, but provides an esimate of the resolution of the dataset on average.", + "drs_name": "5000-m", + "magnitude": 5.0, + "range": [ + 3.6, + 7.2 + ], + "units": "km" } diff --git a/nominal_resolution/site.json b/nominal_resolution/site.json index f34b447..1da4a02 100644 --- a/nominal_resolution/site.json +++ b/nominal_resolution/site.json @@ -1 +1 @@ -{"@context": "000_context.jsonld", "id": "site", "type": "nominal_resolution"} \ No newline at end of file +{"@context": "000_context.jsonld", "id": "site", "type": "nominal_resolution", "drs_name": "site"} \ No newline at end of file