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-88 #94

Merged
merged 3 commits into from
Nov 16, 2016
Merged

feature/ATC-88 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80f64fd
feature/ATC-88 - Adds iief and additional script tag to index.html that
n8rzz Nov 15, 2016
5f777ab
feature/ATC-88 - Move AIRPORT_LOAD_LIST to index.js where it is then
n8rzz Nov 15, 2016
5331558
Merge branch 'develop' of https://github.com/n8rzz/atc into feature/A…
n8rzz Nov 15, 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
345 changes: 345 additions & 0 deletions assets/airports/airportLoadList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,345 @@
/**
* This file lives outside of normal javascript bundle. This provides a way for contributors to add or remove
* airports without the need to re-build the entire app. This means a contributor does not need to have node
* installed in order to contribute.
*
* While not ideal, adding more things to the window, this does get around the need to re-bundle when making changes
* to the list of airports.
*
* This property is used by the `AirportController` and should be used only one time on app instantiation.
*
* @property AIRPORT_LOAD_LIST
* @return {array<object>}
*/
window.AIRPORT_LOAD_LIST = (function() { // eslint-disable-line wrap-iife
/**
* List of airports to load.
*
* If you are adding a new airport to the game, be sure to include:
*
* - the airport json file in `assets/airports/AIRPORT_NAME.json` where `AIRPORT_NAME` is
* the airport icao. (ex: KSFO would be `assets/airports/ksfo.json`)
* - the terrain geojson file (if one exists) in `assets/airports/terrain/AIRPORT_NAME.geojson`
* where `AIRPORT_NAME` is the airport icao. (ex: KSFO would be `assets/airports/terrain/ksfo.geojson`)
* - add a new data block at the bottom of this file in the shape of:
* ```
* {
* icao: {AIRPORT_ICAO},
* level: {AIRPORT_DIFFICULTY},
* name: {AIRPORT_NAME}
* }
* ```
* - `AIRPORT_ICAO` is the airport icao in lowercase (ex: ksfo)
* - `AIRPORT_DIFFICULTY` is the difficulty level (one of: easy, beginner, medium, hard)
* - `AIRPORT_NAME` is the name of the airport (ex: San Francisco International Airport)
* If the airport is a work in progress, please include the icon character `&#9983` after the `name`
* (see ebbr, kmsp or ksea):
* `name: 'Brussels-National &#9983'`
*
* @property AIRPORT_LOAD_LIST
* @type {Array}
* @final
*/
return [
{
icao: 'ebbr',
level: 'easy',
name: 'Brussels-National &#9983'
},
{
icao: 'eddf',
level: 'medium',
name: 'Frankfurt Airport'
},
{
icao: 'eddh',
level: 'easy',
name: 'Hamburg Airport'
},
{
icao: 'eddm',
level: 'beginner',
name: 'Franz Josef Strauß International Airport'
},
{
icao: 'eddt',
level: 'medium',
name: 'Berlin Tegel Airport'
},
{
icao: 'egcc',
level: 'hard',
name: 'Manchester Airport'
},
{
icao: 'eggw',
level: 'medium',
name: 'London Luton Airport'
},
{
icao: 'egkk',
level: 'easy',
name: 'London Gatwick Airport'
},
{
icao: 'eglc',
level: 'medium',
name: 'London City Airport'
},
{
icao: 'egll',
level: 'hard',
name: 'London Heathrow Airport'
},
{
icao: 'egnm',
level: 'beginner',
name: 'Leeds Bradford International Airport'
},
{
icao: 'eham',
level: 'medium',
name: 'Amsterdam Airport Schiphol'
},
{
icao: 'eidw',
level: 'easy',
name: 'Dublin Airport'
},
{
icao: 'einn',
level: 'easy',
name: 'Shannon Airport'
},
{
icao: 'ekch',
level: 'medium',
name: 'Copenhagen Kastrup Airport'
},
{
icao: 'engm',
level: 'easy',
name: 'Oslo Gardermoen International Airport'
},
{
icao: 'espa',
level: 'easy',
name: 'Luleå Airport'
},
{
icao: 'gcrr',
level: 'easy',
name: 'Lanzarote Airport'
},
{
icao: 'kbos',
level: 'medium',
name: 'Boston Logan International Airport'
},
{
icao: 'kdca',
level: 'medium',
name: 'Reagan National Airport'
},
{
icao: 'kiad',
level: 'hard',
name: 'Washington-Dulles International Airport'
},
{
icao: 'kjfk',
level: 'hard',
name: 'John F Kennedy International Airport &#9983'
},
{
icao: 'klas',
level: 'medium',
name: 'McCarran International Airport'
},
{
icao: 'klax90',
level: 'medium',
name: 'Los Angeles International Airport 1990'
},
{
icao: 'klax',
level: 'medium',
name: 'Los Angeles International Airport'
},
{
icao: 'kmia',
level: 'hard',
name: 'Miami International Airport &#9983'
},
{
icao: 'kmsp',
level: 'hard',
name: 'Minneapolis/St. Paul International Airport &#9983'
},
{
icao: 'kord',
level: 'hard',
name: 'Chicago O\'Hare International Airport'
},
{
icao: 'kpdx',
level: 'easy',
name: 'Portland International Airport'
},
{
icao: 'kphx',
level: 'easy',
name: 'Phoenix Sky Harbor International Airport'
},
{
icao: 'ksan',
level: 'easy',
name: 'San Diego International Airport'
},
{
icao: 'ksea',
level: 'medium',
name: 'Seattle-Tacoma International Airport &#9983'
},
{
icao: 'ksfo',
level: 'medium',
name: 'San Francisco International Airport &#9983'
},
{
icao: 'lkpr',
level: 'easy',
name: 'Vaclav Havel International Airport'
},
{
icao: 'loww',
level: 'medium',
name: 'Vienna International Airport'
},
{
icao: 'ltba',
level: 'hard',
name: 'Atatürk International Airport &#9983'
},
{
icao: 'omaa',
level: 'medium',
name: 'Abu Dhabi International Airport'
},
{
icao: 'omdb',
level: 'hard',
name: 'Dubai International Airport'
},
{
icao: 'osdi',
level: 'easy',
name: 'Damascus International Airport'
},
{
icao: 'othh',
level: 'hard',
name: 'Doha Hamad International Airport'
},
{
icao: 'rjtt',
level: 'hard',
name: 'Tokyo Haneda International Airport'
},
{
icao: 'rksi',
level: 'hard',
name: 'Incheon International Airport'
},
{
icao: 'saez',
level: 'medium',
name: 'Aeropuerto Internacional Ministro Pistarini'
},
{
icao: 'same',
level: 'medium',
name: 'Aeropuerto Internacional El Plumerillo'
},
{
icao: 'sawh',
level: 'beginner',
name: 'Aeropuerto Internacional Malvinas Argentinas'
},
{
icao: 'sbgl',
level: 'beginner',
name: 'Aeroporto Internacional Tom Jobim'
},
{
icao: 'sbgr',
level: 'beginner',
name: 'Aeroporto Internacional de São Paulo/Guarulhos'
},
{
icao: 'tjsj',
level: 'easy',
name: 'Luis Muñoz Marín International Airport'
},
{
icao: 'tncm',
level: 'easy',
name: 'Princess Juliana International Airport'
},
{
icao: 'uudd',
level: 'easy',
name: 'Moscow Domodedovo Airport'
},
{
icao: 'vabb',
level: 'hard',
name: 'Chhatrapati Shivaji International Airport'
},
{
icao: 'vecc',
level: 'medium',
name: 'Kolkata Netaji Subhas Chandra Bose Int\'l'
},
{
icao: 'vhhh',
level: 'medium',
name: 'Hong Kong Chep Lap Kok International Airport'
},
{
icao: 'vidp',
level: 'hard',
name: 'Indira Gandhi International Airport'
},
{
icao: 'wiii',
level: 'medium',
name: 'Soekarno-Hatta International Airport'
},
{
icao: 'wimm',
level: 'easy',
name: 'Kuala Namu International Airport'
},
{
icao: 'wmkp',
level: 'medium',
name: 'Pulau Pinang International Airport'
},
{
icao: 'wmkk',
level: 'hard',
name: 'Kuala Lumpur International Airport (KLIA)'
},
{
icao: 'wsss',
level: 'hard',
name: 'Singapore Changi International Airport'
},
{
icao: 'zspd',
level: 'hard',
name: 'Shanghai Pudong International Airport'
}
];
})();
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
</div>


<script src="assets/airports/airportLoadList.js"></script>
<script src="assets/scripts/bundle.js"></script>

<script>
Expand Down
10 changes: 6 additions & 4 deletions src/assets/scripts/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ export default class App {
* @for App
* @constructor
* @param $element {HTML Element|null}
* @param airportLoadList {array<object>} List of airports to load
*/
constructor(element) {
constructor(element, airportLoadList) {
/**
* Root DOM element.
*
Expand Down Expand Up @@ -88,7 +89,7 @@ export default class App {
this.prop.log = LOG.WARNING;
}

return this.setupChildren()
return this.setupChildren(airportLoadList)
.enable();
}

Expand All @@ -99,11 +100,12 @@ export default class App {
*
* @for App
* @method setupChildren
* @param airportLoadList {array<object>} List of airports to load
*/
setupChildren() {
setupChildren(airportLoadList) {
this.loadingView = new LoadingView();
this.contentQueue = new ContentQueue(this.loadingView);
this.airportController = new AirportController(this.updateRun);
this.airportController = new AirportController(airportLoadList, this.updateRun);
this.gameController = new GameController(this.getDeltaTime);
this.tutorialView = new TutorialView(this.$element);
this.inputController = new InputController(this.$element);
Expand Down
Loading