kopia lustrzana https://github.com/magicbug/Cloudlog
Generalize gridmaster functions
phl0
rodzic
4050015d42
commit
bfc2d50c95
|
|
@ -597,8 +597,9 @@ class Awards extends CI_Controller {
|
|||
$this->load->view('awards/details', $data);
|
||||
}
|
||||
|
||||
public function gridmaster() {
|
||||
$data['page_title'] = "Awards - US Gridmaster";
|
||||
public function gridmaster($dxcc) {
|
||||
$dxcc = $this->security->xss_clean($dxcc);
|
||||
$data['page_title'] = "Awards - ".strtoupper($dxcc)." Gridmaster";
|
||||
|
||||
$this->load->model('bands');
|
||||
$this->load->model('gridmap_model');
|
||||
|
|
@ -619,15 +620,17 @@ class Awards extends CI_Controller {
|
|||
$data['gridsquares_gridsquares_lotw']= lang('gridsquares_gridsquares_lotw');
|
||||
$data['gridsquares_gridsquares_paper']= lang('gridsquares_gridsquares_paper');
|
||||
|
||||
$indexData['dxcc'] = $dxcc;
|
||||
|
||||
$footerData = [];
|
||||
$footerData['scripts']= [
|
||||
'assets/js/leaflet/geocoding.js',
|
||||
'assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js',
|
||||
'assets/js/sections/gridmaster.js?'
|
||||
'assets/js/sections/gridmaster.js'
|
||||
];
|
||||
|
||||
$this->load->view('interface_assets/header',$data);
|
||||
$this->load->view('awards/gridmaster/index');
|
||||
$this->load->view('awards/gridmaster/index',$indexData);
|
||||
$this->load->view('interface_assets/footer',$footerData);
|
||||
}
|
||||
|
||||
|
|
@ -837,9 +840,11 @@ class Awards extends CI_Controller {
|
|||
echo json_encode($data);
|
||||
}
|
||||
|
||||
public function getGridmasterGridsjs() {
|
||||
public function getGridmasterGridsjs($dxcc) {
|
||||
$this->load->model('gridmaster_model');
|
||||
|
||||
$dxcc = $this->security->xss_clean($dxcc);
|
||||
|
||||
$array_grid_4char = array();
|
||||
$array_grid_4char_lotw = array();
|
||||
$array_grid_4char_paper = array();
|
||||
|
|
@ -847,7 +852,7 @@ class Awards extends CI_Controller {
|
|||
$grid_4char = "";
|
||||
$grid_4char_lotw = "";
|
||||
|
||||
$query = $this->gridmaster_model->get_lotw();
|
||||
$query = $this->gridmaster_model->get_lotw($dxcc);
|
||||
if ($query && $query->num_rows() > 0) {
|
||||
foreach ($query->result() as $row) {
|
||||
$grid_4char_lotw = strtoupper(substr($row->GRID_SQUARES,0,4));
|
||||
|
|
@ -857,7 +862,7 @@ class Awards extends CI_Controller {
|
|||
}
|
||||
}
|
||||
|
||||
$query = $this->gridmaster_model->get_paper();
|
||||
$query = $this->gridmaster_model->get_paper($dxcc);
|
||||
if ($query && $query->num_rows() > 0) {
|
||||
foreach ($query->result() as $row) {
|
||||
$grid_4char_paper = strtoupper(substr($row->GRID_SQUARES,0,4));
|
||||
|
|
@ -867,7 +872,7 @@ class Awards extends CI_Controller {
|
|||
}
|
||||
}
|
||||
|
||||
$query = $this->gridmaster_model->get_worked();
|
||||
$query = $this->gridmaster_model->get_worked($dxcc);
|
||||
if ($query && $query->num_rows() > 0) {
|
||||
foreach ($query->result() as $row) {
|
||||
$grid_four = strtoupper(substr($row->GRID_SQUARES,0,4));
|
||||
|
|
@ -877,7 +882,7 @@ class Awards extends CI_Controller {
|
|||
}
|
||||
}
|
||||
|
||||
$vucc_grids = $this->gridmaster_model->get_vucc_lotw();
|
||||
$vucc_grids = $this->gridmaster_model->get_vucc_lotw($dxcc);
|
||||
foreach($vucc_grids as $key) {
|
||||
$grid_four_lotw = strtoupper(substr($key,0,4));
|
||||
if(!in_array($grid_four_lotw, $array_grid_4char_lotw)){
|
||||
|
|
@ -885,7 +890,7 @@ class Awards extends CI_Controller {
|
|||
}
|
||||
}
|
||||
|
||||
$vucc_grids = $this->gridmaster_model->get_vucc_paper();
|
||||
$vucc_grids = $this->gridmaster_model->get_vucc_paper($dxcc);
|
||||
foreach($vucc_grids as $key) {
|
||||
$grid_four_paper = strtoupper(substr($key,0,4));
|
||||
if(!in_array($grid_four_paper, $array_grid_4char_paper)){
|
||||
|
|
@ -893,7 +898,7 @@ class Awards extends CI_Controller {
|
|||
}
|
||||
}
|
||||
|
||||
$vucc_grids = $this->gridmaster_model->get_vucc_worked();
|
||||
$vucc_grids = $this->gridmaster_model->get_vucc_worked($dxcc);
|
||||
foreach($vucc_grids as $key) {
|
||||
$grid_four = strtoupper(substr($key,0,4));
|
||||
if(!in_array($grid_four, $array_grid_4char)){
|
||||
|
|
@ -904,6 +909,11 @@ class Awards extends CI_Controller {
|
|||
$data['grid_4char_lotw'] = ($array_grid_4char_lotw);
|
||||
$data['grid_4char_paper'] = ($array_grid_4char_paper);
|
||||
$data['grid_4char'] = ($array_grid_4char);
|
||||
$data['grid_count'] = $this->gridmaster_model->get_grid_count($dxcc);
|
||||
$data['grids'] = $this->gridmaster_model->get_grids($dxcc);
|
||||
$data['lat'] = $this->gridmaster_model->get_lat($dxcc);
|
||||
$data['lon'] = $this->gridmaster_model->get_lon($dxcc);
|
||||
$data['zoom'] = $this->gridmaster_model->get_zoom($dxcc);
|
||||
|
||||
header('Content-Type: application/json');
|
||||
echo json_encode($data);
|
||||
|
|
|
|||
|
|
@ -34,8 +34,22 @@ class Gridmaster_model extends CI_Model {
|
|||
'EL39', 'EL49', 'EL59', 'EL79', 'EL89', 'EL99', 'DL88', 'DL98', 'EL08', 'EL18', 'EL28', 'EL58', 'EL88', 'EL98', 'EL07', 'EL17',
|
||||
'EL87', 'EL97', 'EL06', 'EL16', 'EL86', 'EL96', 'EL15', 'EL95', 'EL84', 'EL94'
|
||||
];
|
||||
private $us_lat = 38;
|
||||
private $us_lon = -91;
|
||||
private $us_zoom = 5;
|
||||
|
||||
function get_lotw() {
|
||||
private $ja_grids = ['PL14', 'PL24', 'PL36', 'PL37', 'PL46', 'PL47', 'PL48', 'PL49', 'PL55', 'PL58', 'PM40', 'PM41', 'PM42', 'PM43',
|
||||
'PM44', 'PM50', 'PM51', 'PM52', 'PM53', 'PM54', 'PM62', 'PM63', 'PM64', 'PM65', 'PM66', 'PM73', 'PM74', 'PM75', 'PM76', 'PM83',
|
||||
'PM84', 'PM85', 'PM86', 'PM87', 'PM92', 'PM93', 'PM94', 'PM95', 'PM96', 'PM97', 'PM98', 'PM99', 'PN90', 'PN91', 'PN92', 'QL16',
|
||||
'QL17', 'QM05', 'QM06', 'QM07', 'QM08', 'QM09', 'QM19', 'QN00', 'QN01', 'QN02', 'QN03', 'QN04', 'QN05', 'QN11', 'QN12', 'QN13',
|
||||
'QN14', 'QN15', 'QN22', 'QN23', 'QN24', 'PL80', 'PM91', 'QL04', 'QL05', 'QL07', 'QL09', 'QL64', 'QM00', 'QM01', 'PL15', 'PL25',
|
||||
'PL54', 'PM57', 'QN33', 'QN34', 'QN35', 'QN45'
|
||||
];
|
||||
private $ja_lat = 35;
|
||||
private $ja_lon = 140;
|
||||
private $ja_zoom = 5;
|
||||
|
||||
function get_lotw($dxcc) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
|
|
@ -50,11 +64,11 @@ class Gridmaster_model extends CI_Model {
|
|||
.' WHERE station_id in ('.$location_list.')'
|
||||
." and COL_LOTW_QSL_RCVD = 'Y'"
|
||||
." and COL_PROP_MODE = 'SAT'"
|
||||
.' AND substring(COL_GRIDSQUARE,1,4) in (\''.implode('\',\'', $this->us_grids).'\')';
|
||||
.' AND substring(COL_GRIDSQUARE,1,4) in (\''.implode('\',\'', $this->{$dxcc.'_grids'}).'\')';
|
||||
return $this->db->query($sql);
|
||||
}
|
||||
|
||||
function get_paper() {
|
||||
function get_paper($dxcc) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
|
|
@ -69,11 +83,11 @@ class Gridmaster_model extends CI_Model {
|
|||
.' WHERE station_id in ('.$location_list.')'
|
||||
." and COL_QSL_RCVD = 'Y'"
|
||||
." and COL_PROP_MODE = 'SAT'"
|
||||
.' AND substring(COL_GRIDSQUARE,1,4) in (\''.implode('\',\'', $this->us_grids).'\')';
|
||||
.' AND substring(COL_GRIDSQUARE,1,4) in (\''.implode('\',\'', $this->{$dxcc.'_grids'}).'\')';
|
||||
return $this->db->query($sql);
|
||||
}
|
||||
|
||||
function get_worked() {
|
||||
function get_worked($dxcc) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
|
|
@ -87,11 +101,11 @@ class Gridmaster_model extends CI_Model {
|
|||
.$this->config->item('table_name')
|
||||
.' WHERE station_id in ('.$location_list.')'
|
||||
." and COL_PROP_MODE = 'SAT'"
|
||||
.' AND substring(COL_GRIDSQUARE,1,4) in (\''.implode('\',\'', $this->us_grids).'\')';
|
||||
.' AND substring(COL_GRIDSQUARE,1,4) in (\''.implode('\',\'', $this->{$dxcc.'_grids'}).'\')';
|
||||
return $this->db->query($sql);
|
||||
}
|
||||
|
||||
function get_vucc_lotw() {
|
||||
function get_vucc_lotw($dxcc) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
|
|
@ -113,7 +127,7 @@ class Gridmaster_model extends CI_Model {
|
|||
foreach ($query->result() as $row) {
|
||||
$grids = explode(',', $row->VUCC_GRIDS);
|
||||
foreach ($grids as $grid) {
|
||||
if (in_array(substr($grid, 0, 4), $this->us_grids)) {
|
||||
if (in_array(substr($grid, 0, 4), $this->{$dxcc.'_grids'})) {
|
||||
if (!in_array(substr($grid, 0, 4), $vucc_grids)) {
|
||||
$vucc_grids[] = substr($grid, 0, 4);
|
||||
}
|
||||
|
|
@ -123,7 +137,7 @@ class Gridmaster_model extends CI_Model {
|
|||
return $vucc_grids;
|
||||
}
|
||||
|
||||
function get_vucc_paper() {
|
||||
function get_vucc_paper($dxcc) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
|
|
@ -145,7 +159,7 @@ class Gridmaster_model extends CI_Model {
|
|||
foreach ($query->result() as $row) {
|
||||
$grids = explode(',', $row->VUCC_GRIDS);
|
||||
foreach ($grids as $grid) {
|
||||
if (in_array(substr($grid, 0, 4), $this->us_grids)) {
|
||||
if (in_array(substr($grid, 0, 4), $this->{$dxcc.'_grids'})) {
|
||||
if (!in_array(substr($grid, 0, 4), $vucc_grids)) {
|
||||
$vucc_grids[] = substr($grid, 0, 4);
|
||||
}
|
||||
|
|
@ -155,7 +169,7 @@ class Gridmaster_model extends CI_Model {
|
|||
return $vucc_grids;
|
||||
}
|
||||
|
||||
function get_vucc_worked() {
|
||||
function get_vucc_worked($dxcc) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
|
|
@ -176,7 +190,7 @@ class Gridmaster_model extends CI_Model {
|
|||
foreach ($query->result() as $row) {
|
||||
$grids = explode(',', $row->VUCC_GRIDS);
|
||||
foreach ($grids as $grid) {
|
||||
if (in_array(substr($grid, 0, 4), $this->us_grids)) {
|
||||
if (in_array(substr($grid, 0, 4), $this->{$dxcc.'_grids'})) {
|
||||
if (!in_array(substr($grid, 0, 4), $vucc_grids)) {
|
||||
$vucc_grids[] = substr($grid, 0, 4);
|
||||
}
|
||||
|
|
@ -186,4 +200,24 @@ class Gridmaster_model extends CI_Model {
|
|||
return $vucc_grids;
|
||||
}
|
||||
|
||||
function get_grid_count($dxcc) {
|
||||
return count($this->{$dxcc.'_grids'});
|
||||
}
|
||||
|
||||
function get_grids($dxcc) {
|
||||
return $this->{$dxcc.'_grids'};
|
||||
}
|
||||
|
||||
function get_lat($dxcc) {
|
||||
return $this->{$dxcc.'_lat'};
|
||||
}
|
||||
|
||||
function get_lon($dxcc) {
|
||||
return $this->{$dxcc.'_lon'};
|
||||
}
|
||||
|
||||
function get_zoom($dxcc) {
|
||||
return $this->{$dxcc.'_zoom'};
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@
|
|||
</div>
|
||||
<script>var gridsquaremap = true;
|
||||
var type = "worked";
|
||||
var dxcc = '<?php echo $dxcc; ?>';
|
||||
<?php
|
||||
echo 'var jslayer ="' . $layer .'";';
|
||||
echo "var jsattribution ='" . $attribution . "';";
|
||||
|
|
|
|||
|
|
@ -149,9 +149,9 @@
|
|||
<div class="dropdown-divider"></div>
|
||||
<div class="nav-item dropdown dropdown-submenu" aria-labelledby="navbarDropdown"><a class="dropdown-item dropdown-toggle" href="#"><i class="fas fa-trophy"></i> Gridmaster</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="dropdown-item" href="<?php echo site_url('awards/ja_gridmaster'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_ja_gridmaster'); ?></a></li>
|
||||
<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/ja'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_ja_gridmaster'); ?></a></li>
|
||||
<div class="dropdown-divider"></div>
|
||||
<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_us_gridmaster'); ?></a></li>
|
||||
<li><a class="dropdown-item" href="<?php echo site_url('awards/gridmaster/us'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_us_gridmaster'); ?></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="dropdown-divider"></div>
|
||||
|
|
|
|||
|
|
@ -53,38 +53,6 @@ L.Maidenhead = L.LayerGroup.extend({
|
|||
var top = Math.ceil(n/unit)*unit;
|
||||
var bottom = Math.floor(s/unit)*unit;
|
||||
this.eachLayer(this.removeLayer, this);
|
||||
const grids_unworked = ['EN29', 'CN78', 'CN88', 'CN98', 'DN08', 'DN18', 'DN28', 'DN38', 'DN48', 'DN58', 'DN68', 'DN78', 'DN88', 'DN98',
|
||||
'EN08', 'EN18', 'EN28', 'EN38', 'EN48', 'EN58', 'CN77', 'CN87', 'CN97', 'DN07', 'DN17', 'DN27', 'DN37', 'DN47', 'DN57', 'DN67',
|
||||
'DN77', 'DN87', 'DN97', 'EN07', 'EN17', 'EN27', 'EN37', 'EN47', 'EN57', 'EN67', 'FN57', 'FN67', 'CN76', 'CN86', 'CN96', 'DN06',
|
||||
'DN16', 'DN26', 'DN36', 'DN46', 'DN56', 'DN66', 'DN76', 'DN86', 'DN96', 'EN06', 'EN16', 'EN26', 'EN36', 'EN46', 'EN56', 'EN66',
|
||||
'EN76', 'EN86', 'FN46', 'FN56', 'FN66', 'CN75', 'CN85', 'CN95', 'DN05', 'DN15', 'DN25', 'DN35', 'DN45', 'DN55', 'DN65', 'DN75',
|
||||
'DN85', 'DN95', 'EN05', 'EN15', 'EN25', 'EN35', 'EN45', 'EN55', 'EN65', 'EN75', 'EN85', 'FN25', 'FN35', 'FN45', 'FN55', 'FN65',
|
||||
'CN74', 'CN84', 'CN94', 'DN04', 'DN14', 'DN24', 'DN34', 'DN44', 'DN54', 'DN64', 'DN74', 'DN84', 'DN94', 'EN04', 'EN14', 'EN24',
|
||||
'EN34', 'EN44', 'EN54', 'EN64', 'EN74', 'EN84', 'FN14', 'FN24', 'FN34', 'FN44', 'FN54', 'FN64', 'CN73', 'CN83', 'CN93', 'DN03',
|
||||
'DN13', 'DN23', 'DN33', 'DN43', 'DN53', 'DN63', 'DN73', 'DN83', 'DN93', 'EN03', 'EN13', 'EN23', 'EN33', 'EN43', 'EN53', 'EN63',
|
||||
'EN73', 'EN83', 'FN03', 'FN13', 'FN23', 'FN33', 'FN43', 'FN53', 'CN72', 'CN82', 'CN92', 'DN02', 'DN12', 'DN22', 'DN32', 'DN42',
|
||||
'DN52', 'DN62', 'DN72', 'DN82', 'DN92', 'EN02', 'EN12', 'EN22', 'EN32', 'EN42', 'EN52', 'EN62', 'EN72', 'EN82', 'EN92', 'FN02',
|
||||
'FN12', 'FN22', 'FN32', 'FN42', 'CN71', 'CN81', 'CN91', 'DN01', 'DN11', 'DN21', 'DN31', 'DN41', 'DN51', 'DN61', 'DN71', 'DN81',
|
||||
'DN91', 'EN01', 'EN11', 'EN21', 'EN31', 'EN41', 'EN51', 'EN61', 'EN71', 'EN81', 'EN91', 'FN01', 'FN11', 'FN21', 'FN31', 'FN41',
|
||||
'FN51', 'CN70', 'CN80', 'CN90', 'DN00', 'DN10', 'DN20', 'DN30', 'DN40', 'DN50', 'DN60', 'DN70', 'DN80', 'DN90', 'EN00', 'EN10',
|
||||
'EN20', 'EN30', 'EN40', 'EN50', 'EN60', 'EN70', 'EN80', 'EN90', 'FN00', 'FN10', 'FN20', 'FN30', 'CM79', 'CM89', 'CM99', 'DM09',
|
||||
'DM19', 'DM29', 'DM39', 'DM49', 'DM59', 'DM69', 'DM79', 'DM89', 'DM99', 'EM09', 'EM19', 'EM29', 'EM39', 'EM49', 'EM59', 'EM69',
|
||||
'EM79', 'EM89', 'EM99', 'FM09', 'FM19', 'FM29', 'CM88', 'CM98', 'DM08', 'DM18', 'DM28', 'DM38', 'DM48', 'DM58', 'DM68', 'DM78',
|
||||
'DM88', 'DM98', 'EM08', 'EM18', 'EM28', 'EM38', 'EM48', 'EM58', 'EM68', 'EM78', 'EM88', 'EM98', 'FM08', 'FM18', 'FM28', 'CM87',
|
||||
'CM97', 'DM07', 'DM17', 'DM27', 'DM37', 'DM47', 'DM57', 'DM67', 'DM77', 'DM87', 'DM97', 'EM07', 'EM17', 'EM27', 'EM37', 'EM47',
|
||||
'EM57', 'EM67', 'EM77', 'EM87', 'EM97', 'FM07', 'FM17', 'FM27', 'CM86', 'CM96', 'DM06', 'DM16', 'DM26', 'DM36', 'DM46', 'DM56',
|
||||
'DM66', 'DM76', 'DM86', 'DM96', 'EM06', 'EM16', 'EM26', 'EM36', 'EM46', 'EM56', 'EM66', 'EM76', 'EM86', 'EM96', 'FM06', 'FM16',
|
||||
'FM26', 'CM95', 'DM05', 'DM15', 'DM25', 'DM35', 'DM45', 'DM55', 'DM65', 'DM75', 'DM85', 'DM95', 'EM05', 'EM15', 'EM25', 'EM35',
|
||||
'EM45', 'EM55', 'EM65', 'EM75', 'EM85', 'EM95', 'FM05', 'FM15', 'FM25', 'CM94', 'DM04', 'DM14', 'DM24', 'DM34', 'DM44', 'DM54',
|
||||
'DM64', 'DM74', 'DM84', 'DM94', 'EM04', 'EM14', 'EM24', 'EM34', 'EM44', 'EM54', 'EM64', 'EM74', 'EM84', 'EM94', 'FM04', 'FM14',
|
||||
'CM93', 'DM03', 'DM13', 'DM23', 'DM33', 'DM43', 'DM53', 'DM63', 'DM73', 'DM83', 'DM93', 'EM03', 'EM13', 'EM23', 'EM33', 'EM43',
|
||||
'EM53', 'EM63', 'EM73', 'EM83', 'EM93', 'FM03', 'FM13', 'DM02', 'DM12', 'DM22', 'DM32', 'DM42', 'DM52', 'DM62', 'DM72', 'DM82',
|
||||
'DM92', 'EM02', 'EM12', 'EM22', 'EM32', 'EM42', 'EM52', 'EM62', 'EM72', 'EM82', 'EM92', 'FM02', 'DM31', 'DM41', 'DM51', 'DM61',
|
||||
'DM71', 'DM81', 'DM91', 'EM01', 'EM11', 'EM21', 'EM31', 'EM41', 'EM51', 'EM61', 'EM71', 'EM81', 'EM91', 'DM70', 'DM80', 'DM90',
|
||||
'EM00', 'EM10', 'EM20', 'EM30', 'EM40', 'EM50', 'EM60', 'EM70', 'EM80', 'EM90', 'DL79', 'DL89', 'DL99', 'EL09', 'EL19', 'EL29',
|
||||
'EL39', 'EL49', 'EL59', 'EL79', 'EL89', 'EL99', 'DL88', 'DL98', 'EL08', 'EL18', 'EL28', 'EL58', 'EL88', 'EL98', 'EL07', 'EL17',
|
||||
'EL87', 'EL97', 'EL06', 'EL16', 'EL86', 'EL96', 'EL15', 'EL95', 'EL84', 'EL94'
|
||||
];
|
||||
|
||||
for (var lon = left; lon < right; lon += (unit*2)) {
|
||||
if (lon > -180 || lon < 180) {
|
||||
|
|
@ -106,7 +74,7 @@ L.Maidenhead = L.LayerGroup.extend({
|
|||
}
|
||||
// Controls text on grid on various zoom levels
|
||||
this.addLayer(this._getLabel(lon+unit-(unit/lcor),lat+(unit/2)+(unit/lcor*c)));
|
||||
} else if (grids_unworked.includes(locator)) {
|
||||
} else if (grids.includes(locator)) {
|
||||
var rect = L.rectangle(bounds, {className: 'grid-rectangle grid-unworked', color: 'rgba(0,0,0, 0.3)', weight: 1, fillOpacity: 0.15, fill:true, interactive: false})
|
||||
this.addLayer(rect);
|
||||
this.addLayer(this._getLabel(lon+unit-(unit/lcor),lat+(unit/2)+(unit/lcor*c)));
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ var grid_four = '';
|
|||
var grid_four_lotw = '';
|
||||
var grid_four_paper = '';
|
||||
|
||||
function gridPlot(form) {
|
||||
function gridPlot(form, dxcc) {
|
||||
$(".ld-ext-right-plot").addClass('running');
|
||||
$(".ld-ext-right-plot").prop('disabled', true);
|
||||
$('#plot').prop("disabled", true);
|
||||
|
|
@ -16,20 +16,28 @@ function gridPlot(form) {
|
|||
$("#gridmapcontainer").append('<div id="gridsquare_map" class="map-leaflet" style="width: 100%; height: 800px"></div>');
|
||||
}
|
||||
|
||||
ajax_url = site_url + '/awards/getGridmasterGridsjs';
|
||||
ajax_url = site_url + '/awards/getGridmasterGridsjs/'+dxcc;
|
||||
|
||||
$.ajax({
|
||||
url: ajax_url,
|
||||
type: 'get',
|
||||
type: 'post',
|
||||
data: {
|
||||
dxcc: 'us'
|
||||
},
|
||||
|
||||
success: function (data) {
|
||||
$('.cohidden').show();
|
||||
$(".ld-ext-right-plot").removeClass('running');
|
||||
$(".ld-ext-right-plot").prop('disabled', false);
|
||||
$('#plot').prop("disabled", false);
|
||||
grid_max = 488;
|
||||
grids = data.grids;
|
||||
grid_max = data.grid_count;
|
||||
grid_four = data.grid_4char;
|
||||
grid_four_lotw = data.grid_4char_lotw;
|
||||
grid_four_paper = data.grid_4char_paper;
|
||||
lat = data.lat;
|
||||
lon = data.lon;
|
||||
zoom = data.zoom;
|
||||
paper_count = 0;
|
||||
grid_four_paper.forEach((element) => {
|
||||
if (!grid_four_lotw.includes(element)) {
|
||||
|
|
@ -44,8 +52,8 @@ function gridPlot(form) {
|
|||
|
||||
map = L.map('gridsquare_map', {
|
||||
layers: [layer],
|
||||
center: [38, -91],
|
||||
zoom: 5,
|
||||
center: [lat, lon],
|
||||
zoom: zoom,
|
||||
minZoom: 4,
|
||||
maxZoom: 12,
|
||||
fullscreenControl: true,
|
||||
|
|
@ -67,7 +75,6 @@ function gridPlot(form) {
|
|||
|
||||
legend.onAdd = function(map) {
|
||||
var div = L.DomUtil.create("div", "legend");
|
||||
//div.innerHTML += "<h4>" + gridsquares_gridsquares + "</h4>";
|
||||
html = "<table border=\"0\">";
|
||||
html += '<tr><td><i style="background: #90ee90"></i><span>' + gridsquares_gridsquares_lotw + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+grid_four_lotw.length+' / '+grid_max+'</span></td></tr>';
|
||||
html += '<tr><td><i style="background: #00b0f0"></i><span>' + gridsquares_gridsquares_paper + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+paper_count+' / '+grid_max+'</span></td></tr>';
|
||||
|
|
@ -138,5 +145,5 @@ function spawnGridsquareModal(loc_4char) {
|
|||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
gridPlot(this.form);
|
||||
gridPlot(this.form, dxcc);
|
||||
})
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue