Merge branch 'cbayer-new-bands' into 'master'

added GHz bands

See merge request gridtracker.org/gridtracker!258

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!
merge-requests/259/merge
T Loomis 2022-12-31 03:39:23 +00:00
commit c50f4bde32
6 zmienionych plików z 67 dodań i 3 usunięć

Wyświetl plik

@ -409,12 +409,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<option data-i18n="mapFilter.band.12m" value="12m">12m</option>
<option data-i18n="mapFilter.band.11m" value="11m">11m</option>
<option data-i18n="mapFilter.band.10m" value="10m">10m</option>
<option data-i18n="mapFilter.band.8m" value="8m">8m</option>
<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.70cm" value="70cm">70cm</option>
<option data-i18n="mapFilter.band.23cm" value="23cm">23cm</option>
<option data-i18n="mapFilter.band.13cm" value="13cm">13cm</option>
<option data-i18n="mapFilter.band.9cm" value="9cm">9cm</option>
<option data-i18n="mapFilter.band.3cm" value="3cm">3cm</option>
<option data-i18n="mapFilter.band.1_2cm" value="1.2cm">1.2cm</option>
<option data-i18n="mapFilter.band.6mm" value="6mm">6mm</option>
<option data-i18n="mapFilter.band.4mm" value="4mm">4mm</option>
<option data-i18n="mapFilter.band.2_5mm" value="2.5mm">2.5mm</option>
<option data-i18n="mapFilter.band.2mm" value="2mm">2mm</option>
<option data-i18n="mapFilter.band.1mm" value="1mm">1mm</option>
<option data-i18n="mapFilter.band.OOB" value="oob">OOB</option>
</select>
</td>
@ -3180,4 +3190,4 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<div id="selectNodeDiv" style="-webkit-user-select: text; user-select: text; display: block; z-index: -10000"></div>
</body>
</html>
</html>

Wyświetl plik

@ -79,12 +79,22 @@
"mapFilter.band.12m": "12m",
"mapFilter.band.11m": "11m",
"mapFilter.band.10m": "10m",
"mapFilter.band.8m": "8m",
"mapFilter.band.6m": "6m",
"mapFilter.band.4m": "4m",
"mapFilter.band.2m": "2m",
"mapFilter.band.125cm": "125cm",
"mapFilter.band.70cm": "70cm",
"mapFilter.band.23cm": "23cm",
"mapFilter.band.13cm": "13cm",
"mapFilter.band.9cm": "9cm",
"mapFilter.band.3cm": "3cm",
"mapFilter.band.1_2cm": "1.2cm",
"mapFilter.band.6mm": "6mm",
"mapFilter.band.4mm": "4mm",
"mapFilter.band.2_5mm": "2.5mm",
"mapFilter.band.2mm": "2mm",
"mapFilter.band.1mm": "1mm",
"mapFilter.band.OOB": "OOB",
"mapFilter.mode.hover": "選擇模式",
"mapFilter.mode.label": "模式",

Wyświetl plik

@ -79,12 +79,22 @@
"mapFilter.band.12m": "12m",
"mapFilter.band.11m": "11m",
"mapFilter.band.10m": "10m",
"mapFilter.band.8m": "8m",
"mapFilter.band.6m": "6m",
"mapFilter.band.4m": "4m",
"mapFilter.band.2m": "2m",
"mapFilter.band.125cm": "125cm",
"mapFilter.band.70cm": "70cm",
"mapFilter.band.23cm": "23cm",
"mapFilter.band.13cm": "13cm",
"mapFilter.band.9cm": "9cm",
"mapFilter.band.3cm": "3cm",
"mapFilter.band.1_2cm": "1.2cm",
"mapFilter.band.6mm": "6mm",
"mapFilter.band.4mm": "4mm",
"mapFilter.band.2_5mm": "2.5mm",
"mapFilter.band.2mm": "2mm",
"mapFilter.band.1mm": "1mm",
"mapFilter.band.OOB": "OOB",
"mapFilter.mode.hover": "选择模式",
"mapFilter.mode.label": "模式",

Wyświetl plik

@ -78,12 +78,22 @@
"mapFilter.band.12m": "12m",
"mapFilter.band.11m": "11m",
"mapFilter.band.10m": "10m",
"mapFilter.band.8m": "8m",
"mapFilter.band.6m": "6m",
"mapFilter.band.4m": "4m",
"mapFilter.band.2m": "2m",
"mapFilter.band.125cm": "125cm",
"mapFilter.band.70cm": "70cm",
"mapFilter.band.23cm": "23cm",
"mapFilter.band.13cm": "13cm",
"mapFilter.band.9cm": "9cm",
"mapFilter.band.3cm": "3cm",
"mapFilter.band.1_2cm": "1.2cm",
"mapFilter.band.6mm": "6mm",
"mapFilter.band.4mm": "4mm",
"mapFilter.band.2_5mm": "2.5mm",
"mapFilter.band.2mm": "2mm",
"mapFilter.band.1mm": "1mm",
"mapFilter.band.OOB": "OOB",
"mapFilter.mode.hover": "Select Mode",
"mapFilter.mode.label": "Mode",
@ -1068,4 +1078,4 @@
"COMMENT_sendAlerts.js": "",
"sendAlerts.scriptEnabled": "Script Enabled",
"sendAlerts.scriptDisabled": "Script Disabled"
}
}

Wyświetl plik

@ -414,12 +414,23 @@ var g_colorBands = [
"12m",
"11m",
"10m",
"8m",
"6m",
"4m",
"2m",
"1.25m",
"70cm",
"23cm"
"23cm",
"13cm",
"9cm",
"5cm",
"3cm",
"1.2cm",
"6mm",
"4mm",
"2.5mm",
"2mm",
"1mm"
];
var g_pathIgnore = {};

Wyświetl plik

@ -33,6 +33,8 @@ Number.prototype.formatBand = function ()
"10m",
29,
"10m",
40,
"8m",
50,
"6m",
51,
@ -82,6 +84,17 @@ Number.prototype.formatBand = function ()
else if (newFreq >= 420 && newFreq <= 450) return "70cm";
else if (newFreq >= 902 && newFreq <= 928) return "33cm";
else if (newFreq >= 1240 && newFreq <= 1300) return "23cm";
else if (newFreq >= 2300 && newFreq <= 2450) return "13cm";
else if (newFreq >= 2300 && newFreq <= 2450) return "13cm";
else if (newFreq >= 3300 && newFreq <= 3500) return "9cm";
else if (newFreq >= 5650 && newFreq <= 5925) return "5cm";
else if (newFreq >= 10000 && newFreq <= 10500) return "3cm";
else if (newFreq >= 24000 && newFreq <= 24250) return "1.2cm";
else if (newFreq >= 47000 && newFreq <= 47200) return "6mm";
else if (newFreq >= 75500 && newFreq <= 81000) return "4mm";
else if (newFreq >= 122500 && newFreq <= 123000) return "2.5mm";
else if (newFreq >= 134000 && newFreq <= 141000) return "2mm";
else if (newFreq >= 241000 && newFreq <= 250000) return "1mm";
else if (freq >= 0.472 && freq <= 0.479) return "630m";
else if (freq >= 0.1357 && freq <= 0.1485) return "2200m";
else if (freq >= 0.009 && freq <= 0.02) return "4000m";