diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js index 539ce6f..240374b 100644 --- a/htdocs/openwebrx.js +++ b/htdocs/openwebrx.js @@ -1220,7 +1220,7 @@ function on_ws_recv(evt) case "receiver_details": var r = json.value; e('webrx-rx-title').innerHTML = r.receiver_name; - e('webrx-rx-desc').innerHTML = r.receiver_location + ' | Loc: ' + r.receiver_qra + ', ASL: ' + r.receiver_asl + ' m, [maps]'; + e('webrx-rx-desc').innerHTML = r.receiver_location + ' | Loc: ' + r.locator + ', ASL: ' + r.receiver_asl + ' m, [maps]'; e('webrx-rx-photo-title').innerHTML = r.photo_title; e('webrx-rx-photo-desc').innerHTML = r.photo_desc; break; diff --git a/owrx/connection.py b/owrx/connection.py index 55b10ed..f7f8dc5 100644 --- a/owrx/connection.py +++ b/owrx/connection.py @@ -5,6 +5,7 @@ from owrx.version import openwebrx_version from owrx.bands import Bandplan from owrx.bookmarks import Bookmarks from owrx.map import Map +from owrx.locator import Locator from multiprocessing import Queue import json import threading @@ -89,13 +90,13 @@ class OpenWebRxReceiverClient(Client): receiver_keys = [ "receiver_name", "receiver_location", - "receiver_qra", "receiver_asl", "receiver_gps", "photo_title", "photo_desc", ] receiver_details = dict((key, pm.getPropertyValue(key)) for key in receiver_keys) + receiver_details["locator"] = Locator.fromCoordinates(receiver_details["receiver_gps"]) self.write_receiver_details(receiver_details) profiles = [