mprins / dokuwiki-plugin-openlayersmap

StaticMap.php

Braces +15 added lines, -10 removed lines

@@ -351,14 +351,18 @@ 
     public function makeMap(): void {
         $this->initCoords();
         $this->createBaseMap();
-        if(!empty ($this->markers))
-            $this->placeMarkers();
-        if(file_exists($this->kmlFileName))
-            $this->drawKML();
-        if(file_exists($this->gpxFileName))
-            $this->drawGPX();
-        if(file_exists($this->geojsonFileName))
-            $this->drawGeojson();
+        if(!empty ($this->markers)) {
+                    $this->placeMarkers();
+        }
+        if(file_exists($this->kmlFileName)) {
+                    $this->drawKML();
+        }
+        if(file_exists($this->gpxFileName)) {
+                    $this->drawGPX();
+        }
+        if(file_exists($this->geojsonFileName)) {
+                    $this->drawGeojson();
+        }
 
         $this->drawCopyright();
     }
@@ -449,8 +453,9 @@ 
      *          for better proxy handling...
      */
     public function fetchTile(string $url) {
-        if($this->useTileCache && ($cached = $this->checkTileCache($url)))
-            return $cached;
+        if($this->useTileCache && ($cached = $this->checkTileCache($url))) {
+                    return $cached;
+        }
 
         $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')';
         if(function_exists("curl_init")) {

Spacing +66 added lines, -66 removed lines

@@ -21,7 +21,7 @@ 
 
 // phpcs:disable PSR1.Files.SideEffects
 // TODO resolve side effect
-include_once(realpath(__DIR__) . '/../geophp/geoPHP/geoPHP.inc');
+include_once(realpath(__DIR__).'/../geophp/geoPHP/geoPHP.inc');
 
 /**
  *
@@ -205,7 +205,7 @@ 
         $this->height = $height;
         // validate + set maptype
         $this->maptype = $this->tileDefaultSrc;
-        if(array_key_exists($maptype, $this->tileInfo)) {
+        if (array_key_exists($maptype, $this->tileInfo)) {
             $this->maptype = $maptype;
         }
         $this->markers          = $markers;
@@ -213,9 +213,9 @@ 
         $this->gpxFileName      = $gpx;
         $this->geojsonFileName  = $geojson;
         $this->mediaBaseDir     = $mediaDir;
-        $this->tileCacheBaseDir = $tileCacheBaseDir . '/olmaptiles';
+        $this->tileCacheBaseDir = $tileCacheBaseDir.'/olmaptiles';
         $this->useTileCache     = $this->tileCacheBaseDir !== '';
-        $this->mapCacheBaseDir  = $mediaDir . '/olmapmaps';
+        $this->mapCacheBaseDir  = $mediaDir.'/olmapmaps';
         $this->autoZoomExtent   = $autoZoomExtent;
         $this->apikey           = $apikey;
     }
@@ -227,15 +227,15 @@ 
      */
     public function getMap(): string {
         try {
-            if($this->autoZoomExtent) {
+            if ($this->autoZoomExtent) {
                 $this->autoZoom();
             }
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             dbglog($e);
         }
 
         // use map cache, so check cache for map
-        if(!$this->checkMapCache()) {
+        if (!$this->checkMapCache()) {
             // map is not in cache, needs to be build
             $this->makeMap();
             $this->mkdirRecursive(dirname($this->mapCacheIDToFilename()), 0777);
@@ -258,37 +258,37 @@ 
      */
     private function autoZoom(float $paddingFactor = 1.0): void {
         $geoms    = array();
-        $geoms [] = new Point ($this->lon, $this->lat);
-        if(!empty ($this->markers)) {
-            foreach($this->markers as $marker) {
-                $geoms [] = new Point ($marker ['lon'], $marker ['lat']);
+        $geoms [] = new Point($this->lon, $this->lat);
+        if (!empty ($this->markers)) {
+            foreach ($this->markers as $marker) {
+                $geoms [] = new Point($marker ['lon'], $marker ['lat']);
             }
         }
-        if(file_exists($this->kmlFileName)) {
+        if (file_exists($this->kmlFileName)) {
             $g = geoPHP::load(file_get_contents($this->kmlFileName), 'kml');
-            if($g !== false) {
+            if ($g !== false) {
                 $geoms [] = $g;
             }
         }
-        if(file_exists($this->gpxFileName)) {
+        if (file_exists($this->gpxFileName)) {
             $g = geoPHP::load(file_get_contents($this->gpxFileName), 'gpx');
-            if($g !== false) {
+            if ($g !== false) {
                 $geoms [] = $g;
             }
         }
-        if(file_exists($this->geojsonFileName)) {
+        if (file_exists($this->geojsonFileName)) {
             $g = geoPHP::load(file_get_contents($this->geojsonFileName), 'geojson');
-            if($g !== false) {
+            if ($g !== false) {
                 $geoms [] = $g;
             }
         }
 
-        if(count($geoms) <= 1) {
+        if (count($geoms) <= 1) {
             dbglog($geoms, "StaticMap::autoZoom: Skip setting autozoom options");
             return;
         }
 
-        $geom     = new GeometryCollection ($geoms);
+        $geom     = new GeometryCollection($geoms);
         $centroid = $geom->centroid();
         $bbox     = $geom->getBBox();
 
@@ -304,7 +304,7 @@ 
         $resolution           = max($resolutionHorizontal, $resolutionVertical) * $paddingFactor;
         $zoom                 = log(360 / ($resolution * $this->tileSize), 2);
 
-        if(is_finite($zoom) && $zoom < 15 && $zoom > 2) {
+        if (is_finite($zoom) && $zoom < 15 && $zoom > 2) {
             $this->zoom = floor($zoom);
         }
         $this->lon = $centroid->getX();
@@ -337,12 +337,12 @@ 
     }
 
     public function mapCacheIDToFilename(): string {
-        if(!$this->mapCacheFile) {
-            $this->mapCacheFile = $this->mapCacheBaseDir . "/" . $this->maptype . "/" . $this->zoom . "/cache_"
-                . substr($this->mapCacheID, 0, 2) . "/" . substr($this->mapCacheID, 2, 2)
-                . "/" . substr($this->mapCacheID, 4);
+        if (!$this->mapCacheFile) {
+            $this->mapCacheFile = $this->mapCacheBaseDir."/".$this->maptype."/".$this->zoom."/cache_"
+                . substr($this->mapCacheID, 0, 2)."/".substr($this->mapCacheID, 2, 2)
+                . "/".substr($this->mapCacheID, 4);
         }
-        return $this->mapCacheFile . "." . $this->mapCacheExtension;
+        return $this->mapCacheFile.".".$this->mapCacheExtension;
     }
 
     /**
@@ -351,13 +351,13 @@ 
     public function makeMap(): void {
         $this->initCoords();
         $this->createBaseMap();
-        if(!empty ($this->markers))
+        if (!empty ($this->markers))
             $this->placeMarkers();
-        if(file_exists($this->kmlFileName))
+        if (file_exists($this->kmlFileName))
             $this->drawKML();
-        if(file_exists($this->gpxFileName))
+        if (file_exists($this->gpxFileName))
             $this->drawGPX();
-        if(file_exists($this->geojsonFileName))
+        if (file_exists($this->geojsonFileName))
             $this->drawGeojson();
 
         $this->drawCopyright();
@@ -408,8 +408,8 @@ 
         $this->offsetX += floor($startX - floor($this->centerX)) * $this->tileSize;
         $this->offsetY += floor($startY - floor($this->centerY)) * $this->tileSize;
 
-        for($x = $startX; $x <= $endX; $x++) {
-            for($y = $startY; $y <= $endY; $y++) {
+        for ($x = $startX; $x <= $endX; $x++) {
+            for ($y = $startY; $y <= $endY; $y++) {
                 $url = str_replace(
                     array(
                         '{Z}',
@@ -423,7 +423,7 @@ 
                 );
 
                 $tileData = $this->fetchTile($url);
-                if($tileData) {
+                if ($tileData) {
                     $tileImage = imagecreatefromstring($tileData);
                 } else {
                     $tileImage = imagecreate($this->tileSize, $this->tileSize);
@@ -449,17 +449,17 @@ 
      *          for better proxy handling...
      */
     public function fetchTile(string $url) {
-        if($this->useTileCache && ($cached = $this->checkTileCache($url)))
+        if ($this->useTileCache && ($cached = $this->checkTileCache($url)))
             return $cached;
 
-        $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')';
-        if(function_exists("curl_init")) {
+        $_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; '.PHP_OS.')';
+        if (function_exists("curl_init")) {
             // use cUrl
             $ch = curl_init();
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($ch, CURLOPT_USERAGENT, $_UA);
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-            curl_setopt($ch, CURLOPT_URL, $url . $this->apikey);
+            curl_setopt($ch, CURLOPT_URL, $url.$this->apikey);
             dbglog("StaticMap::fetchTile: getting: $url using curl_exec");
             $tile = curl_exec($ch);
             curl_close($ch);
@@ -469,21 +469,21 @@ 
             $opts = array(
                 'http' => array(
                     'method'          => "GET",
-                    'header'          => "Accept-language: en\r\n" . "User-Agent: $_UA\r\n" . "accept: image/png\r\n",
+                    'header'          => "Accept-language: en\r\n"."User-Agent: $_UA\r\n"."accept: image/png\r\n",
                     'request_fulluri' => true
                 )
             );
-            if(isset($conf['proxy']['host'], $conf['proxy']['port'])
+            if (isset($conf['proxy']['host'], $conf['proxy']['port'])
                 && $conf['proxy']['host'] !== ''
                 && $conf['proxy']['port'] !== '') {
-                $opts['http'] += ['proxy' => "tcp://" . $conf['proxy']['host'] . ":" . $conf['proxy']['port']];
+                $opts['http'] += ['proxy' => "tcp://".$conf['proxy']['host'].":".$conf['proxy']['port']];
             }
 
             $context = stream_context_create($opts);
             dbglog("StaticMap::fetchTile: getting: $url . $this->apikey using file_get_contents and options $opts");
-            $tile = file_get_contents($url . $this->apikey, false, $context);
+            $tile = file_get_contents($url.$this->apikey, false, $context);
         }
-        if($tile && $this->useTileCache) {
+        if ($tile && $this->useTileCache) {
             $this->writeTileToCache($url, $tile);
         }
         return $tile;
@@ -496,7 +496,7 @@ 
      */
     public function checkTileCache(string $url) {
         $filename = $this->tileUrlToFilename($url);
-        if(file_exists($filename)) {
+        if (file_exists($filename)) {
             return file_get_contents($filename);
         }
         return false;
@@ -508,7 +508,7 @@ 
      * @return string
      */
     public function tileUrlToFilename(string $url): string {
-        return $this->tileCacheBaseDir . "/" . substr($url, strpos($url, '/') + 1);
+        return $this->tileCacheBaseDir."/".substr($url, strpos($url, '/') + 1);
     }
 
     /**
@@ -543,9 +543,9 @@ 
         $count         = 0;
         $color         = imagecolorallocate($this->image, 0, 0, 0);
         $bgcolor       = imagecolorallocate($this->image, 200, 200, 200);
-        $markerBaseDir = __DIR__ . '/icons';
+        $markerBaseDir = __DIR__.'/icons';
         // loop thru marker array
-        foreach($this->markers as $marker) {
+        foreach ($this->markers as $marker) {
             // set some local variables
             $markerLat  = $marker ['lat'];
             $markerLon  = $marker ['lon'];
@@ -555,18 +555,18 @@ 
             $markerShadow   = '';
             $matches        = false;
             // check for marker type, get settings from markerPrototypes
-            if($markerType) {
-                foreach($this->markerPrototypes as $markerPrototype) {
-                    if(preg_match($markerPrototype ['regex'], $markerType, $matches)) {
-                        $markerFilename = $matches [0] . $markerPrototype ['extension'];
-                        if($markerPrototype ['offsetImage']) {
+            if ($markerType) {
+                foreach ($this->markerPrototypes as $markerPrototype) {
+                    if (preg_match($markerPrototype ['regex'], $markerType, $matches)) {
+                        $markerFilename = $matches [0].$markerPrototype ['extension'];
+                        if ($markerPrototype ['offsetImage']) {
                             list ($markerImageOffsetX, $markerImageOffsetY) = explode(
                                 ",",
                                 $markerPrototype ['offsetImage']
                             );
                         }
                         $markerShadow = $markerPrototype ['shadow'];
-                        if($markerShadow) {
+                        if ($markerShadow) {
                             list ($markerShadowOffsetX, $markerShadowOffsetY) = explode(
                                 ",",
                                 $markerPrototype ['offsetShadow']
@@ -576,14 +576,14 @@ 
                 }
             }
             // create img resource
-            if(file_exists($markerBaseDir . '/' . $markerFilename)) {
-                $markerImg = imagecreatefrompng($markerBaseDir . '/' . $markerFilename);
+            if (file_exists($markerBaseDir.'/'.$markerFilename)) {
+                $markerImg = imagecreatefrompng($markerBaseDir.'/'.$markerFilename);
             } else {
-                $markerImg = imagecreatefrompng($markerBaseDir . '/marker.png');
+                $markerImg = imagecreatefrompng($markerBaseDir.'/marker.png');
             }
             // check for shadow + create shadow recource
-            if($markerShadow && file_exists($markerBaseDir . '/' . $markerShadow)) {
-                $markerShadowImg = imagecreatefrompng($markerBaseDir . '/' . $markerShadow);
+            if ($markerShadow && file_exists($markerBaseDir.'/'.$markerShadow)) {
+                $markerShadowImg = imagecreatefrompng($markerBaseDir.'/'.$markerShadow);
             }
             // calc position
             $destX = floor(
@@ -595,7 +595,7 @@ 
                 $this->tileSize * ($this->centerY - $this->latToTile($markerLat, $this->zoom))
             );
             // copy shadow on basemap
-            if($markerShadow && $markerShadowImg) {
+            if ($markerShadow && $markerShadowImg) {
                 imagecopy(
                     $this->image,
                     $markerShadowImg,
@@ -656,14 +656,14 @@ 
      *            drawing colour
      */
     private function drawGeometry(Geometry $geom, int $colour): void {
-        if(empty($geom)) {
+        if (empty($geom)) {
             return;
         }
 
-        switch($geom->geometryType()) {
+        switch ($geom->geometryType()) {
             case 'GeometryCollection' :
                 // recursively draw part of the collection
-                for($i = 1; $i < $geom->numGeometries() + 1; $i++) {
+                for ($i = 1; $i < $geom->numGeometries() + 1; $i++) {
                     $_geom = $geom->geometryN($i);
                     $this->drawGeometry($_geom, $colour);
                 }
@@ -705,7 +705,7 @@ 
         // extring is a linestring actually..
         $extRing = $polygon->exteriorRing();
 
-        for($i = 1; $i < $extRing->numGeometries(); $i++) {
+        for ($i = 1; $i < $extRing->numGeometries(); $i++) {
             $p1           = $extRing->geometryN($i);
             $x            = floor(
                 ($this->width / 2) - $this->tileSize * ($this->centerX - $this->lonToTile($p1->x(), $this->zoom))
@@ -731,7 +731,7 @@ 
      */
     private function drawLineString($line, $colour) {
         imagesetthickness($this->image, 2);
-        for($p = 1; $p < $line->numGeometries(); $p++) {
+        for ($p = 1; $p < $line->numGeometries(); $p++) {
             // get first pair of points
             $p1 = $line->geometryN($p);
             $p2 = $line->geometryN($p + 1);
@@ -802,8 +802,8 @@ 
      * add copyright and origin notice and icons to the map.
      */
     public function drawCopyright() {
-        $logoBaseDir = dirname(__FILE__) . '/' . 'logo/';
-        $logoImg     = imagecreatefrompng($logoBaseDir . $this->tileInfo ['openstreetmap'] ['logo']);
+        $logoBaseDir = dirname(__FILE__).'/'.'logo/';
+        $logoImg     = imagecreatefrompng($logoBaseDir.$this->tileInfo ['openstreetmap'] ['logo']);
         $textcolor   = imagecolorallocate($this->image, 0, 0, 0);
         $bgcolor     = imagecolorallocate($this->image, 200, 200, 200);
 
@@ -836,11 +836,11 @@ 
 
         // additional tile source info, ie. who created/hosted the tiles
         $xIconOffset = 0;
-        if($this->maptype === 'openstreetmap') {
+        if ($this->maptype === 'openstreetmap') {
             $mapAuthor = "(c) OpenStreetMap maps/CC BY-SA";
         } else {
             $mapAuthor   = $this->tileInfo [$this->maptype] ['txt'];
-            $iconImg     = imagecreatefrompng($logoBaseDir . $this->tileInfo [$this->maptype] ['logo']);
+            $iconImg     = imagecreatefrompng($logoBaseDir.$this->tileInfo [$this->maptype] ['logo']);
             $xIconOffset = imagesx($iconImg);
             imagecopy(
                 $this->image,