diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 899df82..a164fe3 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -528,15 +528,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- -
+
+ +
@@ -550,11 +550,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -
- +
+
-
- +
+ +
+
+ +
+
+
@@ -577,14 +583,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. title="Reload Local ADIF Files">
-
- -
-
- -
-
- +
+
@@ -592,9 +592,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- -
-
- - - - - - - -
Lightning Strike - Audio Alert
- -
-

diff --git a/package.nw/gt_chat.html b/package.nw/gt_chat.html index 2be00c7..4875181 100644 --- a/package.nw/gt_chat.html +++ b/package.nw/gt_chat.html @@ -478,9 +478,8 @@ var who = "" + who.formatCallsign() + ""; var time = "" + window.opener.userTimeString(when) + ""; var worker = who + " " + time + "
"; - var newMsg = msg.replace(new RegExp("\r?\n", "g"), "
"); - var msgTextClass = containsDoubleByte(newMsg) ? "msgTextUnicode" : "msgText"; - worker += "" + newMsg.linkify() + "
"; + var msgTextClass = containsDoubleByte(msg) ? "msgTextUnicode" : "msgText"; + worker += "" + msg.linkify() + "
"; return worker; } @@ -672,7 +671,7 @@
/ / / / /
-
+
diff --git a/package.nw/gt_print.html b/package.nw/gt_print.html deleted file mode 100644 index 1c4d773..0000000 --- a/package.nw/gt_print.html +++ /dev/null @@ -1,178 +0,0 @@ - - - - GridTracker - Print - - - - - -
-

GridTracker

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Hot Key List
KeyActionCondition
COpen Conditions Windows
GToggle GridTracker Flags
IOpen Stats/Info
LOpen ADIF file
MToggle Audio Mute
NToggle Earth Shadow
PToggle Grid/PushPin Mode
QCycle QSO/LIVE view
ROpen Call Roster Window
SOpen Settings
WToggle Maidenhead Grid Size
1Show General Map Layer
2Show CQ Zones Award Layer
3Show ITU Zones Award Layer
4Show Continents Award Layer
5Show US States Award Layer
6Show DXCC Award Layer
7Show US Counties Award Layer
MAdd MapCenter Alertright-click
empty grid
TAdd TTS Alertright-click
empty grid
VAdd PopUp Alertright-click
empty grid
F1Hot Key List
-
-
- - diff --git a/package.nw/i18n/cn-t.json b/package.nw/i18n/cn-t.json index 12aa2e4..3f57f32 100644 --- a/package.nw/i18n/cn-t.json +++ b/package.nw/i18n/cn-t.json @@ -138,7 +138,7 @@ "controlPanel.Share.hover": "讓其他GridTracker用戶看到您的在線狀態", "controlPanel.Help.hover": "打開熱鍵清單(F1)", "controlPanel.Trophy.hover": "循環顯示獎狀圖層(=)", - "controlPanel.Lightening.hover": "顯示全球閃電實時狀態(Y)", + "controlPanel.Moon.hover": "顯示月球位置(D)", "controlPanel.MaidenheadWidth.hover": "切換梅登黑德網格位數(W)", "controlPanel.Settings.hover": "設定(S)", @@ -228,12 +228,6 @@ "settings.audio.Speech.Phonetics.hover": "以語音方式播出呼號和網格", "settings.audio.Device.label": "音頻播放設備", "settings.audio.File.Volume.label": "音頻檔案音量", - "settings.audio.lighteningAlert.label": "雷擊音頻警報", - "settings.audio.lighteningAlert.hover": "如果有雷擊報警,則發出雷擊音頻警報!", - "settings.audio.lighteningAlert.none": "無", - "settings.audio.lighteningAlert.short": "短", - "settings.audio.lighteningAlert.long": "長", - "settings.audio.lighteningAlert.voice": "聲音", "settings.audio.QSOLogEventFile.label": "QSO日志記錄通知音頻", "settings.logbook.callsigns.hover": "QSO日志以僅包含這些呼號的數據（逗號分隔）", "settings.logbook.callsigns.label": "過濾通聯呼號", @@ -775,18 +769,11 @@ "gt.gridTable.Azim": "角度", "gt.gridTable.Lat": "緯度", "gt.gridTable.Long": "經度", - "gt.LighteningStrike.disclaimer": "閃電雷擊檢測由 Blitzortung.org 提供\n我們對可能造成損害的誤擊不承擔責任.\n請務必向當地氣象服務機構査詢準確數據.", "gt.UpdateCount.ClearLog": "清除日誌", "gt.UpdateCount.LoadLog": "載入日誌", "gt.CurrentBandMode.Band": "混合波段", "gt.CurrentBandMode.Mode": "混合模式", "gt.currentTime.never": "從未", - "gt.LighteningStrike.Global": "全球閃電", - "gt.LighteningStrike.Changed": "雷擊距離發生變化", - "gt.LighteningStrike.Disabled": "檢測未啟用!", - "gt.LighteningStrike.Detected": "檢測到雷擊!", - "gt.LighteningStrike.Distance": "距離:", - "gt.LighteningStrike.Bearing": "角度:", "gt.WSJTMessage.Generated": "產生信息", "gt.WSJTMessage.TransmitEnable": "發射已啟用!", "gt.WSJTMessage.Decode": "解碼", diff --git a/package.nw/i18n/cn.json b/package.nw/i18n/cn.json index 7c284d5..f5b22c8 100644 --- a/package.nw/i18n/cn.json +++ b/package.nw/i18n/cn.json @@ -138,7 +138,6 @@ "controlPanel.Share.hover": "让其他GridTracker用户看到您的在线状态", "controlPanel.Help.hover": "打开热键清单(F1)", "controlPanel.Trophy.hover": "循环显示奖状图层(=)", - "controlPanel.Lightening.hover": "显示全球闪电实时状态(Y)", "controlPanel.Moon.hover": "显示月球位置(D)", "controlPanel.MaidenheadWidth.hover": "切换梅登黑德网格位数(W)", "controlPanel.Settings.hover": "设置(S)", @@ -228,12 +227,6 @@ "settings.audio.Speech.Phonetics.hover": "以语音方式播出呼号和网格", "settings.audio.Device.label": "音频播放设备", "settings.audio.File.Volume.label": "音频文件音量", - "settings.audio.lighteningAlert.label": "雷击音频警报", - "settings.audio.lighteningAlert.hover": "如果有雷击报警,则发出雷击音频警报!", - "settings.audio.lighteningAlert.none": "无", - "settings.audio.lighteningAlert.short": "短", - "settings.audio.lighteningAlert.long": "长", - "settings.audio.lighteningAlert.voice": "声音", "settings.audio.QSOLogEventFile.label": "QSO日志记录通知音频", "settings.logbook.callsigns.hover": "QSO日志以仅包含这些呼号的数据（逗号分隔）", "settings.logbook.callsigns.label": "过滤通联呼号", @@ -775,18 +768,11 @@ "gt.gridTable.Azim": "方位角", "gt.gridTable.Lat": "纬度", "gt.gridTable.Long": "经度", - "gt.LighteningStrike.disclaimer": "开启雷电提示", "gt.UpdateCount.ClearLog": "清除日志", "gt.UpdateCount.LoadLog": "载入日志", "gt.CurrentBandMode.Band": "混合波段", "gt.CurrentBandMode.Mode": "混合模式", "gt.currentTime.never": "从不", - "gt.LighteningStrike.Global": "全球雷击", - "gt.LighteningStrike.Changed": "累计距离改变", - "gt.LighteningStrike.Disabled": "未启用检测！!", - "gt.LighteningStrike.Detected": "检测到雷击!", - "gt.LighteningStrike.Distance": "距离:", - "gt.LighteningStrike.Bearing": "影响:", "gt.WSJTMessage.Generated": "生成消息(JTDX无效)", "gt.WSJTMessage.TransmitEnable": "开启发射!", "gt.WSJTMessage.Decode": "解码", diff --git a/package.nw/i18n/en.json b/package.nw/i18n/en.json index 21c753f..9c61e42 100644 --- a/package.nw/i18n/en.json +++ b/package.nw/i18n/en.json @@ -137,7 +137,6 @@ "controlPanel.Share.hover": "Share your On-Air Status with other GridTracker users", "controlPanel.Help.hover": "Toggle Hotkey List", "controlPanel.Trophy.hover": "Cycle Award Overlays", - "controlPanel.Lightening.hover": "Toggle Lightening Strikes", "controlPanel.Moon.hover": "Toggle Moon", "controlPanel.MaidenheadWidth.hover": "Toggle Maidenhead Width", "controlPanel.Settings.hover": "Toggle Settings Window", @@ -227,12 +226,6 @@ "settings.audio.Speech.Phonetics.hover": "Speak Callsigns and Gridsquares phonetically", "settings.audio.Device.label": "Audio Device", "settings.audio.File.Volume.label": "File Audio Volume", - "settings.audio.lighteningAlert.label": "Lightening Strike Audio Alert", - "settings.audio.lighteningAlert.hover": "Lightening Strike Audio Alert", - "settings.audio.lighteningAlert.none": "None", - "settings.audio.lighteningAlert.short": "Short", - "settings.audio.lighteningAlert.long": "Long", - "settings.audio.lighteningAlert.voice": "Voice", "settings.audio.QSOLogEventFile.label": "QSO Log Event Notification", "settings.logbook.callsigns.hover": "Filter Logbook QSOs to include these Callsigns only (comma seperated)", "settings.logbook.callsigns.label": "Working Callsign(s)", @@ -775,18 +768,12 @@ "gt.gridTable.Azim": "Azim", "gt.gridTable.Lat": "Lat", "gt.gridTable.Long": "Long", - "gt.LighteningStrike.disclaimer": "Lighting Strike Detection is provided by Blitzortung.org\nWe are not responsible for missed strikes that could result in damage.\nBe sure to check your local weather providers for accurate data.", "gt.UpdateCount.ClearLog": "Clear Log", "gt.UpdateCount.LoadLog": "Load Logs", "gt.CurrentBandMode.Band": "Mixed Bands", "gt.CurrentBandMode.Mode": "Mixed Modes", "gt.currentTime.never": "Never", - "gt.LighteningStrike.Global": "Global Strikes", - "gt.LighteningStrike.Changed": "Strike Distance Chagned", - "gt.LighteningStrike.Disabled": "Detection is not enabled!", - "gt.LighteningStrike.Detected": "Lighting Strike Detected!", - "gt.LighteningStrike.Distance": "Distance:", - "gt.LighteningStrike.Bearing": "Bearing:", + "gt.WSJTMessage.Generated": "Generated Msgs", "gt.WSJTMessage.TransmitEnable": "Transmit Enabled!", "gt.WSJTMessage.Decode": "DECODE", diff --git a/package.nw/img/flag_on_freq.png b/package.nw/img/flag_on_freq.png deleted file mode 100644 index 8c3fae8..0000000 Binary files a/package.nw/img/flag_on_freq.png and /dev/null differ diff --git a/package.nw/img/heat.png b/package.nw/img/heat.png new file mode 100644 index 0000000..106b02d Binary files /dev/null and b/package.nw/img/heat.png differ diff --git a/package.nw/img/l0.png b/package.nw/img/l0.png deleted file mode 100644 index 89d7b19..0000000 Binary files a/package.nw/img/l0.png and /dev/null differ diff --git a/package.nw/img/lw.png b/package.nw/img/lw.png deleted file mode 100644 index 5e0d93b..0000000 Binary files a/package.nw/img/lw.png and /dev/null differ diff --git a/package.nw/lib/defaults.js b/package.nw/lib/defaults.js index e2d8583..5da8f9a 100644 --- a/package.nw/lib/defaults.js +++ b/package.nw/lib/defaults.js @@ -50,7 +50,6 @@ var def_appSettings = { gtMsgEnable: true, gtShareEnable: true, gtSpotEnable: true, - heatEnabled: 0, loadAdifAtStartup: false, locale: "en", lookupLoginCq: "", @@ -88,7 +87,7 @@ var def_appSettings = { sixWideMode: 0, savedAppData: null, soundCard: "default", - spotsEnabled: 0, + spotView: 0, stopAskingVersion: false, useLocalTime: 0, wsjtForwardUdpEnable: false, @@ -129,10 +128,6 @@ var def_mapSettings = { rosterTime: 120, shadow: 0.1, splitQSL: true, - strikes: false, - strikesAlert: 2, - strikesGlobal: false, - strikesNotify: false, trafficDecode: true, usNexrad: false, zoom: 4, diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 9aaa81e..496a7b6 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -181,13 +181,9 @@ var myBand = g_appSettings.myBand; var myRawFreq = g_appSettings.myRawFreq; var myRawCall = g_appSettings.myRawCall; var myRawGrid = g_appSettings.myRawGrid; - var g_flightDuration = 30; - var g_crScript = g_appSettings.crScript; -var g_spotsEnabled = g_appSettings.spotsEnabled; -var g_heatEnabled = g_appSettings.heatEnabled; - +var g_spotView = g_appSettings.spotView; var g_myLat = g_mapSettings.latitude; var g_myLon = g_mapSettings.longitude; @@ -605,7 +601,6 @@ var g_earthShadowImageArray = Array(); g_earthShadowImageArray[0] = "./img/shadow_on_32.png"; g_earthShadowImageArray[1] = "./img/shadow_off_32.png"; var g_gtFlagImageArray = Array(); -g_gtFlagImageArray[2] = "./img/flag_on_freq.png"; g_gtFlagImageArray[1] = "./img/flag_on.png"; g_gtFlagImageArray[0] = "./img/flag_off.png"; var g_gtShareFlagImageArray = Array(); @@ -626,6 +621,10 @@ g_qslLockImageArray[1] = "./img/qsl_locked_32.png"; var g_alertImageArray = Array(); g_alertImageArray[0] = "./img/unmuted-button.png"; g_alertImageArray[1] = "./img/muted-button.png"; +var g_spotImageArray = Array(); +g_spotImageArray[0] = "./img/spots.png"; +g_spotImageArray[1] = "./img/spots.png"; +g_spotImageArray[2] = "./img/heat.png"; var g_maidenheadModeImageArray = Array(); g_maidenheadModeImageArray[0] = "./img/mh4_32.png"; g_maidenheadModeImageArray[1] = "./img/mh6_32.png"; @@ -711,6 +710,7 @@ function gtBandFilterChanged(selector) removePaths(); redrawGrids(); + redrawPins(); redrawSpots(); redrawParks(); } @@ -720,6 +720,7 @@ function gtModeFilterChanged(selector) g_appSettings.gtModeFilter = selector.value; redrawGrids(); + redrawPins(); redrawSpots(); redrawParks(); } @@ -737,6 +738,7 @@ function setBandAndModeToAuto() g_appSettings.gtModeFilter = g_appSettings.gtBandFilter = gtBandFilter.value = gtModeFilter.value = "auto"; redrawGrids(); + redrawPins(); redrawSpots(); redrawParks(); } @@ -828,8 +830,8 @@ function toggleOffline() conditionsButton.style.display = "inline-block"; gtFlagButton.style.display = "inline-block"; gtShareButton.style.display = "inline-block"; - buttonStrikesDiv.style.display = "inline-block"; - buttonPSKSpotsBoxDiv.style.display = "inline-block"; + + buttonSpotsBoxDiv.style.display = "inline-block"; donateButton.style.display = "inline-block"; potaButton.style.display = "inline-block"; @@ -877,8 +879,7 @@ function toggleOffline() msgButton.style.display = "none"; donateButton.style.display = "none"; potaButton.style.display = "none"; - buttonStrikesDiv.style.display = "none"; - buttonPSKSpotsBoxDiv.style.display = "none"; + buttonSpotsBoxDiv.style.display = "none"; setGtShareButtons(); } loadMapSettings(); @@ -2964,14 +2965,14 @@ function registerHotKeys() registerHotKey("KeyE", toggleMoonTrack); registerHotKey("KeyF", toggleSpotPaths); registerHotKey("KeyG", toggleGtMap); - registerHotKey("KeyH", toggleHeatSpots); + // registerHotKey("KeyH", cycleSpotView); registerHotKey("KeyI", showRootInfoBox); // registerHotKey("KeyJ", setTrophyOverlay, 8); registerHotKey("KeyK", makeScreenshots); registerHotKey("KeyL", adifLoadDialog); registerHotKey("KeyM", toggleAlertMute); registerHotKey("KeyN", toggleEarth); - registerHotKey("KeyO", togglePskSpots); + registerHotKey("KeyO", cycleSpotsView); registerHotKey("KeyP", togglePushPinMode); registerHotKey("KeyQ", cycleGridView); registerHotKey("KeyR", openCallRosterWindow); @@ -2980,7 +2981,7 @@ function registerHotKeys() registerHotKey("KeyU", toggleMergeOverlay); registerHotKey("KeyW", toggleGridMode); registerHotKey("KeyX", toggleMouseTrack); - registerHotKey("KeyY", toggleStrikeGlobal); + registerHotKey("KeyZ", setCenterQTH); registerHotKey("Minus", toggleCRScript); @@ -3083,7 +3084,7 @@ function makeTitleInfo(mapWindow) : g_appSettings.gtModeFilter == "auto" ? myMode : g_appSettings.gtModeFilter; - var space = " "; + var news = `GridTracker ${gtVersionStr} [Band: ${band} Mode: ${mode}`; var end = "]"; @@ -3194,8 +3195,6 @@ function setTrophyOverlay(which) mapLoseFocus(); } - g_layerVectors.strikes.setVisible(true); - if (which == 1) { for (key in g_cqZones) @@ -3951,7 +3950,7 @@ function mouseOutOfDataItem(mouseEvent) myTooltip.style.zIndex = -1; g_lastDataGridUp = null; - if (g_spotsEnabled == 1) g_layerSources["psk-hop"].clear(); + if (g_spotView == 1) g_layerSources["psk-hop"].clear(); } function reloadInfo(bandOrMode) @@ -4589,67 +4588,6 @@ function changeHaltOntTxValue(check) saveMapSettings(); } -function changeStrikesAlert() -{ - g_mapSettings.strikesAlert = strikesAlert.value; - saveMapSettings(); - playStrikeAlert(); -} - -function playStrikeAlert() -{ - switch (Number(g_mapSettings.strikesAlert)) - { - case 1: - playAlertMediaFile("short-strike.wav", true); - break; - case 2: - playAlertMediaFile("long-strike.mp3", true); - break; - case 3: - playAlertMediaFile("strike-detected.mp3", true); - break; - default: - // do nothing - break; - } -} - -function setStrikesButton() -{ - if (g_mapSettings.strikes) - { - strikesImg.style.webkitFilter = ""; - } - else - { - strikesImg.style.webkitFilter = "grayscale(1)"; - } - g_gtLiveStatusUpdate = true; -} - -function toggleStrikesValue() -{ - if (g_mapSettings.strikesNotify == false && g_mapSettings.strikes == false) - { - var confirmed = window.confirm( - "Lighting Strike Detection is provided by Blitzortung.org\nWe are not responsible for missed strikes that could result in damage.\nBe sure to check your local weather providers for accurate data." - ); - if (confirmed == false) - { - return; - } - else - { - g_mapSettings.strikesNotify = true; - } - } - g_mapSettings.strikes = g_mapSettings.strikes != true; - setStrikesButton(); - - saveMapSettings(); -} - function changeSplitQSL() { g_mapSettings.splitQSL = splitQSLValue.checked; @@ -5147,23 +5085,6 @@ function displayTime() pskSpotCheck(g_timeNow); - if (g_mapSettings.strikes && g_mapSettings.offlineMode == false) - { - var now = Date.now(); - for (var time in g_bolts) - { - if (now - time > 120000) - { - if (g_layerSources.strikes.hasFeature(g_bolts[time])) { g_layerSources.strikes.removeFeature(g_bolts[time]); } - delete g_bolts[time]; - } - } - } - else - { - g_layerSources.strikes.clear(); - } - if (g_currentNightState != g_nightTime) { changeMapLayer(); @@ -5195,7 +5116,7 @@ function createGlobalMapLayer(name, maxResolution, minResolution) ) { var zIndex = Object.keys(g_layerVectors).length + 1; - if (name == "strikes") zIndex = 2000; + g_layerVectors[name] = new ol.layer.Vector({ source: g_layerSources[name], zIndex: zIndex @@ -5273,115 +5194,6 @@ function panTo(location) }); } -var g_lightningBolt = new ol.style.Icon({ - src: "./img/lw.png", - anchorYUnits: "pixels", - anchorXUnits: "pixels", - size: [64, 64], - anchor: [9, 58], - scale: 0.75 -}); - -var g_lightningGlobal = Array(); - -g_lightningGlobal[0] = new ol.style.Icon({ - src: "./img/l0.png", - anchorYUnits: "pixels", - anchorXUnits: "pixels", - opacity: 0.2, - anchor: [2, 31] -}); - -g_lightningGlobal[1] = new ol.style.Icon({ - src: "./img/l6.png", - anchorYUnits: "pixels", - anchorXUnits: "pixels", - opacity: 0.2, - anchor: [1, 34] -}); - -var g_bolts = {}; -var g_strikeRange = 0.4; - -function toggleStrikeGlobal() -{ - g_mapSettings.strikesGlobal = g_mapSettings.strikesGlobal == false; - saveMapSettings(); - - var msg = "Local Strikes"; - if (g_mapSettings.strikesGlobal == true) msg = "Global Strikes"; - - var worker = - "Strike Distance Changed
" + msg + ""; - if (g_mapSettings.strikes == false) { worker += "
Detection is not enabled!"; } - addLastTraffic(worker); - - g_layerSources.strikes.clear(); -} - -function handleStrike(strike) -{ - var index = Date.now(); - while (index in g_bolts) index++; - - var inRange = true; - - if (myRawGrid.length < 4 || Math.abs(strike.o - g_myLon) > g_strikeRange) inRange = false; - - if (Math.abs(strike.a - g_myLat) > g_strikeRange) inRange = false; - - if ( - g_mapSettings.strikesGlobal || - (g_mapSettings.strikesGlobal == false && inRange) - ) - { - g_bolts[index] = iconFeature( - ol.proj.fromLonLat([strike.o, strike.a]), - inRange ? g_lightningBolt : g_lightningGlobal[0], - 1 - ); - - g_layerSources.strikes.addFeature(g_bolts[index]); - } - - if (inRange == true) - { - playStrikeAlert(); - - var dist = - parseInt( - MyCircle.distance( - g_myLat, - g_myLon, - strike.a, - strike.o, - distanceUnit.value - ) * MyCircle.validateRadius(distanceUnit.value) - ).toLocaleString() + - " " + - distanceUnit.value.toLowerCase(); - var azim = - parseInt( - MyCircle.bearing(g_myLat, g_myLon, strike.a, strike.o) - ).toLocaleString() + "°"; - - var worker = - "Lighting Strike Detected!
"; - worker += - "" + userTimeString(null) + "
"; - worker += - "Distance: " + - dist + - "
"; - worker += - "Bearing: " + - azim + - ""; - - addLastTraffic(worker); - } -} - function toggleMouseTrack() { g_appSettings.mouseTrack ^= 1; @@ -5488,7 +5300,6 @@ function initMap() createGlobalMapLayer("temp"); createGlobalMapLayer("tz"); createGlobalMapLayer("radar"); - createGlobalMapLayer("strikes"); g_mapView = new ol.View({ center: [g_myLon, g_myLat], @@ -5501,7 +5312,6 @@ function initMap() target: "mapDiv", layers: [ g_tileLayer, - g_layerVectors.award, g_layerVectors["psk-heat"], g_layerVectors.qso, @@ -5520,8 +5330,7 @@ function initMap() g_layerVectors.gtflags, g_layerVectors.temp, g_layerVectors.tz, - g_layerVectors.radar, - g_layerVectors.strikes + g_layerVectors.radar ], controls: g_mapControl, loadTilesWhileInteracting: false, @@ -6577,7 +6386,7 @@ function handleWsjtxStatus(newMessage) if (newMessage.TxEnabled) { - if (g_mapSettings.fitQRZ && (!g_spotsEnabled || g_receptionSettings.mergeSpots)) + if (g_mapSettings.fitQRZ && (g_spotView == 0 || g_receptionSettings.mergeSpots)) { if (g_lastMapView == null) { @@ -12337,7 +12146,7 @@ function getBuffer(file_url, callback, flag, mode, port, cache = null) http.get(options, function (res) { - var fsize = res.headers["content-length"]; + // var fsize = res.headers["content-length"]; var cookies = null; if (typeof res.headers["set-cookie"] != "undefined") { cookies = res.headers["set-cookie"]; } res @@ -12390,7 +12199,7 @@ function getPostBuffer( }; var req = http.request(options, function (res) { - var fsize = res.headers["content-length"]; + // var fsize = res.headers["content-length"]; var cookies = null; if (typeof res.headers["set-cookie"] != "undefined") { cookies = res.headers["set-cookie"]; } res @@ -12503,20 +12312,17 @@ function loadMapSettings() fitQRZvalue.checked = g_mapSettings.fitQRZ; qrzDxccFallbackValue.checked = g_mapSettings.qrzDxccFallback; CqHiliteValue.checked = g_mapSettings.CQhilite; - focusRigValue.checked = g_mapSettings.focusRig; haltAllOnTxValue.checked = g_mapSettings.haltAllOnTx; - strikesAlert.value = g_mapSettings.strikesAlert; + clearRosterOnBandChange.checked = g_appSettings.clearRosterOnBandChange; rosterDelayOnFocus.checked = g_appSettings.rosterDelayOnFocus; rosterDelayTime.value = g_appSettings.rosterDelayTime; rosterDelayTimeTd.innerHTML = rosterDelayTime.value + "ms"; - - setStrikesButton(); - trafficDecode.checked = g_mapSettings.trafficDecode; - pskSpotsImg.style.filter = g_spotsEnabled == 1 ? "" : "grayscale(1)"; + setSpotImage(); + timezoneImg.style.filter = g_timezonesEnable == 1 ? "" : "grayscale(1)"; radarImg.style.filter = g_mapSettings.usNexrad ? "" : "grayscale(1)"; gridOverlayImg.style.filter = g_showAllGrids ? "" : "grayscale(1)"; @@ -13037,7 +12843,7 @@ function loadMsgSettings() msgEnable.checked = g_appSettings.gtMsgEnable; GTspotEnable.checked = g_appSettings.gtSpotEnable; - pskSpotsImg.style.filter = g_spotsEnabled == 1 ? "" : "grayscale(1)"; + setSpotImage(); for (var key in g_msgSettings) { @@ -13217,7 +13023,7 @@ function startupButtonsAndInputs() gridViewButton.innerHTML = g_gridViewArray[g_appSettings.gridViewMode]; earthImg.src = g_earthShadowImageArray[g_appSettings.earthImgSrc]; - gtFlagImg.src = g_gtFlagImageArray[g_appSettings.gtFlagImgSrc]; + gtFlagImg.src = g_gtFlagImageArray[g_appSettings.gtFlagImgSrc % 2]; gtShareFlagImg.src = g_gtShareFlagImageArray[g_appSettings.gtShareEnable == false ? 0 : 1]; @@ -13245,8 +13051,7 @@ function startupButtonsAndInputs() msgButton.style.display = "none"; donateButton.style.display = "none"; pskReporterBandActivityDiv.style.display = "none"; - buttonStrikesDiv.style.display = "none"; - buttonPSKSpotsBoxDiv.style.display = "none"; + buttonSpotsBoxDiv.style.display = "none"; } setGtShareButtons(); @@ -15618,7 +15423,7 @@ function pskSpotCheck(timeSec) if (myDEcall == null || myDEcall == "NOCALL" || myDEcall == "") return; if ( - (g_spotsEnabled == 1 || g_rosterSpot) && + (g_spotView > 0 || g_rosterSpot) && (g_receptionReports.lastDownloadTimeSec < g_lastTrasmissionTimeSec) && ( timeSec - g_receptionReports.lastDownloadTimeSec > PSKREPORTER_INTERVAL_IN_SECONDS || @@ -15639,7 +15444,7 @@ function pskSpotCheck(timeSec) 443 ); } - else if (g_spotsEnabled == 1) + else if (g_spotView > 0) { if ( g_lastTrasmissionTimeSec < g_receptionReports.lastDownloadTimeSec && @@ -16043,18 +15848,20 @@ function toggleSpotPaths() redrawSpots(); } -function toggleHeatSpots() +function setSpotImage() { - g_heatEnabled ^= 1; - g_appSettings.heatEnabled = g_heatEnabled; - updateSpotView(); + spotsButtonImg.src = g_spotImageArray[g_spotView]; + spotsButtonImg.style.filter = (g_spotView == 0) ? "grayscale(1)" : ""; } -function togglePskSpots() +function cycleSpotsView() { - g_spotsEnabled ^= 1; - g_appSettings.spotsEnabled = g_spotsEnabled; - pskSpotsImg.style.filter = g_spotsEnabled == 1 ? "" : "grayscale(1)"; + g_spotView++; + g_spotView %= 3; + + g_appSettings.spotView = g_spotView; + setSpotImage(); + setTrophyOverlay(g_currentOverlay); updateSpotView(); } @@ -16080,7 +15887,7 @@ function toggleCRScript() function updateSpotView(leaveCount = true) { - if (g_spotsEnabled == 1) + if (g_spotView > 0) { if (g_receptionSettings.mergeSpots == false) { @@ -16089,7 +15896,7 @@ function updateSpotView(leaveCount = true) g_layerVectors[key].setVisible(false); } } - if (g_heatEnabled == 0) + if (g_spotView == 1) { g_layerVectors["psk-spots"].setVisible(true); g_layerVectors["psk-flights"].setVisible(true); @@ -16116,7 +15923,6 @@ function updateSpotView(leaveCount = true) SpotsDiv.style.display = "none"; spotRefreshDiv.innerHTML = " "; } - g_layerVectors.strikes.setVisible(true); } function gotoDonate() diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js index 208539c..2589481 100644 --- a/package.nw/lib/gtws.js +++ b/package.nw/lib/gtws.js @@ -9,8 +9,7 @@ var g_chatRecvFunctions = { info: gtChatUpdateCall, drop: gtChatRemoveCall, mesg: gtChatMessage, - o: gtSpotMessage, - l: gtLightningStrike + o: gtSpotMessage }; var ChatState = Object(); @@ -248,7 +247,6 @@ function gtChatSendStatus() msg.src = "GT"; msg.canmsg = g_appSettings.gtMsgEnable; msg.o = g_appSettings.gtSpotEnable == true ? 1 : 0; - msg.l = g_mapSettings.strikes == true ? 1 : 0; msg = JSON.stringify(msg); if (msg != g_lastGtStatus) @@ -429,7 +427,7 @@ function makeGtPin(obj) if (validateGridFromString(obj.grid) == false) return; - if (g_appSettings.gtFlagImgSrc == 2 && (obj.mode != myMode || obj.band != myBand)) + if (!validateMapBandAndMode(obj.band, obj.mode)) { return; } @@ -658,15 +656,6 @@ function gtSpotMessage(jsmesg) } } -function gtLightningStrike(jsmesg) -{ - // Saftey check - if (g_mapSettings.strikes) - { - handleStrike(jsmesg); - } -} - function gtChatSystemInit() { g_gtEngineInterval = nodeTimers.setInterval(gtChatStateMachine, 1000); @@ -697,9 +686,9 @@ function clearGtFlags() function toggleGtMap() { g_appSettings.gtFlagImgSrc += 1; - g_appSettings.gtFlagImgSrc %= 3; + g_appSettings.gtFlagImgSrc %= 2; gtFlagImg.src = g_gtFlagImageArray[g_appSettings.gtFlagImgSrc]; - if (g_spotsEnabled == 1 && g_receptionSettings.mergeSpots == false) return; + if (g_spotView > 0 && g_receptionSettings.mergeSpots == false) return; if (g_appSettings.gtFlagImgSrc > 0) { redrawPins(); diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 2fa20a4..9c97a54 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -1177,7 +1177,7 @@ function getBuffer(file_url, callback, flag, mode, port, cookie) } http.get(options, function (res) { - let fsize = res.headers["content-length"]; + // let fsize = res.headers["content-length"]; let cookies = null; if (typeof res.headers["set-cookie"] != "undefined") { cookies = res.headers["set-cookie"]; }