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.

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

release/3.2.0 #755

Merged
merged 252 commits into from
Dec 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
252 commits
Select commit Hold shift + click to select a range
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
4913351
feature/ATC-77 - Adds initial code for ModelSourceFactory and ModelSo…
n8rzz Nov 17, 2016
675361a
Merge branch 'feature/ATC-100' of https://github.com/n8rzz/atc into f…
n8rzz Nov 18, 2016
4ca86a2
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 18, 2016
bcabc46
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 18, 2016
1943a06
feature/ATC-77 - Implements ModelSourcePool with FixCollection and Fi…
n8rzz Nov 19, 2016
547ae72
feature/ATC-77 - Adds comments about future models to add to pool
n8rzz Nov 19, 2016
4087803
feature/ATC-77 - Adds documentation and TODOs
n8rzz Nov 19, 2016
615014c
feature/ATC-77 - updates deprecated name in failing unit test.
n8rzz Nov 19, 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
e5e6714
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
afe6f6d
Merge branch 'release/3.1.0' of https://github.com/n8rzz/atc into gh-…
n8rzz Nov 21, 2016
6153062
ARCH - version bump
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
18eb114
Change $("#airport") to $("#clock")
erikquinn Nov 21, 2016
4272b8d
Add UTC clock
erikquinn Nov 21, 2016
99d5a2c
Refactor game clock to new class GameClockView
erikquinn Nov 21, 2016
b8fda4b
feature/ATC-53 - Removes _runwayCollection from StandardRouteModel
n8rzz Nov 22, 2016
7822775
Merge branch 'gh-pages' of https://github.com/zlsa/atc into gh-pages
n8rzz Nov 22, 2016
c32d2b9
Merge branch 'gh-pages' of https://github.com/n8rzz/atc into release/…
n8rzz Nov 22, 2016
4c6166b
ARCH - adds bundles back to .gitignore and removes cached bundles aft…
n8rzz Nov 22, 2016
d9346e9
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 22, 2016
81a5ee6
feature/ATC-123 - Moves gameOptions to constants dir
n8rzz Nov 22, 2016
e59a841
feature/ATC-144 - Adds new getter in StandardRouteCollection that
n8rzz Nov 22, 2016
a88e7b1
feature/ATC-144 - Adds documentation and TODOs to CanvasController
n8rzz Nov 23, 2016
5342116
ARCH - Adds v3.2.0 section to CHANGELOG.md
n8rzz Nov 23, 2016
c08e05e
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 23, 2016
65ff134
feature/ATC-144 - Adds changelog entry
n8rzz Nov 23, 2016
f0127f2
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 23, 2016
170ddc9
feature/ATC-77 - Adds changelog entry
n8rzz Nov 23, 2016
addc313
bugfix//ATC-145 - Moves _comment blocks to be within object they are
n8rzz Nov 23, 2016
24bb24b
feature/ATC-77 - Updates ModelSourcePool.releaseReusable() to accept
n8rzz Nov 23, 2016
e2bd666
Merge pull request #147 from n8rzz/bugfix/ATC-145
n8rzz Nov 23, 2016
ce7859c
featureATC-144 - Fixes spelling error in StandardRouteCollection
n8rzz Nov 23, 2016
4d0ee06
Merge pull request #146 from n8rzz/feature/ATC-144
n8rzz Nov 23, 2016
93ce4a1
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 23, 2016
270531d
Merge pull request #143 from n8rzz/feature/ATC-123
n8rzz Nov 24, 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
ea02f20
Merge branch 'release/3.2.0' of https://github.com/n8rzz/atc into dev…
n8rzz Nov 24, 2016
deda0da
feature/ATC-52 - Removes `$.each()` from `AirportModel` in favor of `…
n8rzz Nov 24, 2016
780f6e0
feature/ATC-55 - Moves properties shared by all `Arrival` classes up …
n8rzz Nov 24, 2016
6a9b9ff
ARCH - Fixes changelog formatting that resulted from a bad merge
n8rzz Nov 24, 2016
73e247c
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
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
840e073
Merge pull request #89 from n8rzz/feature/ATC-53
n8rzz Nov 24, 2016
20456be
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 24, 2016
876f022
feature/ATC-125 - moves creation of Legs and Waypoints to constants i…
n8rzz Nov 24, 2016
33f334b
Merge pull request #141 from n8rzz/feature/ATC-125
n8rzz Nov 24, 2016
484c17d
feature/ATC-77 - Updates doc block method reference to correct method…
n8rzz Nov 25, 2016
6f1c6b9
Merge pull request #118 from n8rzz/feature/ATC-77
n8rzz Nov 25, 2016
65fe674
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 25, 2016
fb6d21d
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 25, 2016
3327dbd
feature/ATC-128 - Moves fms files to FlightManagementSystem directory
n8rzz Nov 25, 2016
956fcc0
feature/ATC-128 - Updates changelog
n8rzz Nov 25, 2016
8dd127f
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 25, 2016
b0d72fc
feature/ATC-17 - Moves `.parseCoordinate()` out of `PositionModel` an…
n8rzz Nov 25, 2016
09bc5ba
Merge pull request #152 from n8rzz/feature/ATC-52
n8rzz Nov 25, 2016
5fefead
Merge pull request #156 from n8rzz/feature/ATC-128
n8rzz Nov 25, 2016
9fa1b6e
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 25, 2016
7ab9a36
Merge pull request #153 from n8rzz/feature/ATC-55
n8rzz Nov 25, 2016
3dc6333
feature/ATC-151 - streamlines flight number generation and adds new m…
n8rzz Nov 25, 2016
ea1adc8
feature/ATC-151 - Adds .isCallsignInList() boolean helper, adds recur…
n8rzz Nov 25, 2016
ee2c5ce
feature/ATC-54 - Completely removes AirportModel.sid from app
n8rzz Nov 26, 2016
4ec8eec
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 26, 2016
5679616
Merge pull request #157 from n8rzz/feature/ATC-17
n8rzz Nov 26, 2016
e3164d4
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 26, 2016
d800d15
feature/ATC-151 - Adds docblock and console.warn to AircraftControlle…
n8rzz Nov 26, 2016
dcf29fe
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 26, 2016
19a815d
feature/ATC-54- Completely removes AirportModel.stars property in favor
n8rzz Nov 26, 2016
e14f768
feature/ATC-163 - Adds `RouteModel` to `AircraftInstanceModel.runSTAR…
n8rzz Nov 26, 2016
acd700e
feature/ATC-159 - Adds doc blocks to PositionModel
n8rzz Nov 27, 2016
ec1b733
feature/ATC-54 - Fixes typo in StandardRouteCollection
n8rzz Nov 27, 2016
ac2a214
Merge pull request #162 from n8rzz/feature/ATC-54
n8rzz Nov 27, 2016
bbca36f
Merge pull request #158 from n8rzz/feature/ATC-151
n8rzz Nov 27, 2016
664313c
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 27, 2016
d4b2e92
Merge pull request #165 from n8rzz/feature/ATC-163
n8rzz Nov 27, 2016
ca7143f
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 27, 2016
d620639
feature/ATC-159 - Pulls distanceToPoint out of PositionModel
n8rzz Nov 27, 2016
49f27ef
feature/ATC-169 - Adds Express server and basic server script.
n8rzz Nov 27, 2016
3699670
feature/ATC-159 - Adds documentation about Haversine Formula, adds .d…
n8rzz Nov 27, 2016
0f35ec5
feature/ATC-159 - Adds static method .calculatePosition() that can be
n8rzz Nov 28, 2016
19d3ced
Reorganize GameClockView class
erikquinn Nov 29, 2016
9304330
feature/ATC-159 - Integrates PositionModel.calculatePosition() into A…
n8rzz Nov 29, 2016
d907f6c
Merge pull request #140 from n8rzz/feature/ATC-135
n8rzz Nov 29, 2016
04e32cb
Merge branch 'release/3.2.0' of https://github.com/n8rzz/atc into dev…
n8rzz Nov 29, 2016
420ae7d
feature/ATC-167 - Consolidates fixtures in to one root fixtures folder
n8rzz Nov 29, 2016
aa25dc7
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 29, 2016
ca3da88
feature/ATC-159 - Updates changelog
n8rzz Nov 29, 2016
303d0e3
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 29, 2016
b2ec2fb
feature/ATC-169 - Adds Procfile
n8rzz Nov 29, 2016
96d9cf2
feature/ATC-169 - Adds process.env.PORT to server file
n8rzz Nov 29, 2016
7d3ddfa
feature/ATC-169 - adds npm packaces to dependencies for heroku
n8rzz Nov 29, 2016
35157bc
feature/ATC-169 - adds .travis.yml
n8rzz Nov 29, 2016
b15ca32
feature/ATC-169 - fixes typo with import line in test
n8rzz Nov 29, 2016
4b495ff
feature/ATC-169 - Fixes more typos in test imports
n8rzz Nov 29, 2016
9ba204e
Merge pull request #168 from n8rzz/feature/ATC-159
n8rzz Nov 29, 2016
be2f845
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 29, 2016
36440b3
feature/ATC-167 - Finishes consolidating fixtures in fixtures/ directory
n8rzz Nov 29, 2016
268a36b
Merge pull request #172 from n8rzz/feature/ATC-167
n8rzz Nov 29, 2016
9244484
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 29, 2016
6894fb3
feature/ATC-169 - Updates changelog and removes comments from travis.yml
n8rzz Nov 30, 2016
14916a1
feature/ATC-114 - Adds CommandParser and CommandModel and basic tests…
n8rzz Dec 1, 2016
e015d9c
feature/ATC-169 - Adds postinstall script back in to package.json
n8rzz Dec 1, 2016
10e6e0f
Fix minor spelling error
erikquinn Dec 2, 2016
8d9f30f
Fix PositionModel.calculatePosition static method
erikquinn Dec 2, 2016
9d07589
Consolidate duplicate functions for calculating bearing to a point
erikquinn Dec 2, 2016
504794c
Simplify coordinate parsing process and organization
erikquinn Dec 2, 2016
a99cdf4
Change `PositionModel.gps` getter to [lat,lon] order
erikquinn Dec 2, 2016
a8805a5
Simplify PositionModel._calculateScreenPosition by using static calcu…
erikquinn Dec 2, 2016
9b5cd51
feature/ATC-114 - Adds support for unicode character commands
n8rzz Dec 4, 2016
99d7c01
feature/ATC-169 - removes branch specificity in travis.yml
n8rzz Dec 4, 2016
946c9da
feature/ATC-114 - Begins switch to CommandParser for top level comman…
n8rzz Dec 4, 2016
ded0ca3
feature/ATC-114 - Continues CommandParser integration
n8rzz Dec 5, 2016
bf0dc45
Change Position construction to only use refPos if available
erikquinn Dec 4, 2016
70893b5
Amend PositionModel tests to pass
erikquinn Dec 5, 2016
fa4ac70
feature/ATC-114 - Adds commandMap, argumentValidators and argumentPar…
n8rzz Dec 6, 2016
58b2a3b
feature/ATC-114 Adds headingValidator and headingParser
n8rzz Dec 6, 2016
f348e85
feature/ATC-114 - Adds WAYPOINT_NAV_MODE constants to runHeading()
n8rzz Dec 6, 2016
6920d68
feature/ATC-114 - Finishes headingParser
n8rzz Dec 6, 2016
31454d1
feature/ATC-114 - Adds holdValidator and tests
n8rzz Dec 7, 2016
d559a4d
feature/ATC-114 - adds holdParser and brings parser/validator tests u…
n8rzz Dec 7, 2016
7b9f05c
feature/ATC-114 - Adds _commandDefinition as a class property. Update…
n8rzz Dec 8, 2016
bab0b0d
feature/ATC-114 - moves .unicodeToString() and UNICODE regex to prope…
n8rzz Dec 8, 2016
a0995da
feature/ATC-114 - Updates tests for CommandParser
n8rzz Dec 8, 2016
82e6e70
Restore terrain
erikquinn Dec 8, 2016
a4c1de9
Ensure 'removed' aircraft are removed from Runway queues
erikquinn Dec 8, 2016
53d2a9f
feature/ATC-114 - Adds documentation to CammandParser and CommandMode…
n8rzz Dec 9, 2016
18a2c9f
Fix to `fixRadialDist` function
erikquinn Dec 9, 2016
3200501
Add test for `fixRadialDist` function
erikquinn Dec 9, 2016
815a6ad
feature/ATC-176 - Updates changelog
n8rzz Dec 9, 2016
b520aa6
Merge pull request #177 from n8rzz/feature/ATC-176
n8rzz Dec 9, 2016
f4885d1
Merge pull request #173 from n8rzz/feature/ATC-169
n8rzz Dec 9, 2016
a5bbb1d
ARCH - adds slack integration for travis.
n8rzz Dec 9, 2016
e73c2f3
ARCH - adds missing express dependency
n8rzz Dec 9, 2016
c25b624
ARCH - update node and npm versions in package.json
n8rzz Dec 9, 2016
4fa9c75
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Dec 9, 2016
8074021
ARCH - adds app.json to enable heroku review apps
n8rzz Dec 9, 2016
cdd1793
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Dec 9, 2016
ea02be4
ARCH - removes backslashes in index.html urls for github pages
n8rzz Dec 9, 2016
2933994
feature/ATC-114 - Finishes major documentation
n8rzz Dec 10, 2016
7292ec7
feature/ATC-114 - Updates failing test
n8rzz Dec 10, 2016
6279d84
feature/ATC-114 - Adds directionNormalizer() for headingParser
n8rzz Dec 11, 2016
e0a3503
feature/ATC-114 - Updates holdParser to initialize turnDirection and …
n8rzz Dec 11, 2016
8f87e7b
feature/ATC-114 - Fixes broken test for holdParser
n8rzz Dec 11, 2016
57543b3
feature/ATC-114 - Updates headingParser() to initialize direction as …
n8rzz Dec 11, 2016
47eda2d
feature/ATC-114 - Splits command definitions out to smaller constants…
n8rzz Dec 11, 2016
b346d09
feature/ATC-114 - Adds space after unicode commands in InputController
n8rzz Dec 11, 2016
a1c9ca3
feature/ATC-114 - Reverts runSID() method to current shape on v3.1.0
n8rzz Dec 11, 2016
cfad8d4
bugfix/ATC-185 - Adds `_isNumber()` check instead of `!magneticNorth`…
n8rzz Dec 11, 2016
32f9a31
feature/ATC-114 - Updates runSID() method to be a little lighter on b…
n8rzz Dec 12, 2016
0467f0d
feature/ATC-114 - Adds processTransmitCommand method
n8rzz Dec 12, 2016
57b0b5c
Updated function names to addItems and removeItems
Dabea Dec 12, 2016
a6665d2
feature/ATC-114 - Adds helper method that can discern if the letter l…
n8rzz Dec 12, 2016
d10dbb3
feature/ATC-114 - Adds specific user test cases to CommandParser
n8rzz Dec 12, 2016
c5c619d
feature/ATC-114 - Adds additional test case for undefined CommandModel
n8rzz Dec 12, 2016
54db29e
bugfix/ATC-191 - Adds failing test cases for parseElevation() bug rep…
n8rzz Dec 12, 2016
57aacc3
Merge pull request #187 from n8rzz/bugfix/ATC-185
n8rzz Dec 13, 2016
a98f9a0
feature/ATC-114 - Adds bat tick to KEY_CODES in InputController and a…
n8rzz Dec 13, 2016
7dae46f
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Dec 13, 2016
7431ae1
Updats the changelog with the changes made for #186
Dabea Dec 13, 2016
ac05e5d
Merge pull request #190 from n8rzz/feature/ATC-186
n8rzz Dec 13, 2016
c62b3c3
Address review comments
erikquinn Dec 9, 2016
bb67bc6
feature/ATC-194 - Adds gulp-cli and adds SO link for windows + gulp i…
n8rzz Dec 13, 2016
03b680c
bugfix/ATC-196 - Adds initial failing test for #196 bug
n8rzz Dec 14, 2016
6ea5f43
bugfix/ATC-196 - Adds temporary fix for case when only body and rwy e…
n8rzz Dec 14, 2016
8cbe107
Merge pull request #195 from n8rzz/feature/ATC-194
n8rzz Dec 14, 2016
d623354
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Dec 14, 2016
243f3d6
feature/ATC-132 - Adds changelog entry for #132
n8rzz Dec 14, 2016
059dd79
Merge pull request #180 from n8rzz/feature/ATC-132
n8rzz Dec 14, 2016
2c80ba2
Changes routeString to RouteCode
Dabea Dec 14, 2016
d0c6bc5
Changes routeString to routeCode
Dabea Dec 14, 2016
ebad1fd
Merge branch 'develop' into feature/ATC-188
Dabea Dec 14, 2016
2115b2e
Merge pull request #200 from n8rzz/feature/ATC-188
n8rzz Dec 14, 2016
1257c9e
fixes bug where parseElevation() returns NaN
Dabea Dec 14, 2016
3f2ea17
Merge branch 'develop' into bugfix/ATC-191
Dabea Dec 14, 2016
f764db3
feature/ATC-196 - Updates test for bug condition and ensures green
n8rzz Dec 14, 2016
9888008
feature/ATC-114 - removes dead code for airport system command and en…
n8rzz Dec 14, 2016
eb582dd
feature/ATC-114 - Adds custom validator for fix command
n8rzz Dec 15, 2016
92a142c
Create AircraftInstanceModel.isInsideAirspace method
erikquinn Dec 15, 2016
dd45970
Only trigger collision if aircraft are inside the airspace
erikquinn Dec 15, 2016
6cea57e
Update changelog
erikquinn Dec 15, 2016
4c56a4a
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Dec 16, 2016
cd2b71e
feature/ATC-114 - Adjusts spacing in keydown case blocks
n8rzz Dec 16, 2016
0bd87b5
feature/ATC-114 - Adds new functions to support 1 to 3 args for hold …
n8rzz Dec 16, 2016
9419563
feature/ATC-114 - Adjusts hold command to accept 0 to 3 arguments.
n8rzz Dec 16, 2016
8f9c45e
feature/ATC-114 - Adds missing space in InputController to subtract case
n8rzz Dec 16, 2016
fee93b2
feature/ATC-114 - Adds updates to the docs for new CommandParser
n8rzz Dec 16, 2016
607d840
Merge pull request #179 from n8rzz/feature/ATC-114
n8rzz Dec 16, 2016
4f0e261
ARCH - adds missing changelog entry for #114
n8rzz Dec 16, 2016
751f38f
bugfix/ATC-196 - Updates console.error messaging
n8rzz Dec 16, 2016
b3300ba
feature/ATC-216 - Removes pegjs parser and dependencies
n8rzz Dec 17, 2016
289bc3b
feature/ATC-211 - Updates escape key handling to clear everything but…
n8rzz Dec 17, 2016
31092c7
ARCH - adds updates to altitude section about the expedite argument
n8rzz Dec 17, 2016
78e9318
add link to original issue #756
Dec 18, 2016
0162e1f
Combined If statements and added comments
Dabea Dec 18, 2016
7d1dbdc
fixed parentheses placement
Dabea Dec 18, 2016
62ebd0f
add link to original issue #756
Dabea Dec 18, 2016
bddd5c5
Combined If statements and added comments
Dabea Dec 18, 2016
39f0533
fixed parentheses placement
Dabea Dec 18, 2016
c22d404
Merge branch 'bugfix/ATC-191' of https://github.com/n8rzz/atc into bu…
Dabea Dec 18, 2016
ec51eec
Merge pull request #201 from n8rzz/bugfix/ATC-191
n8rzz Dec 18, 2016
62a25e9
Merge develop
erikquinn Dec 18, 2016
90bd8a4
fix improper use of _.has / _.isNil
erikquinn Dec 18, 2016
3bde815
Rename and repair method for weight-on-wheels logic from .wow() to .i…
erikquinn Dec 18, 2016
2e4cb1b
Replace all references to .wow() with .isOnGround()
erikquinn Dec 18, 2016
9756095
Merge pull request #217 from n8rzz/feature/ATC-216
n8rzz Dec 19, 2016
1d8e2ab
Merge pull request #218 from n8rzz/feature/ATC-211
n8rzz Dec 19, 2016
d8b7239
Clean up AircraftInstanceModel.isOnGround() method
erikquinn Dec 19, 2016
0618882
Merge branch 'release/3.2.0' of https://github.com/n8rzz/atc into bug…
n8rzz Dec 19, 2016
2521ab9
Merge pull request #198 from n8rzz/bugfix/ATC-196
n8rzz Dec 19, 2016
dad8644
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Dec 19, 2016
13a69c8
Merge branch 'feature/ATC-134' of https://github.com/n8rzz/atc into f…
n8rzz Dec 19, 2016
02c6844
Merge pull request #209 from n8rzz/feature/ATC-134
n8rzz Dec 19, 2016
cd3a0d6
Fix wrong type fed by setDepartureRunway and add errors
erikquinn Dec 8, 2016
547c8cb
feature/ATC-175 - Adds tests for new throws in StandardRouteModel, up…
n8rzz Dec 19, 2016
b8ebda4
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Dec 19, 2016
2de04cf
Merge pull request #226 from n8rzz/feature/ATC-175
n8rzz Dec 19, 2016
ff9559c
Merge branch 'release/3.2.0' of https://github.com/n8rzz/atc into rel…
n8rzz Dec 19, 2016
9b06f8b
ARCH - updates contributors list
n8rzz Dec 19, 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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ coverage/
.nyc_output/
node_modules/
npm-debug.log
assets/style/
assets/scripts/
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
sudo: false
language: node_js
node_js:
- '6'
git:
depth: 3
notifications:
slack:
secure: pruiXBfZe4Mq3oiEVU9RYirkFd6Sz4kYyruahuiCpW8mnaV4XwVNSYPuxTAUlYowpZOrh85eCKWEBvcxxXqC+9icc2J+ReL5v2B57tfhQ9QIWwoYLccD+ndCpuQMW6tIqWB0F9k/QchP2awhqakuwLcI+AZgNXv1G4LDuHOEz/8TdOaFMlqDRQcxl3M1yyWNftw9V1adCkF1GMSVsRaiK7i0S7xkwtYCBXT0iBchYtuFWcwdASMVgFnHJaGB3j97RkVAc8bndrcENGm5TCdCSXiQwLNtStYjJgOHn4l545dfwK6dHiH9iChalbPVIzEtEEIyJM52Ug2+/iEJ/aaSn8K1c05/wfEpe0XbZIplAktZOFRjT2vlkf31MHoLynBf2sYIxEr/DF5QFqQz7tmRIlwl0AVyEaAqkeJM2KRZEhTpR4FhdAxupqqPQzKo33IyGEzD615Xr7hmFNwGDX1CRxql0nTQ/Ilyf+2PeQRY6Tiw7RsUolyxkIOMViuRdhR2l+fphxP/HUbqsDfv73PyCzyYzX56pXJIwIxJ00E2AfU29jQ28RAckjhwE/OLTtRcvQ8rsLfMNdZfhAyP0gZD0e11rrqoJxYxtfWbLbd0pjGgHRiLSARwYoKAxlzpTFFyqaMwZgEemoPZin0w11cgYMIsS5HRTBbLtQivYNL+iRo=
48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,49 @@
## 3.2.0 (December 20, 2016)
---
### Major
* Integrates `sidCollection` and `starCollection` with `RouteModel` within `AircraftInstanceModel` [#53](https://github.com/n8rzz/atc/issues/53)
- Creates getters for `currentLeg` and `currentWaypoint`
- Abstracts restrictions logic to live within `Waypoint`
- Consolidates `runSID()` and `climbViaSid()` logic
- Deprecates `sid` and `star` properties of the `AirportModel` in favor of `sidCollection` and `starCollection` [#54](https://github.com/n8rzz/atc/issues/54)
- Adds [Express](expressjs.com) server to serve static assets and add [travis](travis-ci.org) config file for travis continuous integration [#169](https://github.com/n8rzz/atc/issues/169)
- Rewrites the CommandParser from the ground up [#114](https://github.com/n8rzz/atc/issues/114)
- Removes `Pegjs` and references completing switch to new CommandParser [#216](https://github.com/n8rzz/atc/issues/216)

### Minor
- Implements `modelSourceFactory` and `modelSourcePool` [#77](https://github.com/n8rzz/atc/issues/77)
- Refactors `canvasController.canvas_draw_sids` method to use `airport.sidCollection` instead of `airport.sid` [#144](https://github.com/n8rzz/atc/issues/144)
- Moves properties shared by all `Arrival` types up to `ArrivalBase` [#55](https://github.com/n8rzz/atc/issues/55)
- Removes `$.each()` from `AirportModel` in favor of `_forEach()` and uses `_get()` inside `AircraftModel.parse()` instead of if statements [#52](https://github.com/n8rzz/atc/issues/52)
- Moves creation of Legs and Waypoints to constants instead of as method arguments [#135](https://github.com/n8rzz/atc/issues/135)
- Moves `.parseCoordinate()` out of `PositionModel` and into `unitConverters` [#17](https://github.com/n8rzz/atc/issues/17)
- Moves flight management system files to `FlightManagementSystem` folder [#128](https://github.com/n8rzz/atc/issues/128)
- Adds `RouteModel` to `AircraftInstanceModel.runSTAR` for easier handling of a route string [#163](https://github.com/n8rzz/atc/issues/163)
- Adds static `calculatePosition` method to `PositionModel` and abstracts common functions [#159](https://github.com/n8rzz/atc/issues/159)
- Replaces active airport icao in view with a zulu time clock [#135](https://github.com/n8rzz/atc/issues/135)
- Consolidates test fixtures in fixtures directory [#167](https://github.com/n8rzz/atc/issues/167)
* Addresses issue with video maps being drawn incorrectly. [#176](https://github.com/n8rzz/atc/issues/176)
- Updates `PositionModel` to run all calculations through the static `.calculatePosition()` method and vastly simplifies internal logic.
- Refactors the the function names in `FixCollection` to better fit their function. `init()` to `addItems()` and `destroy()` to `removeItems()` [#186] (https://github.com/n8rzz/atc/issues/186)
- Adds gulp-cli and adds [tools readme](tools/README.md) link to gulp issues with Windows [#194](https://github.com/n8rzz/atc/issues/194)
- Changes `routeString` to `routeCode` in `RouteModel` and moves `.toUpperCase()` from the getter to `.init()` [#188] (https://github.com/n8rzz/atc/issues/188)
- Updates `StandardRouteModel` to throw when entry/exit point doesn't exist within a collection and updates `.setDepartureRunway()` to send the `routeCode` to `Leg` on instantiation [#175](https://github.com/n8rzz/atc/issues/175)
- Prevents collision detection for aircraft that are outside of our airspace [#134](https://github.com/n8rzz/atc/issues/134)
- Originally reported under [#736](https://github.com/zlsa/atc/issues/736)
- Escape clears commands but not callsign if commands are present [#211] (https://github.com/n8rzz/atc/issues/211)
- Originally reported under [#763](https://github.com/zlsa/atc/issues/763)

### Bugfixes
- Moves `_comment` blocks in airport json file to be within object the are describing [#145](https://github.com/n8rzz/atc/issues/145)
- Streamlines flight number generation and adds new method to add new callsigns to the existing list [#151](https://github.com/n8rzz/atc/issues/151)
- Adds `_isNumber` check instead of `!magneticNorth` inside `PositionModel.calculatePosition()` and the `AirspaceModel` constructor. [#182](https://github.com/n8rzz/atc/issues/182)
- Originally reported under [#754](https://github.com/zlsa/atc/issues/754)
- Adds additional handling to `StandardRouteModel._buildEntryAndExitCollections` to handle case where `entryPoints` and `exitPoints` don't exist in the `airport.sids` definition [#196](https://github.com/n8rzz/atc/issues/196)
- Originally reported under [#760](https://github.com/zlsa/atc/issues/760)
- Ensures proper removal of aircraft from the runway queue(s) when that aircraft has been deleted. [#132](https://github.com/n8rzz/atc/issues/132)
- Originally reported under [#706](https://github.com/zlsa/atc/issues/706)


## 3.1.0 (November 20, 2016)
---
### Major
Expand Down Expand Up @@ -25,3 +71,5 @@
- Aircraft strips show arrival airport in uppercase [#108](https://github.com/n8rzz/atc/issues/108)
- Updates `FixCollection.findFixByName()` to accept upper, mixed, or lower case fix name [#109](https://github.com/n8rzz/atc/issues/109)
- Switching to a previously loaded airport does not clear previous airport fixes [#115](https://github.com/n8rzz/atc/issues/115)
- Fixes `parseElevation()` so that it does not return NaN when it is given the string `'Infinity'` [#191] (https://github.com/n8rzz/atc/issues/191)
- Originally reported under [#756](https://github.com/zlsa/atc/issues/756)
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node index.js
22 changes: 22 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "atc",
"scripts": {},
"env": {
"LANG": "en_US.UTF-8",
"NODE_ENV": "staging",
"NPM_CONFIG_PRODUCTION": "false"
},
"formation": {
"web": {
"quantity": 1
}
},
"addons": [
"logentries"
],
"buildpacks": [
{
"url": "heroku/nodejs"
}
]
}
6 changes: 3 additions & 3 deletions assets/airports/eham.json
Original file line number Diff line number Diff line change
Expand Up @@ -1005,8 +1005,8 @@
["PESER", "STD", "RIVER"]
]
},
"_comment": "ARTIP1X is a day transition for 36R",
"ARTIP1X": {
"_comment": "ARTIP1X is a day transition for 36R",
"icao": "ARTIP1X",
"name": "Artip One Xray",
"entryPoint": {
Expand All @@ -1017,8 +1017,8 @@
["ARTIP", "PAM", "EH611", "EH612", "SOKSI", "EH613", "EH614", "EH609"]
]
},
"_comment_": "Beyond this point are the instrument approach procedures/transitions for night usage",
"ARTIP2A": {
"_comment_": "Beyond this point are the instrument approach procedures/transitions for night usage",
"icao": "ARTIP2A",
"name": "Artip Two Alfa",
"entryPoint": {
Expand Down Expand Up @@ -1573,4 +1573,4 @@
]
}
]
}
}
Loading