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

Merge pull request #1617 from phl0/tileUrl

浏览代码 
Use globally configured tile URL from DB options
这个提交包含在：
Peter Goodhall 2022-09-23 17:26:22 +01:00 提交者 GitHub
当前提交 442c8ff328
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 8 次插入 和 7 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

12
application/views/interface_assets/footer.php
查看文件

@ -562,7 +562,7 @@ function newpath(latlng1, latlng2, locator1, locator2) {
var maidenhead = L.maidenheadqrb().addTo(map); var maidenhead = L.maidenheadqrb().addTo(map);
var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; var osmUrl='<?php echo $this->optionslib->get_option('option_map_tile_server');?>';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
@ -615,7 +615,7 @@ function showActivatorsMap(call, count, grids) {
var maidenhead = new L.maidenheadactivators(grid_four).addTo(map); var maidenhead = new L.maidenheadactivators(grid_four).addTo(map);
var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; var osmUrl='<?php echo $this->optionslib->get_option('option_map_tile_server');?>';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
@ -713,7 +713,7 @@ function getLookupResult() {
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/tempusdominus-bootstrap-4.min.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/tempusdominus-bootstrap-4.min.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script> <script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js"></script> <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()
@ -744,7 +744,7 @@ function getLookupResult() {
<?php if ($this->uri->segment(1) == "map" && $this->uri->segment(2) == "") { ?> <?php if ($this->uri->segment(1) == "map" && $this->uri->segment(2) == "") { ?>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script> <script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js"></script> <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()
@ -775,7 +775,7 @@ function getLookupResult() {
<?php if ($this->uri->segment(1) == "" || $this->uri->segment(1) == "dashboard" ) { ?> <?php if ($this->uri->segment(1) == "" || $this->uri->segment(1) == "dashboard" ) { ?>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script> <script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js"></script> <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()
@ -871,7 +871,7 @@ $(document).on('keypress',function(e) {
<?php if ($this->uri->segment(1) == "logbook" && $this->uri->segment(2) != "view") { ?> <?php if ($this->uri->segment(1) == "logbook" && $this->uri->segment(2) != "view") { ?>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script> <script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js"></script> <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()

3
assets/js/leaflet/leafembed.js
查看文件

@ -10,6 +10,8 @@ var greenIcon = L.icon({
iconSize: [10, 10], // size of the icon iconSize: [10, 10], // size of the icon
}); });
var osmUrl = $('#leafembed').attr("tileUrl");
function initmap(ShowGrid = 'No', MapTag = 'map') { function initmap(ShowGrid = 'No', MapTag = 'map') {
// set up AJAX request // set up AJAX request
ajaxRequest=getXmlHttpObject(); ajaxRequest=getXmlHttpObject();
@ -22,7 +24,6 @@ function initmap(ShowGrid = 'No', MapTag = 'map') {
map = new L.Map(MapTag); map = new L.Map(MapTag);
// create the tile layer with correct attribution // create the tile layer with correct attribution
var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});