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

https://github.com/Portree-Kid/flightgear-airports/issues/58

Browse Source
This commit is contained in:
portree_kid
2020-07-16 21:51:01 +02:00
parent 4fac546e90
commit ec03754c95
10 changed files with 258 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/EditBar.vue
+1 -1
View File
@@ -300,7 +300,7 @@ You should have received a copy of the GNU General Public License along with FG
console.log(o)
//_latlngs[""0""].__vertex.glueindex
var latLngs = o.getLatLngs().map(l => ({lat: l.lat, lng: l.lng, index: l.glueindex}));
return { 'start': Number(o['begin']), 'end': Number(o['end']), '_leaflet_id': o._leaflet_id, 'type': 'poly', 'isPushBackRoute': o.options.attributes.isPushBackRoute, latLngs: latLngs };
return { 'start': Number(o['begin']), 'end': Number(o['end']), '_leaflet_id': o._leaflet_id, 'type': 'poly', 'direction': o.options.attributes.direction, 'isPushBackRoute': o.options.attributes.isPushBackRoute, latLngs: latLngs };
} else {
console.log('Unknown Type ')
console.log(typeof o)
src/renderer/components/Upload.vue
+1 -1
View File
@@ -139,7 +139,7 @@
} else if (o instanceof L.Polyline) {
console.log(o)
var latLngs = o.getLatLngs().map(l => ({lat: l.lat, lng: l.lng, index: l.attributes.index}));
return { 'start': Number(o['begin']), 'end': Number(o['end']), '_leaflet_id': o._leaflet_id, 'type': 'poly', 'isPushBackRoute': o.options.attributes.isPushBackRoute, latLngs: latLngs };
return { 'start': Number(o['begin']), 'end': Number(o['end']), '_leaflet_id': o._leaflet_id, 'type': 'poly', 'direction': o.options.attributes.direction, 'isPushBackRoute': o.options.attributes.isPushBackRoute, latLngs: latLngs };
} else {
console.log('Unknown Type ')
console.log(typeof o)
src/renderer/utils/check.js
+33 -15
View File
@@ -8,9 +8,14 @@ const fs = require('fs');
//debugger;
var turf;
console.log(process.resourcesPath);
if(process.env.NODE_ENV === 'development') {
importScripts('../../../node_modules/dijkstrajs/dijkstra.js');
turf = require('./node_modules/@turf/turf');
} else if (process.env.NODE_ENV === 'mocha') {
importScripts('../../../node_modules/dijkstrajs/dijkstra.js');
turf = require('../../../node_modules/@turf/turf')
} else {
importScripts('dijkstra.js');
turf = require('@turf/turf')
@@ -19,7 +24,7 @@ if(process.env.NODE_ENV === 'development') {
const homedir = require('os').homedir();
importScripts('logger.js');
importScripts('haversine.js');
importScripts('haversine.js');
function errorReceiver(event) {
throw event.data;
@@ -66,6 +71,8 @@ async function checkGroundnet(data) {
}
});
var graph = {};
console.log(parkings);
parkings.forEach(element => {
graph[element] = {};
});
@@ -74,26 +81,37 @@ async function checkGroundnet(data) {
});
var notOkNodes = [];
console.log(edges);
if(edges===undefined) {
resolve({});
}
edges.forEach(edge => {
graph[edge.start] = {};
graph[edge.end] = {};
// Check if there are segments > 2km
edge.latLngs.forEach((latLng, index, arr) => {
if (index>0) {
var d = distance([arr[index-1].lng, arr[index-1].lat], [latLng.lng, latLng.lat]);
if(d>2000) {
notOkNodes.push({ id: Number(arr[index-1].index), message: `Start of long route ${d.toFixed(2)}` });
notOkNodes.push({ id: Number(arr[index].index), message: `End of long route ${d.toFixed(2)}` });
}
//console.log(d);
}
});
if(edge.latLngs !== undefined) {
// Check if there are segments > 2km
edge.latLngs.forEach((latLng, index, arr) => {
if (index>0) {
var d = distance([arr[index-1].lng, arr[index-1].lat], [latLng.lng, latLng.lat]);
if(d>2000) {
notOkNodes.push({ id: Number(arr[index-1].index), message: `Start of long route ${d.toFixed(2)}` });
notOkNodes.push({ id: Number(arr[index].index), message: `End of long route ${d.toFixed(2)}` });
}
//console.log(d);
}
});
}
});
// Add edges to graph
edges.forEach(element => {
var node1 = graph[element.start];
node1[Number(element.end)] = 1;
var node2 = graph[element.end];
node2[Number(element.start)] = 1;
if( element.direction === 'bi-directional' || element.direction === 'forward') {
node1[Number(element.end)] = 1;
}
if( element.direction === 'bi-directional' || element.direction === 'backward') {
node2[Number(element.start)] = 1;
}
});
var isLegitEnd = function(v) {
if( Object.keys(graph[v]).length <= 1 ) {
@@ -396,7 +414,7 @@ var mapEdges = function (o) {
// debugger;
return {
start: o.start, end: o.end, isPushBackRoute: o.isPushBackRoute !== undefined &&
o.isPushBackRoute !== 0, latLngs: o.latLngs
o.isPushBackRoute !== 0, direction: o.direction, latLngs: o.latLngs
};
console.debug(o);
}