Merge branch 'november' into 'master'

November 2023

See merge request gridtracker.org/gridtracker!300

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!
fix-state-keys-shapesjson v1.23.1112
T Loomis 2023-11-13 02:13:28 +00:00
commit f1dc31b192
33 zmienionych plików z 5505 dodań i 1687 usunięć

18
debian/changelog vendored
Wyświetl plik

@ -1,3 +1,21 @@
gridtracker (1.23.1112) unstable; urgency=low
- Language - Added Français and Italiano (Special thanks to HB9TIH and HB9SNR)
- Language - Added Español (Special thanks to KI2D and HI8O)
- DXCC - Renamed Macedonia to N. Macedonia
- System - Fixed 1.25m displaying as 125cm in English
- Award Tracker - Added ARRL VUCC
- BIGCTY - Update from November 3rd
- Map - Improved speed of mouse-over rendering and ordering
- Map - Grid headers show source (Logbook or Live)
- Call Roster - Fixed issue where Spot wasn't populating correctly
- Rotor - All locations can now aim on ctrl-left-click when enabled
- POTA - Left-click a park (tree) on same band/mode will generate messages in WSJT-X
- Lookup - Added OAMS user to details
- Logging - Descriptive error if QRZ.com logging failure
- Logbook Viewer - Regex enabled callsign searching
- Settings - Logbook - New "Logbook Items Per Page" slider
-- Tag Loomis <n0ttl@gridtracker.org> Sun, 12 Nov 2023 00:00:00 -0000
gridtracker (1.23.1019) unstable; urgency=low
- HTTP - Removed timeouts on transactions affecting log downloading and uploading
-- Tag Loomis <n0ttl@gridtracker.org> Thu, 19 Oct 2023 00:00:00 -0000

Wyświetl plik

@ -1,6 +1,6 @@
Name: {{{ git_name name=gridtracker }}}
Summary: GridTracker: An Amateur Radio Companion
Version: 1.23.1019
Version: 1.23.1112
Release: 1%{?dist}
BuildArch: noarch
Source0: {{{ git_dir_pack }}}
@ -40,6 +40,22 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
%license %{_docdir}/%{name}/
%changelog
* Sun Nov 12 2023 Tag Loomis <n0ttl@gridtracker.org> - 1.23.1112-1
- Language - Added Français and Italiano (Special thanks to HB9TIH and HB9SNR)
- Language - Added Español (Special thanks to KI2D and HI8O)
- DXCC - Renamed Macedonia to N. Macedonia
- System - Fixed 1.25m displaying as 125cm in English
- Award Tracker - Added ARRL VUCC
- BIGCTY - Update from November 3rd
- Map - Improved speed of mouse-over rendering and ordering
- Map - Grid headers show source (Logbook or Live)
- Call Roster - Fixed issue where Spot wasn't populating correctly
- Rotor - All locations can now aim on ctrl-left-click when enabled
- POTA - Left-click a park (tree) on same band/mode will generate messages in WSJT-X
- Lookup - Added OAMS user to details
- Logging - Descriptive error if QRZ.com logging failure
- Logbook Viewer - Regex enabled callsign searching
- Settings - Logbook - New "Logbook Items Per Page" slider
* Thu Oct 19 2023 Tag Loomis <n0ttl@gridtracker.org> - 1.23.1019-1
- HTTP - Removed timeouts on transactions affecting log downloading and uploading
* Sun Oct 15 2023 Tag Loomis <n0ttl@gridtracker.org> - 1.23.1015-1

Wyświetl plik

@ -413,7 +413,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<option data-i18n="mapFilter.band.6m" value="6m">6m</option>
<option data-i18n="mapFilter.band.4m" value="4m">4m</option>
<option data-i18n="mapFilter.band.2m" value="2m">2m</option>
<option data-i18n="mapFilter.band.125cm" value="1.25m">1.25m</option>
<option data-i18n="mapFilter.band.1_25m" value="1.25m">1.25m</option>
<option data-i18n="mapFilter.band.70cm" value="70cm">70cm</option>
<option data-i18n="mapFilter.band.33cm" value="33cm">33cm</option>
<option data-i18n="mapFilter.band.23cm" value="23cm">23cm</option>
@ -625,7 +625,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"></div>
</div>
<div id="myFlagtip" class="myFlagtipEnd"></div>
<div id="myParktip" style="
<div id="myTimezoneTip" class="myFlagtipEnd"></div>
<div id="myParktip" style="
-webkit-user-select: text;
user-select: text;
background-color: black;
@ -1200,6 +1201,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<option value="cn">简体中文</option>
<option value="cnt">繁體中文</option>
<option value="de">Deutsch</option>
<option value="fr">Français</option>
<option value="it">Italiano</option>
<option value="es">Español</option>
</select>
</td>
</tr>
@ -1607,6 +1611,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Apply Changes
</div>
</div>
<br/>
<div class="mapItem">
<table align="center">
<tr>
<td align="center">Logbook Items Per Page</td>
</tr>
<tr>
<td align="center" id="qsoItemsPerPageTd">100</td>
</tr>
<tr align="center">
<td colspan="2">
<input type="range" min="50" max="1000" value="100" step="50" class="slider" id="qsoItemsPerPageValue"
oninput="changeLogbookPage()" onmouseup="updateLogbook()" onkeyup="updateLogbook()" />
</td>
</tr>
</table>
</div>
</div>
<div id="gridSettingsDiv" class="settingsTabcontent">
<div class="mapItem" style="padding:10px;">

Wyświetl plik

@ -98,6 +98,441 @@
"sponsor": "ARRL",
"tooltip": "Fred Fish Memorial"
},
"VUCC50": {
"name": "VUCC - VHF/UHF Century Club 6m",
"rule": {
"band": [
"6m"
],
"count": [
100,
200,
300,
400,
500,
600,
700,
800,
900,
1000,
1100,
1200,
1300,
1400,
1500,
1600,
1700,
1800,
1900,
2000
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 50MHz"
},
"VUCC144": {
"name": "VUCC - VHF/UHF Century Club 2m",
"rule": {
"band": [
"2m"
],
"count": [
100,
200,
300,
400,
500,
600,
700,
800,
900,
1000,
1100,
1200,
1300,
1400,
1500,
1600,
1700,
1800,
1900,
2000
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 144MHz"
},
"VUCC222": {
"name": "VUCC - VHF/UHF Century Club 1.25m",
"rule": {
"band": [
"1.25m"
],
"count": [
50,
60,
70,
80,
90,
100,
200,
250
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 222MHz"
},
"VUCC432": {
"name": "VUCC - VHF/UHF Century Club 70cm",
"rule": {
"band": [
"70cm"
],
"count": [
50,
100,
150,
200,
250,
300
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 430MHz"
},
"VUCC902": {
"name": "VUCC - VHF/UHF Century Club 33cm",
"rule": {
"band": [
"33cm"
],
"count": [
25,
30,
35,
40,
45,
50,
55,
60,
65,
70,
75,
80,
85,
90,
95,
100
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 902MHz"
},
"VUCC1296": {
"name": "VUCC - VHF/UHF Century Club 23cm",
"rule": {
"band": [
"23cm"
],
"count": [
25,
50,
100,
150,
200,
250,
300,
350,
400
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 1296MHz"
},
"VUCC2-3G": {
"name": "VUCC - VHF/UHF Century Club 13cm",
"rule": {
"band": [
"13cm"
],
"count": [
10,
25,
50,
100,
150,
200,
250,
300
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 2.3GHz"
},
"VUCC3-3G": {
"name": "VUCC - VHF/UHF Century Club 9cm",
"rule": {
"band": [
"9cm"
],
"count": [
5,
10,
20,
30,
40,
50,
60,
70,
80,
90,
100
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 3.3GHz"
},
"VUCC5-7G": {
"name": "VUCC - VHF/UHF Century Club 5cm",
"rule": {
"band": [
"5cm"
],
"count": [
5,
10,
20,
30,
40,
50,
60,
70,
80,
90,
100
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 5.7G"
},
"VUCC10G": {
"name": "VUCC - VHF/UHF Century Club 3cm",
"rule": {
"band": [
"3cm"
],
"count": [
5,
10,
20,
30,
40,
50,
60,
70,
80,
90,
100,
110,
120,
130,
140,
150,
160,
170,
180,
190,
200
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 10GHz"
},
"VUCC24G": {
"name": "VUCC - VHF/UHF Century Club 1.2cm",
"rule": {
"band": [
"1.2cm"
],
"count": [
5,
10,
15,
20,
25,
30,
35,
40,
45,
50
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 24GHz"
},
"VUCC47G": {
"name": "VUCC - VHF/UHF Century Club 6mm",
"rule": {
"band": [
"6mm"
],
"count": [
5,
10,
15,
20,
25,
30,
35,
40,
45,
50
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 47GHz"
},
"VUCC75G": {
"name": "VUCC - VHF/UHF Century Club 4mm",
"rule": {
"band": [
"4mm"
],
"count": [
5,
10,
15,
20,
25,
30
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 75GHz"
},
"VUCC122G": {
"name": "VUCC - VHF/UHF Century Club 2.5mm",
"rule": {
"band": [
"2.5mm"
],
"count": [
5,
10,
15,
20
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 122GHz"
},
"VUCC134G": {
"name": "VUCC - VHF/UHF Century Club 2mm",
"rule": {
"band": [
"2mm"
],
"count": [
5,
10
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 134GHz"
},
"VUCC241G": {
"name": "VUCC - VHF/UHF Century Club 1mm",
"rule": {
"band": [
"1mm"
],
"count": [
5
],
"endorse": [],
"mode": [
"Mixed"
],
"type": "grids"
},
"sponsor": "ARRL",
"tooltip": "VUCC 241GHz"
},
"WAC": {
"name": "WAC - Worked All Continents",
"rule": {

Wyświetl plik

@ -19039,7 +19039,7 @@
"type":"Feature",
"properties":{
"dxcc_prefix":"Z3",
"dxcc_name":"Macedonia",
"dxcc_name":"N. Macedonia",
"dxcc_entity_code":502,
"center":[
21.667428745618047,

Wyświetl plik

@ -374,7 +374,7 @@
"497": ["Croatia", "HR", "hr.png"],
"499": ["Slovenia", "SI", "si.png"],
"501": ["Bosnia and Herzegovina", "BA", "ba.png"],
"502": ["Macedonia", "MK", "mk.png"],
"502": ["N. Macedonia", "MK", "mk.png"],
"503": ["Czech Republic", "CZ", "cz.png"],
"504": ["Slovak Republic", "SK", "sk.png"],
"505": ["Pratas Island", "TW", "tw.png"],

Wyświetl plik

@ -50,7 +50,7 @@
<div id="txrxdec" style=" background-color: Green; border-style: outset; border-color: yellow; border-width: 3px; margin: 2px;" class="roundBorder">
Waiting…
</div>
<div class="button" style="margin: 3px" onclick="window.opener.haltAllTx(true);">Halt Tx</div>
<div class="button" style="margin: 3px" onclick="window.opener.haltAllTx(true);" data-i18n="roster.haltTX">Halt Tx</div>
</div>
<div id="MoreLessControls">
@ -225,7 +225,7 @@
</div>
<div id="exceptionDiv" class="secondaryControlGroup">
<h3>Exceptions</h3>
<h3 data-i18n="roster.secondary.exceptions.label">Exceptions</h3>
<div class='columns'>
<div>
<input type="checkbox" id="cqOnly" onchange="valuesChanged();" />
@ -339,7 +339,7 @@
<input type="checkbox" id="usesOQRS" onchange="valuesChanged();" />
<label data-i18n="roster.secondary.exceptions.usesOQRS" for="usesOQRS">Uses OQRS</label>
</div>
<div id="allOnlyNewDiv">
<input type="checkbox" id="allOnlyNew" onchange="valuesChanged();" />
<label data-i18n="roster.secondary.exceptions.allOnlyNew" for="allOnlyNew">Only New Calls</label>
@ -356,9 +356,9 @@
</div>
<div>
<label title="No Decodes Containing...">
<input type="checkbox" id="noMsg" onchange="valuesChanged();" />
No &nbsp;&nbsp;
<input type="checkbox" id="noMsg" onchange="valuesChanged();" />
<label title="No Decodes Containing..." data-i18n="roster.secondary.exceptions.noMsg.label" style="padding-right: 2em;">
No
</label>
<input
type="text"
@ -373,8 +373,8 @@
</div>
<div>
<label title="Only Decodes Containing...">
<input type="checkbox" id="onlyMsg" onchange="valuesChanged();" />
<input type="checkbox" id="onlyMsg" onchange="valuesChanged();" />
<label title="Only Decodes Containing..." data-i18n="roster.secondary.exceptions.onlyMsg.label">
Only
</label>
<input
@ -390,8 +390,8 @@
</div>
<div>
<label title="Callsign Regular Expression">
<input type="checkbox" id="useRegex" onchange="valuesChanged();" />
<input type="checkbox" id="useRegex" onchange="valuesChanged();" />
<label title="Callsign Regular Expression" data-i18n="roster.secondary.exceptions.regex.label">
Regex
</label>
@ -434,7 +434,7 @@
</div>
</div>
<div id="settingsDiv" class="roundBorder" style="overflow: hidden;
<div id="settingsDiv" class="roundBorder" style="overflow: hidden;
margin: 0;
top: 10px;
left: 15%;
@ -636,4 +636,4 @@
</div>
</div>
</body>
</html>
</html>

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -83,7 +83,7 @@
"mapFilter.band.6m": "6m",
"mapFilter.band.4m": "4m",
"mapFilter.band.2m": "2m",
"mapFilter.band.125cm": "125cm",
"mapFilter.band.1_25m": "1.25m",
"mapFilter.band.70cm": "70cm",
"mapFilter.band.23cm": "23cm",
"mapFilter.band.13cm": "13cm",

Wyświetl plik

@ -83,7 +83,7 @@
"mapFilter.band.6m": "6m",
"mapFilter.band.4m": "4m",
"mapFilter.band.2m": "2m",
"mapFilter.band.125cm": "125cm",
"mapFilter.band.1_25m": "1.25m",
"mapFilter.band.70cm": "70cm",
"mapFilter.band.33cm": "33cm",
"mapFilter.band.23cm": "23cm",

Wyświetl plik

@ -82,7 +82,7 @@
"mapFilter.band.6m": "6m",
"mapFilter.band.4m": "4m",
"mapFilter.band.2m": "2m",
"mapFilter.band.125cm": "1.25m",
"mapFilter.band.1_25m": "125cm",
"mapFilter.band.70cm": "70cm",
"mapFilter.band.33cm": "33cm",
"mapFilter.band.23cm": "23cm",

Wyświetl plik

@ -325,7 +325,7 @@
"497": "Croatia",
"499": "Slovenia",
"501": "Bosnia-Herzegovina",
"502": "Macedonia",
"502": "N. Macedonia",
"503": "Czech Republic",
"504": "Slovak Republic",
"505": "Pratas I.",

Wyświetl plik

@ -82,7 +82,7 @@
"mapFilter.band.6m": "6m",
"mapFilter.band.4m": "4m",
"mapFilter.band.2m": "2m",
"mapFilter.band.125cm": "125cm",
"mapFilter.band.1_25m": "1.25m",
"mapFilter.band.70cm": "70cm",
"mapFilter.band.33cm": "33cm",
"mapFilter.band.23cm": "23cm",
@ -1073,4 +1073,4 @@
"COMMENT_sendAlerts.js": "",
"sendAlerts.scriptEnabled": "Script Enabled",
"sendAlerts.scriptDisabled": "Script Disabled"
}
}

Wyświetl plik

@ -0,0 +1,350 @@
{
"0": "Ninguno",
"1": "Canada",
"2": "Is. Abu Ali",
"3": "Afganistán",
"4": "Agalega y St. Brandon",
"5": "Is. Aland",
"6": "Alaska",
"7": "Albania",
"9": "Samoa Americana",
"10": "Is. Amsterdam y St. Paul",
"11": "Is. Andaman y Nicobar",
"12": "Anguilla",
"13": "Antarctica",
"14": "Armenia",
"15": "Rusia Asiática",
"16": "Is. Campbell",
"17": "I. Aves",
"18": "Azerbaijan",
"19": "Bajo Neuvo",
"20": "Is. Baker y Howland",
"21": "Is. Baleares",
"22": "Palau",
"24": "Bouvet",
"27": "Belarusia",
"29": "Is. Canarias",
"31": "Kiribati Central",
"32": "Ceuta y Melilla",
"33": "Is. Chagos",
"34": "Is. Chatham",
"35": "I. Christmas",
"36": "I. Clipperton",
"37": "I. Cocos",
"38": "Is. Cocos (Keeling)",
"40": "Creta",
"41": "I. Crozet",
"43": "I. Desecheo",
"45": "Dodecanese",
"46": "Malaysia del Este",
"47": "I. de Pascua",
"48": "Kiribati del Este",
"49": "Guinea Ecuatorial",
"50": "México",
"51": "Eritrea",
"52": "Estonia",
"53": "Etiopía",
"54": "Rusia Europea",
"56": "Fernando de Noronha",
"60": "Bahamas",
"61": "Franz Josef Land",
"62": "Barbados",
"63": "Guyana Francesa",
"64": "Bermuda",
"65": "Is. Virgenes Británicas",
"66": "Belize",
"69": "Is. Caimán",
"70": "Cuba",
"71": "Is. Galapagos",
"72": "República Dominicana",
"74": "El Salvador",
"75": "Georgia",
"76": "Guatemala",
"77": "Grenada",
"78": "Haiti",
"79": "Guadaloupe",
"80": "Honduras",
"82": "Jamaica",
"84": "Martinica",
"85": "Antillas Holandesas",
"86": "Nicaragua",
"88": "Panama",
"89": "Is. Turks y Caicos",
"90": "Trinidad y Tobago",
"91": "Aruba",
"94": "Antigua y Barbuda",
"95": "Dominica",
"96": "Montserrat",
"97": "Sta. Lucia",
"98": "St. Vincent",
"99": "Is. Glorioso",
"100": "Argentina",
"103": "Guam",
"104": "Bolivia",
"105": "Guantanamo",
"106": "Guernsey",
"107": "Guinea",
"108": "Brasil",
"109": "Guinea-Bissau",
"110": "Hawaii",
"111": "I. Heard",
"112": "Chile",
"114": "Isle of Man",
"116": "Colombia",
"117": "ITU HQ Ginebra",
"118": "Jan Mayen",
"120": "Ecuador",
"122": "Jersey",
"123": "I. Johnston",
"124": "I. Juan de Nova",
"125": "Is. Juan Fernandez",
"126": "Kaliningrado",
"129": "Guyana",
"130": "Kazakhstán",
"131": "Is. Kerguelen",
"132": "Paraguay",
"133": "Is. Kermadec",
"134": "Arrecife Kingman",
"135": "Kyrgyzstán",
"136": "Peru",
"137": "South Korea",
"138": "Atolón Kure",
"140": "Surinam",
"141": "Is. Falkland (Malvinas)",
"142": "Is. Lakshadweep",
"143": "Laos",
"144": "Uruguay",
"145": "Latvia",
"146": "Lithuania",
"147": "I. Lord Howe",
"148": "Venezuela",
"149": "Azores",
"150": "Australia",
"151": "I. Malyj Vysotskij",
"152": "Macao",
"153": "I. Macquarie",
"157": "Nauru",
"158": "Vanuatu",
"159": "Maldivas",
"160": "Tonga",
"161": "I. Malpelo",
"162": "Nueva Caledonia",
"163": "Papua Nueva Guinea",
"165": "Mauritius",
"166": "Is. Mariana",
"167": "Arrecife Market",
"168": "Is. Marshall",
"169": "Mayotte",
"170": "New Zealand",
"171": "Arrecife Mellish",
"172": "I. Pitcairn",
"173": "Micronesia",
"174": "I. Midway",
"175": "Polinesia Francesa",
"176": "Fiji",
"177": "Minami Torishima",
"179": "Moldova",
"180": "Monte Athos",
"181": "Mozambique",
"182": "I. Navassa",
"185": "Is. Solomon",
"187": "Niger",
"188": "Niue",
"189": "I. Norfolk",
"190": "Samoa",
"191": "Is. Cook del Norte",
"192": "Ogasawara",
"193": "Okinawa (Ryukyu Is.)",
"195": "I. Annobon",
"197": "Is. Palmyra y Jarvis",
"199": "I. Peter 1",
"201": "I. Prince Edward y Marion",
"202": "Puerto Rico",
"203": "Andorra",
"204": "Revillagigedo",
"205": "I. Ascension",
"206": "Austria",
"207": "I. Rodriguez",
"209": "Belgica",
"211": "I. Sable",
"212": "Bulgaria",
"213": "Saint Martin",
"214": "Corsega",
"215": "Chipre",
"216": "San Andres y Providencia",
"217": "San Felix",
"219": "Sao Tome y Principe",
"221": "Dinamarca",
"222": "Is. Faroe",
"223": "Inglaterra",
"224": "Finlandia",
"225": "Sardinia",
"227": "Francia",
"230": "Alemania",
"232": "Somalia",
"233": "Gibraltar",
"234": "Is. Cook del Sur",
"235": "I. Georgia del Sur",
"236": "Grecia",
"237": "Groenlandia",
"238": "Is. Orkney del Sur",
"239": "Hungía",
"240": "Is. Sandwich del Sur",
"241": "Is. Shetland del Sur",
"242": "Islandia",
"245": "Irlandia",
"246": "SMO Malta",
"247": "Is. Spratly",
"248": "Italia",
"249": "St. Kitts y Nevis",
"250": "St. Helena",
"251": "Liechtenstein",
"252": "I. St Paul",
"253": "St Peter y St Paul Rocks",
"254": "Luxemburgo",
"256": "Is. Madeira",
"257": "Malta",
"259": "Svalbard",
"260": "Monaco",
"262": "Tajikistán",
"263": "Holanda",
"265": "Irlanda del Norte",
"266": "Noruega",
"269": "Polonia",
"270": "Is. Tokelau",
"272": "Portugal",
"273": "Is. Trindade y Martim Vaz",
"274": "I. Tristán da Cunha y Gough",
"275": "Rumania",
"276": "I. Tromelin",
"277": "St Pierre y Miquelon",
"278": "San Marino",
"279": "Escocia",
"280": "Turkmenistán",
"281": "España",
"282": "Tuvalu",
"283": "SBA Chipre",
"284": "Suecia",
"285": "Is. Virgenes US",
"286": "Uganda",
"287": "Suiza",
"288": "Ucraine",
"289": "Naciones Unidas",
"291": "Estados Unidos",
"292": "Uzbekistán",
"293": "Viet Nam",
"294": "Gales",
"295": "Vaticano",
"296": "Serbia",
"297": "I. Wake",
"298": "Is. Wallis y Futuna",
"299": "West Malaysia",
"301": "Kiribati",
"302": "Sahara Occidental",
"303": "Is. Willis",
"304": "Bahrain",
"305": "Bangladesh",
"306": "Bhutan",
"308": "Costa Rica",
"309": "Burma",
"312": "Camboya",
"315": "Sri Lanka",
"318": "China",
"321": "Hong Kong",
"324": "India",
"327": "Indonesia",
"330": "Irán",
"333": "Iraq",
"336": "Israel",
"339": "Japón",
"342": "Jordania",
"344": "Corea del Norte",
"345": "Brunei",
"348": "Kuwait",
"354": "Líbano",
"363": "Mongolia",
"369": "Nepal",
"370": "Oman",
"372": "Pakistán",
"375": "Filipinas",
"376": "Qatar",
"378": "Arabia Saudita",
"379": "Seychelles",
"381": "Singapur",
"382": "Djibouti",
"384": "Siria",
"386": "Taiwan",
"387": "Tailandia",
"390": "Turquía",
"391": "Emiratos Árabes Unidos",
"400": "Algeria",
"401": "Angola",
"402": "Botswana",
"404": "Burundi",
"406": "Camerún",
"408": "República Central Africana",
"409": "Cabo Verde",
"410": "Chad",
"411": "Comoros",
"412": "Congo",
"414": "DRC",
"416": "Benín",
"420": "Gabon",
"422": "Gambia",
"424": "Ghana",
"428": "Costa de Marfil",
"430": "Kenya",
"432": "Lesotho",
"434": "Liberia",
"436": "Libía",
"438": "Madagascar",
"440": "Malawi",
"442": "Mali",
"444": "Mauritania",
"446": "Marruecos",
"450": "Nigeria",
"452": "Zimbabwe",
"453": "Is. Reunión",
"454": "Rwanda",
"456": "Senegal",
"458": "Sierra Leone",
"460": "Rotuma",
"462": "Sudáfrica",
"464": "Namibia",
"466": "Sudán",
"468": "Eswatini",
"470": "Tanzania",
"474": "Tunisia",
"478": "Egipto",
"480": "Burkina Faso",
"482": "Zambia",
"483": "Togo",
"489": "Arrecife Conway",
"490": "Is. Banaba",
"492": "Yemen",
"497": "Croacia",
"499": "Eslovenia",
"501": "Bosnia-Herzegovina",
"502": "Macedonia",
"503": "República Checa",
"504": "República Eslovaca",
"505": "I. Pratas",
"506": "Arrecife Scarborough",
"507": "Temotu",
"508": "Is. Australes y Tubuai",
"509": "Is. Marquesas",
"510": "Palestine",
"511": "Timor-Leste",
"512": "Is. Chesterfield",
"513": "I. Ducie",
"514": "Montenegro",
"515": "I. Swains",
"516": "San Barthélemy",
"517": "Curazao",
"518": "San Maarten",
"519": "Saba y San Eustatius",
"520": "Bonaire",
"521": "Sudan del Sur",
"522": "Kosovo",
"-1": "Unknown"
}

Wyświetl plik

@ -0,0 +1,149 @@
{
"AU-ACT": "Territorio Capital Australiano",
"AU-NSW": "New South Wales",
"AU-NT": "Territorio Norte",
"AU-QLD": "Queensland",
"AU-SA": "Australia Sur",
"AU-TAS": "Tasmania",
"AU-VIC": "Victoria",
"AU-WA": "Australia Oeste",
"CA-AB": "Alberta",
"CA-BC": "Columbia Británica",
"CA-MB": "Manitoba",
"CA-NB": "Nuevo Brunswick",
"CA-NL": "Newfoundland y Labrador",
"CA-NS": "Nova Scotia",
"CA-NT": "Territorios del Noreste",
"CA-NU": "Nunavut",
"CA-ON": "Ontario",
"CA-PE": "Isla de Prince Edward",
"CA-QC": "Québec",
"CA-SK": "Saskatchewan",
"CA-YT": "Yukon",
"DE-BB": "Brandenburg",
"DE-BE": "Berlin",
"DE-BW": "Baden-Württemberg",
"DE-BY": "Bayern",
"DE-HB": "Bremen",
"DE-HE": "Hessen",
"DE-HH": "Hamburg",
"DE-MV": "Mecklenburg-Vorpommern",
"DE-NI": "Niedersachsen",
"DE-NW": "Nordrhein-Westfalen",
"DE-RP": "Rheinland-Pfalz",
"DE-SH": "Schleswig-Holstein",
"DE-SL": "Saarland",
"DE-SN": "Sachsen",
"DE-ST": "Sachsen-Anhalt",
"DE-TH": "Thüringen",
"FR-A": "Alsacia",
"FR-B": "Aquitaina",
"FR-C": "Auvergne",
"FR-D": "Bourgoña",
"FR-E": "Bretaña",
"FR-F": "Centro",
"FR-G": "Champagne-Ardenne",
"FR-H": "Corsega",
"FR-I": "Franche-Comté",
"FR-J": "Île-de-France",
"FR-K": "Languedoc-Roussillon",
"FR-L": "Limousin",
"FR-M": "Lorraine",
"FR-N": "Midi-Pyrineos",
"FR-O": "Nord-Pas-de-Calais",
"FR-P": "Basse-Normandie",
"FR-Q": "Haute-Normandie",
"FR-R": "Pays de la Loire",
"FR-S": "Picardie",
"FR-T": "Poitou-Charentes",
"FR-U": "Provence-Alpes-Côte d'Azur",
"FR-V": "Rhône-Alpes",
"MX-AGU": "Aguascalientes",
"MX-BCN": "Baja California",
"MX-BCS": "Baja California Sur",
"MX-CAM": "Campeche",
"MX-CHH": "Chihuahua",
"MX-CHP": "Chiapas",
"MX-COA": "Coahuila",
"MX-COL": "Colima",
"MX-DIF": "Distrito Federal",
"MX-DUR": "Durango",
"MX-GRO": "Guerrero",
"MX-GUA": "Guanajuato",
"MX-HID": "Hidalgo",
"MX-JAL": "Jalisco",
"MX-MEX": "México",
"MX-MIC": "Michoacán",
"MX-MOR": "Morelos",
"MX-NAY": "Nayarit",
"MX-NLE": "Nuevo León",
"MX-OAX": "Oaxaca",
"MX-PUE": "Puebla",
"MX-QUE": "Querétaro",
"MX-ROO": "Quintana Roo",
"MX-SIN": "Sinaloa",
"MX-SLP": "San Luis Potosí",
"MX-SON": "Sonora",
"MX-TAB": "Tabasco",
"MX-TAM": "Tamaulipas",
"MX-TLA": "Tlaxcala",
"MX-VER": "Veracruz",
"MX-YUC": "Yucatán",
"MX-ZAC": "Zacatecas",
"US-AK": "Alaska",
"US-AL": "Alabama",
"US-AR": "Arkansas",
"US-AZ": "Arizona",
"US-CA": "California",
"US-CO": "Colorado",
"US-CT": "Connecticut",
"US-DC": "District Of Columbia",
"US-DE": "Delaware",
"US-FL": "Florida",
"US-GA": "Georgia",
"US-GU": "Guam",
"US-HI": "Hawaii",
"US-IA": "Iowa",
"US-ID": "Idaho",
"US-IL": "Illinois",
"US-IN": "Indiana",
"US-KS": "Kansas",
"US-KY": "Kentucky",
"US-LA": "Louisiana",
"US-MA": "Massachusetts",
"US-MD": "Maryland",
"US-ME": "Maine",
"US-MH": "Islas Marshall",
"US-MI": "Michigan",
"US-MN": "Minnesota",
"US-MO": "Missouri",
"US-MP": "Islas Marianas del Norte",
"US-MS": "Mississippi",
"US-MT": "Montana",
"US-NC": "North Carolina",
"US-ND": "North Dakota",
"US-NE": "Nebraska",
"US-NH": "New Hampshire",
"US-NJ": "New Jersey",
"US-NM": "New Mexico",
"US-NV": "Nevada",
"US-NY": "New York",
"US-OH": "Ohio",
"US-OK": "Oklahoma",
"US-OR": "Oregon",
"US-PA": "Pennsylvania",
"US-PR": "Puerto Rico",
"US-RI": "Rhode Island",
"US-SC": "South Carolina",
"US-SD": "South Dakota",
"US-TN": "Tennessee",
"US-TX": "Texas",
"US-UT": "Utah",
"US-VA": "Virginia",
"US-VI": "Islas Virgenes",
"US-VT": "Vermont",
"US-WA": "Washington",
"US-WI": "Wisconsin",
"US-WV": "West Virginia",
"US-WY": "Wyoming"
}

Plik diff jest za duży Load Diff

Plik diff jest za duży Load Diff

Plik diff jest za duży Load Diff

Wyświetl plik

@ -1540,6 +1540,7 @@ function getABuffer(file_url, callback, flag, mode, port, imgToGray, stringOfFla
req.on("socket", function (socket)
{
socket.setTimeout(120000);
socket.on("timeout", function ()
{
req.abort();
@ -1653,6 +1654,7 @@ function getAPostBuffer(
req.on("socket", function (socket)
{
socket.setTimeout(120000);
socket.on("timeout", function ()
{
req.abort();
@ -2546,6 +2548,8 @@ function CloudlogSendLogResult(buffer, flag)
function qrzSendLogResult(buffer, flag)
{
let error = null;
if (typeof buffer != "undefined" && buffer != null)
{
var data = String(buffer);
@ -2560,41 +2564,59 @@ function qrzSendLogResult(buffer, flag)
}
if (!("RESULT" in arrData))
{
addLastTraffic("<font style='color:red'>(Unknown Response)</font>");
addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
error = "Unknown Response";
if ("STATUS" in arrData)
{
if ("REASON" in arrData)
{
error = arrData.REASON;
}
if ("EXTENDED" in arrData && arrData.EXTENDED.length > 0)
{
error = arrData.EXTENDED;
if (arrData.EXTENDED.indexOf("outside date range") > -1)
{
error = "Logbook Date Range!";
}
}
}
}
else if (arrData.RESULT != "OK")
{
if (arrData.RESULT == "FAIL" && "REASON" in arrData)
{
addLastTraffic("<font style='color:red'>(" + arrData.REASON + ")</font>");
error = arrData.REASON;
}
else if (arrData.RESULT == "AUTH")
{
addLastTraffic("<font style='color:red'>(Invalid Auth)</font>");
error = "Invalid Auth";
}
else
{
addLastTraffic("<font style='color:red'>Unknown Result (" + arrData.RESULT + ")</font>");
error = arrData.RESULT;
}
addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
}
else
{
addLastTraffic("<font style='color:white'>Logged to QRZ.com</font>");
return;
}
}
else
{
addLastTraffic("<font style='color:red'>(Missing Response)</font>");
addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
error = "Missing Response";
}
}
else
{
addLastTraffic("<font style='color:red'>(No Response)</font>");
addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
error = "No Response";
}
if (error != null)
{
addLastTraffic("<font style='font-size: smaller; color:orange'>" + error + "</font>");
}
addLastTraffic("<font style='color:red'>Failed log to QRZ.com</font>");
}
function postDialogRetryCallback(

Wyświetl plik

@ -96,7 +96,8 @@ var def_appSettings = {
workingCallsignEnable: false,
workingCallsigns: {},
workingDateEnable: false,
workingDate: 0
workingDate: 0,
qsoItemsPerPage: 100
};
var def_mapSettings = {

Plik diff jest za duży Load Diff

Wyświetl plik

@ -472,7 +472,7 @@ function makeGtPin(obj)
}
var LL = squareToCenter(obj.grid);
obj.pin = iconFeature(ol.proj.fromLonLat([LL.o, LL.a]), GT.gtFlagIcon, 100);
obj.pin = iconFeature(ol.proj.fromLonLat([LL.o, LL.a]), GT.gtFlagIcon, 100, "gtFlag");
obj.pin.key = obj.cid;
obj.pin.isGtFlag = true;
obj.pin.size = 1;

Wyświetl plik

@ -2,7 +2,10 @@ let languages = {
en: "i18n/en.json",
cn: "i18n/cn.json",
cnt: "i18n/cn-t.json",
de: "i18n/de.json"
de: "i18n/de.json",
fr: "i18n/fr.json",
it: "i18n/it.json",
es: "i18n/es.json"
};
function loadI18n()
@ -10,6 +13,7 @@ function loadI18n()
$.i18n().load(languages).done(function ()
{
$.i18n().locale = GT.appSettings.locale;
refreshI18NStrings();
});
}

Wyświetl plik

@ -139,7 +139,7 @@ function makeParkFeatures()
var report = GT.pota.parkSpots[park][call];
if (parkObj.feature == null && validateMapBandAndMode(report.band, report.mode) && Date.now() < report.expire)
{
parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1);
parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1, "parkFlag");
parkObj.feature.key = park;
parkObj.feature.size = 22;
@ -222,6 +222,29 @@ function potaSpotFromDecode(callObj)
}
}
function leftClickPota(parkId)
{
if (parkId in GT.pota.parkSpots)
{
for (parkCaller in GT.pota.parkSpots[parkId])
{
let obj = GT.pota.parkSpots[parkId][parkCaller];
let call = obj.activator;
let grid = obj.activatorGrid;
let band = obj.band;
let mode = obj.mode;
for (let instance in GT.instances)
{
if (GT.instances[instance].valid && GT.instances[instance].status.Band == band && GT.instances[instance].status.MO == mode)
{
setCallAndGrid(call, grid, instance);
return;
}
}
}
}
}
/* function reportPotaRBN(callSpot)
{
if (Date.now() < callSpot.expire)
@ -334,7 +357,7 @@ function addParkSpotFeature(park, report)
if (parkObj.feature == null && validateMapBandAndMode(report.band, report.mode))
{
parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1);
parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1, "parkFlag");
parkObj.feature.key = park;
parkObj.feature.size = 22;
GT.layerSources.pota.addFeature(parkObj.feature);
@ -572,31 +595,18 @@ function getPotaSchedule()
GT.pota.scheduleTimeout = nodeTimers.setTimeout(getPotaSchedule, 900000);
}
GT.lastPark = null;
function mouseOverPark(feature)
{
if (GT.lastPark && GT.lastPark == feature)
{
mouseParkMove();
return;
}
GT.lastPark = feature;
if (GT.currentOverlay != 0) return false;
createParkTipTable(feature);
mouseParkMove();
mouseParkMove(feature);
myParktip.style.zIndex = 499;
myParktip.style.display = "block";
return true;
}
function mouseOutPark(mouseEvent)
{
GT.lastPark = null;
myParktip.style.zIndex = -1;
}
function mouseParkMove()
function mouseParkMove(feature)
{
var positionInfo = myParktip.getBoundingClientRect();
var windowWidth = window.innerWidth;
@ -613,6 +623,11 @@ function mouseParkMove()
myParktip.style.top = getMouseY() - positionInfo.height - 12 + "px";
}
function mouseOutPark(feature)
{
myParktip.style.zIndex = -1;
}
function createParkTipTable(toolElement)
{
var worker = "";

Wyświetl plik

@ -184,7 +184,7 @@ function processRosterFiltering(callRoster, rosterSettings)
if (CR.rosterSettings.columns.Spot == true)
{
callObj.spot = window.opener.getSpotTime(callObj.DEcall + callObj.mode + callObj.band + callObj.grid);
callObj.spot = window.opener.getSpotTime(callObj.DEcall + callObj.mode + callObj.band);
if (callObj.spot == null)
{
callObj.spot = { when: 0, snr: 0 };

Wyświetl plik

@ -43,24 +43,14 @@ function aimRotator(info)
{
const { callObj } = info
if (
GT.pstrotatorSettings.enable == true &&
GT.pstrotatorSettings.port > 0 &&
GT.pstrotatorSettings.ip.length > 4 &&
(callObj.distance > 0)
)
if (GT.pstrotatorSettings.enable == true && GT.pstrotatorSettings.port > 0 && GT.pstrotatorSettings.ip.length > 4 && callObj.distance > 0)
{
// If we have a .grid, we have a .distance and .heading, so just send the heading
let payload = `<PST><AZIMUTH>${Math.round(callObj.heading)}</AZIMUTH></PST>`;
try
{
sendUdpMessage(
payload,
payload.length,
parseInt(GT.pstrotatorSettings.port),
GT.pstrotatorSettings.ip
);
sendUdpMessage(payload, payload.length, parseInt(GT.pstrotatorSettings.port), GT.pstrotatorSettings.ip);
if (callObj.DEcall)
{
addLastTraffic(`<font style='color:white'>Aiming rotator at ${callObj.DEcall}</font>`);

Wyświetl plik

@ -64,7 +64,7 @@
*/
return {
type: "Feature",
properties: {},
properties: { prop: "shadow" },
geometry: {
type: "Polygon",
coordinates: [
@ -269,13 +269,11 @@
});
var dayNight = {
map: null,
vectorSource: null,
vectorLayer: null,
init: function (map)
{
this.map = map;
var geoJSON = new GeoJSONTerminator();
this.vectorSource = new ol.source.Vector({
@ -295,7 +293,7 @@ var dayNight = {
opacity: Number(GT.mapSettings.shadow),
zIndex: 0
});
this.map.getLayers().insertAt(1, this.vectorLayer);
map.getLayers().insertAt(1, this.vectorLayer);
},
refresh: function ()
{
@ -334,14 +332,12 @@ var dayNight = {
};
var moonLayer = {
map: null,
vectorSource: null,
vectorLayer: null,
icon: null,
pin: null,
init: function (map)
{
this.map = map;
this.icon = new ol.style.Icon({
src: "./img/luna.png",
anchorYUnits: "pixels",
@ -354,7 +350,8 @@ var moonLayer = {
this.pin = iconFeature(
ol.proj.fromLonLat(subLunar(timeNowSec()).ll),
this.icon,
0
0,
"moon"
);
this.pin.size = 99;
this.vectorSource = new ol.source.Vector({});
@ -363,7 +360,7 @@ var moonLayer = {
source: this.vectorSource,
zIndex: 30
});
this.map.getLayers().insertAt(1, this.vectorLayer);
map.getLayers().insertAt(1, this.vectorLayer);
},
future: function (now)
{
@ -409,7 +406,7 @@ var moonLayer = {
}
line = new ol.geom.LineString(line);
var feature = new ol.Feature({ geometry: line, name: "moonFlight" });
var feature = new ol.Feature({ geometry: line, prop: "moonFlight" });
feature.setStyle(
new ol.style.Style({
@ -430,7 +427,8 @@ var moonLayer = {
this.pin = iconFeature(
ol.proj.fromLonLat(subLunar(now).ll),
this.icon,
0
0,
"moon"
);
this.pin.size = 99;
this.vectorSource.addFeature(this.pin);

Wyświetl plik

@ -142,7 +142,7 @@ body.roster {
}
#RosterControls.normal #MainRosterControls {
margin-left: 160px;
margin-left: 180px;
margin-right: 100px;
display: flex;
flex-direction: row;
@ -154,7 +154,7 @@ body.roster {
position: absolute;
top: 3px;
left: 6px;
width: 160px;
width: 180px;
display: flex;
flex-direction: row;
}
@ -388,7 +388,8 @@ body.roster {
/* == Other Elements ====================================== */
#txrxdec {
width: 100px;
padding-left: 5px;
padding-right: 5px;
}
.link {
@ -410,7 +411,7 @@ table.awardTableCSS {
margin: 0;
}
table.awardTableCSS td,
table.awardTableCSS td,
table.awardTableCSS th {
border: 1px solid #888;
padding: 0px;

Wyświetl plik

@ -302,7 +302,7 @@ function flightFeature(line, opts, layer, canAnimate) {
line = new ol.geom.LineString(line);
var feature = new ol.Feature({ geometry: line, name: 'flight' });
var feature = new ol.Feature({ geometry: line, prop: 'flight' });
feature.setStyle(new ol.style.Style({
stroke: new ol.style.Stroke({ color: opts.color, width: opts.weight, lineDash: dash, lineDashOffset:dashOff}) }));

Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "GridTracker",
"product_string_do_not_use": "gridtracker",
"version": "1.23.1019",
"version": "1.23.1112",
"betaVersion": "",
"description": "GridTracker: An Amateur Radio Companion",
"author": "GridTracker.org",