FGFS-4.1/flightgear-airports-old
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check

Browse Source
This commit is contained in:
portree_kid 2020-06-21 22:55:39 +02:00
parent b841b8560d
commit 063fd049f0
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/components/CheckPanel.vue
View File

@ -8,8 +8,10 @@
</h1>
<div id="panel" width="100%">
<el-row v-for="(result,idx) in results" :key="idx">
<el-col :span="3" v-if="result.id<0"><i class="far fa-check-circle"></i></el-col>
<el-col :span="3" v-if="result.id>=0"><i class="fas fa-exclamation-triangle"></i></el-col>
<el-col :span="15">{{ result.message }}</el-col>
<el-col :span="7"><el-button v-on:click="show(result.id)" class="button"><i class="fas fa-bullseye"></i></el-button></el-col>
<el-col :span="7" v-if="result.id>=0"><el-button v-on:click="show(result.id)" class="button"><i class="fas fa-bullseye"></i></el-button></el-col>
</el-row>
</div>
</div>

6
src/renderer/components/EditBar.vue
View File

@ -3,8 +3,9 @@
<Upload :visible.sync="uploadVisible" ref="upload"></Upload>
<EditButton icon="fas fa-th" v-on:click="zoomin" :show="true" tooltip="Zoomin"></EditButton>
<EditButton icon="fas fa-th-large" v-on:click="zoomout" :show="!editing" tooltip="Zoomout"></EditButton>
<EditButton icon="fas fa-upload" v-on:click="upload" :show="!editing" tooltip="Upload"></EditButton>
<EditButton icon="fas fa-plane" v-on:click="test" :show="!editing" tooltip="Test"></EditButton>
<EditButton icon="fas fa-plane" v-on:click="test" :show="!editing" tooltip="Export"></EditButton>
<EditButton icon="fas fa-edit" v-on:click="edit" :show="!editing" tooltip="Edit"></EditButton>
<EditButton
icon="fas fa-undo"
@ -24,6 +25,8 @@
</el-dialog>
<EditButton icon="fas fa-save" v-on:click="save" :show="editing" tooltip="Save"></EditButton>
<EditButton icon="far fa-check-square" v-on:click="showCheck" :show="editing" tooltip="Check"></EditButton>
<EditButton
icon="fas fa-draw-polygon"
v-on:click="drawPolyline"
@ -49,7 +52,6 @@
tooltip="Draw Parking"
></EditButton>
<EditButton icon="fas fa-trash-alt" v-on:click="deleteFeature" :show="editing" tooltip="Remove"></EditButton>
<EditButton icon="far fa-check-square" v-on:click="showCheck" :show="editing" tooltip="Check"></EditButton>
<el-dialog title="Checking" width="30%" center :visible.sync="checkDialogVisible">
<el-container direction="vertical">
<el-progress :percentage="Number(((progress / max)*100).toPrecision(3))" v-if="max>0"></el-progress>

2
src/renderer/components/FlightgearMap.vue
View File

@ -10,9 +10,11 @@
>
<!--The backgroundmap-->
<l-tile-layer :url="url" :attribution="attribution" :options="{maxZoom: 22, maxNativeZoom: 17}"></l-tile-layer>
<!--
<l-control position="topright" >
<el-button @click="editAirport()">{{ icao }}</el-button>
</l-control>
-->
<!--<l-marker :lat-lng="marker"></l-marker>-->
<LeafletSidebar></LeafletSidebar>
<EditBar></EditBar>

4
src/renderer/components/Upload.vue
View File

@ -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)
}
}

18
src/renderer/utils/check.js
View File

@ -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]);

1
src/renderer/utils/scan.js
View File

@ -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') {