diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 51ec8cf..f0a1523 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -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 diff --git a/.github/workflows/make-doc.yml b/.github/workflows/make-doc.yml index b6b76f6..ef9b979 100644 --- a/.github/workflows/make-doc.yml +++ b/.github/workflows/make-doc.yml @@ -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: | diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 405377e..ded937c 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -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 diff --git a/doc/ch04-md-contrvocabs.adoc b/doc/ch04-md-contrvocabs.adoc index f3c9bc0..faf284c 100644 --- a/doc/ch04-md-contrvocabs.adoc +++ b/doc/ch04-md-contrvocabs.adoc @@ -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 |============================================================================ <> @@ -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 |=============================================================================================================== <> diff --git a/thesauri/mmd-vocabulary.ttl b/thesauri/mmd-vocabulary.ttl index ad30257..43653d9 100644 --- a/thesauri/mmd-vocabulary.ttl +++ b/thesauri/mmd-vocabulary.ttl @@ -692,10 +692,11 @@ a skos:Collection, isothes:ConceptGroup ; skos:inScheme ; 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 ; skos:definition "This describes the platform used to collect the data."@en ; - skos:member , , , , , , , , , , , , , , , , , , . + skos:member , , , , , , , , , , , , , , , , , , , . a skos:Concept, sosa:Platform ; @@ -900,13 +901,25 @@ rdfs:seeAlso ; skos:exactMatch . + + a skos:Concept, sosa:Platform ; + skos:prefLabel "Envisat"@en ; + skos:altLabel "Environmental Satellite"@en ; + sosa:hosts ; + skos:narrower ; + 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 ; + rdfs:seeAlso ; + skos:exactMatch . + a skos:Collection, ; skos:inScheme ; skos:prefLabel "Instrument"@en ; skos:definition "TBW"@en ; skos:changeNote "2022-07-20, Added Concept AVHRR and SSM/I in collection"@en ; - skos:member , , , , , , , , , , , . + skos:changeNote "2024-07-22, Added Concept ASAR in collection"@en ; + skos:member , , , , , , , , , , , , . a skos:Concept, sosa:Sensor ; @@ -1032,6 +1045,17 @@ rdfs:seeAlso ; skos:exactMatch . + + a skos:Concept, sosa:Sensor ; + skos:prefLabel "ASAR"@en ; + skos:altLabel "Advanced Synthetic Aperature Radar"@en ; + sosa:isHostedBy ; + skos:broader ; + 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 ; + rdfs:seeAlso ; + skos:exactMatch . + a skos:Collection, isothes:ConceptGroup ; diff --git a/thesauri/mmd-vocabulary.xml b/thesauri/mmd-vocabulary.xml index 64a14ab..db6d730 100644 --- a/thesauri/mmd-vocabulary.xml +++ b/thesauri/mmd-vocabulary.xml @@ -926,7 +926,8 @@ Platform - Added NOAA-21 in collection + 2023-10-10, Added NOAA-21 in collection + 2024-07-22, Added Envisat collection This describes the platform used to collect the data. @@ -947,6 +948,7 @@ + @@ -1183,12 +1185,25 @@ + + + Envisat + Environmental Satellite + + + 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. + + + + + Instrument TBW 2022-07-20, Added Concept AVHRR and SSM/I in collection + 2024-07-22, Added Concept ASAR in collection @@ -1201,6 +1216,7 @@ + @@ -1367,6 +1383,18 @@ + + + ASAR + Advanced Synthetic Aperature Radar + + + 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. + + + + +