mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
Merge pull request #49 from AndreasK79/map_maidenhead_overlay
[Map] Added maidenhead overlay for WAS and WAJA map
This commit is contained in:
@@ -170,7 +170,8 @@ class Awards extends CI_Controller {
|
||||
public function waja () {
|
||||
$footerData = [];
|
||||
$footerData['scripts'] = [
|
||||
'assets/js/sections/wajamap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/wajamap.js"))
|
||||
'assets/js/sections/wajamap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/wajamap.js")),
|
||||
'assets/js/leaflet/L.Maidenhead.js',
|
||||
];
|
||||
|
||||
$this->load->model('waja');
|
||||
@@ -450,7 +451,8 @@ class Awards extends CI_Controller {
|
||||
public function was() {
|
||||
$footerData = [];
|
||||
$footerData['scripts'] = [
|
||||
'assets/js/sections/wasmap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/wasmap.js"))
|
||||
'assets/js/sections/wasmap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/wasmap.js")),
|
||||
'assets/js/leaflet/L.Maidenhead.js',
|
||||
];
|
||||
|
||||
$this->load->model('was');
|
||||
|
||||
@@ -220,6 +220,9 @@ info.addTo(map);
|
||||
addMarkers();
|
||||
});
|
||||
|
||||
var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map);
|
||||
maidenhead.addTo(map);
|
||||
|
||||
}
|
||||
|
||||
function clearMarkers() {
|
||||
|
||||
@@ -241,6 +241,9 @@ info.addTo(map);
|
||||
addMarkers();
|
||||
});
|
||||
|
||||
var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map);
|
||||
maidenhead.addTo(map);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user