Skip to content

Commit

Permalink
Merge branch '09_display_hints' of github.com:HE-Arc/Swissdle into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
nicomaht committed Dec 18, 2023
2 parents f8145cf + 970448c commit ddf7c36
Show file tree
Hide file tree
Showing 6 changed files with 2,470 additions and 1,667 deletions.
7 changes: 1 addition & 6 deletions backend-laravel/app/Utility/CityComparator.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ public function compareToToday($guessedId)
$guessedCity = Ville::with('canton')->
where('id', $guessedId)->firstOrFail();

if($current->id == $guessedId)
{
return ['city' => $guessedCity];
}

return [
'city' => $guessedCity,
'canton_diff' => $current->canton_id == $guessedCity->canton_id ,
Expand Down Expand Up @@ -62,4 +57,4 @@ private static function comparePosition($city1, $city2)
'direction' => Math::direction($lat1, $long1, $lat2, $long2)
];
}
}
}
Loading

0 comments on commit ddf7c36

Please sign in to comment.