From 5797bc64fc73bc6bf49c8068308938bb5fcda118 Mon Sep 17 00:00:00 2001
From: Emiliano Macedonio <iz0ijd@gmail.com>
Date: Tue, 11 Jun 2024 11:49:36 +0200
Subject: [PATCH] Added Flag to Maps Popups

---
 application/models/Logbook_model.php | 14 +++++++++-----
 assets/js/leaflet/leafembed.js       |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 570f5063..37ec5437 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -4766,17 +4766,21 @@ class Logbook_model extends CI_Model
   public function get_plot_array_for_map($qsos_result, $isVisitor = false)
   {
     $this->load->library('qra');
+	$CI = &get_instance();
+    $CI->load->library('DxccFlag');
 
     $json["markers"] = array();
 
     foreach ($qsos_result as $row) {
-      $plot = array('lat' => 0, 'lng' => 0, 'html' => '', 'label' => '', 'confirmed' => 'N');
+      $plot = array('lat' => 0, 'lng' => 0, 'html' => '', 'label' => '', 'flag' => '', 'confirmed' => 'N');
 
       $plot['label'] = $row->COL_CALL;
-
-      $plot['html'] = "Callsign: " . $row->COL_CALL . "<br />Date/Time: " . $row->COL_TIME_ON . "<br />";
-      $plot['html'] .= ($row->COL_SAT_NAME != null) ? ("SAT: " . $row->COL_SAT_NAME . "<br />") : ("Band: " . $row->COL_BAND . "<br />");
-      $plot['html'] .= "Mode: " . ($row->COL_SUBMODE == null ? $row->COL_MODE : $row->COL_SUBMODE) . "<br />";
+      $flag = strtolower($CI->dxccflag->getISO($row->COL_DXCC));
+	  $plot['flag'] = '<span data-bs-toggle="tooltip" title="' . ucwords(strtolower(($row->name==null?"- NONE -":$row->name))) . '"><span class="fi fi-' . $flag .'"></span></span> ';
+      $plot['html'] = ($row->COL_GRIDSQUARE != null ?  "<b>Grid:</b> " . $row->COL_GRIDSQUARE . "<br />" : "");
+      $plot['html'] .= "<b>Date/Time:</b> " . $row->COL_TIME_ON . "<br />";
+      $plot['html'] .= ($row->COL_SAT_NAME != null) ? ("<b>SAT:</b> " . $row->COL_SAT_NAME . "<br />") : ("<b>Band:</b> " . $row->COL_BAND . " ");
+      $plot['html'] .= "<b>Mode:</b> " . ($row->COL_SUBMODE == null ? $row->COL_MODE : $row->COL_SUBMODE) . "<br />";
 
       // check if qso is confirmed //
       if (!$isVisitor) {
diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js
index ff6c908f..b2a59bf9 100644
--- a/assets/js/leaflet/leafembed.js
+++ b/assets/js/leaflet/leafembed.js
@@ -92,7 +92,7 @@ function createPlots(_plot) {
 	plotmark.data=_plot;
 	map.addLayer(plotmark);
 	if ((typeof _plot.label!=="undefined")&&(typeof _plot.html!=="undefined")) {
-		_plot.label = (_plot.label!="")?("<h3>"+_plot.label+"</h3>"):"";
+		_plot.label = (_plot.label!="")?("<h3>"+ _plot.flag  +  _plot.label+"</h3>"):"";
 		if ((_plot.label+_plot.html)!="") { plotmark.bindPopup(_plot.label+_plot.html); }
 	}
 	plotlayers.push(plotmark);