Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/preprod'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
#	composer.lock
#	package.json
#	sources/Afup/Association/Cotisations.php
#	sources/Afup/Association/Personnes_Morales.php
#	sources/AppBundle/Association/Model/CompanyMember.php
#	sources/AppBundle/Association/Model/User.php
#	sources/AppBundle/Controller/Admin/HomeAction.php
#	sources/AppBundle/Event/Model/Speaker.php
#	sources/AppBundle/Event/Model/Talk.php
#	sources/AppBundle/Twig/AssetsExtension.php
#	yarn.lock
  • Loading branch information
stakovicz committed Feb 9, 2025
2 parents 02ece75 + cb513d3 commit 69d7bbe
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sources/AppBundle/Offices/OfficeFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ protected function locateNearestLocalOffice(Coordinates $coordinates): array
private function haversineGreatCircleDistance(float $latitudeFrom, float $longitudeFrom, float $latitudeTo, float $longitudeTo, int $earthRadius = 6371000): float
{
// convert from degrees to radians
$latFrom = deg2rad($latitudeFrom);
$lonFrom = deg2rad($longitudeFrom);
$latTo = deg2rad($latitudeTo);
$lonTo = deg2rad($longitudeTo);
$latFrom = deg2rad((float) $latitudeFrom);
$lonFrom = deg2rad((float) $longitudeFrom);
$latTo = deg2rad((float) $latitudeTo);
$lonTo = deg2rad((float) $longitudeTo);

$latDelta = $latTo - $latFrom;
$lonDelta = $lonTo - $lonFrom;
Expand Down

0 comments on commit 69d7bbe

Please sign in to comment.