Check for empty names
This commit is contained in:
parent
826781647e
commit
4b908f57ce
@ -19,7 +19,7 @@ function errorReceiver(event) {
|
||||
|
||||
onmessage = function (event) {
|
||||
postMessage('checkStarted');
|
||||
logger('info', 'Check Started');
|
||||
logger('info', 'Check Started');
|
||||
console.log(event.data);
|
||||
if (event.data[0] === 'check') {
|
||||
checkGroundnet(event.data[1]).then(result => {
|
||||
@ -43,8 +43,8 @@ async function checkGroundnet(data) {
|
||||
var runwayNodes = data.map(mapRunwayNodes).filter(n => n !== undefined);
|
||||
var pushbackNodes = data.map(mapPushbackNodes).filter(n => n !== undefined);
|
||||
var edges = data.map(mapEdges).filter(n => n !== undefined);
|
||||
this.max = parkings.length * runwayNodes.length +
|
||||
parkings.length;
|
||||
this.max = parkings.length * runwayNodes.length +
|
||||
parkings.length;
|
||||
this.postMessage(['max', this.max]);
|
||||
|
||||
var graph = {};
|
||||
@ -69,14 +69,14 @@ async function checkGroundnet(data) {
|
||||
logger('info', graph);
|
||||
parkings.forEach(parkingNode => {
|
||||
runwayNodes.forEach(runwayNode => {
|
||||
var ok = checkRoute(graph, parkingNode, runwayNode);
|
||||
if(ok) {
|
||||
okNodes.push(parkingNode);
|
||||
okNodes.push(runwayNode);
|
||||
} else {
|
||||
console.log(`No route from ${parkingNode} to ${runwayNode}`);
|
||||
}
|
||||
this.postMessage(['progress', 1]);
|
||||
var ok = checkRoute(graph, parkingNode, runwayNode);
|
||||
if (ok) {
|
||||
okNodes.push(parkingNode);
|
||||
okNodes.push(runwayNode);
|
||||
} else {
|
||||
console.log(`No route from ${parkingNode} to ${runwayNode}`);
|
||||
}
|
||||
this.postMessage(['progress', 1]);
|
||||
});
|
||||
});
|
||||
// Check forward parkings
|
||||
@ -96,87 +96,94 @@ async function checkGroundnet(data) {
|
||||
node1[Number(element.end)] = 1;
|
||||
var node2 = noPushbackGraph[element.end];
|
||||
node2[Number(element.start)] = 1;
|
||||
});
|
||||
});
|
||||
|
||||
var okPushbacks = [];
|
||||
parkings.forEach(parkingNode => {
|
||||
pushbackNodes.forEach(pushbackNode => {
|
||||
var ok = checkRoute(noPushbackGraph, parkingNode, pushbackNode);
|
||||
if(ok) {
|
||||
okPushbacks.push(parkingNode);
|
||||
}
|
||||
this.postMessage(['progress', 1]);
|
||||
var ok = checkRoute(noPushbackGraph, parkingNode, pushbackNode);
|
||||
if (ok) {
|
||||
okPushbacks.push(parkingNode);
|
||||
}
|
||||
this.postMessage(['progress', 1]);
|
||||
});
|
||||
});
|
||||
var wrongPushbackRoutes = parkings.filter(
|
||||
function(e) {
|
||||
var wrongPushbackRoutes = parkings.filter(
|
||||
function (e) {
|
||||
return this.indexOf(e) < 0;
|
||||
}
|
||||
, okPushbacks ).map(
|
||||
id => {return {id:id, message:'No way to pushback holdpoint'}}
|
||||
);
|
||||
}
|
||||
, okPushbacks).map(
|
||||
id => { return { id: id, message: 'No way to pushback holdpoint' } }
|
||||
);
|
||||
|
||||
|
||||
|
||||
okNodes = okNodes.filter((v,i) => okNodes.indexOf(v) === i);
|
||||
okNodes = okNodes.filter((v, i) => okNodes.indexOf(v) === i);
|
||||
var allLegitimateEndNodes = parkings.concat(runwayNodes).concat(pushbackNodes);
|
||||
var notOkNodes = parkings.concat(runwayNodes).filter(
|
||||
(v,i) => okNodes.indexOf(v) < 0
|
||||
).map(
|
||||
id => {return {id:id, message:'No way to each runway'}}
|
||||
);
|
||||
(v, i) => okNodes.indexOf(v) < 0
|
||||
).map(
|
||||
id => { return { id: id, message: 'No way to each runway' } }
|
||||
);
|
||||
if (parkings.length === 0) {
|
||||
notOkNodes.push({id:0, message:'No parkings'});
|
||||
notOkNodes.push({ id: 0, message: 'No parkings' });
|
||||
}
|
||||
if (runwayNodes.length === 0) {
|
||||
notOkNodes.push({id:0, message:'No Runwaynodes'});
|
||||
notOkNodes.push({ id: 0, message: 'No Runwaynodes' });
|
||||
}
|
||||
var allEnds = Object.entries(graph).filter(
|
||||
(v,i) => Object.keys(v[1]).length <= 1
|
||||
);
|
||||
(v, i) => Object.keys(v[1]).length <= 1
|
||||
);
|
||||
// Ends that are not on Runway and not a Parking or Pushback
|
||||
var danglingEnds = allEnds.filter(
|
||||
(v,i) => allLegitimateEndNodes.indexOf(Number(v[0])) < 0
|
||||
).map(
|
||||
v => {return {id:Number(v[0]), message:'Node not a legimate end'}}
|
||||
);
|
||||
(v, i) => allLegitimateEndNodes.indexOf(Number(v[0])) < 0
|
||||
).map(
|
||||
v => { return { id: Number(v[0]), message: 'Node not a legimate end' } }
|
||||
);
|
||||
notOkNodes = notOkNodes.concat(danglingEnds);
|
||||
// Ends that are not on Runway and not a Parking or Pushback
|
||||
var wrongPushbackEnds = pushbackNodes.filter(
|
||||
(v,i) => allEnds.map(a => Number(a[0])).indexOf(Number(v)) < 0
|
||||
).map(
|
||||
v => {return {id:Number(v), message:'Pushback node not an end'}}
|
||||
);
|
||||
(v, i) => allEnds.map(a => Number(a[0])).indexOf(Number(v)) < 0
|
||||
).map(
|
||||
v => { return { id: Number(v), message: 'Pushback node not an end' } }
|
||||
);
|
||||
notOkNodes = notOkNodes.concat(wrongPushbackEnds).concat(wrongPushbackRoutes);
|
||||
|
||||
var parkingNodes = data.map(mapParkingNode).filter(n => n !== undefined);
|
||||
|
||||
// Check for intersecting radii
|
||||
parkingNodes.forEach(parkingNode => {
|
||||
parkingNodes.forEach( parkingNode1 => {
|
||||
parkingNodes.forEach(parkingNode1 => {
|
||||
console.log(parkingNode, parkingNode1);
|
||||
if(parkingNode.index !== parkingNode1.index) {
|
||||
var d = distance([parkingNode.lng, parkingNode.lat],
|
||||
[parkingNode1.lng, parkingNode1.lat]);
|
||||
if (parkingNode.index !== parkingNode1.index) {
|
||||
var d = distance([parkingNode.lng, parkingNode.lat],
|
||||
[parkingNode1.lng, parkingNode1.lat]);
|
||||
if (d < parkingNode.radius + parkingNode1.radius) {
|
||||
notOkNodes.push({id: parkingNode.index, message:'Intersecting node'});
|
||||
notOkNodes.push({ id: parkingNode.index, message: 'Intersecting node' });
|
||||
}
|
||||
}
|
||||
this.postMessage(['progress', 1]);
|
||||
});
|
||||
});
|
||||
// Check for intersecting radii
|
||||
parkingNodes.forEach(parkingNode => {
|
||||
if (!parkingNode.name || /^\s*$/.test(parkingNode.name)) {
|
||||
notOkNodes.push({ id: parkingNode.index, message: 'Empty name' });
|
||||
}
|
||||
this.postMessage(['progress', 1]);
|
||||
});
|
||||
//Check for dual pushback/runway nodes
|
||||
runwayNodes.forEach(runwayNode => {
|
||||
if( pushbackNodes.indexOf(runwayNode) >= 0 ) {
|
||||
notOkNodes.push({id: runwayNode, message:'Dual runway/ pushback node'});
|
||||
if (pushbackNodes.indexOf(runwayNode) >= 0) {
|
||||
notOkNodes.push({ id: runwayNode, message: 'Dual runway/ pushback node' });
|
||||
}
|
||||
});
|
||||
|
||||
// check1(graph);
|
||||
// check2();
|
||||
// this.postMessage(['progress', 1]);
|
||||
|
||||
// check1(graph);
|
||||
// check2();
|
||||
// this.postMessage(['progress', 1]);
|
||||
resolve(notOkNodes);
|
||||
|
||||
|
||||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
@ -187,10 +194,10 @@ async function checkGroundnet(data) {
|
||||
function checkRoute(graph, from, to) {
|
||||
try {
|
||||
var pathD = this.dijkstra.find_path(graph, from, to);
|
||||
if (pathD.length>0) {
|
||||
console.log(pathD);
|
||||
if (pathD.length > 0) {
|
||||
console.log(pathD);
|
||||
}
|
||||
return true;
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.log('No route from ' + from + ' to ' + to);
|
||||
return false;
|
||||
@ -199,51 +206,53 @@ function checkRoute(graph, from, to) {
|
||||
|
||||
function check1(graph) {
|
||||
var graph1 = {
|
||||
a: {b: 1, d: 1},
|
||||
b: {a: 1, c: 1, e: 1},
|
||||
c: {b: 1, f: 1},
|
||||
d: {a: 1, e: 1, g: 1},
|
||||
e: {b: 1, d: 1, f: 1, h: 1},
|
||||
f: {c: 1, e: 1, i: 1},
|
||||
g: {d: 1, h: 1},
|
||||
h: {e: 1, g: 1, i: 1},
|
||||
i: {f: 1, h: 1}
|
||||
a: { b: 1, d: 1 },
|
||||
b: { a: 1, c: 1, e: 1 },
|
||||
c: { b: 1, f: 1 },
|
||||
d: { a: 1, e: 1, g: 1 },
|
||||
e: { b: 1, d: 1, f: 1, h: 1 },
|
||||
f: { c: 1, e: 1, i: 1 },
|
||||
g: { d: 1, h: 1 },
|
||||
h: { e: 1, g: 1, i: 1 },
|
||||
i: { f: 1, h: 1 }
|
||||
};
|
||||
var path = this.dijkstra.find_path(graph, 'a', 'i');
|
||||
console.log(path);
|
||||
}
|
||||
|
||||
function check2(params) {
|
||||
|
||||
|
||||
}
|
||||
|
||||
var mapPushbackNodes = function (o) {
|
||||
if(o.type === 'PushBack' )
|
||||
return o.index;
|
||||
if (o.type === 'PushBack')
|
||||
return o.index;
|
||||
console.log(o);
|
||||
}
|
||||
|
||||
var mapParkings = function (o) {
|
||||
if(o.type === 'parking')
|
||||
return o.index;
|
||||
if (o.type === 'parking')
|
||||
return o.index;
|
||||
console.log(o);
|
||||
}
|
||||
|
||||
var mapParkingNode = function (o) {
|
||||
if(o.type === 'parking')
|
||||
return {index: o.index, lat:o.lat, lng:o.lng, radius: Number(o.radius)};
|
||||
if (o.type === 'parking')
|
||||
return { index: o.index, lat: o.lat, lng: o.lng, name: o.name, radius: Number(o.radius) };
|
||||
console.log(o);
|
||||
}
|
||||
|
||||
var mapRunwayNodes = function (o) {
|
||||
if(o.type === 'runway')
|
||||
return o.index;
|
||||
if (o.type === 'runway')
|
||||
return o.index;
|
||||
console.log(o);
|
||||
}
|
||||
|
||||
var mapEdges = function (o) {
|
||||
if(o.type === 'poly')
|
||||
return {start: o.start, end: o.end, isPushBackRoute: o.isPushBackRoute !== undefined&&
|
||||
o.isPushBackRoute!==0};
|
||||
if (o.type === 'poly')
|
||||
return {
|
||||
start: o.start, end: o.end, isPushBackRoute: o.isPushBackRoute !== undefined &&
|
||||
o.isPushBackRoute !== 0
|
||||
};
|
||||
console.log(o);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user