Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/ATC-53 #89

Merged
merged 41 commits into from
Nov 24, 2016
Merged

feature/ATC-53 #89

Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d54a136
feature/ATC-53 - Adds TODO and FIXME comments to fms file in prep for…
n8rzz Oct 31, 2016
89aa66e
Merge branch 'feature/ATC-18' of https://github.com/n8rzz/atc into fe…
n8rzz Oct 31, 2016
767c973
feature/ATC-53 - Creates getters for currentLeg and currentWaypoint
n8rzz Oct 31, 2016
0e28eb0
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 3, 2016
c2c17b5
feature/ATC-53 - adds .getFixPositionCoordinates() to FixCollection.
n8rzz Nov 4, 2016
b93a087
feature/ATC-53 - Adds aircraftConstants and updates refs to use new f…
n8rzz Nov 4, 2016
2c21396
feature/ATC-53 - Cleans and streamlines Waypoint, adds example commen…
n8rzz Nov 5, 2016
f93adc3
feature/ATC-53 - Adds docblocs to Leg
n8rzz Nov 5, 2016
cf98892
feature/ATC-53 - Adds restriction parsing to StandardRouteWaypointModel
n8rzz Nov 6, 2016
c2a945f
feature/ATC-53 - Adds .gemerateFmsWaypoint() to StandardWaypointModel.
n8rzz Nov 6, 2016
f756539
feature/ATC-53 - Updates Leg to use the RouteModel and
n8rzz Nov 6, 2016
2d7349c
feature/ATC-53 - Updates FixCollection.findFixByName() to uppercase t…
n8rzz Nov 7, 2016
26a1b4d
feature/ATC-53 - Begins implementing sid and starCollection with Rout…
n8rzz Nov 7, 2016
941811e
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 7, 2016
0809408
feature/ATC-53 - Updates comments and removes old TODOs
n8rzz Nov 7, 2016
6c1442e
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 11, 2016
403fc37
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 11, 2016
33db91c
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 12, 2016
0109343
feature/ATC-53 - Abstracts restrictions logic to Waypoint
n8rzz Nov 14, 2016
42fc97c
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 14, 2016
733547d
feature/ATC-53 - Simplifies .descendViaSTAR()
n8rzz Nov 14, 2016
20041e4
feature/ATC-53 - Replaces fms ref with airportInstanceModel ref in Wa…
n8rzz Nov 15, 2016
d755738
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 16, 2016
0a3900f
feature/ATC-53 - Adds _get to Waypoint for populating class propertie…
n8rzz Nov 16, 2016
4ca86a2
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 18, 2016
eb17c73
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 20, 2016
3643da1
feature/ATC-53 - Fixes merge conflict wonkiness, several items were
n8rzz Nov 20, 2016
29931de
feature/ATC-53 - Updates Waypoint to use ternay assignment inside of …
n8rzz Nov 20, 2016
fa548e2
feature/ATC-53 - updates _generateManualWaypoint() to pass route not fix
n8rzz Nov 20, 2016
a4ee77d
feature/ATC-53 - Adds enum for flight category
n8rzz Nov 20, 2016
767c40c
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 20, 2016
4776baa
feature/ATC-53 - Uncomments ga block in index.html
n8rzz Nov 21, 2016
d0fb9f9
feature/ATC-53 - adds _isNil to fms
n8rzz Nov 21, 2016
ce8690c
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 21, 2016
5814e67
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 21, 2016
b8fda4b
feature/ATC-53 - Removes _runwayCollection from StandardRouteModel
n8rzz Nov 22, 2016
d9346e9
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 22, 2016
defce8d
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 24, 2016
2a92c41
feature/ATC-53 - Adds doc blocks to AircraftFlightManagementSystem cl…
n8rzz Nov 24, 2016
4eefce9
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 24, 2016
cbfd296
feature/ATC-53 - Updates changelog
n8rzz Nov 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assets/scripts/aircraft/AircraftController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ export default class AircraftController {
// Clean up the screen from aircraft that are too far
if (
(!this.aircraft_visible(aircraft, 2) && !aircraft.inside_ctr) &&
aircraft.fms.currentWaypoint().navmode === 'heading'
aircraft.fms.currentWaypoint.navmode === 'heading'
) {
if (aircraft.category === 'arrival' || aircraft.category === 'departure') {
remove = true;
Expand Down
381 changes: 164 additions & 217 deletions src/assets/scripts/aircraft/AircraftFlightManagementSystem.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading