From f976018cf5b03638d37ecf95e1b30477bd735f24 Mon Sep 17 00:00:00 2001 From: Daniel Riehm Date: Fri, 28 Oct 2022 15:50:48 -0400 Subject: [PATCH] Remove vital weather metadata --- arrows/klv/klv_convert_vital.cxx | 14 --------- .../kwiver/vital/tests/test_metadata_tags.py | 9 ------ vital/types/metadata_tags.h | 9 ------ vital/types/metadata_traits.cxx | 31 ------------------- vital/types/metadata_traits.h | 9 ------ 5 files changed, 72 deletions(-) diff --git a/arrows/klv/klv_convert_vital.cxx b/arrows/klv/klv_convert_vital.cxx index d7abf41f64..fbedc69547 100644 --- a/arrows/klv/klv_convert_vital.cxx +++ b/arrows/klv/klv_convert_vital.cxx @@ -363,14 +363,10 @@ klv_0601_to_vital_metadata( klv_timeline const& klv_data, uint64_t timestamp, kv::VITAL_META_TARGET_WIDTH }, { KLV_0601_TARGET_WIDTH_EXTENDED, kv::VITAL_META_TARGET_WIDTH }, - { KLV_0601_STATIC_PRESSURE, - kv::VITAL_META_STATIC_PRESSURE }, { KLV_0601_DENSITY_ALTITUDE, kv::VITAL_META_DENSITY_ALTITUDE }, { KLV_0601_DENSITY_ALTITUDE_EXTENDED, kv::VITAL_META_DENSITY_ALTITUDE }, - { KLV_0601_OUTSIDE_AIR_TEMPERATURE, - kv::VITAL_META_OUTSIDE_AIR_TEMPERATURE }, { KLV_0601_TARGET_TRACK_GATE_WIDTH, kv::VITAL_META_TARGET_TRK_GATE_WIDTH }, { KLV_0601_TARGET_TRACK_GATE_HEIGHT, @@ -379,20 +375,10 @@ klv_0601_to_vital_metadata( klv_timeline const& klv_data, uint64_t timestamp, kv::VITAL_META_TARGET_ERROR_EST_CE90 }, { KLV_0601_TARGET_ERROR_ESTIMATE_LE90, kv::VITAL_META_TARGET_ERROR_EST_LE90 }, - { KLV_0601_DIFFERENTIAL_PRESSURE, - kv::VITAL_META_DIFFERENTIAL_PRESSURE }, - { KLV_0601_PLATFORM_ANGLE_OF_ATTACK, - kv::VITAL_META_PLATFORM_ANG_OF_ATTACK }, { KLV_0601_PLATFORM_VERTICAL_SPEED, kv::VITAL_META_PLATFORM_VERTICAL_SPEED }, - { KLV_0601_PLATFORM_SIDESLIP_ANGLE, - kv::VITAL_META_PLATFORM_SIDESLIP_ANGLE }, - { KLV_0601_AIRFIELD_BAROMETRIC_PRESSURE, - kv::VITAL_META_AIRFIELD_BAROMET_PRESS }, { KLV_0601_AIRFIELD_ELEVATION, kv::VITAL_META_AIRFIELD_ELEVATION }, - { KLV_0601_RELATIVE_HUMIDITY, - kv::VITAL_META_RELATIVE_HUMIDITY }, { KLV_0601_PLATFORM_GROUND_SPEED, kv::VITAL_META_PLATFORM_GROUND_SPEED }, { KLV_0601_GROUND_RANGE, diff --git a/python/kwiver/vital/tests/test_metadata_tags.py b/python/kwiver/vital/tests/test_metadata_tags.py index d926fa97d6..cd67bf8857 100644 --- a/python/kwiver/vital/tests/test_metadata_tags.py +++ b/python/kwiver/vital/tests/test_metadata_tags.py @@ -87,23 +87,14 @@ def setUp(self): mt.tags.VITAL_META_TARGET_WIDTH, mt.tags.VITAL_META_FRAME_CENTER, mt.tags.VITAL_META_CORNER_POINTS, - mt.tags.VITAL_META_WIND_DIRECTION, - mt.tags.VITAL_META_WIND_SPEED, - mt.tags.VITAL_META_STATIC_PRESSURE, mt.tags.VITAL_META_DENSITY_ALTITUDE, - mt.tags.VITAL_META_OUTSIDE_AIR_TEMPERATURE, mt.tags.VITAL_META_TARGET_LOCATION, mt.tags.VITAL_META_TARGET_TRK_GATE_WIDTH, mt.tags.VITAL_META_TARGET_TRK_GATE_HEIGHT, mt.tags.VITAL_META_TARGET_ERROR_EST_CE90, mt.tags.VITAL_META_TARGET_ERROR_EST_LE90, - mt.tags.VITAL_META_DIFFERENTIAL_PRESSURE, - mt.tags.VITAL_META_PLATFORM_ANG_OF_ATTACK, mt.tags.VITAL_META_PLATFORM_VERTICAL_SPEED, - mt.tags.VITAL_META_PLATFORM_SIDESLIP_ANGLE, - mt.tags.VITAL_META_AIRFIELD_BAROMET_PRESS, mt.tags.VITAL_META_AIRFIELD_ELEVATION, - mt.tags.VITAL_META_RELATIVE_HUMIDITY, mt.tags.VITAL_META_PLATFORM_GROUND_SPEED, mt.tags.VITAL_META_GROUND_RANGE, mt.tags.VITAL_META_PLATFORM_FUEL_REMAINING, diff --git a/vital/types/metadata_tags.h b/vital/types/metadata_tags.h index 8210b47b15..c812585507 100644 --- a/vital/types/metadata_tags.h +++ b/vital/types/metadata_tags.h @@ -56,23 +56,14 @@ enum vital_metadata_tag { VITAL_META_TARGET_WIDTH, VITAL_META_FRAME_CENTER, VITAL_META_CORNER_POINTS, - VITAL_META_WIND_DIRECTION, - VITAL_META_WIND_SPEED, - VITAL_META_STATIC_PRESSURE, VITAL_META_DENSITY_ALTITUDE, - VITAL_META_OUTSIDE_AIR_TEMPERATURE, VITAL_META_TARGET_LOCATION, VITAL_META_TARGET_TRK_GATE_WIDTH, VITAL_META_TARGET_TRK_GATE_HEIGHT, VITAL_META_TARGET_ERROR_EST_CE90, VITAL_META_TARGET_ERROR_EST_LE90, - VITAL_META_DIFFERENTIAL_PRESSURE, - VITAL_META_PLATFORM_ANG_OF_ATTACK, VITAL_META_PLATFORM_VERTICAL_SPEED, - VITAL_META_PLATFORM_SIDESLIP_ANGLE, - VITAL_META_AIRFIELD_BAROMET_PRESS, VITAL_META_AIRFIELD_ELEVATION, - VITAL_META_RELATIVE_HUMIDITY, VITAL_META_PLATFORM_GROUND_SPEED, VITAL_META_GROUND_RANGE, VITAL_META_PLATFORM_FUEL_REMAINING, diff --git a/vital/types/metadata_traits.cxx b/vital/types/metadata_traits.cxx index b4afd2b44d..c9863a6845 100644 --- a/vital/types/metadata_traits.cxx +++ b/vital/types/metadata_traits.cxx @@ -174,24 +174,11 @@ VITAL_META_##X, #X, typeid( type_of_tag< VITAL_META_##X > ) "Corner Points (lon/lat)", "Four sided polygon representing the image bounds. The corners are " "ordered: upper left, upper right, lower right, lower left." }, - { TRAITS_OF( WIND_DIRECTION ), - "Wind Direction (degrees)", - "Wind direction at aircraft location. This is the direction the wind is " - "coming from relative to true north." }, - { TRAITS_OF( WIND_SPEED ), - "Wind Speed (meters/second)", - "Wind speed at aircraft location." }, - { TRAITS_OF( STATIC_PRESSURE ), - "Static Pressure (millibar)", - "Static pressure at aircraft location." }, { TRAITS_OF( DENSITY_ALTITUDE ), "Density Altitude (meters)", "Density altitude at aircraft location. Relative aircraft performance " "metric based on outside air temperature, static pressure, and " "humidity." }, - { TRAITS_OF( OUTSIDE_AIR_TEMPERATURE ), - "Outside Air Temperature (Celsius)", - "Temperature outside aircraft." }, { TRAITS_OF( TARGET_LOCATION ), "Target Geodetic Location (lon/lat/alt)", "Three-dimensional coordinates of the target: longitude, latitude, and " @@ -212,31 +199,13 @@ VITAL_META_##X, #X, typeid( type_of_tag< VITAL_META_##X > ) "Lateral Error 90 (LE90) is the estimated error distance in the " "vertical (or lateral) direction. Specifies the interval of 90% " "probability in the local vertical direction." }, - { TRAITS_OF( DIFFERENTIAL_PRESSURE ), - "Differential Pressure (millibar)", - "Differential pressure at aircraft location. Measured as the stagnation/" - "impact/total pressure minus static pressure." }, - { TRAITS_OF( PLATFORM_ANG_OF_ATTACK ), - "Platform Angle of Attack (deg)", - "Angle between platform longitudinal axis and relative wind. Positive " - "angles for upward relative wind." }, { TRAITS_OF( PLATFORM_VERTICAL_SPEED ), "Platform Vertical Speed (meters/sec)", "Vertical speed of the aircraft relative to zenith. Positive ascending, " "negative descending." }, - { TRAITS_OF( PLATFORM_SIDESLIP_ANGLE ), - "Platform Sideslip Angle (degrees)", - "The sideslip angle is the angle between the platform longitudinal axis " - "and relative wind. Positive angles to right wing, negative to left." }, - { TRAITS_OF( AIRFIELD_BAROMET_PRESS ), - "Airfield Barometric Pressure (millibars)", - "Local pressure at airfield of known height." }, { TRAITS_OF( AIRFIELD_ELEVATION ), "Airfield Elevation (meters)", "Elevation of airfield corresponding to Airfield Barometric Pressure." }, - { TRAITS_OF( RELATIVE_HUMIDITY ), - "Relative Humidity (percent)", - "Relative humidity at aircraft location." }, { TRAITS_OF( PLATFORM_GROUND_SPEED ), "Platform Ground Speed (meters/second)", "Speed projected to the ground of an airborne platform passing " diff --git a/vital/types/metadata_traits.h b/vital/types/metadata_traits.h index 898da44195..5581796e7b 100644 --- a/vital/types/metadata_traits.h +++ b/vital/types/metadata_traits.h @@ -70,23 +70,14 @@ TAG_TYPE( VITAL_META_SLANT_RANGE, double ); TAG_TYPE( VITAL_META_TARGET_WIDTH, double ); TAG_TYPE( VITAL_META_FRAME_CENTER, geo_point ); TAG_TYPE( VITAL_META_CORNER_POINTS, geo_polygon ); -TAG_TYPE( VITAL_META_WIND_DIRECTION, double ); -TAG_TYPE( VITAL_META_WIND_SPEED, double ); -TAG_TYPE( VITAL_META_STATIC_PRESSURE, double ); TAG_TYPE( VITAL_META_DENSITY_ALTITUDE, double ); -TAG_TYPE( VITAL_META_OUTSIDE_AIR_TEMPERATURE, double ); TAG_TYPE( VITAL_META_TARGET_LOCATION, geo_point ); TAG_TYPE( VITAL_META_TARGET_TRK_GATE_WIDTH, double ); TAG_TYPE( VITAL_META_TARGET_TRK_GATE_HEIGHT, double ); TAG_TYPE( VITAL_META_TARGET_ERROR_EST_CE90, double ); TAG_TYPE( VITAL_META_TARGET_ERROR_EST_LE90, double ); -TAG_TYPE( VITAL_META_DIFFERENTIAL_PRESSURE, double ); -TAG_TYPE( VITAL_META_PLATFORM_ANG_OF_ATTACK, double ); TAG_TYPE( VITAL_META_PLATFORM_VERTICAL_SPEED, double ); -TAG_TYPE( VITAL_META_PLATFORM_SIDESLIP_ANGLE, double ); -TAG_TYPE( VITAL_META_AIRFIELD_BAROMET_PRESS, double ); TAG_TYPE( VITAL_META_AIRFIELD_ELEVATION, double ); -TAG_TYPE( VITAL_META_RELATIVE_HUMIDITY, double ); TAG_TYPE( VITAL_META_PLATFORM_GROUND_SPEED, double ); TAG_TYPE( VITAL_META_GROUND_RANGE, double ); TAG_TYPE( VITAL_META_PLATFORM_FUEL_REMAINING, double );