diff --git a/hblink.py b/hblink.py index af96be6..8b20f76 100755 --- a/hblink.py +++ b/hblink.py @@ -678,7 +678,7 @@ class HBSYSTEM(DatagramProtocol): self.send_peer(_peer_id, b''.join([RPTACK, _peer_id])) logger.info('(%s) Peer %s (%s) has sent repeater configuration', self._system, _this_peer['CALLSIGN'], _this_peer['RADIO_ID']) - self.send_peer_loc(_peer_id, _this_peer['CALLSIGN'], _this_peer['LATITUDE'], _this_peer['LONGITUDE'], _this_peer['URL'], _this_peer['DESCRIPTION'], _this_peer['LOCATION'], _this_peer['SOFTWARE_ID']) + self.send_peer_loc(_peer_id, _this_peer['CALLSIGN'], _this_peer['LATITUDE'], _this_peer['LONGITUDE'], _this_peer['URL'], _this_peer['DESCRIPTION'], _this_peer['LOCATION'], str(_this_peer['PACKAGE_ID']) + ' - ' + str(_this_peer['SOFTWARE_ID'])) else: self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr) logger.warning('(%s) Peer info from Radio ID that has not logged in: %s', self._system, int_id(_peer_id)) diff --git a/web/app.py b/web/app.py index ce1c81f..95f3405 100644 --- a/web/app.py +++ b/web/app.py @@ -699,24 +699,63 @@ def create_app(): @app.route('/map') @login_required def map_page(): + print(peer_locations) f_map = folium.Map(location=center_map, zoom_start=map_zoom) -## folium.Marker([45.372, -121.6972], popup="hello", icon=folium.Icon(color="red", icon="record"), tooltip='hi').add_to(f_map) for l in peer_locations.items(): +## folium.Marker([float(l[1][1]), float(l[1][2])], popup=''' +##
''' + l[1][0] + ''' |
+
DMR ID: | +''' + str(l[0]) + ''' | +
Location: | +''' + l[1][5] + ''' | +
Lat, Lon: | +''' + l[1][1] + ''', ''' + l[1][2] + ''' | +
Description: | +''' + l[1][4] + ''' | +
URL: + |
+''' + l[1][3] + ''' | +
Device: | +''' + l[1][6] + ''' | +
+
{% endblock %}