diff --git a/src/renderer/components/EditBar.vue b/src/renderer/components/EditBar.vue
index 645c999..f5a9cec 100644
--- a/src/renderer/components/EditBar.vue
+++ b/src/renderer/components/EditBar.vue
@@ -80,6 +80,7 @@
methods: {
upload() {
this.uploadVisible = true
+ this.$refs.upload.status()
this.$refs.upload.check()
},
zoomout() {
diff --git a/src/renderer/components/ParkingEdit.vue b/src/renderer/components/ParkingEdit.vue
index 7a4ab77..ce8e330 100644
--- a/src/renderer/components/ParkingEdit.vue
+++ b/src/renderer/components/ParkingEdit.vue
@@ -79,6 +79,7 @@
Coordinates :
+
-
-
-
+
+
Heading :
-
+
@@ -329,4 +336,10 @@
align-items: center;
font-weight: bold;
}
+.el-popover--plain {
+ padding: 10px 10px;
+}
+.el-popover__title {
+ display: none;
+}
diff --git a/src/renderer/components/SettingsPanel.vue b/src/renderer/components/SettingsPanel.vue
index 03c5b5a..443ad2d 100644
--- a/src/renderer/components/SettingsPanel.vue
+++ b/src/renderer/components/SettingsPanel.vue
@@ -53,6 +53,9 @@
+
+ Author E-Mail :
+
-
- Author E-Mail :
-
-
-
+
+
+
+ Author Name :
+
-
- Author Name :
-
-
-
+
+
-
+
+
Debugger
+
diff --git a/src/renderer/components/Upload.vue b/src/renderer/components/Upload.vue
index d037bfb..de744ef 100644
--- a/src/renderer/components/Upload.vue
+++ b/src/renderer/components/Upload.vue
@@ -1,11 +1,13 @@
-
-
+
+
+
+
{{results.length}} Errors please correct first
- Upload {{icao}} to groundweb.
E-Mail : {{this.$store.state.Settings.settings.email}}
I agree to release the groundnet under GPL v2
- {{message}}
+ {{message}}
+ {{message}}
@@ -16,6 +18,7 @@
/* eslint-disable */
import Vue from 'vue'
import fileUrl from 'file-url'
+ import axios from 'axios'
const fs = require('fs')
const path = require('path')
@@ -26,10 +29,26 @@
},
data () {
return {
- gplv2: false, message: '', progress: 0, max: 0
+ gplv2: false, message: null, error: false, progress: 0, max: 0, azure: false
}
},
methods: {
+ reqListener(e) {
+ if(JSON.parse(e.srcElement.response).status==='OK') {
+ this.message = null;
+ this.azure = true;
+ } else {
+ this.message = 'Azure down';
+ }
+
+ },
+ status () {
+ var xhr = new XMLHttpRequest();
+ this.message = 'Checking for Groundweb health'
+ xhr.open('GET', 'http://groundweb.azurewebsites.net/groundnets/status', true);
+ xhr.addEventListener("load", this.reqListener);
+ xhr.send();
+ },
upload () {
var f = path.join(this.$store.state.Settings.settings.airportsDirectory,
this.icao[0],
@@ -163,7 +182,7 @@
worker.terminate()
worker.view.max = 0
worker.view.checkDialogVisible = false
- clearInterval(this.polling)
+ clearInterval(this.polling)
this.checking = false
} else if (e.data.length > 0) {
if (e.data[0] === 'max') {
@@ -191,6 +210,9 @@
Vue.set(this.$parent, 'uploadVisible', newValue)
}
},
+ title: function () {
+ return `Upload ${this.$parent.$parent.$parent.icao} to groundweb.`
+ },
icao: {
get: function () {
return this.$parent.$parent.$parent.icao
@@ -199,7 +221,7 @@
}
},
comittable: function () {
- return this.$store.state.Check.results.filter(a => a.id>=0).length === 0 && this.gplv2 && this.max === 0
+ return this.$store.state.Check.results.filter(a => a.id>=0).length === 0 && this.gplv2 && this.max === 0 && this.azure
},
results: function () {
return this.$store.state.Check.results.filter(a => a.id>=0)
@@ -210,5 +232,6 @@
diff --git a/src/renderer/loaders/groundnet_writer.js b/src/renderer/loaders/groundnet_writer.js
index a23e796..0fa00e3 100644
--- a/src/renderer/loaders/groundnet_writer.js
+++ b/src/renderer/loaders/groundnet_writer.js
@@ -77,7 +77,7 @@ exports.writeGroundnetXML = function (fDir, icao, featureList) {
var frequencies = [];
var version = new Date().toUTCString() + ' by FlightgearAirports';
- var email = store.default.state.Settings.settings.name;
+ var name = store.default.state.Settings.settings.name;
diff --git a/src/renderer/store/modules/Settings.js b/src/renderer/store/modules/Settings.js
index 66a1c70..c0d67ee 100644
--- a/src/renderer/store/modules/Settings.js
+++ b/src/renderer/store/modules/Settings.js
@@ -1,6 +1,6 @@
/* eslint-disable */
const state = {
- settings: { flightgearDirectory: '.', testDirectory: '.', email: 'x', phi_url: 'http://localhost:8080' },
+ settings: { flightgearDirectory: '.', testDirectory: '.', email: 'flightgearairports@example.org', name: 'unknown', phi_url: 'http://localhost:8080' },
zoom: 14,
center: [47.413220, -1.219482],
bounds: undefined,