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

Check for unconnected pushback nodes

Browse Source
This commit is contained in:
portree_kid 2020-07-01 20:57:18 +02:00
parent 233362b2fa
commit 05a54a2d2f
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,6 +724,7 @@ You should have received a copy of the GNU General Public License along with FG
iconAnchor: [15, 42]
});
element['holdPointType'] = this.$store.state.Editable.data.node.holdPointType;
element.setIcon(icon);
}
hasHoldPointNode = true;
@ -787,6 +788,7 @@ You should have received a copy of the GNU General Public License along with FG
node.addTo(this.groundnetLayerGroup);
node.featureLookup = this.featureLookup;
this.featureLookup[nIndex].push(node);
node['holdPointType'] = this.$store.state.Editable.data.node.holdPointType;
node.addListeners();
node.extensions();
}

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

@ -104,7 +104,7 @@ async function checkGroundnet(data) {
pushbackNodes.forEach(element => {
noPushbackGraph[element] = {};
});
edges.forEach(element => {
edges.filter(element => element.isPushBackRoute).forEach(element => {
noPushbackGraph[element.start] = {};
noPushbackGraph[element.end] = {};
});
@ -141,6 +141,20 @@ async function checkGroundnet(data) {
this.postMessage(['progress', 1]);
});
});
var rogueHoldPoints = pushbackNodes.map(
//multiplePushbackRoutes.push();
id => {
var routes = noPushbackGraph[id];
if(Object.keys(routes).length<1)
return { id: id, message: 'Unconnected Pushbacknode' }
/*
else if(Object.keys(routes).length>1)
return { id: id, message: 'Multiple connected pushback node' }
*/
}
).filter(n => n !== undefined);
var wrongPushbackRoutes = parkings.filter(
function (e) {
//debugger;
@ -243,10 +257,11 @@ async function checkGroundnet(data) {
if (danglingEnds.length===0) {
notOkNodes.push({id:-1, message: 'No invalid ends'});
}
notOkNodes = notOkNodes.concat(notOkNodesParkings);
if (notOkNodesParkings.length===0) {
notOkNodes = notOkNodes.concat(notOkNodesParkings).concat(rogueHoldPoints);
if (notOkNodesParkings.length===0 && rogueHoldPoints===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'});
@ -302,15 +317,14 @@ function check2(params) {
}
var mapPushbackNodes = function (o) {
if (o.type === 'PushBack')
if (o.type === 'PushBack') {
return o.index;
console.log(o);
}
}
var mapParkings = function (o) {
if (o.type === 'parking')
return o.index;
console.log(o);
}
var mapParkingNode = function (o) {