FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7.0.0-beta3 Release (#541)

Browse Source 
* 391 Notification refactorings (#441)

* Refactor notifications to allow easier plugins

* Notification refactoring

* Formatting

* Move news to NewsService; cleanup of events

* More refactoring; added send email out for news item and the template

* Formatting

* Formatting

* Fix missing newsRepo (#445)

* Refactor and add importer to Installer module #443 (#444)

* Refactor and add importer to Installer module #443

* Refactor for finances to use in import

* Import groups into roles

* Formatting

* Formatting

* Add interface in installer for import

* Notes about importing

* Check for installer folder

* Formatting

* Fix pirep->user mapping

* Unused import

* Formatting

* Replace importer with AJAX powered; better error handling #443 (#447)

* Replace importer with AJAX powered; better error handling #443

* Formatting

* Fix command line importer

* Remove bootstrap cache (#448)

* Cleanup the bootstrap/cache directory when packaging

* Fix removal of bootstrap cache

* Formatting

* Stricter checks on ACARS API data (#451)

* Stricter checks on ACARS API data

* More checks

* Fix for flight_number check forcing to exist

* Allow nullable on flight_id

* Avoid proc_open use #455 (#456)

* Use PhpExecutableFinder() closes #457 #458 (#460)

* Use DateTimeZone instead of int for creating datetime

closes #461

* Fix CSV imports giving Storage class not found #454 (#462)

* Fix CSV imports giving Storage class not found #454

* Update yarn files for security alert

* Add PHP 7.4 support (#464)

* Add PHP 7.4 to build matrix

* DB fix

* YAML parser fix in test data

* Show versions

* Package updates

* Track used ICAOs

* 7.4 METAR parsing fix

* METAR parser fix

* Formatting

* Add meters to response units

* Call instance for unit conversion

* Return value

* Catch exception for unknown quantity

* Comment fix

* Formatting

* METAR parsing fixes on PHP 7.4

* Package updates

* More random airport ID

* More random airport ID

* Properly disable toolbar

* Semver written out to version file

* Use dev as default identifier

* Fix BindingResolutionError when debug toolbar isn't present (#465)

* Fix BindingResolutionError when debug toolbar isn't present

* Formatting

* Split the importer module out from the installer module (#468)

* Split the importer module out from the installer module

* Cleanup of unused imports

* Move updater into separate module #453

* Remove unused imports/formatting

* Disable the install and importer modules at the end of the setup

* Unused imports; update IJ style

* test explicit stage for php+mysql

* add more to matrix

* Add different MariaDB versions

* undo

* Cleanup Model doc

* Pilots cannot use the dashboard or flights without admin rights (#481)

* Use auth middleware instead of specific groups for logged in state

* Auth check for admin access

* Check user admin access for updates

* Formatting

* Allow nullable field and calculate distance if nulled for flight import #478 (#482)

* Check for no roles being attached #480 (#483)

* Return the flight fares if there are no subfleet fares #488 (#489)

* Return the flight fares if there are no subfleet fares #488

* Formatting

* Formatting

* Account for units when entering fuel amounts #493

* Search for ICAO not working properly (#496)

* /flights and /flights/search direct to the same endpoint

* Properly set the distance/planned_distance on save (#497)

* 491 Installation Error (#495)

* Disable CSRF token

* Add error handling around looking up the theme and set a default

* Note about logs in issue template

* Formatting

* Fix GeoService errors when viewing PIREP #498 (#499)

* Add new command to export a specific PIREP for debugging (#501)

* Set a default model value for airports on PIREP (#500)

* Set a default model value for airports on PIREP

* Fix airport icao reference

* Default airport models

* Catch broader exception writing out config files #491

* style

* Add reference to docs on doc site (#502)

* Properly create/update rows importing #486 (#503)

* Add base Dockerfile for Dockerhub builds (#504)

* New subfleet not being attached to an airline on import #479 (#505)

* Fix subfleet not being attached to an airline on creation in import #479

* Call airline name with optional() around subfleet

* Minor cleanup

* Search flights by subfleet #484 (#506)

* API level search of flights #484

* Add Subfleet to flights page for search

* Make the fuel used optional (#512)

* Add make to Docker container

* Add getRootDomain() to Utils (#514)

* Show admin dropdown for admin-access ability (#515)

* Show admin dropdown for admin-access ability closes #509

* Formatting

* Check user permissions on the routes #508 (#516)

* Check user permissions on the routes #508

* Formatting

* Return default value on exception for setting()

* Correct text for no subfleets #507 (#518)

* Add a public_url() helper #513 (#519)

* Reduce number of queries for update check (#520)

* Try to clear caches before updating (#522)

* Try to clear caches before updating

* Add clear-compiled to maintenance cache list

* Formatting

* Set PIREPs page to public (#526)

Set PIREPs page to public

* Fix live and route map errors #527 (#528)

* Add menu bar for mobile (#529)

* Format all blade templates to 2 spaces #530 (#531)

* Fix PIREP edit endpoint closes #533 (#534)

* Fix import during flight cron #532 (#535)

* PIREPS resource except for show (#536)

* Use optional() around the airport fields (#537)

* Use optional() around the airport fields

* Add null-coalesce around full_name

* Add link to download ACARS config from profile (#539)

* Add link to download ACARS config from profile

* Formatting

* Update xml config file template (#540)
This commit is contained in:
Nabeel S
2020-02-08 13:29:34 -05:00
committed by GitHub
parent a335ed8e9b
commit 073e48c396
515 changed files with 13939 additions and 10717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/Services/GeoService.php
View File

@@ -221,20 +221,12 @@ class GeoService extends Service
]);
}
/*
* @var $point \App\Models\Acars
*/
/*foreach ($pirep->acars as $point) {
$route->addPoint($point->lat, $point->lon, [
'pirep_id' => $pirep->id,
'alt' => $point->altitude,
]);
}*/
return [
// If there is a position update from ACARS, show where it is
// Otherwise, just assume it's at the arrival airport currently
'position' => [
'lat' => $pirep->position->lat,
'lon' => $pirep->position->lon,
'lat' => optional($pirep->position)->lat ?? $pirep->arr_airport->lat,
'lon' => optional($pirep->position)->lon ?? $pirep->arr_airport->lon,
],
'line' => $route->getLine(),
'points' => $route->getPoints(),
@@ -299,17 +291,17 @@ class GeoService extends Service
$route = new GeoJson();
//# Departure Airport
$route->addPoint($flight->dpt_airport->lat, $flight->dpt_airport->lon, [
'name' => $flight->dpt_airport->icao,
'popup' => $flight->dpt_airport->full_name,
$route->addPoint(optional($flight->dpt_airport)->lat, optional($flight->dpt_airport)->lon, [
'name' => $flight->dpt_airport_id,
'popup' => optional($flight->dpt_airport)->full_name ?? $flight->dpt_airport_id,
'icon' => 'airport',
]);
if ($flight->route) {
$all_route_points = $this->getCoordsFromRoute(
$flight->dpt_airport->icao,
$flight->arr_airport->icao,
[$flight->dpt_airport->lat, $flight->dpt_airport->lon],
$flight->dpt_airport_id,
$flight->arr_airport_id,
[optional($flight->dpt_airport)->lat, optional($flight->dpt_airport)->lon],
$flight->route
);
@@ -323,9 +315,9 @@ class GeoService extends Service
}
}
$route->addPoint($flight->arr_airport->lat, $flight->arr_airport->lon, [
'name' => $flight->arr_airport->icao,
'popup' => $flight->arr_airport->full_name,
$route->addPoint(optional($flight->arr_airport)->lat, optional($flight->arr_airport)->lon, [
'name' => $flight->arr_airport_id,
'popup' => optional($flight->arr_airport)->full_name ?? $flight->arr_airport_id,
'icon' => 'airport',
]);
@@ -350,9 +342,9 @@ class GeoService extends Service
/*
* PLANNED ROUTE
*/
$planned->addPoint($pirep->dpt_airport->lat, $pirep->dpt_airport->lon, [
'name' => $pirep->dpt_airport->icao,
'popup' => $pirep->dpt_airport->full_name,
$planned->addPoint(optional($pirep->dpt_airport)->lat, optional($pirep->dpt_airport)->lon, [
'name' => $pirep->dpt_airport_id,
'popup' => optional($pirep->dpt_airport)->full_name ?? $pirep->dpt_airport_id,
]);
$planned_route = $this->acarsRepo->forPirep($pirep->id, AcarsType::ROUTE);
@@ -363,9 +355,9 @@ class GeoService extends Service
]);
}
$planned->addPoint($pirep->arr_airport->lat, $pirep->arr_airport->lon, [
'name' => $pirep->arr_airport->icao,
'popup' => $pirep->arr_airport->full_name,
$planned->addPoint(optional($pirep->arr_airport)->lat, optional($pirep->arr_airport)->lon, [
'name' => $pirep->arr_airport_id,
'popup' => optional($pirep->arr_airport)->full_name ?? $pirep->arr_airport_id,
'icon' => 'airport',
]);
@@ -382,9 +374,8 @@ class GeoService extends Service
}
return [
'planned_rte_points' => $planned->getPoints(),
'planned_rte_line' => $planned->getLine(),
'planned_rte_points' => $planned->getPoints(),
'planned_rte_line' => $planned->getLine(),
'actual_route_points' => $actual->getPoints(),
'actual_route_line' => $actual->getLine(),
];