Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config.ini
#	meshview/templates/map.html

config.ini

@@ -6,7 +6,7 @@ acme_challenge =
 
 [mqtt]
 server = mqtt.bayme.sh
-topics = ["msh/US/bayarea/#"]
+topics = ['msh/US/bayarea/#', 'msh/US/CA/mrymesh/#']
 port = 1883
 username = meshdev
 password = large4cats

main.py

@@ -1,6 +1,7 @@
 import asyncio
 import argparse
 import configparser
+import json
 from meshview import mqtt_reader
 from meshview import database
 from meshview import store
@@ -9,7 +10,7 @@ from meshview import http
 import json
 
 
-async def load_database_from_mqtt(mqtt_server: str , mqtt_port: int, topic: str, mqtt_user: str | None = None, mqtt_passwd: str | None = None):
+async def load_database_from_mqtt(mqtt_server: str , mqtt_port: int, topic: list, mqtt_user: str | None = None, mqtt_passwd: str | None = None):
     async for topic, env in mqtt_reader.get_topic_envelopes(mqtt_server, mqtt_port, topic, mqtt_user, mqtt_passwd):
         await store.process_envelope(topic, env)
 

meshview/templates/map.html

@@ -152,4 +152,3 @@
 
 </script>
 {% endblock %}
-test