jketterl/openwebrx
1
0
Fork 0
mirror of https://github.com/jketterl/openwebrx.git synced 2026-02-08 00:34:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix GMaps implementation

Browse source
This commit is contained in:
Stanislav Lechev [0xAF] 2023-09-21 02:07:21 +03:00
parent 970f7476e3
commit 8826be467e
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
htdocs/map-google.js
View file

@ -176,7 +176,7 @@ MapManager.prototype.processUpdates = function(updates) {
switch (update.location.type) {
case 'latlon':
var marker = self.mman.find(id);
var marker = self.mman.find(key);
var markerClass = GSimpleMarker;
var aprsOptions = {}
@ -195,9 +195,9 @@ MapManager.prototype.processUpdates = function(updates) {
// when I have the time to spend to understand how.
// As of now, the planes are shown on the map, but with default icon.
marker = new markerClass();
self.mman.add(id, marker);
self.mman.add(key, marker);
marker.addListener('click', function() {
showMarkerInfoWindow(id, marker.position);
showMarkerInfoWindow(key, marker.position);
});
}
@ -215,23 +215,23 @@ MapManager.prototype.processUpdates = function(updates) {
if (expectedIcao && expectedIcao === update.source.icao) {
map.panTo(marker.position);
showMarkerInfoWindow(id, marker.position);
showMarkerInfoWindow(key, marker.position);
expectedIcao = false;
}
if (expectedCallsign && expectedCallsign == id) {
if (expectedCallsign && expectedCallsign == key) {
map.panTo(marker.position);
showMarkerInfoWindow(id, marker.position);
showMarkerInfoWindow(key, marker.position);
expectedCallsign = false;
}
if (infoWindow && infoWindow.callsign && infoWindow.callsign == id) {
if (infoWindow && infoWindow.callsign && infoWindow.callsign == key) {
showMarkerInfoWindow(infoWindow.callsign, marker.position);
}
break;
case 'feature':
var marker = self.mman.find(id);
var marker = self.mman.find(key);
var options = {}
// If no symbol or color supplied, use defaults by type
@ -250,9 +250,9 @@ MapManager.prototype.processUpdates = function(updates) {
if (!marker) {
marker = new GFeatureMarker();
self.mman.addType(update.mode);
self.mman.add(id, marker);
self.mman.add(key, marker);
marker.addListener('click', function() {
showMarkerInfoWindow(id, marker.position);
showMarkerInfoWindow(key, marker.position);
});
}
@ -265,24 +265,24 @@ MapManager.prototype.processUpdates = function(updates) {
// Apply marker options
marker.setMarkerOptions(options);
if (expectedCallsign && expectedCallsign == id) {
if (expectedCallsign && expectedCallsign == key) {
map.panTo(marker.position);
showMarkerInfoWindow(id, marker.position);
showMarkerInfoWindow(key, marker.position);
expectedCallsign = false;
}
if (infoWindow && infoWindow.callsign && infoWindow.callsign == id) {
if (infoWindow && infoWindow.callsign && infoWindow.callsign == key) {
showMarkerInfoWindow(infoWindow.callsign, marker.position);
}
break;
case 'locator':
var rectangle = self.lman.find(id);
var rectangle = self.lman.find(key);
// If new item, create a new locator for it
if (!rectangle) {
rectangle = new GLocator();
self.lman.add(id, rectangle);
self.lman.add(key, rectangle);
rectangle.rect.addListener('click', function() {
showLocatorInfoWindow(rectangle.locator, rectangle.center);
});