Merge branch 'master' into release

Author: hAr1x

.jshintrc

@@ -9,11 +9,12 @@
   , "define": true
   , "require": true
   , "requirejs": true
+  , "Promise": true
   }
 , "laxcomma": true
 , "laxbreak": true
 , "multistr": true
-, "eqnull": true
+, "eqeqeq": true
 , "smarttabs": true
 , "globalstrict": true
 , "jquery": true

README.md

@@ -14,15 +14,13 @@ npm start
 ```
 Then you will be able to access the game at <http://127.0.0.1:3000/geofs.php>
 
-**Quick Update** Due to a jQuery code in-game, please type in `require(['ui/main']);` in the console after game loads.
-
 ----
 #### Quick Optimization
 First, make sure that you have run `npm install`.
 
 If so, open a terminal/command prompt in this directory, then do
 ```
-node node_modules/requirejs/bin/r.js -o build-config.js
+node_modules/requirejs/bin/r.js -o build.json
 ```
 Then you will be able to see the optimized file in *build* as **fmc.min.js**
 

build-config.js

@@ -0,0 +1,7 @@
+{ "baseUrl": "./source"
+, "name": "../node_modules/requirejs/require"
+, "include": "init"
+, "mainConfigFile": "./source/config.js"
+, "out": "./build/fmc.min.js"
+, "optimize": "uglify2"
+}

build.json

@@ -1,4 +1,7 @@
 { "globals":
     { "module": true },
-    "node": true
+    "node": true,
+    "predef": [ "-Promise" ],
+    "varstmt": true,
+    "esnext": 6
 }

compile/.jshintrc

@@ -1,25 +1,31 @@
 'use strict';
 
-var Promise = require('bluebird');
-var fs = Promise.promisifyAll(require('fs'));
-var path = require('path');
+const Promise = require('bluebird');
 
-var FILE_NAME = path.join(__dirname, require('./constants').ROOT_FOLDER + 'ATS.txt');
+const fs = Promise.promisifyAll(require('fs'));
+const path = require('path');
 
-var ATS = {};
+const FILE_NAME = path.join(__dirname, `${require('./utils').ROOT_FOLDER}ATS.txt`);
+
+let ATS = {};
+
+module.exports = new Promise(resolve => {
+    fs.readFileAsync(FILE_NAME, 'utf-8').then(parseFile).then(writeFile).then(resolve);
+});
 
-fs.readFileAsync(FILE_NAME, 'utf-8').then(parseFile).then(writeFile);
 
 
 // --
 function parseFile (fileContent) {
+    console.log('Parsing airways data');
+
     fileContent = fileContent.split('\r\n\r\n');
 
-    for (var blocks = 0; blocks < fileContent.length - 1; blocks++) {
-        var fixesList = [];
+    for (let blocks = 0; blocks < fileContent.length - 1; blocks++) {
+        let fixesList = [];
         fileContent[blocks] = fileContent[blocks].split('\r\n');
 
-        for (var lines = 0; lines < fileContent[blocks].length; lines++) {
+        for (let lines = 0; lines < fileContent[blocks].length; lines++) {
             fileContent[blocks][lines] = fileContent[blocks][lines].split(',');
 
             // Ignores the first line (descriptor) when adding fixes

compile/ATS.js

@@ -1,78 +1,80 @@
 'use strict';
 
-var Promise = require('bluebird');
-var fs = Promise.promisifyAll(require('fs'));
-var path = require('path');
+const Promise = require('bluebird');
+
+const fs = Promise.promisifyAll(require('fs'));
+const path = require('path');
 
 require('graceful-fs').gracefulify(fs);
 
-var PATH = path.join(__dirname, require('./constants').ROOT_FOLDER + 'proc/');
-var RWY_REGEXP = /^\d\d[LCR]?$/;
+const PATH = path.join(__dirname, `${require('./utils').ROOT_FOLDER}proc/`);
+const RWY_REGEXP = /^\d\d[LCR]?$/;
 
-var waypoints = require('./compiled-data/waypoints.json');
-var navaids = require('./compiled-data/navaids.json');
+const waypoints = require('./compiled-data/waypoints.json');
+const navaids = require('./compiled-data/navaids.json');
+const fileList = require('./utils').readDir(PATH);
 
-var promises = [];
-var fileList = require('./constants').readDir(PATH);
-var SID = {};
+let promises = [], SID = {};
 
-fileList.forEach(function (file) {
-    promises.push(new Promise(function (resolve, reject) {
-        var airportName = file.substring(0, file.indexOf('.txt'));
+fileList.forEach(file => {
+    promises.push(new Promise(resolve => {
+        const airportName = file.substring(0, file.indexOf('.txt'));
 
         fs.readFileAsync(PATH + file, 'utf-8')
-            .then(function (data) { parseFile(data, airportName); })
+            .then(data => parseFile(data, airportName))
             .then(resolve);
     }));
 });
 
-Promise.all(promises).then(writeFile);
+// new Promise(resolve => {
+//     console.log('Parsing SID data');
+//     Promise.all(promises).then(writeFile).then(resolve);
+// });
+
+module.exports = {
+    promises: promises,
+    writeFile: writeFile
+};
 
 // Callback functions
 function parseFile (fileContent, airportName) {
     // Splits each block (may contain SID, STAR, Final...)
-    var temp = fileContent.split('\r\n\r\n');
+    let temp = fileContent.split('\r\n\r\n');
     temp.shift();
     fileContent = []; // Empties fileContent for SID filters
 
     // Filters SID blocks and pushes to fileContent
-    temp.forEach(function (block) {
+    temp.forEach(block => {
         if (block.indexOf('SID') === 0) fileContent.push(block);
     });
 
     if (fileContent.length === 0) return;
 
     SID[airportName] = [];
 
-    for (var blocks = 0; blocks < fileContent.length; blocks++) {
+    for (let blocks = 0; blocks < fileContent.length; blocks++) {
         // Splits each SID block by line (SID line)
         fileContent[blocks] = fileContent[blocks].split('\r\n');
 
-        var obj = {
+        let obj = {
             name: undefined,
             runway: undefined,
             waypoints: []
         };
 
-        for (var lines = 0; lines < fileContent[blocks].length; lines++) {
+        for (let lines = 0; lines < fileContent[blocks].length; lines++) {
             // Splits each SID line by element
             fileContent[blocks][lines] = fileContent[blocks][lines].split(',');
 
-            var potentialWaypoint = fileContent[blocks][lines][1];
+            const potentialWaypoint = fileContent[blocks][lines][1];
             if (lines > 0 && (waypoints[potentialWaypoint] || navaids[potentialWaypoint])) {
                 obj.waypoints.push(fileContent[blocks][lines][1].trim());
-
-                // SID[airportName][SID[airportName].length - 1].waypoints.push({
-                //     fix: fileContent[blocks][lines][1],
-                //     altRes: 0 ? undefined : fileContent[blocks][lines][13],
-                //     spdRes: 0 ? undefined : fileContent[blocks][lines][11]
-                // });
             }
         }
 
-        var descriptor = fileContent[blocks][0];
-        var name = String(descriptor[1]).trim();
-        var runway = String(descriptor[2]).trim();
+        const descriptor = fileContent[blocks][0];
+        const name = String(descriptor[1]).trim();
+        const runway = String(descriptor[2]).trim();
 
         if (name) obj.name = name;
         if (RWY_REGEXP.test(runway)) obj.runway = runway;

compile/SID.js

@@ -1,74 +1,81 @@
 'use strict';
 
-var Promise = require('bluebird');
-var fs = Promise.promisifyAll(require('fs'));
-var path = require('path');
+const Promise = require('bluebird');
+
+const fs = Promise.promisifyAll(require('fs'));
+const path = require('path');
 
 require('graceful-fs').gracefulify(fs);
 
-var PATH = path.join(__dirname, require('./constants').ROOT_FOLDER + 'proc/');
-var RWY_REGEXP = /^\d\d[LCR]?$/;
+const PATH = path.join(__dirname, `${require('./utils').ROOT_FOLDER}proc/`);
+const RWY_REGEXP = /^\d\d[LCR]?$/;
 
-var waypoints = require('./compiled-data/waypoints.json');
-var navaids = require('./compiled-data/navaids.json');
+const waypoints = require('./compiled-data/waypoints.json');
+const navaids = require('./compiled-data/navaids.json');
+const fileList = require('./utils').readDir(PATH);
 
-var promises = [];
-var fileList = require('./constants').readDir(PATH);
-var STAR = {};
+let promises = [], STAR = {};
 
-fileList.forEach(function (file) {
-    promises.push(new Promise(function (resolve, reject) {
-        var airportName = file.substring(0, file.indexOf('.txt'));
+fileList.forEach(file => {
+    promises.push(new Promise(resolve => {
+        const airportName = file.substring(0, file.indexOf('.txt'));
 
         fs.readFileAsync(PATH + file, 'utf-8')
-            .then(function (data) { parseFile(data, airportName); })
+            .then(data => parseFile(data, airportName))
             .then(resolve);
     }));
 });
 
-Promise.all(promises).then(writeFile);
+module.exports = {
+    promises: promises,
+    writeFile: writeFile
+};
+// new Promise(resolve => {
+//     console.log('Parsing STAR data');
+//     Promise.all(promises).then(writeFile).then(resolve);
+// });
 
 // Callback functions
 function parseFile (fileContent, airportName) {
     // Splits each block (may contain SID, STAR, Final...)
-    var temp = fileContent.split('\r\n\r\n');
+    let temp = fileContent.split('\r\n\r\n');
     temp.shift();
     fileContent = []; // Empties fileContent for STAR filters
 
     // Filters STAR blocks and pushes to fileContent
-    temp.forEach(function (block) {
+    temp.forEach(block => {
         if (block.indexOf('STAR') === 0) fileContent.push(block);
     });
 
     if (fileContent.length === 0) return;
 
     STAR[airportName] = [];
 
-    for (var blocks = 0; blocks < fileContent.length; blocks++) {
+    for (let blocks = 0; blocks < fileContent.length; blocks++) {
         // Splits each STAR block by line (STAR line)
         fileContent[blocks] = fileContent[blocks].split('\r\n');
 
-        var obj = {
+        let obj = {
             name: undefined,
             runway: undefined,
             transition: undefined,
             connecting: undefined,
             waypoints: []
         };
 
-        for (var lines = 0; lines < fileContent[blocks].length; lines++) {
+        for (let lines = 0; lines < fileContent[blocks].length; lines++) {
             // Splits each STAR line by element
             fileContent[blocks][lines] = fileContent[blocks][lines].split(',');
 
-            var potentialWaypoint = fileContent[blocks][lines][1];
+            const potentialWaypoint = fileContent[blocks][lines][1];
             if (lines > 0 && (waypoints[potentialWaypoint] || navaids[potentialWaypoint])) {
                 obj.waypoints.push(fileContent[blocks][lines][1].trim());
             }
         }
 
-        var descriptor = fileContent[blocks][0];
-        var name = String(descriptor[1]).trim();
-        var runway = String(descriptor[2]).trim();
+        const descriptor = fileContent[blocks][0];
+        const name = String(descriptor[1]).trim();
+        const runway = String(descriptor[2]).trim();
 
         if (name) obj.name = name;
         if (RWY_REGEXP.test(runway)) obj.runway = runway;