Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed and improved asynchronous loading #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed and improved asynchronous loading #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
607d8d8
Fixed and improved asynchronous loading
mikeschutz Mar 20, 2014
73f6131
Fixed hardcoded map name
mikeschutz Mar 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 32 additions & 25 deletions application/libraries/Googlemaps.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class Googlemaps {
var $kmlLayerPreserveViewport = FALSE; // Specifies whether the map should be adjusted to the bounds of the KmlLayer's contents. By default the map is zoomed and positioned to show the entirety of the layer's contents
var $language = ''; // The map will by default load in the language of the browser. This can be overriden however here. For a full list of codes see https://spreadsheets.google.com/pub?key=p9pdwsai2hDMsLkXsoM05KQ&gid=1
var $loadAsynchronously = FALSE; // Load the map and API asynchronously once the page has loaded
var $loadAsynchDelay = 1000; // Number of milliseconds to delay initializing asynchronously-loaded maps, to avoid problems initializing before ready
var $map_div_id = "map_canvas"; // The ID of the <div></div> that is output which contains the map
var $map_height = "450px"; // The height of the map container. Any units (ie 'px') can be used. If no units are provided 'px' will be presumed
var $map_name = "map"; // The JS reference to the map. Currently not used but to be used in the future when multiple maps are supported
Expand Down Expand Up @@ -1189,6 +1190,10 @@ function create_map()
';
}

$this->output_js_contents .= 'function initialize_'.$this->map_name.'() {

';

$this->output_js_contents .= '
var iw_'.$this->map_name.' = new google.maps.InfoWindow(';
if ($this->infowindowMaxWidth != 0)
Expand All @@ -1200,10 +1205,7 @@ function create_map()
$this->output_js_contents .= ');

';

$this->output_js_contents .= 'function initialize_'.$this->map_name.'() {

';


$styleOutput = '';
if (count($this->styles)) {
Expand Down Expand Up @@ -1745,91 +1747,91 @@ function create_map()
}

if ($this->onboundschanged!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "bounds_changed", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "bounds_changed", function(event) {
'.$this->onboundschanged.'
});
';
}
if ($this->oncenterchanged!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "center_changed", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "center_changed", function(event) {
'.$this->oncenterchanged.'
});
';
}
if ($this->onclick!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "click", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "click", function(event) {
'.$this->onclick.'
});
';
}
if ($this->ondblclick!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "dblclick", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "dblclick", function(event) {
'.$this->ondblclick.'
});
';
}
if ($this->ondrag!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "drag", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "drag", function(event) {
'.$this->ondrag.'
});
';
}
if ($this->ondragend!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "dragend", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "dragend", function(event) {
'.$this->ondragend.'
});
';
}
if ($this->ondragstart!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "dragstart", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "dragstart", function(event) {
'.$this->ondragstart.'
});
';
}
if ($this->onidle!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "idle", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "idle", function(event) {
'.$this->onidle.'
});
';
}
if ($this->onmousemove!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "mousemove", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "mousemove", function(event) {
'.$this->onmousemove.'
});
';
}
if ($this->onmouseout!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "mouseout", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "mouseout", function(event) {
'.$this->onmouseout.'
});
';
}
if ($this->onmouseover!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "mouseover", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "mouseover", function(event) {
'.$this->onmouseover.'
});
';
}
if ($this->onresize!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "resize", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "resize", function(event) {
'.$this->onresize.'
});
';
}
if ($this->onrightclick!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "rightclick", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "rightclick", function(event) {
'.$this->onrightclick.'
});
';
}
if ($this->ontilesloaded!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "tilesloaded", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "tilesloaded", function(event) {
'.$this->ontilesloaded.'
});
';
}
if ($this->onzoomchanged!="") {
$this->output_js_contents .= 'google.maps.event.addListener(map, "zoom_changed", function(event) {
$this->output_js_contents .= 'google.maps.event.addListener('.$this->map_name.', "zoom_changed", function(event) {
'.$this->onzoomchanged.'
});
';
Expand Down Expand Up @@ -2113,12 +2115,17 @@ function fitMapToBounds_'.$this->map_name.'() {
if ($this->loadAsynchronously) {
$this->output_js_contents .= '
function loadScript_'.$this->map_name.'() {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "'.$apiLocation.'&callback=initialize_'.$this->map_name.'";
document.body.appendChild(script);
if (typeof google === "object" && typeof google.maps === "object") {
setTimeout(initialize_'.$this->map_name.', '.$this->loadAsynchDelay.');
return;
} else {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "'.$apiLocation.'&callback=initialize_'.$this->map_name.'";
document.body.appendChild(script);
}
}
window.onload = loadScript_'.$this->map_name.';
window.onload = loadScript_'.$this->map_name.'();
';
}else{
$this->output_js_contents .= '
Expand Down Expand Up @@ -2258,4 +2265,4 @@ function get_lat_long_from_address($address, $attempts = 0)

}

?>
?>