Compare commits
No commits in common. "fb5b0347fbd1aa373d5ae527fae44f7824381f60" and "cca7284d9d86cb4a15a94706b7f194ea1ed697ac" have entirely different histories.
fb5b0347fb
...
cca7284d9d
3 changed files with 16 additions and 35 deletions
|
@ -21,23 +21,7 @@ class TrackerController extends Controller
|
|||
*/
|
||||
public function show_past_trips_list()
|
||||
{
|
||||
$trips = [];
|
||||
|
||||
foreach (config('app.past_trip_ids') as $tripId) {
|
||||
$tripData = $this->get_trip_data($tripId, false);
|
||||
$trips[$tripId] = [
|
||||
'name' => $tripData->name,
|
||||
'start_date' => new DateTime($tripData->date_start),
|
||||
'end_date' => new DateTime($tripData->date_end)
|
||||
];
|
||||
}
|
||||
|
||||
return view(
|
||||
'past-trips',
|
||||
[
|
||||
'trips' => $trips
|
||||
]
|
||||
);
|
||||
return view('past-trips');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -14,10 +14,9 @@
|
|||
|
||||
<main id="pastTripsList">
|
||||
<ol>
|
||||
@php $DATE_FORMAT = 'M Y' @endphp
|
||||
@foreach ($trips as $trip_id => $trip)
|
||||
<li><a href="/{{ $trip_id }}">{{ $trip['name'] }}</a> <span>({{ $trip['start_date']->format($DATE_FORMAT) }} to {{ $trip['end_date']->format($DATE_FORMAT) }})</span></li>
|
||||
@endforeach
|
||||
<li><a href="/x8gkdo56o7k3eyp3w2ql">Monkey Run Scotland 2022</a></li>
|
||||
<li><a href="/47xj8go928ql9mq3r20p">Europespedition III: Leds Free or Die Hard</a></li>
|
||||
<li><a href="/2ozdklm6dro0951n04xg">Bentral American Diaries</a></li>
|
||||
</ol>
|
||||
</main>
|
||||
</body>
|
||||
|
|
|
@ -68,8 +68,7 @@
|
|||
@php
|
||||
// Privacy zones
|
||||
$privacyLatLons = config('app.privacy_lat_lons');
|
||||
foreach ($privacyLatLons as $latLonUnparsed) {
|
||||
$latLon = explode(',', $latLonUnparsed);
|
||||
$latLon = explode(',', $privacyLatLons[0]);
|
||||
if (
|
||||
!(
|
||||
( $location->latitude - $latLon[0] > 0.01 ) || ( $location->latitude - $latLon[0] < -0.01 ) ||
|
||||
|
@ -79,7 +78,6 @@
|
|||
$location->latitude = $location->latitude + ((rand(0,2)-1)/100);
|
||||
$location->longitude = $location->longitude + ((rand(0,2)-1)/100);
|
||||
}
|
||||
}
|
||||
@endphp
|
||||
|
||||
[{{ $location->latitude }}, {{ $location->longitude }}],
|
||||
|
|
Loading…
Reference in a new issue