diff --git a/geo_lookup/geo_magnetic_tables.hpp b/geo_lookup/geo_magnetic_tables.hpp index e679c6c769..7e178eda59 100644 --- a/geo_lookup/geo_magnetic_tables.hpp +++ b/geo_lookup/geo_magnetic_tables.hpp @@ -46,7 +46,7 @@ static constexpr int LON_DIM = 37; // Magnetic declination data in degrees // Model: WMM-2020, // Version: 0.5.1.11, -// Date: 2020.4563, +// Date: 2020.4755, static constexpr const int8_t declination_table[17][37] { { 127, 117, 106, 96, 87, 78, 69, 61, 53, 46, 38, 30, 23, 15, 8, 0, -7, -15, -23, -31, -40, -49, -58, -67, -77, -86, -97,-107,-119,-128,-128,-128,-128, 127, 127, 127, 127, }, { 86, 78, 71, 66, 61, 56, 51, 46, 41, 35, 29, 23, 16, 10, 4, -1, -7, -14, -20, -28, -36, -44, -52, -60, -68, -77, -85, -93,-102,-113,-128,-128, 127, 127, 112, 96, 86, }, @@ -62,15 +62,15 @@ static constexpr const int8_t declination_table[17][37] { { 6, 9, 10, 11, 12, 12, 11, 9, 5, -1, -8, -13, -15, -15, -13, -10, -6, -2, 0, 2, 4, 5, 4, 4, 3, 2, 1, 0, -1, -4, -6, -7, -6, -3, 0, 3, 6, }, { 4, 8, 11, 13, 14, 15, 13, 10, 5, -2, -9, -14, -16, -15, -13, -10, -6, -2, 1, 3, 4, 6, 6, 6, 6, 5, 4, 1, -2, -5, -8, -10, -9, -7, -3, 1, 4, }, { 3, 7, 11, 14, 16, 17, 16, 12, 5, -3, -12, -17, -19, -18, -15, -11, -7, -3, 0, 3, 6, 8, 9, 10, 11, 10, 7, 3, -2, -7, -11, -13, -12, -9, -6, -1, 3, }, - { 2, 7, 12, 16, 18, 19, 18, 13, 5, -7, -17, -23, -24, -23, -19, -15, -10, -5, -1, 4, 8, 11, 14, 17, 18, 17, 13, 7, -1, -9, -14, -15, -15, -12, -8, -3, 2, }, + { 2, 7, 12, 15, 18, 19, 18, 13, 5, -7, -17, -23, -24, -23, -19, -15, -10, -5, -1, 4, 8, 11, 14, 17, 18, 17, 13, 7, -1, -9, -14, -15, -15, -12, -8, -3, 2, }, { 1, 6, 12, 16, 20, 21, 20, 13, -1, -17, -28, -33, -33, -30, -25, -20, -14, -8, -2, 4, 10, 16, 21, 25, 28, 28, 25, 17, 4, -8, -15, -18, -17, -14, -9, -4, 1, }, - { -2, 4, 9, 13, 15, 13, 5, -12, -32, -44, -48, -47, -43, -37, -31, -24, -16, -9, -1, 7, 14, 22, 29, 35, 41, 45, 47, 45, 35, 15, -5, -15, -17, -16, -12, -7, -2, }, + { -2, 4, 8, 13, 15, 13, 5, -12, -32, -44, -48, -47, -43, -37, -31, -24, -16, -9, -1, 7, 14, 22, 29, 35, 41, 45, 47, 45, 35, 15, -5, -15, -17, -16, -12, -7, -2, }, }; // Magnetic inclination data in degrees // Model: WMM-2020, // Version: 0.5.1.11, -// Date: 2020.4563, +// Date: 2020.4755, static constexpr const int8_t inclination_table[17][37] { { -78, -78, -77, -76, -75, -73, -72, -71, -70, -69, -68, -67, -67, -66, -66, -66, -65, -65, -66, -66, -66, -67, -68, -69, -70, -71, -73, -74, -75, -76, -77, -78, -79, -79, -79, -79, -78, }, { -81, -79, -77, -75, -74, -72, -69, -67, -65, -64, -62, -61, -60, -60, -60, -60, -60, -60, -60, -61, -61, -62, -64, -66, -68, -70, -73, -75, -78, -80, -83, -85, -86, -86, -84, -83, -81, }, @@ -82,7 +82,7 @@ static constexpr const int8_t inclination_table[17][37] { { -25, -22, -20, -17, -15, -12, -10, -7, -3, 1, 3, 1, -6, -17, -29, -38, -45, -48, -50, -50, -48, -44, -40, -38, -38, -38, -39, -39, -38, -36, -35, -35, -35, -34, -32, -29, -25, }, { -5, -2, 1, 3, 5, 8, 10, 13, 16, 20, 21, 18, 11, 0, -11, -21, -27, -30, -30, -29, -27, -23, -19, -17, -16, -17, -17, -18, -17, -16, -15, -16, -16, -15, -13, -9, -5, }, { 15, 18, 21, 22, 25, 27, 29, 31, 34, 36, 36, 34, 28, 19, 9, 1, -4, -5, -5, -4, -1, 2, 6, 8, 8, 8, 7, 7, 7, 7, 7, 6, 5, 5, 7, 11, 15, }, - { 31, 34, 36, 38, 40, 42, 44, 46, 48, 49, 48, 46, 41, 35, 29, 23, 20, 19, 20, 21, 23, 26, 28, 30, 30, 30, 30, 29, 29, 29, 28, 27, 25, 25, 26, 28, 31, }, + { 31, 34, 36, 38, 40, 42, 44, 46, 48, 49, 48, 46, 41, 35, 29, 23, 20, 19, 20, 21, 23, 26, 28, 30, 30, 30, 30, 29, 29, 29, 28, 27, 25, 25, 25, 28, 31, }, { 43, 45, 47, 49, 51, 53, 55, 57, 58, 59, 58, 56, 52, 48, 45, 42, 40, 39, 40, 41, 43, 44, 46, 47, 47, 47, 47, 47, 47, 47, 46, 44, 42, 40, 40, 41, 43, }, { 53, 54, 56, 57, 59, 61, 64, 66, 67, 68, 67, 65, 62, 59, 57, 55, 54, 54, 55, 56, 57, 58, 59, 59, 60, 60, 61, 61, 61, 60, 59, 57, 55, 53, 52, 52, 53, }, { 62, 63, 64, 65, 67, 69, 71, 73, 74, 75, 74, 72, 70, 68, 67, 66, 65, 65, 65, 66, 66, 67, 68, 68, 69, 70, 70, 71, 71, 70, 69, 67, 65, 63, 62, 62, 62, }, @@ -94,16 +94,16 @@ static constexpr const int8_t inclination_table[17][37] { // Magnetic strength data in micro-Tesla or centi-Gauss // Model: WMM-2020, // Version: 0.5.1.11, -// Date: 2020.4563, +// Date: 2020.4755, static constexpr const int8_t strength_table[17][37] { - { 61, 60, 59, 58, 57, 56, 55, 54, 53, 51, 50, 49, 48, 48, 47, 46, 46, 46, 46, 47, 47, 48, 50, 51, 52, 54, 55, 57, 58, 59, 60, 61, 61, 61, 61, 61, 61, }, + { 61, 60, 59, 58, 57, 56, 55, 54, 53, 51, 50, 49, 48, 47, 47, 46, 46, 46, 46, 47, 47, 48, 50, 51, 52, 54, 55, 57, 58, 59, 60, 61, 61, 61, 61, 61, 61, }, { 63, 62, 60, 59, 57, 55, 53, 51, 49, 46, 44, 43, 41, 40, 39, 38, 37, 37, 38, 38, 40, 41, 44, 46, 49, 52, 55, 58, 61, 63, 64, 65, 66, 66, 65, 64, 63, }, { 62, 60, 58, 56, 54, 52, 49, 46, 43, 40, 38, 35, 34, 32, 31, 30, 30, 30, 30, 31, 33, 35, 38, 42, 46, 51, 55, 59, 62, 64, 66, 67, 67, 66, 65, 64, 62, }, { 59, 56, 54, 52, 49, 47, 44, 41, 38, 35, 32, 29, 27, 27, 26, 26, 25, 25, 25, 26, 28, 30, 34, 39, 44, 49, 54, 58, 61, 64, 65, 66, 65, 64, 63, 61, 59, }, { 54, 52, 49, 47, 44, 42, 40, 37, 34, 30, 27, 25, 24, 24, 24, 24, 24, 24, 24, 24, 25, 28, 32, 37, 43, 48, 53, 56, 59, 61, 62, 62, 62, 60, 59, 56, 54, }, { 49, 46, 44, 42, 40, 37, 35, 33, 30, 28, 25, 23, 22, 23, 23, 24, 25, 25, 25, 26, 26, 28, 32, 36, 42, 47, 51, 54, 56, 57, 57, 57, 56, 55, 53, 51, 49, }, { 43, 41, 39, 37, 35, 33, 32, 30, 28, 26, 24, 23, 22, 23, 24, 25, 26, 27, 28, 29, 29, 30, 32, 36, 40, 45, 48, 51, 52, 52, 52, 51, 50, 49, 47, 45, 43, }, - { 38, 36, 35, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 24, 25, 26, 28, 30, 31, 32, 32, 32, 33, 35, 39, 42, 45, 46, 47, 46, 45, 45, 44, 43, 41, 40, 38, }, + { 38, 36, 35, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 24, 25, 26, 28, 30, 31, 31, 32, 32, 33, 35, 39, 42, 45, 46, 47, 46, 45, 45, 44, 43, 41, 40, 38, }, { 34, 33, 32, 32, 31, 31, 31, 30, 30, 30, 29, 28, 27, 27, 27, 28, 29, 31, 32, 33, 33, 33, 34, 35, 38, 40, 41, 43, 43, 42, 41, 40, 39, 38, 36, 35, 34, }, { 33, 33, 32, 32, 33, 33, 34, 34, 35, 35, 34, 33, 31, 30, 30, 30, 31, 32, 33, 34, 35, 35, 36, 37, 39, 40, 41, 42, 42, 41, 40, 39, 37, 36, 34, 33, 33, }, { 34, 34, 34, 35, 36, 37, 38, 40, 40, 41, 40, 38, 37, 35, 34, 34, 35, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 45, 45, 43, 41, 39, 37, 35, 34, 34, },