@@ -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 | } |
@@ -448,8 +452,9 @@ discard block |
||
448 | 452 | * @return bool|string |
449 | 453 | */ |
450 | 454 | public function fetchTile(string $url) { |
451 | - if($this->useTileCache && ($cached = $this->checkTileCache($url))) |
|
452 | - return $cached; |
|
455 | + if($this->useTileCache && ($cached = $this->checkTileCache($url))) { |
|
456 | + return $cached; |
|
457 | + } |
|
453 | 458 | |
454 | 459 | $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')'; |
455 | 460 | if(function_exists("curl_init")) { |