Merge pull request #43 from ecmwf-projects/GNSS-fixes

GNSS fixes according to drive table
ecmwf-projects · Oct 18, 2024 · a1f3a00 · a1f3a00
2 parents 044f2ef + 0510258
commit a1f3a00
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 70 deletions.
diff --git a/cdsobs/data/insitu-observations-gnss/service_definition.yml b/cdsobs/data/insitu-observations-gnss/service_definition.yml
@@ -16,38 +16,26 @@ sources:
             name: precipitable_water_column_total_uncertainty
             units: kg m-2
       rename:
-        agency: organisation_name
         amsl_m: height_of_station_above_sea_level
         city: city
-        country: country
         date_of_observation: report_timestamp
         date_since: start_date
         epn_ipw: precipitable_water_column
         era_ipw: precipitable_water_column_era5
-        height_from_ellipsoid_m: sensor_altitude
         idstation: primary_station_id
         ipw_epn_data_header_id: report_id
         lat: latitude|station_configuration
         lon: longitude|station_configuration
-        network: network
+        network: observing_programme
         observation_id: observation_id
         sigma_ztd: zenith_total_delay_random_uncertainty
         uncert_epn_ipw: precipitable_water_column_total_uncertainty
         ztd: zenith_total_delay
-      unit_changes:
-        precipitable_water_column:
-          names:
-            kg m-2: kg m-2
-          offset: 0
-          scale: 1
     data_table: ipw_epn_repro2_data_value
     descriptions:
       city:
         description: This parameter is the name of the location of the GNSS receiver. This name is provided by the SEMISYS database (see Citation).
         dtype: object
-      country:
-        description: Country hosting the station name.
-        dtype: object
       height_of_station_above_sea_level:
         description: This parameter is the altitude of the GNSS receiving station above the mean sea-level.
         dtype: float32
@@ -60,15 +48,12 @@ sources:
         description: This parameter is the longitude of the GNSS receiving station.
         dtype: float32
         units: degree_east
-      network:
+      observing_programme:
         description: Subnetwork name the site belongs to.
         dtype: object
       observation_id:
         description: unique ID for observation
         dtype: object
-      organisation_name:
-        description: This parameter indicates the agency responsible for the station.
-        dtype: object
       precipitable_water_column:
         description: This parameter is the total amount of water vapour in a column extending vertically from the GNSS receiver position (near the surface) to the top of the atmosphere.
         dtype: float32
@@ -86,24 +71,28 @@ sources:
       report_timestamp:
         description: This parameter is the date and time (UTC) associated with the observation.
         dtype: datetime64[ns]
-      sensor_altitude:
-        description: This parameter is the difference between the GNSS antenna height and the World Geodetic System (WGS)-84 ellipsoid. The WGS-84 is a static reference, maintained by the United States National Geospatial-Intelligence Agency. It is also the reference coordinate system used by the GPS.
-        dtype: float32
-        units: m
       start_date:
         description: This parameter is the first date and time of data available at the GNSS station.
         dtype: datetime64[ns]
       zenith_total_delay:
         description: This parameter characterizes the delay of the GNSS signal on the path from a satellite to the receiver due to atmospheric refraction and bending, mapped into the zenith direction. It is expressed as an equivalent distance travelled additionally by the radio waves, due to the atmosphere. The numerical value of zenith total delay correlates with the amount of total column water vapour (i.e., not including effects of liquid water and/or ice) above the GNSS receiver antenna. It is hence used to estimate the total column water vapour.
         dtype: float32
         units: m
+      uncertainty_valueN:
+        description: "Uncertainty value N. Available uncertainty types are: 1 (random) and 5  (total)"
+        dtype: float32
+        units: Defined in uncertainty_unitsN
+      uncertainty_typeN:
+        description: Uncertainty type N
+        dtype: uint8
+      uncertainty_unitsN:
+        description: Units for uncertainty type N.
+        dtype: object
     header_columns:
     - primary_station_id
     - city
-    - organisation_name
     - latitude|station_configuration
     - longitude|station_configuration
-    - sensor_altitude
     - height_of_station_above_sea_level
     - start_date
     header_table: ipw_epn_repro2_data_header
@@ -118,8 +107,6 @@ sources:
     - observation_id
     - primary_station_id
     - city
-    - organisation_name
-    - sensor_altitude
     - height_of_station_above_sea_level
     - start_date
     - report_timestamp
@@ -141,20 +128,17 @@ sources:
             name: precipitable_water_column_total_uncertainty
             units: kg m-2
       rename:
-        agency: organisation_name
         amsl_m: height_of_station_above_sea_level
         city: city
-        country: country
         date_of_observation: report_timestamp
         date_since: start_date
         era_ipw: precipitable_water_column_era5
         gnss_ipw: precipitable_water_column
-        height_from_ellipsoid_m: sensor_altitude
         idstation: primary_station_id
         ipw_gnss_data_header_id: report_id
         lat: latitude|station_configuration
         lon: longitude|station_configuration
-        network: network
+        network: observing_programme
         observation_id: observation_id
         sigma_ztd: zenith_total_delay_random_uncertainty
         uncert_gnss_ipw: precipitable_water_column_total_uncertainty
@@ -170,9 +154,6 @@ sources:
       city:
         description: This parameter is the name of the location of the GNSS receiver. This name is provided by the SEMISYS database (see Citation).
         dtype: object
-      country:
-        description: Country hosting the station name.
-        dtype: object
       height_of_station_above_sea_level:
         description: This parameter is the altitude of the GNSS receiving station above the mean sea-level.
         dtype: float32
@@ -185,15 +166,12 @@ sources:
         description: This parameter is the longitude of the GNSS receiving station.
         dtype: float32
         units: degree_east
-      network:
+      observing_programme:
         description: Subnetwork name the site belongs to.
         dtype: object
       observation_id:
         description: unique ID for observation
         dtype: object
-      organisation_name:
-        description: This parameter indicates the agency responsible for the station.
-        dtype: object
       precipitable_water_column:
         description: This parameter is the total amount of water vapour in a column extending vertically from the GNSS receiver position (near the surface) to the top of the atmosphere.
         dtype: float32
@@ -211,24 +189,28 @@ sources:
       report_timestamp:
         description: This parameter is the date and time (UTC) associated with the observation.
         dtype: datetime64[ns]
-      sensor_altitude:
-        description: This parameter is the difference between the GNSS antenna height and the World Geodetic System (WGS)-84 ellipsoid. The WGS-84 is a static reference, maintained by the United States National Geospatial-Intelligence Agency. It is also the reference coordinate system used by the GPS.
-        dtype: float32
-        units: m
       start_date:
         description: This parameter is the first date and time of data available at the GNSS station.
         dtype: datetime64[ns]
       zenith_total_delay:
         description: This parameter characterizes the delay of the GNSS signal on the path from a satellite to the receiver due to atmospheric refraction and bending, mapped into the zenith direction. It is expressed as an equivalent distance travelled additionally by the radio waves, due to the atmosphere. The numerical value of zenith total delay correlates with the amount of total column water vapour (i.e., not including effects of liquid water and/or ice) above the GNSS receiver antenna. It is hence used to estimate the total column water vapour.
         dtype: float32
         units: m
+      uncertainty_valueN:
+        description: "Uncertainty value N. Available uncertainty types are: 1 (random) and 5  (total)"
+        dtype: float32
+        units: Defined in uncertainty_unitsN
+      uncertainty_typeN:
+        description: Uncertainty type N
+        dtype: uint8
+      uncertainty_unitsN:
+        description: Units for uncertainty type N.
+        dtype: object
     header_columns:
     - primary_station_id
     - city
-    - organisation_name
     - latitude|station_configuration
     - longitude|station_configuration
-    - sensor_altitude
     - height_of_station_above_sea_level
     - start_date
     header_table: ipw_gnss_data_header
@@ -243,8 +225,6 @@ sources:
     - observation_id
     - primary_station_id
     - city
-    - organisation_name
-    - sensor_altitude
     - height_of_station_above_sea_level
     - start_date
     - report_timestamp
@@ -266,38 +246,26 @@ sources:
             name: precipitable_water_column_total_uncertainty
             units: kg m-2
       rename:
-        agency: organisation_name
         amsl_m: height_of_station_above_sea_level
         city: city
-        country: country
         date_of_observation: report_timestamp
         date_since: start_date
         era_ipw: precipitable_water_column_era5
         gnss_ipw: precipitable_water_column
-        height_from_ellipsoid_m: sensor_altitude
         idstation: primary_station_id
         ipw_gnss_data_header_id: report_id
         lat: latitude|station_configuration
         lon: longitude|station_configuration
-        network: network
+        network: observing_programme
         observation_id: observation_id
         sigma_ztd: zenith_total_delay_random_uncertainty
         uncert_gnss_ipw: precipitable_water_column_total_uncertainty
         ztd: zenith_total_delay
-      unit_changes:
-        precipitable_water_column:
-          names:
-            kg m-2: kg m-2
-          offset: 0
-          scale: 1
     data_table: ipw_igs_repro3_data_value
     descriptions:
       city:
         description: This parameter is the name of the location of the GNSS receiver. This name is provided by the SEMISYS database (see Citation).
         dtype: object
-      country:
-        description: Country hosting the station name.
-        dtype: object
       height_of_station_above_sea_level:
         description: This parameter is the altitude of the GNSS receiving station above the mean sea-level.
         dtype: float32
@@ -310,15 +278,12 @@ sources:
         description: This parameter is the longitude of the GNSS receiving station.
         dtype: float32
         units: degree_east
-      network:
+      observing_programme:
         description: Subnetwork name the site belongs to.
         dtype: object
       observation_id:
         description: unique ID for observation
         dtype: object
-      organisation_name:
-        description: This parameter indicates the agency responsible for the station.
-        dtype: object
       precipitable_water_column:
         description: This parameter is the total amount of water vapour in a column extending vertically from the GNSS receiver position (near the surface) to the top of the atmosphere.
         dtype: float32
@@ -336,24 +301,28 @@ sources:
       report_timestamp:
         description: This parameter is the date and time (UTC) associated with the observation.
         dtype: datetime64[ns]
-      sensor_altitude:
-        description: This parameter is the difference between the GNSS antenna height and the World Geodetic System (WGS)-84 ellipsoid. The WGS-84 is a static reference, maintained by the United States National Geospatial-Intelligence Agency. It is also the reference coordinate system used by the GPS.
-        dtype: float32
-        units: m
       start_date:
         description: This parameter is the first date and time of data available at the GNSS station.
         dtype: datetime64[ns]
       zenith_total_delay:
         description: This parameter characterizes the delay of the GNSS signal on the path from a satellite to the receiver due to atmospheric refraction and bending, mapped into the zenith direction. It is expressed as an equivalent distance travelled additionally by the radio waves, due to the atmosphere. The numerical value of zenith total delay correlates with the amount of total column water vapour (i.e., not including effects of liquid water and/or ice) above the GNSS receiver antenna. It is hence used to estimate the total column water vapour.
         dtype: float32
         units: m
+      uncertainty_valueN:
+        description: "Uncertainty value N. Available uncertainty types are: 1 (random) and 5  (total)"
+        dtype: float32
+        units: Defined in uncertainty_unitsN
+      uncertainty_typeN:
+        description: Uncertainty type N
+        dtype: uint8
+      uncertainty_unitsN:
+        description: Units for uncertainty type N.
+        dtype: object
     header_columns:
     - primary_station_id
     - city
-    - organisation_name
     - latitude|station_configuration
     - longitude|station_configuration
-    - sensor_altitude
     - height_of_station_above_sea_level
     - start_date
     header_table: ipw_igs_repro3_data_header
@@ -368,8 +337,6 @@ sources:
     - observation_id
     - primary_station_id
     - city
-    - organisation_name
-    - sensor_altitude
     - height_of_station_above_sea_level
     - start_date
     - report_timestamp

diff --git a/cdsobs/forms_jsons.py b/cdsobs/forms_jsons.py
@@ -119,7 +119,7 @@ def get_widgets_json(session, output_path: Path, dataset: str) -> Path:
     ]
     summary = stats_summary(catalogue_entries)
     widgets_json_content = dict()
-    widgets_json_content["variables"] = variables
+    widgets_json_content["variables"] = sorted(set(variables))
     time_coverage_start, time_coverage_end = summary["total time coverage"]
     start_year = int(time_coverage_start[0:4])
     end_year = int(time_coverage_end[0:4])