Introduced optional<string> as return type. Updated tests.
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
parent
6a23412a5e
commit
75b9b134eb
GPG key ID:
C622E5563CAC205D
9 changed files with 266 additions and 379 deletions
|
|
@ -962,9 +962,9 @@ Java_app_organicmaps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble
|
|||
case android::CoordinatesFormat::OSMLink: // Link to osm.org
|
||||
return jni::ToJavaString(env, measurement_utils::FormatOsmLink(lat, lon, 14));
|
||||
case android::CoordinatesFormat::UTM: // Universal Transverse Mercator
|
||||
return jni::ToJavaString(env, utm_mgrs_utils::FormatUTM(lat, lon));
|
||||
return jni::ToJavaString(env, utm_mgrs_utils::FormatUTM(lat, lon).value_or(nullptr));
|
||||
case android::CoordinatesFormat::MGRS: // Military Grid Reference System
|
||||
return jni::ToJavaString(env, utm_mgrs_utils::FormatMGRS(lat, lon, 5));
|
||||
return jni::ToJavaString(env, utm_mgrs_utils::FormatMGRS(lat, lon, 5).value_or(nullptr));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -99,6 +99,24 @@ std::string DebugPrintSequence(IterT beg, IterT end)
|
|||
return out.str();
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
std::string DebugPrint(std::optional<T> const & p)
|
||||
{
|
||||
if (p)
|
||||
{
|
||||
std::ostringstream out;
|
||||
out << "optional(" << DebugPrint(p.value()) << ")";
|
||||
return out.str();
|
||||
}
|
||||
else
|
||||
return "nullopt";
|
||||
}
|
||||
|
||||
std::string inline DebugPrint(std::nullopt_t const & p)
|
||||
{
|
||||
return "nullopt";
|
||||
}
|
||||
|
||||
template <typename T, size_t N> inline std::string DebugPrint(T (&arr) [N])
|
||||
{
|
||||
return DebugPrintSequence(arr, arr + N);
|
||||
|
|
|
|||
|
|
@ -6,63 +6,65 @@
|
|||
|
||||
using namespace utm_mgrs_utils;
|
||||
|
||||
#define OPT(a) std::make_optional(a)
|
||||
|
||||
UNIT_TEST(FormatUTM)
|
||||
{
|
||||
TEST_EQUAL(FormatUTM(42.0, -93.0), "15N 500000 4649776", ());
|
||||
TEST_EQUAL(FormatUTM(31.77597, 35.23406), "36N 711554 3517777", ());
|
||||
TEST_EQUAL(FormatUTM(-34.81449, -58.54016), "21S 359135 6146448", ());
|
||||
TEST_EQUAL(FormatUTM(36.2361322, -115.0820944), "11N 672349 4011845", ());
|
||||
TEST_EQUAL(FormatUTM(42.0, -93.0), OPT("15N 500000 4649776"), ());
|
||||
TEST_EQUAL(FormatUTM(31.77597, 35.23406), OPT("36N 711554 3517777"), ());
|
||||
TEST_EQUAL(FormatUTM(-34.81449, -58.54016), OPT("21S 359135 6146448"), ());
|
||||
TEST_EQUAL(FormatUTM(36.2361322, -115.0820944), OPT("11N 672349 4011845"), ());
|
||||
|
||||
TEST_EQUAL(FormatUTM(50.77535, 6.08389), "32N 294409 5628898", ());
|
||||
TEST_EQUAL(FormatUTM(40.71435, -74.00597), "18N 583960 4507523", ());
|
||||
TEST_EQUAL(FormatUTM(-41.28646, 174.77624), "60S 313784 5427057", ());
|
||||
TEST_EQUAL(FormatUTM(-33.92487, 18.42406), "34S 261878 6243186", ());
|
||||
TEST_EQUAL(FormatUTM(-32.89018, -68.84405), "19S 514586 6360877", ());
|
||||
TEST_EQUAL(FormatUTM(64.83778, -147.71639), "6N 466013 7190568", ());
|
||||
TEST_EQUAL(FormatUTM(56.79680, -5.00601), "30N 377486 6296562", ());
|
||||
TEST_EQUAL(FormatUTM(84, -5.00601), "30N 476594 9328501", ());
|
||||
TEST_EQUAL(FormatUTM(50.77535, 6.08389), OPT("32N 294409 5628898"), ());
|
||||
TEST_EQUAL(FormatUTM(40.71435, -74.00597), OPT("18N 583960 4507523"), ());
|
||||
TEST_EQUAL(FormatUTM(-41.28646, 174.77624), OPT("60S 313784 5427057"), ());
|
||||
TEST_EQUAL(FormatUTM(-33.92487, 18.42406), OPT("34S 261878 6243186"), ());
|
||||
TEST_EQUAL(FormatUTM(-32.89018, -68.84405), OPT("19S 514586 6360877"), ());
|
||||
TEST_EQUAL(FormatUTM(64.83778, -147.71639), OPT("6N 466013 7190568"), ());
|
||||
TEST_EQUAL(FormatUTM(56.79680, -5.00601), OPT("30N 377486 6296562"), ());
|
||||
TEST_EQUAL(FormatUTM(84, -5.00601), OPT("30N 476594 9328501"), ());
|
||||
|
||||
TEST_EQUAL(FormatUTM(12.016469, 188.0), std::nullopt, ());
|
||||
}
|
||||
|
||||
|
||||
UNIT_TEST(FormatMGRS)
|
||||
{
|
||||
TEST_EQUAL(FormatMGRS(42.0, -93.0, 5), "15T WG 00000 49776", ());
|
||||
TEST_EQUAL(FormatMGRS(31.77597, 35.23406, 5), "36R YA 11554 17776", ());
|
||||
TEST_EQUAL(FormatMGRS(-34.81449, -58.54016, 5), "21H UB 59135 46447", ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 5), "11S PA 72349 11844", ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 4), "11S PA 7234 1184", ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 3), "11S PA 723 118", ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 2), "11S PA 72 11", ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 1), "11S PA 7 1", ());
|
||||
TEST_EQUAL(FormatMGRS(42.0, -93.0, 5), OPT("15T WG 00000 49776"), ());
|
||||
TEST_EQUAL(FormatMGRS(31.77597, 35.23406, 5), OPT("36R YA 11554 17776"), ());
|
||||
TEST_EQUAL(FormatMGRS(-34.81449, -58.54016, 5), OPT("21H UB 59135 46447"), ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 5), OPT("11S PA 72349 11844"), ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 4), OPT("11S PA 7234 1184"), ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 3), OPT("11S PA 723 118"), ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 2), OPT("11S PA 72 11"), ());
|
||||
TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 1), OPT("11S PA 7 1"), ());
|
||||
|
||||
TEST_EQUAL(FormatMGRS(84.644103, 3.000009, 5), "Latitude limit exceeded", ()); // Some converters generate string "Z AB 31142 05767"
|
||||
TEST_EQUAL(FormatMGRS(-81.016469, 8.745519, 5), "Latitude limit exceeded", ()); // Some converters generate string "B BX 51947 87732"
|
||||
TEST_EQUAL(FormatMGRS(12.016469, 188.0, 2), "Longitude limit exceeded", ());
|
||||
TEST_EQUAL(FormatMGRS(84.644103, 3.000009, 5), std::nullopt, ()); // Some converters generate string "Z AB 31142 05767"
|
||||
TEST_EQUAL(FormatMGRS(-81.016469, 8.745519, 5), std::nullopt, ()); // Some converters generate string "B BX 51947 87732"
|
||||
TEST_EQUAL(FormatMGRS(12.016469, 188.0, 2), std::nullopt, ());
|
||||
|
||||
// Test data from https://s3.amazonaws.com/mgrs.io/mgrsToGeo_WE.txt
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 0.304981, 5), "31N BA 00000 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(4.518520, 48.296629, 5), "39N TF 00000 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(9.045438, 50.090125, 5), "39P VL 00000 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(63.115494, 91.017708, 5), "46V DR 00000 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(40.626644, 137.364687, 5), "53T QF 00000 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, -4.797048, 5), "30N UF 00000 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, -0.592324, 5), "30N YF 67993 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 6.592333, 5), "32N KF 32007 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 54.592333, 5), "40N BF 32007 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(76.463950, 58.675211, 5), "40X EK 43763 87577", ());
|
||||
TEST_EQUAL(FormatMGRS(-49.578078, 85.150396, 5), "45F UF 66291 06635", ());
|
||||
TEST_EQUAL(FormatMGRS(-45.089793, 132.812340, 5), "53G LL 27848 04746", ());
|
||||
TEST_EQUAL(FormatMGRS(4.514602, 138.603457, 5), "54N TK 34069 99447", ());
|
||||
TEST_EQUAL(FormatMGRS(-67.547521, -142.303616, 5), "07D DF 44443 06997", ());
|
||||
TEST_EQUAL(FormatMGRS(-62.908852, -154.887008, 5), "05E ML 04130 23160", ());
|
||||
TEST_EQUAL(FormatMGRS(4.514602, -144.603447, 5), "06N YK 65931 99447", ());
|
||||
TEST_EQUAL(FormatMGRS(4.514602, -137.396543, 5), "08N KK 34069 99447", ());
|
||||
TEST_EQUAL(FormatMGRS(9.028532, -144.637149, 5), "06P YQ 59760 98847", ());
|
||||
TEST_EQUAL(FormatMGRS(54.109208, -60.059588, 5), "20U PE 92211 99669", ());
|
||||
TEST_EQUAL(FormatMGRS(54.109208, -53.940397, 5), "22U CE 07789 99669", ());
|
||||
TEST_EQUAL(FormatMGRS(-45.089793, -53.187660, 5), "22G CR 27848 04746", ());
|
||||
TEST_EQUAL(FormatMGRS(-31.596034, -18.161583, 5), "27J YF 69322 00842", ());
|
||||
TEST_EQUAL(FormatMGRS(-22.559756, -11.111475, 5), "29K KR 82882 03678", ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 0.592333, 5), "31N BA 32007 00000", ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 0.304981, 5), OPT("31N BA 00000 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(4.518520, 48.296629, 5), OPT("39N TF 00000 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(9.045438, 50.090125, 5), OPT("39P VL 00000 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(63.115494, 91.017708, 5), OPT("46V DR 00000 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(40.626644, 137.364687, 5), OPT("53T QF 00000 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, -4.797048, 5), OPT("30N UF 00000 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, -0.592324, 5), OPT("30N YF 67993 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 6.592333, 5), OPT("32N KF 32007 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 54.592333, 5), OPT("40N BF 32007 00000"), ());
|
||||
TEST_EQUAL(FormatMGRS(76.463950, 58.675211, 5), OPT("40X EK 43763 87577"), ());
|
||||
TEST_EQUAL(FormatMGRS(-49.578078, 85.150396, 5), OPT("45F UF 66291 06635"), ());
|
||||
TEST_EQUAL(FormatMGRS(-45.089793, 132.812340, 5), OPT("53G LL 27848 04746"), ());
|
||||
TEST_EQUAL(FormatMGRS(4.514602, 138.603457, 5), OPT("54N TK 34069 99447"), ());
|
||||
TEST_EQUAL(FormatMGRS(-67.547521, -142.303616, 5), OPT("07D DF 44443 06997"), ());
|
||||
TEST_EQUAL(FormatMGRS(-62.908852, -154.887008, 5), OPT("05E ML 04130 23160"), ());
|
||||
TEST_EQUAL(FormatMGRS(4.514602, -144.603447, 5), OPT("06N YK 65931 99447"), ());
|
||||
TEST_EQUAL(FormatMGRS(4.514602, -137.396543, 5), OPT("08N KK 34069 99447"), ());
|
||||
TEST_EQUAL(FormatMGRS(9.028532, -144.637149, 5), OPT("06P YQ 59760 98847"), ());
|
||||
TEST_EQUAL(FormatMGRS(54.109208, -60.059588, 5), OPT("20U PE 92211 99669"), ());
|
||||
TEST_EQUAL(FormatMGRS(54.109208, -53.940397, 5), OPT("22U CE 07789 99669"), ());
|
||||
TEST_EQUAL(FormatMGRS(-45.089793, -53.187660, 5), OPT("22G CR 27848 04746"), ());
|
||||
TEST_EQUAL(FormatMGRS(-31.596034, -18.161583, 5), OPT("27J YF 69322 00842"), ());
|
||||
TEST_EQUAL(FormatMGRS(-22.559756, -11.111475, 5), OPT("29K KR 82882 03678"), ());
|
||||
TEST_EQUAL(FormatMGRS(0.000005, 0.592333, 5), OPT("31N BA 32007 00000"), ());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ namespace utm_mgrs_utils
|
|||
{
|
||||
using namespace std;
|
||||
using namespace math; // To use constexpr math::pi
|
||||
using namespace base; // To use constexpr base::DegToRad and base::RadToDeg
|
||||
using namespace base; // To use base::DegToRad and base::RadToDeg
|
||||
using namespace ms; // To use ms::LatLon
|
||||
|
||||
typedef struct UTMPoint_Value
|
||||
{
|
||||
|
|
@ -46,13 +47,15 @@ constexpr double P3 = (21.0 / 16.0 * _E2 - 55.0 / 32.0 * _E4);
|
|||
constexpr double P4 = (151.0 / 96.0 * _E3 - 417.0 / 128.0 * _E5);
|
||||
constexpr double P5 = (1097.0 / 512.0 * _E4);
|
||||
|
||||
constexpr double kInvalidNorthing = -1.0;
|
||||
|
||||
const string ZONE_LETTERS = "CDEFGHJKLMNPQRSTUVWXX";
|
||||
|
||||
const int NUM_100K_SETS = 6;
|
||||
const int SET_ORIGIN_COLUMN_LETTERS[] = { 'A', 'J', 'S', 'A', 'J', 'S' };
|
||||
const int SET_ORIGIN_ROW_LETTERS[] = { 'A', 'F', 'A', 'F', 'A', 'F' };
|
||||
const int SET_ORIGIN_COLUMN_LETTERS[] = { 'S', 'A', 'J', 'S', 'A', 'J' };
|
||||
const int SET_ORIGIN_ROW_LETTERS[] = { 'F', 'A', 'F', 'A', 'F', 'A' };
|
||||
|
||||
// Returns angle in radians to be between -PI and PI.
|
||||
// Returns angle in radians to be between -π and π.
|
||||
double mod_angle(double value)
|
||||
{
|
||||
if (value < -pi)
|
||||
|
|
@ -82,12 +85,12 @@ int latlon_to_zone_number(double lat, double lon)
|
|||
return int((lon + 180.0) / 6.0) + 1;
|
||||
}
|
||||
|
||||
char latitude_to_zone_letter(double lat)
|
||||
optional<char> latitude_to_zone_letter(double lat)
|
||||
{
|
||||
if (-80.0 <= lat && lat <= 84.0)
|
||||
return ZONE_LETTERS[int(lat + 80.0) >> 3];
|
||||
else
|
||||
return '?';
|
||||
return nullopt;
|
||||
}
|
||||
|
||||
int zone_number_to_central_longitude(int zone_number)
|
||||
|
|
@ -149,22 +152,15 @@ string utm_to_str(UTMPoint point)
|
|||
to_string(int(round(point.northing)));
|
||||
}
|
||||
|
||||
int zone_to_100k(int i) {
|
||||
int set = i % NUM_100K_SETS;
|
||||
if (set == 0)
|
||||
set = NUM_100K_SETS;
|
||||
return set;
|
||||
}
|
||||
|
||||
// Build 2 chars string with 100k square ID
|
||||
// Build 2 chars string with MGRS 100k designator.
|
||||
string get_100k_id(double easting, double northing, int zone_number)
|
||||
{
|
||||
int set = zone_to_100k(zone_number);
|
||||
int set = zone_number % NUM_100K_SETS;
|
||||
int setColumn = ((int) easting / 100000);
|
||||
int setRow = ((int) northing / 100000) % 20;
|
||||
|
||||
int colOrigin = SET_ORIGIN_COLUMN_LETTERS[set - 1];
|
||||
int rowOrigin = SET_ORIGIN_ROW_LETTERS[set - 1];
|
||||
int colOrigin = SET_ORIGIN_COLUMN_LETTERS[set];
|
||||
int rowOrigin = SET_ORIGIN_ROW_LETTERS[set];
|
||||
|
||||
int colInt = colOrigin + setColumn - 1;
|
||||
int rowInt = rowOrigin + setRow;
|
||||
|
|
@ -239,19 +235,19 @@ string utm_to_mgrs_str(UTMPoint point, int precision)
|
|||
// Convert UTM parameters to lat,lon for WSG 84 ellipsoid.
|
||||
// If UTM parameters are valid lat and lon references are used to output calculated coordinates.
|
||||
// Otherwise function returns 'false'.
|
||||
bool UTMtoLatLon(double easting, double northing, int zone_number, char zone_letter, double &lat, double &lon)
|
||||
std::optional<ms::LatLon> UTMtoLatLon(double easting, double northing, int zone_number, char zone_letter)
|
||||
{
|
||||
if (zone_number < 1 || zone_number > 60)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
if (easting < 100000.0 || easting >= 1000000.0)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
if (northing < 0.0 || northing > 10000000.0)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
if (zone_letter<'C' || zone_letter>'X' || zone_letter == 'I' || zone_letter == 'O')
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
bool northern = (zone_letter >= 'N');
|
||||
double x = easting - 500000.0;
|
||||
|
|
@ -305,10 +301,7 @@ bool UTMtoLatLon(double easting, double northing, int zone_number, char zone_let
|
|||
|
||||
longitude = mod_angle(longitude + DegToRad(zone_number_to_central_longitude(zone_number)));
|
||||
|
||||
lat = RadToDeg(latitude);
|
||||
lon = RadToDeg(longitude);
|
||||
|
||||
return true;
|
||||
return LatLon(RadToDeg(latitude), RadToDeg(longitude));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -316,7 +309,7 @@ bool UTMtoLatLon(double easting, double northing, int zone_number, char zone_let
|
|||
* MGRS table set for the zone number, figure out the easting value that
|
||||
* should be added to the other, secondary easting value.*/
|
||||
double square_char_to_easting(char e, int set) {
|
||||
int curCol = SET_ORIGIN_COLUMN_LETTERS[set - 1];
|
||||
int curCol = SET_ORIGIN_COLUMN_LETTERS[set];
|
||||
double eastingValue = 100000.0;
|
||||
bool rewindMarker = false;
|
||||
|
||||
|
|
@ -330,7 +323,7 @@ double square_char_to_easting(char e, int set) {
|
|||
if (curCol > 'Z')
|
||||
{
|
||||
if (rewindMarker)
|
||||
return -1;
|
||||
return kInvalidNorthing;
|
||||
curCol = 'A';
|
||||
rewindMarker = true;
|
||||
}
|
||||
|
|
@ -355,12 +348,12 @@ double square_char_to_easting(char e, int set) {
|
|||
* @param set
|
||||
* the MGRS table set number, which is dependent on the UTM zone
|
||||
* number. */
|
||||
double square_char_to_northing(char n, int set) {
|
||||
|
||||
double square_char_to_northing(char n, int set)
|
||||
{
|
||||
if (n > 'V')
|
||||
return -1;
|
||||
return kInvalidNorthing;
|
||||
|
||||
int curRow = SET_ORIGIN_ROW_LETTERS[set - 1];
|
||||
int curRow = SET_ORIGIN_ROW_LETTERS[set];
|
||||
double northingValue = 0.0;
|
||||
bool rewindMarker = false;
|
||||
|
||||
|
|
@ -371,12 +364,10 @@ double square_char_to_northing(char n, int set) {
|
|||
curRow++;
|
||||
if (curRow == 'O')
|
||||
curRow++;
|
||||
// fixing a bug making whole application hang in this loop
|
||||
// when 'n' is a wrong character
|
||||
if (curRow > 'V')
|
||||
{
|
||||
if (rewindMarker) // making sure that this loop ends
|
||||
return -1;
|
||||
if (rewindMarker) // Making sure that this loop ends even if n has invalid value.
|
||||
return kInvalidNorthing;
|
||||
curRow = 'A';
|
||||
rewindMarker = true;
|
||||
}
|
||||
|
|
@ -387,11 +378,7 @@ double square_char_to_northing(char n, int set) {
|
|||
}
|
||||
|
||||
|
||||
/* The function getMinNorthing returns the minimum northing value of a MGRS
|
||||
* zone.
|
||||
*
|
||||
* portted from Geotrans' c Latitude_Band_Value structure table. zoneLetter
|
||||
* : MGRS zone (input). */
|
||||
// Get minimum northing value of a MGRS zone.
|
||||
double zone_to_min_northing(char zoneLetter)
|
||||
{
|
||||
double northing;
|
||||
|
|
@ -458,41 +445,41 @@ double zone_to_min_northing(char zoneLetter)
|
|||
northing = 7900000.0;
|
||||
break;
|
||||
default:
|
||||
northing = -1.0;
|
||||
northing = kInvalidNorthing;
|
||||
}
|
||||
|
||||
return northing;
|
||||
}
|
||||
|
||||
// Convert MGRS parameters to UTM parameters and then use UTM to lat,lon conversion.
|
||||
bool MGRStoLatLon(double easting, double northing, int zone_code, char zone_letter, char square_code[2], double &lat, double &lon)
|
||||
std::optional<ms::LatLon> MGRStoLatLon(double easting, double northing, int zone_code, char zone_letter, char square_code[2])
|
||||
{
|
||||
// Convert easting and northing according to zone_code and square_code
|
||||
if (zone_code < 1 || zone_code > 60)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
if (zone_letter <= 'B' || zone_letter >= 'Y' || zone_letter == 'I' || zone_letter == 'O')
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
int set = zone_to_100k(zone_code);
|
||||
int set = zone_code % NUM_100K_SETS;
|
||||
|
||||
char char1 = square_code[0];
|
||||
char char2 = square_code[1];
|
||||
|
||||
if (char1 < 'A' || char2 < 'A' || char1 > 'Z' || char2 > 'Z' || char1 == 'I' || char2 == 'I' || char1 == 'O' || char2 == 'O')
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
float east100k = square_char_to_easting(char1, set);
|
||||
if (east100k < 0)
|
||||
return false;
|
||||
if (east100k == kInvalidNorthing)
|
||||
return nullopt;
|
||||
|
||||
float north100k = square_char_to_northing(char2, set);
|
||||
if (north100k < 0)
|
||||
return false;
|
||||
if (north100k == kInvalidNorthing)
|
||||
return nullopt;
|
||||
|
||||
double minNorthing = zone_to_min_northing(zone_letter);
|
||||
if (minNorthing < 0)
|
||||
return false;
|
||||
if (minNorthing == kInvalidNorthing)
|
||||
return nullopt;
|
||||
|
||||
while (north100k < minNorthing)
|
||||
north100k += 2000000.0;
|
||||
|
|
@ -500,11 +487,11 @@ bool MGRStoLatLon(double easting, double northing, int zone_code, char zone_lett
|
|||
easting += east100k;
|
||||
northing += north100k;
|
||||
|
||||
return UTMtoLatLon(easting, northing, zone_code, zone_letter, lat, lon);
|
||||
return UTMtoLatLon(easting, northing, zone_code, zone_letter);
|
||||
}
|
||||
|
||||
// Convert lat,lon for WSG 84 ellipsoid to MGRS string.
|
||||
string FormatMGRS(double lat, double lon, int precision)
|
||||
// Convert lat,lon for WGS84 ellipsoid to MGRS string.
|
||||
optional<string> FormatMGRS(double lat, double lon, int precision)
|
||||
{
|
||||
if (precision > 5)
|
||||
precision = 5;
|
||||
|
|
@ -512,24 +499,30 @@ string FormatMGRS(double lat, double lon, int precision)
|
|||
precision = 1;
|
||||
|
||||
if (lat <= -80 || lat > 84)
|
||||
return "Latitude limit exceeded";
|
||||
return nullopt; // Latitude limit exceeded.
|
||||
if (lon <= -180 || lon > 180)
|
||||
return "Longitude limit exceeded";
|
||||
return nullopt; // Longitude limit exceeded.
|
||||
|
||||
UTMPoint mgrsp = latlon_to_utm(lat, lon);
|
||||
|
||||
// Need to add this to set the right letter for the latitude.
|
||||
mgrsp.zone_letter = latitude_to_zone_letter(lat);
|
||||
return utm_to_mgrs_str(mgrsp, precision);
|
||||
// Need to set the right letter for the latitude.
|
||||
auto maybeZone = latitude_to_zone_letter(lat);
|
||||
if (maybeZone)
|
||||
{
|
||||
mgrsp.zone_letter = maybeZone.value();
|
||||
return utm_to_mgrs_str(mgrsp, precision);
|
||||
}
|
||||
|
||||
return nullopt;
|
||||
}
|
||||
|
||||
// Convert lat,lon for WSG 84 ellipsoid to UTM string.
|
||||
string FormatUTM(double lat, double lon)
|
||||
// Convert lat,lon for WGS84 ellipsoid to UTM string.
|
||||
optional<string> FormatUTM(double lat, double lon)
|
||||
{
|
||||
if (lat <= -80 || lat > 84)
|
||||
return "Latitude limit exceeded";
|
||||
return nullopt; // Latitude limit exceeded.
|
||||
if (lon <= -180 || lon > 180)
|
||||
return "Longitude limit exceeded";
|
||||
return nullopt; // Longitude limit exceeded.
|
||||
|
||||
UTMPoint utm = latlon_to_utm(lat, lon);
|
||||
return utm_to_str(utm);
|
||||
|
|
|
|||
|
|
@ -2,10 +2,12 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "geometry/latlon.hpp"
|
||||
|
||||
namespace utm_mgrs_utils
|
||||
{
|
||||
// Convert from Lat and Lon coordinates in WGS 84 projection to UTM string
|
||||
std::string FormatUTM(double lat, double lon);
|
||||
std::optional<std::string> FormatUTM(double lat, double lon);
|
||||
|
||||
/* Convert from Lat and Lon coordinates in WGS 84 projection to MGRS square string
|
||||
* Parameter prec should be a number from 1 to 5.
|
||||
|
|
@ -15,12 +17,12 @@ std::string FormatUTM(double lat, double lon);
|
|||
* prec = 4 gives MGRS coordinates "11S PA 7234 1184"
|
||||
* prec = 5 gives MGRS coordinates "11S PA 72349 11844" (highest precision)
|
||||
*/
|
||||
std::string FormatMGRS(double lat, double lon, int prec);
|
||||
std::optional<std::string> FormatMGRS(double lat, double lon, int prec);
|
||||
|
||||
// Covevrt UTM coordinates to Lat Lon. If UTM parameters are invalid function returns false
|
||||
bool UTMtoLatLon(double easting, double northing, int zone_code, char zone_letter, double &lat, double &lon);
|
||||
std::optional<ms::LatLon> UTMtoLatLon(double easting, double northing, int zone_code, char zone_letter);
|
||||
|
||||
// Covevrt MGRS coordinates to Lat Lon. If parameters are invalid function returns false
|
||||
bool MGRStoLatLon(double easting, double northing, int zone_code, char zone_letter, char square_code[2], double &lat, double &lon);
|
||||
std::optional<ms::LatLon> MGRStoLatLon(double easting, double northing, int zone_code, char zone_letter, char square_code[2]);
|
||||
|
||||
} // namespace utm_mgrs_utils
|
||||
|
|
|
|||
|
|
@ -617,16 +617,20 @@ bool Processor::SearchCoordinates()
|
|||
results.emplace_back(lat, lon);
|
||||
}
|
||||
|
||||
if (MatchUTMCoords(m_query, lat, lon))
|
||||
optional<ms::LatLon> maybeLatLon = MatchUTMCoords(m_query);
|
||||
if (maybeLatLon)
|
||||
{
|
||||
coords_found = true;
|
||||
results.emplace_back(lat, lon);
|
||||
auto latLon = maybeLatLon.value();
|
||||
results.emplace_back(latLon.m_lat, latLon.m_lon);
|
||||
}
|
||||
|
||||
if (MatchMGRSCoords(m_query, lat, lon))
|
||||
maybeLatLon = MatchMGRSCoords(m_query);
|
||||
if (maybeLatLon)
|
||||
{
|
||||
coords_found = true;
|
||||
results.emplace_back(lat, lon);
|
||||
auto latLon = maybeLatLon.value();
|
||||
results.emplace_back(latLon.m_lat, latLon.m_lon);
|
||||
}
|
||||
|
||||
istringstream iss(m_query);
|
||||
|
|
|
|||
|
|
@ -13,281 +13,147 @@ using namespace search;
|
|||
// We expect the results to be quite precise.
|
||||
double const kEps = 1e-5;
|
||||
|
||||
void TestAlmostEqual(double actual, double expected)
|
||||
void TestAlmostEqual(std::optional<ms::LatLon> maybeLatLon, double expectedLat, double expectedLon)
|
||||
{
|
||||
TEST(base::AlmostEqualAbsOrRel(actual, expected, kEps), (actual, expected));
|
||||
TEST(maybeLatLon.has_value(), ());
|
||||
|
||||
auto const actualLat = maybeLatLon.value().m_lat;
|
||||
TEST(base::AlmostEqualAbsOrRel(actualLat, expectedLat, kEps), ("Lat is not close", actualLat, expectedLat));
|
||||
|
||||
auto const actualLon = maybeLatLon.value().m_lon;
|
||||
TEST(base::AlmostEqualAbsOrRel(actualLon, expectedLon, kEps), ("Lon is not close", actualLon, expectedLon));
|
||||
}
|
||||
|
||||
UNIT_TEST(MatchUTMCoords)
|
||||
{
|
||||
double lat, lon;
|
||||
|
||||
// Extra spaces shouldn't break format
|
||||
TEST(MatchUTMCoords("15 N 500000 4649776", lat, lon), ());
|
||||
TEST(MatchUTMCoords("15 N 500000 4649776", lat, lon), ());
|
||||
TEST(MatchUTMCoords("15 N 500000 4649776").has_value(), ());
|
||||
TEST(MatchUTMCoords("15 N 500000 4649776").has_value(), ());
|
||||
|
||||
TEST(MatchUTMCoords("15N 500000 4649776", lat, lon), ());
|
||||
TestAlmostEqual(lat, 42.0);
|
||||
TestAlmostEqual(lon, -93.0);
|
||||
|
||||
TEST(MatchUTMCoords("15 N 500000 4649776", lat, lon), ());
|
||||
TestAlmostEqual(lat, 42.0);
|
||||
TestAlmostEqual(lon, -93.0);
|
||||
|
||||
TEST(MatchUTMCoords("32U 294409 5628898", lat, lon), ());
|
||||
TestAlmostEqual(lat, 50.77535);
|
||||
TestAlmostEqual(lon, 6.08389);
|
||||
|
||||
TEST(MatchUTMCoords("32 U 294409 5628898", lat, lon), ());
|
||||
TestAlmostEqual(lat, 50.77535);
|
||||
TestAlmostEqual(lon, 6.08389);
|
||||
|
||||
TEST(MatchUTMCoords("30X 476594 9328501", lat, lon), ());
|
||||
TestAlmostEqual(lat, 84.0);
|
||||
TestAlmostEqual(lon, -5.00601);
|
||||
|
||||
TEST(MatchUTMCoords("30 N 476594 9328501", lat, lon), ());
|
||||
TestAlmostEqual(lat, 84.0);
|
||||
TestAlmostEqual(lon, -5.00601);
|
||||
TestAlmostEqual(MatchUTMCoords("15N 500000 4649776"), 42.0, -93.0);
|
||||
TestAlmostEqual(MatchUTMCoords("15 N 500000 4649776"), 42.0, -93.0);
|
||||
TestAlmostEqual(MatchUTMCoords("32U 294409 5628898"), 50.77535, 6.08389);
|
||||
TestAlmostEqual(MatchUTMCoords("32 U 294409 5628898"), 50.77535, 6.08389);
|
||||
TestAlmostEqual(MatchUTMCoords("30X 476594 9328501"), 84.0, -5.00601);
|
||||
TestAlmostEqual(MatchUTMCoords("30 N 476594 9328501"), 84.0, -5.00601);
|
||||
}
|
||||
|
||||
UNIT_TEST(MatchUTMCoords_False)
|
||||
{
|
||||
double lat, lon;
|
||||
|
||||
TEST(!MatchUTMCoords("2 1st", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("15N5000004649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("2 1st").has_value(), ());
|
||||
TEST(!MatchUTMCoords("15N5000004649776").has_value(), ());
|
||||
|
||||
// Wrong zone number (first two digits)
|
||||
TEST(!MatchUTMCoords("0X 476594 9328501", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("0 X 476594 9328501", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("61N 294409 5628898", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("61 N 294409 5628898", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("0X 476594 9328501").has_value(), ());
|
||||
TEST(!MatchUTMCoords("0 X 476594 9328501").has_value(), ());
|
||||
TEST(!MatchUTMCoords("61N 294409 5628898").has_value(), ());
|
||||
TEST(!MatchUTMCoords("61 N 294409 5628898").has_value(), ());
|
||||
|
||||
// Wrong zone letter
|
||||
TEST(!MatchUTMCoords("25I 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("25 I 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("25O 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("25 O 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("5A 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("5 A 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("7B 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("7 B 500000 4649776", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("25I 500000 4649776").has_value(), ());
|
||||
TEST(!MatchUTMCoords("25 I 500000 4649776").has_value(), ());
|
||||
TEST(!MatchUTMCoords("25O 500000 4649776").has_value(), ());
|
||||
TEST(!MatchUTMCoords("25 O 500000 4649776").has_value(), ());
|
||||
TEST(!MatchUTMCoords("5A 500000 4649776").has_value(), ());
|
||||
TEST(!MatchUTMCoords("5 A 500000 4649776").has_value(), ());
|
||||
TEST(!MatchUTMCoords("7B 500000 4649776").has_value(), ());
|
||||
TEST(!MatchUTMCoords("7 B 500000 4649776").has_value(), ());
|
||||
|
||||
// easting out of range (must be between 100,000 m and 999,999 m)
|
||||
TEST(!MatchUTMCoords("19S 999 6360877", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("19S 99999 6360877", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("19S 1000000 6360877", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("19S 2000000 6360877", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("19S 999 6360877").has_value(), ());
|
||||
TEST(!MatchUTMCoords("19S 99999 6360877").has_value(), ());
|
||||
TEST(!MatchUTMCoords("19S 1000000 6360877").has_value(), ());
|
||||
TEST(!MatchUTMCoords("19S 2000000 6360877").has_value(), ());
|
||||
|
||||
// northing out of range (must be between 0 m and 10,000,000 m)
|
||||
TEST(!MatchUTMCoords("30N 476594 10000001", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("30N 476594 20000000", lat, lon), ());
|
||||
TEST(!MatchUTMCoords("30N 476594 10000001").has_value(), ());
|
||||
TEST(!MatchUTMCoords("30N 476594 20000000").has_value(), ());
|
||||
}
|
||||
|
||||
UNIT_TEST(MatchMGRSCoords_parsing)
|
||||
{
|
||||
double lat, lon;
|
||||
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF 67993 00000", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF 67993 00000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF 67993 00000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF67993 00000", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF67993 00000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF67993 00000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF6799300000", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30NYF6799300000 ", lat, lon), ());
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000 ").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000 ").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000 ").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF 67993 00000").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF 67993 00000 ").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF 67993 00000 ").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF67993 00000").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF67993 00000 ").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF67993 00000 ").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF6799300000").has_value(), ());
|
||||
TEST(MatchMGRSCoords("30NYF6799300000 ").has_value(), ());
|
||||
|
||||
// Wrong number of digits
|
||||
TEST(!MatchMGRSCoords("30NYF 679930000 ", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30NYF 679930000", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30NYF 679930000 ").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30NYF 679930000").has_value(), ());
|
||||
|
||||
TEST(!MatchMGRSCoords("30N YF 693 23020", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30N YF 693 23 ", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30N YF 693 23020").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30N YF 693 23 ").has_value(), ());
|
||||
|
||||
// Invalid zone
|
||||
TEST(!MatchMGRSCoords("30 FF 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30A YF 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30Z YF 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30Z F 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30Z 3F 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30Z K? 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30Z IB 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30Z DO 693 230", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30 FF 693 230").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30A YF 693 230").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30Z YF 693 230").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30Z F 693 230").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30Z 3F 693 230").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30Z K? 693 230").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30Z IB 693 230").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30Z DO 693 230").has_value(), ());
|
||||
|
||||
// Wrong easting or northing
|
||||
TEST(!MatchMGRSCoords("30NYF 679_3 00000", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30NYF 6930&000", lat, lon), ());
|
||||
TEST(!MatchMGRSCoords("30NYF 679_3 00000").has_value(), ());
|
||||
TEST(!MatchMGRSCoords("30NYF 6930&000").has_value(), ());
|
||||
}
|
||||
|
||||
UNIT_TEST(MatchMGRSCoords_convert)
|
||||
{
|
||||
double lat, lon;
|
||||
TestAlmostEqual(MatchMGRSCoords("30N YF 67993 00000"), 0.000000, -0.592330);
|
||||
TestAlmostEqual(MatchMGRSCoords("31N BA 00000 00000"), 0.000000, 0.304980);
|
||||
TestAlmostEqual(MatchMGRSCoords("32R LR 00000 00000"), 27.107980, 6.982490);
|
||||
TestAlmostEqual(MatchMGRSCoords("32R MR 00000 00000"), 27.118850, 7.991060);
|
||||
TestAlmostEqual(MatchMGRSCoords("33R TK 05023 99880"), 27.089890, 12.025310);
|
||||
TestAlmostEqual(MatchMGRSCoords("31R GQ 69322 99158"), 31.596040, 5.838410);
|
||||
TestAlmostEqual(MatchMGRSCoords("35L KF 50481 01847"), -13.541120, 24.694510);
|
||||
TestAlmostEqual(MatchMGRSCoords("33L YL 59760 01153"), -9.028520, 17.362850);
|
||||
TestAlmostEqual(MatchMGRSCoords("36G VR 27441 12148"), -45.040410, 32.078730);
|
||||
TestAlmostEqual(MatchMGRSCoords("41R KQ 30678 99158"), 31.596040, 60.161590);
|
||||
TestAlmostEqual(MatchMGRSCoords("43F CF 66291 06635"), -49.578080, 73.150400);
|
||||
TestAlmostEqual(MatchMGRSCoords("43F DF 65832 14591"), -49.520340, 74.527920);
|
||||
TestAlmostEqual(MatchMGRSCoords("41G NL 72559 12148"), -45.040410, 63.921270);
|
||||
TestAlmostEqual(MatchMGRSCoords("41G PL 72152 04746"), -45.089800, 65.187670);
|
||||
TestAlmostEqual(MatchMGRSCoords("42G UR 00000 00000"), -45.125150, 66.456880);
|
||||
TestAlmostEqual(MatchMGRSCoords("42G VR 00000 00000"), -45.146390, 67.727970);
|
||||
TestAlmostEqual(MatchMGRSCoords("42G WR 00000 00000"), -45.153480, 69.000000);
|
||||
TestAlmostEqual(MatchMGRSCoords("42G XR 00000 00000"), -45.146390, 70.272030);
|
||||
TestAlmostEqual(MatchMGRSCoords("42G YR 00000 00000"), -45.125150, 71.543120);
|
||||
TestAlmostEqual(MatchMGRSCoords("43G CL 27848 04746"), -45.089800, 72.812330);
|
||||
TestAlmostEqual(MatchMGRSCoords("43G DL 27441 12148"), -45.040410, 74.078730);
|
||||
TestAlmostEqual(MatchMGRSCoords("41G PR 08066 09951"), -40.554160, 64.276370);
|
||||
TestAlmostEqual(MatchMGRSCoords("41G QR 07714 03147"), -40.596410, 65.454770);
|
||||
TestAlmostEqual(MatchMGRSCoords("42G UA 00000 00000"), -40.626640, 66.635320);
|
||||
TestAlmostEqual(MatchMGRSCoords("43L GF 49519 01847"), -13.541120, 77.305490);
|
||||
TestAlmostEqual(MatchMGRSCoords("45L VL 00000 00000"), -9.045430, 86.090120);
|
||||
TestAlmostEqual(MatchMGRSCoords("50Q KE 64726 97325"), 18.051740, 114.777360);
|
||||
TestAlmostEqual(MatchMGRSCoords("53F LF 66291 06635"), -49.578080, 133.150400);
|
||||
TestAlmostEqual(MatchMGRSCoords("60F VL 65832 14591"), -49.520340, 176.527920);
|
||||
|
||||
TEST(MatchMGRSCoords("30N YF 67993 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 0.000000);
|
||||
TestAlmostEqual(lon, -0.592330);
|
||||
|
||||
TEST(MatchMGRSCoords("31N BA 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 0.000000);
|
||||
TestAlmostEqual(lon, 0.304980);
|
||||
|
||||
TEST(MatchMGRSCoords("32R LR 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 27.107980);
|
||||
TestAlmostEqual(lon, 6.982490);
|
||||
|
||||
TEST(MatchMGRSCoords("32R MR 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 27.118850);
|
||||
TestAlmostEqual(lon, 7.991060);
|
||||
|
||||
TEST(MatchMGRSCoords("33R TK 05023 99880", lat, lon), ());
|
||||
TestAlmostEqual(lat, 27.089890);
|
||||
TestAlmostEqual(lon, 12.025310);
|
||||
|
||||
TEST(MatchMGRSCoords("31R GQ 69322 99158", lat, lon), ());
|
||||
TestAlmostEqual(lat, 31.596040);
|
||||
TestAlmostEqual(lon, 5.838410);
|
||||
|
||||
TEST(MatchMGRSCoords("35L KF 50481 01847", lat, lon), ());
|
||||
TestAlmostEqual(lat, -13.541120);
|
||||
TestAlmostEqual(lon, 24.694510);
|
||||
|
||||
TEST(MatchMGRSCoords("33L YL 59760 01153", lat, lon), ());
|
||||
TestAlmostEqual(lat, -9.028520);
|
||||
TestAlmostEqual(lon, 17.362850);
|
||||
|
||||
TEST(MatchMGRSCoords("36G VR 27441 12148", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.040410);
|
||||
TestAlmostEqual(lon, 32.078730);
|
||||
|
||||
TEST(MatchMGRSCoords("41R KQ 30678 99158", lat, lon), ());
|
||||
TestAlmostEqual(lat, 31.596040);
|
||||
TestAlmostEqual(lon, 60.161590);
|
||||
|
||||
TEST(MatchMGRSCoords("43F CF 66291 06635", lat, lon), ());
|
||||
TestAlmostEqual(lat, -49.578080);
|
||||
TestAlmostEqual(lon, 73.150400);
|
||||
|
||||
TEST(MatchMGRSCoords("43F DF 65832 14591", lat, lon), ());
|
||||
TestAlmostEqual(lat, -49.520340);
|
||||
TestAlmostEqual(lon, 74.527920);
|
||||
|
||||
TEST(MatchMGRSCoords("41G NL 72559 12148", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.040410);
|
||||
TestAlmostEqual(lon, 63.921270);
|
||||
|
||||
TEST(MatchMGRSCoords("41G PL 72152 04746", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.089800);
|
||||
TestAlmostEqual(lon, 65.187670);
|
||||
|
||||
TEST(MatchMGRSCoords("42G UR 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.125150);
|
||||
TestAlmostEqual(lon, 66.456880);
|
||||
|
||||
TEST(MatchMGRSCoords("42G VR 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.146390);
|
||||
TestAlmostEqual(lon, 67.727970);
|
||||
|
||||
TEST(MatchMGRSCoords("42G WR 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.153480);
|
||||
TestAlmostEqual(lon, 69.000000);
|
||||
|
||||
TEST(MatchMGRSCoords("42G XR 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.146390);
|
||||
TestAlmostEqual(lon, 70.272030);
|
||||
|
||||
TEST(MatchMGRSCoords("42G YR 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.125150);
|
||||
TestAlmostEqual(lon, 71.543120);
|
||||
|
||||
TEST(MatchMGRSCoords("43G CL 27848 04746", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.089800);
|
||||
TestAlmostEqual(lon, 72.812330);
|
||||
|
||||
TEST(MatchMGRSCoords("43G DL 27441 12148", lat, lon), ());
|
||||
TestAlmostEqual(lat, -45.040410);
|
||||
TestAlmostEqual(lon, 74.078730);
|
||||
|
||||
TEST(MatchMGRSCoords("41G PR 08066 09951", lat, lon), ());
|
||||
TestAlmostEqual(lat, -40.554160);
|
||||
TestAlmostEqual(lon, 64.276370);
|
||||
|
||||
TEST(MatchMGRSCoords("41G QR 07714 03147", lat, lon), ());
|
||||
TestAlmostEqual(lat, -40.596410);
|
||||
TestAlmostEqual(lon, 65.454770);
|
||||
|
||||
TEST(MatchMGRSCoords("42G UA 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, -40.626640);
|
||||
TestAlmostEqual(lon, 66.635320);
|
||||
|
||||
TEST(MatchMGRSCoords("43L GF 49519 01847", lat, lon), ());
|
||||
TestAlmostEqual(lat, -13.541120);
|
||||
TestAlmostEqual(lon, 77.305490);
|
||||
|
||||
TEST(MatchMGRSCoords("45L VL 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, -9.045430);
|
||||
TestAlmostEqual(lon, 86.090120);
|
||||
|
||||
TEST(MatchMGRSCoords("50Q KE 64726 97325", lat, lon), ());
|
||||
TestAlmostEqual(lat, 18.051740);
|
||||
TestAlmostEqual(lon, 114.777360);
|
||||
|
||||
TEST(MatchMGRSCoords("53F LF 66291 06635", lat, lon), ());
|
||||
TestAlmostEqual(lat, -49.578080);
|
||||
TestAlmostEqual(lon, 133.150400);
|
||||
|
||||
TEST(MatchMGRSCoords("60F VL 65832 14591", lat, lon), ());
|
||||
TestAlmostEqual(lat, -49.520340);
|
||||
TestAlmostEqual(lon, 176.527920);
|
||||
|
||||
|
||||
TEST(MatchMGRSCoords("04X ER 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 81.060880);
|
||||
TestAlmostEqual(lon, -159.000000);
|
||||
|
||||
TEST(MatchMGRSCoords("05X MK 95564 95053", lat, lon), ());
|
||||
TestAlmostEqual(lat, 81.016470);
|
||||
TestAlmostEqual(lon, -153.254480);
|
||||
|
||||
TEST(MatchMGRSCoords("08X ME 93476 90354", lat, lon), ());
|
||||
TestAlmostEqual(lat, 72.012660);
|
||||
TestAlmostEqual(lon, -135.189280);
|
||||
|
||||
TEST(MatchMGRSCoords("12H TF 59828 01847", lat, lon), ());
|
||||
TestAlmostEqual(lat, -36.098350);
|
||||
TestAlmostEqual(lon, -113.667820);
|
||||
|
||||
TEST(MatchMGRSCoords("15N YA 67993 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 0.000000);
|
||||
TestAlmostEqual(lon, -90.592330);
|
||||
|
||||
TEST(MatchMGRSCoords("16N BF 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 0.000000);
|
||||
TestAlmostEqual(lon, -89.695020);
|
||||
|
||||
TEST(MatchMGRSCoords("16N CF 00000 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 0.000000);
|
||||
TestAlmostEqual(lon, -88.797050);
|
||||
|
||||
TEST(MatchMGRSCoords("21L TL 40240 01153", lat, lon), ());
|
||||
TestAlmostEqual(lat, -9.028520);
|
||||
TestAlmostEqual(lon, -59.362850);
|
||||
|
||||
TEST(MatchMGRSCoords("24P YV 49519 98153", lat, lon), ());
|
||||
TestAlmostEqual(lat, 13.541120);
|
||||
TestAlmostEqual(lon, -36.694510);
|
||||
|
||||
TEST(MatchMGRSCoords("31K BA 64726 02675", lat, lon), ());
|
||||
TestAlmostEqual(lat, -18.051740);
|
||||
TestAlmostEqual(lon, 0.777360);
|
||||
|
||||
TEST(MatchMGRSCoords("31N BA 32007 00000", lat, lon), ());
|
||||
TestAlmostEqual(lat, 0.000000);
|
||||
TestAlmostEqual(lon, 0.592330);
|
||||
TestAlmostEqual(MatchMGRSCoords("04X ER 00000 00000"), 81.060880, -159.000000);
|
||||
TestAlmostEqual(MatchMGRSCoords("05X MK 95564 95053"), 81.016470, -153.254480);
|
||||
TestAlmostEqual(MatchMGRSCoords("08X ME 93476 90354"), 72.012660, -135.189280);
|
||||
TestAlmostEqual(MatchMGRSCoords("12H TF 59828 01847"), -36.098350, -113.667820);
|
||||
TestAlmostEqual(MatchMGRSCoords("15N YA 67993 00000"), 0.000000, -90.592330);
|
||||
TestAlmostEqual(MatchMGRSCoords("16N BF 00000 00000"), 0.000000, -89.695020);
|
||||
TestAlmostEqual(MatchMGRSCoords("16N CF 00000 00000"), 0.000000, -88.797050);
|
||||
TestAlmostEqual(MatchMGRSCoords("21L TL 40240 01153"), -9.028520, -59.362850);
|
||||
TestAlmostEqual(MatchMGRSCoords("24P YV 49519 98153"), 13.541120, -36.694510);
|
||||
TestAlmostEqual(MatchMGRSCoords("31K BA 64726 02675"), -18.051740, 0.777360);
|
||||
TestAlmostEqual(MatchMGRSCoords("31N BA 32007 00000"), 0.000000, 0.592330);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ size_t MatchLong(string const & query, long &value, size_t startPos);
|
|||
// Parse UTM format "(\d\d)\s?(\W)\s+(\d+)\s+(\d+)" and converts it to lat,lon.
|
||||
// Return true if parsed successfully or false otherwise.
|
||||
// See utm_mgrs_coords_match_test.cpp for sample UTM strings
|
||||
bool MatchUTMCoords(string const & query, double & lat, double & lon)
|
||||
std::optional<ms::LatLon> MatchUTMCoords(string const & query)
|
||||
{
|
||||
int zone_code;
|
||||
char zone_letter;
|
||||
|
|
@ -34,21 +34,21 @@ bool MatchUTMCoords(string const & query, double & lat, double & lon)
|
|||
|
||||
size_t pos = MatchZoneCode(query, zone_code);
|
||||
if (pos == string::npos)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
pos = MatchZoneLetter(query, zone_letter, pos);
|
||||
if (pos == string::npos)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
pos = MatchLong(query, easting, pos);
|
||||
if (pos == string::npos)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
pos = MatchLong(query, northing, pos);
|
||||
if (pos == string::npos)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
return utm_mgrs_utils::UTMtoLatLon((double)easting, (double)northing, zone_code, zone_letter, lat, lon);
|
||||
return utm_mgrs_utils::UTMtoLatLon((double)easting, (double)northing, zone_code, zone_letter);
|
||||
}
|
||||
|
||||
// Matches 2 digits zone code. Returns end position of matched chars or string::npos if no match.
|
||||
|
|
@ -112,7 +112,7 @@ size_t MatchLong(string const & query, long &value, size_t startPos)
|
|||
// Parse MGRS format "(\d\d\W)\s*(\W\W)\s*(\d+)\s*(\d+)" and converts it to lat,lon.
|
||||
// Returns true if parsed successfully or false otherwise.
|
||||
// See utm_mgrs_coords_match_test.cpp for sample MGRS strings
|
||||
bool MatchMGRSCoords(std::string const & query, double & lat, double & lon)
|
||||
std::optional<ms::LatLon> MatchMGRSCoords(std::string const & query)
|
||||
{
|
||||
long zone_code;
|
||||
char zone_letter;
|
||||
|
|
@ -124,7 +124,7 @@ bool MatchMGRSCoords(std::string const & query, double & lat, double & lon)
|
|||
|
||||
strings::SimpleTokenizer it(query, " \t\r");
|
||||
if (!it)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
auto token = std::string(*it);
|
||||
// Parse 2 digit zone code and 1 char zone letter
|
||||
|
|
@ -133,24 +133,24 @@ bool MatchMGRSCoords(std::string const & query, double & lat, double & lon)
|
|||
char dig1 = token[0];
|
||||
char dig2 = token[1];
|
||||
if (dig1 < '0' || dig1 > '9' || dig2 < '0' || dig2 > '9')
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
zone_code = (dig1 - '0') * 10 + (dig2 - '0');
|
||||
if (zone_code<1 || zone_code > 60)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
zone_letter = token[2];
|
||||
token = token.substr(3);
|
||||
}
|
||||
else
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
// Read next token if needed.
|
||||
if (token.size() == 0)
|
||||
{
|
||||
++it;
|
||||
if (!it)
|
||||
return false;
|
||||
return nullopt;
|
||||
token = std::string(*it);
|
||||
}
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ bool MatchMGRSCoords(std::string const & query, double & lat, double & lon)
|
|||
{
|
||||
++it;
|
||||
if (!it)
|
||||
return false;
|
||||
return nullopt;
|
||||
token = std::string(*it);
|
||||
}
|
||||
|
||||
|
|
@ -184,7 +184,7 @@ bool MatchMGRSCoords(std::string const & query, double & lat, double & lon)
|
|||
{
|
||||
// eastingStr contains both easting and northing. Let's split
|
||||
if (eastingStr.size()%2 != 0)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
int eastingSize = eastingStr.size()/2;
|
||||
northingStr = eastingStr.substr(eastingSize);
|
||||
|
|
@ -192,10 +192,10 @@ bool MatchMGRSCoords(std::string const & query, double & lat, double & lon)
|
|||
}
|
||||
|
||||
if (eastingStr.size() != northingStr.size() || eastingStr.size()>5 || northingStr.size()>5)
|
||||
return false;
|
||||
return nullopt;
|
||||
|
||||
if (!strings::to_int64(eastingStr, easting))
|
||||
return false;
|
||||
return nullopt;
|
||||
if (eastingStr.size() < 5)
|
||||
{
|
||||
int decShift = 5 - eastingStr.size();
|
||||
|
|
@ -203,14 +203,14 @@ bool MatchMGRSCoords(std::string const & query, double & lat, double & lon)
|
|||
}
|
||||
|
||||
if (!strings::to_int64(northingStr, northing))
|
||||
return false;
|
||||
return nullopt;
|
||||
if (northingStr.size() < 5)
|
||||
{
|
||||
int decShift = 5 - northingStr.size();
|
||||
northing *= base::PowUint(10L, decShift);
|
||||
}
|
||||
|
||||
return utm_mgrs_utils::MGRStoLatLon((double)easting, (double)northing, zone_code, zone_letter, square_code, lat, lon);
|
||||
return utm_mgrs_utils::MGRStoLatLon((double)easting, (double)northing, zone_code, zone_letter, square_code);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "geometry/latlon.hpp"
|
||||
|
||||
namespace search
|
||||
{
|
||||
// Parses input query for UTM and MGRS coordinate formats.
|
||||
bool MatchUTMCoords(std::string const & query, double & lat, double & lon);
|
||||
bool MatchMGRSCoords(std::string const & query, double & lat, double & lon);
|
||||
std::optional<ms::LatLon> MatchUTMCoords(std::string const & query);
|
||||
std::optional<ms::LatLon> MatchMGRSCoords(std::string const & query);
|
||||
} // namespace search
|
||||
|
|
|
|||
Reference in a new issue