Merge pull request #11 from phl0/tileUrl

Use globally configured tileUrl for CQ map
magicbug · Oct 12, 2022 · 21b2725 · 21b2725
2 parents 0f3d88f + df4dcf9
commit 21b2725
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
@@ -41,7 +41,7 @@ function load_was_map() {
 
 <?php if ($this->uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq") ) { ?>
     <script src="<?php echo base_url(); ?>assets/js/Polyline.encoded.js"></script>
-    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/cqmap.js"></script>
+    <script id="cqmapjs" type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/cqmap.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
 <?php } ?>
 
 <?php if ($this->uri->segment(1) == "statistics") { ?>

diff --git a/assets/js/sections/cqmap.js b/assets/js/sections/cqmap.js