Skip to content

Commit a3ab379

Browse files
committed
Ensure that abs applies to double.
1 parent d1629b2 commit a3ab379

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/overpass_api/statements/around.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ Prepared_Point::Prepared_Point
667667

668668
double great_circle_line_dist(const Prepared_Segment& segment, const std::vector< double >& cartesian)
669669
{
670-
double scalar_prod_ = abs(scalar_prod(cartesian, segment.norm))
670+
double scalar_prod_ = std::abs(scalar_prod(cartesian, segment.norm))
671671
/sqrt(scalar_prod(segment.norm, segment.norm));
672672

673673
if (scalar_prod_ > 1)
@@ -682,7 +682,7 @@ double great_circle_line_dist(double llat1, double llon1, double llat2, double l
682682
{
683683
std::vector< double > norm = cross_prod(cartesian(llat1, llon1), cartesian(llat2, llon2));
684684

685-
double scalar_prod_ = abs(scalar_prod(cartesian(plat, plon), norm))
685+
double scalar_prod_ = std::abs(scalar_prod(cartesian(plat, plon), norm))
686686
/sqrt(scalar_prod(norm, norm));
687687

688688
if (scalar_prod_ > 1)
@@ -701,8 +701,8 @@ bool intersect(const Prepared_Segment& segment_a,
701701
std::vector< double > asum = sum(segment_a.first_cartesian, segment_a.second_cartesian);
702702
std::vector< double > bsum = sum(segment_b.first_cartesian, segment_b.second_cartesian);
703703

704-
return (abs(scalar_prod(asum, intersection_pt)) >= scalar_prod(asum, segment_a.first_cartesian)
705-
&& abs(scalar_prod(bsum, intersection_pt)) >= scalar_prod(bsum, segment_b.first_cartesian));
704+
return (std::abs(scalar_prod(asum, intersection_pt)) >= scalar_prod(asum, segment_a.first_cartesian)
705+
&& std::abs(scalar_prod(bsum, intersection_pt)) >= scalar_prod(bsum, segment_b.first_cartesian));
706706
}
707707

708708

@@ -722,8 +722,8 @@ bool intersect(double alat1, double alon1, double alat2, double alon2,
722722
std::vector< double > asum = sum(a1, a2);
723723
std::vector< double > bsum = sum(b1, b2);
724724

725-
return (abs(scalar_prod(asum, intersection_pt)) >= scalar_prod(asum, a1)
726-
&& abs(scalar_prod(bsum, intersection_pt)) >= scalar_prod(bsum, b1));
725+
return (std::abs(scalar_prod(asum, intersection_pt)) >= scalar_prod(asum, a1)
726+
&& std::abs(scalar_prod(bsum, intersection_pt)) >= scalar_prod(bsum, b1));
727727
}
728728

729729

@@ -749,7 +749,7 @@ void add_coord(double lat, double lon, double radius,
749749
double south = lat - radius*(360.0/(40000.0*1000.0));
750750
double north = lat + radius*(360.0/(40000.0*1000.0));
751751
double scale_lat = lat > 0.0 ? north : south;
752-
if (abs(scale_lat) >= 89.9)
752+
if (std::abs(scale_lat) >= 89.9)
753753
scale_lat = 89.9;
754754
double west = lon - radius*(360.0/(40000.0*1000.0))/cos(scale_lat/90.0*acos(0));
755755
double east = lon + radius*(360.0/(40000.0*1000.0))/cos(scale_lat/90.0*acos(0));

0 commit comments

Comments
 (0)