kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Merge branch '124-need-to-update-ip-geolocation-fallback' into 'master'
Resolve "need to update ip-geolocation fallback" Closes #124 See merge request gridtracker.org/gridtracker!154 If this is changing anything in the UI or operational behavior, please prepare to update the wiki!merge-requests/162/merge
Matthew Chambers
commit
a03965fb92
|
|
@ -97,7 +97,7 @@ win:package:
|
||||||
eval $(ssh-agent -s)
|
eval $(ssh-agent -s)
|
||||||
echo "$NR0Q_PRIV" | tr -d '\r' | ssh-add -
|
echo "$NR0Q_PRIV" | tr -d '\r' | ssh-add -
|
||||||
mkdir -p ~/.ssh; chmod 700 ~/.ssh
|
mkdir -p ~/.ssh; chmod 700 ~/.ssh
|
||||||
scp -o StrictHostKeyChecking=no mchambers@$NR0Q_SERVER_ADDRESS:~/codecert.spc ./
|
scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT mchambers@$NR0Q_SERVER_ADDRESS:~/codecert.spc ./
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
# Making our Windows packages
|
# Making our Windows packages
|
||||||
|
|
@ -299,7 +299,7 @@ uploadtest:
|
||||||
echo "Calculating MD5 Hash for $FILE"
|
echo "Calculating MD5 Hash for $FILE"
|
||||||
md5sum $FILE > $FILE.md5
|
md5sum $FILE > $FILE.md5
|
||||||
done
|
done
|
||||||
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/ && ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "rm latest_test && ln -s $CI_COMMIT_TAG latest_test"
|
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/ && ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "rm latest_test && ln -s $CI_COMMIT_TAG latest_test"
|
||||||
|
|
||||||
# copy release assets to NR0Q's server
|
# copy release assets to NR0Q's server
|
||||||
uploadrelease:
|
uploadrelease:
|
||||||
|
|
@ -321,7 +321,7 @@ uploadrelease:
|
||||||
echo "Calculating MD5 Hash for $FILE"
|
echo "Calculating MD5 Hash for $FILE"
|
||||||
md5sum $FILE > $FILE.md5
|
md5sum $FILE > $FILE.md5
|
||||||
done
|
done
|
||||||
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/
|
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/
|
||||||
|
|
||||||
# this only creates a "source code release" -- gitlab doesn't specify binaries
|
# this only creates a "source code release" -- gitlab doesn't specify binaries
|
||||||
# except as links to external storage, which is suboptimal for now
|
# except as links to external storage, which is suboptimal for now
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,9 @@
|
||||||
|
// FIXME ****************************************************************************** //
|
||||||
|
// The datepicker's "Time" section doesn't work. This really needs to be fixed before
|
||||||
|
// the next big RTTY Roundup or Field Day where there may be a lot of hams that want
|
||||||
|
// to use this feature to only reference their log starting when the contest starts.
|
||||||
|
// Which isn't always 00:00 UTC.
|
||||||
|
// ************************************************************************************ //
|
||||||
var picker = {
|
var picker = {
|
||||||
attach: function (opt)
|
attach: function (opt)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,266 +1,266 @@
|
||||||
var validSettings = [
|
var validSettings = [
|
||||||
"HRDLogbookLogSettings",
|
"HRDLogbookLogSettings",
|
||||||
"N1MMSettings",
|
"N1MMSettings",
|
||||||
"acLogSettings",
|
"acLogSettings",
|
||||||
"adifLogSettings",
|
"adifLogSettings",
|
||||||
"alertSettings",
|
"alertSettings",
|
||||||
"appSettings",
|
"appSettings",
|
||||||
"audioSettings",
|
"audioSettings",
|
||||||
"awardTracker",
|
"awardTracker",
|
||||||
"bandActivity",
|
"bandActivity",
|
||||||
"blockedCQ",
|
"blockedCQ",
|
||||||
"blockedCalls",
|
"blockedCalls",
|
||||||
"blockedDxcc",
|
"blockedDxcc",
|
||||||
"callsignLookups",
|
"callsignLookups",
|
||||||
"classicAlerts",
|
"classicAlerts",
|
||||||
"classicAlertsVersion",
|
"classicAlertsVersion",
|
||||||
"currentVersion",
|
"currentVersion",
|
||||||
"dxkLogSettings",
|
"dxkLogSettings",
|
||||||
"log4OMSettings",
|
"log4OMSettings",
|
||||||
"mapMemory",
|
"mapMemory",
|
||||||
"mapSettings",
|
"mapSettings",
|
||||||
"msgSettings",
|
"msgSettings",
|
||||||
"receptionSettings",
|
"receptionSettings",
|
||||||
"rosterSettings",
|
"rosterSettings",
|
||||||
"savedAlerts",
|
"savedAlerts",
|
||||||
"speechSettings",
|
"speechSettings",
|
||||||
"startupLogs",
|
"startupLogs",
|
||||||
"trustedQslSettings",
|
"trustedQslSettings",
|
||||||
"screenSettings",
|
"screenSettings",
|
||||||
"legendColors"
|
"legendColors"
|
||||||
];
|
];
|
||||||
|
|
||||||
var def_appSettings = {
|
var def_appSettings = {
|
||||||
alertMute: 0,
|
alertMute: 0,
|
||||||
rosterAlwaysOnTop: false,
|
rosterAlwaysOnTop: false,
|
||||||
centerGridsquare: "",
|
centerGridsquare: "",
|
||||||
chatUUID: "",
|
chatUUID: "",
|
||||||
crScript: 0,
|
crScript: 0,
|
||||||
distanceUnit: "MI",
|
distanceUnit: "MI",
|
||||||
earthImgSrc: 0,
|
earthImgSrc: 0,
|
||||||
gridViewMode: 3,
|
gridViewMode: 3,
|
||||||
gridsquareDecayTime: 300,
|
gridsquareDecayTime: 300,
|
||||||
gtAgree: "",
|
gtAgree: "",
|
||||||
gtBandFilter: "",
|
gtBandFilter: "",
|
||||||
gtFlagImgSrc: 0,
|
gtFlagImgSrc: 0,
|
||||||
gtModeFilter: "",
|
gtModeFilter: "",
|
||||||
gtPropFilter: "mixed",
|
gtPropFilter: "mixed",
|
||||||
gtMsgEnable: true,
|
gtMsgEnable: true,
|
||||||
gtShareEnable: true,
|
gtShareEnable: true,
|
||||||
heatEnabled: 0,
|
heatEnabled: 0,
|
||||||
loadAdifAtStartup: false,
|
loadAdifAtStartup: false,
|
||||||
lookupLoginCq: "",
|
lookupLoginCq: "",
|
||||||
lookupLoginQrz: "",
|
lookupLoginQrz: "",
|
||||||
lookupLoginQth: "",
|
lookupLoginQth: "",
|
||||||
lookupOnTx: false,
|
lookupOnTx: false,
|
||||||
lookupCloseLog: false,
|
lookupCloseLog: false,
|
||||||
lookupMerge: true,
|
lookupMerge: true,
|
||||||
lookupMissingGrid: false,
|
lookupMissingGrid: false,
|
||||||
lookupPasswordCq: "",
|
lookupPasswordCq: "",
|
||||||
lookupPasswordQrz: "",
|
lookupPasswordQrz: "",
|
||||||
lookupPasswordQth: "",
|
lookupPasswordQth: "",
|
||||||
lookupService: "CALLOOK",
|
lookupService: "CALLOOK",
|
||||||
lookupCallookPreferred: false,
|
lookupCallookPreferred: false,
|
||||||
clearRosterOnBandChange: false,
|
clearRosterOnBandChange: false,
|
||||||
moonPath: 0,
|
moonPath: 0,
|
||||||
moonTrack: 0,
|
moonTrack: 0,
|
||||||
mouseTrack: 0,
|
mouseTrack: 0,
|
||||||
multicast: false,
|
multicast: false,
|
||||||
myBand: "OOB",
|
myBand: "OOB",
|
||||||
myDEGrid: "",
|
myDEGrid: "",
|
||||||
myDEcall: "NOCALL",
|
myDEcall: "NOCALL",
|
||||||
myMode: "",
|
myMode: "",
|
||||||
myRawCall: "NOCALL",
|
myRawCall: "NOCALL",
|
||||||
myRawFreq: "",
|
myRawFreq: "",
|
||||||
myRawGrid: "",
|
myRawGrid: "",
|
||||||
pathWidthWeight: 1.0,
|
pathWidthWeight: 1.0,
|
||||||
pushPinMode: false,
|
pushPinMode: false,
|
||||||
qrzPathWidthWeight: 1.2,
|
qrzPathWidthWeight: 1.2,
|
||||||
sixWideMode: 0,
|
sixWideMode: 0,
|
||||||
savedAppData: null,
|
savedAppData: null,
|
||||||
soundCard: "default",
|
soundCard: "default",
|
||||||
spotsEnabled: 0,
|
spotsEnabled: 0,
|
||||||
stopAskingVersion: false,
|
stopAskingVersion: false,
|
||||||
useLocalTime: 0,
|
useLocalTime: 0,
|
||||||
wsjtForwardUdpEnable: false,
|
wsjtForwardUdpEnable: false,
|
||||||
wsjtForwardUdpIp: "127.0.0.1",
|
wsjtForwardUdpIp: "127.0.0.1",
|
||||||
wsjtForwardUdpPort: 2238,
|
wsjtForwardUdpPort: 2238,
|
||||||
wsjtIP: "",
|
wsjtIP: "",
|
||||||
wsjtUdpPort: 0,
|
wsjtUdpPort: 0,
|
||||||
workingCallsignEnable: false,
|
workingCallsignEnable: false,
|
||||||
workingCallsigns: {},
|
workingCallsigns: {},
|
||||||
workingDateEnable: false,
|
workingDateEnable: false,
|
||||||
workingDate: 0,
|
workingDate: 0,
|
||||||
gtSpotEnable: true
|
gtSpotEnable: true
|
||||||
};
|
};
|
||||||
|
|
||||||
var def_mapSettings = {
|
var def_mapSettings = {
|
||||||
animate: true,
|
animate: true,
|
||||||
animateSpeed: 4,
|
animateSpeed: 4,
|
||||||
CQhilite: true,
|
CQhilite: true,
|
||||||
fitQRZ: false,
|
fitQRZ: false,
|
||||||
focusRig: true,
|
focusRig: true,
|
||||||
gridAlpha: 136,
|
gridAlpha: 136,
|
||||||
haltAllOnTx: true,
|
haltAllOnTx: true,
|
||||||
legend: true,
|
legend: true,
|
||||||
longitude: 0.0,
|
longitude: 0.0,
|
||||||
latitude: 0.0,
|
latitude: 0.0,
|
||||||
loudness: 1,
|
loudness: 1,
|
||||||
mapIndex: 19,
|
mapIndex: 19,
|
||||||
mergeOverlay: false,
|
mergeOverlay: false,
|
||||||
mouseOver: true,
|
mouseOver: true,
|
||||||
nightLoudness: 0.8,
|
nightLoudness: 0.8,
|
||||||
nightMapEnable: false,
|
nightMapEnable: false,
|
||||||
nightMapIndex: 20,
|
nightMapIndex: 20,
|
||||||
nightPathColor: 361,
|
nightPathColor: 361,
|
||||||
nightQrzPathColor: 1,
|
nightQrzPathColor: 1,
|
||||||
offlineMode: false,
|
offlineMode: false,
|
||||||
pathColor: 0,
|
pathColor: 0,
|
||||||
qrzDxccFallback: false,
|
qrzDxccFallback: false,
|
||||||
qrzPathColor: 1,
|
qrzPathColor: 1,
|
||||||
rosterTime: 120,
|
rosterTime: 120,
|
||||||
shadow: 0.1,
|
shadow: 0.1,
|
||||||
splitQSL: true,
|
splitQSL: true,
|
||||||
strikes: false,
|
strikes: false,
|
||||||
strikesAlert: 2,
|
strikesAlert: 2,
|
||||||
strikesGlobal: false,
|
strikesGlobal: false,
|
||||||
strikesNotify: false,
|
strikesNotify: false,
|
||||||
trafficDecode: true,
|
trafficDecode: true,
|
||||||
usNexrad: false,
|
usNexrad: false,
|
||||||
zoom: 4,
|
zoom: 4,
|
||||||
mapTrans: 0.5
|
mapTrans: 0.5
|
||||||
};
|
};
|
||||||
|
|
||||||
var def_adifLogSettings = {
|
var def_adifLogSettings = {
|
||||||
menu: {
|
menu: {
|
||||||
buttonAdifCheckBox: false,
|
buttonAdifCheckBox: false,
|
||||||
buttonClubCheckBox: false,
|
buttonClubCheckBox: false,
|
||||||
buttonLOTWCheckBox: false,
|
buttonLOTWCheckBox: false,
|
||||||
buttonQRZCheckBox: false,
|
buttonQRZCheckBox: false,
|
||||||
buttonPsk24CheckBox: true
|
buttonPsk24CheckBox: true
|
||||||
},
|
},
|
||||||
startup: {
|
startup: {
|
||||||
loadAdifCheckBox: false,
|
loadAdifCheckBox: false,
|
||||||
loadPsk24CheckBox: false,
|
loadPsk24CheckBox: false,
|
||||||
loadQRZCheckBox: false,
|
loadQRZCheckBox: false,
|
||||||
loadLOTWCheckBox: false,
|
loadLOTWCheckBox: false,
|
||||||
loadClubCheckBox: false,
|
loadClubCheckBox: false,
|
||||||
loadGTCheckBox: true
|
loadGTCheckBox: true
|
||||||
},
|
},
|
||||||
qsolog: {
|
qsolog: {
|
||||||
logQRZqsoCheckBox: false,
|
logQRZqsoCheckBox: false,
|
||||||
logGTqsoCheckBox: true,
|
logGTqsoCheckBox: true,
|
||||||
logLOTWqsoCheckBox: false,
|
logLOTWqsoCheckBox: false,
|
||||||
logHRDLOGqsoCheckBox: false,
|
logHRDLOGqsoCheckBox: false,
|
||||||
logClubqsoCheckBox: false,
|
logClubqsoCheckBox: false,
|
||||||
logCloudlogQSOCheckBox: false,
|
logCloudlogQSOCheckBox: false,
|
||||||
logeQSLQSOCheckBox: false
|
logeQSLQSOCheckBox: false
|
||||||
},
|
},
|
||||||
nickname: {
|
nickname: {
|
||||||
nicknameeQSLCheckBox: false
|
nicknameeQSLCheckBox: false
|
||||||
},
|
},
|
||||||
text: {
|
text: {
|
||||||
lotwLogin: "",
|
lotwLogin: "",
|
||||||
clubCall: "",
|
clubCall: "",
|
||||||
clubEmail: "",
|
clubEmail: "",
|
||||||
clubPassword: "",
|
clubPassword: "",
|
||||||
lotwPassword: "",
|
lotwPassword: "",
|
||||||
lotwTrusted: "",
|
lotwTrusted: "",
|
||||||
lotwStation: "",
|
lotwStation: "",
|
||||||
qrzApiKey: "",
|
qrzApiKey: "",
|
||||||
HRDLOGCallsign: "",
|
HRDLOGCallsign: "",
|
||||||
HRDLOGUploadCode: "",
|
HRDLOGUploadCode: "",
|
||||||
CloudlogURL: "http://127.0.0.1/index.php/api/qso",
|
CloudlogURL: "http://127.0.0.1/index.php/api/qso",
|
||||||
CloudlogAPI: "",
|
CloudlogAPI: "",
|
||||||
eQSLUser: "",
|
eQSLUser: "",
|
||||||
eQSLPassword: "",
|
eQSLPassword: "",
|
||||||
eQSLNickname: ""
|
eQSLNickname: ""
|
||||||
},
|
},
|
||||||
downloads: {},
|
downloads: {},
|
||||||
lastFetch: {
|
lastFetch: {
|
||||||
lotw_qso: "1970-01-01",
|
lotw_qso: "1970-01-01",
|
||||||
lotw_qsl: "1970-01-01"
|
lotw_qsl: "1970-01-01"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var def_msgSettings = {
|
var def_msgSettings = {
|
||||||
msgAlertSelect: 1,
|
msgAlertSelect: 1,
|
||||||
msgAlertWord: "New chat message",
|
msgAlertWord: "New chat message",
|
||||||
msgAlertMedia: "none",
|
msgAlertMedia: "none",
|
||||||
msgFrequencySelect: 0,
|
msgFrequencySelect: 0,
|
||||||
msgActionSelect: 1,
|
msgActionSelect: 1,
|
||||||
msgAwaySelect: 0,
|
msgAwaySelect: 0,
|
||||||
msgAwayText: "I am away from the shack at the moment"
|
msgAwayText: "I am away from the shack at the moment"
|
||||||
};
|
};
|
||||||
|
|
||||||
var def_receptionSettings = {
|
var def_receptionSettings = {
|
||||||
lastSequenceNumber: "0", // Treat as a string, it's friggin big
|
lastSequenceNumber: "0", // Treat as a string, it's friggin big
|
||||||
lastDownloadTimeSec: 0,
|
lastDownloadTimeSec: 0,
|
||||||
viewHistoryTimeSec: 900,
|
viewHistoryTimeSec: 900,
|
||||||
viewPaths: false,
|
viewPaths: false,
|
||||||
pathColor: -1,
|
pathColor: -1,
|
||||||
pathNightColor: 361,
|
pathNightColor: 361,
|
||||||
spotWidth: 0.8,
|
spotWidth: 0.8,
|
||||||
mergeSpots: true
|
mergeSpots: true
|
||||||
};
|
};
|
||||||
|
|
||||||
var def_N1MMSettings = {
|
var def_N1MMSettings = {
|
||||||
enable: false,
|
enable: false,
|
||||||
port: 2333,
|
port: 2333,
|
||||||
ip: "127.0.0.1"
|
ip: "127.0.0.1"
|
||||||
};
|
};
|
||||||
var def_log4OMSettings = {
|
var def_log4OMSettings = {
|
||||||
enable: false,
|
enable: false,
|
||||||
port: 2236,
|
port: 2236,
|
||||||
ip: "127.0.0.1"
|
ip: "127.0.0.1"
|
||||||
};
|
};
|
||||||
var def_dxkLogSettings = {
|
var def_dxkLogSettings = {
|
||||||
enable: false,
|
enable: false,
|
||||||
port: 52000,
|
port: 52000,
|
||||||
ip: "127.0.0.1"
|
ip: "127.0.0.1"
|
||||||
};
|
};
|
||||||
var def_HRDLogbookLogSettings = {
|
var def_HRDLogbookLogSettings = {
|
||||||
enable: false,
|
enable: false,
|
||||||
port: 7826,
|
port: 7826,
|
||||||
ip: "127.0.0.1"
|
ip: "127.0.0.1"
|
||||||
};
|
};
|
||||||
var def_acLogSettings = {
|
var def_acLogSettings = {
|
||||||
enable: false,
|
enable: false,
|
||||||
port: 1100,
|
port: 1100,
|
||||||
ip: "127.0.0.1"
|
ip: "127.0.0.1"
|
||||||
};
|
};
|
||||||
var def_trustedQslSettings = {
|
var def_trustedQslSettings = {
|
||||||
stationFile: "",
|
stationFile: "",
|
||||||
stationFileValid: false,
|
stationFileValid: false,
|
||||||
binaryFile: "",
|
binaryFile: "",
|
||||||
binaryFileValid: false
|
binaryFileValid: false
|
||||||
};
|
};
|
||||||
var def_callsignLookups = {
|
var def_callsignLookups = {
|
||||||
lotwUseEnable: true,
|
lotwUseEnable: true,
|
||||||
lotwWeeklyEnable: true,
|
lotwWeeklyEnable: true,
|
||||||
lotwLastUpdate: 0,
|
lotwLastUpdate: 0,
|
||||||
eqslUseEnable: true,
|
eqslUseEnable: true,
|
||||||
eqslWeeklyEnable: true,
|
eqslWeeklyEnable: true,
|
||||||
eqslLastUpdate: 0,
|
eqslLastUpdate: 0,
|
||||||
ulsUseEnable: true,
|
ulsUseEnable: true,
|
||||||
ulsWeeklyEnable: true,
|
ulsWeeklyEnable: true,
|
||||||
ulsLastUpdate: 0,
|
ulsLastUpdate: 0,
|
||||||
oqrsUseEnable: false,
|
oqrsUseEnable: false,
|
||||||
oqrsWeeklyEnable: false,
|
oqrsWeeklyEnable: false,
|
||||||
oqrsLastUpdate: 0
|
oqrsLastUpdate: 0
|
||||||
};
|
};
|
||||||
|
|
||||||
var def_bandActivity = {
|
var def_bandActivity = {
|
||||||
lastUpdate: {},
|
lastUpdate: {},
|
||||||
lines: {}
|
lines: {}
|
||||||
};
|
};
|
||||||
|
|
||||||
var def_legendColors = {
|
var def_legendColors = {
|
||||||
QSO: "#EEEE00",
|
QSO: "#EEEE00",
|
||||||
QSL: "#EE0000",
|
QSL: "#EE0000",
|
||||||
QSX: "#1111EE",
|
QSX: "#1111EE",
|
||||||
CQ: "#00FF00",
|
CQ: "#00FF00",
|
||||||
CQDX: "#00FFFF",
|
CQDX: "#00FFFF",
|
||||||
QRZ: "#FFFF00",
|
QRZ: "#FFFF00",
|
||||||
QTH: "#FFA600"
|
QTH: "#FFA600"
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -10070,7 +10070,7 @@ function renderStatsBox()
|
||||||
worker +=
|
worker +=
|
||||||
"<br/> In Section: " +
|
"<br/> In Section: " +
|
||||||
scoreSection +
|
scoreSection +
|
||||||
"<br/>Error Generating Stats<br/>Please take a screenshot and send to gridtracker@gmail.com";
|
"<br/>Error Generating Stats<br/>Please take a screenshot and send to team@gridtracker.org";
|
||||||
}
|
}
|
||||||
|
|
||||||
setStatsDiv("statViewDiv", worker);
|
setStatsDiv("statViewDiv", worker);
|
||||||
|
|
@ -11305,7 +11305,13 @@ function pskBandActivityCallback(buffer, flag)
|
||||||
|
|
||||||
renderBandActivity();
|
renderBandActivity();
|
||||||
}
|
}
|
||||||
|
/* FIXME ******************************************************************************
|
||||||
|
Should we somewhere in settings, have a checkbox to enable / disable PSK spots
|
||||||
|
specifically? We can disable the overall spots, both PSK and OAMS, and OAMS has a
|
||||||
|
checkbox in the OAMS tab. I'm thinking for the situation where I only want to
|
||||||
|
pull in OAMS spots and not PSK reporter's spots.
|
||||||
|
************************************************************************************
|
||||||
|
*/
|
||||||
function pskGetBandActivity()
|
function pskGetBandActivity()
|
||||||
{
|
{
|
||||||
if (g_mapSettings.offlineMode == true) return;
|
if (g_mapSettings.offlineMode == true) return;
|
||||||
|
|
@ -11569,14 +11575,7 @@ function updateBasedOnIni()
|
||||||
{
|
{
|
||||||
if (typeof nw != "undefined")
|
if (typeof nw != "undefined")
|
||||||
{
|
{
|
||||||
// lets see if we can find our location the hard way
|
alert("Location not available!\nEither start WSJT-X/JTDX or enter your grid square in the settings ");
|
||||||
getBuffer(
|
|
||||||
"https://api.ipstack.com/check?access_key=8c9233ec1c09861a707951ab3718a7f6&format=1",
|
|
||||||
ipLocation,
|
|
||||||
null,
|
|
||||||
"https",
|
|
||||||
443
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -12054,27 +12053,6 @@ function selectElementContents(el)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function ipLocation(buffer, flag)
|
|
||||||
{
|
|
||||||
var obj = JSON.parse(buffer);
|
|
||||||
if (
|
|
||||||
typeof obj != "undefined" &&
|
|
||||||
obj != null &&
|
|
||||||
typeof obj.latitude != "undefined"
|
|
||||||
)
|
|
||||||
{
|
|
||||||
g_appSettings.centerGridsquare = latLonToGridSquare(
|
|
||||||
obj.latitude,
|
|
||||||
obj.longitude
|
|
||||||
).substr(0, 6);
|
|
||||||
if (g_appSettings.centerGridsquare.length > 0)
|
|
||||||
{
|
|
||||||
homeQTHInput.value = g_appSettings.centerGridsquare;
|
|
||||||
if (ValidateGridsquare(homeQTHInput, null)) setCenterGridsquare();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function popupNewWindows()
|
function popupNewWindows()
|
||||||
{
|
{
|
||||||
if (typeof nw != "undefined")
|
if (typeof nw != "undefined")
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue