Merge pull request #94 from joubu/issue_93

xbgmsharp · xbgmsharp · commit b17182c44405 · 2016-02-19T17:59:22.000Z
Fix #93: Do not autocenter if params are passed in the url
diff --git a/include/functions_map.php b/include/functions_map.php
@@ -520,7 +520,7 @@ function osm_get_js($conf, $local_conf, $js_data)
     }
     $js .= "\nif (typeof L.MarkerClusterGroup === 'function')\n";
     $js .= "    " . $divname . ".addLayer(markers);\n";
-    if ( $autocenter ) {
+    if ( $autocenter and !isset($_GET['center_lat']) and !isset($_GET['center_lng']) and !isset($_GET['zoom']) ) {
         $js .= "var group = new L.featureGroup(MarkerClusterList);";
         $js .= "this." . $divname . ".whenReady(function () {
         window.setTimeout(function () {

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ function osm_get_js($conf, $local_conf, $js_data)`
`520`	`520`	`}`
`521`	`521`	`$js .= "\nif (typeof L.MarkerClusterGroup === 'function')\n";`
`522`	`522`	`$js .= " " . $divname . ".addLayer(markers);\n";`
`523`		`- if ( $autocenter ) {`
	`523`	`+ if ( $autocenter and !isset($_GET['center_lat']) and !isset($_GET['center_lng']) and !isset($_GET['zoom']) ) {`
`524`	`524`	`$js .= "var group = new L.featureGroup(MarkerClusterList);";`
`525`	`525`	`$js .= "this." . $divname . ".whenReady(function () {`
`526`	`526`	`window.setTimeout(function () {`