Add airport and radio menu

Author: newtom28

index.html

@@ -120,9 +120,22 @@
       class="control-button"
       data-i18n-title="tooltips.my_locale"
     >
-      🌐
+      🌎
     </button>
 
+    <div id="more-wrapper" class="dropdown-wrapper">
+      <button
+        id="more-button"
+        class="control-button"
+        data-i18n-title="tooltips.more_options"
+      >
+        ⋮
+      </button>
+      <div id="more-menu" class="dropdown-menu">
+        <!-- menu items will be inserted here -->
+      </div>
+    </div>
+
     <!-- Search Bar -->
     <div id="search-bar-container" class="hidden">
       <!-- Form input to auto-save history -->

public/locales/en.json

@@ -2,7 +2,9 @@
   "app": {
     "loading_text": "Loading map…",
     "caching_text": "Finding landmarks…",
-    "search_placeholder": "Search location…"
+    "search_placeholder": "Search location…",
+    "airport_menu": "Search Airports",
+    "radio_menu": "Search Radio Stations"
   },
   "Settings": {
     "GOOGLE_MAPS_API_KEY": "Google Maps API Key",
@@ -20,15 +22,14 @@
       "connection_description": "There was a problem retrieving landmarks information. This could be due to:",
       "network_issue": "Network connectivity issues",
       "api_unavailable": "API service temporarily unavailable",
-      "connection_suggestion": "Please check your network connection and try again later.",
       "retry_button": "Try Again"
     }
   },
   "landmark": {
     "overlay": {
       "load_failed_title": "3D Map Failed to Load",
-      "load_failed_description": "The photorealistic 3D view could not be initialized.",
-      "load_failed_details": "This may be due to browser compatibility, network issues, or Google Maps 3D beta access limitations.",
+      "load_failed_description": "The Google 3D Map view could not be initialized.",
+      "load_failed_details": "This may be due to browser compatibility, network issues, or API access limitations.",
       "close_button": "Close 3D View"
     }
   },
@@ -51,11 +52,13 @@
     "replay_animation": "Replay Animation",
     "teleport_to_aircraft": "Teleport to aircraft position",
     "view_in_3d": "View in 3D",
-    "delete_setting": "Delete Setting"
+    "delete_setting": "Delete Setting",
+    "more_options": "More Options"
   },
   "errors": {
     "no_landmarks_found": "No landmarks found in this area",
     "location_not_found": "Location not found",
+    "no_results": "No search results",
     "geolocation_not_supported": "Geolocation not supported",
     "unable_to_get_geolocation": "Unable to get Geolocation",
     "moving_map_server_unavailable": "Moving Map server not available",

server/simconnect.py

@@ -2,59 +2,44 @@
 Connection to MSFS via SimConnect for real-time aircraft telemetry.
 """
 
-import time
 import threading
+import time
 
 try:
     from SimConnect import SimConnect, AircraftRequests
 except Exception as e:  # noqa: F841
     SimConnect = None
-    AircraftRequests = None
 
-# Global variables for aircraft data
 aircraft_data = {
     "latitude": 0.0,
     "longitude": 0.0,
     "altitude": 0.0,  # in meters
     "heading": 0.0,  # in degrees
 }
-
-# SimConnect instance
-sm = None
+sm_aq = None
 data_thread = None
-data_lock = threading.Lock()
 
 
 def connect_to_simconnect():
-    """Initialize SimConnect connection to MSFS"""
-    global sm, aircraft_data
     if SimConnect is None:
-        print("SimConnect library not available")
+        print("SimConnect connectivity not available")
         return None
-
     try:
-        if sm is None:
-            sm = SimConnect()
-
-        # Request data definitions for aircraft position and orientation
-        # AircraftRequests handles the data request setup automatically
-        if AircraftRequests is None:
-            print("SimConnect library not available")
-            return None
-        aq = AircraftRequests(sm, _time=100)  # Update every 100ms
-
-        with data_lock:
+        global sm_aq
+        if sm_aq is None:
+            sm_aq = AircraftRequests(
+                SimConnect(), _time=100
+            )  # Update every 100ms
             aircraft_data["connected"] = True
-        return aq
+        return sm_aq
     except Exception as e:
         print(f"✗ Failed to connect via SimConnect: {e}")
         return None
 
 
-def update_aircraft_data():
+def update_aircraft_data(stop_event):
     """Background thread to continuously update aircraft data"""
-    global aircraft_data
-    if aq := connect_to_simconnect():
+    if connect_to_simconnect():
         print("Starting SimConnect Proxy for MSFS Moving map...")
     else:
         center_lat = 37.6188  # e.g. SFO airport
@@ -63,25 +48,25 @@ def update_aircraft_data():
         t = 0.0
         print("Starting Circular flight demo/test mode...")
 
-    while True:
+    global sm_aq
+    while not stop_event.is_set():
         try:
-            if sm and aq:
+            if sm_aq:
                 # Get current aircraft position and heading
-                lat = aq.get("PLANE_LATITUDE")
-                lon = aq.get("PLANE_LONGITUDE")
-                alt_ft = aq.get("PLANE_ALTITUDE")
-                heading = aq.get("MAGNETIC_COMPASS")
-                with data_lock:
-                    aircraft_data.update(
-                        {
-                            "latitude": lat if lat else 0.0,
-                            "longitude": lon if lon else 0.0,
-                            "altitude": alt_ft * 0.3048 if alt_ft else 0.0,
-                            "heading": heading if heading else 0.0,
-                            "connected": True,
-                            "last_update": time.time(),
-                        }
-                    )
+                lat = sm_aq.get("PLANE_LATITUDE")
+                lon = sm_aq.get("PLANE_LONGITUDE")
+                alt_ft = sm_aq.get("PLANE_ALTITUDE")
+                heading = sm_aq.get("MAGNETIC_COMPASS")
+                aircraft_data.update(
+                    {
+                        "latitude": lat if lat else 0.0,
+                        "longitude": lon if lon else 0.0,
+                        "altitude": alt_ft * 0.3048 if alt_ft else 0.0,
+                        "heading": heading if heading else 0.0,
+                        "connected": True,
+                        "last_update": time.time(),
+                    }
+                )
             else:
                 import math
 
@@ -96,20 +81,26 @@ def update_aircraft_data():
                 t += 0.05
 
         except Exception as err:
+            stop_event.set()
+            sm_aq = None
             print(f"Error reading aircraft data: {err}")
-            with data_lock:
-                aircraft_data["connected"] = False
+            aircraft_data["connected"] = False
 
         # Update at 1Hz
         time.sleep(1)
 
 
 def start_simconnect_server(status):
     if status == "connect":
-       return connect_to_simconnect()
+        return connect_to_simconnect()
 
     global data_thread
-    if status == "track" and (data_thread is None or not data_thread.is_alive()):
-        # Start background thread for data collection
-        data_thread = threading.Thread(target=update_aircraft_data, daemon=True)
+    if status == "track" and (
+        data_thread is None or not data_thread.is_alive()
+    ):
+        # Start background thread for data updates
+        stop_event = threading.Event()
+        data_thread = threading.Thread(
+            target=update_aircraft_data, args=(stop_event,), daemon=True
+        )
         data_thread.start()

src/app.js

@@ -1,5 +1,11 @@
 /* eslint-disable no-undef */
-import { initSearch, searchLandmarks, getUserLocation } from './search.js';
+import {
+  initSearch,
+  searchLandmarks,
+  getUserLocation,
+  searchAirport,
+  openInternetRadio,
+} from './search.js';
 import { initLandmark } from './landmark.js';
 import {
   getConfig,
@@ -16,11 +22,11 @@ import { i18n, initi18n, updateTranslation } from './lion.js';
 
 const translationMap = {
   // mapping DOM selectors to translation keys
-  '.loading-text': { property: 'textContent', key: 'app.loading_text' },
-  '.caching-text': { property: 'textContent', key: 'app.caching_text' },
+  '.loading-text': { property: 'textContent', strkey: 'app.loading_text' },
+  '.caching-text': { property: 'textContent', strkey: 'app.caching_text' },
   'input#search-input': {
     property: 'placeholder',
-    key: 'app.search_placeholder',
+    strkey: 'app.search_placeholder',
   },
 };
 
@@ -33,6 +39,9 @@ const settingsButton = document.getElementById('settings-button');
 const localeButton = document.getElementById('locale-button');
 const searchSideBar = document.getElementById('search-bar-container');
 const landmarkSidebar = document.getElementById('landmarks-sidebar');
+const moreWrapper = document.getElementById('more-wrapper');
+const moreButton = document.getElementById('more-button');
+const moreMenu = document.getElementById('more-menu');
 
 // Default coordinates (San Francisco)
 let defaultLocation = { lat: 37.7749, lng: -122.4194 };
@@ -144,16 +153,43 @@ async function initMap() {
   setLoading(false);
 }
 
+/**
+ * Adds a new option to More-menu dropdown.
+ * @param {string} strkey - The translation key for this label.
+ * @param {Function} handler - Function called when the option is clicked.
+ */
+export function addMoreOption(strkey, handler) {
+  const item = document.createElement('div');
+  item.className = 'dropdown-item';
+  item.setAttribute('data-i18n-text', strkey);
+  item.addEventListener('click', (ev) => {
+    handler(ev);
+    moreMenu.classList.remove('show'); // hide after selection
+  });
+  moreMenu.appendChild(item);
+}
+
+// when clicking elsewhere on the document
+document.addEventListener('click', () => {
+  moreMenu.classList.remove('show');
+});
+
 /**
  * Set up custom controls
  */
 async function setupCustomControl() {
+  // add each button into gmap DOM structure, attaching click listeners
   map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(myLocationButton);
   myLocationButton.addEventListener('click', async () => {
     await markUserLocation();
   });
 
-  // Add click event to search landmarks button
+  map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(moreWrapper);
+  moreButton.addEventListener('click', (ev) => {
+    ev.stopPropagation(); // Prevent click bubbling
+    moreMenu.classList.toggle('show');
+  });
+
   map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(
     searchLandmarksButton
   );
@@ -178,9 +214,13 @@ async function setupCustomControl() {
   if (i18n.lang.secondLocale) {
     map.controls[google.maps.ControlPosition.LEFT_BOTTOM].push(localeButton);
     localeButton.addEventListener('click', async () => {
-      if (i18n.userLocale === i18n.lang.preferLocale)
+      if (i18n.userLocale === i18n.lang.preferLocale) {
         i18n.userLocale = i18n.lang.secondLocale;
-      else i18n.userLocale = i18n.lang.preferLocale;
+        localeButton.textContent = '🌏';
+      } else {
+        i18n.userLocale = i18n.lang.preferLocale;
+        localeButton.textContent = '🌎';
+      }
       // await updateTranslation();
       await applyTranslations();
     });
@@ -257,23 +297,23 @@ function loadGoogleMapsAPI() {
 }
 
 async function applyTranslations() {
-  Object.entries(translationMap).forEach(([selector, { property, key }]) => {
+  Object.entries(translationMap).forEach(([selector, { property, strkey }]) => {
     document.querySelectorAll(selector).forEach((el) => {
       if (property in el || property === 'textContent') {
-        el[property] = i18n.t(key);
+        el[property] = i18n.t(strkey);
       }
     });
   });
 
   document.querySelectorAll('[data-i18n-text]').forEach((el) => {
-    const key = el.getAttribute('data-i18n-text');
-    const str_value = i18n.t(key);
-    el.textContent = str_value === key ? '' : str_value;
+    const strkey = el.getAttribute('data-i18n-text');
+    const str_value = i18n.t(strkey);
+    el.textContent = str_value === strkey ? '' : str_value;
   });
 
   document.querySelectorAll('[data-i18n-title]').forEach((el) => {
-    const key = el.getAttribute('data-i18n-title');
-    el.title = i18n.t(key); // Set title for tooltips
+    const strkey = el.getAttribute('data-i18n-title');
+    el.title = i18n.t(strkey); // Set title for tooltips
   });
 }
 
@@ -289,6 +329,14 @@ document.addEventListener('DOMContentLoaded', async () => {
   // Load Google Maps API
   loadGoogleMapsAPI();
 
+  addMoreOption('app.airport_menu', async () => {
+    await searchAirport();
+  });
+
+  addMoreOption('app.radio_menu', async () => {
+    await openInternetRadio();
+  });
+
   // Skip auto-translation if no resource bundles are loaded
   if (Object.keys(i18n.translations).length > 0) {
     await updateTranslation();

src/components.js

@@ -219,9 +219,9 @@ class SettingDialog {
       const tr = document.createElement('tr');
 
       const tdLabel = document.createElement('td');
-      const str_key = `Settings.${key}`;
-      const str_value = i18n.t(str_key);
-      tdLabel.textContent = str_value === str_key ? key : str_value;
+      const strkey = `Settings.${key}`;
+      const strval = i18n.t(strkey);
+      tdLabel.textContent = strval === strkey ? key : strval;
       tr.appendChild(tdLabel);
 
       const tdInput = document.createElement('td');

src/gmap.js

@@ -93,14 +93,15 @@ export async function getLocationDetails(latitude, longitude) {
         parts.push(country);
 
       const locationName = parts.length ? parts.join(', ') : 'Unknown Location';
-      console.debug(`Where is (${cacheKey}): ${locationName} (${countryCode})`);
-
       const resultDict = {
         locationName,
+        city: locality ? locality : adminArea,
+        state: locality ? adminArea : undefined,
         country: country || 'Unknown',
         countryCode,
       };
       locationCache[cacheKey] = resultDict;
+      console.debug(`Where is (${cacheKey}): ${locationName}`, resultDict);
       return resultDict;
     }
   } catch (error) {