Merge pull request #39 from quimnut/main

Update pip and centre map to web site location

Dockerfile

@@ -13,6 +13,9 @@ WORKDIR /app
 # Copy the requirements file
 COPY requirements.txt .
 
+# Update pip
+RUN pip install --upgrade pip
+
 # Install Python dependencies
 RUN pip install --no-cache-dir -r requirements.txt
 

meshtastic_support.py

@@ -87,6 +87,8 @@ class HardwareModel(Enum):
   HardwareModel.LILYGO_TBEAM_S3_CORE: "LILYGO_TBEAM_S3_CORE.png",
   HardwareModel.NANO_G1_EXPLORER: "NANO_G1_EXPLORER.png",
   HardwareModel.NANO_G2_ULTRA: "NANO_G2_ULTRA.png",
+  HardwareModel.NRF52_PROMICRO_DIY: "NRF52_PROMICRO_DIY.png",
+  HardwareModel.RAK11310: "RAK11310.png",
   HardwareModel.RAK4631: "RAK4631.png",
   HardwareModel.RP2040_LORA: "RP2040_LORA.png",
   HardwareModel.RPI_PICO: "RPI_PICO.png",
@@ -96,4 +98,5 @@ class HardwareModel(Enum):
   HardwareModel.T_DECK: "T_DECK.png",
   HardwareModel.T_ECHO: "T_ECHO.png",
   HardwareModel.T_WATCH_S3: "T_WATCH_S3.png",
+  HardwareModel.PRIVATE_HW: "PRIVATE_HW.png",
 }

templates/static/map.html.j2

@@ -49,10 +49,10 @@
       longitude: -121.4944,
     };
     var server_position = null;
-    {% if 'position' in server_node and server_node.position and 'latitude_i' in server_node.position and 'longitude_i' in server_node.position %}
+    {% if 'latitude' in config['mesh'] and 'longitude'in config['mesh'] %}
       server_position = {
-        latitude: {{ server_node.position.latitude_i / 10000000 }},
-        longitude: {{ server_node.position.longitude_i / 10000000 }},
+        latitude: {{ config['mesh']['latitude'] }},
+        longitude: {{ config['mesh']['longitude'] }}
       };
     {% else %}
       server_position = default_position;