mprins / dokuwiki-plugin-openlayersmap

syntax/osmlayer.php

Spacing +4 added lines, -4 removed lines

@@ -117,13 +117,13 @@
         static $overlaynumber = 0;
 
         list ($id, $url, $name, $visible) = $data;
-        $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
-        $str           = '{';
+        $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,';
+        $str = '{';
         foreach ($data as $key => $val) {
-            $str .= "'" . $key . "' : '" . $val . "',";
+            $str .= "'".$key."' : '".$val."',";
         }
         $str           .= '"type":"osm"}';
-        $renderer->doc .= base64_encode("olMapOverlays['osm" . $overlaynumber . "'] = " . $str . ";")
+        $renderer->doc .= base64_encode("olMapOverlays['osm".$overlaynumber."'] = ".$str.";")
             . '"></script>';
         $overlaynumber++;
         return true;

syntax/agslayer.php

Spacing +4 added lines, -4 removed lines

@@ -121,13 +121,13 @@
         static $overlaynumber = 0;
 
         list ($id, $url, $name, $visible) = $data;
-        $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
-        $str           = '{';
+        $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,';
+        $str = '{';
         foreach ($data as $key => $val) {
-            $str .= "'" . $key . "' : '" . $val . "',";
+            $str .= "'".$key."' : '".$val."',";
         }
         $str           .= "'type':'ags'}";
-        $renderer->doc .= base64_encode("olMapOverlays['ags" . $overlaynumber . "'] = " . $str . ";")
+        $renderer->doc .= base64_encode("olMapOverlays['ags".$overlaynumber."'] = ".$str.";")
             . '"></script>';
         $overlaynumber++;
         return true;

syntax/wmslayer.php

Spacing +4 added lines, -4 removed lines

@@ -120,13 +120,13 @@
         static $overlaynumber = 0;
 
         list ($id, $url, $name, $visible) = $data;
-        $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,';
-        $str           = '{';
+        $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,';
+        $str = '{';
         foreach ($data as $key => $val) {
-            $str .= "'" . $key . "' : '" . $val . "',";
+            $str .= "'".$key."' : '".$val."',";
         }
         $str           .= "'type':'wms'}";
-        $renderer->doc .= base64_encode("olMapOverlays['wms" . $overlaynumber . "'] = " . $str . ";")
+        $renderer->doc .= base64_encode("olMapOverlays['wms".$overlaynumber."'] = ".$str.";")
             . '"></script>';
         $overlaynumber++;
         return true;

syntax/olmap.php

Spacing +130 added lines, -130 removed lines

@@ -94,10 +94,10 @@ 
         preg_match('(lon[:|=]\"-?\d*\.?\d*\")', $match, $mainLon);
         $mainLat = substr($mainLat [0], 5, -1);
         $mainLon = substr($mainLon [0], 5, -1);
-        if(!is_numeric($mainLat)) {
+        if (!is_numeric($mainLat)) {
             $mainLat = $this->dflt ['lat'];
         }
-        if(!is_numeric($mainLon)) {
+        if (!is_numeric($mainLon)) {
             $mainLon = $this->dflt ['lon'];
         }
 
@@ -108,23 +108,23 @@ 
         $_nocache = false;
         // choose maptype based on the specified tag
         $imgUrl = "{{";
-        if(stripos($gmap ['baselyr'], 'google') !== false) {
+        if (stripos($gmap ['baselyr'], 'google') !== false) {
             // Google
             $imgUrl .= $this->getGoogle($gmap, $overlay);
             $imgUrl .= "&.png";
-        } elseif(stripos($gmap ['baselyr'], 'bing') !== false) {
+        } elseif (stripos($gmap ['baselyr'], 'bing') !== false) {
             // Bing
-            if(!$this->getConf('bingAPIKey')) {
+            if (!$this->getConf('bingAPIKey')) {
                 // in case there is no Bing api key we'll use OSM
                 $_firstimageID = $this->getStaticOSM($gmap, $overlay);
-                $imgUrl        .= $_firstimageID;
-                if($this->getConf('optionStaticMapGenerator') == 'remote') {
+                $imgUrl .= $_firstimageID;
+                if ($this->getConf('optionStaticMapGenerator') == 'remote') {
                     $imgUrl .= "&.png";
                 }
             } else {
                 // seems that Bing doesn't like the DW client, turn off caching
                 $_nocache = true;
-                $imgUrl   .= $this->getBing($gmap, $overlay) . "&.png";
+                $imgUrl .= $this->getBing($gmap, $overlay)."&.png";
             }
         } /* elseif (stripos ( $gmap ['baselyr'], 'mapquest' ) !== false) {
             // MapQuest
@@ -142,33 +142,33 @@ 
         } */ else {
             // default OSM
             $_firstimageID = $this->getStaticOSM($gmap, $overlay);
-            $imgUrl        .= $_firstimageID;
-            if($this->getConf('optionStaticMapGenerator') == 'remote') {
+            $imgUrl .= $_firstimageID;
+            if ($this->getConf('optionStaticMapGenerator') == 'remote') {
                 $imgUrl .= "&.png";
             }
         }
 
         // append dw p_render specific params and render
-        $imgUrl .= "?" . str_replace("px", "", $gmap ['width']) . "x"
+        $imgUrl .= "?".str_replace("px", "", $gmap ['width'])."x"
             . str_replace("px", "", $gmap ['height']);
         $imgUrl .= "&nolink";
 
         // add nocache option for selected services
-        if($_nocache) {
+        if ($_nocache) {
             $imgUrl .= "&nocache";
         }
 
-        $imgUrl .= " |" . $gmap ['summary'] . " }}";
+        $imgUrl .= " |".$gmap ['summary']." }}";
 
         // dbglog($imgUrl,"complete image tags is:");
 
         $mapid = $gmap ['id'];
         // create a javascript parameter string for the map
         $param = '';
-        foreach($gmap as $key => $val) {
-            $param .= is_numeric($val) ? "$key: $val, " : "$key: '" . hsc($val) . "', ";
+        foreach ($gmap as $key => $val) {
+            $param .= is_numeric($val) ? "$key: $val, " : "$key: '".hsc($val)."', ";
         }
-        if(!empty ($param)) {
+        if (!empty ($param)) {
             $param = substr($param, 0, -2);
         }
         unset ($gmap ['id']);
@@ -177,13 +177,13 @@ 
         $poi      = '';
         $poitable = '';
         $rowId    = 0;
-        if(!empty ($overlay)) {
-            foreach($overlay as $data) {
+        if (!empty ($overlay)) {
+            foreach ($overlay as $data) {
                 list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
                 $rowId++;
                 $poi .= ", {lat:$lat,lon:$lon,txt:'$text',angle:$angle,opacity:$opacity,img:'$img',rowId: $rowId}";
 
-                if($this->getConf('displayformat') === 'DMS') {
+                if ($this->getConf('displayformat') === 'DMS') {
                     $lat = $this->convertLat($lat);
                     $lon = $this->convertLon($lon);
                 } else {
@@ -193,52 +193,52 @@ 
 
                 $poitable .= '
                     <tr>
-                    <td class="rowId">' . $rowId . '</td>
-                    <td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/icons/' . $img . '" alt="'
-                    . substr($img, 0, -4) . $this->getlang('alt_legend_poi') . '" /></td>
-                    <td class="lat" title="' . $this->getLang('olmapPOIlatTitle') . '">' . $lat . '</td>
-                    <td class="lon" title="' . $this->getLang('olmapPOIlonTitle') . '">' . $lon . '</td>
-                    <td class="txt">' . $text . '</td>
+                    <td class="rowId">' . $rowId.'</td>
+                    <td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/icons/'.$img.'" alt="'
+                    . substr($img, 0, -4).$this->getlang('alt_legend_poi').'" /></td>
+                    <td class="lat" title="' . $this->getLang('olmapPOIlatTitle').'">'.$lat.'</td>
+                    <td class="lon" title="' . $this->getLang('olmapPOIlonTitle').'">'.$lon.'</td>
+                    <td class="txt">' . $text.'</td>
                     </tr>';
             }
             $poi = substr($poi, 2);
         }
-        if(!empty ($gmap ['kmlfile'])) {
+        if (!empty ($gmap ['kmlfile'])) {
             $poitable .= '
                     <tr>
                     <td class="rowId"><img src="' . DOKU_BASE
                 . 'lib/plugins/openlayersmap/toolbar/kml_file.png" alt="KML file" /></td>
-                    <td class="icon"><img src="' . DOKU_BASE . 'lib/plugins/openlayersmap/toolbar/kml_line.png" alt="'
-                . $this->getlang('alt_legend_kml') . '" /></td>
-                    <td class="txt" colspan="3">KML track: ' . $this->getFileName($gmap ['kmlfile']) . '</td>
+                    <td class="icon"><img src="' . DOKU_BASE.'lib/plugins/openlayersmap/toolbar/kml_line.png" alt="'
+                . $this->getlang('alt_legend_kml').'" /></td>
+                    <td class="txt" colspan="3">KML track: ' . $this->getFileName($gmap ['kmlfile']).'</td>
                     </tr>';
         }
-        if(!empty ($gmap ['gpxfile'])) {
+        if (!empty ($gmap ['gpxfile'])) {
             $poitable .= '
                     <tr>
                     <td class="rowId"><img src="' . DOKU_BASE
                 . 'lib/plugins/openlayersmap/toolbar/gpx_file.png" alt="GPX file" /></td>
                     <td class="icon"><img src="' . DOKU_BASE
                 . 'lib/plugins/openlayersmap/toolbar/gpx_line.png" alt="'
-                . $this->getlang('alt_legend_gpx') . '" /></td>
-                    <td class="txt" colspan="3">GPX track: ' . $this->getFileName($gmap ['gpxfile']) . '</td>
+                . $this->getlang('alt_legend_gpx').'" /></td>
+                    <td class="txt" colspan="3">GPX track: ' . $this->getFileName($gmap ['gpxfile']).'</td>
                     </tr>';
         }
-        if(!empty ($gmap ['geojsonfile'])) {
+        if (!empty ($gmap ['geojsonfile'])) {
             $poitable .= '
                     <tr>
                     <td class="rowId"><img src="' . DOKU_BASE
                 . 'lib/plugins/openlayersmap/toolbar/geojson_file.png" alt="GeoJSON file" /></td>
                     <td class="icon"><img src="' . DOKU_BASE
                 . 'lib/plugins/openlayersmap/toolbar/geojson_line.png" alt="'
-                . $this->getlang('alt_legend_geojson') . '" /></td>
-                    <td class="txt" colspan="3">GeoJSON track: ' . $this->getFileName($gmap ['geojsonfile']) . '</td>
+                . $this->getlang('alt_legend_geojson').'" /></td>
+                    <td class="txt" colspan="3">GeoJSON track: ' . $this->getFileName($gmap ['geojsonfile']).'</td>
                     </tr>';
         }
 
         $autozoom = empty ($gmap ['autozoom']) ? $this->getConf('autoZoomMap') : $gmap ['autozoom'];
-        $js       = "{mapOpts: {" . $param . ", displayformat: '" . $this->getConf('displayformat')
-            . "', autozoom: " . $autozoom . "}, poi: [$poi]};";
+        $js       = "{mapOpts: {".$param.", displayformat: '".$this->getConf('displayformat')
+            . "', autozoom: ".$autozoom."}, poi: [$poi]};";
         // unescape the json
         $poitable = stripslashes($poitable);
 
@@ -266,21 +266,21 @@ 
         preg_match_all('/(\w*)="(.*?)"/us', $str_params, $param, PREG_SET_ORDER);
         // parse match for instructions, break into key value pairs
         $gmap = $this->dflt;
-        foreach($gmap as $key => &$value) {
-            $defval = $this->getConf('default_' . $key);
-            if($defval !== '') {
+        foreach ($gmap as $key => &$value) {
+            $defval = $this->getConf('default_'.$key);
+            if ($defval !== '') {
                 $value = $defval;
             }
         }
         unset ($value);
-        foreach($param as $kvpair) {
+        foreach ($param as $kvpair) {
             list ($match, $key, $val) = $kvpair;
             $key = strtolower($key);
-            if(isset ($gmap [$key])) {
-                if($key == 'summary') {
+            if (isset ($gmap [$key])) {
+                if ($key == 'summary') {
                     // preserve case for summary field
                     $gmap [$key] = $val;
-                } elseif($key == 'id') {
+                } elseif ($key == 'id') {
                     // preserve case for id field
                     $gmap [$key] = $val;
                 } else {
@@ -316,7 +316,7 @@ 
         );
         // create poi array
         $overlay = array();
-        foreach($point as $pt) {
+        foreach ($point as $pt) {
             list ($match, $lat, $lon, $angle, $opacity, $img, $text) = $pt;
             $lat     = is_numeric($lat) ? $lat : 0;
             $lon     = is_numeric($lon) ? $lon : 0;
@@ -350,10 +350,10 @@ 
      */
     private function getGoogle(array $gmap, array $overlay): string {
         $sUrl = $this->getConf('iconUrlOverload');
-        if(!$sUrl) {
+        if (!$sUrl) {
             $sUrl = DOKU_URL;
         }
-        switch($gmap ['baselyr']) {
+        switch ($gmap ['baselyr']) {
             case 'google hybrid' :
                 $maptype = 'hybrid';
                 break;
@@ -373,29 +373,29 @@ 
         // see: https://developers.google.com/maps/documentation/staticmaps/index#Viewports
         // http://maps.google.com/maps/api/staticmap?center=51.565690,5.456756&zoom=16&size=600x400&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/marker.png|label:1|51.565690,5.456756&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/marker-blue.png|51.566197,5.458966|label:2&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/parking.png|51.567177,5.457909|label:3&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/parking.png|51.566283,5.457330|label:4&markers=icon:http://wild-water.nl/dokuwiki/lib/plugins/openlayersmap/icons/parking.png|51.565630,5.457695|label:5&sensor=false&format=png&maptype=roadmap
         $imgUrl = "https://maps.googleapis.com/maps/api/staticmap?";
-        $imgUrl .= "&size=" . str_replace("px", "", $gmap ['width']) . "x"
+        $imgUrl .= "&size=".str_replace("px", "", $gmap ['width'])."x"
             . str_replace("px", "", $gmap ['height']);
         //if (!$this->getConf( 'autoZoomMap')) { // no need for center & zoom params }
-        $imgUrl .= "&center=" . $gmap ['lat'] . "," . $gmap ['lon'];
+        $imgUrl .= "&center=".$gmap ['lat'].",".$gmap ['lon'];
         // max is 21 (== building scale), but that's overkill..
-        if($gmap ['zoom'] > 17) {
+        if ($gmap ['zoom'] > 17) {
             $imgUrl .= "&zoom=17";
         } else {
-            $imgUrl .= "&zoom=" . $gmap ['zoom'];
+            $imgUrl .= "&zoom=".$gmap ['zoom'];
         }
-        if(!empty ($overlay)) {
+        if (!empty ($overlay)) {
             $rowId = 0;
-            foreach($overlay as $data) {
+            foreach ($overlay as $data) {
                 list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
-                $imgUrl .= "&markers=icon%3a" . $sUrl . "lib/plugins/openlayersmap/icons/" . $img . "%7c"
-                    . $lat . "," . $lon . "%7clabel%3a" . ++$rowId;
+                $imgUrl .= "&markers=icon%3a".$sUrl."lib/plugins/openlayersmap/icons/".$img."%7c"
+                    . $lat.",".$lon."%7clabel%3a".++$rowId;
             }
         }
-        $imgUrl .= "&format=png&maptype=" . $maptype;
+        $imgUrl .= "&format=png&maptype=".$maptype;
         global $conf;
-        $imgUrl .= "&language=" . $conf ['lang'];
-        if($this->getConf('googleAPIkey')) {
-            $imgUrl .= "&key=" . $this->getConf('googleAPIkey');
+        $imgUrl .= "&language=".$conf ['lang'];
+        if ($this->getConf('googleAPIkey')) {
+            $imgUrl .= "&key=".$this->getConf('googleAPIkey');
         }
         // dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::getGoogle: Google image url is:');
         return $imgUrl;
@@ -478,23 +478,23 @@ 
     private function getStaticOSM(array $gmap, array $overlay) {
         global $conf;
 
-        if($this->getConf('optionStaticMapGenerator') == 'local') {
+        if ($this->getConf('optionStaticMapGenerator') == 'local') {
             // using local basemap composer
-            if(!$myMap = plugin_load('helper', 'openlayersmap_staticmap')) {
+            if (!$myMap = plugin_load('helper', 'openlayersmap_staticmap')) {
                 dbglog(
                     $myMap,
                     'openlayersmap_staticmap plugin is not available for use.'
                 );
             }
-            if(!$geophp = plugin_load('helper', 'geophp')) {
+            if (!$geophp = plugin_load('helper', 'geophp')) {
                 dbglog($geophp, 'geophp plugin is not available for use.');
             }
-            $size = str_replace("px", "", $gmap ['width']) . "x"
+            $size = str_replace("px", "", $gmap ['width'])."x"
                 . str_replace("px", "", $gmap ['height']);
 
             $markers = array();
-            if(!empty ($overlay)) {
-                foreach($overlay as $data) {
+            if (!empty ($overlay)) {
+                foreach ($overlay as $data) {
                     list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
                     $iconStyle  = substr($img, 0, strlen($img) - 4);
                     $markers [] = array(
@@ -506,26 +506,26 @@ 
             }
 
             $apikey = '';
-            switch($gmap ['baselyr']) {
+            switch ($gmap ['baselyr']) {
                 case 'mapnik' :
                 case 'openstreetmap' :
                     $maptype = 'openstreetmap';
                     break;
                 case 'transport' :
                     $maptype = 'transport';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'landscape' :
                     $maptype = 'landscape';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'outdoors' :
                     $maptype = 'outdoors';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'cycle map' :
                     $maptype = 'cycle';
-                    $apikey  = '?apikey=' . $this->getConf('tfApiKey');
+                    $apikey  = '?apikey='.$this->getConf('tfApiKey');
                     break;
                 case 'hike and bike map' :
                     $maptype = 'hikeandbike';
@@ -554,25 +554,25 @@ 
             //  ol-marker|47.921629720114,18.027343747285,ol-marker-gold|47.951071133739,19.257812497236,
             //  ol-marker-blue|47.180141361692,19.257812497236,ol-marker-green
             $imgUrl = "https://staticmap.openstreetmap.de/staticmap.php";
-            $imgUrl .= "?center=" . $gmap ['lat'] . "," . $gmap ['lon'];
-            $imgUrl .= "&size=" . str_replace("px", "", $gmap ['width']) . "x"
+            $imgUrl .= "?center=".$gmap ['lat'].",".$gmap ['lon'];
+            $imgUrl .= "&size=".str_replace("px", "", $gmap ['width'])."x"
                 . str_replace("px", "", $gmap ['height']);
 
-            if($gmap ['zoom'] > 16) {
+            if ($gmap ['zoom'] > 16) {
                 // actually this could even be 18, but that seems overkill
                 $imgUrl .= "&zoom=16";
             } else {
-                $imgUrl .= "&zoom=" . $gmap ['zoom'];
+                $imgUrl .= "&zoom=".$gmap ['zoom'];
             }
 
-            if(!empty ($overlay)) {
-                $rowId  = 0;
+            if (!empty ($overlay)) {
+                $rowId = 0;
                 $imgUrl .= "&markers=";
-                foreach($overlay as $data) {
+                foreach ($overlay as $data) {
                     list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
                     $rowId++;
                     $iconStyle = "lightblue$rowId";
-                    $imgUrl    .= "$lat,$lon,$iconStyle%7c";
+                    $imgUrl .= "$lat,$lon,$iconStyle%7c";
                 }
                 $imgUrl = substr($imgUrl, 0, -3);
             }
@@ -591,7 +591,7 @@ 
      * @return string
      */
     private function getBing(array $gmap, array $overlay): string {
-        switch($gmap ['baselyr']) {
+        switch ($gmap ['baselyr']) {
             case 've hybrid' :
             case 'bing hybrid' :
                 $maptype = 'AerialWithLabels';
@@ -608,33 +608,33 @@ 
                 $maptype = 'Road';
                 break;
         }
-        $imgUrl = "https://dev.virtualearth.net/REST/v1/Imagery/Map/" . $maptype;// . "/";
-        if($this->getConf('autoZoomMap')) {
+        $imgUrl = "https://dev.virtualearth.net/REST/v1/Imagery/Map/".$maptype; // . "/";
+        if ($this->getConf('autoZoomMap')) {
             $bbox = $this->calcBBOX($overlay, $gmap ['lat'], $gmap ['lon']);
             //$imgUrl .= "?ma=" . $bbox ['minlat'] . "," . $bbox ['minlon'] . ","
             //          . $bbox ['maxlat'] . "," . $bbox ['maxlon'];
-            $imgUrl .= "?ma=" . $bbox ['minlat'] . "%2C" . $bbox ['minlon'] . "%2C" . $bbox ['maxlat']
-                . "%2C" . $bbox ['maxlon'];
+            $imgUrl .= "?ma=".$bbox ['minlat']."%2C".$bbox ['minlon']."%2C".$bbox ['maxlat']
+                . "%2C".$bbox ['maxlon'];
             $imgUrl .= "&dcl=1";
         }
-        if(strpos($imgUrl, "?") === false)
+        if (strpos($imgUrl, "?") === false)
             $imgUrl .= "?";
 
         //$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . ","
         //          . str_replace ( "px", "", $gmap ['height'] );
-        $imgUrl .= "&ms=" . str_replace("px", "", $gmap ['width']) . "%2C"
+        $imgUrl .= "&ms=".str_replace("px", "", $gmap ['width'])."%2C"
             . str_replace("px", "", $gmap ['height']);
-        $imgUrl .= "&key=" . $this->getConf('bingAPIKey');
-        if(!empty ($overlay)) {
+        $imgUrl .= "&key=".$this->getConf('bingAPIKey');
+        if (!empty ($overlay)) {
             $rowId = 0;
-            foreach($overlay as $data) {
+            foreach ($overlay as $data) {
                 list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
                 // TODO icon style lookup, see: http://msdn.microsoft.com/en-us/library/ff701719.aspx for iconStyle
                 $iconStyle = 32;
                 $rowId++;
                 // NOTE: the max number of pushpins is 18! or we have to use POST
                 //  (http://msdn.microsoft.com/en-us/library/ff701724.aspx)
-                if($rowId == 18) {
+                if ($rowId == 18) {
                     break;
                 }
                 //$imgUrl .= "&pp=$lat,$lon;$iconStyle;$rowId";
@@ -644,7 +644,7 @@ 
         }
         global $conf;
         $imgUrl .= "&fmt=png";
-        $imgUrl .= "&c=" . $conf ['lang'];
+        $imgUrl .= "&c=".$conf ['lang'];
         // dbglog($imgUrl,'syntax_plugin_openlayersmap_olmap::getBing: bing image url is:');
         return $imgUrl;
     }
@@ -663,7 +663,7 @@ 
     private function calcBBOX(array $overlay, float $lat, float $lon): array {
         $lats = array($lat);
         $lons = array($lon);
-        foreach($overlay as $data) {
+        foreach ($overlay as $data) {
             list ($lat, $lon, $text, $angle, $opacity, $img) = $data;
             $lats [] = $lat;
             $lons [] = $lon;
@@ -691,13 +691,13 @@ 
      * @todo move this into a shared library
      */
     private function convertLat(float $decimaldegrees): string {
-        if(strpos($decimaldegrees, '-') !== false) {
+        if (strpos($decimaldegrees, '-') !== false) {
             $latPos = "S";
         } else {
             $latPos = "N";
         }
         $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $latPos);
+        return hsc($dms.$latPos);
     }
 
     /**
@@ -712,7 +712,7 @@ 
         $secs = ($decimaldegrees - $dms) * 3600;
         $min  = floor($secs / 60);
         $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
+        $dms .= 'º'.$min.'\''.$sec.'"';
         return $dms;
     }
 
@@ -724,13 +724,13 @@ 
      * @todo move this into a shared library
      */
     private function convertLon(float $decimaldegrees): string {
-        if(strpos($decimaldegrees, '-') !== false) {
+        if (strpos($decimaldegrees, '-') !== false) {
             $lonPos = "W";
         } else {
             $lonPos = "E";
         }
         $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $lonPos);
+        return hsc($dms.$lonPos);
     }
 
     /**
@@ -761,60 +761,60 @@ 
         // dbglog($data, 'olmap::render() data.');
         list ($mapid, $param, $mainLat, $mainLon, $poitable, $poitabledesc, $staticImgUrl, $_firstimage) = $data;
 
-        if($format == 'xhtml') {
+        if ($format == 'xhtml') {
             $olscript     = '';
             $stamenEnable = $this->getConf('enableStamen');
             $osmEnable    = $this->getConf('enableOSM');
             $enableBing   = $this->getConf('enableBing');
 
             $scriptEnable = '';
-            if(!$initialised) {
+            if (!$initialised) {
                 $initialised = true;
                 // render necessary script tags only once
-                $olscript = '<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol6/ol.js"></script>
-<script defer="defer" src="' . DOKU_BASE . 'lib/plugins/openlayersmap/ol6/ol-layerswitcher.js"></script>';
+                $olscript = '<script defer="defer" src="'.DOKU_BASE.'lib/plugins/openlayersmap/ol6/ol.js"></script>
+<script defer="defer" src="' . DOKU_BASE.'lib/plugins/openlayersmap/ol6/ol-layerswitcher.js"></script>';
 
                 $scriptEnable = '<script defer="defer" src="data:text/javascript;base64,';
                 $scriptSrc    = $olscript ? 'const olEnable=true;' : 'const olEnable=false;';
-                $scriptSrc    .= 'const osmEnable=' . ($osmEnable ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const stamenEnable=' . ($stamenEnable ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const bEnable=' . ($enableBing ? 'true' : 'false') . ';';
-                $scriptSrc    .= 'const bApiKey="' . $this->getConf('bingAPIKey') . '";';
-                $scriptSrc    .= 'const tfApiKey="' . $this->getConf('tfApiKey') . '";';
-                $scriptSrc    .= 'const gApiKey="' . $this->getConf('googleAPIkey') . '";';
+                $scriptSrc    .= 'const osmEnable='.($osmEnable ? 'true' : 'false').';';
+                $scriptSrc    .= 'const stamenEnable='.($stamenEnable ? 'true' : 'false').';';
+                $scriptSrc    .= 'const bEnable='.($enableBing ? 'true' : 'false').';';
+                $scriptSrc    .= 'const bApiKey="'.$this->getConf('bingAPIKey').'";';
+                $scriptSrc    .= 'const tfApiKey="'.$this->getConf('tfApiKey').'";';
+                $scriptSrc    .= 'const gApiKey="'.$this->getConf('googleAPIkey').'";';
                 $scriptSrc    .= 'olMapData = []; let olMaps = {}; let olMapOverlays = {};';
                 $scriptEnable .= base64_encode($scriptSrc);
                 $scriptEnable .= '"></script>';
             }
             $renderer->doc .= "$olscript\n$scriptEnable";
-            $renderer->doc .= '<div class="olMapHelp">' . $this->locale_xhtml("help") . '</div>';
-            if($this->getConf('enableA11y')) {
-                $renderer->doc .= '<div id="' . $mapid . '-static" class="olStaticMap">'
-                    . p_render($format, p_get_instructions($staticImgUrl), $info) . '</div>';
+            $renderer->doc .= '<div class="olMapHelp">'.$this->locale_xhtml("help").'</div>';
+            if ($this->getConf('enableA11y')) {
+                $renderer->doc .= '<div id="'.$mapid.'-static" class="olStaticMap">'
+                    . p_render($format, p_get_instructions($staticImgUrl), $info).'</div>';
             }
-            $renderer->doc .= '<div id="' . $mapid . '-clearer" class="clearer"><p>&nbsp;</p></div>';
-            if($this->getConf('enableA11y')) {
+            $renderer->doc .= '<div id="'.$mapid.'-clearer" class="clearer"><p>&nbsp;</p></div>';
+            if ($this->getConf('enableA11y')) {
                 // render a table of the POI for the print and a11y presentation, it is hidden using javascript
                 $renderer->doc .= '
-                <div class="olPOItableSpan" id="' . $mapid . '-table-span">
-                    <table class="olPOItable" id="' . $mapid . '-table">
-                    <caption class="olPOITblCaption">' . $this->getLang('olmapPOItitle') . '</caption>
+                <div class="olPOItableSpan" id="' . $mapid.'-table-span">
+                    <table class="olPOItable" id="' . $mapid.'-table">
+                    <caption class="olPOITblCaption">' . $this->getLang('olmapPOItitle').'</caption>
                     <thead class="olPOITblHeader">
                     <tr>
                     <th class="rowId" scope="col">id</th>
-                    <th class="icon" scope="col">' . $this->getLang('olmapPOIicon') . '</th>
-                    <th class="lat" scope="col" title="' . $this->getLang('olmapPOIlatTitle') . '">'
-                    . $this->getLang('olmapPOIlat') . '</th>
-                    <th class="lon" scope="col" title="' . $this->getLang('olmapPOIlonTitle') . '">'
-                    . $this->getLang('olmapPOIlon') . '</th>
-                    <th class="txt" scope="col">' . $this->getLang('olmapPOItxt') . '</th>
+                    <th class="icon" scope="col">' . $this->getLang('olmapPOIicon').'</th>
+                    <th class="lat" scope="col" title="' . $this->getLang('olmapPOIlatTitle').'">'
+                    . $this->getLang('olmapPOIlat').'</th>
+                    <th class="lon" scope="col" title="' . $this->getLang('olmapPOIlonTitle').'">'
+                    . $this->getLang('olmapPOIlon').'</th>
+                    <th class="txt" scope="col">' . $this->getLang('olmapPOItxt').'</th>
                     </tr>
                     </thead>';
-                if($poitabledesc != '') {
-                    $renderer->doc .= '<tfoot class="olPOITblFooter"><tr><td colspan="5">' . $poitabledesc
+                if ($poitabledesc != '') {
+                    $renderer->doc .= '<tfoot class="olPOITblFooter"><tr><td colspan="5">'.$poitabledesc
                         . '</td></tr></tfoot>';
                 }
-                $renderer->doc .= '<tbody class="olPOITblBody">' . $poitable . '</tbody>
+                $renderer->doc .= '<tbody class="olPOITblBody">'.$poitable.'</tbody>
                     </table>
                 </div>';
                 $renderer->doc .= "\n";
@@ -825,28 +825,28 @@ 
             $renderer->doc .= '"></script>';
             $mapnumber++;
             return true;
-        } elseif($format == 'metadata') {
-            if(!(($this->dflt ['lat'] == $mainLat) && ($this->dflt ['lon'] == $mainLon))) {
+        } elseif ($format == 'metadata') {
+            if (!(($this->dflt ['lat'] == $mainLat) && ($this->dflt ['lon'] == $mainLon))) {
                 // render geo metadata, unless they are the default
                 $renderer->meta ['geo'] ['lat'] = $mainLat;
                 $renderer->meta ['geo'] ['lon'] = $mainLon;
-                if($geophp = plugin_load('helper', 'geophp')) {
+                if ($geophp = plugin_load('helper', 'geophp')) {
                     // if we have the geoPHP helper, add the geohash
 
                     // fails with older php versions..
                     // $renderer->meta['geo']['geohash'] = (new Point($mainLon,$mainLat))->out('geohash');
-                    $p                                  = new Point ($mainLon, $mainLat);
+                    $p                                  = new Point($mainLon, $mainLat);
                     $renderer->meta ['geo'] ['geohash'] = $p->out('geohash');
                 }
             }
 
-            if(($this->getConf('enableA11y')) && (!empty ($_firstimage))) {
+            if (($this->getConf('enableA11y')) && (!empty ($_firstimage))) {
                 // add map local image into relation/firstimage if not already filled and when it is a local image
 
                 global $ID;
                 $rel = p_get_metadata($ID, 'relation', METADATA_RENDER_USING_CACHE);
                 $img = $rel ['firstimage'];
-                if(empty ($img) /* || $img == $_firstimage*/) {
+                if (empty ($img) /* || $img == $_firstimage*/) {
                     //dbglog ( $_firstimage,
                     // 'olmap::render#rendering image relation metadata for _firstimage as $img was empty or same.' );
                     // This seems to never work; the firstimage entry in the .meta file is empty

StaticMap.php

Spacing +64 added lines, -64 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();
 
@@ -297,7 +297,7 @@ 
         $vy0 = log(tan(M_PI * (0.25 + $bbox ['miny'] / 360)));
         $vy1 = log(tan(M_PI * (0.25 + $bbox ['maxy'] / 360)));
         dbglog("StaticMap::autoZoom: vertical resolution: $vy0, $vy1");
-        if ($vy1 - $vy0 === 0.0){
+        if ($vy1 - $vy0 === 0.0) {
             $resolutionVertical = 0;
             dbglog("StaticMap::autoZoom: using $resolutionVertical");
         } else {
@@ -310,7 +310,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();
@@ -343,12 +343,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;
     }
 
     /**
@@ -357,7 +357,7 @@ 
     public function makeMap(): void {
         $this->initCoords();
         $this->createBaseMap();
-        if(!empty ($this->markers)) {
+        if (!empty ($this->markers)) {
             $this->placeMarkers();
         }
         if (file_exists($this->kmlFileName)) {
@@ -430,8 +430,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}',
@@ -445,7 +445,7 @@ 
                 );
 
                 $tileData = $this->fetchTile($url);
-                if($tileData) {
+                if ($tileData) {
                     $tileImage = imagecreatefromstring($tileData);
                 } else {
                     $tileImage = imagecreate($this->tileSize, $this->tileSize);
@@ -471,17 +471,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);
@@ -491,21 +491,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;
@@ -518,7 +518,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;
@@ -530,7 +530,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);
     }
 
     /**
@@ -565,14 +565,14 @@ 
         $count         = 0;
         $color         = imagecolorallocate($this->image, 0, 0, 0);
         $bgcolor       = imagecolorallocate($this->image, 200, 200, 200);
-        $markerBaseDir = __DIR__ . '/icons';
+        $markerBaseDir = __DIR__.'/icons';
         $markerImageOffsetX  = 0;
         $markerImageOffsetY  = 0;
         $markerShadowOffsetX = 0;
         $markerShadowOffsetY = 0;
         $markerShadowImg     = null;
         // loop thru marker array
-        foreach($this->markers as $marker) {
+        foreach ($this->markers as $marker) {
             // set some local variables
             $markerLat  = $marker ['lat'];
             $markerLon  = $marker ['lon'];
@@ -582,18 +582,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']
@@ -603,14 +603,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(
@@ -622,7 +622,7 @@ 
                 $this->tileSize * ($this->centerY - $this->latToTile($markerLat, $this->zoom))
             );
             // copy shadow on basemap
-            if($markerShadow && $markerShadowImg) {
+            if ($markerShadow && $markerShadowImg) {
                 imagecopy(
                     $this->image,
                     $markerShadowImg,
@@ -683,14 +683,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);
                 }
@@ -732,7 +732,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))
@@ -758,7 +758,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);
@@ -829,8 +829,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);
 
@@ -863,11 +863,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,