diff --git a/build/installer.nsh b/build/installer.nsh
new file mode 100644
index 0000000..9886d3d
--- /dev/null
+++ b/build/installer.nsh
@@ -0,0 +1,8 @@
+!macro preInit
+ SetRegView 64
+ WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES64\flightgear-airports"
+ WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES64\flightgear-airports"
+ SetRegView 32
+ WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES32\flightgear-airports"
+ WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES32\flightgear-airports"
+!macroend
diff --git a/src/renderer/components/ArcEditMulti.vue b/src/renderer/components/ArcEditMulti.vue
new file mode 100644
index 0000000..753eafc
--- /dev/null
+++ b/src/renderer/components/ArcEditMulti.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+ Name :
+
+
+
+
+
+
+ Pushback :
+
+
+
+
+
+
+ Direction :
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/DirectorySelect.vue b/src/renderer/components/DirectorySelect.vue
index dde7b6b..64dbfab 100644
--- a/src/renderer/components/DirectorySelect.vue
+++ b/src/renderer/components/DirectorySelect.vue
@@ -3,7 +3,7 @@
...
-
@@ -51,7 +60,9 @@
},
computed: {
-
+ version: function () {
+ return ' Flightgear Airports ' + require('electron').remote.app.getVersion()
+ }
}
}
diff --git a/src/renderer/components/LeafletSidebar.vue b/src/renderer/components/LeafletSidebar.vue
index 746190d..967de5b 100644
--- a/src/renderer/components/LeafletSidebar.vue
+++ b/src/renderer/components/LeafletSidebar.vue
@@ -38,6 +38,7 @@ You should have received a copy of the GNU General Public License along with FG
Airports Directory
- {{ airports_directory }}
-
- {{ airports_directory }}
+
+
+
Flightgear Data Directory
- {{ flightgear_directory }}
-
+ {{ flightgear_directory }}
+
- Traffic Directory
- {{ Traffic_directory }}
+ Traffic Directory
+
+
+ {{ Traffic_directory }}
- APT File
- {{ apt_file }}
+ APT File
+
+
+ {{ apt_file }}
Export Directory
- {{ test_directory }}
+ {{ test_directory }}
@@ -194,6 +206,14 @@
flightgear_directory: function () {
return this.$store.state.Settings.settings.flightgearDirectory
},
+ flightgear_directory_ok: function () {
+ try {
+ fs.accessSync(this.$store.state.Settings.settings.flightgearDirectory)
+ return true
+ } catch (error) {
+ return false
+ }
+ },
AI_directory: function () {
return this.$store.state.Settings.settings.flightgearDirectory_ai
},
@@ -222,9 +242,25 @@
airports_directory: function () {
return this.$store.state.Settings.settings.airportsDirectory
},
+ airports_directory_ok: function () {
+ try {
+ fs.accessSync(this.$store.state.Settings.settings.airportsDirectory)
+ return true
+ } catch (error) {
+ return false
+ }
+ },
test_directory: function () {
return this.$store.state.Settings.settings.testDirectory
},
+ test_directory_ok: function () {
+ try {
+ fs.accessSync(this.$store.state.Settings.settings.testDirectory)
+ return true
+ } catch (error) {
+ return false
+ }
+ },
scanLogging: {
// getter
get: function () {
@@ -247,14 +283,14 @@
border-radius: 4px;
}
.label {
- padding: 10px;
+ padding: 5px;
font-weight: bold;
}
-.file-label {
- padding: 10px;
+.file_label {
+ padding: 5px;
}
.invalid {
- padding: 10px;
+ padding: 5px;
background-color: red;
}
diff --git a/src/renderer/components/ThresholdLayer.vue b/src/renderer/components/ThresholdLayer.vue
index a6f75e7..545186a 100644
--- a/src/renderer/components/ThresholdLayer.vue
+++ b/src/renderer/components/ThresholdLayer.vue
@@ -31,6 +31,10 @@
load (icao) {
// Callback for add
this.layerGroup = readThresholdXML(this.$store.state.Settings.settings.airportsDirectory, icao, this.read)
+ if (!this.layerGroup) {
+ console.warn('Threshold for ICAO not loaded ' + icao)
+ return
+ }
this.layerGroup.addTo(this.$parent.mapObject)
this.visible = true
this.icao = icao
@@ -58,13 +62,21 @@
this.visible = visible
}
}
+ },
+ zoomUpdated () {
+ this.layerGroup.eachLayer(l => {
+ if (l instanceof L.Threshold) {
+ l.updateIcon(this.$parent.mapObject)
+ }
+ })
}
+
},
computed: {
edit: function () {
console.log('Zoom : ' + this.$store.state.Settings.zoom)
if (this.$store.state.Settings.zoom > 12) {
- console.log()
+ console.log('Zoom above 12')
}
}
}
diff --git a/src/renderer/components/TowerLayer.vue b/src/renderer/components/TowerLayer.vue
new file mode 100644
index 0000000..3718b94
--- /dev/null
+++ b/src/renderer/components/TowerLayer.vue
@@ -0,0 +1,104 @@
+
+${this.svg}
`,
+ }));
+
+ this.update(this.getLatLng());
+ console.debug();
+ this.setLatLng(this.getLatLng());
+ this._metersPP = metersPP;
}
- else if(event.target.editor._resizeLatLng.__vertex._icon === event.sourceTarget._element) {
- event.target.updateDirectionFromVertex();
- event.target.updateVertexFromDirection();
- }
- });
- /*
- this.on('editable:vertex:drag', function (event) {
- console.log("Drag : ", event);
- });
- */
- this.on('click', function (event) {
- console.log("Click : " + event.target);
- store.default.dispatch('setParking', event.target.options.attributes);
- this.select();
- this.unwatch = store.default.watch(
- function (state) {
- return state.Editable.data.parking;
- },
- () => {
- if (event.target instanceof L.Threshold) {
- event.target.setStyle({color : '#3388ff'});
- this.unwatch();
- }
- }
- ,
- {
- deep: true //add this if u need to watch object properties change etc.
- }
- );
- });
- this.on('editable:vertex:clicked', function (event) {
- console.log(this.featureLookup[event.vertex.glueindex]);
- if(event.target.editor._resizeLatLng.__vertex._icon !== event.sourceTarget._element){
- event.vertex._icon.style['background-color'] = 'red';
- store.default.dispatch('setParking', event.target.options.attributes);
- this.unwatch = store.default.watch(
- function (state) {
- return state.Editable.data.parking;
- },
- () => {
- event.target.setStyle({color : '#3388ff'});
- this.unwatch();
- }
- ,
- {
- deep: true //add this if u need to watch object properties change etc.
- }
- );
+ }
+ },
+ onAdd : function(map) {
+ var metersPP = this.metersPerPixel(map.getCenter().lat, map.getZoom());
+ this.updateIcon(map);
+ },
+ metersPerPixel: function (latitude, zoomLevel) {
+ var earthCircumference = 40075017;
+ var latitudeRadians = latitude * (Math.PI / 180);
+ return earthCircumference * Math.cos(latitudeRadians) / Math.pow(2, zoomLevel + 8);
+ },
- }
-
- });
-
- this.on('editable:disable', function (event) {
- event.target.removeDirection();
- });
- },
- updateStyle: function () {
-
- },
- turfToLatLng: function (turfPoint) {
- return {lat: turfPoint.geometry.coordinates[1], lng: turfPoint.geometry.coordinates[0]};
- },
- extensions: function (editLayer) {
- this.createDirection();
- if (typeof this.featureLookup[this.id] === 'undefined') {
- this.featureLookup[this.id] = [];
- }
- this.featureLookup[this.id].push(this);
- },
-
- _getLatRadius: function () {
- return this._mRadius;
- },
-
- _getLngRadius: function () {
- return this._mRadius;
+ pixelValue: function (latitude, meters, zoomLevel) {
+ return meters / metersPerPixel(latitude, zoomLevel);
},
+
});
-var threshold = function (n, layerGroup) {
- //console.log(n.attr('lat') + " " + n.attr('lon'));
- var latlon = convert(n.find('lat/text()').text() + " " + n.find('lon/text()').text());
- //console.log(latlon.decimalLatitude);
- //console.log(convert(n.attr('lat') + " " + n.attr('lon')).decimalLongitude);
- const circle = new L.Threshold([latlon.decimalLatitude, latlon.decimalLongitude], { radius: 10, attributes: {} });
- circle.on('editable:enable', function (event) {
- // event.target.createDirection();
- });
- /*
-${this.svg}
`,
+ }));
+ this._metersPP = metersPP;
+ }
+ }
+ },
+ onAdd : function(map) {
+ var metersPP = this.metersPerPixel(map.getCenter().lat, map.getZoom());
+ console.debug('Meters per pixel ' + metersPP);
+ this.updateIcon(map);
+ },
+ metersPerPixel: function (latitude, zoomLevel) {
+ var earthCircumference = 40075017;
+ var latitudeRadians = latitude * (Math.PI / 180);
+ return earthCircumference * Math.cos(latitudeRadians) / Math.pow(2, zoomLevel + 8);
+ },
+
+ pixelValue: function (latitude, meters, zoomLevel) {
+ return meters / metersPerPixel(latitude, zoomLevel);
+ },
+
+
+});
+
+//Builds a marker for a ai or multiplayer aircraft
+var tower = function (n, options) {
+ var latlon = convert(n.find('lat/text()').text() + " " + n.find('lon/text()').text());
+ return new L.TowerMarker([latlon.decimalLatitude, latlon.decimalLongitude], options);
+}
+
+module.exports = tower;
diff --git a/src/renderer/loaders/groundnet_writer.js b/src/renderer/loaders/groundnet_writer.js
index 5fa6463..4fc2c74 100644
--- a/src/renderer/loaders/groundnet_writer.js
+++ b/src/renderer/loaders/groundnet_writer.js
@@ -60,6 +60,11 @@ function walkPushbackRoute (index, walkedNodes, pushBackNodes) {
exports.writeGroundnetXML = function (fDir, icao, featureList) {
try {
+ try { fs.mkdirSync(path.join(fDir), { recursive: true })} catch (err) { }
+ try { fs.mkdirSync(path.join(fDir, icao[0]),{ recursive: true })} catch (err) { }
+ try { fs.mkdirSync(path.join(fDir, icao[0], icao[1]), { recursive: true })} catch (err) { }
+ try { fs.mkdirSync(path.join(fDir, icao[0], icao[1], icao[2]), { recursive: true })} catch (err) { }
+
var f = path.join(fDir, icao[0], icao[1], icao[2], icao + '.groundnet.new.xml');
var fBak = path.join(fDir, icao[0], icao[1], icao[2], icao + '.groundnet.bak.xml');
@@ -201,7 +206,12 @@ var mapParkings = function (o) {
console.debug(o.options.attributes.airlineCodes);
parking['@airlineCodes'] = o.options.attributes.airlineCodes;
}
- if(o.options.attributes.number) {
+ if(o.options.attributes.number !== undefined &&
+ typeof o.options.attributes.number === 'number' || (
+ typeof o.options.attributes.number === 'string' &&
+ o.options.attributes.number.trim() !== ''
+ )
+ ) {
console.debug(o.options.attributes.number);
parking['@number'] = o.options.attributes.number;
}
diff --git a/src/renderer/loaders/threshold_loader.js b/src/renderer/loaders/threshold_loader.js
index 9b6b5da..31ae532 100644
--- a/src/renderer/loaders/threshold_loader.js
+++ b/src/renderer/loaders/threshold_loader.js
@@ -50,8 +50,16 @@ exports.readThresholdXML = function (fDir, icao, force) {
thresholdNodes.map(n => {
- var circle = threshold(n, layerGroup);
- features.push(circle);
+ var icon = threshold(n);
+ icon.addTo(layerGroup);
+
+ var latlon = convert(n.find('lat/text()').text() + " " + n.find('lon/text()').text());
+ /*
+ var marker = new L.Circle([latlon.decimalLatitude, latlon.decimalLongitude], 5);
+ marker.addTo(layerGroup);
+ */
+
+// features.push(circle);
}).sort();
return layerGroup;
diff --git a/src/renderer/loaders/tower_loader.js b/src/renderer/loaders/tower_loader.js
new file mode 100644
index 0000000..e898bd1
--- /dev/null
+++ b/src/renderer/loaders/tower_loader.js
@@ -0,0 +1,83 @@
+/*
+Copyright 2020 Keith Paterson
+
+This file is part of FG Airports.
+
+FG Airports is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+FG Airports is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with FG Airports. If not, see http://www.gnu.org/licenses/.
+*/
+/* eslint-disable */
+const fs = require('fs');
+const path = require('path');
+var xamel = require('xamel');
+const convert = require('geo-coordinates-parser');
+
+const store = require('../store');
+
+const util = require('util');
+
+const tower = require('./Tower.js');
+
+
+var $ = require('jquery');
+
+exports.readTowerXML = function (fDir, icao, force) {
+ try {
+ var layerGroup = L.layerGroup();
+ layerGroup.maxId = 0;
+ var f = path.join(fDir, icao[0], icao[1], icao[2], icao + '.twr.xml');
+ var fNew = path.join(fDir, icao[0], icao[1], icao[2], icao + '.twr.new.xml');
+
+ if (f == null || !fs.existsSync(f))
+ return;
+ if (fNew != null && fs.existsSync(fNew) && !force) {
+ f = fNew;
+ }
+
+ var features = new Array();
+
+ // map.on("editable:vertex:new", function (event) {
+ // log.console("Add vertex " + event);
+ // });
+
+ var xmlGroundnet = fs.readFileSync(f, 'utf8').toString();
+ xamel.parse(xmlGroundnet, function (err, xml) {
+ console.debug("parsed " + path.basename(f));
+ if (err !== null) {
+ console.error("Error in " + airline);
+ throw err;
+ }
+
+ var towerNodes = xml.find('PropertyList/tower/twr');
+ console.log("Tower " + towerNodes.length);
+
+ var merged = new Array();
+
+ var nodesLookup = {};
+ featureLookup = [];
+
+
+ towerNodes.map(n => {
+ var towerIcon = tower(n, layerGroup);
+ towerIcon.addTo(layerGroup);
+ var latlon = convert(n.find('lat/text()').text() + " " + n.find('lon/text()').text());
+ /*
+ var marker = new L.Circle([latlon.decimalLatitude, latlon.decimalLongitude], 5);
+ marker.addTo(layerGroup);
+ */
+
+ features.push(towerIcon);
+ }).sort();
+
+ return layerGroup;
+ });
+ // var jsonAirports = JSON.parse(geoJSON);
+ // return jsonAirports;
+ } catch (error) {
+ console.error(error);
+ }
+ return layerGroup;
+};
\ No newline at end of file
diff --git a/src/renderer/store/modules/Editable.js b/src/renderer/store/modules/Editable.js
index 1c10641..45270bf 100644
--- a/src/renderer/store/modules/Editable.js
+++ b/src/renderer/store/modules/Editable.js
@@ -1,15 +1,28 @@
+/**
+Copyright 2020 Keith Paterson
+
+This file is part of FG Airports.
+
+FG Airports is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+FG Airports is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with FG Airports. If not, see http://www.gnu.org/licenses/.
+*/
+
import Vue from 'vue'
const state = {
type: 'none',
index: 'none',
editing: false,
- data: {airports: {}, parking: {}, arc: {}, node: {}, runway: {}}
+ data: {airports: {}, parking: {}, arc: {}, multiarc: {}, node: {}, runway: {}}
}
const SET_EDIT_AIRPORT = 'SET_EDIT_AIRPORT'
const SET_EDIT_PARKING = 'SET_EDIT_PARKING'
const SET_EDIT_ARC = 'SET_EDIT_ARC'
+const SET_EDIT_MULTI_ARC = 'SET_EDIT_MULTI_ARC'
const SET_EDIT_RUNWAY = 'SET_EDIT_RUNWAY'
const mutations = {
@@ -62,6 +75,34 @@ const mutations = {
Vue.set(state, 'index', arc.index)
Vue.set(state, 'type', 'arc')
},
+ SET_EDIT_MULTI_ARC (state, arc) {
+ if (arc === undefined) {
+ return
+ }
+ if (!state.data || state.type !== 'multiarc') {
+ Vue.set(state, 'data', {multiarc: {}})
+ }
+ Vue.set(state.data.multiarc, 'isPushBackRoute', arc.isPushBackRoute)
+ Vue.set(state.data.multiarc, 'direction', arc.direction)
+ if (state.data.multiarc.name === undefined) {
+ Vue.set(state.data.multiarc, 'name', '')
+ }
+ Vue.set(state, 'index', arc.index)
+
+ Vue.set(state, 'type', 'multiarc')
+ },
+ 'SET_EDIT_MULTI_ARC_IDS' (state, arcs) {
+ if (arcs === undefined) {
+ return
+ }
+ if (!state.data || state.type !== 'multiarc') {
+ return
+ }
+ if (state.data.multiarc.ids === undefined) {
+ state.data.multiarc.ids = []
+ }
+ state.data.multiarc.ids = state.data.multiarc.ids.concat(arcs.filter(n => n).filter((v, i, a) => a.indexOf(v) === i))
+ },
'SET_EDIT_PARKING_NAME' (state, parkingName) {
Vue.set(state.data.parking, 'name', parkingName)
},
@@ -91,13 +132,25 @@ const mutations = {
Vue.set(state.data.parking, 'coords', coords)
},
'SET_EDIT_ARC_NAME' (state, arcName) {
- Vue.set(state.data.arc, 'name', arcName)
+ if (state.type === 'arc') {
+ Vue.set(state.data.arc, 'name', arcName)
+ } else {
+ Vue.set(state.data.multiarc, 'name', arcName)
+ }
},
'SET_EDIT_PUSHBACK' (state, isPushBackRoute) {
- Vue.set(state.data.arc, 'isPushBackRoute', Number(isPushBackRoute))
+ if (state.type === 'arc') {
+ Vue.set(state.data.arc, 'isPushBackRoute', Number(isPushBackRoute))
+ } else {
+ Vue.set(state.data.multiarc, 'isPushBackRoute', Number(isPushBackRoute))
+ }
},
'SET_EDIT_DIRECTION' (state, direction) {
- Vue.set(state.data.arc, 'direction', direction)
+ if (state.type === 'arc') {
+ Vue.set(state.data.arc, 'direction', direction)
+ } else {
+ Vue.set(state.data.multiarc, 'direction', direction)
+ }
},
'SET_EDIT_HOLDPOINTTYPE' (state, holdPointType) {
Vue.set(state.data.node, 'holdPointType', holdPointType)
@@ -132,6 +185,12 @@ const actions = {
async setArc (context, arc) {
context.commit(SET_EDIT_ARC, arc)
},
+ async setMultiArc (context, arc) {
+ context.commit(SET_EDIT_MULTI_ARC, arc)
+ },
+ async setMultiArcIds (context, arc) {
+ context.commit('SET_EDIT_MULTI_ARC_IDS', arc)
+ },
async setNode (context, node) {
context.commit('SET_EDIT_NODE', node.attributes)
context.commit('SET_EDIT_NODE_COORDS', node.lat.toFixed(6) + ' ' + node.lng.toFixed(6))
diff --git a/src/renderer/store/modules/Loading.js b/src/renderer/store/modules/Loading.js
index 75a16ee..d6cc7bf 100644
--- a/src/renderer/store/modules/Loading.js
+++ b/src/renderer/store/modules/Loading.js
@@ -31,9 +31,15 @@ const actions = {
context.commit('SET_ICAO_LOADING', p)
},
async setGroundnetLoaded (context, p) {
+ if (typeof p !== 'boolean') {
+ console.error('Not Boolean')
+ }
context.commit('SET_GROUNDNET_LOADED', p)
},
async setPavementLoaded (context, p) {
+ if (typeof p !== 'boolean') {
+ console.error('Not Boolean')
+ }
context.commit('SET_PAVEMENT_LOADED', p)
}
}
diff --git a/src/renderer/utils/scan.js b/src/renderer/utils/scan.js
index dd951e0..303bfc0 100644
--- a/src/renderer/utils/scan.js
+++ b/src/renderer/utils/scan.js
@@ -186,6 +186,9 @@ function scanTrafficIntoDB(p, features) {
function traverseDir(dir) {
var result = [];
+ if(!fs.existsSync(dir)) {
+ return result;
+ }
fs.readdirSync(dir).forEach(file => {
let fullPath = path.join(dir, file);
if (fs.lstatSync(fullPath).isDirectory()) {
diff --git a/static/FGA_ACT_A_GA.svg b/static/FGA_ACT_A_GA.svg
new file mode 100644
index 0000000..ea3bfb2
--- /dev/null
+++ b/static/FGA_ACT_A_GA.svg
@@ -0,0 +1,2 @@
+
+image/svg+xml
+
+
+
+image/svg+xml
+
+
+
+
+
+
diff --git a/static/FGA_THR.svg b/static/FGA_THR.svg
new file mode 100644
index 0000000..aa41794
--- /dev/null
+++ b/static/FGA_THR.svg
@@ -0,0 +1,89 @@
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
diff --git a/static/tower.svg b/static/tower.svg
new file mode 100644
index 0000000..93d5265
--- /dev/null
+++ b/static/tower.svg
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+