@@ -617,8 +617,9 @@ |
||
617 | 617 | . "%2C" . $bbox ['maxlon']; |
618 | 618 | $imgUrl .= "&dcl=1"; |
619 | 619 | } |
620 | - if(strpos($imgUrl, "?") === false) |
|
621 | - $imgUrl .= "?"; |
|
620 | + if(strpos($imgUrl, "?") === false) { |
|
621 | + $imgUrl .= "?"; |
|
622 | + } |
|
622 | 623 | |
623 | 624 | //$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "," |
624 | 625 | // . str_replace ( "px", "", $gmap ['height'] ); |
@@ -351,14 +351,18 @@ discard block |
||
351 | 351 | public function makeMap(): void { |
352 | 352 | $this->initCoords(); |
353 | 353 | $this->createBaseMap(); |
354 | - if(!empty ($this->markers)) |
|
355 | - $this->placeMarkers(); |
|
356 | - if(file_exists($this->kmlFileName)) |
|
357 | - $this->drawKML(); |
|
358 | - if(file_exists($this->gpxFileName)) |
|
359 | - $this->drawGPX(); |
|
360 | - if(file_exists($this->geojsonFileName)) |
|
361 | - $this->drawGeojson(); |
|
354 | + if(!empty ($this->markers)) { |
|
355 | + $this->placeMarkers(); |
|
356 | + } |
|
357 | + if(file_exists($this->kmlFileName)) { |
|
358 | + $this->drawKML(); |
|
359 | + } |
|
360 | + if(file_exists($this->gpxFileName)) { |
|
361 | + $this->drawGPX(); |
|
362 | + } |
|
363 | + if(file_exists($this->geojsonFileName)) { |
|
364 | + $this->drawGeojson(); |
|
365 | + } |
|
362 | 366 | |
363 | 367 | $this->drawCopyright(); |
364 | 368 | } |
@@ -449,8 +453,9 @@ discard block |
||
449 | 453 | * for better proxy handling... |
450 | 454 | */ |
451 | 455 | public function fetchTile(string $url) { |
452 | - if($this->useTileCache && ($cached = $this->checkTileCache($url))) |
|
453 | - return $cached; |
|
456 | + if($this->useTileCache && ($cached = $this->checkTileCache($url))) { |
|
457 | + return $cached; |
|
458 | + } |
|
454 | 459 | |
455 | 460 | $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')'; |
456 | 461 | if(function_exists("curl_init")) { |