diff --git a/src/renderer/components/CheckPanel.vue b/src/renderer/components/CheckPanel.vue index 8184772..732d5e8 100644 --- a/src/renderer/components/CheckPanel.vue +++ b/src/renderer/components/CheckPanel.vue @@ -8,8 +8,10 @@
+ + {{ result.message }} - +
diff --git a/src/renderer/components/EditBar.vue b/src/renderer/components/EditBar.vue index 7b68db7..645c999 100644 --- a/src/renderer/components/EditBar.vue +++ b/src/renderer/components/EditBar.vue @@ -3,8 +3,9 @@ + - + + + - diff --git a/src/renderer/components/FlightgearMap.vue b/src/renderer/components/FlightgearMap.vue index 3e93cac..0da497d 100644 --- a/src/renderer/components/FlightgearMap.vue +++ b/src/renderer/components/FlightgearMap.vue @@ -10,9 +10,11 @@ > + diff --git a/src/renderer/components/Upload.vue b/src/renderer/components/Upload.vue index 2715d8d..d037bfb 100644 --- a/src/renderer/components/Upload.vue +++ b/src/renderer/components/Upload.vue @@ -199,10 +199,10 @@ } }, comittable: function () { - return this.$store.state.Check.results.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 }, results: function () { - return this.$store.state.Check.results + return this.$store.state.Check.results.filter(a => a.id>=0) } } diff --git a/src/renderer/utils/check.js b/src/renderer/utils/check.js index a9b8723..8536f51 100644 --- a/src/renderer/utils/check.js +++ b/src/renderer/utils/check.js @@ -212,11 +212,29 @@ async function checkGroundnet(data) { }); notOkNodes = notOkNodes.concat(invalidParkings); + if (invalidParkings.length===0) { + notOkNodes.push({id:-1, message: 'Parkings valid'}); + } notOkNodes = notOkNodes.concat(overlappingParkings); + if (overlappingParkings.length===0) { + notOkNodes.push({id:-1, message: 'No parkings overlapping'}); + } notOkNodes = notOkNodes.concat(danglingEnds); + if (danglingEnds.length===0) { + notOkNodes.push({id:-1, message: 'No invalid ends'}); + } notOkNodes = notOkNodes.concat(notOkNodesParkings); + if (notOkNodesParkings.length===0) { + notOkNodes.push({id:-1, message: 'Routes from parkings OK'}); + } notOkNodes = notOkNodes.concat(notOkNodesRunways); + if (notOkNodesRunways.length===0) { + notOkNodes.push({id:-1, message: 'Routes from runways OK'}); + } notOkNodes = notOkNodes.concat(wrongPushbackRoutes); + if (wrongPushbackRoutes.length===0) { + notOkNodes.push({id:-1, message: 'Pushback routes OK'}); + } // check1(graph); // check2(); // this.postMessage(['progress', 1]); diff --git a/src/renderer/utils/scan.js b/src/renderer/utils/scan.js index 0372dd1..4df43f3 100644 --- a/src/renderer/utils/scan.js +++ b/src/renderer/utils/scan.js @@ -435,6 +435,7 @@ async function readGroundnet(f, features) { } feature['properties']['groundnet'] = nodes && nodes.node ? nodes.node.length : 0; var nodes = dat['?xml'].groundnet.parkingList; + //debugger; feature['properties']['parking'] = nodes && nodes.Parking ? nodes.Parking.length : 0; } } else if (filename[2] == 'ils') {