diff --git a/build/icons/256x256.png b/build/icons/256x256.png deleted file mode 100644 index 3d67e9d..0000000 Binary files a/build/icons/256x256.png and /dev/null differ diff --git a/build/icons/icon.icns b/build/icons/icon.icns deleted file mode 100644 index a65f91b..0000000 Binary files a/build/icons/icon.icns and /dev/null differ diff --git a/build/icons/icon.ico b/build/icons/icon.ico deleted file mode 100644 index 8702729..0000000 Binary files a/build/icons/icon.ico and /dev/null differ diff --git a/src/renderer/loaders/RunwayNode.js b/src/renderer/loaders/RunwayNode.js index 767f274..2e77857 100644 --- a/src/renderer/loaders/RunwayNode.js +++ b/src/renderer/loaders/RunwayNode.js @@ -43,9 +43,11 @@ L.RunwayNode = L.Marker.extend({ }); }, highlight() { - var style = {}; - style['color'] = 'red'; - this.setStyle(style); + try { + this._icon.style['color'] = 'red'; + } catch (error) { + console.error(error); + } }, extensions: function (editLayer) { this.options.attributes = {}; diff --git a/src/renderer/loaders/groundnet_writer.js b/src/renderer/loaders/groundnet_writer.js index 06a6afe..71fb82f 100644 --- a/src/renderer/loaders/groundnet_writer.js +++ b/src/renderer/loaders/groundnet_writer.js @@ -133,7 +133,7 @@ var mapParkings = function (o) { var lat = convertLat(o.getLatLng()); var lon = convertLon(o.getLatLng()); // - return { '@index': String(o['id']), '@type': o.options.attributes.type, '@name': o.options.attributes.name, '@lat': lat, '@lon': lon, '@heading': Number(o.options.attributes.heading+180), '@radius': String(o.options.attributes.radius) }; + return { '@index': String(o['id']), '@type': o.options.attributes.type, '@name': o.options.attributes.name, '@lat': lat, '@lon': lon, '@heading': Number(o.options.attributes.heading%360), '@radius': String(o.options.attributes.radius) }; } } @@ -143,7 +143,7 @@ var mapRunwayNodes = function (o) { return { '@index': String(o['glueindex']), '@lat': convertLat(o._latlng), '@lon': convertLon(o._latlng), '@isOnRunway': '1', '@holdPointType': 'none' }; } if (o instanceof L.HoldNode) { - return { '@index': String(o['glueindex']), '@lat': convertLat(o._latlng), '@lon': convertLon(o._latlng), '@isOnRunway': '0', '@holdPointType': o['holdPointType'] }; + // return { '@index': String(o['glueindex']), '@lat': convertLat(o._latlng), '@lon': convertLon(o._latlng), '@isOnRunway': '0', '@holdPointType': o['holdPointType'] }; } } diff --git a/src/renderer/utils/check.js b/src/renderer/utils/check.js index b91bbed..65060d1 100644 --- a/src/renderer/utils/check.js +++ b/src/renderer/utils/check.js @@ -73,16 +73,18 @@ async function checkGroundnet(data) { if(ok) { okNodes.push(parkingNode); okNodes.push(runwayNode); - } + } else { + console.log(`No route from ${parkingNode} to ${runwayNode}`); + } this.postMessage(['progress', 1]); }); }); okNodes = okNodes.filter((v,i) => okNodes.indexOf(v) === i); - var allLegitimateEndNodes = parkings.concat(runwayNodes); - var notOkNodes = allLegitimateEndNodes.filter( + 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:'Node not connected'}} + id => {return {id:id, message:'No way to each runway'}} ); if (parkings.length === 0) { notOkNodes.push({id:0, message:'No parkings'});