jketterl/openwebrx
1
0
Fork 0
mirror of https://github.com/jketterl/openwebrx.git synced 2026-01-07 09:10:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add plane markers

Browse source
This commit is contained in:
Jakob Ketterl 2023-08-24 23:56:44 +02:00
parent d7e203fd82
commit 1c44099d89
4 changed files with 80 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
htdocs/lib/PlaneMarker.js Normal file
View file

@ -0,0 +1,69 @@
function PlaneMarker(){}
PlaneMarker.prototype = new google.maps.OverlayView();
PlaneMarker.prototype.draw = function() {
var svg = this.svg;
if (!svg) return;
if (this.course) {
if (this.course > 180) {
svg.style.transform = 'scalex(-1) rotate(' + (270 - this.course) + 'deg)'
} else {
svg.style.transform = 'rotate(' + (this.course - 90) + 'deg)';
}
} else {
svg.style.transform = null;
}
if (this.opacity) {
svg.style.opacity = this.opacity;
} else {
svg.style.opacity = null;
}
var point = this.getProjection().fromLatLngToDivPixel(this.position);
if (point) {
svg.style.left = point.x - 12 + 'px';
svg.style.top = point.y - 12 + 'px';
}
};
PlaneMarker.prototype.setOptions = function(options) {
google.maps.OverlayView.prototype.setOptions.apply(this, arguments);
this.draw();
};
PlaneMarker.prototype.onAdd = function() {
var svg = this.svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
svg.setAttribute('viewBox', '0 0 65 65');
svg.setAttribute('fill', 'blue');
svg.setAttribute('stroke', 'black');
var path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
path.setAttribute('d', 'M 0,0 M 1.9565564,41.694305 C 1.7174505,40.497708 1.6419973,38.448747 1.8096508,37.70494 1.8936398,37.332056 2.0796653,36.88191 2.222907,36.70461 2.4497603,36.423844 4.087816,35.47248 14.917931,29.331528 l 12.434577,-7.050718 -0.04295,-7.613412 c -0.03657,-6.4844888 -0.01164,-7.7625804 0.168134,-8.6194061 0.276129,-1.3160905 0.762276,-2.5869575 1.347875,-3.5235502 l 0.472298,-0.7553719 1.083746,-0.6085497 c 1.194146,-0.67053522 1.399524,-0.71738842 2.146113,-0.48960552 1.077005,0.3285939 2.06344,1.41299352 2.797602,3.07543322 0.462378,1.0469993 0.978731,2.7738408 1.047635,3.5036272 0.02421,0.2570284 0.06357,3.78334 0.08732,7.836246 0.02375,4.052905 0.0658,7.409251 0.09345,7.458546 0.02764,0.04929 5.600384,3.561772 12.38386,7.805502 l 12.333598,7.715871 0.537584,0.959688 c 0.626485,1.118378 0.651686,1.311286 0.459287,3.516442 -0.175469,2.011604 -0.608966,2.863924 -1.590344,3.127136 -0.748529,0.200763 -1.293144,0.03637 -10.184829,-3.07436 C 48.007733,41.72562 44.793806,40.60197 43.35084,40.098045 l -2.623567,-0.916227 -1.981212,-0.06614 c -1.089663,-0.03638 -1.985079,-0.05089 -1.989804,-0.03225 -0.0052,0.01863 -0.02396,2.421278 -0.04267,5.339183 -0.0395,6.147742 -0.143635,7.215456 -0.862956,8.845475 l -0.300457,0.680872 2.91906,1.361455 c 2.929379,1.366269 3.714195,1.835385 4.04589,2.41841 0.368292,0.647353 0.594634,2.901439 0.395779,3.941627 -0.0705,0.368571 -0.106308,0.404853 -0.765159,0.773916 L 41.4545,62.83158 39.259237,62.80426 c -6.030106,-0.07507 -16.19508,-0.495041 -16.870991,-0.697033 -0.359409,-0.107405 -0.523792,-0.227482 -0.741884,-0.541926 -0.250591,-0.361297 -0.28386,-0.522402 -0.315075,-1.52589 -0.06327,-2.03378 0.23288,-3.033615 1.077963,-3.639283 0.307525,-0.2204 4.818478,-2.133627 6.017853,-2.552345 0.247872,-0.08654 0.247455,-0.102501 -0.01855,-0.711959 -0.330395,-0.756986 -0.708622,-2.221756 -0.832676,-3.224748 -0.05031,-0.406952 -0.133825,-3.078805 -0.185533,-5.937448 -0.0517,-2.858644 -0.145909,-5.208974 -0.209316,-5.222958 -0.06341,-0.01399 -0.974464,-0.0493 -2.024551,-0.07845 L 23.247235,38.61921 18.831373,39.8906 C 4.9432155,43.88916 4.2929558,44.057819 3.4954426,43.86823 2.7487826,43.690732 2.2007966,42.916622 1.9565564,41.694305 z')
svg.appendChild(path);
svg.style.position = 'absolute';
svg.style.cursor = 'pointer';
svg.style.width = '30px';
svg.style.height = '30px';
var self = this;
svg.addEventListener("click", function(event) {
event.stopPropagation();
google.maps.event.trigger(self, "click", event);
});
var panes = this.getPanes();
panes.overlayImage.appendChild(svg);
};
PlaneMarker.prototype.remove = function() {
if (this.svg) {
this.svg.parentNode.removeChild(this.svg);
this.svg = null;
}
};

8
htdocs/map.js
View file

@ -123,6 +123,8 @@ $(function(){
aprsOptions.symbol = update.location.symbol;
aprsOptions.course = update.location.course;
aprsOptions.speed = update.location.speed;
} else if (update.source.icao) {
markerClass = PlaneMarker;
}
if (markers[key]) {
marker = markers[key];
@ -252,7 +254,10 @@ $(function(){
nite.init(map);
setInterval(function() { nite.refresh() }, 10000); // every 10s
});
$.getScript('static/lib/AprsMarker.js').done(function(){
$.when(
$.getScript('static/lib/AprsMarker.js'),
$.getScript('static/lib/PlaneMarker.js')
).done(function(){
processUpdates(updateQueue);
updateQueue = [];
});
@ -351,6 +356,7 @@ $(function(){
// not just for display but also in key treatment in order not to overlap with other locations sent by the same callsign
if ('item' in source) return source['item'];
if ('object' in source) return source['object'];
if ('icao' in source) return source['icao'];
var key = source.callsign;
if ('ssid' in source) key += '-' + source.ssid;
return key;

4
owrx/adsb/modes.py
View file

@ -181,9 +181,9 @@ class ModeSParser(PickleModule):
# Mode-S All-call reply
message["icao"] = input[1:4].hex()
if "lat" in message and "lon" in message:
if "icao" in message and "lat" in message and "lon" in message:
loc = AirplaneLocation(message)
Map.getSharedInstance().updateLocation({"callsign": icao}, loc, "ADS-B", None)
Map.getSharedInstance().updateLocation({"icao": icao}, loc, "ADS-B", None)
return message

2
owrx/map.py
View file

@ -80,6 +80,8 @@ class Map(object):
def _sourceToKey(self, source):
if "ssid" in source:
return "{callsign}-{ssid}".format(**source)
elif "icao" in source:
return source["icao"]
return source["callsign"]
def updateLocation(self, source, loc: Location, mode: str, band: Band = None):