Skip to content

Commit 97fd301

Browse files
author
berndgassmann
authored
Even larger ENU coordinates (#69)
up to 1e8m
1 parent 9eb4535 commit 97fd301

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎ad_map_access/generated/include/ad/map/point/ENUCoordinateValidInputRange.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* \note the specified input range is defined by
3535
* std::numeric_limits<::ad::map::point::ENUCoordinate>::lowest() <= \c input <=
3636
* std::numeric_limits<::ad::map::point::ENUCoordinate>::max()
37-
* -1e6 <= \c input <= 1e6
37+
* -1e8 <= \c input <= 1e8
3838
*/
3939
inline bool withinValidInputRange(::ad::map::point::ENUCoordinate const &input, bool const logErrors = true)
4040
{
@@ -52,13 +52,13 @@ inline bool withinValidInputRange(::ad::map::point::ENUCoordinate const &input,
5252
if (inValidInputRange)
5353
{
5454
inValidInputRange
55-
= (::ad::map::point::ENUCoordinate(-1e6) <= input) && (input <= ::ad::map::point::ENUCoordinate(1e6));
55+
= (::ad::map::point::ENUCoordinate(-1e8) <= input) && (input <= ::ad::map::point::ENUCoordinate(1e8));
5656
if (!inValidInputRange && logErrors)
5757
{
5858
spdlog::error("withinValidInputRange(::ad::map::point::ENUCoordinate)>> {} out of valid input range [{}, {}]",
5959
input,
60-
::ad::map::point::ENUCoordinate(-1e6),
61-
::ad::map::point::ENUCoordinate(1e6)); // LCOV_EXCL_BR_LINE
60+
::ad::map::point::ENUCoordinate(-1e8),
61+
::ad::map::point::ENUCoordinate(1e8)); // LCOV_EXCL_BR_LINE
6262
}
6363
}
6464
return inValidInputRange;

‎ad_map_access/impl/tests/generated/ad/map/point/ENUCoordinateValidInputRangeTests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,24 @@ TEST(ENUCoordinateValidInputRangeTests, testValidInputRangeExceedsMax)
5050

5151
TEST(ENUCoordinateValidInputRangeTests, testValidInputRangeInputMinOk)
5252
{
53-
::ad::map::point::ENUCoordinate value(-1e6);
53+
::ad::map::point::ENUCoordinate value(-1e8);
5454
ASSERT_TRUE(withinValidInputRange(value));
5555
}
5656

5757
TEST(ENUCoordinateValidInputRangeTests, testValidInputRangeInputMaxOk)
5858
{
59-
::ad::map::point::ENUCoordinate value(1e6);
59+
::ad::map::point::ENUCoordinate value(1e8);
6060
ASSERT_TRUE(withinValidInputRange(value));
6161
}
6262

6363
TEST(ENUCoordinateValidInputRangeTests, testValidInputRangeBelowInputMin)
6464
{
65-
::ad::map::point::ENUCoordinate value(-1e6 * 1.1);
65+
::ad::map::point::ENUCoordinate value(-1e8 * 1.1);
6666
ASSERT_FALSE(withinValidInputRange(value));
6767
}
6868

6969
TEST(ENUCoordinateValidInputRangeTests, testValidInputRangeExceedsInputMax)
7070
{
71-
::ad::map::point::ENUCoordinate value(1e6 * 1.1);
71+
::ad::map::point::ENUCoordinate value(1e8 * 1.1);
7272
ASSERT_FALSE(withinValidInputRange(value));
7373
}

‎ad_map_access/impl/tests/generated/ad/map/point/ENUPointValidInputRangeTests.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,43 @@
2121
TEST(ENUPointValidInputRangeTests, testValidInputRange)
2222
{
2323
::ad::map::point::ENUPoint value;
24-
::ad::map::point::ENUCoordinate valueX(-1e6);
24+
::ad::map::point::ENUCoordinate valueX(-1e8);
2525
value.x = valueX;
26-
::ad::map::point::ENUCoordinate valueY(-1e6);
26+
::ad::map::point::ENUCoordinate valueY(-1e8);
2727
value.y = valueY;
28-
::ad::map::point::ENUCoordinate valueZ(-1e6);
28+
::ad::map::point::ENUCoordinate valueZ(-1e8);
2929
value.z = valueZ;
3030
ASSERT_TRUE(withinValidInputRange(value));
3131
}
3232

3333
TEST(ENUPointValidInputRangeTests, testValidInputRangeXTooSmall)
3434
{
3535
::ad::map::point::ENUPoint value;
36-
::ad::map::point::ENUCoordinate valueX(-1e6);
36+
::ad::map::point::ENUCoordinate valueX(-1e8);
3737
value.x = valueX;
38-
::ad::map::point::ENUCoordinate valueY(-1e6);
38+
::ad::map::point::ENUCoordinate valueY(-1e8);
3939
value.y = valueY;
40-
::ad::map::point::ENUCoordinate valueZ(-1e6);
40+
::ad::map::point::ENUCoordinate valueZ(-1e8);
4141
value.z = valueZ;
4242

4343
// override member with data type value below input range minimum
44-
::ad::map::point::ENUCoordinate invalidInitializedMember(-1e6 * 1.1);
44+
::ad::map::point::ENUCoordinate invalidInitializedMember(-1e8 * 1.1);
4545
value.x = invalidInitializedMember;
4646
ASSERT_FALSE(withinValidInputRange(value));
4747
}
4848

4949
TEST(ENUPointValidInputRangeTests, testValidInputRangeXTooBig)
5050
{
5151
::ad::map::point::ENUPoint value;
52-
::ad::map::point::ENUCoordinate valueX(-1e6);
52+
::ad::map::point::ENUCoordinate valueX(-1e8);
5353
value.x = valueX;
54-
::ad::map::point::ENUCoordinate valueY(-1e6);
54+
::ad::map::point::ENUCoordinate valueY(-1e8);
5555
value.y = valueY;
56-
::ad::map::point::ENUCoordinate valueZ(-1e6);
56+
::ad::map::point::ENUCoordinate valueZ(-1e8);
5757
value.z = valueZ;
5858

5959
// override member with data type value above input range maximum
60-
::ad::map::point::ENUCoordinate invalidInitializedMember(1e6 * 1.1);
60+
::ad::map::point::ENUCoordinate invalidInitializedMember(1e8 * 1.1);
6161
value.x = invalidInitializedMember;
6262
ASSERT_FALSE(withinValidInputRange(value));
6363
}
@@ -73,31 +73,31 @@ TEST(ENUPointValidInputRangeTests, testValidInputRangexDefault)
7373
TEST(ENUPointValidInputRangeTests, testValidInputRangeYTooSmall)
7474
{
7575
::ad::map::point::ENUPoint value;
76-
::ad::map::point::ENUCoordinate valueX(-1e6);
76+
::ad::map::point::ENUCoordinate valueX(-1e8);
7777
value.x = valueX;
78-
::ad::map::point::ENUCoordinate valueY(-1e6);
78+
::ad::map::point::ENUCoordinate valueY(-1e8);
7979
value.y = valueY;
80-
::ad::map::point::ENUCoordinate valueZ(-1e6);
80+
::ad::map::point::ENUCoordinate valueZ(-1e8);
8181
value.z = valueZ;
8282

8383
// override member with data type value below input range minimum
84-
::ad::map::point::ENUCoordinate invalidInitializedMember(-1e6 * 1.1);
84+
::ad::map::point::ENUCoordinate invalidInitializedMember(-1e8 * 1.1);
8585
value.y = invalidInitializedMember;
8686
ASSERT_FALSE(withinValidInputRange(value));
8787
}
8888

8989
TEST(ENUPointValidInputRangeTests, testValidInputRangeYTooBig)
9090
{
9191
::ad::map::point::ENUPoint value;
92-
::ad::map::point::ENUCoordinate valueX(-1e6);
92+
::ad::map::point::ENUCoordinate valueX(-1e8);
9393
value.x = valueX;
94-
::ad::map::point::ENUCoordinate valueY(-1e6);
94+
::ad::map::point::ENUCoordinate valueY(-1e8);
9595
value.y = valueY;
96-
::ad::map::point::ENUCoordinate valueZ(-1e6);
96+
::ad::map::point::ENUCoordinate valueZ(-1e8);
9797
value.z = valueZ;
9898

9999
// override member with data type value above input range maximum
100-
::ad::map::point::ENUCoordinate invalidInitializedMember(1e6 * 1.1);
100+
::ad::map::point::ENUCoordinate invalidInitializedMember(1e8 * 1.1);
101101
value.y = invalidInitializedMember;
102102
ASSERT_FALSE(withinValidInputRange(value));
103103
}
@@ -113,31 +113,31 @@ TEST(ENUPointValidInputRangeTests, testValidInputRangeyDefault)
113113
TEST(ENUPointValidInputRangeTests, testValidInputRangeZTooSmall)
114114
{
115115
::ad::map::point::ENUPoint value;
116-
::ad::map::point::ENUCoordinate valueX(-1e6);
116+
::ad::map::point::ENUCoordinate valueX(-1e8);
117117
value.x = valueX;
118-
::ad::map::point::ENUCoordinate valueY(-1e6);
118+
::ad::map::point::ENUCoordinate valueY(-1e8);
119119
value.y = valueY;
120-
::ad::map::point::ENUCoordinate valueZ(-1e6);
120+
::ad::map::point::ENUCoordinate valueZ(-1e8);
121121
value.z = valueZ;
122122

123123
// override member with data type value below input range minimum
124-
::ad::map::point::ENUCoordinate invalidInitializedMember(-1e6 * 1.1);
124+
::ad::map::point::ENUCoordinate invalidInitializedMember(-1e8 * 1.1);
125125
value.z = invalidInitializedMember;
126126
ASSERT_FALSE(withinValidInputRange(value));
127127
}
128128

129129
TEST(ENUPointValidInputRangeTests, testValidInputRangeZTooBig)
130130
{
131131
::ad::map::point::ENUPoint value;
132-
::ad::map::point::ENUCoordinate valueX(-1e6);
132+
::ad::map::point::ENUCoordinate valueX(-1e8);
133133
value.x = valueX;
134-
::ad::map::point::ENUCoordinate valueY(-1e6);
134+
::ad::map::point::ENUCoordinate valueY(-1e8);
135135
value.y = valueY;
136-
::ad::map::point::ENUCoordinate valueZ(-1e6);
136+
::ad::map::point::ENUCoordinate valueZ(-1e8);
137137
value.z = valueZ;
138138

139139
// override member with data type value above input range maximum
140-
::ad::map::point::ENUCoordinate invalidInitializedMember(1e6 * 1.1);
140+
::ad::map::point::ENUCoordinate invalidInitializedMember(1e8 * 1.1);
141141
value.z = invalidInitializedMember;
142142
ASSERT_FALSE(withinValidInputRange(value));
143143
}

‎ad_map_access/impl/tests/point/CoordinateTransformTests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ TEST_F(CoordianteTransformTest, Distances)
148148
ASSERT_TRUE(isValid(ecef3));
149149

150150
ENUPoint enu0 = mCoordinateTransform.ECEF2ENU(ecef1);
151-
ASSERT_FALSE(isValid(enu0, false));
151+
ASSERT_TRUE(isValid(enu0, false));
152152

153153
mCoordinateTransform.setENUReferencePoint(geo1);
154154
ENUPoint enu1 = mCoordinateTransform.ECEF2ENU(ecef1);

‎doc/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Release 2.4.8
22
#### :ghost: Maintenance
3-
* Allow larger ENUCoordinates up to 1e9 (previously 1e6) and ENUCoordinate input up to 1e7 (previously 1.6e4)
3+
* Allow larger ENUCoordinates up to 1e9 (previously 1e6) and ENUCoordinate input up to 1e8 (previously 1.6e4)
44

55
## Release 2.4.7
66
#### :ghost: Maintenance

0 commit comments

Comments
 (0)