Skip to content

Commit 0f72d38

Browse files
authored
Merge pull request wavelog#275 from AndreasK79/export_map_defaults
2 parents d7ef14d + 3d0121d commit 0f72d38

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

application/controllers/Visitor.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,12 +507,28 @@ public function get_map_custom() {
507507

508508
$this->load->model('user_options_model');
509509

510-
$result=$this->user_options_model->get_options('map_custom', null, $userid);
511-
$jsonout=[];
510+
$result = $this->user_options_model->get_options('map_custom', null, $userid);
511+
$jsonout = [];
512512
foreach($result->result() as $options) {
513513
if ($options->option_name=='icon') $jsonout[$options->option_key]=json_decode($options->option_value,true);
514514
else $jsonout[$options->option_name.'_'.$options->option_key]=$options->option_value;
515515
}
516+
517+
if (count($jsonout) == 0) {
518+
$jsonout['qso'] = array(
519+
"icon" => "fas fa-dot-circle",
520+
"color" => "#ff0000"
521+
);
522+
$jsonout['qsoconfirm'] = array(
523+
"icon" => "fas fa-dot-circle",
524+
"color" => "#00aa00"
525+
);
526+
$jsonout['station'] = array(
527+
"icon" => "fas fa-broadcast-tower",
528+
"color" => "#0000ff"
529+
);
530+
}
531+
516532
$jsonout['gridsquare_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'gridsquare_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;
517533
$jsonout['path_lines'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'path_lines','option_key'=>$slug), $userid)->row()->option_value ?? true;
518534
$jsonout['cqzone_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'cqzone_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;

0 commit comments

Comments
 (0)