Marianas Map Markers added and finalised

Author: arn-c0de

app/src/main/assets/databases/map_data.db

@@ -48,8 +48,8 @@ def marianas_samples():
             iata="GUM",
             elevation_m=91.0,
             runways=[
-                Runway(name="06L/24R", length_m=3255, width_m=45, heading=63.0, surface="asphalt", ils=True),
-                Runway(name="06R/24L", length_m=2743, width_m=45, heading=63.0, surface="asphalt", ils=False)
+                Runway(name="06L/24R", length_m=3255, width_m=45, heading=65.0, surface="asphalt", ils=True),
+                Runway(name="06R/24L", length_m=2743, width_m=45, heading=65.0, surface="asphalt", ils=False)
             ],
             frequencies={"tower": 110.30, "ground": 121.9, "approach": 118.7, "atis": 127.25},
             country="United States (Guam)",
@@ -66,8 +66,8 @@ def marianas_samples():
             iata="UAM",
             elevation_m=184.0,
             runways=[
-                Runway(name="06L/24R", length_m=3399, width_m=61, heading=63.0, surface="concrete", ils=True),
-                Runway(name="06R/24L", length_m=3048, width_m=46, heading=63.0, surface="concrete", ils=False)
+                Runway(name="06L/24R", length_m=3399, width_m=61, heading=65.0, surface="concrete", ils=True),
+                Runway(name="06R/24L", length_m=3048, width_m=46, heading=65.0, surface="concrete", ils=False)
             ],
             frequencies={"tower": 126.2, "ground": 275.8, "approach": 327.0, "departure": 363.275},
             country="United States (Guam)",
@@ -77,8 +77,8 @@ def marianas_samples():
         ),
         Location(
             name="OLF Orote (Naval Base Guam)",
-            latitude=13.447222,
-            longitude=144.637778,
+            latitude=13.438336,
+            longitude=144.642391,
             marker_type=MarkerType.AIRPORT.value,
             icao="PGRO",
             elevation_m=116.0,
@@ -92,7 +92,7 @@ def marianas_samples():
             map="Marianas"
         ),
 
-        # Northern Mariana Islands (US Commonwealth)
+        # Northern Mariana Islands (US Commonwealth)                
         Location(
             name="Saipan International Airport",
             latitude=15.119444,
@@ -129,13 +129,13 @@ def marianas_samples():
         ),
         Location(
             name="North West Field (Tinian)",
-            latitude=15.087778,
-            longitude=145.641389,
+            latitude=15.077842,
+            longitude=145.639744,
             marker_type=MarkerType.AIRPORT.value,
             icao="TN01",
             elevation_m=187.0,
             runways=[
-                Runway(name="08/26", length_m=2438, width_m=46, heading=80.0, surface="asphalt", ils=False)
+                Runway(name="06/24", length_m=2438, width_m=46, heading=62.0, surface="asphalt", ils=False)
             ],
             frequencies={"tower": 118.5},
             country="United States (Northern Mariana Islands)",
@@ -162,13 +162,13 @@ def marianas_samples():
         ),
         Location(
             name="Pagan Airstrip",
-            latitude=18.139722,
-            longitude=145.774167,
+            latitude=18.123207,
+            longitude=145.763147,
             marker_type=MarkerType.AIRPORT.value,
             icao="PGPA",
             elevation_m=167.0,
             runways=[
-                Runway(name="03/21", length_m=914, width_m=18, heading=30.0, surface="coral", ils=False)
+                Runway(name="12/30", length_m=914, width_m=18, heading=119.0, surface="coral", ils=False)
             ],
             frequencies={},
             country="United States (Northern Mariana Islands)",

scripts/MapDatabaseTools/add_marianas_markers.py

@@ -91,12 +91,44 @@ def refresh_list(self):
         markers_header.setForeground(QColor("#666"))
         self.list_widget.addItem(markers_header)
 
-        markers = self.db.get_all_locations()
-        for m in markers:
-            if cat in ("All", "Markers") and (not q or q in (m.name or "").lower()):
-                item = QListWidgetItem(f"📍 {m.name} ({m.latitude:.4f}, {m.longitude:.4f})")
-                item.setData(Qt.ItemDataRole.UserRole, ("marker", m.id))
+        # Group markers by DCS map (show subheaders per map)
+        if cat in ("All", "Markers"):
+            markers = self.db.get_all_locations()
+            groups: dict = {}
+            for m in markers:
+                # Apply name filter
+                if q and q not in (m.name or "").lower():
+                    continue
+                map_name = (m.map or "").strip()
+                if not map_name:
+                    map_key = "No Map"
+                else:
+                    map_key = map_name
+                groups.setdefault(map_key, []).append(m)
+
+            if not groups:
+                item = QListWidgetItem("No markers found")
+                item.setFlags(Qt.ItemFlag.NoItemFlags)
+                item.setForeground(QColor("gray"))
                 self.list_widget.addItem(item)
+            else:
+                # Sort maps alphabetically but put "No Map" last
+                def map_sort_key(s):
+                    return (s == "No Map", s.lower())
+
+                for map_key in sorted(groups.keys(), key=map_sort_key):
+                    # Subheader for this map
+                    sub_label = f"  — {map_key} —"
+                    sub_item = QListWidgetItem(sub_label)
+                    sub_item.setFlags(Qt.ItemFlag.NoItemFlags)
+                    sub_item.setForeground(QColor("#888"))
+                    self.list_widget.addItem(sub_item)
+
+                    # Add markers in this map (sorted by name)
+                    for m in sorted(groups[map_key], key=lambda x: (x.name or "").lower()):
+                        item = QListWidgetItem(f"    📍 {m.name} ({m.latitude:.4f}, {m.longitude:.4f})")
+                        item.setData(Qt.ItemDataRole.UserRole, ("marker", m.id))
+                        self.list_widget.addItem(item)
 
         # Borders
         borders_header = QListWidgetItem("— BORDERS —")

scripts/MapDatabaseTools/gui/assets_manager.py

@@ -722,6 +722,12 @@ def on_location_selected(self, location: Location):
             js = f"centerMap({location.latitude:.6f}, {location.longitude:.6f});"
             try:
                 self._call_js_when_ready('centerMap', js)
+                # Also draw runway headings if present for this location
+                try:
+                    self._call_js_when_ready('clearRunwayLines', "clearRunwayLines();")
+                    self._call_js_when_ready('showRunwayHeadings', f"showRunwayHeadings({location.id});")
+                except Exception:
+                    pass
             except Exception:
                 pass
 
@@ -731,7 +737,16 @@ def on_asset_selected(self, asset_tuple):
             return
         typ, obj = asset_tuple
         if typ == "marker":
+            # Center on selected location and show runway heading lines (if available)
             self.on_location_selected(obj)
+            try:
+                # Clear previous runway lines
+                if self.webview:
+                    self._call_js_when_ready('clearRunwayLines', "clearRunwayLines();")
+                    # Draw for this marker id
+                    self._call_js_when_ready('showRunwayHeadings', f"showRunwayHeadings({obj.id});")
+            except Exception:
+                pass
         elif typ == "border":
             self.on_border_selected(obj)
 
@@ -783,6 +798,12 @@ def on_location_changed(self, location):
     def on_border_selected(self, border: Border):
         """Handle border selection - zoom to border on map"""
         if self.webview and border and border.points:
+            # Clear any runway lines (we are switching to border)
+            try:
+                self._call_js_when_ready('clearRunwayLines', "clearRunwayLines();")
+            except Exception:
+                pass
+
             # Calculate center of border
             lats = [p[0] for p in border.points]
             lons = [p[1] for p in border.points]
@@ -1286,6 +1307,14 @@ def refresh_map_markers(self):
                     marker_info['icao'] = loc.icao
                 if loc.runways:
                     marker_info['runways'] = len(loc.runways)
+                    # Add runway heading details for visualization (heading in degrees, length in meters)
+                    try:
+                        marker_info['runway_headings'] = [
+                            { 'heading': float(rw.heading), 'length_m': float(rw.length_m) if rw.length_m else None }
+                            for rw in loc.runways
+                        ]
+                    except Exception:
+                        marker_info['runway_headings'] = []
                 if loc.threat_level:
                     marker_info['threat'] = loc.threat_level
 

scripts/MapDatabaseTools/gui/datapad_gui.py

@@ -254,6 +254,9 @@
                 var bordersLayer = L.layerGroup().addTo(map);
                 var borderPolygons = {};
                 var mgrsGridLayer = null;
+
+                // Layer for drawing selected marker runway centerlines
+                var runwayLinesLayer = L.layerGroup().addTo(map);
 
                 // Border drawing state
                 var isDrawingBorder = false;
@@ -391,13 +394,78 @@
                                 marker.bindPopup(popupContent);
 
                                 markersLayer.addLayer(marker);
+                                // Attach runway headings data (if any) to marker for later visualization
+                                try { marker.runway_headings = m.runway_headings || []; marker.options.runway_headings = m.runway_headings || []; } catch (e) {}
                                 locationMarkers[m.id] = marker;
 
                             } catch (e) {
                                 console.error('Error adding marker:', e, m);
                             }
                         });
 
+                        // Function to compute destination point given bearing and distance (meters)
+                        function destinationPoint(lat, lon, bearing, distance_m) {
+                            var R = 6371000; // Earth radius in meters
+                            var br = bearing * Math.PI / 180;
+                            var lat1 = lat * Math.PI / 180;
+                            var lon1 = lon * Math.PI / 180;
+                            var d = distance_m / R;
+                            var lat2 = Math.asin(Math.sin(lat1) * Math.cos(d) + Math.cos(lat1) * Math.sin(d) * Math.cos(br));
+                            var lon2 = lon1 + Math.atan2(Math.sin(br) * Math.sin(d) * Math.cos(lat1), Math.cos(d) - Math.sin(lat1) * Math.sin(lat2));
+                            return [lat2 * 180 / Math.PI, lon2 * 180 / Math.PI];
+                        }
+
+                        // Clear existing runway lines
+                        window.clearRunwayLines = function() {
+                            try {
+                                runwayLinesLayer.clearLayers();
+                            } catch (e) { console.error('clearRunwayLines', e); }
+                        };
+
+                        // Draw runway centerlines for a given marker id using supplied runway_headings in marker data
+                        window.showRunwayHeadings = function(markerId) {
+                            try {
+                                runwayLinesLayer.clearLayers();
+                                if (!locationMarkers[markerId]) return;
+                                var marker = locationMarkers[markerId];
+                                var lat = marker.getLatLng().lat;
+                                var lon = marker.getLatLng().lng;
+                                var mdata = null;
+                                // Try to find the original data object; it's not stored directly, so
+                                // we rely on markers array closure in updateMarkers - workaround: markersLayer.eachLayer
+                                markersLayer.eachLayer(function(layer) {
+                                    if (layer && layer.getLatLng && layer.getLatLng().lat === lat && layer.getLatLng().lng === lon) {
+                                        // try to get stored marker options or bind to popup content hint
+                                    }
+                                });
+                                // Instead, request runway headings from window._lastMarkerRunways if available
+                                // To keep things simple, we also store runway data on the marker object itself in updateMarkers
+                                var runways = marker.options.runway_headings || marker.runway_headings || [];
+
+                                if (!runways || runways.length === 0) {
+                                    // Nothing to draw
+                                    return;
+                                }
+
+                                runways.forEach(function(r) {
+                                    var heading = Number(r.heading) || 0;
+                                    var length_m = r.length_m && Number(r.length_m) > 0 ? Number(r.length_m) : 1000; // default 1 km
+                                    var half = length_m / 2.0;
+
+                                    var pt1 = destinationPoint(lat, lon, heading, half);
+                                    var pt2 = destinationPoint(lat, lon, (heading + 180) % 360, half);
+
+                                    var line = L.polyline([pt1, pt2], { color: '#FF8800', weight: 3, opacity: 0.9, dashArray: '8,6' });
+                                    line.addTo(runwayLinesLayer);
+                                });
+
+                                // Optionally zoom slightly to show the lines
+                                // Here we pan to marker to ensure visibility
+                                map.panTo([lat, lon]);
+
+                            } catch (e) { console.error('showRunwayHeadings error', e); }
+                        };
+
                         // Provide getters for Python to poll for marker interactions
                         window.getClickedMarker = function() {
                             try {