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

#113 hack adding points

Browse Source
This commit is contained in:
Keith Paterson 2021-01-10 20:01:28 +01:00
parent d317bd049c
commit 51d114e6d2
1 changed files with 70 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/renderer/loaders/TaxiwaySegmentExtender.js
View File

@ -141,7 +141,7 @@ const extendTaxiSegment = function (taxiwaySegment) {
} }
} else { } else {
var arcs = event.target.expandArc(event.target.options.attributes); var arcs = event.target.expandArc(event.target.options.attributes);
var multiarc = {name: '', index: 900719925474099, ids: [] ,isPushBackRoute: null, direction: null}; var multiarc = { name: '', index: 900719925474099, ids: [], isPushBackRoute: null, direction: null };
if (store.default.state.Editable.data.multiarc === undefined || if (store.default.state.Editable.data.multiarc === undefined ||
store.default.state.Editable.data.multiarc !== event.target.options.attributes) { store.default.state.Editable.data.multiarc !== event.target.options.attributes) {
if (event.target.options.attributes === undefined) { if (event.target.options.attributes === undefined) {
@ -152,18 +152,18 @@ const extendTaxiSegment = function (taxiwaySegment) {
this.editLayer.featureLookup[event.target._leaflet_id] = []; this.editLayer.featureLookup[event.target._leaflet_id] = [];
this.featureLookup[event.target._leaflet_id].push(this); this.featureLookup[event.target._leaflet_id].push(this);
event.target.options.attributes.selected = true; event.target.options.attributes.selected = true;
//multiarc.name = JSON.parse(JSON.stringify(event.target.options.attributes.name)); //multiarc.name = JSON.parse(JSON.stringify(event.target.options.attributes.name));
//multiarc.isPushBackRoute = JSON.parse(JSON.stringify(event.target.options.attributes.isPushBackRoute)); //multiarc.isPushBackRoute = JSON.parse(JSON.stringify(event.target.options.attributes.isPushBackRoute));
//multiarc.direction = JSON.parse(JSON.stringify(event.target.options.attributes.direction)); //multiarc.direction = JSON.parse(JSON.stringify(event.target.options.attributes.direction));
if(event.target.options.attributes.name!==undefined) { if (event.target.options.attributes.name !== undefined) {
multiarc.name = assign(event.target.options.attributes.name); multiarc.name = assign(event.target.options.attributes.name);
} }
multiarc.isPushBackRoute = assign(event.target.options.attributes.isPushBackRoute); multiarc.isPushBackRoute = assign(event.target.options.attributes.isPushBackRoute);
multiarc.direction = assign(event.target.options.attributes.direction); multiarc.direction = assign(event.target.options.attributes.direction);
this.editLayer.featureLookup[900719925474099] = []; this.editLayer.featureLookup[900719925474099] = [];
multiarc.ids = []; multiarc.ids = [];
//TODO //TODO
@ -175,11 +175,11 @@ const extendTaxiSegment = function (taxiwaySegment) {
var arc = editLayer.groundnetLayerGroup.getLayer(id); var arc = editLayer.groundnetLayerGroup.getLayer(id);
if (arc && arc instanceof L.Polyline) { if (arc && arc instanceof L.Polyline) {
editLayer.featureLookup[900719925474099].push(arc); editLayer.featureLookup[900719925474099].push(arc);
arc.select(); arc.select();
} }
}); });
store.default.dispatch('setMultiArcIds', arcs); store.default.dispatch('setMultiArcIds', arcs);
} }
}); });
this.on('editable:drawing:move', function (event) { this.on('editable:drawing:move', function (event) {
if (dragIndex >= 0) { if (dragIndex >= 0) {
@ -195,15 +195,25 @@ const extendTaxiSegment = function (taxiwaySegment) {
console.debug('editable:vertex:new ' + event.vertex.getIndex() + '\t' + event.vertex.getLastIndex() + '\t'); console.debug('editable:vertex:new ' + event.vertex.getIndex() + '\t' + event.vertex.getLastIndex() + '\t');
// Find nearest node // Find nearest node
let closest = this.editLayer.closestLayerSnap(event.latlng, 5) let closest = this.editLayer.closestLayerSnap(event.latlng, 5)
let taxiwaySegment = event.latlng.__vertex.editor.feature; let taxiwaySegment = event.vertex.editor.feature;
if (taxiwaySegment.options.attributes === undefined) { if (taxiwaySegment.options.attributes === undefined) {
taxiwaySegment.options.attributes = { direction: 'bi-directional' }; taxiwaySegment.options.attributes = { direction: 'bi-directional' };
} }
taxiwaySegment.updateStyle(); taxiwaySegment.updateStyle();
if (event.vertex.getIndex() !== 0 && event.vertex.getIndex() !== event.vertex.getLastIndex()) { if (event.vertex.getIndex() !== 0 && event.vertex.getIndex() !== event.vertex.getLastIndex()) {
var x = taxiwaySegment.getLatLngs().filter(l => l === event.vertex.latlng);
// Somehow the latlng is not in our Segment!?
if (taxiwaySegment.getLatLngs().length < 3 && x.length === 0) {
var fixed = taxiwaySegment.getLatLngs();
fixed.splice(1, 0, event.vertex.latlng);
taxiwaySegment.setLatLngs(fixed);
}
var nextIndex = ++taxiwaySegment.editLayer.groundnetLayerGroup.maxId; var nextIndex = ++taxiwaySegment.editLayer.groundnetLayerGroup.maxId;
var splitOffNodes = taxiwaySegment.getLatLngs().splice(-1); var splitOffNodes = taxiwaySegment.getLatLngs().splice(-1);
var remainingNodes = taxiwaySegment.getLatLngs(); var remainingNodes = taxiwaySegment.getLatLngs();
if (remainingNodes.length <= 1 || !remainingNodes[1]) {
console.error(remainingNodes);
}
splitOffNodes.unshift(L.latLng(remainingNodes[1].lat, remainingNodes[1].lng, remainingNodes[1].alt)); splitOffNodes.unshift(L.latLng(remainingNodes[1].lat, remainingNodes[1].lng, remainingNodes[1].alt));
remainingNodes[1]['glueindex'] = nextIndex; remainingNodes[1]['glueindex'] = nextIndex;
remainingNodes[1].attributes = { index: nextIndex, isOnRunway: 0 }; remainingNodes[1].attributes = { index: nextIndex, isOnRunway: 0 };
@ -236,6 +246,8 @@ const extendTaxiSegment = function (taxiwaySegment) {
this.editLayer.featureLookup[nextIndex] = []; this.editLayer.featureLookup[nextIndex] = [];
this.featureLookup[nextIndex].push(taxiwaySegment); this.featureLookup[nextIndex].push(taxiwaySegment);
this.featureLookup[nextIndex].push(polyline); this.featureLookup[nextIndex].push(polyline);
} else {
console.error('SplitoffNodes Short ', splitOffNodes);
} }
} else { } else {
// Glue to another node // Glue to another node
@ -254,7 +266,7 @@ const extendTaxiSegment = function (taxiwaySegment) {
taxiwaySegment.begin = closest.glueindex; taxiwaySegment.begin = closest.glueindex;
} }
taxiwaySegment.end = closest.glueindex; taxiwaySegment.end = closest.glueindex;
console.log(`Closest : ${closest}`) console.debug(`Closest : ${closest}`)
} else { } else {
event.vertex.latlng['glueindex'] = ++this.editLayer.groundnetLayerGroup.maxId; event.vertex.latlng['glueindex'] = ++this.editLayer.groundnetLayerGroup.maxId;
event.vertex.latlng.attributes = { index: event.vertex.latlng.glueindex, isOnRunway: 0 }; event.vertex.latlng.attributes = { index: event.vertex.latlng.glueindex, isOnRunway: 0 };
@ -287,8 +299,8 @@ const extendTaxiSegment = function (taxiwaySegment) {
console.debug('editable:vertex:click') console.debug('editable:vertex:click')
}); });
this.on('editable:vertex:rawclick', event => { this.on('editable:vertex:rawclick', event => {
event.cancel()
console.debug('editable:vertex:rawclick') console.debug('editable:vertex:rawclick')
event.cancel()
}); });
this.on('editable:vertex:clicked', function (event) { this.on('editable:vertex:clicked', function (event) {
if (Number(store.default.state.Editable.index) >= 0 && if (Number(store.default.state.Editable.index) >= 0 &&
@ -355,6 +367,9 @@ const extendTaxiSegment = function (taxiwaySegment) {
}); });
} }
dragIndex = -1; dragIndex = -1;
if (!event.vertex.latlng.glueindex) {
console.error('GlueIndex not found : ', event.vertex);
}
var parking = this.featureLookup[event.vertex.latlng.glueindex].filter(n => n instanceof L.ParkingSpot); var parking = this.featureLookup[event.vertex.latlng.glueindex].filter(n => n instanceof L.ParkingSpot);
if (parking.length > 0) { if (parking.length > 0) {
parking[0].selectParking(); parking[0].selectParking();
@ -379,6 +394,7 @@ const extendTaxiSegment = function (taxiwaySegment) {
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
console.error(event.vertex.latlng.glueindex);
} }
}); });
}; };
@ -394,44 +410,44 @@ const extendTaxiSegment = function (taxiwaySegment) {
return ids; return ids;
} }
taxiwaySegment.__proto__.walkPushbackRoute = function (index, walkedNodes, isPushBackRoute) { taxiwaySegment.__proto__.walkPushbackRoute = function (index, walkedNodes, isPushBackRoute) {
console.debug('Walk Level'); console.debug('Walk Level');
walkedNodes.push(index) walkedNodes.push(index)
var segmentIds = []; var segmentIds = [];
var polyLines = this.featureLookup[index].filter(n => n instanceof L.Polyline); var polyLines = this.featureLookup[index].filter(n => n instanceof L.Polyline);
if (polyLines===undefined || polyLines.length>2) { if (polyLines === undefined || polyLines.length > 2) {
console.debug('Walk ' + index + '\t' + polyLines.length); console.debug('Walk ' + index + '\t' + polyLines.length);
return; return;
} }
polyLines.forEach(l => { polyLines.forEach(l => {
segmentIds.push(l._leaflet_id); segmentIds.push(l._leaflet_id);
console.debug('Walk Next ' + index + '\t' + console.debug('Walk Next ' + index + '\t' +
(walkedNodes.indexOf(index)<0) + '\t'+ (walkedNodes.indexOf(index) < 0) + '\t' +
l.begin + '\t'+ l.begin + '\t' +
(walkedNodes.indexOf(Number(l.begin))<0) + '\t'+ (walkedNodes.indexOf(Number(l.begin)) < 0) + '\t' +
l.end + '\t'+ l.end + '\t' +
(walkedNodes.indexOf(Number(l.end))<0) + '\t'+ (walkedNodes.indexOf(Number(l.end)) < 0) + '\t' +
l.options.attributes.direction + '\t' + l.options.attributes.direction + '\t' +
l.options.attributes.begin + '\t' + l.options.attributes.begin + '\t' +
l.options.attributes.end); l.options.attributes.end);
console.debug('Walk isPushBackRoute ' + l.options.attributes.isPushBackRoute + '\t' + isPushBackRoute + '\t' + (l.options.attributes.isPushBackRoute === isPushBackRoute)); console.debug('Walk isPushBackRoute ' + l.options.attributes.isPushBackRoute + '\t' + isPushBackRoute + '\t' + (l.options.attributes.isPushBackRoute === isPushBackRoute));
if(l.options.attributes.isPushBackRoute === isPushBackRoute ) { if (l.options.attributes.isPushBackRoute === isPushBackRoute) {
console.debug(Number(l.begin) === index && walkedNodes.indexOf(Number(l.end)) < 0); console.debug(Number(l.begin) === index && walkedNodes.indexOf(Number(l.end)) < 0);
if (Number(l.begin) === index && walkedNodes.indexOf(Number(l.end)) < 0) { if (Number(l.begin) === index && walkedNodes.indexOf(Number(l.end)) < 0) {
console.debug( 'Walk forward ' + l.options.attributes.direction ); console.debug('Walk forward ' + l.options.attributes.direction);
segmentIds = segmentIds.concat(this.walkPushbackRoute(Number(l.end), walkedNodes, isPushBackRoute)) segmentIds = segmentIds.concat(this.walkPushbackRoute(Number(l.end), walkedNodes, isPushBackRoute))
}
console.debug(Number(l.end) === index && walkedNodes.indexOf(Number(l.begin)) < 0);
if (Number(l.end) === index && walkedNodes.indexOf(Number(l.begin)) < 0) {
console.debug('Walk backward ' + l.options.attributes.direction);
segmentIds = segmentIds.concat(this.walkPushbackRoute(Number(l.begin), walkedNodes, isPushBackRoute))
}
} }
console.debug(Number(l.end) === index && walkedNodes.indexOf(Number(l.begin)) < 0); });
if (Number(l.end) === index && walkedNodes.indexOf(Number(l.begin)) < 0 ) {
console.debug( 'Walk backward ' + l.options.attributes.direction );
segmentIds = segmentIds.concat(this.walkPushbackRoute(Number(l.begin), walkedNodes, isPushBackRoute))
}
}
});
return segmentIds; return segmentIds;
} }
/** /**
* *
*/ */
@ -486,30 +502,30 @@ const extendTaxiSegment = function (taxiwaySegment) {
}; };
taxiwaySegment.__proto__.updateArrows = function (zoom) { taxiwaySegment.__proto__.updateArrows = function (zoom) {
if( this._map === null) { if (this._map === null) {
return; return;
} }
if (this.options.attributes.direction === 'forward') { if (this.options.attributes.direction === 'forward') {
this.setText(null); this.setText(null);
if (zoom <= 16) { if (zoom <= 16) {
this.setText(' >', { repeat: true, offset: 6, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 15px serif;' } }) this.setText(' >', { repeat: true, offset: 6, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 15px serif;' } })
} else if (zoom <= 19 ) { } else if (zoom <= 19) {
this.setText(' > ', { repeat: true, offset: 7, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 20px serif;' } }) this.setText(' > ', { repeat: true, offset: 7, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 20px serif;' } })
} else { } else {
this.setText(' > ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } }) this.setText(' > ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } })
} }
} else if (this.options.attributes.direction === 'backward') { } else if (this.options.attributes.direction === 'backward') {
this.setText(null); this.setText(null);
if (zoom <= 16) { if (zoom <= 16) {
this.setText(' <', { repeat: true, offset: 6, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 15px serif;' } }) this.setText(' <', { repeat: true, offset: 6, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 15px serif;' } })
} else if (zoom <= 19 ) { } else if (zoom <= 19) {
this.setText(' < ', { repeat: true, offset: 7, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 20px serif;' } }) this.setText(' < ', { repeat: true, offset: 7, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 20px serif;' } })
} else { } else {
this.setText(' < ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } }) this.setText(' < ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } })
} }
} else { } else {
this.setText(null); this.setText(null);
} }
} }
taxiwaySegment.__proto__.setInteractive = function (interactive) { taxiwaySegment.__proto__.setInteractive = function (interactive) {
@ -522,9 +538,9 @@ const extendTaxiSegment = function (taxiwaySegment) {
if (!this._path) { if (!this._path) {
return; return;
} }
this.options.interactive = interactive; this.options.interactive = interactive;
if (interactive) { if (interactive) {
L.DomUtil.addClass(this._path, 'leaflet-interactive'); L.DomUtil.addClass(this._path, 'leaflet-interactive');
} else { } else {
@ -534,7 +550,7 @@ const extendTaxiSegment = function (taxiwaySegment) {
taxiwaySegment.__proto__.updateStyle = function () { taxiwaySegment.__proto__.updateStyle = function () {
var style = {}; var style = {};
if(!this.options.attributes) { if (!this.options.attributes) {
return; return;
} }
if (this.options.attributes.selected) { if (this.options.attributes.selected) {
@ -545,7 +561,7 @@ const extendTaxiSegment = function (taxiwaySegment) {
else { else {
style.color = '#3388ff'; style.color = '#3388ff';
} }
if(this.editEnabled()) { if (this.editEnabled()) {
style.interactive = true; style.interactive = true;
} else { } else {
style.interactive = false; style.interactive = false;
@ -554,10 +570,10 @@ const extendTaxiSegment = function (taxiwaySegment) {
if (this._map !== null) { if (this._map !== null) {
if (this.options.attributes.direction === 'forward') { if (this.options.attributes.direction === 'forward') {
this.setText(null); this.setText(null);
this.setText(' > ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } }) this.setText(' > ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } })
} else if (this.options.attributes.direction === 'backward') { } else if (this.options.attributes.direction === 'backward') {
this.setText(null); this.setText(null);
this.setText(' < ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } }) this.setText(' < ', { repeat: true, offset: 10, attributes: { fill: 'red', style: 'vertical-align: bottom; vertical-align: bottom; font-weight: bold; font: bold 30px serif;' } })
} else { } else {
this.setText(null); this.setText(null);
} }