goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #2749 from phl0/fixGridmap

浏览代码 
Fix various errors in gridmap (in context of removal of old maps)
这个提交包含在：
Andreas Kristiansen 2023-11-30 10:46:31 +01:00 提交者 GitHub
当前提交 227ded2165
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 4 个文件被更改，包括 21 次插入 和 13 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

1
application/controllers/Activated_gridmap.php
查看文件

@ -13,6 +13,7 @@ class Activated_gridmap extends CI_Controller {
$this->load->model('activated_gridmap_model'); $this->load->model('activated_gridmap_model');
$this->load->model('stations'); $this->load->model('stations');
$data['visitor'] = false;
$data['homegrid'] = explode(',', $this->stations->find_gridsquare()); $data['homegrid'] = explode(',', $this->stations->find_gridsquare());
$data['modes'] = $this->activated_gridmap_model->get_worked_modes(); $data['modes'] = $this->activated_gridmap_model->get_worked_modes();

1
application/controllers/Visitor.php
查看文件

@ -439,7 +439,6 @@ class Visitor extends CI_Controller {
$data['grid_4char'] = js_array($array_grid_4char); $data['grid_4char'] = js_array($array_grid_4char);
$data['grid_6char'] = js_array($array_grid_6char); $data['grid_6char'] = js_array($array_grid_6char);
$data['homegrid'] = 'JO31OL';
$data['layer'] = $this->optionslib->get_option('option_map_tile_server'); $data['layer'] = $this->optionslib->get_option('option_map_tile_server');
$data['attribution'] = $this->optionslib->get_option('option_map_tile_server_copyright'); $data['attribution'] = $this->optionslib->get_option('option_map_tile_server_copyright');

18
application/views/activated_gridmap/index.php
查看文件

@ -124,19 +124,25 @@
<div id="gridsquare_map" style="width: 100%; height: 800px"></div> <div id="gridsquare_map" style="width: 100%; height: 800px"></div>
</div> </div>
<div class="coordinates d-flex"> <div class="coordinates d-flex">
<div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="latDeg"></div> <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div> <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="locator"></div> <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="distance"></div> <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="bearing"></div> <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
</div> </div>
<script>var gridsquaremap = true; <script>
var gridsquaremap = true;
var type = "activated"; var type = "activated";
<?php if ($visitor == true) { ?>
var visitor = true;
<?php } else { ?>
var visitor = false;
<?php } ?>
<?php <?php
echo 'var jslayer ="' . $layer .'";'; echo 'var jslayer ="' . $layer .'";';
echo "var jsattribution ='" . $attribution . "';"; echo "var jsattribution ='" . $attribution . "';";

12
application/views/gridmap/index.php
查看文件

@ -126,15 +126,15 @@
<div id="gridsquare_map" style="width: 100%; height: 800px"></div> <div id="gridsquare_map" style="width: 100%; height: 800px"></div>
</div> </div>
<div class="coordinates d-flex"> <div class="coordinates d-flex">
<div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="latDeg"></div> <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div> <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="locator"></div> <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="distance"></div> <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
<div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div> <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>:&nbsp;</div>
<div class="cohidden col-auto text-success fw-bold" id="bearing"></div> <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
</div> </div>
<script> <script>
@ -148,7 +148,9 @@ var visitor = false;
<?php <?php
echo "var jslayer = \"" . $layer ."\";\n"; echo "var jslayer = \"" . $layer ."\";\n";
echo "var jsattribution ='" . $attribution . "';"; echo "var jsattribution ='" . $attribution . "';";
if ($visitor == false) {
echo "var homegrid = \"" . strtoupper($homegrid[0]) . "\";\n"; echo "var homegrid = \"" . strtoupper($homegrid[0]) . "\";\n";
}
echo "var gridsquares_gridsquares = \"" . $gridsquares_gridsquares . "\";\n"; echo "var gridsquares_gridsquares = \"" . $gridsquares_gridsquares . "\";\n";
echo "var gridsquares_gridsquares_confirmed = \"" . $gridsquares_gridsquares_confirmed . "\";\n"; echo "var gridsquares_gridsquares_confirmed = \"" . $gridsquares_gridsquares_confirmed . "\";\n";