From 7e032e73b22b1b0b3575da2adea0e1894907851e Mon Sep 17 00:00:00 2001
From: portree_kid <keith.paterson@gmx.de>
Date: Fri, 10 Jul 2020 21:44:51 +0200
Subject: [PATCH] https://github.com/Portree-Kid/flightgear-airports/issues/46

---
 src/renderer/components/FlightgearMap.vue | 15 +++++++++++----
 src/renderer/utils/check.js               | 19 +++++++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/renderer/components/FlightgearMap.vue b/src/renderer/components/FlightgearMap.vue
index 5e73aaa..e5f7682 100644
--- a/src/renderer/components/FlightgearMap.vue
+++ b/src/renderer/components/FlightgearMap.vue
@@ -62,6 +62,8 @@ You should have received a copy of the GNU General Public License along with FG
   import ToolLayer from './ToolLayer'
   import PavementLayer from './PavementLayer'
   import ThresholdLayer from './ThresholdLayer'
+
+  import { Loading } from 'element-ui'
   import L from 'leaflet'
 
   // https://github.com/KoRiGaN/Vue2Leaflet/issues/103
@@ -86,10 +88,15 @@ You should have received a copy of the GNU General Public License along with FG
             .filter(feature => this.visible(feature))
             .map(feature => feature.properties.icao)
           if (airportsToLoad.length > 0 && airportsToLoad[0] !== this.editingAirport && this.zoom > 12) {
-            this.$refs.pavementLayer.load(airportsToLoad[0])
-            this.$refs.editLayer.load(airportsToLoad[0])
-            this.$refs.thresholdLayer.load(airportsToLoad[0])
-            this.editingAirport = airportsToLoad[0]
+            let loadingInstance = Loading.service({ fullscreen: true })
+
+            this.$nextTick(() => { // Loading should be closed asynchronously
+              this.$refs.pavementLayer.load(airportsToLoad[0])
+              this.$refs.editLayer.load(airportsToLoad[0])
+              this.$refs.thresholdLayer.load(airportsToLoad[0])
+              loadingInstance.close()
+              this.editingAirport = airportsToLoad[0]
+            })
           }
           if (this.$refs.editLayer) {
             this.$refs.editLayer.setVisible(this.zoom >= 12)
diff --git a/src/renderer/utils/check.js b/src/renderer/utils/check.js
index fc7c0f4..5af134a 100644
--- a/src/renderer/utils/check.js
+++ b/src/renderer/utils/check.js
@@ -10,7 +10,7 @@ var turf;
 
 if(process.env.NODE_ENV === 'development') {
     importScripts('../../../node_modules/dijkstrajs/dijkstra.js');
-    turf = require('../../../../../@turf/turf');
+    turf = require('./node_modules/@turf/turf');
 } else {
     importScripts('dijkstra.js');
     turf = require('@turf/turf')
@@ -119,7 +119,7 @@ async function checkGroundnet(data) {
                     this.postMessage(['progress', 1]);
                 });
             });
-            // Check pushback parkings
+            // Build pushback graph
             var noPushbackGraph = {};
             parkings.forEach(element => {
                 noPushbackGraph[element] = {};
@@ -131,6 +131,7 @@ async function checkGroundnet(data) {
                 noPushbackGraph[element.start] = {};
                 noPushbackGraph[element.end] = {};
             });
+            // add all pushback edges
             edges.filter(element => element.isPushBackRoute).forEach(element => {
                 var node1 = noPushbackGraph[Number(element.start)];
                 node1[Number(element.end)] = 1;
@@ -147,7 +148,16 @@ async function checkGroundnet(data) {
                 pushbackNodes.forEach(pushbackNode => {
                     var numRoutes = checkRoute(noPushbackGraph, parkingNode, pushbackNode);
                     if (numRoutes===0) {
-                        okPushbacks.push(parkingNode);
+                        /*
+                        if(parkingNode===14) {
+                            debugger;
+                        }
+                        */
+                        if (multiplePushbackRoutes[parkingNode]===undefined &&
+                            Object.keys(noPushbackGraph[parkingNode])>0) {
+                            // Only when there is a edge leaving     
+                            multiplePushbackRoutes[parkingNode] = [];
+                        } 
                     } else if (numRoutes===1){
                         if (multiplePushbackRoutes[parkingNode]===undefined) {
                             multiplePushbackRoutes[parkingNode] = [pushbackNode];
@@ -181,9 +191,6 @@ async function checkGroundnet(data) {
                     return this[e] != undefined && this[e].length != 1;
                 }
                 , multiplePushbackRoutes).map(
-
-                    //multiplePushbackRoutes.push();
-
                     id => { 
                         var endPoints = multiplePushbackRoutes[id];
                         if( endPoints.length<1)