Skip to content

Commit

Permalink
Merge pull request #259 from metno/issue_257
Browse files Browse the repository at this point in the history
add Envisat and ASAR to vocabulary
  • Loading branch information
ferrighi authored Aug 13, 2024
2 parents 650a79b + 65dcf61 commit 4708f44
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:

- name: run coverage testing
run: |
docker-compose -f docker-compose.coverage.yml up --exit-code-from coverage
docker compose -f docker-compose.coverage.yml up --exit-code-from coverage
2 changes: 1 addition & 1 deletion .github/workflows/make-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- name: create html and pdf
run: |
docker-compose -f docker-compose.asciidoctor.yml up
docker compose -f docker-compose.asciidoctor.yml up
- name: commit changed files
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:

- name: run unit tests
run: |
docker-compose -f docker-compose.unittests.yml up --exit-code-from unittests
docker compose -f docker-compose.unittests.yml up --exit-code-from unittests
2 changes: 2 additions & 0 deletions doc/ch04-md-contrvocabs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ variable.
|FY-3D |Feng-Yun 3D | https://www.wmo-sat.info/oscar/satellites/view/fy_3d
|FY-3E |Feng-Yun 3E | https://www.wmo-sat.info/oscar/satellites/view/fy_3e
|GCOM-W1 |Global Change Observation Mission 1st-Water | https://www.wmo-sat.info/oscar/satellites/view/gcom_w
|Envisat |Environmental Satellite | https://www.wmo-sat.info/oscar/satellites/view/envisat
|============================================================================

<<platform>>
Expand All @@ -401,6 +402,7 @@ variable.
|MERSI-2 |Medium Resolution Spectral Imager -2 | https://www.wmo-sat.info/oscar/instruments/view/mersi_2
|MODIS |Moderate-resolution Imaging Spectro-radiometer | https://www.wmo-sat.info/oscar/instruments/view/modis
|AMSR2 |Advanced Microwave Scanning Radiometer 2 | https://www.wmo-sat.info/oscar/instruments/view/amsr2
|ASAR |Advanced Synthetic Aperature Radar | https://www.wmo-sat.info/oscar/instruments/view/asar
|===============================================================================================================

<<platform>>
Expand Down
30 changes: 27 additions & 3 deletions thesauri/mmd-vocabulary.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -692,10 +692,11 @@
a skos:Collection, isothes:ConceptGroup ;
skos:inScheme <https://vocab.met.no/mmd>;
skos:prefLabel "Platform"@en ;
skos:changeNote "Added NOAA-21 in collection"@en ;
skos:changeNote "2023-10-10, Added NOAA-21 in collection"@en ;
skos:changeNote "2024-07-22, Added Envisat collection"@en ;
skos:exactMatch <https://gcmd.earthdata.nasa.gov/kms/concepts/concept_scheme/platforms> ;
skos:definition "This describes the platform used to collect the data."@en ;
skos:member <https://vocab.met.no/mmd/Platform/Sentinel-1A>, <https://vocab.met.no/mmd/Platform/Sentinel-1B>, <https://vocab.met.no/mmd/Platform/Sentinel-2A>, <https://vocab.met.no/mmd/Platform/Sentinel-2B>, <https://vocab.met.no/mmd/Platform/Sentinel-3A>, <https://vocab.met.no/mmd/Platform/Sentinel-3B>, <https://vocab.met.no/mmd/Platform/Metop-A>, <https://vocab.met.no/mmd/Platform/Metop-B>, <https://vocab.met.no/mmd/Platform/Metop-C>, <https://vocab.met.no/mmd/Platform/NOAA-18>, <https://vocab.met.no/mmd/Platform/NOAA-19>, <https://vocab.met.no/mmd/Platform/NOAA-20>, <https://vocab.met.no/mmd/Platform/NOAA-21>, <https://vocab.met.no/mmd/Platform/SNPP>, <https://vocab.met.no/mmd/Platform/Aqua>, <https://vocab.met.no/mmd/Platform/Terra>, <https://vocab.met.no/mmd/Platform/FY-3D>, <https://vocab.met.no/mmd/Platform/FY-3E>, <https://vocab.met.no/mmd/Platform/GCOM-W1> .
skos:member <https://vocab.met.no/mmd/Platform/Sentinel-1A>, <https://vocab.met.no/mmd/Platform/Sentinel-1B>, <https://vocab.met.no/mmd/Platform/Sentinel-2A>, <https://vocab.met.no/mmd/Platform/Sentinel-2B>, <https://vocab.met.no/mmd/Platform/Sentinel-3A>, <https://vocab.met.no/mmd/Platform/Sentinel-3B>, <https://vocab.met.no/mmd/Platform/Metop-A>, <https://vocab.met.no/mmd/Platform/Metop-B>, <https://vocab.met.no/mmd/Platform/Metop-C>, <https://vocab.met.no/mmd/Platform/NOAA-18>, <https://vocab.met.no/mmd/Platform/NOAA-19>, <https://vocab.met.no/mmd/Platform/NOAA-20>, <https://vocab.met.no/mmd/Platform/NOAA-21>, <https://vocab.met.no/mmd/Platform/SNPP>, <https://vocab.met.no/mmd/Platform/Aqua>, <https://vocab.met.no/mmd/Platform/Terra>, <https://vocab.met.no/mmd/Platform/FY-3D>, <https://vocab.met.no/mmd/Platform/FY-3E>, <https://vocab.met.no/mmd/Platform/GCOM-W1>, <https://vocab.met.no/mmd/Platform/Envisat> .

<https://vocab.met.no/mmd/Platform/Sentinel-1A>
a skos:Concept, sosa:Platform ;
Expand Down Expand Up @@ -900,13 +901,25 @@
rdfs:seeAlso <https://www.wmo-sat.info/oscar/satellites/view/gcom_w> ;
skos:exactMatch <https://gcmd.earthdata.nasa.gov/kms/concept/8781da14-5ced-4d64-81cd-8daa10a1c30d> .

<https://vocab.met.no/mmd/Platform/Envisat>
a skos:Concept, sosa:Platform ;
skos:prefLabel "Envisat"@en ;
skos:altLabel "Environmental Satellite"@en ;
sosa:hosts <https://vocab.met.no/mmd/Instrument/ASAR> ;
skos:narrower <https://vocab.met.no/mmd/Instrument/ASAR> ;
skos:definition "Envisat was ESA's successor to ERS. Launched on 1 March 2002 on an Ariane-5 rocket from Europe's spaceport in French Guiana, Envisat was the largest Earth observation spacecraft ever built with 10 instruments aboard and at eight tonnes was the largest civilian Earth observation mission ever launched. More advanced imaging radar, radar altimeter and temperature-measuring radiometer instruments extended ERS data sets. This was supplemented by new instruments including a medium-resolution spectrometer sensitive to both land features and ocean colour. Envisat also carried two atmospheric sensors monitoring trace gases. The Envisat mission ended on 8 April 2012, following the unexpected loss of contact with the satellite."@en ;
dc:source <https://earth.esa.int/eogateway/missions/envisat> ;
rdfs:seeAlso <https://www.wmo-sat.info/oscar/satellites/view/envisat> ;
skos:exactMatch <https://gcmd.earthdata.nasa.gov/kms/concept/a1498dff-002d-4d67-9091-16822c608221> .

<https://vocab.met.no/mmd/Instrument>
a skos:Collection, <http://purl.org/iso25964/skos-thes#ConceptGroup> ;
skos:inScheme <https://vocab.met.no/mmd>;
skos:prefLabel "Instrument"@en ;
skos:definition "TBW"@en ;
skos:changeNote "2022-07-20, Added Concept AVHRR and SSM/I in collection"@en ;
skos:member <https://vocab.met.no/mmd/Instrument/SAR-C>, <https://vocab.met.no/mmd/Instrument/MSI>, <https://vocab.met.no/mmd/Instrument/OLCI>, <https://vocab.met.no/mmd/Instrument/SLSTR>, <https://vocab.met.no/mmd/Instrument/MWR>, <https://vocab.met.no/mmd/Instrument/VIIRS>, <https://vocab.met.no/mmd/Instrument/SSM_I>, <https://vocab.met.no/mmd/Instrument/AVHRR>, <https://vocab.met.no/mmd/Instrument/AVHRR_3>, <https://vocab.met.no/mmd/Instrument/MERSI-2>, <https://vocab.met.no/mmd/Instrument/MODIS>, <https://vocab.met.no/mmd/Instrument/AMSR2> .
skos:changeNote "2024-07-22, Added Concept ASAR in collection"@en ;
skos:member <https://vocab.met.no/mmd/Instrument/SAR-C>, <https://vocab.met.no/mmd/Instrument/MSI>, <https://vocab.met.no/mmd/Instrument/OLCI>, <https://vocab.met.no/mmd/Instrument/SLSTR>, <https://vocab.met.no/mmd/Instrument/MWR>, <https://vocab.met.no/mmd/Instrument/VIIRS>, <https://vocab.met.no/mmd/Instrument/SSM_I>, <https://vocab.met.no/mmd/Instrument/AVHRR>, <https://vocab.met.no/mmd/Instrument/AVHRR_3>, <https://vocab.met.no/mmd/Instrument/MERSI-2>, <https://vocab.met.no/mmd/Instrument/MODIS>, <https://vocab.met.no/mmd/Instrument/AMSR2>, <https://vocab.met.no/mmd/Instrument/ASAR> .

<https://vocab.met.no/mmd/Instrument/SAR-C>
a skos:Concept, sosa:Sensor ;
Expand Down Expand Up @@ -1032,6 +1045,17 @@
rdfs:seeAlso <https://www.wmo-sat.info/oscar/instruments/view/amsr2> ;
skos:exactMatch <https://gcmd.earthdata.nasa.gov/kms/concept/92d834e1-689c-4d12-8c4a-74ee4cf75b36> .

<https://vocab.met.no/mmd/Instrument/ASAR>
a skos:Concept, sosa:Sensor ;
skos:prefLabel "ASAR"@en ;
skos:altLabel "Advanced Synthetic Aperature Radar"@en ;
sosa:isHostedBy <https://vocab.met.no/mmd/Platform/Envisat> ;
skos:broader <https://vocab.met.no/mmd/Platform/Envisat> ;
skos:definition "The Advanced Synthetic Aperture Radar (ASAR) instrument was an active radar sensor on-board the Envisat satellite, which was operational from March 2002 until the unexpected loss of contact in April 2012. ASAR built upon the Active Microwave Instrument (AMI) carried aboard the ERS satellites."@en ;
dc:source <https://earth.esa.int/eogateway/instruments/asar> ;
rdfs:seeAlso <https://www.wmo-sat.info/oscar/instruments/view/asar> ;
skos:exactMatch <https://gcmd.earthdata.nasa.gov/kms/concept/912c3308-23bc-4e12-b7fb-9d82e9fc5fe9> .


<https://vocab.met.no/mmd/Operational_Status>
a skos:Collection, isothes:ConceptGroup ;
Expand Down
30 changes: 29 additions & 1 deletion thesauri/mmd-vocabulary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,8 @@
<rdf:type rdf:resource="http://purl.org/iso25964/skos-thes#ConceptGroup"/>
<skos:inScheme rdf:resource="https://vocab.met.no/mmd"/>
<skos:prefLabel xml:lang="en">Platform</skos:prefLabel>
<skos:changeNote xml:lang="en">Added NOAA-21 in collection</skos:changeNote>
<skos:changeNote xml:lang="en">2023-10-10, Added NOAA-21 in collection</skos:changeNote>
<skos:changeNote xml:lang="en">2024-07-22, Added Envisat collection</skos:changeNote>
<skos:exactMatch rdf:resource="https://gcmd.earthdata.nasa.gov/kms/concepts/concept_scheme/platforms"/>
<skos:definition xml:lang="en">This describes the platform used to collect the data.</skos:definition>
<skos:member rdf:resource="https://vocab.met.no/mmd/Platform/Sentinel-1A"/>
Expand All @@ -947,6 +948,7 @@
<skos:member rdf:resource="https://vocab.met.no/mmd/Platform/Terra"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Platform/FY-3D"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Platform/GCOM-W1"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Platform/Envisat"/>
<skos:member>
<skos:Concept rdf:about="https://vocab.met.no/mmd/Platform/FY-3E">
<rdf:type rdf:resource="http://www.w3.org/ns/sosa/Platform"/>
Expand Down Expand Up @@ -1183,12 +1185,25 @@
<skos:exactMatch rdf:resource="https://gcmd.earthdata.nasa.gov/kms/concept/8781da14-5ced-4d64-81cd-8daa10a1c30d"/>
</skos:Concept>

<skos:Concept rdf:about="https://vocab.met.no/mmd/Platform/Envisat">
<rdf:type rdf:resource="http://www.w3.org/ns/sosa/Platform"/>
<skos:prefLabel xml:lang="en">Envisat</skos:prefLabel>
<skos:altLabel xml:lang="en">Environmental Satellite</skos:altLabel>
<sosa:hosts rdf:resource="https://vocab.met.no/mmd/Instrument/ASAR"/>
<skos:narrower rdf:resource="https://vocab.met.no/mmd/Instrument/ASAR"/>
<skos:definition xml:lang="en">Envisat was ESA's successor to ERS. Launched on 1 March 2002 on an Ariane-5 rocket from Europe's spaceport in French Guiana, Envisat was the largest Earth observation spacecraft ever built with 10 instruments aboard and at eight tonnes was the largest civilian Earth observation mission ever launched. More advanced imaging radar, radar altimeter and temperature-measuring radiometer instruments extended ERS data sets. This was supplemented by new instruments including a medium-resolution spectrometer sensitive to both land features and ocean colour. Envisat also carried two atmospheric sensors monitoring trace gases. The Envisat mission ended on 8 April 2012, following the unexpected loss of contact with the satellite.</skos:definition>
<dc:source rdf:resource="https://earth.esa.int/eogateway/missions/envisat"/>
<rdfs:seeAlso rdf:resource="https://www.wmo-sat.info/oscar/satellites/view/envisat"/>
<skos:exactMatch rdf:resource="https://gcmd.earthdata.nasa.gov/kms/concept/a1498dff-002d-4d67-9091-16822c608221"/>
</skos:Concept>

<skos:Collection rdf:about="https://vocab.met.no/mmd/Instrument">
<rdf:type rdf:resource="http://purl.org/iso25964/skos-thes#ConceptGroup"/>
<skos:inScheme rdf:resource="https://vocab.met.no/mmd"/>
<skos:prefLabel xml:lang="en">Instrument</skos:prefLabel>
<skos:definition xml:lang="en">TBW</skos:definition>
<skos:changeNote xml:lang="en">2022-07-20, Added Concept AVHRR and SSM/I in collection</skos:changeNote>
<skos:changeNote xml:lang="en">2024-07-22, Added Concept ASAR in collection</skos:changeNote>
<skos:member rdf:resource="https://vocab.met.no/mmd/Instrument/SAR-C"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Instrument/MSI"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Instrument/OLCI"/>
Expand All @@ -1201,6 +1216,7 @@
<skos:member rdf:resource="https://vocab.met.no/mmd/Instrument/MERSI-2"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Instrument/MODIS"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Instrument/AMSR2"/>
<skos:member rdf:resource="https://vocab.met.no/mmd/Instrument/ASAR"/>
</skos:Collection>

<skos:Concept rdf:about="https://vocab.met.no/mmd/Instrument/SAR-C">
Expand Down Expand Up @@ -1367,6 +1383,18 @@
<skos:exactMatch rdf:resource="https://gcmd.earthdata.nasa.gov/kms/concept/92d834e1-689c-4d12-8c4a-74ee4cf75b36"/>
</skos:Concept>

<skos:Concept rdf:about="https://vocab.met.no/mmd/Instrument/ASAR">
<rdf:type rdf:resource="http://www.w3.org/ns/sosa/Sensor"/>
<skos:prefLabel xml:lang="en">ASAR</skos:prefLabel>
<skos:altLabel xml:lang="en">Advanced Synthetic Aperature Radar</skos:altLabel>
<sosa:isHostedBy rdf:resource="https://vocab.met.no/mmd/Platform/Envisat"/>
<skos:broader rdf:resource="https://vocab.met.no/mmd/Platform/Envisat"/>
<skos:definition xml:lang="en">The Advanced Synthetic Aperture Radar (ASAR) instrument was an active radar sensor on-board the Envisat satellite, which was operational from March 2002 until the unexpected loss of contact in April 2012. ASAR built upon the Active Microwave Instrument (AMI) carried aboard the ERS satellites.</skos:definition>
<dc:source rdf:resource="https://earth.esa.int/eogateway/instruments/asar"/>
<rdfs:seeAlso rdf:resource="https://www.wmo-sat.info/oscar/instruments/view/asar"/>
<skos:exactMatch rdf:resource="https://gcmd.earthdata.nasa.gov/kms/concept/912c3308-23bc-4e12-b7fb-9d82e9fc5fe9"/>
</skos:Concept>

<skos:Collection rdf:about="https://vocab.met.no/mmd/Operational_Status">
<rdf:type rdf:resource="http://purl.org/iso25964/skos-thes#ConceptGroup"/>
<skos:inScheme rdf:resource="https://vocab.met.no/mmd"/>
Expand Down

0 comments on commit 4708f44

Please sign in to comment.