diff --git a/application/controllers/Map.php b/application/controllers/Map.php index 356f4c74a..42b6bd946 100644 --- a/application/controllers/Map.php +++ b/application/controllers/Map.php @@ -72,7 +72,7 @@ class Map extends CI_Controller { $station_id = ($station_id === 'all') ? null : $station_id; try { - $qsos = $this->Map_model->get_qsos_by_country($country, $station_id, $limit); + $qsos = $this->Map_model->get_qsos_by_country($country, $station_id); if (empty($qsos)) { while (ob_get_level()) ob_end_clean(); diff --git a/application/locale/de_DE/LC_MESSAGES/messages.mo b/application/locale/de_DE/LC_MESSAGES/messages.mo index 26bc84967..b7c10a4d4 100644 Binary files a/application/locale/de_DE/LC_MESSAGES/messages.mo and b/application/locale/de_DE/LC_MESSAGES/messages.mo differ diff --git a/application/locale/de_DE/LC_MESSAGES/messages.po b/application/locale/de_DE/LC_MESSAGES/messages.po index 647f51682..7ed34886f 100644 --- a/application/locale/de_DE/LC_MESSAGES/messages.po +++ b/application/locale/de_DE/LC_MESSAGES/messages.po @@ -27,10 +27,10 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" "POT-Creation-Date: 2025-12-26 19:47+0000\n" -"PO-Revision-Date: 2025-12-26 16:35+0000\n" -"Last-Translator: Fabian Franz BSc \n" -"Language-Team: German \n" +"PO-Revision-Date: 2025-12-27 14:44+0000\n" +"Last-Translator: Jörg Dorgeist \n" +"Language-Team: German \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1106,7 +1106,7 @@ msgstr "Download des eQSL Bildes fehlgeschlagen" #: application/controllers/Eqsl.php:419 msgid "Failed to load cached eQSL image" -msgstr "" +msgstr "Fehler beim Laden der eQSL-Karte" #: application/controllers/Eqsl.php:540 msgid "eQSL Tools" diff --git a/application/locale/nl_NL/LC_MESSAGES/messages.mo b/application/locale/nl_NL/LC_MESSAGES/messages.mo index b38415261..8366ba411 100644 Binary files a/application/locale/nl_NL/LC_MESSAGES/messages.mo and b/application/locale/nl_NL/LC_MESSAGES/messages.mo differ diff --git a/application/locale/nl_NL/LC_MESSAGES/messages.po b/application/locale/nl_NL/LC_MESSAGES/messages.po index 6db6bd49a..48e451284 100644 --- a/application/locale/nl_NL/LC_MESSAGES/messages.po +++ b/application/locale/nl_NL/LC_MESSAGES/messages.po @@ -11,10 +11,10 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" "POT-Creation-Date: 2025-12-26 19:47+0000\n" -"PO-Revision-Date: 2025-12-26 16:35+0000\n" +"PO-Revision-Date: 2025-12-27 14:44+0000\n" "Last-Translator: Alexander \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch \n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1090,7 +1090,7 @@ msgstr "Kon niet eQSL-afbeelding downloaden" #: application/controllers/Eqsl.php:419 msgid "Failed to load cached eQSL image" -msgstr "" +msgstr "Kan de gecachte eQSL-afbeelding niet laden" #: application/controllers/Eqsl.php:540 msgid "eQSL Tools" diff --git a/application/locale/sv_SE/LC_MESSAGES/messages.mo b/application/locale/sv_SE/LC_MESSAGES/messages.mo index 0e0e9b429..ebe8738ee 100644 Binary files a/application/locale/sv_SE/LC_MESSAGES/messages.mo and b/application/locale/sv_SE/LC_MESSAGES/messages.mo differ diff --git a/application/locale/sv_SE/LC_MESSAGES/messages.po b/application/locale/sv_SE/LC_MESSAGES/messages.po index 237d326fb..1aec5cafc 100644 --- a/application/locale/sv_SE/LC_MESSAGES/messages.po +++ b/application/locale/sv_SE/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" "POT-Creation-Date: 2025-12-26 19:47+0000\n" -"PO-Revision-Date: 2025-12-26 16:35+0000\n" +"PO-Revision-Date: 2025-12-26 19:47+0000\n" "Last-Translator: \"Jorgen Dahl, NU1T\" \n" "Language-Team: Swedish \n" @@ -1086,7 +1086,7 @@ msgstr "Det gick inte att ladda ner eQSL-bild" #: application/controllers/Eqsl.php:419 msgid "Failed to load cached eQSL image" -msgstr "" +msgstr "Det gick inte att ladda cachad eQSL-bild" #: application/controllers/Eqsl.php:540 msgid "eQSL Tools" diff --git a/application/locale/tr_TR/LC_MESSAGES/messages.mo b/application/locale/tr_TR/LC_MESSAGES/messages.mo index f06ba911f..d2a72069d 100644 Binary files a/application/locale/tr_TR/LC_MESSAGES/messages.mo and b/application/locale/tr_TR/LC_MESSAGES/messages.mo differ diff --git a/application/locale/tr_TR/LC_MESSAGES/messages.po b/application/locale/tr_TR/LC_MESSAGES/messages.po index c1b37323f..4d831e7a5 100644 --- a/application/locale/tr_TR/LC_MESSAGES/messages.po +++ b/application/locale/tr_TR/LC_MESSAGES/messages.po @@ -13,10 +13,10 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" "POT-Creation-Date: 2025-12-26 19:47+0000\n" -"PO-Revision-Date: 2025-12-08 16:35+0000\n" +"PO-Revision-Date: 2025-12-27 14:44+0000\n" "Last-Translator: \"Erkin Mercan (TA4AQG-SP9AQG)\" \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish \n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -684,7 +684,7 @@ msgstr " ve grup " #: application/controllers/Calltester.php:33 msgid "Call Tester" -msgstr "" +msgstr "Çağrı Testi" #: application/controllers/Club.php:23 msgid "Club Officer" @@ -1069,27 +1069,27 @@ msgstr "Belirtilen eQSL QTH Takma Adı bulunamadı: %s" #: application/controllers/Eqsl.php:312 msgid "QSO not found or not accessible" -msgstr "" +msgstr "QSO bulunamadı veya erişilemez" #: application/controllers/Eqsl.php:330 msgid "User not found" -msgstr "" +msgstr "Kullanıcı bulunamadı" #: application/controllers/Eqsl.php:339 msgid "eQSL password not configured for this user" -msgstr "" +msgstr "Bu kullanıcı için eQSL şifresi yapılandırılmamış" #: application/controllers/Eqsl.php:357 msgid "Failed to fetch eQSL image data" -msgstr "" +msgstr "eQSL resim verisi alınamadı" #: application/controllers/Eqsl.php:376 msgid "eQSL image not available" -msgstr "" +msgstr "eQSL resmi mevcut değil" #: application/controllers/Eqsl.php:395 msgid "Failed to download eQSL image" -msgstr "" +msgstr "eQSL resmi indirilemedi" #: application/controllers/Eqsl.php:419 msgid "Failed to load cached eQSL image" @@ -1995,7 +1995,7 @@ msgstr "LoTW .TQ8 Gönderilmedi" #: application/controllers/Map.php:46 msgid "QSO Map" -msgstr "" +msgstr "QSO Haritası" #: application/controllers/Mode.php:25 application/controllers/Usermode.php:23 #: application/views/interface_assets/header.php:328 @@ -6706,15 +6706,15 @@ msgstr "kategori ödülü!" #: application/views/awards/pl_polska/index.php:342 msgid "Award Category:" -msgstr "" +msgstr "Ödül Kategorisi:" #: application/views/awards/pl_polska/index.php:344 msgid "Mode Categories" -msgstr "" +msgstr "Mod Kategorileri" #: application/views/awards/pl_polska/index.php:350 msgid "Band Categories" -msgstr "" +msgstr "Bant Kategorileri" #: application/views/awards/pl_polska/index.php:372 #: application/views/logbookadvanced/dbtoolsdialog.php:47 @@ -6724,7 +6724,7 @@ msgstr "" #: application/views/awards/pl_polska/index.php:372 msgid "Logbook Advanced" -msgstr "" +msgstr "Gelişmiş Logbook" #: application/views/awards/pl_polska/index.php:372 msgid "" @@ -6734,11 +6734,11 @@ msgstr "" #: application/views/awards/pl_polska/index.php:372 msgid "Tip:" -msgstr "" +msgstr "İpucu:" #: application/views/awards/pl_polska/index.php:372 msgid "Use" -msgstr "" +msgstr "Kullan" #: application/views/awards/pl_polska/index.php:372 msgid "to auto-populate states from Maidenhead locators." @@ -7223,7 +7223,7 @@ msgstr "İmleci eyaletin üstüne getirin" #: application/views/awards/was/index.php:5 #: application/views/awards/was/index.php:166 msgid "inc." -msgstr "" +msgstr "dahil" #: application/views/awards/was/index.php:25 msgid "WAS Award" @@ -7461,7 +7461,7 @@ msgstr "" #: application/views/bandmap/list.php:34 msgid "Band Lock" -msgstr "" +msgstr "Bant Kilidi" #: application/views/bandmap/list.php:35 msgid "Band lock enabled - band filter will track radio band" @@ -7506,11 +7506,11 @@ msgstr "Favori bantlarınız ve modlarınız uygulandı" #: application/views/bandmap/list.php:47 application/views/bandmap/list.php:314 #: application/views/bandmap/list.php:479 msgid "My Submodes" -msgstr "" +msgstr "Alt modlarım" #: application/views/bandmap/list.php:48 msgid "Submode filter enabled" -msgstr "" +msgstr "Submode filtresi etkinleştirildi" #: application/views/bandmap/list.php:49 msgid "Submode filter disabled - showing all" @@ -7518,7 +7518,7 @@ msgstr "" #: application/views/bandmap/list.php:50 msgid "Required submodes" -msgstr "" +msgstr "Gerekli alt modlar" #: application/views/bandmap/list.php:51 msgid "Configure in User Settings - Modes" @@ -7553,7 +7553,7 @@ msgstr "Telefon (ssb,lsb,usb..) modu filtresini aç/kapat" #: application/views/bandmap/list.php:60 application/views/bandmap/list.php:421 msgid "Favorites" -msgstr "" +msgstr "Favoriler" #: application/views/bandmap/list.php:61 application/views/bandmap/list.php:424 msgid "Save Current Filters..." @@ -7565,7 +7565,7 @@ msgstr "" #: application/views/bandmap/list.php:63 msgid "Filter preset saved" -msgstr "" +msgstr "Filtre ayarı kaydedildi" #: application/views/bandmap/list.php:64 msgid "Filter preset loaded" @@ -7573,15 +7573,15 @@ msgstr "" #: application/views/bandmap/list.php:65 msgid "Filter preset deleted" -msgstr "" +msgstr "Filtre ön ayarı silindi" #: application/views/bandmap/list.php:66 msgid "Are you sure to delete this filter preset?" -msgstr "" +msgstr "Bu filtre ön ayarını silmek istediğinizden emin misiniz?" #: application/views/bandmap/list.php:67 msgid "No saved filter presets" -msgstr "" +msgstr "Kayıtlı filtre ön ayarı yok" #: application/views/bandmap/list.php:68 msgid "" @@ -8100,7 +8100,7 @@ msgstr "SHF bantları filtresini aç/kapat" #: application/views/bandmap/list.php:478 msgid "Loading submodes..." -msgstr "" +msgstr "Alt modlar yükleniyor..." #: application/views/bandmap/list.php:483 msgid "Toggle LoTW User filter" @@ -8800,12 +8800,12 @@ msgstr "" #: application/views/calltester/comparison_result.php:22 #: application/views/calltester/comparison_result.php:34 msgid "Execution time:" -msgstr "" +msgstr "Çalışma süresi:" #: application/views/calltester/comparison_result.php:23 #: application/views/calltester/comparison_result.php:35 msgid "Issues found:" -msgstr "" +msgstr "Karşılaşılan sorunlar:" #: application/views/calltester/comparison_result.php:30 msgid "Logbook Model Results" @@ -8837,7 +8837,7 @@ msgstr "" #: application/views/calltester/result.php:24 #: application/views/logbookadvanced/checkresult.php:135 msgid "Station Profile" -msgstr "" +msgstr "İstasyon Profili" #: application/views/calltester/comparison_result.php:63 #: application/views/calltester/comparison_result.php:99 @@ -8845,14 +8845,14 @@ msgstr "" #: application/views/calltester/result.php:25 #: application/views/logbookadvanced/checkresult.php:136 msgid "Existing DXCC" -msgstr "" +msgstr "Mevcut DXCC" #: application/views/calltester/comparison_result.php:64 #: application/views/calltester/comparison_result.php:100 #: application/views/calltester/comparison_result.php:136 #: application/views/calltester/result.php:26 msgid "Existing ADIF" -msgstr "" +msgstr "Mevcut ADIF" #: application/views/calltester/comparison_result.php:65 #: application/views/calltester/comparison_result.php:101 @@ -8860,14 +8860,14 @@ msgstr "" #: application/views/calltester/result.php:27 #: application/views/logbookadvanced/checkresult.php:137 msgid "Result DXCC" -msgstr "" +msgstr "Sonuç DXCC" #: application/views/calltester/comparison_result.php:66 #: application/views/calltester/comparison_result.php:102 #: application/views/calltester/comparison_result.php:138 #: application/views/calltester/result.php:28 msgid "Result ADIF" -msgstr "" +msgstr "Sonuç ADIF" #: application/views/calltester/comparison_result.php:90 msgid "Issues found only in Logbook Model (not in DXCC Class):" @@ -8875,7 +8875,7 @@ msgstr "" #: application/views/calltester/comparison_result.php:126 msgid "Issues found in both methods:" -msgstr "" +msgstr "Her iki yöntemde de bulunan sorunlar:" #: application/views/calltester/comparison_result.php:162 msgid "" @@ -8904,12 +8904,12 @@ msgstr "" #: application/views/calltester/result.php:4 #: application/views/logbookadvanced/checkresult.php:117 msgid "Callsigns tested: " -msgstr "" +msgstr "Çağrı işaretleri test edildi: " #: application/views/calltester/result.php:5 #: application/views/logbookadvanced/checkresult.php:118 msgid "Execution time: " -msgstr "" +msgstr "Çalışma süresi: " #: application/views/calltester/result.php:6 #: application/views/logbookadvanced/checkresult.php:119 @@ -9019,7 +9019,7 @@ msgstr "QSO'yu ADIF olarak dışa aktar" #: application/views/club/permissions.php:128 msgid "Export own QSO per ADIF" -msgstr "" +msgstr "Kendi QSO'larını ADIF olarak dışa aktar" #: application/views/club/permissions.php:137 msgid "User Management" @@ -12113,7 +12113,7 @@ msgstr "LX Gridmaster" #: application/views/interface_assets/header.php:268 msgid "Poland" -msgstr "" +msgstr "Polonya" #: application/views/interface_assets/header.php:274 msgid "Switzerland" @@ -12571,6 +12571,8 @@ msgid "" "If a QSO has a 4‑char locator (e.g., JO90), try to refine it using callbook " "data." msgstr "" +"Eğer bir QSO 4 karakterli bir lokator içeriyorsa (örneğin, JO90), bunu " +"callbook verilerini kullanarak detaylandırmaya çalış." #: application/views/logbookadvanced/callbookdialog.php:6 msgid "" @@ -12589,7 +12591,7 @@ msgstr "" #: application/views/logbookadvanced/checkresult.php:96 #: application/views/logbookadvanced/checkresult.php:107 msgid "QSOs to update found:" -msgstr "" +msgstr "Güncellenmesi gereken QSO/QSO'lar bulundu:" #: application/views/logbookadvanced/checkresult.php:44 #: application/views/logbookadvanced/distancedialog.php:2 @@ -12644,7 +12646,7 @@ msgstr "" #: application/views/logbookadvanced/checkresult.php:77 #: application/views/logbookadvanced/statecheckresult.php:30 msgid "Run fix" -msgstr "" +msgstr "Düzeltmeyi çalıştır" #: application/views/logbookadvanced/checkresult.php:84 msgid "CQ Zone Check Results" @@ -12652,7 +12654,7 @@ msgstr "" #: application/views/logbookadvanced/checkresult.php:95 msgid "ITU Zone Check Results" -msgstr "" +msgstr "ITU Bölge Kontrol Sonuçları" #: application/views/logbookadvanced/checkresult.php:106 msgid "Gridsquare Check Results" @@ -12660,15 +12662,15 @@ msgstr "" #: application/views/logbookadvanced/checkresult.php:124 msgid "Update selected" -msgstr "" +msgstr "Seçilenleri güncelle" #: application/views/logbookadvanced/dbtoolsdialog.php:4 msgid "Data Repair Tools" -msgstr "" +msgstr "Veri Onarım Araçları" #: application/views/logbookadvanced/dbtoolsdialog.php:6 msgid "Wiki Help" -msgstr "" +msgstr "Wiki Yardım" #: application/views/logbookadvanced/dbtoolsdialog.php:11 #: application/views/logbookadvanced/index.php:792 @@ -12677,7 +12679,7 @@ msgstr "CQ Bölgelerini Düzelt" #: application/views/logbookadvanced/dbtoolsdialog.php:12 msgid "Update missing CQ zone information" -msgstr "" +msgstr "Eksik CQ bölgesi bilgisini güncelle" #: application/views/logbookadvanced/dbtoolsdialog.php:16 #: application/views/logbookadvanced/dbtoolsdialog.php:28 @@ -12688,7 +12690,7 @@ msgstr "" #: application/views/logbookadvanced/dbtoolsdialog.php:88 #: application/views/logbookadvanced/dbtoolsdialog.php:101 msgid "Check" -msgstr "" +msgstr "Kontrol Et" #: application/views/logbookadvanced/dbtoolsdialog.php:23 #: application/views/logbookadvanced/index.php:793 @@ -12726,7 +12728,7 @@ msgstr "DXCC verisi eksik QSOlari kontrol et" #: application/views/logbookadvanced/dbtoolsdialog.php:72 msgid "Identify QSOs that are missing DXCC information" -msgstr "" +msgstr "DXCC bilgisi eksik olan QSO'ları belirle" #: application/views/logbookadvanced/dbtoolsdialog.php:83 msgid "Check all QSOs in the logbook for incorrect DXCC" @@ -12734,7 +12736,7 @@ msgstr "" #: application/views/logbookadvanced/dbtoolsdialog.php:84 msgid "Use Wavelog to determine DXCC for all QSOs." -msgstr "" +msgstr "Wavelog'u kullanarak tüm QSQ'ların DXCC'sini belirle." #: application/views/logbookadvanced/dbtoolsdialog.php:95 msgid "Lookup QSOs with missing grid in callbook" @@ -12746,7 +12748,7 @@ msgstr "" #: application/views/logbookadvanced/dbtoolsdialog.php:97 msgid "This is limited to 150 callsigns for each run!" -msgstr "" +msgstr "Bu, her çalıştırma için 150 çağrı işaretleri ile sınırlıdır!" #: application/views/logbookadvanced/dupesearchdialog.php:4 msgid "Search for duplicates using:" @@ -13178,7 +13180,7 @@ msgstr "" #: application/views/logbookadvanced/index.php:37 msgid "Fixed" -msgstr "" +msgstr "Düzeltildi" #: application/views/logbookadvanced/index.php:38 #, php-format @@ -13187,7 +13189,7 @@ msgstr "" #: application/views/logbookadvanced/index.php:39 msgid "Skipped" -msgstr "" +msgstr "Atlandı" #: application/views/logbookadvanced/index.php:40 #, php-format @@ -13296,10 +13298,12 @@ msgid "" "Are you sure you want to fix all QSOs with missing DXCC information? This " "action cannot be undone." msgstr "" +"Eksik DXCC bilgisine sahip tüm QSO'ları düzeltmek istediğinizden emin " +"misiniz? Bu işlem geri alınamaz." #: application/views/logbookadvanced/index.php:74 msgid "Duplicate Search" -msgstr "" +msgstr "Yinelenen Arama" #: application/views/logbookadvanced/index.php:301 msgid "From" @@ -13349,7 +13353,7 @@ msgstr "" #: application/views/logbookadvanced/index.php:506 #: application/views/logbookadvanced/index.php:688 msgid "Apply filters" -msgstr "" +msgstr "Filtreleri Uygula" #: application/views/logbookadvanced/index.php:516 msgid "QSL Filters" @@ -13653,7 +13657,7 @@ msgstr "3D Harita" #: application/views/logbookadvanced/index.php:845 msgid "Database Tools" -msgstr "" +msgstr "Veritabanı Araçları" #: application/views/logbookadvanced/index.php:872 #: application/views/logbookadvanced/useroptions.php:26 @@ -13725,12 +13729,12 @@ msgstr "Sonraki" #: application/views/logbookadvanced/showMissingDxccQsos.php:14 #, php-format msgid "Found %s QSO(s) missing DXCC information." -msgstr "" +msgstr "%s QSO'nun DXCC bilgisi eksik." #: application/views/logbookadvanced/showMissingDxccQsos.php:47 #: application/views/logbookadvanced/showStateQsos.php:49 msgid "No Issues Found" -msgstr "" +msgstr "Sorun Bulunamadı" #: application/views/logbookadvanced/showStateQsos.php:16 #, php-format @@ -13769,7 +13773,7 @@ msgstr "İstasyon" #: application/views/logbookadvanced/showUpdateResult.php:31 msgid "Results for DXCC update:" -msgstr "" +msgstr "DXCC güncellemesi sonuçları:" #: application/views/logbookadvanced/showUpdateResult.php:34 #: application/views/logbookadvanced/showUpdateResult.php:40 @@ -13824,7 +13828,7 @@ msgstr "" #: application/views/logbookadvanced/showUpdateResult.php:140 msgid "Results for CQ zone update:" -msgstr "" +msgstr "CQ bölge güncellemesi sonuçları:" #: application/views/logbookadvanced/showUpdateResult.php:141 msgid "The number of QSOs updated for CQ zone is" @@ -13903,7 +13907,7 @@ msgstr "" #: application/views/logbookadvanced/statedialog.php:10 msgid "Currently supported countries" -msgstr "" +msgstr "Şu anda desteklenen ülkeler" #: application/views/logbookadvanced/useroptions.php:16 msgid "Column" @@ -14044,15 +14048,15 @@ msgstr "Son yükleme" #: application/views/lotw_views/index.php:95 msgid "Last change:" -msgstr "" +msgstr "Son değişiklik:" #: application/views/lotw_views/index.php:95 msgid "Serial number:" -msgstr "" +msgstr "Seri numarası:" #: application/views/lotw_views/index.php:97 msgid "Certificate superseded" -msgstr "" +msgstr "Sertifika geçersiz kılındı" #: application/views/lotw_views/index.php:100 msgid "Certificate expired" @@ -14096,11 +14100,11 @@ msgstr "" #: application/views/map/qso_map.php:6 msgid "Select Country:" -msgstr "" +msgstr "Ülke Seç:" #: application/views/map/qso_map.php:8 msgid "Choose a country..." -msgstr "" +msgstr "Bir ülke seç..." #: application/views/mode/create.php:24 application/views/mode/edit.php:33 msgctxt "Name of mode in ADIF-specification" @@ -17871,7 +17875,7 @@ msgstr "Bu ayar, güneş ve yayılım verilerinin görüntülenmesini değiştir #: application/views/user/edit.php:688 msgid "Show Fields on QSO Tab" -msgstr "" +msgstr "QSO sekmesinde alanları göster" #: application/views/user/edit.php:692 msgid "" @@ -18714,7 +18718,7 @@ msgstr "eQSL Kartı (eQSL.cc)" #: application/views/view_log/qso.php:923 msgid "QSO not found" -msgstr "" +msgstr "QSO bulunamadı" #: application/views/visitor/layout/footer.php:239 msgid "Filter Results" diff --git a/application/models/Map_model.php b/application/models/Map_model.php index b20b29d0e..410ac75ad 100644 --- a/application/models/Map_model.php +++ b/application/models/Map_model.php @@ -6,13 +6,12 @@ class Map_model extends CI_Model { * Get available countries from the logbook with QSOs */ public function get_available_countries() { - $this->db->select('DISTINCT COL_COUNTRY, COL_DXCC, COUNT(*) as qso_count', FALSE); + $this->db->select('DISTINCT dxcc_entities.name AS COL_COUNTRY, COL_DXCC, COUNT(*) as qso_count', FALSE); $this->db->from($this->config->item('table_name')); - $this->db->join('station_profile', 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id'); - $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); - $this->db->where('COL_COUNTRY IS NOT NULL'); - $this->db->where('COL_COUNTRY !=', ''); - $this->db->where("LENGTH(COL_GRIDSQUARE) >=", 6); // At least 6 chars + $this->db->join('station_profile', 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id'); + $this->db->join('dxcc_entities', 'dxcc_entities.adif = ' . $this->config->item('table_name') . '.COL_DXCC'); + $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); + $this->db->where("LENGTH(COL_GRIDSQUARE) >=", 6); // At least 6 chars $this->db->group_by('COL_COUNTRY, COL_DXCC'); $this->db->order_by('COL_COUNTRY'); diff --git a/application/views/map/qso_map.php b/application/views/map/qso_map.php index 0b7ee0160..658109ce5 100644 --- a/application/views/map/qso_map.php +++ b/application/views/map/qso_map.php @@ -7,9 +7,9 @@ @@ -284,9 +284,9 @@ function initMap() { if (dxcc && supportedDxccs.includes(parseInt(dxcc))) { // Single country GeoJSON $.ajax({ - url: base_url + "map/get_country_geojson/", + url: base_url + "index.php/map/get_country_geojson/", type: 'post', - data: { dxcc: dxcc }, + data: { dxcc: dxcc }, success: function(geojson) { if (geojson && !geojson.error) { const layer = L.geoJSON(geojson, { diff --git a/assets/json/geojson/states_214.geojson b/assets/json/geojson/states_214.geojson index 1298c6353..404a69114 100644 --- a/assets/json/geojson/states_214.geojson +++ b/assets/json/geojson/states_214.geojson @@ -1,7 +1,7 @@ { "type":"FeatureCollection", "features":[ - {"type":"Feature","id":"2A","properties":{"code":"2A","name":"Corse-du-Sud"},"geometry":{"type":"Polygon","coordinates":[[[8.573411068108614,42.38140571205032],[8.594967598626758,42.370442888773276],[8.640801666424288,42.373436353833],[8.650412807593723,42.36235593170432],[8.681978913121439,42.358465400722466],[8.68321233664994,42.348405991522625],[8.715164693117954,42.34731408789375],[8.759078812317421,42.33804006429769],[8.770887277733078,42.324764827713246],[8.819561377056067,42.317558041882876],[8.861675727165986,42.32811167142221],[8.859024483697455,42.29995020570288],[8.87520921911696,42.29428830686922],[8.881953886518218,42.27178078880156],[8.904766989145307,42.253859280700944],[8.933097537277835,42.25043111224553],[8.947076130982284,42.23422817213641],[8.973044637723564,42.232597522891176],[8.991464818157644,42.216579484852076],[9.024603276811161,42.20363389421303],[9.04565931380628,42.206923431408285],[9.050611468499882,42.17000397791563],[9.064131426559902,42.166950715680095],[9.08185038106952,42.1259098454875],[9.123403164538574,42.10551607054204],[9.13482913062442,42.08700036410981],[9.130916384150003,42.05440439115911],[9.161526350789277,42.024930468066465],[9.188367061229057,42.03108582200928],[9.221084024655989,42.02759696053908],[9.223140183667368,41.95046593535651],[9.230490115935124,41.932324073627385],[9.220925415083576,41.9218761454385],[9.248804246301058,41.908855875310024],[9.25220736357214,41.898984720376],[9.234965106156862,41.87934237596686],[9.22749739090474,41.85558903234784],[9.236915461534869,41.84652580746613],[9.270702639104186,41.840591858357556],[9.301434820029463,41.84490426472732],[9.309095237783188,41.832145235940885],[9.329474334205734,41.83678041560044],[9.37190803582647,41.86500821735677],[9.40226832441199,41.858698242272276],[9.406272769840172,41.82236027573807],[9.394129959534725,41.79894602702587],[9.40804423486613,41.765964137404545],[9.399816891537837,41.692798815395356],[9.372306452198895,41.67882801196141],[9.3867990309586,41.66013485456259],[9.370050242610121,41.63650941542051],[9.354744447894907,41.64070711833988],[9.336739554234802,41.6215416098364],[9.287840387799415,41.60914794779935],[9.29567773050855,41.58331885207275],[9.318350951823037,41.60473961141595],[9.342535240446413,41.594200027915484],[9.365038855194317,41.596441470607836],[9.340900099192766,41.559245310577836],[9.30264040024383,41.54562427007991],[9.283924696074152,41.52045330843586],[9.275938375380612,41.496440290295695],[9.28564621195539,41.481455763871594],[9.256106433634463,41.45544645978787],[9.223954643701347,41.44249242165367],[9.226384203660677,41.41695973685865],[9.2502303450001,41.4084598048058],[9.217973376538382,41.36822599455603],[9.179838238258498,41.36705499317599],[9.167240749781808,41.385592289043764],[9.148965906928566,41.38520002286676],[9.123343747407722,41.39749027875982],[9.092348336772952,41.39866884973409],[9.104353270113341,41.4255060819188],[9.097269216996475,41.44376682791671],[9.074312339266525,41.44292158486769],[9.039677264505034,41.46863417186722],[9.0227210321415,41.46376611394031],[8.99284982541176,41.48539712661482],[8.959459141628432,41.49213642659868],[8.921974806573186,41.49333335996221],[8.91474945736704,41.50721159848068],[8.884614957295412,41.50507147381323],[8.877812471356815,41.523794319360206],[8.852559366284032,41.53340920646009],[8.839699710816092,41.54602923754972],[8.82073184232227,41.545714667370824],[8.800523477489595,41.57188276189636],[8.775873328951134,41.59168224390554],[8.789698855828817,41.605741813229336],[8.793554350339635,42.62955326123481],[8.821776132159119,41.63009123019617],[8.850720584313095,41.64641263412892],[8.869502509562649,41.64609463570318],[8.880911938109922,41.66809704399582],[8.915782780480423,41.68156786818509],[8.914509146058741,41.68972719719775],[8.841281825467787,41.69754888764182],[8.812716636350928,41.71412605870484],[8.773461665894612,41.71202820764472],[8.78400108030721,41.73521507782763],[8.77244949030242,41.74151395397478],[8.721540704721875,41.724158153889434],[8.686037575634304,41.748045833798216],[8.713140775389308,41.760833711858524],[8.730281258947743,41.776823799920166],[8.70924681599125,41.79940893302203],[8.740535859236362,41.80060842998491],[8.770981055994985,41.811121572150675],[8.784393807344568,41.830407894413874],[8.790279130273717,41.86641909560435],[8.779265166063484,41.88361463279185],[8.802495279594497,41.89037396990991],[8.780329131904372,41.924549684275014],[8.740124001713054,41.92079895025009],[8.717470184551035,41.90771623226959],[8.671249490634217,41.90478838139739],[8.641453371512307,41.90989807542862],[8.613429079275429,41.9012604850547],[8.620491915709744,41.92638143385013],[8.59770740264425,41.95324242752227],[8.614841081409581,41.97132815848069],[8.646060498119223,41.96813286974832],[8.665774103171897,41.978579613548604],[8.656419834192247,42.00934596433834],[8.690325750960795,42.02759574803638],[8.702100729051129,42.02667306302128],[8.741332481964943,42.04090929509705],[8.739158783588737,42.06270232429793],[8.719858223120928,42.063513495459055],[8.71025694439948,42.09582422568561],[8.683317701085334,42.10767939043072],[8.658338303250986,42.10633293826876],[8.647011374442783,42.121135348279964],[8.62381016858365,42.12310886026918],[8.577473591502791,42.15655723250558],[8.590170524060465,42.16388769237882],[8.578216021601701,42.188552849158576],[8.581385985210854,42.20594433664427],[8.56099542798187,42.23688048012684],[8.615721768949843,42.253944800849766],[8.689105710448825,42.26352397175119],[8.690120554846226,42.27821075076003],[8.65998027654801,42.30242037262011],[8.637554534466465,42.30184726505929],[8.62490287547782,42.3121592221741],[8.628148233048128,42.338703487843894],[8.614873875271428,42.349587758831014],[8.59038224862291,42.35235664185015],[8.562054289065225,42.33282223020302],[8.551790417379964,42.34737867747405],[8.573411068108614,42.38140571205032]]]}}, + {"type":"Feature","id":"2A","properties":{"code":"2A","name":"Corse-du-Sud"},"geometry":{"type":"Polygon","coordinates":[[[8.573411068108614,42.38140571205032],[8.594967598626758,42.370442888773276],[8.640801666424288,42.373436353833],[8.650412807593723,42.36235593170432],[8.681978913121439,42.358465400722466],[8.68321233664994,42.348405991522625],[8.715164693117954,42.34731408789375],[8.759078812317421,42.33804006429769],[8.770887277733078,42.324764827713246],[8.819561377056067,42.317558041882876],[8.861675727165986,42.32811167142221],[8.859024483697455,42.29995020570288],[8.87520921911696,42.29428830686922],[8.881953886518218,42.27178078880156],[8.904766989145307,42.253859280700944],[8.933097537277835,42.25043111224553],[8.947076130982284,42.23422817213641],[8.973044637723564,42.232597522891176],[8.991464818157644,42.216579484852076],[9.024603276811161,42.20363389421303],[9.04565931380628,42.206923431408285],[9.050611468499882,42.17000397791563],[9.064131426559902,42.166950715680095],[9.08185038106952,42.1259098454875],[9.123403164538574,42.10551607054204],[9.13482913062442,42.08700036410981],[9.130916384150003,42.05440439115911],[9.161526350789277,42.024930468066465],[9.188367061229057,42.03108582200928],[9.221084024655989,42.02759696053908],[9.223140183667368,41.95046593535651],[9.230490115935124,41.932324073627385],[9.220925415083576,41.9218761454385],[9.248804246301058,41.908855875310024],[9.25220736357214,41.898984720376],[9.234965106156862,41.87934237596686],[9.22749739090474,41.85558903234784],[9.236915461534869,41.84652580746613],[9.270702639104186,41.840591858357556],[9.301434820029463,41.84490426472732],[9.309095237783188,41.832145235940885],[9.329474334205734,41.83678041560044],[9.37190803582647,41.86500821735677],[9.40226832441199,41.858698242272276],[9.406272769840172,41.82236027573807],[9.394129959534725,41.79894602702587],[9.40804423486613,41.765964137404545],[9.399816891537837,41.692798815395356],[9.372306452198895,41.67882801196141],[9.3867990309586,41.66013485456259],[9.370050242610121,41.63650941542051],[9.354744447894907,41.64070711833988],[9.336739554234802,41.6215416098364],[9.287840387799415,41.60914794779935],[9.29567773050855,41.58331885207275],[9.318350951823037,41.60473961141595],[9.342535240446413,41.594200027915484],[9.365038855194317,41.596441470607836],[9.340900099192766,41.559245310577836],[9.30264040024383,41.54562427007991],[9.283924696074152,41.52045330843586],[9.275938375380612,41.496440290295695],[9.28564621195539,41.481455763871594],[9.256106433634463,41.45544645978787],[9.223954643701347,41.44249242165367],[9.226384203660677,41.41695973685865],[9.2502303450001,41.4084598048058],[9.217973376538382,41.36822599455603],[9.179838238258498,41.36705499317599],[9.167240749781808,41.385592289043764],[9.148965906928566,41.38520002286676],[9.123343747407722,41.39749027875982],[9.092348336772952,41.39866884973409],[9.104353270113341,41.4255060819188],[9.097269216996475,41.44376682791671],[9.074312339266525,41.44292158486769],[9.039677264505034,41.46863417186722],[9.0227210321415,41.46376611394031],[8.99284982541176,41.48539712661482],[8.959459141628432,41.49213642659868],[8.921974806573186,41.49333335996221],[8.91474945736704,41.50721159848068],[8.884614957295412,41.50507147381323],[8.877812471356815,41.523794319360206],[8.852559366284032,41.53340920646009],[8.839699710816092,41.54602923754972],[8.82073184232227,41.545714667370824],[8.800523477489595,41.57188276189636],[8.775873328951134,41.59168224390554],[8.789698855828817,41.605741813229336],[8.793554350339635,41.62955326123481],[8.821776132159119,41.63009123019617],[8.850720584313095,41.64641263412892],[8.869502509562649,41.64609463570318],[8.880911938109922,41.66809704399582],[8.915782780480423,41.68156786818509],[8.914509146058741,41.68972719719775],[8.841281825467787,41.69754888764182],[8.812716636350928,41.71412605870484],[8.773461665894612,41.71202820764472],[8.78400108030721,41.73521507782763],[8.77244949030242,41.74151395397478],[8.721540704721875,41.724158153889434],[8.686037575634304,41.748045833798216],[8.713140775389308,41.760833711858524],[8.730281258947743,41.776823799920166],[8.70924681599125,41.79940893302203],[8.740535859236362,41.80060842998491],[8.770981055994985,41.811121572150675],[8.784393807344568,41.830407894413874],[8.790279130273717,41.86641909560435],[8.779265166063484,41.88361463279185],[8.802495279594497,41.89037396990991],[8.780329131904372,41.924549684275014],[8.740124001713054,41.92079895025009],[8.717470184551035,41.90771623226959],[8.671249490634217,41.90478838139739],[8.641453371512307,41.90989807542862],[8.613429079275429,41.9012604850547],[8.620491915709744,41.92638143385013],[8.59770740264425,41.95324242752227],[8.614841081409581,41.97132815848069],[8.646060498119223,41.96813286974832],[8.665774103171897,41.978579613548604],[8.656419834192247,42.00934596433834],[8.690325750960795,42.02759574803638],[8.702100729051129,42.02667306302128],[8.741332481964943,42.04090929509705],[8.739158783588737,42.06270232429793],[8.719858223120928,42.063513495459055],[8.71025694439948,42.09582422568561],[8.683317701085334,42.10767939043072],[8.658338303250986,42.10633293826876],[8.647011374442783,42.121135348279964],[8.62381016858365,42.12310886026918],[8.577473591502791,42.15655723250558],[8.590170524060465,42.16388769237882],[8.578216021601701,42.188552849158576],[8.581385985210854,42.20594433664427],[8.56099542798187,42.23688048012684],[8.615721768949843,42.253944800849766],[8.689105710448825,42.26352397175119],[8.690120554846226,42.27821075076003],[8.65998027654801,42.30242037262011],[8.637554534466465,42.30184726505929],[8.62490287547782,42.3121592221741],[8.628148233048128,42.338703487843894],[8.614873875271428,42.349587758831014],[8.59038224862291,42.35235664185015],[8.562054289065225,42.33282223020302],[8.551790417379964,42.34737867747405],[8.573411068108614,42.38140571205032]]]}}, {"type":"Feature","id":"2B","properties":{"code":"2B","name":"Haute-Corse"},"geometry":{"type":"Polygon","coordinates":[[[9.40226832441199,41.858698242272276],[9.37190803582647,41.86500821735677],[9.329474334205734,41.83678041560044],[9.309095237783188,41.832145235940885],[9.301434820029463,41.84490426472732],[9.270702639104186,41.840591858357556],[9.236915461534869,41.84652580746613],[9.22749739090474,41.85558903234784],[9.234965106156862,41.87934237596686],[9.25220736357214,41.898984720376],[9.248804246301058,41.908855875310024],[9.220925415083576,41.9218761454385],[9.230490115935124,41.932324073627385],[9.223140183667368,41.95046593535651],[9.221084024655989,42.02759696053908],[9.188367061229057,42.03108582200928],[9.161526350789277,42.024930468066465],[9.130916384150003,42.05440439115911],[9.13482913062442,42.08700036410981],[9.123403164538574,42.10551607054204],[9.08185038106952,42.1259098454875],[9.064131426559902,42.166950715680095],[9.050611468499882,42.17000397791563],[9.04565931380628,42.206923431408285],[9.024603276811161,42.20363389421303],[8.991464818157644,42.216579484852076],[8.973044637723564,42.232597522891176],[8.947076130982284,42.23422817213641],[8.933097537277835,42.25043111224553],[8.904766989145307,42.253859280700944],[8.881953886518218,42.27178078880156],[8.87520921911696,42.29428830686922],[8.859024483697455,42.29995020570288],[8.861675727165986,42.32811167142221],[8.819561377056067,42.317558041882876],[8.770887277733078,42.324764827713246],[8.759078812317421,42.33804006429769],[8.715164693117954,42.34731408789375],[8.68321233664994,42.348405991522625],[8.681978913121439,42.358465400722466],[8.650412807593723,42.36235593170432],[8.640801666424288,42.373436353833],[8.594967598626758,42.370442888773276],[8.573411068108614,42.38140571205032],[8.608843089791446,42.38638181068826],[8.608422093704315,42.416825413431944],[8.623443614293404,42.421015734058656],[8.655236173325635,42.41573491228313],[8.67479692494207,42.47624538852454],[8.664552800602856,42.4929949414802],[8.665497159436656,42.51362834780463],[8.696840811820111,42.52558454397895],[8.71045001223845,42.52370248684714],[8.720517193362127,42.55564630552545],[8.756417557530522,42.570659862791466],[8.760441827402945,42.55857137100389],[8.787065945635801,42.55803097954457],[8.804094980454654,42.569860341632605],[8.808932860020777,42.599055946968434],[8.87503956071919,42.61316864013493],[8.881531586278046,42.62934512068445],[8.902416916945402,42.62713736501694],[8.918133832632359,42.63690557613399],[8.94178034180466,42.63409527809801],[9.010380292350433,42.64035285104823],[9.061821349825943,42.66509048310729],[9.053801584912287,42.67995503339286],[9.085757984829678,42.714606767529766],[9.124558531022126,42.731635182878094],[9.168148283828739,42.73637983567517],[9.19805748276381,42.724981437235],[9.220663922308333,42.73560950529737],[9.293321757624451,42.67431591000078],[9.32260417864183,42.69810306283922],[9.32247464967814,42.71680913865703],[9.3451446458748,42.73666315749103],[9.337520755219344,42.765033852323455],[9.340204735886463,42.800597016108405],[9.311621298469504,42.829728091907505],[9.331968178166248,42.87026782937916],[9.322219609930274,42.899631062547094],[9.347705223407253,42.91305574845976],[9.358875948356951,42.94492748470534],[9.340869996691138,42.99446130565274],[9.359044857554936,43.006721643949774],[9.413672465126256,43.00653079400656],[9.463553614767086,42.98640316480421],[9.451876286538043,42.964357928208706],[9.466129664769332,42.9409504747163],[9.469036245492854,42.90508876257289],[9.48223146636352,42.86451840047255],[9.491086000893741,42.79496852775402],[9.47207892681302,42.7705337050651],[9.446187747709702,42.67357644963208],[9.474879109198852,42.62483253404349],[9.514827798261265,42.58472928229309],[9.527302925634157,42.566105171529315],[9.53474359181352,42.523009178263784],[9.529616852014632,42.489443970187914],[9.54134697029719,42.455927275892016],[9.543397471188387,42.428489580925785],[9.532439507617266,42.38377840928965],[9.537662619936489,42.34360270025531],[9.559720920174655,42.281366796993574],[9.552574586239787,42.23523928410182],[9.558966860048981,42.19643769306218],[9.556601094642179,42.14214728519851],[9.549983013016067,42.104163972329616],[9.530222254216497,42.08620807802025],[9.466958564261997,42.01274493764188],[9.441543252653778,41.98975134561307],[9.41378283019094,41.95570089844187],[9.415949003320323,41.927960722873955],[9.397017056900047,41.87461789997752],[9.40226832441199,41.858698242272276]]]}} ] }